From 785fd3c3e9984f301018b3b5deb91ecc2c8da124 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 01 八月 2017 17:44:35 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 60 +++++++++++++-----------------------------------------------
1 files changed, 13 insertions(+), 47 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 e207a66..3980c15 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
@@ -7,6 +7,7 @@
import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.common.CommonVariables;
+import cn.com.basic.face.discern.query.item.DeviceQueryItem;
import cn.com.basic.face.fragment.DeviceFragment;
import cn.com.basic.face.service.sqlite.DeviceDao;
import cn.com.basic.face.service.sync.DeleteLastMonthRecordAndPictureThread;
@@ -111,9 +112,9 @@
params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
public void success() {
- List<Device> devices = resultBean.getList(Device.class);
+ List<DeviceQueryItem> devices = resultBean.getList(DeviceQueryItem.class);
if (devices.size() > 0) {
- final Device camera1 = devices.get(0);
+ final DeviceQueryItem camera1 = devices.get(0);
BaseApplication.getInstance().setCamera1(camera1);
DeviceFragment.getInstance().setCamera1(camera1);
}
@@ -126,24 +127,24 @@
params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
public void success() {
- List<Device> devices = resultBean.getList(Device.class);
+ List<DeviceQueryItem> devices = resultBean.getList(DeviceQueryItem.class);
if (devices.size() > 0) {
- final Device camera2 = devices.get(0);
+ final DeviceQueryItem camera2 = devices.get(0);
BaseApplication.getInstance().setCamera2(camera2);
DeviceFragment.getInstance().setCamera2(camera2);
}
}
});
} else {
- List<Device> camera1List = DeviceDao.getInstance().loadCamera(CommonVariables.DeviceType.CAMERA1, device.getBelongId());
+ List<DeviceQueryItem> camera1List = DeviceDao.getInstance().loadCamera(CommonVariables.DeviceType.CAMERA1, device.getBelongId());
if (camera1List != null && camera1List.size() > 0) {
- final Device camera1 = camera1List.get(0);
+ final DeviceQueryItem camera1 = camera1List.get(0);
BaseApplication.getInstance().setCamera1(camera1);
DeviceFragment.getInstance().setCamera1(camera1);
}
- List<Device> camera2List = DeviceDao.getInstance().loadCamera(CommonVariables.DeviceType.CAMERA2, device.getBelongId());
+ List<DeviceQueryItem> camera2List = DeviceDao.getInstance().loadCamera(CommonVariables.DeviceType.CAMERA2, device.getBelongId());
if (camera2List != null && camera2List.size() > 0) {
- final Device camera2 = camera2List.get(0);
+ final DeviceQueryItem camera2 = camera2List.get(0);
BaseApplication.getInstance().setCamera2(camera2);
DeviceFragment.getInstance().setCamera2(camera2);
}
@@ -226,26 +227,7 @@
String password = "admin12345";
String ip = "192.168.1.70";
String port = "554";
-
-// SharedPreferences camera1 = DeviceMng.getInstance().loadSharedPreferences(CommonVariables.DeviceSharedPreferences.CAMERA1);
-// if (!"".equals(camera1.getString("fragment_device_right_camera1_username", ""))) {
-// username = camera1.getString("fragment_device_right_camera1_username", "");
-// }
-// if (!"".equals(camera1.getString("fragment_device_right_camera1_password", ""))) {
-// password = camera1.getString("fragment_device_right_camera1_password", "");
-// }
-// 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", ""))) {
-// port = camera1.getString("fragment_device_right_camera1_port", "");
-// }
-
-// 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: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 getCamera1Address() {
@@ -253,28 +235,12 @@
String password = "a1234567";
String ip = "192.168.1.68";
String port = "554";
-
-// SharedPreferences camera1 = DeviceMng.getInstance().loadSharedPreferences(CommonVariables.DeviceSharedPreferences.CAMERA2);
-// if (!"".equals(camera1.getString("fragment_device_right_camera1_username", ""))) {
-// username = camera1.getString("fragment_device_right_camera1_username", "");
-// }
-// if (!"".equals(camera1.getString("fragment_device_right_camera1_password", ""))) {
-// password = camera1.getString("fragment_device_right_camera1_password", "");
-// }
-// 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", ?
-// ""))) {
-// port = camera1.getString("fragment_device_right_camera1_port", "");
-// }
-
- //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:a1234567@192.168.1.201:554/h264/ch1/main/av_stream";
}
+ public void saveDevice(RequestParams params, Device camera) {
+
+ }
+
}
--
Gitblit v1.8.0