From 03f65ab5ad75eae6a438a65bcd66ce25a7551d1a Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 31 三月 2017 11:50:33 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SupervisoryMng.java | 20 ++
VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SupervisoryQueryItem.java | 190 +++++++++++++++++++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SupervisoryFragment.java | 74 +++++---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SupervisoryBottomListView.java | 57 +++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SupervisoryBottomListViewAdapter.java | 25 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInLeftListView.java | 8
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory.xml | 5
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory_bottom_visitor_cell.xml | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInLeftListViewAdapter.java | 12
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/PhoneCallFragment.java | 8
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java | 52 ++++--
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java | 14 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 5
14 files changed, 392 insertions(+), 82 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml b/VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml
index 850f987..dadf198 100644
--- a/VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml
+++ b/VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml
@@ -25,8 +25,6 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name=".ui.activity.TestARGB8888Activity"
- android:screenOrientation="landscape"></activity>
</application>
</manifest>
\ No newline at end of file
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInLeftListViewAdapter.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInLeftListViewAdapter.java
index 6c56435..0e26f4e 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInLeftListViewAdapter.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/CheckInLeftListViewAdapter.java
@@ -50,10 +50,10 @@
@Override
public void onBindRecycleViewHolder(EasyRecyclerViewHolder viewHolder, int position) {
switch (type) {
- case Constant.VISITOR_ROW:
+ case Constant.CheckIn.VISITOR_ROW:
visitorCellHolder(viewHolder, position);
break;
- case Constant.INTERVIEWEE_ROW:
+ case Constant.CheckIn.INTERVIEWEE_ROW:
intervieweeCellHolder(viewHolder, position);
break;
}
@@ -62,9 +62,9 @@
@Override
public int getRecycleViewItemType(int position) {
switch (type) {
- case Constant.VISITOR_ROW:
+ case Constant.CheckIn.VISITOR_ROW:
return 0;
- case Constant.INTERVIEWEE_ROW:
+ case Constant.CheckIn.INTERVIEWEE_ROW:
return 1;
default:
return 1;
@@ -152,11 +152,11 @@
}
public void setVisitorRow() {
- this.type = Constant.VISITOR_ROW;
+ this.type = Constant.CheckIn.VISITOR_ROW;
}
public void setIntervieweeRow() {
- this.type = Constant.INTERVIEWEE_ROW;
+ this.type = Constant.CheckIn.INTERVIEWEE_ROW;
}
public void setRowType(int type) {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SupervisoryBottomAdapter.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SupervisoryBottomListViewAdapter.java
similarity index 94%
rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SupervisoryBottomAdapter.java
rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SupervisoryBottomListViewAdapter.java
index 70a00d9..c4fccee 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SupervisoryBottomAdapter.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/SupervisoryBottomListViewAdapter.java
@@ -21,17 +21,12 @@
import cn.com.basic.face.discern.query.item.FacePhotoItem;
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
-
-/**
- * Created by zhangbo on 2017/2/15.
- */
-
-public class SupervisoryBottomAdapter extends EasyRecyclerViewAdapter {
+public class SupervisoryBottomListViewAdapter extends EasyRecyclerViewAdapter {
private int TYPE_1 = 0,TYPE_2 = 1;
private int type;
private Context context;
private List list;
- public SupervisoryBottomAdapter(Context context) {
+ public SupervisoryBottomListViewAdapter(Context context) {
this.context = context;
}
@@ -55,6 +50,7 @@
@Override
public int getRecycleViewItemType(int position) {
+
type = position%2;
switch (type){
case 0:
@@ -67,9 +63,7 @@
}
/**
- * 绗竴鍒楁敞鍐�
- * @param holder
- * @param posistion
+ * 璁垮->浜哄憳娉ㄥ唽
*/
private void RegisterViewHolder(EasyRecyclerViewHolder holder,int posistion){
@@ -98,13 +92,11 @@
}
/**
- * 绗簩鍒楃敤鎴锋儏鍐�
- * @param holder
- * @param posistion
+ * 璁垮->鏉ヨ鐧昏
*/
private void UserViewHolder(EasyRecyclerViewHolder holder,int posistion){
- RelativeLayout mLayout = holder.findViewById(R.id.item_user_base);
+ RelativeLayout mLayout = holder.findViewById(R.id.fragment_supervisory_bottom_visitor_cell_relative_layout);
ViewGroup.LayoutParams layoutParams = mLayout.getLayoutParams();
layoutParams.height = WindowsUtil.dip2px(context, 127);
layoutParams.width = WindowsUtil.dip2px(context, 104);
@@ -168,4 +160,9 @@
}
}
+
+
+ public void setRowType(int i) {
+
+ }
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java
index 7b26ed4..d06c09d 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/CheckInQueryItem.java
@@ -19,10 +19,12 @@
private String deptName;
// 鍏徃涓婚敭
private String companyId;
- // 鑱屼綅涓婚敭
+ // 鑱屼綅鍚嶇О
private String postName;
// 绉诲姩鐢佃瘽
private String mobilePhone;
+ //
+ private int type;
/**
* Get 浜哄憳涓婚敭
@@ -30,7 +32,7 @@
public String getId() {
return id;
}
-
+
/**
* Set 浜哄憳涓婚敭
*/
@@ -44,7 +46,7 @@
public String getName() {
return name;
}
-
+
/**
* Set 浜哄憳鍚嶅瓧
*/
@@ -58,7 +60,7 @@
public String getImagePath() {
return imagePath;
}
-
+
/**
* Set 鍥剧墖鍦板潃
*/
@@ -72,7 +74,7 @@
public String getCompanyName() {
return companyName;
}
-
+
/**
* Set 鍏徃鍚嶇О
*/
@@ -86,7 +88,7 @@
public String getPhone() {
return phone;
}
-
+
/**
* Set 搴ф満鐢佃瘽
*/
@@ -100,7 +102,7 @@
public String getIdentify() {
return identify;
}
-
+
/**
* Set 璇佷欢缂栧彿
*/
@@ -114,7 +116,7 @@
public String getDeptName() {
return deptName;
}
-
+
/**
* Set 閮ㄩ棬鍚嶇О
*/
@@ -128,7 +130,7 @@
public String getCompanyId() {
return companyId;
}
-
+
/**
* Set 鍏徃涓婚敭
*/
@@ -137,14 +139,14 @@
}
/**
- * Get 鑱屼綅涓婚敭
+ * Get 鑱屼綅鍚嶇О
*/
public String getPostName() {
return postName;
}
-
+
/**
- * Set 鑱屼綅涓婚敭
+ * Set 鑱屼綅鍚嶇О
*/
public void setPostName(String postName) {
this.postName = postName;
@@ -156,7 +158,7 @@
public String getMobilePhone() {
return mobilePhone;
}
-
+
/**
* Set 绉诲姩鐢佃瘽
*/
@@ -164,11 +166,25 @@
this.mobilePhone = mobilePhone;
}
+ /**
+ * Get
+ */
+ public int getType() {
+ return type;
+ }
+
+ /**
+ * Set
+ */
+ public void setType(int type) {
+ this.type = type;
+ }
+
public String toString() {
- return
- ",浜哄憳涓婚敭 =" + id + ",浜哄憳鍚嶅瓧 =" + name + ",鍥剧墖鍦板潃 =" + imagePath +
- ",鍏徃鍚嶇О =" + companyName + ",搴ф満鐢佃瘽 =" + phone + ",璇佷欢缂栧彿 =" + identify +
- ",閮ㄩ棬鍚嶇О =" + deptName + ",鍏徃涓婚敭 =" + companyId + ",鑱屼綅涓婚敭 =" + postName +
- ",绉诲姩鐢佃瘽 =" + mobilePhone;
+ return
+ ",浜哄憳涓婚敭 =" + id + ",浜哄憳鍚嶅瓧 =" + name + ",鍥剧墖鍦板潃 =" + imagePath +
+ ",鍏徃鍚嶇О =" + companyName + ",搴ф満鐢佃瘽 =" + phone + ",璇佷欢缂栧彿 =" + identify +
+ ",閮ㄩ棬鍚嶇О =" + deptName + ",鍏徃涓婚敭 =" + companyId + ",鑱屼綅鍚嶇О =" + postName +
+ ",绉诲姩鐢佃瘽 =" + mobilePhone + ", =" + type ;
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SupervisoryQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SupervisoryQueryItem.java
new file mode 100644
index 0000000..cddcf1b
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/SupervisoryQueryItem.java
@@ -0,0 +1,190 @@
+package cn.com.basic.face.discern.query.item;
+
+
+public class SupervisoryQueryItem {
+
+ // 浜哄憳涓婚敭
+ private String id;
+ // 浜哄憳鍚嶅瓧
+ private String name;
+ // 鍥剧墖鍦板潃
+ private String imagePath;
+ // 鍏徃鍚嶇О
+ private String companyName;
+ // 搴ф満鐢佃瘽
+ private String phone;
+ // 璇佷欢缂栧彿
+ private String identify;
+ // 閮ㄩ棬鍚嶇О
+ private String deptName;
+ // 鍏徃涓婚敭
+ private String companyId;
+ // 鑱屼綅鍚嶇О
+ private String postName;
+ // 绉诲姩鐢佃瘽
+ private String mobilePhone;
+ //
+ private int type;
+
+ /**
+ * Get 浜哄憳涓婚敭
+ */
+ public String getId() {
+ return id;
+ }
+
+ /**
+ * Set 浜哄憳涓婚敭
+ */
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ /**
+ * Get 浜哄憳鍚嶅瓧
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Set 浜哄憳鍚嶅瓧
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * Get 鍥剧墖鍦板潃
+ */
+ public String getImagePath() {
+ return imagePath;
+ }
+
+ /**
+ * Set 鍥剧墖鍦板潃
+ */
+ public void setImagePath(String imagePath) {
+ this.imagePath = imagePath;
+ }
+
+ /**
+ * Get 鍏徃鍚嶇О
+ */
+ public String getCompanyName() {
+ return companyName;
+ }
+
+ /**
+ * Set 鍏徃鍚嶇О
+ */
+ public void setCompanyName(String companyName) {
+ this.companyName = companyName;
+ }
+
+ /**
+ * Get 搴ф満鐢佃瘽
+ */
+ public String getPhone() {
+ return phone;
+ }
+
+ /**
+ * Set 搴ф満鐢佃瘽
+ */
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+
+ /**
+ * Get 璇佷欢缂栧彿
+ */
+ public String getIdentify() {
+ return identify;
+ }
+
+ /**
+ * Set 璇佷欢缂栧彿
+ */
+ public void setIdentify(String identify) {
+ this.identify = identify;
+ }
+
+ /**
+ * Get 閮ㄩ棬鍚嶇О
+ */
+ public String getDeptName() {
+ return deptName;
+ }
+
+ /**
+ * Set 閮ㄩ棬鍚嶇О
+ */
+ public void setDeptName(String deptName) {
+ this.deptName = deptName;
+ }
+
+ /**
+ * Get 鍏徃涓婚敭
+ */
+ public String getCompanyId() {
+ return companyId;
+ }
+
+ /**
+ * Set 鍏徃涓婚敭
+ */
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
+ }
+
+ /**
+ * Get 鑱屼綅鍚嶇О
+ */
+ public String getPostName() {
+ return postName;
+ }
+
+ /**
+ * Set 鑱屼綅鍚嶇О
+ */
+ public void setPostName(String postName) {
+ this.postName = postName;
+ }
+
+ /**
+ * Get 绉诲姩鐢佃瘽
+ */
+ public String getMobilePhone() {
+ return mobilePhone;
+ }
+
+ /**
+ * Set 绉诲姩鐢佃瘽
+ */
+ public void setMobilePhone(String mobilePhone) {
+ this.mobilePhone = mobilePhone;
+ }
+
+ /**
+ * Get
+ */
+ public int getType() {
+ return type;
+ }
+
+ /**
+ * Set
+ */
+ public void setType(int type) {
+ this.type = type;
+ }
+
+ public String toString() {
+ return
+ ",浜哄憳涓婚敭 =" + id + ",浜哄憳鍚嶅瓧 =" + name + ",鍥剧墖鍦板潃 =" + imagePath +
+ ",鍏徃鍚嶇О =" + companyName + ",搴ф満鐢佃瘽 =" + phone + ",璇佷欢缂栧彿 =" + identify +
+ ",閮ㄩ棬鍚嶇О =" + deptName + ",鍏徃涓婚敭 =" + companyId + ",鑱屼綅鍚嶇О =" + postName +
+ ",绉诲姩鐢佃瘽 =" + mobilePhone + ", =" + type ;
+ }
+}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/PhoneCallFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/PhoneCallFragment.java
index 08b2a8f..fddf50e 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/PhoneCallFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/PhoneCallFragment.java
@@ -48,11 +48,11 @@
mRecyclerView = (EasyRecyclerView) mViewLeft.findViewById(R.id.fragment_check_in_left_list_view);
LinearLayoutManager manager = new LinearLayoutManager(getActivity(),LinearLayoutManager.VERTICAL,false);
mRecyclerView.setLayoutManager(manager);
- mAdapter = new CheckInLeftListViewAdapter(getActivity(),Constant.VISITOR_ROW);
+ mAdapter = new CheckInLeftListViewAdapter(getActivity(),Constant.CheckIn.VISITOR_ROW);
ViewUtils.inject(this, mViewLeft);
mLlRadioGroupClass.setVisibility(View.VISIBLE);
- mAdapter = new CheckInLeftListViewAdapter(getActivity(), Constant.INTERVIEWEE_ROW);
+ mAdapter = new CheckInLeftListViewAdapter(getActivity(), Constant.CheckIn.INTERVIEWEE_ROW);
mAdapter.set_fragment_check_in_left_sort_radio_group_type(CheckInLeftListViewAdapter.TYPE_NAME);
mAdapter.setList(mList);
mRecyclerView.setAdapter(mAdapter);
@@ -76,13 +76,13 @@
switch (radioGroup.getCheckedRadioButtonId()){
case R.id.fragment_check_in_left_visitor_radio:
mLlRadioGroupClass.setVisibility(View.GONE);
- mAdapter = new CheckInLeftListViewAdapter(getActivity(), Constant.VISITOR_ROW);
+ mAdapter = new CheckInLeftListViewAdapter(getActivity(), Constant.CheckIn.VISITOR_ROW);
mAdapter.setList(mList);
mRecyclerView.setAdapter(mAdapter);
break;
case R.id.fragment_check_in_left_interviewee_radio:
mLlRadioGroupClass.setVisibility(View.VISIBLE);
- mAdapter = new CheckInLeftListViewAdapter(getActivity(), Constant.INTERVIEWEE_ROW);
+ mAdapter = new CheckInLeftListViewAdapter(getActivity(), Constant.CheckIn.INTERVIEWEE_ROW);
mAdapter.set_fragment_check_in_left_sort_radio_group_type(CheckInLeftListViewAdapter.TYPE_NAME);
mAdapter.setList(mList);
mRecyclerView.setAdapter(mAdapter);
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 86373a3..4c5d4df 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
@@ -5,16 +5,18 @@
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
-import android.view.SurfaceView;
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.SupervisoryBottomAdapter;
+import cn.com.basic.face.adapter.SupervisoryBottomListViewAdapter;
import cn.com.basic.face.base.BaseFragment;
-import cn.com.basic.face.service.CheckInMng;
+
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;
@@ -41,17 +43,22 @@
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_enter_camera)
- SurfaceView fragment_supervisory_enter_camera;
+ VideoView fragment_supervisory_enter_camera;
@ViewInject(R.id.fragment_supervisory_exit_camera)
- SurfaceView fragment_supervisory_exit_camera;
+ VideoView fragment_supervisory_exit_camera;
- private SupervisoryBottomAdapter mAdapter;
+ private SupervisoryBottomListViewAdapter mAdapter;
private List mList;
+ static boolean useNative = false;
static {
- System.loadLibrary("rtspface");
- RtspFaceNative.init();
+ if (useNative) {
+ System.loadLibrary("rtspface");
+ RtspFaceNative.init();
+ }
}
private static SupervisoryFragment instance = new SupervisoryFragment();
@@ -71,16 +78,25 @@
GridLayoutManager gridLayoutManager = new GridLayoutManager(getActivity(), 2);
gridLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
fragment_supervisory_bottom_register_list.setLayoutManager(gridLayoutManager);
- mAdapter = new SupervisoryBottomAdapter(getActivity());
+ mAdapter = new SupervisoryBottomListViewAdapter(getActivity());
new Thread(new Runnable() {
@Override
public void run() {
try {
Thread.sleep(2000);
- RtspFaceNative.setSurface(1, fragment_supervisory_enter_camera.getHolder().getSurface());
- RtspFaceNative.setSurface(2, fragment_supervisory_exit_camera.getHolder().getSurface());
- RtspFaceNative.createPlayer(1, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/sub/av_stream");
- RtspFaceNative.createPlayer(2, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/sub/av_stream");
+ if (useNative) {
+ RtspFaceNative.setSurface(1, fragment_supervisory_enter_camera.getHolder().getSurface());
+ RtspFaceNative.setSurface(2, fragment_supervisory_exit_camera.getHolder().getSurface());
+ RtspFaceNative.createPlayer(1, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/sub/av_stream");
+ RtspFaceNative.createPlayer(2, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/sub/av_stream");
+ } else {
+// fragment_supervisory_enter_camera.setVideoURI(Uri.parse("rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/sub/av_stream"));
+// fragment_supervisory_enter_camera.requestFocus();
+// fragment_supervisory_enter_camera.start();
+// fragment_supervisory_exit_camera.setVideoURI(Uri.parse("rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/main/av_stream"));
+// fragment_supervisory_exit_camera.requestFocus();
+// fragment_supervisory_exit_camera.start();
+ }
} catch (Exception e) {
e.printStackTrace();
}
@@ -93,20 +109,20 @@
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;
-// }
+ 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;
+ }
reloadBottomList();
}
});
@@ -123,8 +139,8 @@
private void reloadBottomList() {
if (fragment_supervisory_bottom_register_list != null) {
mList = new ArrayList();
- CheckInMng.getInstance().findVisitorList();
- mAdapter = new SupervisoryBottomAdapter(getActivity());
+ SupervisoryMng.getInstance().findSupervisoryBottomList();
+ mAdapter = new SupervisoryBottomListViewAdapter(getActivity());
mAdapter.setList(mList);
fragment_supervisory_bottom_register_list.setAdapter(mAdapter);
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
index c997612..6290497 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
@@ -4,6 +4,7 @@
import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.fragment.CheckInFragment;
+import cn.com.basic.face.fragment.SupervisoryFragment;
import cn.com.basic.face.util.AppApi;
import org.xutils.http.RequestParams;
@@ -32,7 +33,7 @@
/**
* 鏌ヨ鏉ヨ浜哄憳鍒楄〃
*/
- public void findVisitorList(String pageNum, String name, final boolean isClear) {
+ public void findSupervisoryBottomList(String pageNum, String name, final boolean isClear) {
//id锛屽悕绉帮紝澶村儚璺緞锛岃仈绯荤數璇濓紝鍏徃鍚嶇О锛岃瘉浠剁紪鍙�
RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.CheckInQuery);
params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId());
@@ -47,7 +48,7 @@
/**
* 鏌ヨ鏉ヨ浜哄憳鍒楄〃
*/
- public void findVisitorList() {
+ public void findSupervisoryBottomList() {
//id锛屽悕绉帮紝澶村儚璺緞锛岃仈绯荤數璇濓紝鍏徃鍚嶇О锛岃瘉浠剁紪鍙�
RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.CheckInQuery);
params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId());
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
new file mode 100644
index 0000000..d6d7a54
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SupervisoryMng.java
@@ -0,0 +1,20 @@
+package cn.com.basic.face.service;
+
+/**
+ * Created by xiuxi on 2017/3/31.
+ */
+
+public class SupervisoryMng {
+
+ private static SupervisoryMng instance = new SupervisoryMng();
+
+ public static SupervisoryMng getInstance() {
+ return instance;
+ }
+
+ public void findSupervisoryBottomList() {
+
+
+
+ }
+}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java
index 324a013..2bf48cd 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java
@@ -5,5 +5,17 @@
*/
public class Constant {
- public static final int INTERVIEWEE_ROW = 1, VISITOR_ROW = 2;
+
+ public static class CheckIn {
+ /*鏉ヨ鐧昏宸﹁竟琚鑰呭垪琛ㄨ绫诲瀷*/
+ public static final int INTERVIEWEE_ROW = 1;
+ /*鏉ヨ鐧昏宸﹁竟琚鑰呭垪琛ㄨ绫诲瀷*/
+ public static final int VISITOR_ROW = 2;
+ }
+
+ public static class Supervisory {
+ public static final int VISIT_REGISTER_CELL = 1;
+ public static final int VISIT_CHECK_IN_CELL = 2;
+ }
+
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInLeftListView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInLeftListView.java
index ee84d50..3ee48aa 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInLeftListView.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/CheckInLeftListView.java
@@ -13,7 +13,7 @@
public class CheckInLeftListView extends EasyRecyclerView {
- CheckInLeftListViewAdapter mAdapter;
+ private CheckInLeftListViewAdapter mAdapter;
private List list = new ArrayList();
public void setAdapter(Context context) {
@@ -38,8 +38,12 @@
}
public void show(List list, boolean isVisitorList) {
+ mAdapter.setRowType(isVisitorList? Constant.CheckIn.VISITOR_ROW:Constant.CheckIn.INTERVIEWEE_ROW);
+ refresh();
+ }
+
+ public void refresh() {
this.list.clear();
- mAdapter.setRowType(isVisitorList? Constant.VISITOR_ROW:Constant.INTERVIEWEE_ROW);
this.list.addAll(list);
mAdapter.setList(this.list);
this.setAdapter(mAdapter);
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
new file mode 100644
index 0000000..c9b1494
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/SupervisoryBottomListView.java
@@ -0,0 +1,57 @@
+package cn.com.basic.face.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import com.camnter.easyrecyclerview.widget.EasyRecyclerView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import cn.com.basic.face.adapter.CheckInLeftListViewAdapter;
+import cn.com.basic.face.adapter.SupervisoryBottomListViewAdapter;
+import cn.com.basic.face.util.Constant;
+
+/**
+ * Created by xiuxi on 2017/3/31.
+ */
+
+public class SupervisoryBottomListView extends EasyRecyclerView {
+
+ private SupervisoryBottomListViewAdapter mAdapter;
+ private List list = new ArrayList();
+
+ public void setAdapter(Context context) {
+ mAdapter = new SupervisoryBottomListViewAdapter(context);
+ mAdapter.setList(list);
+ setAdapter(mAdapter);
+ }
+
+ public SupervisoryBottomListView(Context context) {
+ super(context);
+ setAdapter(context);
+ }
+
+ public SupervisoryBottomListView(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ setAdapter(context);
+ }
+
+ public SupervisoryBottomListView(Context context, AttributeSet attrs, int defStyle) {
+ super(context, attrs, defStyle);
+ setAdapter(context);
+ }
+
+ public void show(List list, boolean isVisitorList) {
+ mAdapter.setRowType(isVisitorList? Constant.CheckIn.VISITOR_ROW:Constant.CheckIn.INTERVIEWEE_ROW);
+ refresh();
+ }
+
+ public void refresh() {
+ this.list.clear();
+ this.list.addAll(list);
+ mAdapter.setList(this.list);
+ this.setAdapter(mAdapter);
+ }
+
+}
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 7301580..cb3a482 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory.xml
@@ -37,7 +37,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
>
- <SurfaceView
+ <VideoView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/fragment_supervisory_enter_camera" />
@@ -73,8 +73,7 @@
android:layout_weight="1"
android:layout_marginLeft="2dp"
>
- <!--<com.bsk.zhangbo.demoforbsk.widget.MyGLSurfaceView-->
- <SurfaceView
+ <VideoView
android:id="@+id/fragment_supervisory_exit_camera"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory_bottom_visitor_cell.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory_bottom_visitor_cell.xml
index e9f0e48..a9eb579 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory_bottom_visitor_cell.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_supervisory_bottom_visitor_cell.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-android:id="@+id/item_user_base"
+android:id="@+id/fragment_supervisory_bottom_visitor_cell_relative_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
--
Gitblit v1.8.0