From 9a4f30159d1f1a6007e326da5633581d635a69b2 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 12 五月 2017 18:33:27 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 91 ++++++++++++++++++++++++++++++++-------------
1 files changed, 65 insertions(+), 26 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 c21a759..8b8fa40 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,7 +1,10 @@
package cn.com.basic.face.fragment;
+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;
@@ -13,17 +16,24 @@
import cn.com.basic.face.base.BaseFragment;
import cn.com.basic.face.base.MainActivity;
+import cn.com.basic.face.service.DeviceMng;
import cn.com.basic.face.util.RtspFaceNative;
import cn.com.basic.face.service.SurveillanceMng;
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.File;
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.text.SimpleDateFormat;
-import java.util.Date;
public class SurveillanceFragment extends BaseFragment {
@@ -48,7 +58,7 @@
@ViewInject(R.id.fragment_surveillance_exit_timer)
private TextView fragment_surveillance_exit_timer;
- static boolean useNative = true;
+ static boolean useNative = false;
public static boolean isEmulator() {
return Build.FINGERPRINT.startsWith("generic")
@@ -76,7 +86,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);
}
}
@@ -108,12 +123,42 @@
if (useNative) {
MainActivity.getInstance().runOnUiThread(new Runnable() {
public void run() {
-// RtspFaceNative.setSurface(1, fragment_supervisory_enter_camera.getHolder().getSurface());
+ 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();
+ }
+ RtspFaceNative.setSurface(1, fragment_supervisory_enter_camera.getHolder().getSurface());
RtspFaceNative.setSurface(2, fragment_supervisory_exit_camera.getHolder().getSurface());
-// RtspFaceNative.createPlayer(1, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/sub/av_stream");
- RtspFaceNative.createPlayer(2, "rtsp://admin:a1234567@192.168.1.68:554/h264/ch1/sub/av_stream");
-// RtspFaceNative.setFaceCallback(1, "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
+ RtspFaceNative.createPlayer(1, DeviceMng.getInstance().getCamera1Address());
+ RtspFaceNative.createPlayer(2, DeviceMng.getInstance().getCamera2Address());
+ RtspFaceNative.setFaceCallback(1, "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
RtspFaceNative.setFaceCallback(2, "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
+ }
+ 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;
}
});
@@ -124,21 +169,22 @@
}
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();
- reloadBottomList();
+ new SurveillanceMng.SurveillanceListThread().start();
}
@OnClick(R.id.fragment_supervisory_bottom_visitor_radio_button)
@@ -147,7 +193,6 @@
fragment_supervisory_bottom_visit_list_view.setVisibility(fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
fragment_supervisory_bottom_attendance_background.setVisibility(!fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
fragment_supervisory_bottom_attendance_list_view.setVisibility(!fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
- reloadBottomList();
}
@OnClick(R.id.fragment_supervisory_bottom_attendance_radio_button)
@@ -156,7 +201,6 @@
fragment_supervisory_bottom_visit_list_view.setVisibility(fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
fragment_supervisory_bottom_attendance_background.setVisibility(!fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
fragment_supervisory_bottom_attendance_list_view.setVisibility(!fragment_supervisory_bottom_visitor_radio_button.isChecked()?View.VISIBLE:View.GONE);
- reloadBottomList();
}
@Override
@@ -177,12 +221,7 @@
public void setMenuVisibility(boolean menuVisible) {
super.setMenuVisibility(menuVisible);
if (menuVisible && fragment_supervisory_bottom_visit_list_view != null) {
- //reloadBottomList();
}
- }
-
- private void reloadBottomList() {
- SurveillanceMng.getInstance().findSurveillanceBottomList(fragment_supervisory_bottom_visitor_radio_button.isChecked());
}
}
--
Gitblit v1.8.0