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 | 33 +++------------------------------
1 files changed, 3 insertions(+), 30 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 46a461a..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
@@ -1,18 +1,11 @@
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.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;
@@ -72,8 +65,6 @@
Fresco.initialize(this);
initOkHttpUtils();
application = this;
- DeviceMng.getInstance().findDevice();
-
}
private void initOkHttpUtils() {
@@ -88,25 +79,7 @@
}
- 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() {
- 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;
+ return MainActivity.getInstance().getInternetAccessible() == CommonVariables.InternetAccess.INTERNET_ACCESSIBLE;
}
-
-
}
--
Gitblit v1.8.0