From 21e08324c323d0c5d1e7cedc36323c554857a239 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 01 八月 2017 17:55:09 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java | 35 ++++++++++-------------------------
1 files changed, 10 insertions(+), 25 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 057e56b..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
@@ -1,18 +1,12 @@
package cn.com.basic.face.base;
import android.app.Application;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.os.IBinder;
+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;
@@ -30,8 +24,8 @@
}
private Device androidDevice;
- private Device camera1;
- private Device camera2;
+ private DeviceQueryItem camera1;
+ private DeviceQueryItem camera2;
public static boolean deviceAvailable = false;
@@ -44,14 +38,14 @@
}
}
- public void setCamera1(Device camera1) {
+ public void setCamera1(DeviceQueryItem camera1) {
this.camera1 = camera1;
if (camera1 != null && camera1.getDeviceId() != null && !"".equals(camera1.getDeviceId())) {
DictionaryMng.getInstance().loadAllDictionaryData();
}
}
- public void setCamera2(Device camera2) {
+ public void setCamera2(DeviceQueryItem camera2) {
this.camera2 = camera2;
if (camera2 != null && camera2.getDeviceId() != null && !"".equals(camera2.getDeviceId())) {
DictionaryMng.getInstance().loadAllDictionaryData();
@@ -72,8 +66,6 @@
Fresco.initialize(this);
initOkHttpUtils();
application = this;
- DeviceMng.getInstance().findDevice();
-
}
private void initOkHttpUtils() {
@@ -88,15 +80,8 @@
}
- public boolean networkNotAvailable() {
- boolean connected = false;
- ConnectivityManager connectivityManager = (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
- if(connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE).getState() == NetworkInfo.State.CONNECTED ||
- connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI).getState() == NetworkInfo.State.CONNECTED) {
- connected = true;
- }
- return !connected;
+ public boolean networkAvailable() {
+// return false;
+ return MainActivity.getInstance().getInternetAccessible() == CommonVariables.InternetAccess.INTERNET_ACCESSIBLE;
}
-
-
}
--
Gitblit v1.8.0