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

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/PhoneCallMng.java |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 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 36f2cf7..d0ba9b3 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
@@ -17,6 +17,7 @@
 import cn.com.basic.face.discern.common.BaseCommonCallBack;
 import cn.com.basic.face.discern.common.CommonVariables;
 import cn.com.basic.face.discern.common.ResultBean;
+import cn.com.basic.face.discern.common.SqliteSqlBean;
 import cn.com.basic.face.discern.entity.PhoneCall;
 import cn.com.basic.face.discern.query.condition.PhoneCallQueryCondition;
 import cn.com.basic.face.discern.query.item.CheckInQueryItem;
@@ -25,6 +26,7 @@
 import cn.com.basic.face.service.sqlite.PhoneCallDao;
 import cn.com.basic.face.util.AppApi;
 import cn.com.basic.face.util.CharacterParser;
+import cn.com.basic.face.util.SqliteSqlUtil;
 
 public class PhoneCallMng extends BaseMng {
 
@@ -42,17 +44,18 @@
             params.addBodyParameter(PhoneCallQueryCondition.FieldNames.username, searchText);
             params.addBodyParameter(CommonVariables.Page.PAGE_SIZE, CommonVariables.Page.DEFAULT_PAGE_SIZE);
             params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum+"");
+            params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
             x.http().post(params, new BaseCommonCallBack() {
                 public void success() {
                     findPhoneCallLeftListAfterReturn(resultBean, isSortByDept, append);
                 }
             });
         } else {
-            findPhoneCallLeftListAfterReturn(PhoneCallDao.getInstance().findPhoneCallLeftList(searchText, pageNum), isSortByDept, append);
+             findPhoneCallLeftListAfterReturn(PhoneCallDao.getInstance().findPhoneCallLeftList(searchText, pageNum), isSortByDept, append);
         }
     }
 
-    private void findPhoneCallLeftListAfterReturn(ResultBean resultBean, boolean isSortByDept, boolean append) {
+    private void findPhoneCallLeftListAfterReturn(ResultBean resultBean, final boolean isSortByDept, final boolean append) {
         List<PhoneCallQueryItem> list = resultBean.getList(PhoneCallQueryItem.class);
 
         if (append) {
@@ -67,7 +70,7 @@
             }
         }
         sort(list, isSortByDept);
-        List itemList = new ArrayList();
+        final List itemList = new ArrayList();
         String name = "";
         String prev = "";
         for (int i = 0; i < list.size(); i++) {
@@ -92,7 +95,16 @@
             prev = name;
         }
         addPageFooter(resultBean.hasMorePages(), resultBean.getPageNum(), itemList);
-        PhoneCallFragment.getInstance().get_fragment_phone_call_left_list_view().show(isSortByDept, itemList, append);
+        if (BaseApplication.getInstance().networkAvailable()) {
+            PhoneCallFragment.getInstance().get_fragment_phone_call_left_list_view().show(isSortByDept, itemList, append);
+        } else {
+            MainActivity.getInstance().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    PhoneCallFragment.getInstance().get_fragment_phone_call_left_list_view().show(isSortByDept, itemList, append);
+                }
+            });
+        }
     }
 
     private void sort(List<PhoneCallQueryItem> list, final boolean sortedByDept) {
@@ -142,8 +154,10 @@
             params.addBodyParameter(PhoneCall.FieldNames.calleeId, interviewee.getRegisterId());
             params.addBodyParameter(PhoneCall.FieldNames.deviceId, BaseApplication.getInstance().getAndroidDevice().getDeviceId());
             params.addBodyParameter(PhoneCall.FieldNames.callerId, visitor.getRegisterId());
+            params.addBodyParameter("deviceCompanyId", BaseApplication.getInstance().getAndroidDevice().getCompanyId());
             x.http().post(params, new BaseCommonCallBack() {
                 public void success() {
+                    SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
                 }
             });
         } else {

--
Gitblit v1.8.0