From d999731ac1ba495dbfea06cbb14dcfd3a53bcd64 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期六, 22 七月 2017 00:03:04 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java | 32 +++++++++-----------------------
1 files changed, 9 insertions(+), 23 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 c94ebb0..d957d52 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,13 +1,6 @@
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.entity.Device;
import cn.com.basic.face.service.CheckInMng;
@@ -15,7 +8,6 @@
import cn.com.basic.face.service.DeviceMng;
import cn.com.basic.face.service.RegisterMng;
import cn.com.basic.face.service.SurveillanceMng;
-import cn.com.basic.face.util.WindowsUtil;
import com.facebook.drawee.backends.pipeline.Fresco;
import com.lzy.okhttputils.OkHttpUtils;
@@ -75,7 +67,6 @@
Fresco.initialize(this);
initOkHttpUtils();
application = this;
- DeviceMng.getInstance().findDevice();
}
@@ -92,16 +83,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;
-// }
-// if (connected) {
-// sendOfflineDataToServer();
-// }
- return !connected;
+ return !networkAvailable();
}
public boolean networkAvailable() {
@@ -111,15 +93,19 @@
// connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI).getState() == NetworkInfo.State.CONNECTED) {
// connected = true;
// }
-// if (connected) {
+ if (connected) {
// sendOfflineDataToServer();
-// }
+ }
return connected;
}
public void sendOfflineDataToServer() {
- RegisterMng.getInstance().sendOfflineRegisterToServer();
- if (RegisterMng.getInstance().hasOfflineRegisterData()) {
+ RegisterMng.getInstance().sendOfflineVisitorRegisterToServer();
+ if (RegisterMng.getInstance().hasOfflineVisitorRegisterData()) {
+ return;
+ }
+ RegisterMng.getInstance().sendOfflineAttenderRegisterToServer();
+ if (RegisterMng.getInstance().hasOfflineAttenderRegisterData()) {
return;
}
CheckInMng.getInstance().sendOfflineCheckInToServer();
--
Gitblit v1.8.0