From d56dfe791f22ddcccd7de6fb2c4be1255a80f9c5 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 27 七月 2017 20:39:23 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 153 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 103 insertions(+), 50 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 09cdb4c..15351cd 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
@@ -8,6 +8,8 @@
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.fragment.DeviceFragment;
+import cn.com.basic.face.service.sqlite.DeviceDao;
+import cn.com.basic.face.service.sync.SyncDownThread;
import cn.com.basic.face.util.AppApi;
import org.xutils.http.RequestParams;
@@ -19,9 +21,13 @@
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.service.sync.SyncUpThread;
public class DeviceMng {
public static DeviceMng instance = new DeviceMng();
+
+ private SyncUpThread syncUpThread = null;
+ private SyncDownThread syncDownThread = null;
public static String authorationId = "101";
@@ -35,6 +41,7 @@
public void run() {
try {
while (true) {
+ //AttendanceDao.getInstance().reloadLeftList(null, 0, false);
if (!BaseApplication.getInstance().deviceAvailable) {
load ();
} else {
@@ -61,58 +68,97 @@
// });
// 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() {
- public void success() {
- List<Device> devices = resultBean.getListBeanOfType(Device.class);
- if (devices.size() > 0) {
- final Device device = devices.get(0);
- BaseApplication.getInstance().setAndroidDevice(device);
- MainActivity.getInstance().runOnUiThread(new Runnable() {
- @Override
- public void run() {
- DeviceFragment.getInstance().setAndroidDevice(device);
+ if (MainActivity.getInstance().getInternetAccessible() == CommonVariables.InternetAccess.INTERNET_NOT_INITIALIZE) {
+ return;
+ }
+ if (BaseApplication.getInstance().networkAvailable()) {
+ RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY);
- 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);
- x.http().post(params, new BaseCommonCallBack() {
- public void success() {
- List<Device> devices = resultBean.getListBeanOfType(Device.class);
- if (devices.size() > 0) {
- final Device camera1 = devices.get(0);
- BaseApplication.getInstance().setCamera1(camera1);
- DeviceFragment.getInstance().setCamera1(camera1);
- }
- }
- });
+ 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));
+ }
+ });
+ } else {
+ loadAfterReturn(DeviceDao.getInstance().loadMainDevice(CommonVariables.DeviceType.ANDROID_DEVICE, authorationId));
+ }
+ } catch (Throwable e) {
+ e.printStackTrace();
+ Toast.makeText(BaseApplication.getInstance(), "鏁版嵁搴撲腑鎵句笉鍒拌璁惧", Toast.LENGTH_SHORT).show();
+ }
+ }
+ public void loadAfterReturn(List<Device> devices) {
+// List<Device> devices = getList(Device.class);
+ if (devices.size() > 0) {
+ final Device device = devices.get(0);
+ BaseApplication.getInstance().setAndroidDevice(device);
+ MainActivity.getInstance().runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ DeviceFragment.getInstance().setAndroidDevice(device);
- 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);
- x.http().post(params, new BaseCommonCallBack() {
- public void success() {
- List<Device> devices = resultBean.getListBeanOfType(Device.class);
- if (devices.size() > 0) {
- final Device camera2 = devices.get(0);
- BaseApplication.getInstance().setCamera2(camera2);
- DeviceFragment.getInstance().setCamera2(camera2);
- }
- }
- });
+ if (BaseApplication.getInstance().networkAvailable()) {
+
+ 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);
+ if (devices.size() > 0) {
+ final Device camera1 = devices.get(0);
+ BaseApplication.getInstance().setCamera1(camera1);
+ DeviceFragment.getInstance().setCamera1(camera1);
+ }
+ }
+ });
+
+ 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);
+ if (devices.size() > 0) {
+ final Device camera2 = devices.get(0);
+ BaseApplication.getInstance().setCamera2(camera2);
+ DeviceFragment.getInstance().setCamera2(camera2);
+ }
}
});
} else {
- Toast.makeText(BaseApplication.getInstance(), "鏁版嵁搴撲腑鎵句笉鍒拌璁惧", Toast.LENGTH_SHORT).show();
+ List<Device> camera1List = DeviceDao.getInstance().loadCamera(CommonVariables.DeviceType.CAMERA1, device.getBelongId());
+ if (camera1List != null && camera1List.size() > 0) {
+ final Device camera1 = camera1List.get(0);
+ BaseApplication.getInstance().setCamera1(camera1);
+ DeviceFragment.getInstance().setCamera1(camera1);
+ }
+ List<Device> camera2List = DeviceDao.getInstance().loadCamera(CommonVariables.DeviceType.CAMERA2, device.getBelongId());
+ if (camera2List != null && camera2List.size() > 0) {
+ final Device camera2 = camera2List.get(0);
+ BaseApplication.getInstance().setCamera2(camera2);
+ DeviceFragment.getInstance().setCamera2(camera2);
+ }
}
}
});
- } catch (Throwable e) {
- e.printStackTrace();
+ synchronized (this) {
+ if (syncUpThread == null) {
+ syncUpThread = new SyncUpThread();
+ syncUpThread.start();
+ }
+ if (syncDownThread == null) {
+ syncDownThread = new SyncDownThread();
+ syncDownThread.start();
+ }
+ }
+ } else {
Toast.makeText(BaseApplication.getInstance(), "鏁版嵁搴撲腑鎵句笉鍒拌璁惧", Toast.LENGTH_SHORT).show();
}
}
@@ -135,7 +181,7 @@
// params.addBodyParameter(Device.FieldNames.type, CommonVariables.DeviceType.ANDROID_DEVICE);
// x.http().post(params, new BaseCommonCallBack() {
// public void success() {
-// List<Device> places = resultBean.getListBeanOfType(Device.class);
+// List<Device> places = resultBean.getList(Device.class);
// if (places.size() > 0) {
// BaseApplication.getInstance().setAndroidDevice(places.get(0));
// } else {
@@ -169,7 +215,7 @@
return sharedPreferences.getString(key, "");
}
- public String getCamera1Address() {
+ public String getCamera2Address() {
String username = "admin";
String password = "admin12345";
String ip = "192.168.1.70";
@@ -190,11 +236,13 @@
// }
// return "rtsp://"+username+":"+password+"@"+ip+":"+port+"/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.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";
@@ -210,12 +258,17 @@
// 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://admin:a1234567@192.168.1.68:554/h264/ch1/main/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";
}
+
}
--
Gitblit v1.8.0