From b7caa566e4b9608552fab26603e041be646b28b0 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 29 三月 2017 12:05:38 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitorRegisterFragment.java | 69 ++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 29 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitorRegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitorRegisterFragment.java
index 3aefb43..96e27d3 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitorRegisterFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/VisitorRegisterFragment.java
@@ -10,6 +10,7 @@
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
+import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.TextView;
import android.widget.Toast;
@@ -54,7 +55,7 @@
private VisitorView mVisitorTo,mVisitorFrom;
private VisitorRecyclerViewAdapter mAdapter;
private EasyRecyclerView mRecyclerView;
- private List mList;
+ private List mList = new ArrayList();;
private static VisitorRegisterFragment instance = new VisitorRegisterFragment();
private TextView companyNameTv;
@@ -76,6 +77,10 @@
private TextView visitorReasonTv;
@ViewInject(R.id.visitor_register_search_et)
private EditText visitorRegisterSearchEt;
+ @ViewInject(R.id.visitor_register_rb_left)
+ private RadioButton visitorRegisterRbLeft;
+ @ViewInject(R.id.visitor_register_check_department)
+ private RadioButton visitorRegisterCheckDepartment;
public static VisitorRegisterFragment getInstance() {
return instance;
@@ -93,17 +98,25 @@
public void onCheckedChanged(RadioGroup radioGroup, int i) {
switch (radioGroup.getCheckedRadioButtonId()){
case R.id.visitor_register_rb_left:
+ //Toast.makeText(MainActivity.getInstance(), "鏉ヨ浜哄憳", Toast.LENGTH_SHORT).show();
mLlRadioGroupClass.setVisibility(View.GONE);
mAdapter = new VisitorRecyclerViewAdapter(getActivity(), Constant.VISITOR_FROM);
+ //mList.clear();
mAdapter.setList(mList);
mRecyclerView.setAdapter(mAdapter);
+ int pageNum = 1;
+ VisitorCheckInMng.getInstance().findVisitorList(pageNum+"", visitorRegisterSearchEt.getText().toString(), true);
break;
case R.id.visitor_register_rb_right:
+ //Toast.makeText(MainActivity.getInstance(), "琚浜哄憳", Toast.LENGTH_SHORT).show();
mLlRadioGroupClass.setVisibility(View.VISIBLE);
mAdapter = new VisitorRecyclerViewAdapter(getActivity(), Constant.VISITOR_TO);
mAdapter.setVisitorToColor(VisitorRecyclerViewAdapter.TYPE_NAME);
+ //mList.clear();
mAdapter.setList(mList);
mRecyclerView.setAdapter(mAdapter);
+ int pageNum1 = 1;
+ VisitorCheckInMng.getInstance().findIntervieweeList(pageNum1+"", visitorRegisterSearchEt.getText().toString(), true);
break;
}
}
@@ -125,6 +138,7 @@
sort(mList, true);
mAdapter.setList(mList);
mRecyclerView.setAdapter(mAdapter);
+
break;
}
}
@@ -134,17 +148,21 @@
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {}
@Override
- public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-// String searchContent = visitorRegisterSearchEt.getText().toString();
-// Toast.makeText(MainActivity.getInstance(), searchContent, Toast.LENGTH_SHORT).show();
- }
+ public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {}
@Override
public void afterTextChanged(Editable editable) {
- String searchContent = editable.toString();
- Toast.makeText(MainActivity.getInstance(), searchContent, Toast.LENGTH_SHORT).show();
+ loadList();
}
});
+ }
+
+ public void loadList() {
+ if (visitorRegisterRbLeft.isChecked()) {
+ VisitorCheckInMng.getInstance().findVisitorList(1+"", visitorRegisterSearchEt.getText().toString(), true);
+ } else {
+ VisitorCheckInMng.getInstance().findIntervieweeList(1+"", visitorRegisterSearchEt.getText().toString(), true);
+ }
}
private void sort(List<VisitorQueryItem> list, final boolean sortedByDept) {
@@ -152,36 +170,23 @@
@Override
public int compare(VisitorQueryItem t1, VisitorQueryItem t2) {
if (sortedByDept) {
- if(!t1.getDeptName().equals(t2.getDeptName())) {
- return t1.getDeptName().compareTo(t2.getDeptName());
+ String dept1Name = t1.getDeptName()==null?"":t1.getDeptName();
+ String dept2Name = t2.getDeptName()==null?"":t2.getDeptName();
+ if(!dept1Name.equals(dept2Name)) {
+ return dept1Name.compareTo(dept2Name);
}
}
- return t1.getName().compareTo(t2.getName());
+ String name1 = t1.getName()==null?"":t1.getName();
+ String name2 = t2.getName()==null?"":t2.getName();
+ return name1.compareTo(name2);
}
});
}
-
@Override
protected void initData() {
- mList = new ArrayList();
- for (int i=0;i<25;i++){
- //mList.add("");
- VisitorQueryItem item = new VisitorQueryItem();
- item.setName("鏉庡洓"+i);
- item.setCompanyName("璐濇�濈"+i);
- item.setIdentify("1001"+i);
- item.setImagePath("test.png");
- item.setPhone("136913486"+i);
- item.setMobilePhone("1369134876"+i);
- item.setPostName("鑱屽姟"+i);
- item.setDeptName("閮ㄩ棬"+(i%4));
- item.setImagePath("upload/oaImage/f6681e0822504f03aa70de847e471408.jpg");
- mList.add(item);
- }
- mAdapter.setList(mList);
- mRecyclerView.setAdapter(mAdapter);
+ loadList();
}
@Override
@@ -279,8 +284,14 @@
if (isClear) {
mList.clear();
}
+ if (visitorRegisterCheckDepartment.isChecked()) {
+ sort(list, false);
+ } else {
+ sort(list, true);
+ }
mList.addAll(list);
- mAdapter.notifyDataSetChanged();
+ mAdapter.setList(mList);
+ mRecyclerView.setAdapter(mAdapter);
}
public void setVisitorInfo(VisitorQueryItem item) {
--
Gitblit v1.8.0