From f78d6020a2750ca0d764d3013755710341fb8aa2 Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 09 八月 2017 17:38:21 +0800
Subject: [PATCH] capnproto add lib
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java | 54 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 38 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 224269d..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,9 +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 com.facebook.drawee.backends.pipeline.Fresco;
import com.lzy.okhttputils.OkHttpUtils;
@@ -12,12 +14,6 @@
import com.lzy.okhttputils.model.HttpParams;
import org.xutils.x;
-
-import cn.com.basic.face.discern.entity.Device;
-
-/**
- * Created by zhangbo on 2017/2/15.
- */
public class BaseApplication extends Application{
@@ -27,17 +23,40 @@
return application;
}
- private Device place;
+ private Device androidDevice;
+ private DeviceQueryItem camera1;
+ private DeviceQueryItem camera2;
- public void setPlace(Device 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 Device getPlace() {
- if (place == null) {
- place = new Device();
+ public void setCamera1(DeviceQueryItem camera1) {
+ this.camera1 = camera1;
+ if (camera1 != null && camera1.getDeviceId() != null && !"".equals(camera1.getDeviceId())) {
+ DictionaryMng.getInstance().loadAllDictionaryData();
}
- return place;
+ }
+
+ 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
@@ -47,8 +66,6 @@
Fresco.initialize(this);
initOkHttpUtils();
application = this;
- DeviceMng.getInstance().findPlace();
- DictionaryMng.getInstance().loadAllDictionaryData();
}
private void initOkHttpUtils() {
@@ -62,4 +79,9 @@
OkHttpUtils.init(this);
}
+
+ public boolean networkAvailable() {
+// return false;
+ return MainActivity.getInstance().getInternetAccessible() == CommonVariables.InternetAccess.INTERNET_ACCESSIBLE;
+ }
}
--
Gitblit v1.8.0