From 2c458f1f33a30375e10e5b04e5c552279a5e147c Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 26 七月 2017 14:41:58 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
index 540bacf..05370b0 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
@@ -11,6 +11,7 @@
import cn.com.basic.face.discern.entity.VisitDetail;
import cn.com.basic.face.discern.query.condition.AttendanceQueryCondition;
import cn.com.basic.face.discern.query.condition.CheckInQueryCondition;
+import cn.com.basic.face.discern.query.item.OfflineAttenderRegisterItem;
import cn.com.basic.face.discern.query.item.OfflineVisitItem;
import cn.com.basic.face.fragment.CheckInFragment;
import cn.com.basic.face.service.sqlite.CheckInDao;
@@ -60,10 +61,22 @@
}
});
} else {
- CheckInDao.getInstance().add(offlineVisitItem);
- if (visitReasonId == null || "".equals(visitReasonId)) {
- DictionaryMng.getInstance().loadVisitReasonList();
- }
+ final long result = CheckInDao.getInstance().addOfflineVisit(offlineVisitItem);
+
+ MainActivity.getInstance().runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ if (result > 0) {
+ Toast.makeText(BaseApplication.getInstance(), "娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
+ if (visitReasonId == null || "".equals(visitReasonId)) {
+ DictionaryMng.getInstance().loadVisitReasonList();
+ }
+ CheckInFragment.getInstance().resetForm();
+ } else {
+ Toast.makeText(BaseApplication.getInstance(), "娣诲姞澶辫触", Toast.LENGTH_SHORT).show();
+ }
+ }
+ });
}
}
@@ -95,6 +108,9 @@
public void findCheckInLeftListAfterReturn(ResultBean resultBean, final boolean isVisitorList, final boolean isSortByDept, final boolean append) {
List<CheckInQueryItem> list = resultBean.getList(CheckInQueryItem.class);
+ if (list == null) {
+ list = new ArrayList<>();
+ }
List prevList = null;
if (append) {
@@ -156,6 +172,9 @@
if (!BaseApplication.deviceAvailable) {
return;
}
+ if (list == null) {
+ list = new ArrayList<>();
+ }
Collections.sort(list, new Comparator<CheckInQueryItem>() {
@Override
public int compare(CheckInQueryItem item1, CheckInQueryItem item2) {
@@ -186,7 +205,7 @@
}
- public void sendOfflineCheckInToServer() {
+ public void sendOfflineCheckInToServer(Integer mysqlVisitorId, long sqliteVisitorId) {
}
--
Gitblit v1.8.0