|
@@ -473,38 +473,42 @@ class WdKeepAliveService : AbsWorkService() {
|
|
}
|
|
}
|
|
|
|
|
|
4 -> { //更新通讯录,更新通话白名单列表
|
|
4 -> { //更新通讯录,更新通话白名单列表
|
|
- 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) {
|
|
|
|
- for (contactVO in contactVos) {
|
|
|
|
- if (!Strings.isNullOrEmpty(contactVO.name) && !Strings.isNullOrEmpty(contactVO.phoneNumber)) {
|
|
|
|
- ContactHelper.setContact(this, 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) {
|
|
|
|
+ for (contactVO in contactVos) {
|
|
|
|
+ if (!Strings.isNullOrEmpty(contactVO.name) && !Strings.isNullOrEmpty(contactVO.phoneNumber)) {
|
|
|
|
+ ContactHelper.setContact(this, contactVO.name, contactVO.phoneNumber)
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
|
|
- //更新白名单列表
|
|
|
|
- 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()
|
|
|
|
|
|
|
|
|
|
}
|
|
}
|