From f43fddb41da955629c292f83529c47d84bc33426 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 13 四月 2017 14:08:13 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 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 5fa8acb..1b90897 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
@@ -10,17 +10,12 @@
import cn.com.basic.face.base.BaseFragment;
-import com.bsk.zhangbo.demoforbsk.util.RtspFaceNative;
+import cn.com.basic.face.util.RtspFaceNative;
-import cn.com.basic.face.service.SurvalanceMng;
+import cn.com.basic.face.service.SurveillanceMng;
import cn.com.basic.face.widget.surveilance.SurveillanceBottomListView;
import com.lidroid.xutils.view.annotation.ViewInject;
-
-
-/**
- * Created by zhangbo on 2017/2/15.
- */
public class SurveillanceFragment extends BaseFragment {
@@ -45,6 +40,11 @@
static {
if (useNative) {
+ System.loadLibrary("cvface_api");
+ System.loadLibrary("opencv_java3");
+ System.loadLibrary("protobuf-lite");
+ System.loadLibrary("protobuf");
+ System.loadLibrary("protoc");
System.loadLibrary("rtspface");
RtspFaceNative.init();
}
@@ -78,16 +78,11 @@
Thread.sleep(2000);
if (useNative) {
RtspFaceNative.setSurface(1, fragment_supervisory_enter_camera.getHolder().getSurface());
- RtspFaceNative.setSurface(2, fragment_supervisory_exit_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.createPlayer(2, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/sub/av_stream");
+ RtspFaceNative.setFaceCallback(1, "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
} 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();
@@ -120,7 +115,7 @@
}
private void reloadBottomList() {
- SurvalanceMng.getInstance().findSupervisoryBottomList(fragment_supervisory_bottom_visitor_radio_button.isChecked());
+ SurveillanceMng.getInstance().findSurveillanceBottomList(fragment_supervisory_bottom_visitor_radio_button.isChecked());
}
}
--
Gitblit v1.8.0