From d9ffa50c7e8d6b8c3157690aef8e2a70af1d1695 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 09 八月 2017 13:58:01 +0800
Subject: [PATCH] rtps server (not ok)
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
index 04a0163..06f907c 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
@@ -4,6 +4,7 @@
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.entity.Device;
+import cn.com.basic.face.discern.query.item.DeviceQueryItem;
import cn.com.basic.face.service.InternetAccessThread;
import cn.com.basic.face.service.DictionaryMng;
@@ -23,8 +24,8 @@
}
private Device androidDevice;
- private Device camera1;
- private Device camera2;
+ private DeviceQueryItem camera1;
+ private DeviceQueryItem camera2;
public static boolean deviceAvailable = false;
@@ -37,14 +38,14 @@
}
}
- public void setCamera1(Device camera1) {
+ public void setCamera1(DeviceQueryItem camera1) {
this.camera1 = camera1;
if (camera1 != null && camera1.getDeviceId() != null && !"".equals(camera1.getDeviceId())) {
DictionaryMng.getInstance().loadAllDictionaryData();
}
}
- public void setCamera2(Device camera2) {
+ public void setCamera2(DeviceQueryItem camera2) {
this.camera2 = camera2;
if (camera2 != null && camera2.getDeviceId() != null && !"".equals(camera2.getDeviceId())) {
DictionaryMng.getInstance().loadAllDictionaryData();
@@ -80,6 +81,7 @@
public boolean networkAvailable() {
+// return false;
return MainActivity.getInstance().getInternetAccessible() == CommonVariables.InternetAccess.INTERNET_ACCESSIBLE;
}
}
--
Gitblit v1.8.0