From d6119c2d7fe2f802dd224d77bf2d95eeeedb4526 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 10 七月 2017 16:08:15 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java |   62 ++++++++++++-------------------
 1 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
index ca088c9..718a4ec 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
@@ -1,30 +1,28 @@
 package cn.com.basic.face.service;
 
-import android.widget.Toast;
+    import android.widget.Toast;
 
-import cn.com.basic.face.base.BaseApplication;
-import cn.com.basic.face.discern.common.CommonVariables;
-import cn.com.basic.face.discern.query.condition.CheckInQueryCondition;
-import cn.com.basic.face.discern.query.item.PhoneCallQueryItem;
-import cn.com.basic.face.fragment.CheckInFragment;
-import cn.com.basic.face.util.AppApi;
+    import cn.com.basic.face.base.BaseApplication;
+    import cn.com.basic.face.discern.common.CommonVariables;
+    import cn.com.basic.face.discern.query.condition.CheckInQueryCondition;
+    import cn.com.basic.face.fragment.CheckInFragment;
+    import cn.com.basic.face.util.AppApi;
 
-import org.xutils.http.RequestParams;
-import org.xutils.x;
+    import org.xutils.http.RequestParams;
+    import org.xutils.x;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
+    import java.util.ArrayList;
+    import java.util.Collections;
+    import java.util.Comparator;
+    import java.util.List;
 
-import cn.com.basic.face.discern.common.BaseCommonCallBack;
-import cn.com.basic.face.discern.query.condition.VisitorQueryCondition;
-import cn.com.basic.face.discern.query.item.CheckInQueryItem;
-import cn.com.basic.face.util.CharacterParser;
+    import cn.com.basic.face.discern.common.BaseCommonCallBack;
+    import cn.com.basic.face.discern.query.item.CheckInQueryItem;
+    import cn.com.basic.face.util.CharacterParser;
 
-public class CheckInMng {
+    public class CheckInMng extends BaseMng {
 
-    public static CheckInMng instance = new CheckInMng();
+        public static CheckInMng instance = new CheckInMng();
 
     public static CheckInMng getInstance() {
         return instance;
@@ -52,7 +50,7 @@
             return;
         }
         RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.CHECK_IN_QUERY);
-        String deviceCompanyId = BaseApplication.getInstance().getDevice().getDeviceCompanyId();
+        String deviceCompanyId = BaseApplication.getInstance().getAndroidDevice().getCompanyId();
         if (isVisitorList) {
             params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, deviceCompanyId);
         } else {
@@ -81,7 +79,7 @@
                 }
 
                 sort(list, isSortByDept);
-                List allItems = new ArrayList();
+                List itemList = new ArrayList();
                 String name = "";
                 String prev = "";
                 for (int i = 0; i < list.size(); i++) {
@@ -95,28 +93,16 @@
                         name = CharacterParser.getInstance().getSelling(item.getUsername()).substring(0, 1);
                     }
                     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);
-                        }
-                    }
-                }
+                addPageFooter(hasMorePages(), getPageNum(), itemList);
                 if (isVisitorList) {
-                    CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(allItems);
+                    CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(itemList);
                 } else {
-                    CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(allItems, isSortByDept, append);
+                    CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(itemList, isSortByDept, append);
                 }
             }
         });

--
Gitblit v1.8.0