From d6f612e55872c1b891b1cf5b4c5eaa0ed80188ce Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期日, 23 七月 2017 17:16:39 +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/service/AttendanceMng.java |   38 ++++++++++++++++--
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java   |   23 +++++++----
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java      |   16 ++++++-
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java    |   24 +++++++++--
 5 files changed, 91 insertions(+), 25 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
index 05e56d9..2d5d251 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
@@ -8,6 +8,7 @@
 import java.util.List;
 
 import cn.com.basic.face.base.BaseApplication;
+import cn.com.basic.face.base.MainActivity;
 import cn.com.basic.face.discern.common.BaseCommonCallBack;
 import cn.com.basic.face.discern.common.CommonVariables;
 import cn.com.basic.face.discern.common.ResultBean;
@@ -47,9 +48,9 @@
         }
     }
 
-    public void reloadLeftListAfterReturn(boolean append, ResultBean resultBean) {
+    public void reloadLeftListAfterReturn(final boolean append, ResultBean resultBean) {
         List<AttendanceQueryItem> list = resultBean.getList(AttendanceQueryItem.class);
-        List itemList = new ArrayList();
+        final List itemList = new ArrayList();
         int i = 0;
         String previewDate = "";
         if (append) {
@@ -72,10 +73,32 @@
             i++;
         }
         addPageFooter(resultBean.hasMorePages(), resultBean.getPageNum(), itemList);
-        AttendanceFragment.getInstance().get_fragment_attendance_left_list_view().show(itemList, append);
+        if (BaseApplication.getInstance().networkAvailable()) {
+            AttendanceFragment.getInstance().get_fragment_attendance_left_list_view().show(itemList, append);
+        } else {
+            MainActivity.getInstance().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    AttendanceFragment.getInstance().get_fragment_attendance_left_list_view().show(itemList, append);
+                }
+            });
+        }
     }
+    /*
+    if (BaseApplication.getInstance().networkAvailable()) {
 
-    public void reloadAttendanceDetail(AttendanceQueryItem item) {
+        } else {
+            MainActivity.getInstance().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+
+                }
+            });
+        }
+
+     */
+
+    public void reloadAttendanceDetail(final AttendanceQueryItem item) {
         if (!BaseApplication.deviceAvailable) {
             return;
         }
@@ -96,7 +119,12 @@
                 e.printStackTrace();
             }
         } else {
-            AttendanceFragment.getInstance().get_fragment_attendance_right_list_view().show(AttendanceDao.getInstance().reloadAttendanceDetail(item));
+            MainActivity.getInstance().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    AttendanceFragment.getInstance().get_fragment_attendance_right_list_view().show(AttendanceDao.getInstance().reloadAttendanceDetail(item));
+                }
+            });
         }
     }
 
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 f3940ac..540bacf 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
@@ -3,6 +3,7 @@
 import android.widget.Toast;
 
 import cn.com.basic.face.base.BaseApplication;
+import cn.com.basic.face.base.MainActivity;
 import cn.com.basic.face.discern.common.CommonVariables;
 import cn.com.basic.face.discern.common.ResultBean;
 import cn.com.basic.face.discern.common.SqliteSqlBean;
@@ -92,7 +93,7 @@
         }
     }
 
-    public void findCheckInLeftListAfterReturn(ResultBean resultBean, boolean isVisitorList, boolean isSortByDept, boolean append) {
+    public void findCheckInLeftListAfterReturn(ResultBean resultBean, final boolean isVisitorList, final boolean isSortByDept, final boolean append) {
         List<CheckInQueryItem> list = resultBean.getList(CheckInQueryItem.class);
 
         List prevList = null;
@@ -111,7 +112,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++) {
@@ -131,10 +132,23 @@
             prev = name;
         }
         addPageFooter(resultBean.hasMorePages(), resultBean.getPageNum(), itemList);
-        if (isVisitorList) {
-            CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(itemList);
+        if (BaseApplication.getInstance().networkAvailable()) {
+            if (isVisitorList) {
+                CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(itemList);
+            } else {
+                CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(itemList, isSortByDept, append);
+            }
         } else {
-            CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(itemList, isSortByDept, append);
+            MainActivity.getInstance().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    if (isVisitorList) {
+                        CheckInFragment.getInstance().get_fragment_check_in_left_visitor().show(itemList);
+                    } else {
+                        CheckInFragment.getInstance().get_fragment_check_in_left_interviewee().show(itemList, isSortByDept, append);
+                    }
+                }
+            });
         }
     }
 
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 f08bd5c..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
@@ -55,7 +55,7 @@
         }
     }
 
-    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) {
@@ -70,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++) {
@@ -95,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) {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
index 7f53bb3..af744ff 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/RegisterMng.java
@@ -103,14 +103,20 @@
                 long registerId = RegisterDao.getInstance().add(offlineVisitorRegisterItem);
                 if (registerId > 0) {
                     MainActivity.selectPage(2);
-                    ResultBean resultBean = (ResultBean) CheckInDao.getInstance().findCheckInLeftVisitorListByVisitorId(registerId);
-                    CheckInMng.getInstance().findCheckInLeftListAfterReturn(resultBean, true, false, false);
-                    List<CheckInQueryItem> list = (List<CheckInQueryItem>)resultBean.getData();
-                    if (list != null && list.size() > 0) {
-                        CheckInFragment.getInstance().checkInFromHomePage(list.get(0));
-                    }
-                    Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
-                    VisitorRegisterFragment.getInstance().resetForm();
+                    final ResultBean resultBean = (ResultBean) CheckInDao.getInstance().findCheckInLeftVisitorListByVisitorId(registerId);
+
+                    MainActivity.getInstance().runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            CheckInMng.getInstance().findCheckInLeftListAfterReturn(resultBean, true, false, false);
+                            List<CheckInQueryItem> list = (List<CheckInQueryItem>)resultBean.getData();
+                            if (list != null && list.size() > 0) {
+                                CheckInFragment.getInstance().checkInFromHomePage(list.get(0));
+                            }
+                            Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
+                            VisitorRegisterFragment.getInstance().resetForm();
+                        }
+                    });
                 } else {
                     MainActivity.getInstance().runOnUiThread(new Runnable() {
                         @Override
@@ -184,7 +190,6 @@
         }
 
     }
-
 
     public void addAttender(RequestParams params, String idCardHeadPhoto) {
         if (!BaseApplication.deviceAvailable) {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java
index 2b18214..4dd5048 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java
@@ -8,6 +8,7 @@
 import java.util.List;
 
 import cn.com.basic.face.base.BaseApplication;
+import cn.com.basic.face.base.MainActivity;
 import cn.com.basic.face.discern.common.BaseCommonCallBack;
 import cn.com.basic.face.discern.common.CommonVariables;
 import cn.com.basic.face.discern.common.ResultBean;
@@ -43,9 +44,9 @@
         }
     }
 
-    public void findLeftVisitorListAfterReturn(ResultBean resultBean, boolean append) {
+    public void findLeftVisitorListAfterReturn(ResultBean resultBean, final boolean append) {
         List<VisitQueryItem> list = resultBean.getList(VisitQueryItem.class);
-        List itemList = new ArrayList();
+        final List itemList = new ArrayList();
         int i = 0;
         String previewDate = "";
         SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
@@ -71,7 +72,16 @@
             i++;
         }
         addPageFooter(resultBean.hasMorePages(), resultBean.getPageNum(), itemList);
-        cn.com.basic.face.fragment.VisitFragment.getInstance().get_fragment_visit_left_list_view().show(itemList, append);
+        if (BaseApplication.getInstance().networkAvailable()) {
+            cn.com.basic.face.fragment.VisitFragment.getInstance().get_fragment_visit_left_list_view().show(itemList, append);
+        } else {
+            MainActivity.getInstance().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    cn.com.basic.face.fragment.VisitFragment.getInstance().get_fragment_visit_left_list_view().show(itemList, append);
+                }
+            });
+        }
     }
 
 }

--
Gitblit v1.8.0