From 48884e6d8f7fa1df03396c708b9a6558eaa5c4fd Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 8 Oct 2024 15:50:20 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0]=20[fea]=20[=E5=85=BC=E5=AE=B9=E9=80=80?= =?UTF-8?q?=E5=87=BA=E7=99=BB=E5=BD=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/unmanned/taxi/ui/base/TaxiFragment.kt | 7 +------ .../mogo/och/unmanned/taxi/ui/base/TaxiPresenter.java | 11 +++++++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiFragment.kt index 003ed56a74..59361dd6d0 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiFragment.kt @@ -326,12 +326,7 @@ class TaxiFragment : BaseTaxiTabFragment(), findViewById(R.id.test_bar_route)?.setOnClickListener { testRouteInfoUpload() } -// findViewById(R.id.test_brake)?.setOnClickListener { -// TaxiTaskModel.handleBrakeStatusChange(false) -// } -// findViewById(R.id.test_resume_brake)?.setOnClickListener { -// TaxiTaskModel.handleBrakeStatusChange(true) -// } + findViewById(R.id.test_parallel_driver)?.setOnClickListener { stopAutoStartAutopilot() } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiPresenter.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiPresenter.java index 7ebf4009d4..7e777cda64 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiPresenter.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiPresenter.java @@ -19,6 +19,8 @@ import com.mogo.och.common.module.biz.order.OrderListener; import com.mogo.och.common.module.biz.order.OrderModel; import com.mogo.och.common.module.biz.order.TaxiOrderStatusEnum; import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager; +import com.mogo.och.common.module.manager.transform.OchTransform; +import com.mogo.och.common.module.manager.transform.OchTransformDispatch; import com.mogo.och.data.taxi.BaseOrderBean; import com.mogo.och.unmanned.taxi.callback.ITaxiADASStatusCallback; import com.mogo.och.unmanned.taxi.callback.ITaxiControllerStatusCallback; @@ -65,6 +67,7 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS TaxiRoutingModel.INSTANCE.setOrderStatusCallback(this); LoginStatusManager.INSTANCE.addListener(TAG,this); OrderModel.INSTANCE.setOrderStatusCallback(TAG,this); + OchTransform.INSTANCE.addListener(TAG,ochTransform); } private void releaseListeners() { @@ -74,6 +77,7 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS OCHAdasAbilityManager.getInstance().release(); TaxiTaskModel.INSTANCE.setMoGoAutopilotPlanningListener(null); LoginStatusManager.INSTANCE.removeListener(TAG); + OchTransform.INSTANCE.removeListener(TAG); } /** @@ -90,6 +94,13 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS } } + private OchTransformDispatch ochTransform = new OchTransformDispatch(){ + @Override + public void logout() { + TaxiTaskModel.INSTANCE.logout(); + } + }; + // 登出 public void logout() { TaxiTaskModel.INSTANCE.logout();