From 46a8044f3449c6e9a884c90477ada5a5e6879367 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 01 八月 2017 17:37:39 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 99 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 71 insertions(+), 28 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 700c907..c15e972 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,19 +1,18 @@
package cn.com.basic.face.fragment;
+import android.app.AlarmManager;
import android.content.Context;
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.ProgressBar;
+import android.widget.LinearLayout;
import android.widget.RadioButton;
import android.widget.RadioGroup;
+import android.widget.RelativeLayout;
import android.widget.TextView;
import com.bsk.zhangbo.demoforbsk.R;
@@ -26,17 +25,14 @@
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;
@@ -64,6 +60,13 @@
private TextView fragment_surveillance_enter_timer;
@ViewInject(R.id.fragment_surveillance_exit_timer)
private TextView fragment_surveillance_exit_timer;
+ @ViewInject(R.id.fragment_supervisory_exit_camera_relative_layout)
+ 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;
@@ -84,8 +87,40 @@
} else {
useNative = true;
}
+ if (CommonVariables.FACE_SERVER) {
+ useNative = false;
+ }
//useNative = false;
+ if (CommonVariables.EMULATOR) {
+ useNative = false;
+ }
if (useNative) {
+ try{
+ Calendar c = Calendar.getInstance();
+ c.set(2017, 4, 1, 12, 34, 56);
+ AlarmManager am = (AlarmManager) MainActivity.getInstance().getSystemService(Context.ALARM_SERVICE);
+
+ am.setTime(c.getTimeInMillis());
+ Process su = Runtime.getRuntime().exec("su");
+ DataOutputStream outputStream = new DataOutputStream(su.getOutputStream());
+
+ //outputStream.writeBytes("busybox ifconfig wlan0 down\n");
+ //outputStream.flush();
+ //Thread.sleep(5000);
+// outputStream.writeBytes("busybox ifconfig wlan0 hw ether f4:8b:32:62:4f:89\n");
+// outputStream.flush();
+
+ //outputStream.writeBytes("exit\n");
+ //outputStream.flush();
+ //su.waitFor();
+ /*
+ busybox ifconfig wlan0 hw ether AC:83:F3:42:19:CE
+
+
+ */
+ }catch(Exception e){
+ e.printStackTrace();
+ }
System.loadLibrary("cvface_api");
System.loadLibrary("opencv_java3");
System.loadLibrary("protobuf-lite");
@@ -102,32 +137,23 @@
for (Enumeration<InetAddress> enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements();) {
InetAddress inetAddress = enumIpAddr.nextElement();
if (!inetAddress.isLoopbackAddress()) {
- ipAddress = inetAddress.getHostAddress().toString();
+ String ip1 = inetAddress.getHostAddress().toString();
+ if (ip1.contains("192.")) {
+ ipAddress = ip1;
+ }
}
}
}
} catch (SocketException ex) {}
- try{
-
- Process su = Runtime.getRuntime().exec("su");
- DataOutputStream outputStream = new DataOutputStream(su.getOutputStream());
-
- //outputStream.writeBytes("busybox ifconfig wlan0 down\n");
- //outputStream.flush();
- //Thread.sleep(5000);
- outputStream.writeBytes("busybox ifconfig wlan0 hw ether f4:8b:32:62:4f:89\n");
- outputStream.flush();
-
- outputStream.writeBytes("exit\n");
- outputStream.flush();
- su.waitFor();
- }catch(Exception e){
- e.printStackTrace();
- }
// outputStream.writeBytes("busybox ifconfig wlan0 hw ether 00:e0:2c:31:1a:ba\n");
- RtspFaceNative.setLocalIP("192.168.1.53");
+ /*
+sysctl kernel.sched_is_big_little=1
+sysctl net.core.rmem_max=40000000
+ */
+ RtspFaceNative.setLocalIP(ipAddress);
+ System.out.println("ipaddr="+ipAddress);
}
}
@@ -152,8 +178,17 @@
@Override
protected void initViews(View view, Bundle savedInstanceState) {
+ 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) {
+ 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());
@@ -175,7 +210,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");
}
@@ -211,6 +253,7 @@
// reloadBottomList();
}
});
+ setupUI(getView());
}
@Override
--
Gitblit v1.8.0