Merge branch 'dev_robotaxi-d-app-module_270_220510_2.7.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_270_220510_2.7.0

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt

@@ -1019,6 +1019,7 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
             ipcUpgradeStateInfo.status.let {
                 if(AdUpgradeStateHelper.isUpgradeSuccess(it)){
                     ToastUtils.showLong("升级成功")
+                    AdUpgradeStateHelper.setConfirmUpgrade(false)
                 }
             }
         }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -1073,13 +1073,19 @@ class DebugSettingView @JvmOverloads constructor(
                 if (logTimeStr.isNullOrEmpty()) {
                     logTimeStr = "10"
                 }
-                val logCatchTime = logTimeStr.toInt()
-                if (logCatchTime > 60) {
-                    tbLogCatch.isChecked = false
-                    TipToast.shortTip("最长抓取时间为60分钟")
-                    return@setOnCheckedChangeListener
+                try{
+                    val logCatchTime = logTimeStr.toInt()
+                    if (logCatchTime > 60) {
+                        tbLogCatch.isChecked = false
+                        TipToast.shortTip("最长抓取时间为60分钟")
+                        return@setOnCheckedChangeListener
+                    }
+                    CallerDevaToolsManager.startCatchLog(logCatchTime)
+                }catch (e: Exception){
+                    ToastUtils.showLong("输入格式错误，请重新输入正确时间数字，最长抓取时间为60分钟")
+                    etLogCatch.setText("")
                 }
-                CallerDevaToolsManager.startCatchLog(logCatchTime)
+
             } else {
                 CallerDevaToolsManager.stopCatchLog()
             }