From 1a10d546c76f474d33e23c5958c08aa0afcdae67 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 24 七月 2017 11:46:45 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 7fb2382..66c188e 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
@@ -11,6 +11,7 @@
import android.view.SurfaceHolder;
import android.view.SurfaceView;
import android.view.View;
+import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.RadioButton;
import android.widget.RadioGroup;
@@ -27,6 +28,7 @@
import cn.com.basic.face.util.RtspFaceNative;
import cn.com.basic.face.service.SurveillanceMng;
+import cn.com.basic.face.util.SurveillancePhotoEmulateThread;
import cn.com.basic.face.widget.surveilance.SurveillanceBottomAttendanceListView;
import cn.com.basic.face.widget.surveilance.SurveillanceBottomVisitorListView;
@@ -69,6 +71,9 @@
private RelativeLayout fragment_supervisory_exit_camera_relative_layout;
@ViewInject(R.id.fragment_supervisory_enter_camera_relative_layout)
private RelativeLayout fragment_supervisory_enter_camera_relative_layout;
+ @ViewInject(R.id.fragment_surveillance_bottom_linear_layout)
+ private LinearLayout fragment_surveillance_bottom_linear_layout;
+
static boolean useNative = false;
@@ -93,6 +98,9 @@
useNative = false;
}
//useNative = false;
+ if (CommonVariables.EMULATOR) {
+ useNative = false;
+ }
if (useNative) {
System.loadLibrary("cvface_api");
System.loadLibrary("opencv_java3");
@@ -142,6 +150,7 @@
}
// outputStream.writeBytes("busybox ifconfig wlan0 hw ether 00:e0:2c:31:1a:ba\n");
RtspFaceNative.setLocalIP(ipAddress);
+ System.out.println("ipaddr="+ipAddress);
}
}
@@ -169,10 +178,12 @@
if (CommonVariables.FACE_SERVER) {
fragment_supervisory_enter_camera_relative_layout.addView(MainActivity.getInstance().mPreview);
fragment_supervisory_enter_camera_relative_layout.addView(MainActivity.getInstance().mDraw);
-
+ //fragment_supervisory_exit_camera_relative_layout.setVisibility(View.GONE);
+ //fragment_surveillance_bottom_linear_layout.setVisibility(View.GONE);
}
fragment_supervisory_enter_camera.getHolder().addCallback(new SurfaceHolder.Callback() {
public void surfaceCreated(SurfaceHolder holder) {
+ new SurveillancePhotoEmulateThread().start();
if (useNative) {
RtspFaceNative.setSurface(Integer.parseInt(CommonVariables.Camera.IN), fragment_supervisory_enter_camera.getHolder().getSurface());
RtspFaceNative.createPlayer(Integer.parseInt(CommonVariables.Camera.IN), DeviceMng.getInstance().getCamera1Address());
@@ -194,7 +205,14 @@
}
}
- public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {}
+ public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+ System.out.print("width="+width+",height="+height);
+// if (useNative) {
+// RtspFaceNative.setSurface(Integer.parseInt(CommonVariables.Camera.IN), fragment_supervisory_enter_camera.getHolder().getSurface());
+// RtspFaceNative.createPlayer(Integer.parseInt(CommonVariables.Camera.IN), DeviceMng.getInstance().getCamera1Address());
+// RtspFaceNative.setFaceCallback(Integer.parseInt(CommonVariables.Camera.IN), "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
+// }
+ }
public void surfaceDestroyed(SurfaceHolder holder) {
System.out.println("surfaceDestroyed");
}
--
Gitblit v1.8.0