From 88886b3c3d0b87f755ca7660dea1465c6042e3cc Mon Sep 17 00:00:00 2001 From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674> Date: 星期五, 28 七月 2017 09:44:00 +0800 Subject: [PATCH] Failed commit: Default --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 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 871329f..6231b7e 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 @@ -4,15 +4,11 @@ import android.net.wifi.WifiManager; import android.os.Build; import android.os.Bundle; -import android.os.Environment; -import android.os.SystemClock; import android.text.format.Formatter; -import android.util.Log; 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; import android.widget.RelativeLayout; @@ -28,17 +24,13 @@ import cn.com.basic.face.util.RtspFaceNative; import cn.com.basic.face.service.SurveillanceMng; +import cn.com.basic.face.thread.SurveillancePhotoEmulateThread; import cn.com.basic.face.widget.surveilance.SurveillanceBottomAttendanceListView; import cn.com.basic.face.widget.surveilance.SurveillanceBottomVisitorListView; -import com.facebook.common.file.FileUtils; import com.lidroid.xutils.view.annotation.ViewInject; import com.lidroid.xutils.view.annotation.event.OnClick; -import java.io.BufferedReader; -import java.io.DataOutputStream; -import java.io.File; -import java.io.FileReader; import java.net.InetAddress; import java.net.NetworkInterface; import java.net.SocketException; @@ -97,6 +89,9 @@ useNative = false; } //useNative = false; + if (CommonVariables.EMULATOR) { + useNative = false; + } if (useNative) { System.loadLibrary("cvface_api"); System.loadLibrary("opencv_java3"); @@ -145,7 +140,12 @@ e.printStackTrace(); } // outputStream.writeBytes("busybox ifconfig wlan0 hw ether 00:e0:2c:31:1a:ba\n"); + /* +sysctl kernel.sched_is_big_little=1 +sysctl net.core.rmem_max=40000000 + */ RtspFaceNative.setLocalIP(ipAddress); + System.out.println("ipaddr="+ipAddress); } } @@ -178,6 +178,9 @@ } fragment_supervisory_enter_camera.getHolder().addCallback(new SurfaceHolder.Callback() { public void surfaceCreated(SurfaceHolder holder) { + if (CommonVariables.EMULATOR) { + 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()); @@ -199,7 +202,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