diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java index 8372649f04..4a0a1cba9c 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java @@ -61,7 +61,7 @@ public class AdasNoticeHelper implements IMogoAdasWarnMessageCallback, IMogoLoca private View selfCar; - private boolean lightCenter = false; + private boolean lightCenter = true; public void init(Context context) { this.context = context; @@ -184,7 +184,7 @@ public class AdasNoticeHelper implements IMogoAdasWarnMessageCallback, IMogoLoca } tvTrafficLight.setText(surplusTime + "S"); - MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController().showMyLocation(selfCar); + MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController().showMyLocation(inflateRoadInfo()); if (isVrMode) { handler.sendEmptyMessageDelayed(MSG_REFRESH_CAR_STRATEGY, STRATEGY_DELAY); } @@ -326,4 +326,13 @@ public class AdasNoticeHelper implements IMogoAdasWarnMessageCallback, IMogoLoca handler.sendEmptyMessage(MSG_HIDE_TRAFFIC_LIGHT_BY_CLOUD); } } + + private View inflateRoadInfo(){ + View view = View.inflate(context, R.layout.module_ext_item_self_car, null); + TextView _speed = view.findViewById(R.id.tvSelfSpeed); + _speed.setText("" + currentSpeed); + Logger.d(TAG, "showCurrentSpeed: " + currentSpeed); + return view; + } + } diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_self_car.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_self_car.png index dc22ac57a1..01f991d7f7 100644 Binary files a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_self_car.png and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_self_car.png differ diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_item_self_car.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_item_self_car.xml index 5b4e3b2c6d..53c4d45924 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_item_self_car.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_item_self_car.xml @@ -17,7 +17,7 @@ android:text="72" android:textColor="@color/module_ext_vr_mode_left_traffic_light_red" android:textSize="@dimen/module_ext_vr_mode_traffic_light_text_size" - android:visibility="gone" + android:visibility="visible" app:layout_constraintRight_toLeftOf="@+id/tvTrafficLight" app:layout_constraintTop_toTopOf="@+id/tvTrafficLight"/> @@ -31,7 +31,7 @@ android:text="26S" android:textColor="@color/module_ext_vr_mode_left_traffic_light_green" android:textSize="@dimen/module_ext_vr_mode_traffic_light_text_size" - android:visibility="gone" + android:visibility="visible" app:layout_constraintLeft_toLeftOf="@+id/ivSelfCar" app:layout_constraintRight_toRightOf="@+id/ivSelfCar" app:layout_constraintBottom_toTopOf="@+id/ivSelfCar"/> @@ -47,7 +47,7 @@ android:text="160" android:textColor="@color/module_ext_vr_mode_left_traffic_light_white" android:textSize="@dimen/module_ext_vr_mode_traffic_light_text_size" - android:visibility="gone" + android:visibility="visible" app:layout_constraintLeft_toRightOf="@+id/tvTrafficLight" app:layout_constraintTop_toTopOf="@+id/tvTrafficLight"/> diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index f10ce125c2..e1c8837aa8 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -234,13 +234,16 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/module_ext_vr_mode_self_speed_margin_end" android:background="@drawable/module_ext_vr_mode_speed_red_bg" + android:layout_marginBottom="@dimen/module_ext_vr_mode_self_speed_margin_bottom" android:gravity="center" android:text="72" android:textColor="@color/module_ext_vr_mode_left_traffic_light_red" android:textSize="@dimen/module_ext_vr_mode_traffic_light_text_size" android:visibility="gone" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@+id/tvTrafficLight" - app:layout_constraintTop_toTopOf="@+id/tvTrafficLight" + app:layout_constraintBottom_toBottomOf="parent" tools:visibility="visible" />