diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerArrivedView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerArrivedView.kt index a1ff2c470b..eb7f9cd238 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerArrivedView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerArrivedView.kt @@ -87,7 +87,7 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener { ochThankShadowLayout = findViewById(R.id.och_thank_shadow_layout) ivAnimalList = findViewById(R.id.iv_animal_list) svpFrame = findViewById(R.id.svp_frame) - + svpFrame.setBackgroundResource(R.drawable.tail_ani_0000) svpFrame.setIsTouchWiget(false) svpFrame.setIsTouchWigetFull(false) svpFrame.enableshowProgressDialog = false diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 3febd674c3..2e827924c5 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/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(), ipcUpgradeStateInfo.status.let { if(AdUpgradeStateHelper.isUpgradeSuccess(it)){ ToastUtils.showLong("升级成功") + AdUpgradeStateHelper.setConfirmUpgrade(false) } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 181287c215..6d744b0329 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/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() }