Browse Source

家属探视机,后台多次点击升级会出现anr问题

weizhengliang 1 year ago
parent
commit
c064d8a1b7

+ 1 - 0
android_visiting/src/main/java/com/wdkl/ncs/android/component/home/activity/VisitingActivationActivity.kt

@@ -85,6 +85,7 @@ class VisitingActivationActivity : BaseActivity<HomeActivityPresenter, VisitingA
                     Uri.parse("package:$packageName"))
                     Uri.parse("package:$packageName"))
             startActivityForResult(intent, 10)
             startActivityForResult(intent, 10)
         }
         }
+
         //init
         //init
         NetHelper.getInstance().init()
         NetHelper.getInstance().init()
 
 

+ 0 - 7
android_visiting/src/main/java/com/wdkl/ncs/android/component/home/activity/VisitingActivity.kt

@@ -206,13 +206,6 @@ class VisitingActivity : BaseActivity<HomeActivityPresenter, ActivityHomeBinding
     }
     }
 
 
     private fun permissionGranted() {
     private fun permissionGranted() {
-        if (Build.VERSION.SDK_INT >= 23) {
-            if (!Settings.canDrawOverlays(this)) {
-                val intent = Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse("package:$packageName"))
-                startActivityForResult(intent, 10)
-            }
-        }
-
         Log.i(TAG, "IMEI " + Constant.imei)
         Log.i(TAG, "IMEI " + Constant.imei)
 
 
         //获取TCP服务器IP和端口
         //获取TCP服务器IP和端口

+ 1 - 5
android_visiting/src/main/java/com/wdkl/ncs/android/component/home/service/TcpHandleService.kt

@@ -58,13 +58,9 @@ class TcpHandleService : Service(){
         when(messageEvent.type){
         when(messageEvent.type){
             //APP升级
             //APP升级
             Constant.EVENT_APP_UPDATE->{
             Constant.EVENT_APP_UPDATE->{
-                while (DeviceChannel.calling) {    //通话中不处理,一直等待至结束
-                    Thread.sleep(3000)
-                }
 
 
-                DeviceChannel.calling = true    //置于通话状态中,不可呼叫
                 Util.wakeUpAndUnlock(this)
                 Util.wakeUpAndUnlock(this)
-                var tcpModel = messageEvent.getMessage() as TcpModel
+                var tcpModel = messageEvent.message as TcpModel
                 if (tcpModel.action == TcpAction.DeviceAction.APP_UPDATE) {
                 if (tcpModel.action == TcpAction.DeviceAction.APP_UPDATE) {
                     if ((System.currentTimeMillis() / 1000) - updateLastTime > 10){   //大于10秒可继续升级
                     if ((System.currentTimeMillis() / 1000) - updateLastTime > 10){   //大于10秒可继续升级
                         updateLastTime = System.currentTimeMillis() / 1000
                         updateLastTime = System.currentTimeMillis() / 1000