From 5923077a6573b12982f4c0ec321cc7759384f93e Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期四, 20 七月 2017 09:46:52 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineAttenderRegisterItem.java | 5 ++ VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java | 16 +++----- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java | 21 +++++++++- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineVisitorRegisterItem.java | 5 ++ VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java | 19 +++++++++ 5 files changed, 52 insertions(+), 14 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..7e81f63 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; @@ -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(); diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineAttenderRegisterItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineAttenderRegisterItem.java new file mode 100644 index 0000000..36ed941 --- /dev/null +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineAttenderRegisterItem.java @@ -0,0 +1,5 @@ +package cn.com.basic.face.discern.query.item; + +public class OfflineAttenderRegisterItem { + +} diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineVisitorRegisterItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineVisitorRegisterItem.java new file mode 100644 index 0000000..1e4b0c3 --- /dev/null +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/OfflineVisitorRegisterItem.java @@ -0,0 +1,5 @@ +package cn.com.basic.face.discern.query.item; + +public class OfflineVisitorRegisterItem { + +} diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java index 417808a..75f0f10 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java @@ -4,6 +4,8 @@ import cn.com.basic.face.base.BaseApplication; import cn.com.basic.face.discern.common.CommonVariables; +import cn.com.basic.face.discern.query.item.OfflineAttenderRegisterItem; +import cn.com.basic.face.discern.query.item.OfflineVisitorRegisterItem; import cn.com.basic.face.fragment.AttenderRegisterFragment; import cn.com.basic.face.fragment.VisitorRegisterFragment; import cn.com.basic.face.service.sqlite.RegisterDao; @@ -211,10 +213,23 @@ } - public void sendOfflineRegisterToServer() { + public void sendOfflineVisitorRegisterToServer() { + OfflineVisitorRegisterItem item = RegisterDao.getInstance().readOfflineVisitorRegister(); + + } - public boolean hasOfflineRegisterData() { - return RegisterDao.getInstance().hasOfflineRegisterData(); + public boolean hasOfflineVisitorRegisterData() { + return RegisterDao.getInstance().hasOfflineVisitorRegisterData(); + } + + public void sendOfflineAttenderRegisterToServer() { + OfflineAttenderRegisterItem item = RegisterDao.getInstance().readOfflineAttenderRegister(); + + + } + + public boolean hasOfflineAttenderRegisterData() { + return RegisterDao.getInstance().hasOfflineAttenderRegisterData(); } } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java index e14906e..b9a32a5 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java @@ -5,6 +5,8 @@ import org.xutils.http.RequestParams; import cn.com.basic.face.base.Config; +import cn.com.basic.face.discern.query.item.OfflineAttenderRegisterItem; +import cn.com.basic.face.discern.query.item.OfflineVisitorRegisterItem; public class RegisterDao { @@ -33,9 +35,24 @@ return true; } - public boolean hasOfflineRegisterData() { + public boolean hasOfflineVisitorRegisterData() { Cursor c = Config.sqlMap.getDb().rawQuery("select count(*) from register", new String[]{}); c.moveToFirst(); return c.getInt(0) > 0 ? true : false; } + + public boolean hasOfflineAttenderRegisterData() { + Cursor c = Config.sqlMap.getDb().rawQuery("select count(*) from register", new String[]{}); + c.moveToFirst(); + return c.getInt(0) > 0 ? true : false; + } + + public OfflineVisitorRegisterItem readOfflineVisitorRegister() { + return null; + } + + public OfflineAttenderRegisterItem readOfflineAttenderRegister() { + return null; + } + } -- Gitblit v1.8.0