From b0c7af6f45b531b12dd7cd6d223af3b61ecdebe7 Mon Sep 17 00:00:00 2001 From: renwj Date: Tue, 5 Jul 2022 10:34:51 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[DebugView]=E7=BE=8E=E5=8C=96=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E7=8E=AF=E5=A2=83=E5=85=A5=E5=8F=A3=E7=9B=B8=E5=85=B3?= =?UTF-8?q?UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/view_debug_setting.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index e320246b31..0478f29693 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -1045,14 +1045,16 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" + android:background="@drawable/debug_setting_edit_bg" android:gravity="center_vertical"> @@ -1062,7 +1064,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="@dimen/dp_8" - android:layout_marginStart="20px" + android:layout_marginEnd="@dimen/dp_10" android:text="切换环境" android:textSize="@dimen/dp_24" android:textColor="#1A1A1A"/> From 1fb5a1dba46587867dc80503ee313f51bf9efd28 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 5 Jul 2022 11:17:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[Taxi-d=20280,=20Taxi-p=20130]=201=E3=80=81?= =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B9=98=E5=AE=A2=E5=B1=8F=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E9=A1=B5=E5=86=85=E5=AD=98=E6=B3=84=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxi/passenger/ui/TaxiPassengerStartAutopilotView.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerStartAutopilotView.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerStartAutopilotView.java index 080b15b6fc..4773358920 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerStartAutopilotView.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerStartAutopilotView.java @@ -241,7 +241,10 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V @Override protected void onDetachedFromWindow() { - closeAllAnimsAndView(); + isStarting = false; + clearStartingAnimFrame(); + clearBgAnimDrawable(); + mContext = null; super.onDetachedFromWindow(); } } From 96a7582e3e26b99952fb824ae898859bbd5e1657 Mon Sep 17 00:00:00 2001 From: pangfan Date: Thu, 7 Jul 2022 10:56:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[Bus/Taxi=20driver=20v2.8.0]=E4=B8=8A?= =?UTF-8?q?=E7=BA=BF=E7=89=88=E6=9C=AC=E6=B3=A8=E9=87=8A"=E8=BD=A8?= =?UTF-8?q?=E8=BF=B9=E4=B8=8B=E8=BD=BD"=E7=9B=B8=E5=85=B3toast?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/bus/util/BusTrajectoryManager.java | 10 +++++----- .../com/mogo/och/taxi/utils/TaxiTrajectoryManager.java | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java index 06e98681c0..430909a7b4 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java @@ -71,27 +71,27 @@ public class BusTrajectoryManager { if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) { // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发） CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹开始下载"); - ToastUtils.showShort("轨迹开始下载"); + // ToastUtils.showShort("轨迹开始下载"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) { // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发） CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载成功"); - ToastUtils.showShort("轨迹下载成功"); + // ToastUtils.showShort("轨迹下载成功"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) { // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹 CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地无对应轨迹"); - ToastUtils.showShort("轨迹下载失败，本地无对应轨迹"); + // ToastUtils.showShort("轨迹下载失败，本地无对应轨迹"); } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) { // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功 CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地有对应轨迹，认为成功"); - ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功"); + // ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功"); } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) { // 5. 轨迹管理_轨迹下载超时 CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载超时"); - ToastUtils.showShort("轨迹下载超时"); + // ToastUtils.showShort("轨迹下载超时"); } } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java index d436061208..04b619566e 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java @@ -75,27 +75,27 @@ public class TaxiTrajectoryManager { if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) { // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发） CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹开始下载"); - ToastUtils.showShort("轨迹开始下载"); + // ToastUtils.showShort("轨迹开始下载"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) { // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发） CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载成功"); - ToastUtils.showShort("轨迹下载成功"); + // ToastUtils.showShort("轨迹下载成功"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) { // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹 CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地无对应轨迹"); - ToastUtils.showShort("轨迹下载失败，本地无对应轨迹"); + // ToastUtils.showShort("轨迹下载失败，本地无对应轨迹"); } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) { // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功 CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地有对应轨迹，认为成功"); - ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功"); + // ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功"); } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) { // 5. 轨迹管理_轨迹下载超时 CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载超时"); - ToastUtils.showShort("轨迹下载超时"); + // ToastUtils.showShort("轨迹下载超时"); } } From 24b4f5703ee2cb78fed49eced0e1d8b7d73ff0cb Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 7 Jul 2022 11:11:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[Taxi-d=20280,=20Taxi-p=20130]=20taxi?= =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E7=AB=AF=E6=9C=8D=E5=8A=A1=E4=B8=AD=E6=9D=80?= =?UTF-8?q?=E6=8E=89=E8=BF=9B=E7=A8=8B=EF=BC=8C=E5=86=8D=E6=AC=A1=E5=BC=80?= =?UTF-8?q?=E5=90=AFapp=E8=87=AA=E5=8A=A8=E9=A9=BE=E9=A9=B6=E6=8C=89?= =?UTF-8?q?=E9=92=AEtag=E5=88=9D=E5=80=BC=E4=B8=BAtrue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/taxi/presenter/TaxiPresenter.java | 1 + .../java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java index 58d80c572c..f40200dc4c 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java @@ -211,6 +211,7 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS if (TaxiOrderStatusEnum.OnTheWayToEnd.getCode() == order.orderStatus){ TaxiModel.getInstance().startDynamicCalculateRouteInfo(); + runOnUIThread(() -> mView.updateCtvAutopilotStatusTag(true)); } if (TaxiOrderStatusEnum.ArriveAtEnd.getCode() == order.orderStatus || diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java index 9b94b4e277..c033d594e5 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java @@ -91,7 +91,7 @@ public abstract class BaseTaxiTabFragment