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

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SupervisoryFragment.java |   82 +++++++++++------------------------------
 1 files changed, 22 insertions(+), 60 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 4c5d4df..9e4042b 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,28 +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 com.camnter.easyrecyclerview.widget.EasyRecyclerView;
-import com.lidroid.xutils.view.annotation.ViewInject;
+import cn.com.basic.face.widget.SupervisoryBottomListView;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.lidroid.xutils.view.annotation.ViewInject;
 
 
 /**
@@ -35,23 +28,19 @@
     private RadioGroup fragment_supervisory_bottom_left_radio_group;
     @ViewInject(R.id.fragment_supervisory_bottom_visitor_radio_button)
     private RadioButton fragment_supervisory_bottom_visitor_radio_button;
-    @ViewInject(R.id.fragment_supervisory_bottom_attendance_radio_button)
-    private RadioButton fragment_supervisory_bottom_attendance_radio_button;
     @ViewInject(R.id.fragment_supervisory_bottom_visitor_background)
     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_register_list)
-    private EasyRecyclerView fragment_supervisory_bottom_register_list;
-    @ViewInject(R.id.fragment_supervisory_bottom_visitor_list)
-    private EasyRecyclerView fragment_supervisory_bottom_visitor_list;
+    @ViewInject(R.id.fragment_supervisory_bottom_visit_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;
     @ViewInject(R.id.fragment_supervisory_enter_camera)
     VideoView fragment_supervisory_enter_camera;
     @ViewInject(R.id.fragment_supervisory_exit_camera)
     VideoView fragment_supervisory_exit_camera;
 
-    private SupervisoryBottomListViewAdapter mAdapter;
-    private List mList;
     static boolean useNative = false;
 
     static {
@@ -67,6 +56,14 @@
         return instance;
     }
 
+    public SupervisoryBottomListView get_fragment_supervisory_bottom_visit_list_view() {
+        return fragment_supervisory_bottom_visit_list_view;
+    }
+
+    public SupervisoryBottomListView get_fragment_supervisory_bottom_attendance_list_view() {
+        return fragment_supervisory_bottom_visit_list_view;
+    }
+
     @Override
     protected int getLayoutId() {
         return R.layout.fragment_supervisory;
@@ -74,11 +71,6 @@
 
     @Override
     protected void initViews(View view, Bundle savedInstanceState) {
-        fragment_supervisory_bottom_register_list.addItemDecoration(new SpaceItemDecoration());
-        GridLayoutManager gridLayoutManager = new GridLayoutManager(getActivity(), 2);
-        gridLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
-        fragment_supervisory_bottom_register_list.setLayoutManager(gridLayoutManager);
-        mAdapter = new SupervisoryBottomListViewAdapter(getActivity());
         new Thread(new Runnable() {
             @Override
             public void run() {
@@ -102,6 +94,7 @@
                 }
             }
         }).start();
+        reloadBottomList();
     }
 
     @Override
@@ -109,20 +102,10 @@
         fragment_supervisory_bottom_left_radio_group.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(RadioGroup group, int checkedId) {
-                switch (checkedId) {
-                    case R.id.fragment_supervisory_bottom_visitor_radio_button:
-                        fragment_supervisory_bottom_visitor_background.setVisibility(View.VISIBLE);
-                        fragment_supervisory_bottom_attendance_background.setVisibility(View.INVISIBLE);
-                        fragment_supervisory_bottom_register_list.setVisibility(View.VISIBLE);
-                        fragment_supervisory_bottom_visitor_list.setVisibility(View.GONE);
-                        break;
-                    case R.id.fragment_supervisory_bottom_attendance_radio_button:
-                        fragment_supervisory_bottom_visitor_background.setVisibility(View.INVISIBLE);
-                        fragment_supervisory_bottom_attendance_background.setVisibility(View.VISIBLE);
-                        fragment_supervisory_bottom_register_list.setVisibility(View.GONE);
-                        fragment_supervisory_bottom_visitor_list.setVisibility(View.VISIBLE);
-                        break;
-                }
+                fragment_supervisory_bottom_visitor_background.setVisibility(fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
+                fragment_supervisory_bottom_visit_list_view.setVisibility(fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
+                fragment_supervisory_bottom_attendance_background.setVisibility(!fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
+                fragment_supervisory_bottom_attendance_list_view.setVisibility(!fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
                 reloadBottomList();
             }
         });
@@ -131,34 +114,13 @@
     @Override
     public void setMenuVisibility(boolean menuVisible) {
         super.setMenuVisibility(menuVisible);
-        if (menuVisible) {
+        if (menuVisible && fragment_supervisory_bottom_visit_list_view != null) {
             reloadBottomList();
         }
     }
 
     private void reloadBottomList() {
-        if (fragment_supervisory_bottom_register_list != null) {
-            mList = new ArrayList();
-            SupervisoryMng.getInstance().findSupervisoryBottomList();
-            mAdapter = new SupervisoryBottomListViewAdapter(getActivity());
-            mAdapter.setList(mList);
-            fragment_supervisory_bottom_register_list.setAdapter(mAdapter);
-        }
-    }
-
-    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);
-            }
-        }
+        SupervisoryMng.getInstance().findSupervisoryBottomList(fragment_supervisory_bottom_visitor_radio_button.isChecked());
     }
 
 }

--
Gitblit v1.8.0