From 109ffe9a777658936a38d0c146579a67c60a0d17 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 11 五月 2017 17:48:48 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 86 ++++++++++++++++++++++++++++++++-----------
1 files changed, 64 insertions(+), 22 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
index 531f48b..9cf5964 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
@@ -1,26 +1,29 @@
package cn.com.basic.face.fragment;
-import android.graphics.Bitmap;
+import android.graphics.ImageFormat;
+import android.media.ImageReader;
+import android.os.Build;
import android.os.Bundle;
-import android.view.Surface;
import android.view.SurfaceView;
import android.view.View;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.TextView;
-import android.widget.VideoView;
import com.bsk.zhangbo.demoforbsk.R;
import cn.com.basic.face.base.BaseFragment;
import cn.com.basic.face.base.MainActivity;
+import cn.com.basic.face.service.DeviceMng;
import cn.com.basic.face.util.RtspFaceNative;
import cn.com.basic.face.service.SurveillanceMng;
-import cn.com.basic.face.widget.surveilance.SurveillanceBottomListView;
+import cn.com.basic.face.widget.surveilance.SurveillanceBottomAttendanceListView;
+import cn.com.basic.face.widget.surveilance.SurveillanceBottomVisitorListView;
import com.lidroid.xutils.view.annotation.ViewInject;
+import com.lidroid.xutils.view.annotation.event.OnClick;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -36,9 +39,9 @@
@ViewInject(R.id.fragment_supervisory_bottom_attendance_background)
private View fragment_supervisory_bottom_attendance_background;
@ViewInject(R.id.fragment_supervisory_bottom_visit_list_view)
- private SurveillanceBottomListView fragment_supervisory_bottom_visit_list_view;
+ private SurveillanceBottomVisitorListView fragment_supervisory_bottom_visit_list_view;
@ViewInject(R.id.fragment_supervisory_bottom_attendance_list_view)
- private SurveillanceBottomListView fragment_supervisory_bottom_attendance_list_view;
+ private SurveillanceBottomAttendanceListView fragment_supervisory_bottom_attendance_list_view;
@ViewInject(R.id.fragment_supervisory_enter_camera)
SurfaceView fragment_supervisory_enter_camera;
@ViewInject(R.id.fragment_supervisory_exit_camera)
@@ -50,7 +53,23 @@
static boolean useNative = false;
+ public static boolean isEmulator() {
+ return Build.FINGERPRINT.startsWith("generic")
+ || Build.FINGERPRINT.startsWith("unknown")
+ || Build.MODEL.contains("google_sdk")
+ || Build.MODEL.contains("Emulator")
+ || Build.MODEL.contains("Android SDK built for x86")
+ || Build.MANUFACTURER.contains("Genymotion")
+ || (Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic"))
+ || "google_sdk".equals(Build.PRODUCT);
+ }
+
static {
+ if (isEmulator()) {
+ useNative = false;
+ } else {
+ useNative = true;
+ }
if (useNative) {
System.loadLibrary("cvface_api");
System.loadLibrary("opencv_java3");
@@ -59,7 +78,9 @@
System.loadLibrary("protoc");
System.loadLibrary("rtspface");
RtspFaceNative.init();
- RtspFaceNative.setLocalIP("192.168.1.10");
+// RtspFaceNative.setLocalIP("192.168.1.10");
+ RtspFaceNative.setLocalIP("192.168.1.106");//鑷繁鎵嬫満ip
+// RtspFaceNative.setLocalIP("192.168.1.203");
}
}
@@ -69,12 +90,12 @@
return instance;
}
- public SurveillanceBottomListView get_fragment_supervisory_bottom_visit_list_view() {
+ public SurveillanceBottomVisitorListView get_fragment_supervisory_bottom_visitor_list_view() {
return fragment_supervisory_bottom_visit_list_view;
}
- public SurveillanceBottomListView get_fragment_supervisory_bottom_attendance_list_view() {
- return fragment_supervisory_bottom_visit_list_view;
+ public SurveillanceBottomAttendanceListView get_fragment_supervisory_bottom_attendance_list_view() {
+ return fragment_supervisory_bottom_attendance_list_view;
}
@Override
@@ -92,10 +113,11 @@
MainActivity.getInstance().runOnUiThread(new Runnable() {
public void run() {
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");
+ RtspFaceNative.setSurface(2, fragment_supervisory_exit_camera.getHolder().getSurface());
+ RtspFaceNative.createPlayer(1, DeviceMng.getInstance().getCamera1Address());
+ RtspFaceNative.createPlayer(2, DeviceMng.getInstance().getCamera2Address());
RtspFaceNative.setFaceCallback(1, "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
+ RtspFaceNative.setFaceCallback(2, "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
}
});
@@ -104,8 +126,8 @@
} catch (Exception e) {
e.printStackTrace();
}
-// try {
-// final SimpleDateFormat sdf = new SimpleDateFormat("yyyy骞碝M鏈坉d鏃� HH锛歮m锛歴s鍒�");
+ try {
+ final SimpleDateFormat sdf = new SimpleDateFormat("yyyy骞碝M鏈坉d鏃� HH锛歮m锛歴s鍒�");
// while (true) {
// Thread.sleep(1000);
// MainActivity.getInstance().runOnUiThread(new Runnable() {
@@ -116,10 +138,30 @@
// }
// });
// }
-// } catch (InterruptedException e) {
-// }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
}).start();
+ reloadBottomList();
+ new SurveillanceMng.SurveillanceListThread().start();
+ }
+
+ @OnClick(R.id.fragment_supervisory_bottom_visitor_radio_button)
+ public void fragment_supervisory_bottom_visitor_radio_button_click(View view) {
+ 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();
+ }
+
+ @OnClick(R.id.fragment_supervisory_bottom_attendance_radio_button)
+ public void fragment_supervisory_bottom_attendance_radio_button_click(View view) {
+ 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();
}
@@ -128,11 +170,11 @@
fragment_supervisory_bottom_left_radio_group.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(RadioGroup group, int checkedId) {
- 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();
+// 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();
}
});
}
--
Gitblit v1.8.0