From d289fd8eb7a6581da0dd9c9963c15b6e7c08d744 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 27 六月 2017 09:48:34 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java | 53 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 37 insertions(+), 16 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 8916775..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
@@ -2,21 +2,17 @@
import android.app.Application;
+import cn.com.basic.face.discern.entity.Device;
import cn.com.basic.face.service.DictionaryMng;
-import cn.com.basic.face.service.PlaceMng;
-import cn.com.basic.face.service.VisitorTypeMng;
+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;
import com.lzy.okhttputils.model.HttpHeaders;
import com.lzy.okhttputils.model.HttpParams;
import org.xutils.x;
-
-import cn.com.basic.face.discern.entity.Place;
-
-/**
- * Created by zhangbo on 2017/2/15.
- */
public class BaseApplication extends Application{
@@ -26,14 +22,40 @@
return application;
}
- private Place place;
+ private Device androidDevice;
+ private Device camera1;
+ private Device camera2;
- public void setPlace(Place place) {
- this.place = place;
+
+ 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 Place getPlace() {
- return place;
+ public void setCamera1(Device camera1) {
+ this.camera1 = camera1;
+ if (camera1 != null && camera1.getDeviceId() != null && !"".equals(camera1.getDeviceId())) {
+ DictionaryMng.getInstance().loadAllDictionaryData();
+ }
+ }
+
+ 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
@@ -43,9 +65,8 @@
Fresco.initialize(this);
initOkHttpUtils();
application = this;
- PlaceMng.getInstance().findPlace();
- DictionaryMng.getInstance().loadAllDictionaryData();
- VisitorTypeMng.getInstance().loadAll();
+ DeviceMng.getInstance().findDevice();
+
}
private void initOkHttpUtils() {
--
Gitblit v1.8.0