From c769d1392f1b540d61d78027d5a1295fb156bb4f Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 02 六月 2017 16:17:10 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 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 cc3f78c..313e485 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
@@ -5,6 +5,7 @@
import cn.com.basic.face.discern.entity.Device;
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;
@@ -21,17 +22,40 @@
return application;
}
- private Device device;
+ private Device androidDevice;
+ private Device camera1;
+ private Device camera2;
- public void setDevice(Device device) {
- this.device = device;
+
+ public static boolean deviceAvailable = false;
+
+ 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(Device camera1) {
+ this.camera1 = camera1;
+ if (camera1 != null && camera1.getDeviceId() != null && !"".equals(camera1.getDeviceId())) {
+ DictionaryMng.getInstance().loadAllDictionaryData();
}
- return device;
+ }
+
+ public void setCamera2(Device 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
@@ -42,7 +66,7 @@
initOkHttpUtils();
application = this;
DeviceMng.getInstance().findDevice();
- DictionaryMng.getInstance().loadAllDictionaryData();
+
}
private void initOkHttpUtils() {
--
Gitblit v1.8.0