From b83bcaf7db50cbba5e7509649bcb7d1cd3afb27f Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 09 五月 2017 10:04:10 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 5 +++--
2 files changed, 50 insertions(+), 2 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 27e284a..7d95cab 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
@@ -13,6 +13,7 @@
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;
@@ -110,8 +111,8 @@
public void run() {
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.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");
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
index 43e2be7..6c64ea4 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
@@ -95,4 +95,51 @@
public String get(SharedPreferences sharedPreferences, String key) {
return sharedPreferences.getString(key, "");
}
+
+ public String getCamera1Address() {
+ String username = "admin";
+ String password = "admin12345";
+ String ip = "192.168.1.70";
+ String port = "554";
+
+ SharedPreferences camera1 = DeviceMng.getInstance().loadSharedPreferences(CommonVariables.DeviceSharedPreferences.CAMERA1);
+ if (!"".equals(camera1.getString("fragment_device_right_camera1_username", ""))) {
+ username = camera1.getString("fragment_device_right_camera1_username", "");
+ }
+ if (!"".equals(camera1.getString("fragment_device_right_camera1_password", ""))) {
+ password = camera1.getString("fragment_device_right_camera1_password", "");
+ }
+ if (!"".equals(camera1.getString("fragment_device_right_camera1_ip", ""))) {
+ ip = camera1.getString("fragment_device_right_camera1_ip", "");
+ }
+ if (!"".equals(camera1.getString("fragment_device_right_camera1_port", ""))) {
+ port = camera1.getString("fragment_device_right_camera1_port", "");
+ }
+
+ return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/sub/av_stream";
+ }
+
+ public String getCamera2Address() {
+ String username = "admin";
+ String password = "a1234567";
+ String ip = "192.168.1.68";
+ String port = "554";
+
+ SharedPreferences camera1 = DeviceMng.getInstance().loadSharedPreferences(CommonVariables.DeviceSharedPreferences.CAMERA2);
+ if (!"".equals(camera1.getString("fragment_device_right_camera1_username", ""))) {
+ username = camera1.getString("fragment_device_right_camera1_username", "");
+ }
+ if (!"".equals(camera1.getString("fragment_device_right_camera1_password", ""))) {
+ password = camera1.getString("fragment_device_right_camera1_password", "");
+ }
+ if (!"".equals(camera1.getString("fragment_device_right_camera1_ip", ""))) {
+ ip = camera1.getString("fragment_device_right_camera1_ip", "");
+ }
+ if (!"".equals(camera1.getString("fragment_device_right_camera1_port", ""))) {
+ port = camera1.getString("fragment_device_right_camera1_port", "");
+ }
+
+ return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/sub/av_stream";
+ }
+
}
--
Gitblit v1.8.0