From dcd1da326930c3ab0242156736a4f4870b052d64 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 21 四月 2017 11:37:58 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java                   |   15 +++++++++++++++
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/adapter/PhoneCallFragment.java              |    4 ++--
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java |   26 +++++++++++++++-----------
 3 files changed, 32 insertions(+), 13 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 e30ca5c..5a449d4 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
@@ -39,8 +39,8 @@
                 load_more_text_view.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        cn.com.basic.face.fragment.VisitFragment.getInstance().addPageNum();
-                        cn.com.basic.face.fragment.VisitFragment.getInstance().append();
+                        cn.com.basic.face.fragment.PhoneCallFragment.getInstance().addPageNum();
+                        cn.com.basic.face.fragment.PhoneCallFragment.getInstance().append();
                     }
                 });
                 return;
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 3f4ecfd..40d9fd6 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,9 +38,24 @@
         }
         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_NUM, pageNum+"");
         x.http().post(params, new BaseCommonCallBack() {
             public void success() {
+
                 List<PhoneCallQueryItem> list = getList(PhoneCallQueryItem.class);
+
+                if (append) {
+                    List prevList = PhoneCallFragment.getInstance().get_fragment_phone_call_left_list_view().getPrevList();
+                    if (prevList != null && prevList.size() > 0) {
+                        for (int i = 0; i < prevList.size(); i++) {
+                            Object item = prevList.get(i);
+                            if (item instanceof PhoneCallQueryItem) {
+                                list.add((PhoneCallQueryItem)item);
+                            }
+                        }
+                    }
+                }
                 sort(list, isSortByDept);
                 List allItems = new ArrayList();
                 String name = "";
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java
index e6f8075..e3f6ee7 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/phonecall/PhoneCallLeftListView.java
@@ -37,20 +37,20 @@
 
     public void show(boolean isSortByDept, List list, boolean append) {
         if (append) {
-            List newList = new ArrayList();
-            if (adapter.getList().size() > 0 &&  adapter.getList().get(adapter.getList().size()-1) instanceof Integer && ((int)adapter.getList().get(adapter.getList().size()-1))== CommonVariables.Page.hasMorePages) {
-                adapter.getList().remove(adapter.getList().size() - 1);
-            }
-            if (adapter.getList().size() > 0 &&  adapter.getList().get(adapter.getList().size()-1) instanceof
-                    Integer && ((int)adapter.getList().get(adapter.getList().size()-1))== CommonVariables.Page.noMorePage) {
-                adapter.getList().remove(adapter.getList().size() - 1);
-            }
-            newList.addAll(adapter.getList());
-            newList.addAll(list);
+//            List newList = new ArrayList();
+//            if (adapter.getList().size() > 0 &&  adapter.getList().get(adapter.getList().size()-1) instanceof Integer && ((int)adapter.getList().get(adapter.getList().size()-1))== CommonVariables.Page.hasMorePages) {
+//                adapter.getList().remove(adapter.getList().size() - 1);
+//            }
+//            if (adapter.getList().size() > 0 &&  adapter.getList().get(adapter.getList().size()-1) instanceof
+//                    Integer && ((int)adapter.getList().get(adapter.getList().size()-1))== CommonVariables.Page.noMorePage) {
+//                adapter.getList().remove(adapter.getList().size() - 1);
+//            }
+//            newList.addAll(adapter.getList());
+//            newList.addAll(list);
             if (adapter.getList().size() > 0) {
                 this.scrollToPosition(adapter.getList().size()-1);
             }
-            adapter.setList(newList);
+            adapter.setList(list);
         } else {
             adapter.setList(list);
         }
@@ -58,4 +58,8 @@
         adapter.setSortByDept(isSortByDept);
     }
 
+    public List getPrevList() {
+        return adapter.getList();
+    }
+
 }

--
Gitblit v1.8.0