From d56dfe791f22ddcccd7de6fb2c4be1255a80f9c5 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 27 七月 2017 20:39:23 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 71 ++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 26 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 918349f..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
@@ -3,6 +3,7 @@
import android.widget.Toast;
import cn.com.basic.face.base.BaseApplication;
+import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.common.ResultBean;
import cn.com.basic.face.discern.common.SqliteSqlBean;
@@ -10,6 +11,8 @@
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;
import cn.com.basic.face.service.sqlite.DictionaryDao;
@@ -39,7 +42,7 @@
return instance;
}
- public void add(RequestParams params, final String visitReasonId) {
+ public void add(RequestParams params, final String visitReasonId, OfflineVisitItem offlineVisitItem) {
if (!BaseApplication.deviceAvailable) {
return;
}
@@ -58,25 +61,22 @@
}
});
} else {
-// params.addBodyParameter(Visit.FieldNames.visitReasonId, visitReasonId);
-// params.addBodyParameter(Visit.FieldNames.visitReason, fragment_check_in_right_visitor_reason.getText().toString());
-// params.addBodyParameter(Visit.FieldNames.remark, fragment_check_in_right_remark.getText().toString());
-// params.addBodyParameter(Visit.FieldNames.visitorId, visitor.getRegisterId());
-// params.addBodyParameter(Visit.FieldNames.visiteeId, interviewee.getRegisterId());
-// params.addBodyParameter(Visit.FieldNames.visitorCompanyId, visitor.getCompanyId());
-// params.addBodyParameter(Visit.FieldNames.visiteeCompanyId, interviewee.getCompanyId());
-// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-// params.addBodyParameter(Visit.FieldNames.enterTime, sdf.format(new Date()));
-// params.addBodyParameter(Visit.FieldNames.currentStateId, ""+ CommonVariables.VisitType.VISITOR_ENTERED);
-// params.addBodyParameter(Visit.FieldNames.warning, visitor.getWarning());
-//
-// params.addBodyParameter(VisitDetail.FieldNames.stateId, ""+CommonVariables.VisitType.VISITOR_ENTERED);
-// params.addBodyParameter(VisitDetail.FieldNames.createTime, sdf.format(new Date()));
-// params.addBodyParameter(VisitDetail.FieldNames.deviceId, BaseApplication.getInstance().getAndroidDevice().getDeviceId());
- CheckInDao.getInstance().add(params);
- 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();
+ }
+ }
+ });
}
}
@@ -106,8 +106,11 @@
}
}
- public void findCheckInLeftListAfterReturn(ResultBean resultBean, boolean isVisitorList, boolean isSortByDept, boolean append) {
+ 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) {
@@ -125,7 +128,7 @@
}
sort(list, isSortByDept);
- List itemList = new ArrayList();
+ final List itemList = new ArrayList();
String name = "";
String prev = "";
for (int i = 0; i < list.size(); i++) {
@@ -145,16 +148,32 @@
prev = name;
}
addPageFooter(resultBean.hasMorePages(), resultBean.getPageNum(), itemList);
- if (isVisitorList) {
- CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(itemList);
+ if (BaseApplication.getInstance().networkAvailable()) {
+ if (isVisitorList) {
+ CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(itemList);
+ } else {
+ CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(itemList, isSortByDept, append);
+ }
} else {
- CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(itemList, isSortByDept, append);
+ MainActivity.getInstance().runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ if (isVisitorList) {
+ CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(itemList);
+ } else {
+ CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(itemList, isSortByDept, append);
+ }
+ }
+ });
}
}
private void sort(List<CheckInQueryItem> list, final boolean sortedByDept) {
if (!BaseApplication.deviceAvailable) {
return;
+ }
+ if (list == null) {
+ list = new ArrayList<>();
}
Collections.sort(list, new Comparator<CheckInQueryItem>() {
@Override
@@ -186,7 +205,7 @@
}
- public void sendOfflineCheckInToServer() {
+ public void sendOfflineCheckInToServer(Integer mysqlVisitorId, long sqliteVisitorId) {
}
--
Gitblit v1.8.0