From bcefcf7249692e61574438d3857e737c2fd29ca7 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 14 七月 2017 16:50:36 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 53 ++++++++++++++++++++---------------------------------
1 files changed, 20 insertions(+), 33 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 3be790b..20e21b3 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
@@ -5,7 +5,6 @@
import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.query.condition.CheckInQueryCondition;
-import cn.com.basic.face.discern.query.item.PhoneCallQueryItem;
import cn.com.basic.face.fragment.CheckInFragment;
import cn.com.basic.face.util.AppApi;
@@ -18,11 +17,10 @@
import java.util.List;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
-import cn.com.basic.face.discern.query.condition.VisitorQueryCondition;
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
import cn.com.basic.face.util.CharacterParser;
-public class CheckInMng {
+public class CheckInMng extends BaseMng {
public static CheckInMng instance = new CheckInMng();
@@ -52,14 +50,15 @@
return;
}
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.CHECK_IN_QUERY);
+ String deviceCompanyId = BaseApplication.getInstance().getAndroidDevice().getCompanyId();
if (isVisitorList) {
- params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, BaseApplication.getInstance().getDevice().getDeviceCompanyId());
+ params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, deviceCompanyId);
} else {
- params.addBodyParameter(CheckInQueryCondition.FieldNames.employeeCompanyId, BaseApplication.getInstance().getDevice().getDeviceCompanyId());
+ params.addBodyParameter(CheckInQueryCondition.FieldNames.employeeCompanyId, deviceCompanyId);
}
params.addBodyParameter(CheckInQueryCondition.FieldNames.username, searchText);
params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum+"");
- params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "5");
+ params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, CommonVariables.Page.DEFAULT_PAGE_SIZE);
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<CheckInQueryItem> list = getList(CheckInQueryItem.class);
@@ -80,7 +79,7 @@
}
sort(list, isSortByDept);
- List allItems = new ArrayList();
+ List itemList = new ArrayList();
String name = "";
String prev = "";
for (int i = 0; i < list.size(); i++) {
@@ -94,28 +93,16 @@
name = CharacterParser.getInstance().getSelling(item.getUsername()).substring(0, 1);
}
if (!name.equals(prev)) {
- allItems.add(name);
+ itemList.add(name);
}
- allItems.add(item);
+ itemList.add(item);
prev = name;
}
- if (hasMorePages()) {
- allItems.add(CommonVariables.Page.hasMorePages);
- } else {
- if (getPageNum() > 1) {
- allItems.add(CommonVariables.Page.reachBottom);
- } else {
- if (allItems.size() > 0) {
- allItems.add(CommonVariables.Page.reachBottom);
- } else {
- allItems.add(CommonVariables.Page.noMorePage);
- }
- }
- }
+ addPageFooter(hasMorePages(), getPageNum(), itemList);
if (isVisitorList) {
- CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(allItems, append);
+ CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(itemList);
} else {
- CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(allItems, isSortByDept, append);
+ CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(itemList, isSortByDept, append);
}
}
});
@@ -127,10 +114,10 @@
}
Collections.sort(list, new Comparator<CheckInQueryItem>() {
@Override
- public int compare(CheckInQueryItem t1, CheckInQueryItem t2) {
+ public int compare(CheckInQueryItem item1, CheckInQueryItem item2) {
if (sortedByDept) {
- String dept1Name = t1.getDeptName()==null?"":t1.getDeptName();
- String dept2Name = t2.getDeptName()==null?"":t2.getDeptName();
+ String dept1Name = item1.getDeptName()==null?"":item1.getDeptName();
+ String dept2Name = item2.getDeptName()==null?"":item2.getDeptName();
if(!dept1Name.equals(dept2Name)) {
String dept1Name_a = dept1Name.trim();
String dept1Name_b = dept2Name.trim();
@@ -141,13 +128,13 @@
return dept1Name_a.compareTo(dept1Name_b);
}
}
- String name1 = t1.getUsername()==null?"":t1.getUsername();
- String name2 = t2.getUsername()==null?"":t2.getUsername();
- String dept1Name_a = name1.trim();
- String dept1Name_b = name2.trim();
+ String username1 = item1.getUsername()==null?"":item1.getUsername();
+ String username2 = item2.getUsername()==null?"":item2.getUsername();
+ String dept1Name_a = username1.trim();
+ String dept1Name_b = username2.trim();
if (dept1Name_a.length() > 0 && dept1Name_b.length() > 0) {
- dept1Name_a = CharacterParser.getInstance().getSelling(name1).toLowerCase();
- dept1Name_b = CharacterParser.getInstance().getSelling(name2).toLowerCase();
+ dept1Name_a = CharacterParser.getInstance().getSelling(username1).toLowerCase();
+ dept1Name_b = CharacterParser.getInstance().getSelling(username2).toLowerCase();
}
return dept1Name_a.compareTo(dept1Name_b);
}
--
Gitblit v1.8.0