From 75caa65bc18cb12b1b314a0641e01da962337359 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 12 五月 2017 15:23:45 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 56 ++++++++++++++++++++++++++++----------------------------
1 files changed, 28 insertions(+), 28 deletions(-)
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 6c64ea4..61376e0 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
@@ -102,21 +102,21 @@
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", "");
- }
+// 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";
+ return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/main/av_stream";
}
public String getCamera2Address() {
@@ -125,21 +125,21 @@
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", "");
- }
+// 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";
+ return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/h264/ch1/main/av_stream";
}
}
--
Gitblit v1.8.0