From abdbd618b87ff042815e99507111f96564348446 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 12 四月 2017 16:19:04 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 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 104a473..6f67618 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
@@ -24,11 +24,11 @@
public void findPhoneCallLeftList(final boolean isSortByDept, String searchText) {
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.PHONE_CALL_QUERY);
- params.addBodyParameter(PhoneCallQueryCondition.FieldNames.name, searchText);
+ params.addBodyParameter(PhoneCallQueryCondition.FieldNames.username, searchText);
x.http().post(params, new BaseCommonCallBack() {
public void success() {
List<PhoneCallQueryItem> list = getList(PhoneCallQueryItem.class);
- //sort(list, isSortByDept);
+ sort(list, isSortByDept);
List allItems = new ArrayList();
String name = "";
String prev = "";
@@ -36,9 +36,13 @@
PhoneCallQueryItem item = list.get(i);
try {
if (isSortByDept) {
- //name = CharacterParser.getInstance().getSelling(item.getDeptName()).substring(0, 1);
+ if (item.getCallerDept() != null && item.getCallerDept().length() > 0) {
+ name = CharacterParser.getInstance().getSelling(item.getCallerDept()).substring(0, 1);
+ }
} else {
- //name = CharacterParser.getInstance().getSelling(item.getUsername()).substring(0, 1);
+ if (item.getCaller() != null && item.getCaller().length() > 0) {
+ name = CharacterParser.getInstance().getSelling(item.getCaller()).substring(0, 1);
+ }
}
} catch (Exception e) {
@@ -59,18 +63,26 @@
@Override
public int compare(PhoneCallQueryItem t1, PhoneCallQueryItem t2) {
if (sortedByDept) {
- String dept1Name = t1.getDeptName()==null?"":t1.getDeptName();
- String dept2Name = t2.getDeptName()==null?"":t2.getDeptName();
+ String dept1Name = t1.getCallerDept()==null?"":t1.getCallerDept();
+ String dept2Name = t2.getCallerDept()==null?"":t2.getCallerDept();
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.getUsername()==null?"":t1.getUsername();
- String name2 = t2.getUsername()==null?"":t2.getUsername();
- String dept1Name_a = CharacterParser.getInstance().getSelling(name1).toLowerCase();
- String dept1Name_b = CharacterParser.getInstance().getSelling(name2).toLowerCase();
+ String name1 = t1.getCaller()==null?"":t1.getCaller();
+ String name2 = t2.getCaller()==null?"":t2.getCaller();
+ 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