From d343b71cd89f59a87e85c46ce7a04d47c357462d Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 七月 2017 15:46:45 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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 57d534e..c8a4d1d 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
@@ -21,9 +21,12 @@
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.entity.Device;
import cn.com.basic.face.util.SharedPreferencesUtils;
+import cn.com.basic.face.util.SyncUpAndDownThread;
public class DeviceMng {
public static DeviceMng instance = new DeviceMng();
+
+ private SyncUpAndDownThread syncUpAndDownThread = null;
public static String authorationId = "101";
@@ -69,6 +72,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 +102,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 +117,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);
@@ -138,6 +144,12 @@
}
}
});
+ synchronized (this) {
+ if (syncUpAndDownThread == null) {
+ syncUpAndDownThread = new SyncUpAndDownThread();
+ syncUpAndDownThread.start();
+ }
+ }
} else {
Toast.makeText(BaseApplication.getInstance(), "鏁版嵁搴撲腑鎵句笉鍒拌璁惧", Toast.LENGTH_SHORT).show();
}
@@ -195,7 +207,7 @@
return sharedPreferences.getString(key, "");
}
- public String getCamera1Address() {
+ public String getCamera2Address() {
String username = "admin";
String password = "admin12345";
String ip = "192.168.1.70";
@@ -217,11 +229,12 @@
// 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() {
+ public String getCamera1Address() {
String username = "admin";
String password = "a1234567";
String ip = "192.168.1.68";
@@ -245,7 +258,8 @@
//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:1234@192.168.1.22/h264";
+// 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