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 | 50 ++++++++++----------------------------------------
1 files changed, 10 insertions(+), 40 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 285d0c5..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,17 +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.os.IBinder;
+import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.entity.Device;
-import cn.com.basic.face.service.ConnetedService;
+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;
@@ -29,8 +24,8 @@
}
private Device androidDevice;
- private Device camera1;
- private Device camera2;
+ private DeviceQueryItem camera1;
+ private DeviceQueryItem camera2;
public static boolean deviceAvailable = false;
@@ -43,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();
@@ -71,8 +66,6 @@
Fresco.initialize(this);
initOkHttpUtils();
application = this;
- DeviceMng.getInstance().findDevice();
-
}
private void initOkHttpUtils() {
@@ -86,32 +79,9 @@
OkHttpUtils.init(this);
}
- boolean isConnect = false;
- boolean flag = false;
- //
- private ConnetedService.MyBinder myBinder;
-
-
- private ServiceConnection conn=new ServiceConnection() {
-
- @Override
- public void onServiceDisconnected(ComponentName arg0) {
- myBinder=null;
-
- }
-
- @Override
- public void onServiceConnected(ComponentName arg0, IBinder service) {
- myBinder=(ConnetedService.MyBinder) service;
- }
- };
-
- public void bindService(){
- isConnect = true;
- flag=true;
- Intent intent=new Intent(application,ConnetedService.class);
- application.bindService(intent, conn, Context.BIND_AUTO_CREATE);
+ public boolean networkAvailable() {
+// return false;
+ return MainActivity.getInstance().getInternetAccessible() == CommonVariables.InternetAccess.INTERNET_ACCESSIBLE;
}
-
}
--
Gitblit v1.8.0