From 0a681611c0b0278e03e6da031c37a28d2973b7b2 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 24 七月 2017 15:30:50 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 3a3c14d..f37ac81 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
@@ -61,7 +61,7 @@
}
});
} else {
- CheckInDao.getInstance().add(offlineVisitItem);
+ CheckInDao.getInstance().addOfflineVisit(offlineVisitItem);
if (visitReasonId == null || "".equals(visitReasonId)) {
DictionaryMng.getInstance().loadVisitReasonList();
}
@@ -96,6 +96,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) {
@@ -157,6 +160,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) {
@@ -190,8 +196,8 @@
public void sendOfflineCheckInToServer(Integer mysqlVisitorId, long sqliteVisitorId) {
RequestParams params = new RequestParams();
- List<OfflineAttenderRegisterItem> offlineAttenderRegisterItems = CheckInDao.getInstance().readOfflineAttenderFromLocal(sqliteVisitorId);
- for (OfflineAttenderRegisterItem item : offlineAttenderRegisterItems) {
+ List<OfflineVisitItem> offlineVisitItems = CheckInDao.getInstance().readOfflineVisitItemFromLocal(sqliteVisitorId);
+ for (OfflineVisitItem item : offlineVisitItems) {
params.setUri(AppApi.BASE_URL +AppApi.VISIT_ADD);
params.addBodyParameter(Visit.FieldNames.deviceCompanyId, BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
--
Gitblit v1.8.0