From d6119c2d7fe2f802dd224d77bf2d95eeeedb4526 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 10 七月 2017 16:08:15 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 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..7fb2382 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
@@ -14,6 +14,7 @@
import android.widget.ProgressBar;
import android.widget.RadioButton;
import android.widget.RadioGroup;
+import android.widget.RelativeLayout;
import android.widget.TextView;
import com.bsk.zhangbo.demoforbsk.R;
@@ -64,6 +65,10 @@
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;
static boolean useNative = false;
@@ -84,6 +89,9 @@
} else {
useNative = true;
}
+ if (CommonVariables.FACE_SERVER) {
+ useNative = false;
+ }
//useNative = false;
if (useNative) {
System.loadLibrary("cvface_api");
@@ -102,32 +110,38 @@
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());
+ //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("busybox ifconfig wlan0 hw ether f4:8b:32:62:4f:89\n");
+// outputStream.flush();
- outputStream.writeBytes("exit\n");
- outputStream.flush();
- su.waitFor();
+ //outputStream.writeBytes("exit\n");
+ //outputStream.flush();
+ //su.waitFor();
+ /*
+ busybox ifconfig wlan0 hw ether AC:83:F3:42:19:CE
+
+
+ */
}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");
+ RtspFaceNative.setLocalIP(ipAddress);
}
}
@@ -152,6 +166,11 @@
@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_enter_camera.getHolder().addCallback(new SurfaceHolder.Callback() {
public void surfaceCreated(SurfaceHolder holder) {
if (useNative) {
--
Gitblit v1.8.0