From 1fe0c079105d74f70455bbe925be2376e61de27f Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 18 七月 2017 12:01:59 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java |   29 ++++++++---------------------
 1 files changed, 8 insertions(+), 21 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 4d6a3d8..80540f6 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
@@ -20,12 +20,11 @@
 import cn.com.basic.face.discern.query.condition.PhoneCallQueryCondition;
 import cn.com.basic.face.discern.query.item.CheckInQueryItem;
 import cn.com.basic.face.discern.query.item.PhoneCallQueryItem;
-import cn.com.basic.face.fragment.CheckInFragment;
 import cn.com.basic.face.fragment.PhoneCallFragment;
 import cn.com.basic.face.util.AppApi;
 import cn.com.basic.face.util.CharacterParser;
 
-public class PhoneCallMng {
+public class PhoneCallMng extends BaseMng {
 
     private static PhoneCallMng instance = new PhoneCallMng();
     public static PhoneCallMng getInstance() {
@@ -38,7 +37,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, "20");
+        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() {
@@ -57,7 +56,7 @@
                     }
                 }
                 sort(list, isSortByDept);
-                List allItems = new ArrayList();
+                List itemList = new ArrayList();
                 String name = "";
                 String prev = "";
                 for (int i = 0; i < list.size(); i++) {
@@ -76,25 +75,13 @@
 
                     }
                     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);
-                        }
-                    }
-                }
-                PhoneCallFragment.getInstance().get_fragment_phone_call_left_list_view().show(isSortByDept, allItems, append);
+                addPageFooter(hasMorePages(), getPageNum(), itemList);
+                PhoneCallFragment.getInstance().get_fragment_phone_call_left_list_view().show(isSortByDept, itemList, append);
             }
         });
     }
@@ -143,7 +130,7 @@
         RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.PHONE_CALL_ADD);
         params.addBodyParameter(PhoneCall.FieldNames.date, sdf.format(new Date()));
         params.addBodyParameter(PhoneCall.FieldNames.calleeId, interviewee.getRegisterId());
-        params.addBodyParameter(PhoneCall.FieldNames.deviceId, BaseApplication.getInstance().getDevice().getDeviceId());
+        params.addBodyParameter(PhoneCall.FieldNames.deviceId, BaseApplication.getInstance().getAndroidDevice().getDeviceId());
         params.addBodyParameter(PhoneCall.FieldNames.callerId, visitor.getRegisterId());
         x.http().post(params, new BaseCommonCallBack() {
             public void success() {

--
Gitblit v1.8.0