diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt index 34d7806abe..fa9831f93b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt @@ -15,6 +15,7 @@ import com.mogo.eagle.core.data.deva.bindingcar.IPCUpgradeStateInfo import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig import com.mogo.eagle.core.data.temp.EventLogout import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener +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 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager @@ -251,6 +252,12 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor( private fun initOchView() { actvLoginout.onClick { + if (CallerAutoPilotStatusListenerManager.getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING + || CallerAutoPilotStatusListenerManager.getState() == IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING + ) { + ToastUtils.showShort("请稍后退出") + return@onClick + } EventBus.getDefault().post(EventLogout(EventLogout.LOGOUT_TYPE)) //将消息盒子操作记录还原 MsgBoxConfig.setUserRecord(0) diff --git a/tts/tts-zhi/src/main/java/com/mogo/tts/pad/ZhiAvatarWindow.java b/tts/tts-zhi/src/main/java/com/mogo/tts/pad/ZhiAvatarWindow.java index a59d950da2..64a87e0974 100644 --- a/tts/tts-zhi/src/main/java/com/mogo/tts/pad/ZhiAvatarWindow.java +++ b/tts/tts-zhi/src/main/java/com/mogo/tts/pad/ZhiAvatarWindow.java @@ -60,7 +60,7 @@ public class ZhiAvatarWindow implements RecordWinUi { public void onStatusChange(RecordStatus status) { Log.d(TAG, "onStatusChange status = " + status); if (status== RecordStatus.STATUS_SILENCE) { - AvatarManager.INSTANCE.dispatchStatusChangeEvent(ZhiRecordWinUi.RecordStatus.STATUS_UNDERSTANDING); + AvatarManager.INSTANCE.dispatchStatusChangeEvent(ZhiRecordWinUi.RecordStatus.STATUS_SILENCE); }else if(status== RecordStatus.STATUS_LISTENING) { AvatarManager.INSTANCE.dispatchStatusChangeEvent(ZhiRecordWinUi.RecordStatus.STATUS_LISTENING); }else if(status== RecordStatus.STATUS_UNDERSTANDING) {