From 3a5f09c61a87adb8dba2cc4a5366893886ba1c1d Mon Sep 17 00:00:00 2001
From: dupengyue <dupengyue@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 20 七月 2017 17:31:40 +0800
Subject: [PATCH] 接口初步完成
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 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..b53445a 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;
@@ -92,7 +84,7 @@
public boolean networkNotAvailable() {
- boolean connected = false;
+ boolean connected = true;
// 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) {
@@ -105,7 +97,7 @@
}
public boolean networkAvailable() {
- boolean connected = false;
+ boolean connected = true;
// 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) {
@@ -118,8 +110,12 @@
}
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