From 4f40d5eea0b9ecefa80632c53d2c6e7f5cc6c35a Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 24 七月 2017 13:25:47 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 5ad2dde..0fb724f 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
@@ -69,6 +69,7 @@
params.addBodyParameter(Device.FieldNames.sn, authorationId);
params.addBodyParameter(Device.FieldNames.type, CommonVariables.DeviceType.ANDROID_DEVICE);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
public void success() {
loadAfterReturn(getList(Device.class));
@@ -98,6 +99,7 @@
RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY);
params.addBodyParameter(Device.FieldNames.belongId, device.getBelongId());
params.addBodyParameter(Device.FieldNames.type, CommonVariables.DeviceType.CAMERA1);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<Device> devices = resultBean.getList(Device.class);
@@ -112,6 +114,7 @@
params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY);
params.addBodyParameter(Device.FieldNames.belongId, device.getBelongId());
params.addBodyParameter(Device.FieldNames.type, CommonVariables.DeviceType.CAMERA2);
+ params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<Device> devices = resultBean.getList(Device.class);
@@ -217,7 +220,9 @@
// 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.132:554/h264/ch1/sub/av_stream";
+// return "rtsp://admin:a1234567@192.168.1.132:554/h264/ch1/sub/av_stream";
+ return "rtsp://admin:admin12345@192.168.1.202:554/h264/ch1/main/av_stream";
+// return "rtsp://admin:a1234567@192.168.1.132:554/h264/ch1/main/av_stream";
}
public String getCamera2Address() {
@@ -243,7 +248,10 @@
//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/sub/av_stream";
+// return "rtsp://admin:a1234567@192.168.1.69:554/h264/ch1/sub/av_stream";
+// return "rtsp://Admin:1234@192.168.1.22/h264";
+ return "rtsp://admin:a1234567@192.168.1.201:554/h264/ch1/main/av_stream";
}
+
}
--
Gitblit v1.8.0