From 00fbeab326328aef416882ce3417b4906d385de3 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 27 四月 2017 18:38:26 +0800
Subject: [PATCH] optimize
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java | 82 ++++++++++++++++++++++++++++++++--------
1 files changed, 65 insertions(+), 17 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 0692b3e..ebdad56 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
@@ -8,11 +8,14 @@
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.TextView;
+import android.widget.Toast;
import com.bsk.zhangbo.demoforbsk.R;
+import cn.com.basic.face.base.BaseApplication;
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.util.Constant;
import cn.com.basic.face.util.OkClickedListener;
import cn.com.basic.face.service.DictionaryMng;
@@ -28,7 +31,9 @@
import org.xutils.http.RequestParams;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import cn.com.basic.face.discern.common.CommonVariables;
@@ -41,9 +46,6 @@
public static CheckInFragment getInstance() {
return instance;
}
-
- private View fragment_check_in_left;
- private View fragment_check_in_right;
@ViewInject(R.id.fragment_check_in_left_sort_type_linear_layout)
private LinearLayout fragment_check_in_left_sort_type_linear_layout;
@@ -68,9 +70,9 @@
@ViewInject(R.id.fragment_check_in_left_interviewee_radio)
private RadioButton fragment_check_in_left_interviewee_radio;
- private CheckInMng manager = CheckInMng.getInstance();
+ private int pageNum = 1;
- private List<String> visitPurposeList = new ArrayList<String>();
+ private CheckInMng manager = CheckInMng.getInstance();
@Override
public int[] getLeftRightLayoutIds() {
@@ -105,13 +107,27 @@
}
- private void reloadCheckInLeftList() {
+ public void append() {
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());
+ fragment_check_in_left_search_edit_text.getText().toString(), pageNum, true);
+ }
+
+ public void addPageNum() {
+ pageNum++;
+ }
+
+ 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);
}
@Override
@@ -131,24 +147,49 @@
public void fragment_check_in_right_print_click(View view) { }
@OnClick(R.id.fragment_check_in_right_add)
- public void fragment_check_in_right_add_click(View view) { }
+ public void fragment_check_in_right_add_click(View view) { resetForm(); }
@OnClick(R.id.fragment_check_in_right_save)
public void fragment_check_in_right_save_click(View view) {
CheckInQueryItem visitor = fragment_check_in_right_visitor_cell.getVisitor();
CheckInQueryItem interviewee = fragment_check_in_right_interviewee_cell.getInterviewee();
- if (visitor == null || interviewee == null) {
+ if (visitor == null) {
+ Toast.makeText(MainActivity.getInstance(), "璇烽�夋嫨鏉ヨ浜哄憳", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ if (interviewee == null) {
+ Toast.makeText(MainActivity.getInstance(), "璇烽�夋嫨琚浜哄憳", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ String right_visitor_reason = fragment_check_in_right_visitor_reason.getText().toString().trim();
+ if (right_visitor_reason.length() == 0) {
+ Toast.makeText(MainActivity.getInstance(), "鎷滆浜嬬敱涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
return;
}
RequestParams params = new RequestParams();
- params.addBodyParameter(Visit.FieldNames.matterId, DictionaryMng.getInstance().getId(CommonVariables.DictionaryType.VISIT_REASON + fragment_check_in_right_visitor_reason.getText().toString()));
+ 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.visitorPersonId, visitor.getId());
- params.addBodyParameter(Visit.FieldNames.visiteePersonId, interviewee.getId());
+ 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());
- CheckInMng.getInstance().add(params);
+ 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);
+ }
+
+ @OnClick(R.id.fragment_check_in_right_visitor_reason_text_view)
+ public void fragment_check_in_right_visitor_reason_linear_layout_click(View view) {
+ //fragment_check_in_right_visitor_reason_click(view);
}
@OnClick(R.id.fragment_check_in_right_visitor_reason)
@@ -162,10 +203,6 @@
public void checkInFromHomePage(CheckInQueryItem item) {
fragment_check_in_left_interviewee_radio.performClick();
- }
-
- public void setVisitPurposeList(List<String> visitPurposeList) {
- this.visitPurposeList = visitPurposeList;
}
public CheckInRightVisitorCell getFragment_check_in_right_visitor_cell() {
@@ -184,4 +221,15 @@
return fragment_check_in_left_visitor;
}
+ public void resetForm() {
+ fragment_check_in_right_visitor_reason.setText("");
+ fragment_check_in_right_remark.setText("");
+ fragment_check_in_right_interviewee_cell.resetForm();
+ fragment_check_in_right_visitor_cell.resetForm();
+ }
+
+ public void setVisitReasonText(String value) {
+ fragment_check_in_right_visitor_reason.setText(value);
+ }
+
}
--
Gitblit v1.8.0