From 735a0a05e380f445b3ce3c7810327e44bc240f17 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 11 五月 2017 16:10:43 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java | 95 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 81 insertions(+), 14 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 2402045..0bcf130 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
@@ -1,13 +1,14 @@
package cn.com.basic.face.fragment;
+import android.content.Context;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.View;
+import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.RadioButton;
import android.widget.RadioGroup;
-import android.widget.TextView;
import android.widget.Toast;
import com.bsk.zhangbo.demoforbsk.R;
@@ -32,7 +33,6 @@
import org.xutils.http.RequestParams;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -60,7 +60,7 @@
@ViewInject(R.id.fragment_check_in_right_remark)
private EditText fragment_check_in_right_remark;
@ViewInject(R.id.fragment_check_in_right_visitor_reason)
- private TextView fragment_check_in_right_visitor_reason;
+ private EditText fragment_check_in_right_visitor_reason;
@ViewInject(R.id.fragment_check_in_left_search_edit_text)
private EditText fragment_check_in_left_search_edit_text;
@ViewInject(R.id.fragment_check_in_left_visitor_radio)
@@ -69,6 +69,10 @@
private RadioButton fragment_check_in_left_sort_by_dept_radio_button;
@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;
@@ -87,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();
+ }
+ }
}
});
@@ -102,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();
+ }
});
}
@@ -121,13 +146,17 @@
}
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);
+ }
}
@Override
@@ -147,7 +176,7 @@
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) {
@@ -177,22 +206,60 @@
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.StatusID.VISITOR_ENTERED);
+ params.addBodyParameter(Visit.FieldNames.currentStateId, ""+CommonVariables.VisitType.VISITOR_ENTERED);
+ params.addBodyParameter(Visit.FieldNames.warning, visitor.getWarning());
- params.addBodyParameter(VisitDetail.FieldNames.stateId, ""+CommonVariables.StatusID.VISITOR_ENTERED);
+ 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)
+ @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)
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(
+ Context.INPUT_METHOD_SERVICE);
+ imm.hideSoftInputFromWindow(fragment_check_in_right_visitor_reason.getWindowToken(), 0);
new SelectDialog(getView(), Constant.DialogSelectType.VISIT_REASON, new OkClickedListener() {
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);
+ }
+
+ @OnClick(R.id.fragment_check_in_right_parent)
+ public void fragment_check_in_right_linear_layout_click(View view) {
+ InputMethodManager imm = (InputMethodManager)MainActivity.getInstance().getSystemService(
+ Context.INPUT_METHOD_SERVICE);
+ imm.hideSoftInputFromWindow(fragment_check_in_right_visitor_reason.getWindowToken(), 0);
+ }
+
+ @OnClick(R.id.fragment_check_in_left_parent)
+ public void fragment_check_in_left_parent_click(View view) {
+ InputMethodManager imm = (InputMethodManager)MainActivity.getInstance().getSystemService(
+ Context.INPUT_METHOD_SERVICE);
+ imm.hideSoftInputFromWindow(fragment_check_in_right_visitor_reason.getWindowToken(), 0);
+ }
+
+ @OnClick(R.id.fragment_check_in_right_visitor_reason_edit)
+ public void fragment_check_in_right_visitor_reason_edit_click(View view) {
+ fragment_check_in_right_visitor_reason.setFocusableInTouchMode(true);
+ fragment_check_in_right_visitor_reason.requestFocus();
+ InputMethodManager imm = (InputMethodManager)MainActivity.getInstance().getSystemService(Context.INPUT_METHOD_SERVICE);
+ imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
}
public void checkInFromHomePage(CheckInQueryItem item) {
--
Gitblit v1.8.0