From 8e34dd3ffa2e5d16af330a47d25da4ba983be12b Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 1 Jun 2022 11:06:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E5=9B=A0=E6=80=A7?= =?UTF-8?q?=E8=83=BD=E4=B8=8D=E8=B6=B3=E5=8A=A0=E8=BD=BD=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E8=BF=87=E6=85=A2=E5=AF=BC=E8=87=B4=E7=9A=84=E9=BB=91=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/taxi/passenger/ui/TaxiPassengerArrivedView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From f3304a313b0104310e8aa49e48d7ec79cc1e6355 Mon Sep 17 00:00:00 2001 From: xuxinchao <13522809046@163.com> Date: Wed, 1 Jun 2022 11:17:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?MAP=E6=8E=A8=E6=8B=89=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 升级成功后改变本地下载中状态 --- .../java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt | 1 + 1 file changed, 1 insertion(+) 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) } } } From f003f0fc5af8b1f603b7494b3182246a319c7b9c Mon Sep 17 00:00:00 2001 From: xuxinchao <13522809046@163.com> Date: Wed, 1 Jun 2022 11:54:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E8=AF=95=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复NumberFormatException异常 --- .../hmi/ui/setting/DebugSettingView.kt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) 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() }