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 | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 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 27e284a..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,5 +1,7 @@
package cn.com.basic.face.fragment;
+import android.graphics.ImageFormat;
+import android.media.ImageReader;
import android.os.Build;
import android.os.Bundle;
import android.view.SurfaceView;
@@ -13,6 +15,7 @@
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;
@@ -48,7 +51,7 @@
@ViewInject(R.id.fragment_surveillance_exit_timer)
private TextView fragment_surveillance_exit_timer;
- static boolean useNative = true;
+ static boolean useNative = false;
public static boolean isEmulator() {
return Build.FINGERPRINT.startsWith("generic")
@@ -77,6 +80,7 @@
RtspFaceNative.init();
// RtspFaceNative.setLocalIP("192.168.1.10");
RtspFaceNative.setLocalIP("192.168.1.106");//鑷繁鎵嬫満ip
+// RtspFaceNative.setLocalIP("192.168.1.203");
}
}
@@ -110,8 +114,8 @@
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:a1234567@192.168.1.68:554/h264/ch1/sub/av_stream");
+ 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");
}
@@ -124,21 +128,23 @@
}
try {
final SimpleDateFormat sdf = new SimpleDateFormat("yyyy骞碝M鏈坉d鏃� HH锛歮m锛歴s鍒�");
- while (true) {
- Thread.sleep(1000);
- MainActivity.getInstance().runOnUiThread(new Runnable() {
- @Override
- public void run() {
- fragment_surveillance_enter_timer.setText(sdf.format(new Date()));
- fragment_surveillance_exit_timer.setText(sdf.format(new Date()));
- }
- });
- }
- } catch (InterruptedException e) {
+// while (true) {
+// Thread.sleep(1000);
+// MainActivity.getInstance().runOnUiThread(new Runnable() {
+// @Override
+// public void run() {
+// fragment_surveillance_enter_timer.setText(sdf.format(new Date()));
+// fragment_surveillance_exit_timer.setText(sdf.format(new Date()));
+// }
+// });
+// }
+ } catch (Exception e) {
+ e.printStackTrace();
}
}
}).start();
reloadBottomList();
+ new SurveillanceMng.SurveillanceListThread().start();
}
@OnClick(R.id.fragment_supervisory_bottom_visitor_radio_button)
--
Gitblit v1.8.0