From bd701580edb6a3b91bcba622a37d2032c471d153 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 12 May 2023 11:11:08 +0800 Subject: [PATCH] =?UTF-8?q?[charter]=20[3.2.0]=20[tts=E8=BD=A6=E9=97=A8?= =?UTF-8?q?=E6=89=93=E5=BC=80=E7=A6=81=E6=AD=A2=E5=90=AF=E5=8A=A8=E8=87=AA?= =?UTF-8?q?=E9=A9=BE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/bus/passenger/ui/view/bottom/impl/GoView.kt | 8 ++++++++ .../src/main/res/values/strings.xml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoView.kt index cd873d8bb7..94e43674ed 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoView.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoView.kt @@ -6,6 +6,7 @@ import android.util.AttributeSet import android.view.MotionEvent import android.view.View import androidx.appcompat.widget.AppCompatTextView +import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager @@ -16,6 +17,7 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.model.CharterPassengerModel import com.mogo.och.bus.passenger.ui.view.bottom.BottomClickView +import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorStatusManager import com.mogo.och.common.module.utils.SoundPoolHelper import kotlinx.android.synthetic.main.m1_bottom_bar.view.* @@ -61,6 +63,12 @@ class GoView @JvmOverloads constructor( } private fun startGo(){ + + if (LightAirconditionDoorStatusManager.doorStatus.isOpen) { + val string = AbsMogoApplication.getApp().getString(R.string.m1_close_door_and_startauto) + ToastUtils.showShort(string) + return + } when (CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state) { IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {// 不可自动驾驶 ToastUtils.showShort("设备未就绪请稍等") diff --git a/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml b/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml index 9f0db562a8..aed8c7aa75 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml +++ b/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml @@ -45,7 +45,7 @@ 最后,蘑菇小助手为您送上乘车小贴士~ 太棒了!您已完成乘车指南,更多功能欢迎探索~蘑菇小助手预祝您旅途愉快 - + 先关闭车门再启动吧~