ui fix

2020-07-28 11:49:58 +08:00
parent 53a49ec003
commit 77fff248a4
3 changed files with 33 additions and 27 deletions
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
@@ -380,11 +380,12 @@ public class TopViewAnimHelper {
                        // 方法之后执行才能生效，所以分开了两个判断，至于为什么这么做才能生效，不得而知
                        constraintSet.connect(tvNextDistance.getId(), ConstraintSet.BOTTOM,
                                ivTurnIcon.getId(), ConstraintSet.BOTTOM);
-                        constraintSet.connect(tvNextRoad.getId(), ConstraintSet.TOP,
-                                ivTurnIcon.getId(), ConstraintSet.TOP);
+//                        constraintSet.connect(tvNextRoad.getId(), ConstraintSet.TOP,
+//                                ivTurnIcon.getId(), ConstraintSet.TOP);
 //                        constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BOTTOM);
-//                        constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BASELINE,
-//                                tvNextDistance.getId(), ConstraintSet.BASELINE);
+                        constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BOTTOM,
+                                tvNextDistance.getId(), ConstraintSet.BOTTOM,
+                                (int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_6));
                        constraintSet.connect(tvNextRoad.getId(), ConstraintSet.LEFT,
                                R.id.module_map_id_navi_next_info_turn_info, ConstraintSet.RIGHT,
                                (int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_46));
@@ -399,8 +400,10 @@ public class TopViewAnimHelper {
                                computeNaviMarginTop(params.height));

                        // 动态改变相关字体大小
-                        tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize_small));
-                        tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize_small));
+                        tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                                getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize_small));
+                        tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                                getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize_small));

                    }
                    constraintSet.applyTo(topMotionLayout);
@@ -450,8 +453,10 @@ public class TopViewAnimHelper {
                remainDistanceGroup.setVisibility(View.VISIBLE);
                remainTimeGroup.setVisibility(View.VISIBLE);
                arriveTimeGroup.setVisibility(View.VISIBLE);
-                tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize));
-                tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize));
+                tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                        getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize));
+                tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                        getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize));

            }
            constraintSet.clone(topMotionLayout);
@@ -466,7 +471,7 @@ public class TopViewAnimHelper {
                // 约束设置需要在applyTo()方法之前执行，visiable设置需要在applyTo()
                // 方法之后执行才能生效，所以分开了两个判断，至于为什么这么做才能生效，不得而知
                constraintSet.clear(tvNextDistance.getId(), ConstraintSet.BOTTOM);
-                constraintSet.clear(tvNextRoad.getId(), ConstraintSet.TOP);
+//                constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BASELINE);
                constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BOTTOM,
                        ivTurnIcon.getId(), ConstraintSet.BOTTOM,
                        (int) getDimen(R.dimen.module_map_id_navi_next_info_road_marginBottom));
@@ -513,15 +518,18 @@ public class TopViewAnimHelper {
            remainDistanceGroup.setVisibility(View.VISIBLE);
            remainTimeGroup.setVisibility(View.VISIBLE);
            arriveTimeGroup.setVisibility(View.VISIBLE);
-            tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize));
-            tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize));
+            tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                    getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize));
+            tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                    getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize));

            // 调整约束
            constraintSet.clone(topMotionLayout);
            constraintSet.clear(tvNextDistance.getId(), ConstraintSet.BOTTOM);
-            constraintSet.clear(tvNextRoad.getId(), ConstraintSet.TOP);
+//            constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BASELINE);
            constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BOTTOM, ivTurnIcon.getId(),
-                    ConstraintSet.BOTTOM);
+                    ConstraintSet.BOTTOM,
+                    (int) getDimen(R.dimen.module_map_id_navi_next_info_road_marginBottom));
            constraintSet.connect(tvNextRoad.getId(), ConstraintSet.LEFT,
                    tvNextDistance.getId(), ConstraintSet.LEFT,
                    0);
@@ -545,27 +553,24 @@ public class TopViewAnimHelper {
            remainDistanceGroup.setVisibility(View.GONE);
            remainTimeGroup.setVisibility(View.GONE);
            arriveTimeGroup.setVisibility(View.GONE);
-            tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize_small));
-            tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize_small));
+            tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                    getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize_small));
+            tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                    getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize_small));
            // 调整约束
            constraintSet.clone(topMotionLayout);
            constraintSet.connect(tvNextDistance.getId(), ConstraintSet.BOTTOM,
                    ivTurnIcon.getId(), ConstraintSet.BOTTOM);
-            constraintSet.connect(tvNextRoad.getId(), ConstraintSet.TOP,
-                    ivTurnIcon.getId(), ConstraintSet.TOP);
+//            constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BOTTOM);
+            constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BOTTOM,
+                    tvNextDistance.getId(), ConstraintSet.BOTTOM,
+                    (int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_6));
            constraintSet.connect(tvNextRoad.getId(), ConstraintSet.LEFT,
                    R.id.module_map_id_navi_next_info_turn_info, ConstraintSet.RIGHT,
                    (int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_46));
            constraintSet.connect(naviBg.getId(), ConstraintSet.TOP,
                    R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP,
                    computeNaviMarginTop(topContainer.getHeight()));
-//            ivTurnIcon.getLayoutParams().height =
-//                    (int) getDimen(R.dimen.module_ext_navi_info_panel_turn_icon_small_height);
-//            ivTurnIcon.getLayoutParams().width =
-//                    (int) getDimen(R.dimen.module_ext_navi_info_panel_turn_icon_small_width);
-//            naviBg.getLayoutParams().height =
-//                    (int) topMotionLayout.getContext().getResources().getDimension(R.dimen
-//                    .module_ext_navi_info_panel_small_height);
            constraintSet.clear(ivTurnIcon.getId(), ConstraintSet.TOP);
            constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM,
                    naviBg.getId(), ConstraintSet.BOTTOM,
--- a/modules/mogo-module-left-panel/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-left-panel/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <dimen name="module_left_panel_simple_speed_text_size">122px</dimen>
-    <dimen name="module_left_panel_simple_speed_text_margin_top">120px</dimen>
+    <dimen name="module_left_panel_simple_speed_text_margin_top">130px</dimen>
    <dimen name="module_left_panel_simple_speed_title_size">30px</dimen>
-    <dimen name="module_left_panel_simple_speed_title_margin">51.4px</dimen>
+    <dimen name="module_left_panel_simple_speed_title_margin">53px</dimen>

 </resources>
--- a/modules/mogo-module-splash/src/main/res/layout/fragment_byd_splash.xml
+++ b/modules/mogo-module-splash/src/main/res/layout/fragment_byd_splash.xml
@@ -16,7 +16,8 @@
        android:background="@drawable/byd_enter_btn_bg"
        android:textColor="#0D172C"
        android:text="开启行程"
-        android:textSize="@dimen/dp_48"
+        android:textSize="@dimen/dp_46"
+        android:textStyle="bold"
        android:layout_marginStart="@dimen/dp_182"
        android:layout_marginBottom="@dimen/dp_251"
        app:layout_constraintBottom_toBottomOf="parent"