From 3a5f09c61a87adb8dba2cc4a5366893886ba1c1d Mon Sep 17 00:00:00 2001
From: dupengyue <dupengyue@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 20 七月 2017 17:31:40 +0800
Subject: [PATCH] 接口初步完成
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 149 +++++++++++++++++++++++++------------------------
1 files changed, 75 insertions(+), 74 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 29a8f55..0ed7ded 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,13 +4,18 @@
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;
import android.widget.TextView;
import com.bsk.zhangbo.demoforbsk.R;
@@ -31,12 +36,13 @@
import com.lidroid.xutils.view.annotation.event.OnClick;
import java.io.BufferedReader;
+import java.io.DataOutputStream;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.text.SimpleDateFormat;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.*;
public class SurveillanceFragment extends BaseFragment {
@@ -60,6 +66,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;
@@ -80,6 +93,13 @@
} else {
useNative = true;
}
+ if (CommonVariables.FACE_SERVER) {
+ useNative = false;
+ }
+ //useNative = false;
+ if (CommonVariables.EMULATOR) {
+ useNative = false;
+ }
if (useNative) {
System.loadLibrary("cvface_api");
System.loadLibrary("opencv_java3");
@@ -88,13 +108,47 @@
System.loadLibrary("protoc");
System.loadLibrary("rtspface");
RtspFaceNative.init();
-// RtspFaceNative.setLocalIP("192.168.1.10");
-// RtspFaceNative.setLocalIP("192.168.1.106");//鑷繁鎵嬫満ip
-// RtspFaceNative.setLocalIP("192.168.1.203");
-// RtspFaceNative.setLocalIP("192.168.1.205");
WifiManager wm = (WifiManager) MainActivity.getInstance().getSystemService(Context.WIFI_SERVICE);
String ip = Formatter.formatIpAddress(wm.getConnectionInfo().getIpAddress());
- RtspFaceNative.setLocalIP(ip);
+ String ipAddress = null;
+ try {
+ for (Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements();) {
+ NetworkInterface intf = en.nextElement();
+ for (Enumeration<InetAddress> enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements();) {
+ InetAddress inetAddress = enumIpAddr.nextElement();
+ if (!inetAddress.isLoopbackAddress()) {
+ 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();
+ /*
+ 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(ipAddress);
}
}
@@ -119,6 +173,12 @@
@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 (useNative) {
@@ -129,7 +189,9 @@
}
public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {}
- public void surfaceDestroyed(SurfaceHolder holder) {}
+ public void surfaceDestroyed(SurfaceHolder holder) {
+ System.out.println("surfaceDestroyed");
+ }
});
fragment_supervisory_exit_camera.getHolder().addCallback(new SurfaceHolder.Callback() {
public void surfaceCreated(SurfaceHolder holder) {
@@ -141,71 +203,10 @@
}
public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {}
- public void surfaceDestroyed(SurfaceHolder holder) {}
+ public void surfaceDestroyed(SurfaceHolder holder) {
+ System.out.println("surfaceDestroyed");
+ }
});
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// try {
-// if (useNative) {
-// MainActivity.getInstance().runOnUiThread(new Runnable() {
-// public void run() {
-// try {
-//// File file2 = MainActivity.getInstance().getExternalFilesDir(null);
-//// File[] files = file2.listFiles();
-//// for (File file : files) {
-//// System.out.println(file.getAbsolutePath());
-//// }
-//// String s1 = getStringFromFile("/sdcard/license.lic");
-//// String str = convertStreamToString(MainActivity.getInstance().getAssets().open("license.lic"));
-//// RtspFaceNative.dbgSetStfaceLicense(str);
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-//
-// }
-// public String convertStreamToString(InputStream is) throws Exception {
-// BufferedReader reader = new BufferedReader(new InputStreamReader(is));
-// StringBuilder sb = new StringBuilder();
-// String line = null;
-// while ((line = reader.readLine()) != null) {
-// sb.append(line).append("\n");
-// }
-// reader.close();
-// return sb.toString();
-// }
-// public String getStringFromFile (String filePath) throws Exception {
-// File fl = new File(filePath);
-// FileInputStream fin = new FileInputStream(fl);
-// String ret = convertStreamToString(fin);
-// //Make sure you close all streams.
-// fin.close();
-// return ret;
-// }
-// });
-//
-// } else {
-// }
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// try {
-// final SimpleDateFormat sdf = new SimpleDateFormat("yyyy骞碝M鏈坉d鏃� HH锛歮m锛歴s鍒�");
-//// while (true) {
-//// Thread.sleep(1000);
-//// MainActivity.getInstance().runOnUiThread(new Runnable() {
-//// @Override
-//// public void run() {
-//// fragment_surveillance_enter_timer.setText(sdf.format(new Date()));
-//// fragment_surveillance_exit_timer.setText(sdf.format(new Date()));
-//// }
-//// });
-//// }
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// }
-// }).start();
new SurveillanceMng.SurveillanceListThread().start();
}
--
Gitblit v1.8.0