From 77a4bfcf78c650f76d5c50b0554206d7a767f7fa Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期四, 30 三月 2017 13:04:26 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java | 125 +++++++++++++++++------------------------ 1 files changed, 53 insertions(+), 72 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 8dd53c3..2f07645 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 @@ -38,7 +38,6 @@ import cn.com.basic.face.discern.common.CommonVariables; import cn.com.basic.face.discern.entity.Visit; -import cn.com.basic.face.discern.query.item.FacePhotoItem; import cn.com.basic.face.discern.query.item.CheckInQueryItem; public class CheckInFragment extends MainUIBaseFragment { @@ -67,22 +66,27 @@ @ViewInject(R.id.fragment_check_in_left_list_view) private EasyRecyclerView fragment_check_in_left_list_view; @ViewInject(R.id.fragment_check_in_right_remark) - private EditText visitorRemarkEt; + private EditText fragment_check_in_right_remark; @ViewInject(R.id.fragment_check_in_right_visitor_reason) - private TextView visitorReasonTv; + private TextView fragment_check_in_right_visitor_reason; @ViewInject(R.id.fragment_check_in_left_search_edit_text) - private EditText visitorRegisterSearchEt; + private EditText fragment_check_in_left_search_edit_text; @ViewInject(R.id.fragment_check_in_left_visitor_radio) - private RadioButton visitorRegisterRbLeft; + private RadioButton fragment_check_in_left_visitor_radio; @ViewInject(R.id.fragment_check_in_left_sort_by_dept_radio_button) - private RadioButton visitorRegisterCheckDepartment; + 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 List<String> visitPurposeList = new ArrayList<String>(); + public CheckInRightVisitorCell getFragment_check_in_right_visitor_cell() { + return this.fragment_check_in_right_visitor_cell; + } - private CheckInQueryItem selectedVisitor; - private CheckInQueryItem selectedInterviewee; + public CheckInIntervieweeCell getFragment_check_in_right_interviewee_cell() { + return this.fragment_check_in_right_interviewee_cell; + } + + private List<String> visitPurposeList = new ArrayList<String>(); @Override public View addLeftLayout() { @@ -113,21 +117,13 @@ case R.id.fragment_check_in_left_visitor_radio: fragment_check_in_left_sort_type_linear_layout.setVisibility(View.GONE); mAdapter = new CheckInRightCellAdapter(getActivity(), Constant.VISITOR_CELL); - //mList.clear(); - mAdapter.setList(mList); - fragment_check_in_left_list_view.setAdapter(mAdapter); - int pageNum = 1; - CheckInMng.getInstance().findVisitorList(pageNum+"", visitorRegisterSearchEt.getText().toString(), true); + CheckInMng.getInstance().findVisitorList("1", fragment_check_in_left_search_edit_text.getText().toString(), true); break; case R.id.fragment_check_in_left_interviewee_radio: fragment_check_in_left_sort_type_linear_layout.setVisibility(View.VISIBLE); mAdapter = new CheckInRightCellAdapter(getActivity(), Constant.INTERVIEWEE_CELL); - mAdapter.setVisitorToColor(CheckInRightCellAdapter.TYPE_NAME); - //mList.clear(); - mAdapter.setList(mList); - fragment_check_in_left_list_view.setAdapter(mAdapter); - int pageNum1 = 1; - CheckInMng.getInstance().findIntervieweeList(pageNum1+"", visitorRegisterSearchEt.getText().toString(), true); + mAdapter.set_fragment_check_in_left_sort_radio_group_type(CheckInRightCellAdapter.TYPE_NAME); + CheckInMng.getInstance().findIntervieweeList("1", fragment_check_in_left_search_edit_text.getText().toString(), true); break; } } @@ -137,24 +133,19 @@ public void onCheckedChanged(RadioGroup radioGroup, int i) { switch (radioGroup.getCheckedRadioButtonId()){ case R.id.fragment_check_in_left_sort_by_name_radio_button: -// mAdapter.setVisitorToTextColor(CheckInRightCellAdapter.TYPE_NAME); - mAdapter.setVisitorToColor(CheckInRightCellAdapter.TYPE_NAME); + mAdapter.set_fragment_check_in_left_sort_radio_group_type(CheckInRightCellAdapter.TYPE_NAME); sort(mList, false); - mAdapter.setList(mList); - fragment_check_in_left_list_view.setAdapter(mAdapter); + refreshFragment_check_in_left_list_view(); break; case R.id.fragment_check_in_left_sort_by_dept_radio_button: -// mAdapter.setVisitorToTextColor(CheckInRightCellAdapter.TYPE_DEPARTMENT); - mAdapter.setVisitorToColor(CheckInRightCellAdapter.TYPE_DEPARTMENT); + mAdapter.set_fragment_check_in_left_sort_radio_group_type(CheckInRightCellAdapter.TYPE_DEPARTMENT); sort(mList, true); - mAdapter.setList(mList); - fragment_check_in_left_list_view.setAdapter(mAdapter); - + refreshFragment_check_in_left_list_view(); break; } } }); - visitorRegisterSearchEt.addTextChangedListener(new TextWatcher() { + 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) { loadList(); } @@ -162,11 +153,29 @@ } public void loadList() { - if (visitorRegisterRbLeft.isChecked()) { - CheckInMng.getInstance().findVisitorList(1+"", visitorRegisterSearchEt.getText().toString(), true); + if (fragment_check_in_left_visitor_radio.isChecked()) { + CheckInMng.getInstance().findVisitorList(1+"", fragment_check_in_left_search_edit_text.getText().toString(), true); } else { - CheckInMng.getInstance().findIntervieweeList(1+"", visitorRegisterSearchEt.getText().toString(), true); + CheckInMng.getInstance().findIntervieweeList(1+"", fragment_check_in_left_search_edit_text.getText().toString(), true); } + } + + public void listChanged(List list, boolean isClear) { + if (isClear) { + mList.clear(); + } + if (fragment_check_in_left_sort_by_dept_radio_button.isChecked()) { + sort(list, false); + } else { + sort(list, true); + } + mList.addAll(list); + refreshFragment_check_in_left_list_view(); + } + + private void refreshFragment_check_in_left_list_view() { + mAdapter.setList(mList); + fragment_check_in_left_list_view.setAdapter(mAdapter); } private void sort(List<CheckInQueryItem> list, final boolean sortedByDept) { @@ -208,16 +217,18 @@ @OnClick(R.id.fragment_check_in_right_save) public void save(View view) { - if (selectedVisitor == null || selectedInterviewee == null) { + CheckInQueryItem visitor = fragment_check_in_right_visitor_cell.getVisitor(); + CheckInQueryItem interviewee = fragment_check_in_right_interviewee_cell.getInterviewee(); + if (visitor == null || interviewee == null) { return; } RequestParams params = new RequestParams(); - params.addBodyParameter(Visit.FieldNames.matterId, DictionaryMng.getInstance().getId(CommonVariables.DictionaryType.VISIT_PURPOSE+visitorReasonTv.getText().toString())); - params.addBodyParameter(Visit.FieldNames.remark, visitorRemarkEt.getText().toString()); - params.addBodyParameter(Visit.FieldNames.visitorPersonId, selectedVisitor.getId()); - params.addBodyParameter(Visit.FieldNames.visiteePersonId, selectedInterviewee.getId()); - params.addBodyParameter(Visit.FieldNames.visitorCompanyId, selectedVisitor.getCompanyId()); - params.addBodyParameter(Visit.FieldNames.visiteeCompanyId, selectedInterviewee.getCompanyId()); + params.addBodyParameter(Visit.FieldNames.matterId, DictionaryMng.getInstance().getId(CommonVariables.DictionaryType.VISIT_PURPOSE+ 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.visitorCompanyId, visitor.getCompanyId()); + params.addBodyParameter(Visit.FieldNames.visiteeCompanyId, interviewee.getCompanyId()); CheckInMng.getInstance().add(params); } @@ -229,43 +240,13 @@ popup1.addOkButtonClickedListener(new OkButtonClickedListener() { @Override public void onItemSelected(int position, Object o, String item) { - visitorReasonTv.setText(item); + fragment_check_in_right_visitor_reason.setText(item); } }); } - public void visitorCheckIn(FacePhotoItem item) { -// fragment_check_in_right_visitor_cell.setTitle(item.getName()); - } - - public void visitorCheckIn(CheckInQueryItem item) { + public void checkInFromHomePage(CheckInQueryItem item) { fragment_check_in_left_interviewee_radio.performClick(); - fragment_check_in_right_visitor_cell.setVisitorInfo(item); - selectedVisitor = item; - } - - public void listChanged(List list, boolean isClear) { - if (isClear) { - mList.clear(); - } - if (visitorRegisterCheckDepartment.isChecked()) { - sort(list, false); - } else { - sort(list, true); - } - mList.addAll(list); - mAdapter.setList(mList); - fragment_check_in_left_list_view.setAdapter(mAdapter); - } - - public void setVisitorInfo(CheckInQueryItem item) { - fragment_check_in_right_visitor_cell.setVisitorInfo(item); - selectedVisitor = item; - } - - public void setIntervieweeInfo(final CheckInQueryItem item) { - fragment_check_in_right_interviewee_cell.setIntervieweeInfo(item); - selectedInterviewee = item; } public void setVisitPurposeList(List<String> visitPurposeList) { -- Gitblit v1.8.0