From 35bffdc99223544ef7cc302936501d6a86814a96 Mon Sep 17 00:00:00 2001 From: pangfan Date: Tue, 31 May 2022 17:56:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[Bus/Taxi=20driver=20v2.7.0]Taxi=EF=BC=9A?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8E=A5=E7=AE=A1=E5=90=8E=E5=90=AF=E8=87=AA?= =?UTF-8?q?=E9=A9=BE=E5=9F=8B=E7=82=B9=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/taxi/model/TaxiModel.java | 1 + 1 file changed, 1 insertion(+) diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index f3dd2c3263..f5d01b8c55 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -1074,6 +1074,7 @@ public class TaxiModel { } else if (mCurrentOCHOrder != null && getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToEnd && state != mPrevAPStatus) { + mPrevAPStatus = state; // 接管后再次启动成功埋点 TaxiAnalyticsManager.getInstance().triggerStartAutopilotEvent(true, true, mCurrentOCHOrder.startSiteAddr, mCurrentOCHOrder.endSiteAddr, mCurrentOCHOrder.orderNo); From 2982765c3a06572d2c7fcda6289c0aee27ae39e7 Mon Sep 17 00:00:00 2001 From: renwj Date: Tue, 31 May 2022 17:57:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E7=8A=B6=E6=80=81=E6=A0=8F]=E5=B0=8F?= =?UTF-8?q?=E7=BA=A2=E7=82=B9UI=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo_core_function_devatools/status/ui/StatusView.kt | 2 +- .../src/main/res/layout/layout_status_bar.xml | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt index 2322a958a8..647483f81b 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt @@ -44,7 +44,7 @@ internal class StatusView(private val model: StatusModel, ctx: Context): Constra private fun init() { isClickable = true - dot.background = shape(solid = Color.RED, shape = GradientDrawable.OVAL, width = 30.PX, height = 30.PX) + dot.background = shape(solid = Color.parseColor("#F33F1D"), shape = GradientDrawable.OVAL, width = 30.PX, height = 30.PX) iv.also { it.background = ContextCompat.getDrawable(context, R.drawable.icon_dev_status_un_fold) it.onClick { v -> diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar.xml index 99d3f38d46..4b6a95baf4 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar.xml @@ -29,8 +29,10 @@