From cd491d5aa9280419f8c4e0c928fbaa7336d8831c Mon Sep 17 00:00:00 2001 From: renwj Date: Tue, 31 May 2022 11:50:51 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=8A=B6=E6=80=81=E6=A0=8F]=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=87=AA=E5=8A=A8=E9=A9=BE=E9=A9=B6=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../status/flow/trace/TracingImpl.kt | 3 ++- .../mogo_core_function_devatools/status/model/StatusModel.kt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/trace/TracingImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/trace/TracingImpl.kt index e3d5b7717a..e3bbd97d06 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/trace/TracingImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/trace/TracingImpl.kt @@ -42,7 +42,8 @@ internal class TracingImpl(ctx: Context): IFlow(ctx), IMoGoAutopi override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) { super.onAutopilotStatusResponse(autoPilotStatusInfo) - if (autoPilotStatusInfo.pilotmode != 1) { + Log.d(TAG, "-- onAutopilotStatusResponse -- autopilotMode: ${autoPilotStatusInfo.pilotmode} :: state: ${autoPilotStatusInfo.state}") + if (autoPilotStatusInfo.state != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { send(TracingStatus(UNKNOWN)) } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kt index 29bbdbceac..22c3ebee8f 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kt @@ -2,6 +2,7 @@ package com.zhjt.mogo_core_function_devatools.status.model import android.util.* import androidx.lifecycle.* +import com.mogo.eagle.core.function.api.autopilot.* import com.mogo.eagle.core.function.call.autopilot.* import com.zhjt.mogo_core_function_devatools.status.entity.CanStatus import com.zhjt.mogo_core_function_devatools.status.entity.GpsStatus @@ -83,7 +84,7 @@ internal class StatusModel : ViewModel() { } } is TracingStatus -> { - val c1 = CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().pilotmode == 1 + val c1 = CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING val c2 = s.state.isException() Log.d(TAG, "getExceptionStatus-::c1: $c1 -> c2: $c2") if (c1 && c2) {