From e1bcafb39828e18a3605d94aad20376484b56b26 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 12 五月 2017 10:07:00 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 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 2bbc917..4dc0da9 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,9 +1,10 @@
package cn.com.basic.face.fragment;
-import android.graphics.ImageFormat;
-import android.media.ImageReader;
+import android.content.Context;
+import android.net.wifi.WifiManager;
import android.os.Build;
import android.os.Bundle;
+import android.text.format.Formatter;
import android.view.SurfaceView;
import android.view.View;
import android.widget.RadioButton;
@@ -26,7 +27,6 @@
import com.lidroid.xutils.view.annotation.event.OnClick;
import java.text.SimpleDateFormat;
-import java.util.Date;
public class SurveillanceFragment extends BaseFragment {
@@ -65,7 +65,6 @@
}
static {
- ImageReader imageReader = ImageReader.newInstance(100, 100, ImageFormat.JPEG, 3);
if (isEmulator()) {
useNative = false;
} else {
@@ -80,8 +79,12 @@
System.loadLibrary("rtspface");
RtspFaceNative.init();
// RtspFaceNative.setLocalIP("192.168.1.10");
- RtspFaceNative.setLocalIP("192.168.1.106");//鑷繁鎵嬫満ip
+// 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);
}
}
@@ -129,17 +132,18 @@
}
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 (InterruptedException e) {
+// 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();
--
Gitblit v1.8.0