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 | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 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 eb38d12..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,8 +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.AttendanceDao;
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;
@@ -21,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";
@@ -64,6 +68,9 @@
// });
// return;
// }
+ 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);
@@ -141,6 +148,16 @@
}
}
});
+ 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();
}
@@ -198,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";
@@ -220,11 +237,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";
@@ -248,7 +266,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