重新进入主界面时检查当前是否有未处理事件，有则显示

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchHome2Activity.kt

@@ -698,6 +698,14 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
         /*if (!Constants.showFloatWindow) {
             DeviceChannel.calling = false
         }*/
+
+        //检查当前是否还有未处理事件，有则显示
+        if (Constants.eventList.size > 0) {
+            val intent = Intent()
+            intent.setClass(this, NewEventListActivity::class.java)
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            startActivity(intent)
+        }
     }
 
     override fun onError(message: String, type: Int) {

home/src/main/code/com/wdkl/ncs/android/component/home/service/WdKeepAliveService.kt

@@ -470,42 +470,47 @@ class WdKeepAliveService : AbsWorkService() {
             }
 
             Constants.EVENT_DATA_REFRESH -> { //更新通讯录,更新通话白名单列表
-                Thread(Runnable {
-                    var jsonStr = ""
-                    val contactVos = ApiManager.API_WatchManageDevice.getWatchContactList(Constants.deviceId).map {
-                        jsonStr = it.getJsonString()
-                        val gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()
-                        val contactList: List<WatchContactVO> = gson.fromJson(jsonStr, object : TypeToken<List<WatchContactVO>>() {}.type)
-                        return@map contactList
-                    }.blockingSingle()
-
-                    if (contactVos != null && contactVos.size > 0) {
-                        Log.e(TAG, "222 start update contacts...")
-                        /*for (contactVO in contactVos) {
-                            if (!Strings.isNullOrEmpty(contactVO.name) && !Strings.isNullOrEmpty(contactVO.phoneNumber)) {
-                                ContactHelper.setContact(BaseApplication.appContext, contactVO.name, contactVO.phoneNumber)
-                            }
-                        }*/
+                Thread {
+                    try {
+                        var jsonStr = ""
+                        val contactVos = ApiManager.API_WatchManageDevice.getWatchContactList(Constants.deviceId)
+                                .map {
+                                    jsonStr = it.getJsonString()
+                                    val gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()
+                                    val contactList: List<WatchContactVO> = gson.fromJson(jsonStr, object : TypeToken<List<WatchContactVO>>() {}.type)
+                                    return@map contactList
+                                }.blockingSingle()
+
+                        if (contactVos != null && contactVos.size > 0) {
+                            Log.e(TAG, "222 start update contacts...")
+                            /*for (contactVO in contactVos) {
+                                if (!Strings.isNullOrEmpty(contactVO.name) && !Strings.isNullOrEmpty(contactVO.phoneNumber)) {
+                                    ContactHelper.setContact(BaseApplication.appContext, contactVO.name, contactVO.phoneNumber)
+                                }
+                            }*/
 
-                        ContactHelper.setContact2(BaseApplication.appContext, contactVos)
-                        Log.e(TAG, "222 update contacts end...")
-                    }
+                            ContactHelper.setContact2(BaseApplication.appContext, contactVos)
+                            Log.e(TAG, "222 update contacts end...")
+                        }
 
-                    //更新白名单列表
-                    val whiteList = ApiManager.API_WatchManageDevice.getPhoneWhiteList(Constants.deviceId).map {
-                        jsonStr = it.getJsonString()
-                        val gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()
-                        val whiteList: List<String> = gson.fromJson(jsonStr, object : TypeToken<List<String>>() {}.type)
-                        return@map whiteList
-                    }.blockingSingle()
+                        //更新白名单列表
+                        val whiteList = ApiManager.API_WatchManageDevice.getPhoneWhiteList(Constants.deviceId).map {
+                                jsonStr = it.getJsonString()
+                                val gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()
+                                val whiteList: List<String> = gson.fromJson(jsonStr, object : TypeToken<List<String>>() {}.type)
+                                return@map whiteList
+                            }.blockingSingle()
 
 
-                    if (whiteList != null && whiteList.size > 0) {
-                        Constants.phoneWhiteList.clear()
-                        Constants.phoneWhiteList.addAll(whiteList)
+                        if (whiteList != null && whiteList.size > 0) {
+                            Constants.phoneWhiteList.clear()
+                            Constants.phoneWhiteList.addAll(whiteList)
+                        }
+                    } catch (ex: Exception) {
+                        ex.printStackTrace()
                     }
 
-                }).start()
+                }.start()
 
 
             }