diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MapMarkerBaseView.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MapMarkerBaseView.java index c3cbc4149e..f01929b1e5 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MapMarkerBaseView.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MapMarkerBaseView.java @@ -90,7 +90,9 @@ public abstract class MapMarkerBaseView extends LinearLayout implements IMarkerV } private void loadPoiTypeIconInUiThread(String url,int res) { - + if (mMarker != null) { + mMarker.setIcon( ViewUtils.fromView(MapMarkerBaseView.this)); + } if (!url.isEmpty()) { ivIcon.setPlaceHolder(res); ivIcon.setFailureHolder(res); diff --git a/modules/mogo-module-extensions/src/main/res/layout/include_navi_in_vr.xml b/modules/mogo-module-extensions/src/main/res/layout/include_navi_in_vr.xml index 507d0730b8..7f0e64e2f8 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/include_navi_in_vr.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/include_navi_in_vr.xml @@ -29,6 +29,7 @@ android:id="@+id/module_ext_id_tv_speed" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/module_ext_navi_in_vr_nav_common_margin_top" android:layout_marginStart="@dimen/module_ext_navi_in_vr_speed_margin_start" android:text="--" android:textColor="#fff" @@ -53,6 +54,8 @@ android:id="@+id/module_map_id_navi_next_info_road_turn_icon_in_vr_mode" android:layout_width="@dimen/module_ext_navi_in_vr_navi_icon_size" android:layout_height="@dimen/module_ext_navi_in_vr_navi_icon_size" + android:layout_marginTop="@dimen/module_ext_navi_in_vr_nav_common_margin_top" + android:layout_marginStart="@dimen/module_ext_navi_in_vr_limit_speed_margin_start" android:src="@drawable/tc_11" app:layout_constraintBottom_toTopOf="@id/module_ext_id_navi_in_vr_traffic_bg" app:layout_constraintLeft_toLeftOf="@id/module_ext_id_navi_in_vr_traffic_bg" @@ -65,6 +68,7 @@ android:text="200" android:textColor="#f1f1f1" android:textSize="@dimen/module_ext_navi_in_vr_next_info_txt_size" + app:layout_constraintBottom_toTopOf="@id/module_map_id_navi_next_info_road_in_vr_mode" app:layout_constraintLeft_toRightOf="@id/module_map_id_navi_next_info_road_turn_icon_in_vr_mode" app:layout_constraintTop_toTopOf="@id/module_map_id_navi_next_info_road_turn_icon_in_vr_mode" /> @@ -85,6 +89,7 @@ android:text="北三环东路辅路" android:textColor="#f1f1f1" android:textSize="@dimen/module_ext_navi_in_vr_next_info_road_txt_size" + app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_next_info_road_turn_icon_in_vr_mode" app:layout_constraintLeft_toLeftOf="@id/module_map_id_navi_next_info_distance_in_vr_mode" app:layout_constraintTop_toBottomOf="@id/module_map_id_navi_next_info_distance_in_vr_mode" /> @@ -94,6 +99,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/module_ext_navi_in_vr_limit_speed_margin_end" + android:layout_marginTop="@dimen/module_ext_navi_in_vr_limit_speed_margin_top" android:background="@drawable/module_ext_vr_mode_limit_speed_bg" android:gravity="center" android:text="80" @@ -148,14 +154,14 @@ android:layout_height="wrap_content" app:constraint_referenced_ids="module_ext_id_tv_speed,module_ext_id_tv_speed_unit" android:visibility="gone" - tools:visibility="gone" /> + tools:visibility="visible" /> diff --git a/modules/mogo-module-extensions/src/main/res/layout/merge_vertical_traffic_light_in_vr.xml b/modules/mogo-module-extensions/src/main/res/layout/merge_vertical_traffic_light_in_vr.xml index 9c14f81fb8..4dacff9734 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/merge_vertical_traffic_light_in_vr.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/merge_vertical_traffic_light_in_vr.xml @@ -23,12 +23,13 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="12" + android:layout_marginTop="@dimen/module_ext_navi_in_vr_traffic_light_left_time_margin_top" android:textColor="#fff" app:layout_constraintHorizontal_chainStyle="packed" android:textSize="@dimen/module_ext_navi_in_vr_traffic_light_left_time_txt_size" app:layout_constraintLeft_toLeftOf="@id/module_ext_id_traffic_light_icon" app:layout_constraintRight_toLeftOf="@id/module_ext_id_traffic_light_left_time_unit" - app:layout_constraintTop_toBottomOf="@id/module_ext_id_traffic_light_icon" /> + app:layout_constraintTop_toTopOf="@id/module_ext_id_traffic_light_icon" /> 60px 100px 30px - 30px + 15px 70px 22px 78px 66px - 43px + 23px + 30px + 20px 40px 20px 17px 36px + 60px 21px - 21px + 11px 400px 300px diff --git a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/MockUtil.kt b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/MockUtil.kt index b67be3a6fe..ff4743d73e 100644 --- a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/MockUtil.kt +++ b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/MockUtil.kt @@ -45,7 +45,7 @@ class MockUtil:Handler.Callback { if (msg.what == 1001) { Logger.d(TAG,"准备添加调试view") val api = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context) as IMogoServiceApis - api.windowManagerApi.addView(view, 500, 300, false) + api.windowManagerApi.addView(view, 800, 300, false) } return false }