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/fragment/SupervisoryFragment.java | 74 ++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 29 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 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);
}
--
Gitblit v1.8.0