From 77fff248a4d31c51e6c6a2c9f7a6863b6cd3d1b5 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Tue, 28 Jul 2020 11:49:58 +0800 Subject: [PATCH] ui fix --- .../extensions/utils/TopViewAnimHelper.java | 53 ++++++++++--------- .../res/values-xhdpi-1920x1000/dimens.xml | 4 +- .../main/res/layout/fragment_byd_splash.xml | 3 +- 3 files changed, 33 insertions(+), 27 deletions(-) diff --git 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 index f6daadef2a..47494f15ba 100644 --- 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, diff --git 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 index 2b7a52a38a..91bd49b433 100644 --- 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 @@ 122px - 120px + 130px 30px - 51.4px + 53px \ No newline at end of file diff --git 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 index f7bb689995..bb79601719 100644 --- 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"