From 9e051a7dae2301f66859808c1cb4b95990da7804 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 20 六月 2017 16:16:33 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java | 4 ++--
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 21 ++++++++++++---------
2 files changed, 14 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..849a21c 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
@@ -102,7 +102,10 @@
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;
+ }
}
}
}
@@ -110,24 +113,24 @@
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();
}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);
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java
index 00b0e18..854c8b7 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java
@@ -7,8 +7,8 @@
//public final static String BASE_URL = "http://192.168.1.137:8333/face/";
public final static String IMAGE_URL_BASE = "http://192.168.1.137:8888/";
- public final static String BASE_URL = "http://192.168.1.51/face/";
-// public final static String BASE_URL = "http://192.168.1.137:8333/face/";
+// public final static String BASE_URL = "http://192.168.1.51/face/";
+ public final static String BASE_URL = "http://192.168.1.137:8333/face/";
public static final String REGISTER_ADD = "Register/o_add.do";
--
Gitblit v1.8.0