From 41000e2503136338840f67f0a07e8dd40ebaaa6c Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 5 Nov 2024 14:22:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[6.7.2]=20[fix]=20[saas=20t1=20ui=20?= =?UTF-8?q?=E5=8F=98=E6=9B=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt index 3ea9826713..6a53c25dc4 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt @@ -33,6 +33,7 @@ import com.mogo.och.common.module.utils.ResourcesUtils import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.common.module.wigets.CommonSlideView import com.mogo.och.common.module.wigets.OCHCommitDialog +import com.mogo.och.common.module.wigets.dialog.CommonDialogStatus import com.mogo.och.unmanned.taxi.R import com.mogo.och.unmanned.taxi.TaxiUnmannedDriverProvider import com.mogo.och.unmanned.taxi.bean.OrderDetail @@ -361,14 +362,14 @@ class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineVi } private fun closeOrderDialog() { - val builder = OCHCommitDialog.Builder() + val builder = CommonDialogStatus.Builder() val closeOrderDialog = builder .title(ResourcesUtils.getString(R.string.dialog_order_close_title)) .tips(ResourcesUtils.getString(R.string.dialog_order_close_content)) .confirmStr(ResourcesUtils.getString(R.string.dialog_order_close_confirm)) .cancelStr(ResourcesUtils.getString(R.string.dialog_order_close_cancel)) .build(context) - closeOrderDialog!!.setClickListener(object : OCHCommitDialog.ClickListener { + closeOrderDialog.setClickListener(object : CommonDialogStatus.ClickListener { override fun confirm() { viewModel?.sendUiIntent(TaskUiIntent.CloseOrderByDriver) } From 1ca50c7a71bffebf09a8b28ac05dc81aa0ebb0fa Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 5 Nov 2024 15:31:53 +0800 Subject: [PATCH 2/3] [6.7.2] [fix] [eb5 kill app] --- .../function/hmi/ui/setting/DebugSettingView.kt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 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 23e415b0d2..e4c3bc988c 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 @@ -2519,11 +2519,16 @@ internal class DebugSettingView @JvmOverloads constructor( private fun killApp() { Intent(Intent.ACTION_MAIN).apply { - addCategory(Intent.CATEGORY_HOME) - flags = Intent.FLAG_ACTIVITY_NEW_TASK - ActivityUtils.startActivity(this) - Process.killProcess(Process.myPid()) - exitProcess(0) + try { + addCategory(Intent.CATEGORY_HOME) + flags = Intent.FLAG_ACTIVITY_NEW_TASK + ActivityUtils.startActivity(this) + Process.killProcess(Process.myPid()) + exitProcess(0) + }catch (e:Exception){ + e.printStackTrace() + CallerLogger.d(TAG,"killApp :${e.message}") + } } } From 71ee720005095b6eab7cbba3db8f18d6de5b5a04 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 5 Nov 2024 15:32:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[6.7.2]=20[fix]=20[=E8=87=AA=E9=A9=BE?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=B1=95=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/module/wigets/autopilot/AutopilotStateModel.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotStateModel.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotStateModel.kt index 4113a60f13..b0138cb9ed 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotStateModel.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotStateModel.kt @@ -111,10 +111,10 @@ class AutopilotStateModel : ViewModel(), IOchAutopilotStatusListener, ILineCall this.viewCallback?.autopilotDisable() } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE-> { - if (!CallerAutoPilotControlManager.isCanStartAutopilot(false) && !OchAutoPilotStatusListenerManager.canStartAutopilotFromFSM) {// 不可用 - this.viewCallback?.autopilotDisable() - } else {// 部分可用 + if (CallerAutoPilotControlManager.isCanStartAutopilot(false) || OchAutoPilotStatusListenerManager.canStartAutopilotFromFSM) {// 不可用 this.viewCallback?.canStartAutopilot() + } else {// 部分可用 + this.viewCallback?.autopilotDisable() } } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING-> {// 自驾中