yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_robotaxi-d-app-module_270_220510_2.7.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_270_220510_2.7.0

Browse Source
This commit is contained in:
xinfengkun
2022-05-31 18:12:27 +08:00
parent 7b424db493 2982765c3a
commit abf0d163d1
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
View File

@@ -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);

2
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt
View File

@@ -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 ->

6
core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_status_bar.xml
View File

@@ -29,8 +29,10 @@
<View
android:id="@+id/dot"
android:layout_width="30px"
android:layout_height="30px"
android:layout_width="20px"
android:layout_height="20px"
android:layout_marginEnd="5px"
android:layout_marginTop="5px"
app:layout_constraintEnd_toEndOf="@+id/iv"
app:layout_constraintTop_toTopOf="@+id/iv"
android:visibility="invisible"/>