From 1a10d546c76f474d33e23c5958c08aa0afcdae67 Mon Sep 17 00:00:00 2001 From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674> Date: 星期一, 24 七月 2017 11:46:45 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 64 ++++++++++++++++++++----------- 1 files changed, 41 insertions(+), 23 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..1a83671 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,22 +61,7 @@ } }); } 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); + CheckInDao.getInstance().addOfflineVisit(offlineVisitItem); if (visitReasonId == null || "".equals(visitReasonId)) { DictionaryMng.getInstance().loadVisitReasonList(); } @@ -106,7 +94,7 @@ } } - 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); List prevList = null; @@ -125,7 +113,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,10 +133,23 @@ 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); + } + } + }); } } @@ -186,8 +187,25 @@ } - public void sendOfflineCheckInToServer() { + public void sendOfflineCheckInToServer(Integer mysqlVisitorId, long sqliteVisitorId) { + RequestParams params = new RequestParams(); + 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() { + @Override + public void success() { + SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class)); + Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show(); + CheckInFragment.getInstance().resetForm(); +// if (visitReasonId == null || "".equals(visitReasonId)) { +// DictionaryMng.getInstance().loadVisitReasonList(); +// } + } + }); + } } public boolean hasOfflineCheckInData() { -- Gitblit v1.8.0