From ff93094cd08e8486242e60e9f076ebfd66b83e9c Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期五, 31 三月 2017 17:23:59 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 50 ++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 44 insertions(+), 6 deletions(-) diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java index 9f455ca..6290497 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java @@ -3,12 +3,16 @@ import android.widget.Toast; import cn.com.basic.face.base.BaseApplication; -import cn.com.basic.face.fragment.HomeFragment; import cn.com.basic.face.fragment.CheckInFragment; +import cn.com.basic.face.fragment.SupervisoryFragment; import cn.com.basic.face.util.AppApi; import org.xutils.http.RequestParams; import org.xutils.x; + +import java.util.Collections; +import java.util.Comparator; +import java.util.List; import cn.com.basic.face.discern.common.BaseCommonCallBack; import cn.com.basic.face.discern.query.condition.VisitorQueryCondition; @@ -29,14 +33,14 @@ /** * 鏌ヨ鏉ヨ浜哄憳鍒楄〃 */ - public void findVisitorList(String pageNum, String name, final boolean isClear) { + public void findSupervisoryBottomList(String pageNum, String name, final boolean isClear) { //id锛屽悕绉帮紝澶村儚璺緞锛岃仈绯荤數璇濓紝鍏徃鍚嶇О锛岃瘉浠剁紪鍙� RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.CheckInQuery); params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId()); params.addBodyParameter(VisitorQueryCondition.FieldNames.name, name); x.http().post(params, new BaseCommonCallBack() { public void success() { - CheckInFragment.getInstance().listChanged(getList(CheckInQueryItem.class), isClear); + //CheckInFragment.getInstance().listChanged(getList(CheckInQueryItem.class), isClear); } }); } @@ -44,13 +48,13 @@ /** * 鏌ヨ鏉ヨ浜哄憳鍒楄〃 */ - public void findVisitorList() { + public void findSupervisoryBottomList() { //id锛屽悕绉帮紝澶村儚璺緞锛岃仈绯荤數璇濓紝鍏徃鍚嶇О锛岃瘉浠剁紪鍙� RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.CheckInQuery); params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId()); x.http().post(params, new BaseCommonCallBack() { public void success() { - HomeFragment.getInstance().visitorListChanged(getList(CheckInQueryItem.class)); + //SupervisoryFragment.getInstance().visitorListChanged(getList(CheckInQueryItem.class)); } }); } @@ -64,7 +68,7 @@ params.addBodyParameter(VisitorQueryCondition.FieldNames.name, name); x.http().post(params, new BaseCommonCallBack() { public void success() { - CheckInFragment.getInstance().listChanged(getList(CheckInQueryItem.class), isClear); + //CheckInFragment.getInstance().listChanged(getList(CheckInQueryItem.class), isClear); } }); } @@ -85,6 +89,40 @@ } + public void findCheckInLeftList(final boolean isVisitorList, final boolean isSortByDept, String searchText) { + RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.CheckInQuery); + if (isVisitorList) { + params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId()); + } else { + params.addBodyParameter(VisitorQueryCondition.FieldNames.companyId, BaseApplication.getInstance().getPlace().getCompanyId()); + } + params.addBodyParameter(VisitorQueryCondition.FieldNames.name, searchText); + x.http().post(params, new BaseCommonCallBack() { + public void success() { + List<CheckInQueryItem> list = getList(CheckInQueryItem.class); + sort(list, isSortByDept); + CheckInFragment.getInstance().get_fragment_check_in_left_list_view().show(list, isVisitorList); + } + }); + } + + private void sort(List<CheckInQueryItem> list, final boolean sortedByDept) { + Collections.sort(list, new Comparator<CheckInQueryItem>() { + @Override + public int compare(CheckInQueryItem t1, CheckInQueryItem t2) { + if (sortedByDept) { + String dept1Name = t1.getDeptName()==null?"":t1.getDeptName(); + String dept2Name = t2.getDeptName()==null?"":t2.getDeptName(); + if(!dept1Name.equals(dept2Name)) { + return dept1Name.compareTo(dept2Name); + } + } + String name1 = t1.getName()==null?"":t1.getName(); + String name2 = t2.getName()==null?"":t2.getName(); + return name1.compareTo(name2); + } + }); + } /** * 鏌ヨ鎷滆浜嬬敱鍒楄〃 -- Gitblit v1.8.0