From 02a2e411b9e2005e2504bfa0a3a4112e8b4ff50d Mon Sep 17 00:00:00 2001 From: renwj Date: Mon, 6 May 2024 16:50:28 +0800 Subject: [PATCH] =?UTF-8?q?[6.4.0][=E5=90=AF=E8=87=AA=E9=A9=BE=E6=8C=87?= =?UTF-8?q?=E5=BC=95][=E5=9F=8B=E7=82=B9]=20=E6=B7=BB=E5=8A=A0=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/bus/fragment/BaseBusTabFragment.java | 4 ++-- .../java/com/mogo/och/bus/model/OrderModel.java | 2 +- .../com/mogo/och/bus/presenter/BusPresenter.java | 6 +++--- .../shuttle/fragment/BaseShuttleTabFragment.java | 4 ++-- .../java/com/mogo/och/taxi/model/TaxiModel.java | 14 +++++++------- .../com/mogo/och/taxi/ui/BaseTaxiTabFragment.java | 4 ++-- .../DevaToolsProvider.kt | 4 ++-- .../mofang/MoFangCommandExecutor.kt | 2 +- .../status/StatusManager.kt | 3 ++- .../function/api/devatools/IDevaToolsProvider.kt | 2 +- .../autopilot/CallerAutoPilotControlManager.kt | 6 +++--- .../call/devatools/CallerDevaToolsManager.kt | 4 ++-- 12 files changed, 28 insertions(+), 27 deletions(-) diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java index a00acdcf0e..5ccfabacbf 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java @@ -168,7 +168,7 @@ public abstract class BaseBusTabFragment }); initListener(); - setAutopilotBtnStatus(CallerAutoPilotStatusListenerManager.INSTANCE.getState(), CallerAutoPilotControlManager.INSTANCE.isCanStartAutopilot(false)); + setAutopilotBtnStatus(CallerAutoPilotStatusListenerManager.INSTANCE.getState(), CallerAutoPilotControlManager.INSTANCE.isCanStartAutopilot(false, 0)); ctvAutopilotStatus.setOnClickListener(new OnPreventFastClickListener() { @Override @@ -437,7 +437,7 @@ public abstract class BaseBusTabFragment ctvAutopilotStatus.setClickable(false); // ctvAutopilotStatus.setSelected(false); } - UiThreadHandler.postDelayed(() -> setAutopilotBtnStatus(autopilotStatus,CallerAutoPilotControlManager.INSTANCE.isCanStartAutopilot(false)), 1000); + UiThreadHandler.postDelayed(() -> setAutopilotBtnStatus(autopilotStatus,CallerAutoPilotControlManager.INSTANCE.isCanStartAutopilot(false, 0)), 1000); } private void changeAutopilotBtnView(int autopilotStatus, boolean isAnimateRunning, boolean canStartAutopilt) { diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java index 90ba076029..b6e6770a2b 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java @@ -617,7 +617,7 @@ public class OrderModel { return; } //2、6个条件判断 - if (!CallerAutoPilotControlManager.INSTANCE.isCanStartAutopilot(true)) { + if (!CallerAutoPilotControlManager.INSTANCE.isCanStartAutopilot(true, 0)) { return; } diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java index 39358801c6..ba144cf95a 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java @@ -186,13 +186,13 @@ public class BusPresenter extends Presenter return; } // 改变UI自动驾驶状态 - runOnUIThread(() -> mView.onAutopilotStatusChanged(state, CallerAutoPilotControlManager.INSTANCE.isCanStartAutopilot(false))); + runOnUIThread(() -> mView.onAutopilotStatusChanged(state, CallerAutoPilotControlManager.INSTANCE.isCanStartAutopilot(false, 0))); break; case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING: OrderModel.getInstance().triggerStartServiceEvent( OrderModel.getInstance().isRestartAutopilot(), true); // 改变UI自动驾驶状态 - runOnUIThread(() -> mView.onAutopilotStatusChanged(state, CallerAutoPilotControlManager.INSTANCE.isCanStartAutopilot(false))); + runOnUIThread(() -> mView.onAutopilotStatusChanged(state, CallerAutoPilotControlManager.INSTANCE.isCanStartAutopilot(false, 0))); break; default: runOnUIThread(() -> mView.onAutopilotEnableChange(false)); @@ -213,7 +213,7 @@ public class BusPresenter extends Presenter //中间站点再次开启自驾时， 自动驾驶状态是2未改变， 此次鹰眼底层不再返给业务，需优化按钮动画显示 if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING == CallerAutoPilotStatusListenerManager.INSTANCE.getState()){ - mView.onAutopilotStatusChanged(CallerAutoPilotStatusListenerManager.INSTANCE.getState(), CallerAutoPilotControlManager.INSTANCE.isCanStartAutopilot(false)); + mView.onAutopilotStatusChanged(CallerAutoPilotStatusListenerManager.INSTANCE.getState(), CallerAutoPilotControlManager.INSTANCE.isCanStartAutopilot(false, 0)); } } diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java index 4c959d31da..50625d169b 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java @@ -161,7 +161,7 @@ public abstract class BaseShuttleTabFragment @@ -384,7 +384,7 @@ public abstract class BaseTaxiTabFragment Unit) { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangCommandExecutor.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangCommandExecutor.kt index 9ba3c87c3d..137a5b841d 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangCommandExecutor.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangCommandExecutor.kt @@ -248,7 +248,7 @@ internal class MoFangCommandExecutor { if (AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)) { CallerAutoPilotControlManager.startAutoPilotByMoFang(parameters) } else { - if (CallerAutoPilotControlManager.isCanStartAutopilot(true)) { + if (CallerAutoPilotControlManager.isCanStartAutopilot(true, -1)) { CallerAutoPilotControlManager.startAutoPilot(parameters) } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/StatusManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/StatusManager.kt index 1e7516bbab..c331fb3b2b 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/StatusManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/StatusManager.kt @@ -184,7 +184,7 @@ object StatusManager { listeners.remove(tag) } - fun getExceptionStatusBeforeLaunchAutopilot(): Int { + fun getExceptionStatusBeforeLaunchAutopilot(source: Int): Int { if (!hasInit) { return 0 } @@ -202,6 +202,7 @@ object StatusManager { "vehicle_start_autopilot_state_check", HashMap().also { itx -> itx["time"] = time + itx["src"] = source itx["desc"] = ll.joinToString(",") { item -> when (item) { is SteerStatus -> "方向盘" diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt index fc4da778d4..f06737299e 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt @@ -302,7 +302,7 @@ interface IDevaToolsProvider : IProvider { fun attachAutopilotStatusView(ctx: Context, group: ViewGroup) - fun getExceptionStatusBeforeLaunchAutopilot(): Int + fun getExceptionStatusBeforeLaunchAutopilot(source: Int): Int fun registerRouteDownloadListener(tag: String, block:(state: Int) -> Unit) diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt index 0bde4c7074..2abbfb75b6 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt @@ -84,9 +84,9 @@ object CallerAutoPilotControlManager { /** * 启自驾前，是否要拦截 * @param isShowTip true: 展示Toast+语音提示; false:不展示Toast+语音提示 - * + * @param source -1: 蘑方发出启自驾前状态拦截；>=0 用于其它场景的判断 */ - fun isCanStartAutopilot(isShowTip: Boolean): Boolean { + fun isCanStartAutopilot(isShowTip: Boolean, source: Int = 0): Boolean { /** * 方向盘： 1<<0 * 油门 : 1<<1 @@ -95,7 +95,7 @@ object CallerAutoPilotControlManager { * 档位: 1<<4 * 轨迹下载: (下载中) 1<<5； （下载失败）1<<6 */ - val exceptionValue = CallerDevaToolsManager.getExceptionStatusBeforeLaunchAutopilot() + val exceptionValue = CallerDevaToolsManager.getExceptionStatusBeforeLaunchAutopilot(source) if (exceptionValue != 0) { if (isShowTip) { val sb = StringBuilder("请检查车辆") diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt index 5d6509a2d4..65228efb99 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt @@ -379,8 +379,8 @@ object CallerDevaToolsManager { devaToolsProviderApi?.unRegisterRouteDownloadListener(tag) } - fun getExceptionStatusBeforeLaunchAutopilot(): Int { - return devaToolsProviderApi?.getExceptionStatusBeforeLaunchAutopilot() ?: 0 + fun getExceptionStatusBeforeLaunchAutopilot(source: Int): Int { + return devaToolsProviderApi?.getExceptionStatusBeforeLaunchAutopilot(source) ?: 0 } fun registerStartAutopilotStateListener(tag: String, block: (isCanStartAutopilot: Boolean) -> Unit) {