From ba203bb099ebe6764eedea44c4f67ee4b1e21918 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 26 七月 2017 15:57:15 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java | 55 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 37 insertions(+), 18 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 33bf6ac..04a0163 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,9 +2,10 @@
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.service.InternetAccessThread;
import cn.com.basic.face.service.DictionaryMng;
-import cn.com.basic.face.service.DeviceMng;
-import cn.com.basic.face.service.VisitorTypeMng;
import com.facebook.drawee.backends.pipeline.Fresco;
import com.lzy.okhttputils.OkHttpUtils;
@@ -12,12 +13,6 @@
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{
@@ -27,17 +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() {
- if (place == null) {
- place = new Place();
+ public void setCamera1(Device camera1) {
+ this.camera1 = camera1;
+ if (camera1 != null && camera1.getDeviceId() != null && !"".equals(camera1.getDeviceId())) {
+ DictionaryMng.getInstance().loadAllDictionaryData();
}
- return place;
+ }
+
+ 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
@@ -47,9 +65,6 @@
Fresco.initialize(this);
initOkHttpUtils();
application = this;
- DeviceMng.getInstance().findPlace();
- DictionaryMng.getInstance().loadAllDictionaryData();
- VisitorTypeMng.getInstance().loadAll();
}
private void initOkHttpUtils() {
@@ -63,4 +78,8 @@
OkHttpUtils.init(this);
}
+
+ public boolean networkAvailable() {
+ return MainActivity.getInstance().getInternetAccessible() == CommonVariables.InternetAccess.INTERNET_ACCESSIBLE;
+ }
}
--
Gitblit v1.8.0