From 3a5f09c61a87adb8dba2cc4a5366893886ba1c1d Mon Sep 17 00:00:00 2001
From: dupengyue <dupengyue@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 20 七月 2017 17:31:40 +0800
Subject: [PATCH] 接口初步完成
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 9 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 cf8e794..11d8f56 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
@@ -34,6 +34,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.entity.Visit;
@@ -69,6 +70,10 @@
@ViewInject(R.id.fragment_check_in_left_interviewee_radio)
private RadioButton fragment_check_in_left_interviewee_radio;
+ private String visitorSearchText;
+ private String intervieweeSearchText;
+ private boolean ignoreSearchText = false;
+
private int pageNum = 1;
private CheckInMng manager = CheckInMng.getInstance();
@@ -86,7 +91,21 @@
.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(RadioGroup radioGroup, int i) {
- reloadCheckInLeftList();
+ if (fragment_check_in_left_visitor_radio.isChecked()) {
+ List prevList = fragment_check_in_left_visitor.getPrevList();
+ 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);
+ List prevList = fragment_check_in_left_interviewee.getPrevList();
+ if (prevList == null || prevList.size() == 0) {
+ reloadCheckInLeftList();
+ }
+ }
}
});
@@ -101,7 +120,14 @@
fragment_check_in_left_search_edit_text.addTextChangedListener(new TextWatcher() {
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {}
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {}
- public void afterTextChanged(Editable editable) { reloadCheckInLeftList(); }
+ public void afterTextChanged(Editable editable) {
+ if (fragment_check_in_left_visitor_radio.isChecked()) {
+ visitorSearchText = editable.toString();
+ } else {
+ intervieweeSearchText = editable.toString();
+ }
+ reloadCheckInLeftList();
+ }
});
}
@@ -120,13 +146,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
@@ -181,8 +216,7 @@
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());
-
+ params.addBodyParameter(VisitDetail.FieldNames.deviceId, BaseApplication.getInstance().getAndroidDevice().getDeviceId());
CheckInMng.getInstance().add(params, visitReasonId);
}
@@ -195,6 +229,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(
@@ -204,7 +239,7 @@
public void onSelected(String value) {
fragment_check_in_right_visitor_reason.setText(value);
}
- });
+ }, fragment_check_in_right_visitor_reason.getText().toString());
// fragment_check_in_right_visitor_reason.setFocusable(false);
// fragment_check_in_right_visitor_reason.setClickable(false);
}
--
Gitblit v1.8.0