From 9a31f01e796d262c7fc3555a3ad42801e9b343a5 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 31 三月 2017 13:45:47 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SupervisoryMng.java           |    2 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SupervisoryFragment.java     |   34 +----------------
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SupervisoryBottomListView.java |   30 +++++++++++++++
 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory.xml                          |   19 ++++++++-
 4 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SupervisoryFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SupervisoryFragment.java
index f125c7e..fc71781 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SupervisoryFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SupervisoryFragment.java
@@ -1,30 +1,21 @@
 package cn.com.basic.face.fragment;
 
-import android.graphics.Rect;
 import android.os.Bundle;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.VideoView;
 
 import com.bsk.zhangbo.demoforbsk.R;
-import cn.com.basic.face.adapter.SupervisoryBottomListViewAdapter;
+
 import cn.com.basic.face.base.BaseFragment;
 
 import com.bsk.zhangbo.demoforbsk.util.RtspFaceNative;
 
 import cn.com.basic.face.service.SupervisoryMng;
-import cn.com.basic.face.util.WindowsUtil;
 import cn.com.basic.face.widget.SupervisoryBottomListView;
 
-import com.camnter.easyrecyclerview.widget.EasyRecyclerView;
 import com.lidroid.xutils.view.annotation.ViewInject;
-
-import java.util.ArrayList;
-import java.util.List;
 
 
 /**
@@ -43,7 +34,7 @@
     private View fragment_supervisory_bottom_visitor_background;
     @ViewInject(R.id.fragment_supervisory_bottom_attendance_background)
     private View fragment_supervisory_bottom_attendance_background;
-    @ViewInject(R.id.fragment_supervisory_bottom_visit_list_view)
+    @ViewInject(R.id.fragment_supervisory_bottom_visit_register_list_view)
     private SupervisoryBottomListView fragment_supervisory_bottom_visit_list_view;
     @ViewInject(R.id.fragment_supervisory_bottom_attendance_list_view)
     private SupervisoryBottomListView fragment_supervisory_bottom_attendance_list_view;
@@ -52,8 +43,6 @@
     @ViewInject(R.id.fragment_supervisory_exit_camera)
     VideoView fragment_supervisory_exit_camera;
 
-    private SupervisoryBottomListViewAdapter mAdapter;
-    private List mList;
     static boolean useNative = false;
 
     static {
@@ -84,11 +73,6 @@
 
     @Override
     protected void initViews(View view, Bundle savedInstanceState) {
-        fragment_supervisory_bottom_visit_list_view.addItemDecoration(new SpaceItemDecoration());
-        GridLayoutManager gridLayoutManager = new GridLayoutManager(getActivity(), 2);
-        gridLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
-        fragment_supervisory_bottom_visit_list_view.setLayoutManager(gridLayoutManager);
-        mAdapter = new SupervisoryBottomListViewAdapter(getActivity());
         new Thread(new Runnable() {
             @Override
             public void run() {
@@ -151,19 +135,5 @@
         SupervisoryMng.getInstance().findSupervisoryBottomList(fragment_supervisory_bottom_visitor_radio_button.isChecked());
     }
 
-    private class SpaceItemDecoration extends RecyclerView.ItemDecoration {
-        @Override
-        public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
-            super.getItemOffsets(outRect, view, parent, state);
-            outRect.right = WindowsUtil.dip2px(getActivity(), 15);
-
-            if (parent.getChildLayoutPosition(view) == 0 || parent.getChildLayoutPosition(view) == 1) {
-                outRect.left = WindowsUtil.dip2px(getActivity(), 14);
-            }
-            if (parent.getChildLayoutPosition(view) % 2 == 0) {
-                outRect.bottom = WindowsUtil.dip2px(getActivity(), 7);
-            }
-        }
-    }
 
 }
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SupervisoryMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SupervisoryMng.java
index 6a62983..470afd8 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SupervisoryMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SupervisoryMng.java
@@ -28,7 +28,7 @@
     public void findSupervisoryBottomList(final boolean isVisit) {
 
         RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.SupervisoryQuery);
-        params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId());
+//        params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId());
         x.http().post(params, new BaseCommonCallBack() {
             public void success() {
                 List<SupervisoryQueryItem> list = getList(SupervisoryQueryItem.class);
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SupervisoryBottomListView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SupervisoryBottomListView.java
index 00c0379..8f53f9e 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SupervisoryBottomListView.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SupervisoryBottomListView.java
@@ -1,7 +1,12 @@
 package cn.com.basic.face.widget;
 
 import android.content.Context;
+import android.graphics.Rect;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
+import android.view.View;
 
 import com.camnter.easyrecyclerview.widget.EasyRecyclerView;
 
@@ -10,13 +15,37 @@
 
 import cn.com.basic.face.adapter.CheckInLeftListViewAdapter;
 import cn.com.basic.face.adapter.SupervisoryBottomListViewAdapter;
+import cn.com.basic.face.base.MainActivity;
 import cn.com.basic.face.util.Constant;
+import cn.com.basic.face.util.WindowsUtil;
 
 /**
  * Created by xiuxi on 2017/3/31.
  */
 
 public class SupervisoryBottomListView extends EasyRecyclerView {
+
+    private class SpaceItemDecoration extends RecyclerView.ItemDecoration {
+        @Override
+        public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+            super.getItemOffsets(outRect, view, parent, state);
+            outRect.right = WindowsUtil.dip2px(MainActivity.getInstance(), 15);
+
+            if (parent.getChildLayoutPosition(view) == 0 || parent.getChildLayoutPosition(view) == 1) {
+                outRect.left = WindowsUtil.dip2px(MainActivity.getInstance(), 14);
+            }
+            if (parent.getChildLayoutPosition(view) % 2 == 0) {
+                outRect.bottom = WindowsUtil.dip2px(MainActivity.getInstance(), 7);
+            }
+        }
+    }
+
+    public void initLayout() {
+        addItemDecoration(new SpaceItemDecoration());
+        GridLayoutManager gridLayoutManager = new GridLayoutManager(MainActivity.getInstance(), 1);
+        gridLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
+        setLayoutManager(gridLayoutManager);
+    }
 
     private SupervisoryBottomListViewAdapter mAdapter;
     private List list = new ArrayList();
@@ -25,6 +54,7 @@
         mAdapter = new SupervisoryBottomListViewAdapter(context);
         mAdapter.setList(list);
         setAdapter(mAdapter);
+        initLayout();
     }
 
     public SupervisoryBottomListView(Context context) {
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory.xml
index bbd6374..c755dbc 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory.xml
@@ -171,11 +171,24 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/white">
-            <cn.com.basic.face.widget.SupervisoryBottomListView
-                android:id="@+id/fragment_supervisory_bottom_visit_list_view"
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:orientation="vertical"/>
+                android:orientation="vertical">
+                <cn.com.basic.face.widget.SupervisoryBottomListView
+                    android:id="@+id/fragment_supervisory_bottom_visit_register_list_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:orientation="vertical"/>
+                <cn.com.basic.face.widget.SupervisoryBottomListView
+                    android:id="@+id/fragment_supervisory_bottom_visit_check_in_list_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:orientation="vertical"/>
+            </LinearLayout>
+
 
             <cn.com.basic.face.widget.SupervisoryBottomListView
                 android:id="@+id/fragment_supervisory_bottom_attendance_list_view"

--
Gitblit v1.8.0