From 0abb3d251383bcdf22db67e2b26431b7a7b74148 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 11 八月 2017 14:30:34 +0800
Subject: [PATCH] bug fix
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 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 85bf8a0..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
@@ -2,10 +2,11 @@
import android.app.Application;
+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;
-import cn.com.basic.face.service.DeviceMng;
-import cn.com.basic.face.util.WindowsUtil;
import com.facebook.drawee.backends.pipeline.Fresco;
import com.lzy.okhttputils.OkHttpUtils;
@@ -22,23 +23,40 @@
return application;
}
- private Device device;
+ private Device androidDevice;
+ private DeviceQueryItem camera1;
+ private DeviceQueryItem camera2;
+
public static boolean deviceAvailable = false;
- public void setDevice(Device device) {
- this.device = device;
+ public void setAndroidDevice(Device device) {
+ this.androidDevice = device;
if (device != null && device.getDeviceId() != null && !"".equals(device.getDeviceId())) {
deviceAvailable = true;
DictionaryMng.getInstance().loadAllDictionaryData();
}
}
- public Device getDevice() {
- if (device == null) {
- device = new Device();
+ public void setCamera1(DeviceQueryItem camera1) {
+ this.camera1 = camera1;
+ if (camera1 != null && camera1.getDeviceId() != null && !"".equals(camera1.getDeviceId())) {
+ DictionaryMng.getInstance().loadAllDictionaryData();
}
- return device;
+ }
+
+ public void setCamera2(DeviceQueryItem camera2) {
+ this.camera2 = camera2;
+ if (camera2 != null && camera2.getDeviceId() != null && !"".equals(camera2.getDeviceId())) {
+ DictionaryMng.getInstance().loadAllDictionaryData();
+ }
+ }
+
+ public Device getAndroidDevice() {
+ if (androidDevice == null) {
+ androidDevice = new Device();
+ }
+ return androidDevice;
}
@Override
@@ -48,8 +66,6 @@
Fresco.initialize(this);
initOkHttpUtils();
application = this;
- DeviceMng.getInstance().findDevice();
-
}
private void initOkHttpUtils() {
@@ -63,4 +79,9 @@
OkHttpUtils.init(this);
}
+
+ public boolean networkAvailable() {
+// return false;
+ return MainActivity.getInstance().getInternetAccessible() == CommonVariables.InternetAccess.INTERNET_ACCESSIBLE;
+ }
}
--
Gitblit v1.8.0