From 632255913b21d02141c794f829da0e9ad3edda9a Mon Sep 17 00:00:00 2001 From: aibingbing Date: Wed, 15 Nov 2023 20:41:45 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=87=AA=E4=B8=BB=E7=AE=97=E8=B7=AF=E9=AA=8C?= =?UTF-8?q?=E8=AF=81]=20feat:=20=E8=BF=90=E8=90=A5=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B0=83=E8=AF=95=E5=BC=80=E5=85=B3=E5=92=8C?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/taxi/ui/base/BaseTaxiTabFragment.kt | 20 ++++++++- .../core/function/hmi/ui/MoGoHmiProvider.kt | 43 ++++++++++++++----- .../function/hmi/ui/setting/SOPSettingView.kt | 35 +++++++++++++++ .../src/main/res/layout/view_sop_setting.xml | 15 ++++++- .../api/hmi/warning/IMoGoHmiProvider.kt | 21 +++++++++ .../function/call/hmi/CallerHmiManager.kt | 36 ++++++++++++++-- .../module/status/IMogoStatusManager.java | 30 +++++++++++++ .../module/status/MogoStatusManager.java | 30 +++++++++++++ .../module/status/StatusDescriptor.java | 17 +++++++- 9 files changed, 228 insertions(+), 19 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt index ff9092412c..39364027fa 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt @@ -11,6 +11,8 @@ import android.view.animation.LinearInterpolator import androidx.fragment.app.FragmentTransaction import androidx.localbroadcastmanager.content.LocalBroadcastManager import com.mogo.commons.AbsMogoApplication +import com.mogo.commons.module.status.MogoStatusManager +import com.mogo.commons.module.status.StatusDescriptor import com.mogo.commons.mvp.IView import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.mvp.Presenter @@ -26,6 +28,7 @@ import com.mogo.eagle.core.function.hmi.ui.widget.ParallelDriveView import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener +import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.map.listener.IMogoMapListener import com.mogo.map.uicontroller.VisualAngleMode @@ -197,9 +200,22 @@ abstract class BaseTaxiTabFragment> : MvpFragment + if (StatusDescriptor.TAXI_UNMANED_DRIVER_LINE_ROUTING_VERIFY_MODE == descriptor) { + UiThreadHandler.post { + module_mogo_och_operation_status.isEnabled = !isTrue + } + } + } taxi_close_navi_icon.setOnClickListener { showAmapNaviToStationFragment(false) @@ -222,13 +238,13 @@ abstract class BaseTaxiTabFragment> : MvpFragment + if(!buttonView.isPressed) return@setOnCheckedChangeListener + if (isChecked) { + if (CallerHmiManager.isTaxiUnmanedDriverPerformTask()) { + ToastUtils.showLong("请先结束当前任务") + buttonView.isChecked = !isChecked + return@setOnCheckedChangeListener + } + if (CallerHmiManager.isTaxiUnmanedDriverTakingOrders()) { + ToastUtils.showLong("请先结束接单状态") + buttonView.isChecked = !isChecked + return@setOnCheckedChangeListener + } + CallerHmiManager.setTaxiUnmanedDriverLineRoutingVerifyMode(true) + } else { + if (CallerHmiManager.isTaxiUnmanedDriverPerformTask()) { + ToastUtils.showLong("请先结束当前任务") + buttonView.isChecked = !isChecked + return@setOnCheckedChangeListener + } + CallerHmiManager.setTaxiUnmanedDriverLineRoutingVerifyMode(false) + } + } + it.isChecked = CallerHmiManager.isTaxiUnmanedDriverLineRoutingVerifyMode() + } else { + it.isEnabled = false + it.visibility = View.GONE + } + } + //是否展示被动触发的录包弹窗(自动驾驶下出现问题触发的录包) scShowBagRecordWindow.isChecked = FunctionBuildConfig.isShowBagRecordWindow scShowBagRecordWindow.setOnCheckedChangeListener { _, isChecked -> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml index 1a05165d25..b4dd1a06f9 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml @@ -548,6 +548,19 @@ app:layout_constraintRight_toRightOf="@id/otherGuideLine" app:layout_constraintTop_toBottomOf="@id/scIPCReport" /> + + + + app:layout_constraintTop_toBottomOf="@id/scLineRoutingVerify" />