From 7e669fb9fd825919c6d9268930dbec15c760a6a8 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 21 四月 2017 11:55:54 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java | 18 +++++++++---------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/PhoneCallFragment.java | 13 ++++++++-----
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/PhoneCallFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/PhoneCallFragment.java
index 5a449d4..806ffb5 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/PhoneCallFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/PhoneCallFragment.java
@@ -51,18 +51,21 @@
return;
}
TextView fragment_phone_call_left_row_name = viewHolder.findViewById(R.id.fragment_phone_call_left_row_name);
- TextView fragment_phone_call_left_row_dept = viewHolder.findViewById(R.id.fragment_phone_call_left_interviewee_row_dept);
+ TextView fragment_phone_call_left_interviewee_row_dept = viewHolder.findViewById(R.id.fragment_phone_call_left_interviewee_row_dept);
+ SimpleDraweeView fragment_phone_call_left_row_photo = viewHolder.findViewById(R.id.fragment_phone_call_left_row_photo);
+
if (isSortByDept) {
fragment_phone_call_left_row_name.setTextColor(MainActivity.getInstance().getResources().getColor(R.color.colorText_b));
- fragment_phone_call_left_row_dept.setTextColor(MainActivity.getInstance().getResources().getColor(R.color.colorText_5));
+ fragment_phone_call_left_interviewee_row_dept.setTextColor(MainActivity.getInstance().getResources().getColor(R.color.colorText_5));
} else {
fragment_phone_call_left_row_name.setTextColor(MainActivity.getInstance().getResources().getColor(R.color.colorText_5));
- fragment_phone_call_left_row_dept.setTextColor(MainActivity.getInstance().getResources().getColor(R.color.colorText_b));
+ fragment_phone_call_left_interviewee_row_dept.setTextColor(MainActivity.getInstance().getResources().getColor(R.color.colorText_b));
}
final PhoneCallQueryItem item = getItem(position);
+
fragment_phone_call_left_row_name.setText(item.getCallee());
- fragment_phone_call_left_row_dept.setText(item.getCallerDept());
- SimpleDraweeView fragment_phone_call_left_row_photo = viewHolder.findViewById(R.id.fragment_phone_call_left_row_photo);
+ fragment_phone_call_left_interviewee_row_dept.setText(item.getCalleeDept());
+
if (item.getCallerImage() != null && !"".equals(item.getCallerImage())) {
fragment_phone_call_left_row_photo.setImageURI(AppApi.IMAGE_URL_BASE +item.getCallerImage());
} else {
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..8d6c74d 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, "6");
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) {
@@ -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