From fae4c47aa2842f08294d0eaaf9aef4df4001c111 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 12 四月 2017 11:42:38 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java | 46 ++++++++++++++++++++++++++++++----------------
1 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java
index dc40388..0edb454 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java
@@ -8,13 +8,11 @@
import java.util.Comparator;
import java.util.List;
-import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
-import cn.com.basic.face.discern.query.condition.VisitorQueryCondition;
-import cn.com.basic.face.fragment.CheckInFragment;
+import cn.com.basic.face.discern.query.condition.PhoneCallQueryCondition;
+import cn.com.basic.face.discern.query.item.PhoneCallQueryItem;
import cn.com.basic.face.fragment.PhoneCallFragment;
import cn.com.basic.face.util.AppApi;
-import cn.com.basic.face.service.vo.PhoneCallFragment.PhoneCallQueryItem;
import cn.com.basic.face.util.CharacterParser;
public class PhoneCallMng {
@@ -25,8 +23,8 @@
}
public void findPhoneCallLeftList(final boolean isSortByDept, String searchText) {
- RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.CheckInQuery);
- params.addBodyParameter(VisitorQueryCondition.FieldNames.name, searchText);
+ RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.PHONE_CALL_QUERY);
+ params.addBodyParameter(PhoneCallQueryCondition.FieldNames.name, searchText);
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<PhoneCallQueryItem> list = getList(PhoneCallQueryItem.class);
@@ -36,10 +34,18 @@
String prev = "";
for (int i = 0; i < list.size(); i++) {
PhoneCallQueryItem item = list.get(i);
- if (isSortByDept) {
- name = CharacterParser.getInstance().getSelling(item.getDeptName()).substring(0, 1);
- } else {
- name = CharacterParser.getInstance().getSelling(item.getName()).substring(0, 1);
+ try {
+ if (isSortByDept) {
+ if (item.getDeptName() != null && item.getDeptName().length() > 0) {
+ name = CharacterParser.getInstance().getSelling(item.getDeptName()).substring(0, 1);
+ }
+ } else {
+ if (item.getUsername() != null && item.getUsername().length() > 0) {
+ name = CharacterParser.getInstance().getSelling(item.getUsername()).substring(0, 1);
+ }
+ }
+ } catch (Exception e) {
+
}
if (!name.equals(prev)) {
allItems.add(name);
@@ -60,15 +66,23 @@
String dept1Name = t1.getDeptName()==null?"":t1.getDeptName();
String dept2Name = t2.getDeptName()==null?"":t2.getDeptName();
if(!dept1Name.equals(dept2Name)) {
- String dept1Name_a = CharacterParser.getInstance().getSelling(dept1Name).toLowerCase();
- String dept1Name_b = CharacterParser.getInstance().getSelling(dept2Name).toLowerCase();
+ String dept1Name_a = dept1Name.trim();
+ String dept1Name_b = dept2Name.trim();
+ if (dept1Name_a.length() > 0 && dept1Name_b.length() > 0) {
+ dept1Name_a = CharacterParser.getInstance().getSelling(dept1Name).toLowerCase();
+ dept1Name_b = CharacterParser.getInstance().getSelling(dept2Name).toLowerCase();
+ }
return dept1Name_a.compareTo(dept1Name_b);
}
}
- String name1 = t1.getName()==null?"":t1.getName();
- String name2 = t2.getName()==null?"":t2.getName();
- String dept1Name_a = CharacterParser.getInstance().getSelling(name1).toLowerCase();
- String dept1Name_b = CharacterParser.getInstance().getSelling(name2).toLowerCase();
+ String name1 = t1.getUsername()==null?"":t1.getUsername();
+ String name2 = t2.getUsername()==null?"":t2.getUsername();
+ String dept1Name_a = name1.trim();
+ String dept1Name_b = name2.trim();
+ if (dept1Name_a.length() > 0 && dept1Name_b.length() > 0) {
+ dept1Name_a = CharacterParser.getInstance().getSelling(name1).toLowerCase();
+ dept1Name_b = CharacterParser.getInstance().getSelling(name2).toLowerCase();
+ }
return dept1Name_a.compareTo(dept1Name_b);
}
});
--
Gitblit v1.8.0