From b9c378d9fa062013833ff6c69ac28f6801760352 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Fri, 17 Jul 2020 14:45:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AF=94=E4=BA=9A=E8=BF=AA=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E5=92=8C=E9=A1=B6=E9=83=A8=E7=95=8C=E9=9D=A2=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/values-xhdpi-1920x1000/dimens.xml | 5 +++++ .../extensions/utils/TopViewAnimHelper.java | 16 +++++++++++++++- .../res/layout/module_ext_layout_entrance.xml | 2 +- .../main/res/values-xhdpi-1920x1000/dimens.xml | 2 ++ .../src/main/res/values-xhdpi/dimens.xml | 2 ++ .../src/main/res/values/dimens.xml | 2 ++ .../res/layout/module_main_activity_main.xml | 8 +++----- 7 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 main-extensions/mogo-module-main-independent/src/main/res/values-xhdpi-1920x1000/dimens.xml diff --git a/main-extensions/mogo-module-main-independent/src/main/res/values-xhdpi-1920x1000/dimens.xml b/main-extensions/mogo-module-main-independent/src/main/res/values-xhdpi-1920x1000/dimens.xml new file mode 100644 index 0000000000..c436f9daca --- /dev/null +++ b/main-extensions/mogo-module-main-independent/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -0,0 +1,5 @@ + + + 635px + 366px + \ No newline at end of file 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 0d4a626e29..5c67f3141e 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 @@ -6,6 +6,7 @@ import android.transition.AutoTransition; import android.transition.Transition; import android.transition.TransitionManager; import android.util.ArrayMap; +import android.util.TypedValue; import android.view.View; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; @@ -394,6 +395,11 @@ public class TopViewAnimHelper { constraintSet.connect(naviBg.getId(), ConstraintSet.TOP, R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP, 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)); + } constraintSet.applyTo(topMotionLayout); ivTurnIcon.getLayoutParams().height = @@ -487,6 +493,9 @@ 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)); + } constraintSet.clone(topMotionLayout); @@ -547,6 +556,9 @@ 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)); + // 调整约束 constraintSet.clone(topMotionLayout); constraintSet.clear(tvNextDistance.getId(), ConstraintSet.BOTTOM); @@ -576,6 +588,8 @@ 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)); // 调整约束 constraintSet.clone(topMotionLayout); constraintSet.connect(tvNextDistance.getId(), ConstraintSet.BOTTOM, @@ -655,7 +669,7 @@ public class TopViewAnimHelper { } private float getDimen(int resId) { - return (int) topMotionLayout.getContext().getResources().getDimension(resId); + return (int) topMotionLayout.getContext().getResources().getDimensionPixelSize(resId); } private int computeNaviMarginTop(int height) { 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 bae7449c91..542e47991f 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 @@ -202,7 +202,7 @@ diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml index 169a5f6e4e..0e3d697760 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -89,9 +89,11 @@ 24px 40px 60px + 50px 12px 10px 40px + 30px 34px 24px 28px diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index 059f8fb764..b1e5bf7240 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -89,9 +89,11 @@ 24px 40px 60px + 50px 12px 10px 40px + 30px 34px 24px 28px diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index a55c7a34a9..3b7a570ba8 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -91,9 +91,11 @@ 13px 20px 32px + 32px 7px 5px 22px + 22px 18px 24px diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml index c3a6b4463d..bcb2744c24 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml @@ -43,12 +43,10 @@ + android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft" + android:padding="@dimen/module_main_entrance_fragment_container_padding" />