From 8d434f2a76348a759486cb7a95042a211bcc81db Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期日, 23 七月 2017 14:51:18 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java | 71 ++++++++++++++++++++++++----------- 1 files changed, 49 insertions(+), 22 deletions(-) diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java index c8cb0fe..43067ba 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java @@ -17,6 +17,7 @@ import cn.com.basic.face.base.LeftRightBaseFragment; import cn.com.basic.face.dialog.SelectDialog; import cn.com.basic.face.discern.entity.VisitDetail; +import cn.com.basic.face.discern.query.item.OfflineVisitItem; import cn.com.basic.face.util.Constant; import cn.com.basic.face.util.OkClickedListener; import cn.com.basic.face.service.DictionaryMng; @@ -72,7 +73,7 @@ private String visitorSearchText; private String intervieweeSearchText; -// private boolean ignore + private boolean ignoreSearchText = false; private int pageNum = 1; @@ -96,8 +97,8 @@ if (prevList == null || prevList.size() == 0) { reloadCheckInLeftList(); } else { + ignoreSearchText = true; fragment_check_in_left_search_edit_text.setText(visitorSearchText); - } } else { fragment_check_in_left_search_edit_text.setText(intervieweeSearchText); @@ -146,13 +147,22 @@ } private void reloadCheckInLeftList() { - pageNum = 1; fragment_check_in_left_sort_type_linear_layout.setVisibility(!fragment_check_in_left_visitor_radio.isChecked()?View.VISIBLE:View.GONE); fragment_check_in_left_interviewee.setVisibility(!fragment_check_in_left_visitor_radio.isChecked()?View.VISIBLE:View.GONE); fragment_check_in_left_visitor.setVisibility(fragment_check_in_left_visitor_radio.isChecked()?View.VISIBLE:View.GONE); - manager.findCheckInLeftList(fragment_check_in_left_visitor_radio.isChecked(), - fragment_check_in_left_sort_by_dept_radio_button.isChecked(), - fragment_check_in_left_search_edit_text.getText().toString(), pageNum, false); + if (ignoreSearchText) { + ignoreSearchText = false; + } else { + pageNum = 1; + manager.findCheckInLeftList(fragment_check_in_left_visitor_radio.isChecked(), + fragment_check_in_left_sort_by_dept_radio_button.isChecked(), + fragment_check_in_left_search_edit_text.getText().toString(), pageNum, false); + } + } + + public void selectVisiteeRadio() { + fragment_check_in_left_interviewee_radio.callOnClick(); + fragment_check_in_left_interviewee_radio.setChecked(true); } @Override @@ -192,24 +202,40 @@ return; } RequestParams params = new RequestParams(); + OfflineVisitItem offlineVisitItem = new OfflineVisitItem(); String visitReasonId = DictionaryMng.getInstance().getId(fragment_check_in_right_visitor_reason.getText().toString()); - 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()); + if(BaseApplication.getInstance().networkAvailable()) { + 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().getDevice().getDeviceId()); - - CheckInMng.getInstance().add(params, visitReasonId); + 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()); + } else { + offlineVisitItem.setVisitReasonId(visitReasonId); + offlineVisitItem.setVisitReason(fragment_check_in_right_visitor_reason.getText().toString()); + offlineVisitItem.setRemark(fragment_check_in_right_remark.getText().toString()); + offlineVisitItem.setVisitorId(visitor.getRegisterId()); + offlineVisitItem.setVisiteeId(interviewee.getRegisterId()); + offlineVisitItem.setVisitorCompanyId(visitor.getCompanyId()); + offlineVisitItem.setVisiteeCompanyId(interviewee.getCompanyId()); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + offlineVisitItem.setEnterTime(sdf.format(new Date())); + offlineVisitItem.setCurrentStateId(""+CommonVariables.VisitType.VISITOR_ENTERED); + offlineVisitItem.setWarning(visitor.getWarning()); + offlineVisitItem.setCreateTime(sdf.format(new Date())); + offlineVisitItem.setDeviceId(BaseApplication.getInstance().getAndroidDevice().getDeviceId()); + } + CheckInMng.getInstance().add(params, visitReasonId, offlineVisitItem); } @OnClick(R.id.fragment_check_in_right_visitor_reason_text_view) @@ -221,6 +247,7 @@ public void fragment_check_in_right_visitor_reason_click(View view) { } + @OnClick(R.id.fragment_check_in_right_visitor_reason_more) public void fragment_check_in_right_visitor_reason_more_click(View view) { InputMethodManager imm = (InputMethodManager)MainActivity.getInstance().getSystemService( -- Gitblit v1.8.0