From 0d2d3d6cb41f54531ab4c24c75298caff19574f2 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 27 四月 2017 10:29:38 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java | 24 ++++++++++++------------
1 files changed, 12 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 c280c0a..9c7f326 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
@@ -38,7 +38,7 @@
}
RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.PHONE_CALL_QUERY);
params.addBodyParameter(PhoneCallQueryCondition.FieldNames.username, searchText);
- params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, "5");
+ params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, CommonVariables.Page.DEFAULT_PAGE_SIZE);
params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum+"");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
@@ -64,12 +64,12 @@
PhoneCallQueryItem item = list.get(i);
try {
if (isSortByDept) {
- if (item.getCallerDept() != null && item.getCallerDept().length() > 0) {
- name = CharacterParser.getInstance().getSelling(item.getCallerDept()).substring(0, 1);
+ if (item.getCalleeDept() != null && item.getCalleeDept().length() > 0) {
+ name = CharacterParser.getInstance().getSelling(item.getCalleeDept()).substring(0, 1);
}
} else {
- if (item.getCaller() != null && item.getCaller().length() > 0) {
- name = CharacterParser.getInstance().getSelling(item.getCaller()).substring(0, 1);
+ if (item.getCallee() != null && item.getCallee().length() > 0) {
+ name = CharacterParser.getInstance().getSelling(item.getCallee()).substring(0, 1);
}
}
} catch (Exception e) {
@@ -85,12 +85,12 @@
allItems.add(CommonVariables.Page.hasMorePages);
} else {
if (getPageNum() > 1) {
- allItems.add(CommonVariables.Page.reachBottom);
+ //allItems.add(CommonVariables.Page.reachBottom);
} else {
if (allItems.size() > 0) {
- allItems.add(CommonVariables.Page.reachBottom);
+ //allItems.add(CommonVariables.Page.reachBottom);
} else {
- allItems.add(CommonVariables.Page.noMorePage);
+ //allItems.add(CommonVariables.Page.noMorePage);
}
}
}
@@ -104,8 +104,8 @@
@Override
public int compare(PhoneCallQueryItem t1, PhoneCallQueryItem t2) {
if (sortedByDept) {
- String dept1Name = t1.getCallerDept()==null?"":t1.getCallerDept();
- String dept2Name = t2.getCallerDept()==null?"":t2.getCallerDept();
+ String dept1Name = t1.getCalleeDept()==null?"":t1.getCalleeDept();
+ String dept2Name = t2.getCalleeDept()==null?"":t2.getCalleeDept();
if(!dept1Name.equals(dept2Name)) {
String dept1Name_a = dept1Name.trim();
String dept1Name_b = dept2Name.trim();
@@ -116,8 +116,8 @@
return dept1Name_a.compareTo(dept1Name_b);
}
}
- String name1 = t1.getCaller()==null?"":t1.getCaller();
- String name2 = t2.getCaller()==null?"":t2.getCaller();
+ String name1 = t1.getCallee()==null?"":t1.getCallee();
+ String name2 = t2.getCallee()==null?"":t2.getCallee();
String dept1Name_a = name1.trim();
String dept1Name_b = name2.trim();
if (dept1Name_a.length() > 0 && dept1Name_b.length() > 0) {
--
Gitblit v1.8.0