From ae5a02a4428be27d69c1fe8791ec83bce3827e80 Mon Sep 17 00:00:00 2001
From: chenke <chenke@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 09 八月 2017 13:07:06 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 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 297acfa..bc5dc95 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,12 +245,16 @@
String password = "a1234567";
String ip = "192.168.1.68";
String port = "554";
+ DeviceQueryItem camera1 = DeviceFragment.getInstance().getCamera1();
+ if (camera1 != null) {
+ return "rtsp://admin:a1234567@"+camera1.getIp()+":554/h264/ch1/main/av_stream";
+ }
return "rtsp://admin:a1234567@192.168.1.201:554/h264/ch1/main/av_stream";
}
- public void updateDevice(RequestParams params, Device camera) {
+ public void updateCamera(RequestParams params, Device camera) {
if (BaseApplication.getInstance().networkAvailable()) {
- params.setUri(AppApi.BASE_URL +AppApi.DEVICE_EDIT);
+ params.setUri(AppApi.BASE_URL +AppApi.CAMERA_UPDATE);
x.http().post(params, new BaseCommonCallBack() {
@Override
public void success() {
@@ -255,8 +263,24 @@
}
});
} else {
- DeviceDao.getInstance().updateDevice(camera);
+ DeviceDao.getInstance().updateCamera(camera);
}
}
+ public void updateAndroidDevice(RequestParams params, Device androidDevice) {
+ if (BaseApplication.getInstance().networkAvailable()) {
+ params.setUri(AppApi.BASE_URL +AppApi.ANDROID_DEVICE_UPDATE);
+ x.http().post(params, new BaseCommonCallBack() {
+ @Override
+ public void success() {
+ SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
+ Toast.makeText(BaseApplication.getInstance(),"淇敼鎴愬姛", Toast.LENGTH_SHORT).show();
+ }
+ });
+ } else {
+ DeviceDao.getInstance().updateAndroidDevice(androidDevice);
+ }
+ }
+
+
}
--
Gitblit v1.8.0