From db2c035c3406d310af30094ec2bbf55ab396bf83 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 01 八月 2017 18:25:46 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 297acfa..ce58361 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
@@ -233,6 +233,10 @@
String password = "admin12345";
String ip = "192.168.1.70";
String port = "554";
+ DeviceQueryItem camera2 = DeviceFragment.getInstance().getCamera2();
+ if (camera2 != null) {
+ return "rtsp://admin:admin12345@"+camera2.getIp()+":554/h264/ch1/main/av_stream";
+ }
return "rtsp://admin:admin12345@192.168.1.202:554/h264/ch1/main/av_stream";
}
@@ -241,6 +245,10 @@
String password = "a1234567";
String ip = "192.168.1.68";
String port = "554";
+ DeviceQueryItem camera1 = DeviceFragment.getInstance().getCamera1();
+ if (camera1 != null) {
+ return "rtsp://admin:admin12345@"+camera1.getIp()+":554/h264/ch1/main/av_stream";
+ }
return "rtsp://admin:a1234567@192.168.1.201:554/h264/ch1/main/av_stream";
}
--
Gitblit v1.8.0