From bef8d3da93bc4f16b1ff11da5f41c758f4f7d70d Mon Sep 17 00:00:00 2001
From: qvyuanxin <qvyuanxin@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 21 七月 2017 11:04:31 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 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..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
@@ -72,7 +72,7 @@
private String visitorSearchText;
private String intervieweeSearchText;
-// private boolean ignore
+ private boolean ignoreSearchText = false;
private int pageNum = 1;
@@ -96,8 +96,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 +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
@@ -207,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);
}
@@ -221,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(
--
Gitblit v1.8.0