From 015d93f76b446e3ec3c0dbcc582b77f9e4694ff8 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 07 七月 2017 11:32:30 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 83d99d9..ebb95a2 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
@@ -62,6 +62,7 @@
// return;
// }
RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY);
+
params.addBodyParameter(Device.FieldNames.sn, authorationId);
params.addBodyParameter(Device.FieldNames.type, CommonVariables.DeviceType.ANDROID_DEVICE);
x.http().post(params, new BaseCommonCallBack() {
@@ -188,7 +189,10 @@
// 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/sub/av_stream";
+// return "rtsp://Admin:1234@192.168.1.22/h264";
+ return "rtsp://admin:a1234567@192.168.1.68:554/h264/ch1/main/av_stream";
+
}
public String getCamera2Address() {
@@ -207,11 +211,14 @@
// 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", ""))) {
+// 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/sub/av_stream";
+// return "rtsp://admin:a1234567@192.168.1.68:554/h264/ch1/main/av_stream";
+ return "rtsp://admin:a1234567@192.168.1.69:554/h264/ch1/main/av_stream";
}
}
--
Gitblit v1.8.0