From a0fad158444db9c06c75979cce87dd0e004ad981 Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Tue, 28 Jul 2020 19:04:06 +0800
Subject: [PATCH 1/2] ui fix

---
 .../com/mogo/module/extensions/utils/TopViewAnimHelper.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 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 47494f15ba..177aa0c2a8 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
@@ -379,7 +379,7 @@ public class TopViewAnimHelper {
                         // 约束设置需要在applyTo()方法之前执行，visiable设置需要在applyTo()
                         // 方法之后执行才能生效，所以分开了两个判断，至于为什么这么做才能生效，不得而知
                         constraintSet.connect(tvNextDistance.getId(), ConstraintSet.BOTTOM,
-                                ivTurnIcon.getId(), ConstraintSet.BOTTOM);
+                                ivTurnIcon.getId(), ConstraintSet.BOTTOM,(int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_2));
 //                        constraintSet.connect(tvNextRoad.getId(), ConstraintSet.TOP,
 //                                ivTurnIcon.getId(), ConstraintSet.TOP);
 //                        constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BOTTOM);
@@ -560,7 +560,8 @@ public class TopViewAnimHelper {
             // 调整约束
             constraintSet.clone(topMotionLayout);
             constraintSet.connect(tvNextDistance.getId(), ConstraintSet.BOTTOM,
-                    ivTurnIcon.getId(), ConstraintSet.BOTTOM);
+                    ivTurnIcon.getId(), ConstraintSet.BOTTOM,
+                    (int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_2));
 //            constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BOTTOM);
             constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BOTTOM,
                     tvNextDistance.getId(), ConstraintSet.BOTTOM,

From d2f556e58f0e4882221efe7351b137bc0e22b930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 28 Jul 2020 19:27:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=96=B2=E5=8A=B3?=
 =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E4=BB=A5=E5=8F=8A=E6=95=85=E9=9A=9C=E6=B1=82?=
 =?UTF-8?q?=E5=8A=A9=E7=9A=84=E6=96=87=E5=AD=97=E5=A4=A7=E5=B0=8F=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=E5=85=B6=E5=AE=83=E6=9C=BA=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java  | 4 ++--
 .../v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java
index 0a901e78ad..f1d36a428f 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java
@@ -194,9 +194,9 @@ public class V2XSeekHelpAdapter extends RecyclerView.Adapter<V2XSeekHelpAdapter.
             tvDistance.setText(distance);
             SpanUtils.with(tvDistance)
                     .append("" + distance)
-                    .setFontSize(80)
+                    .setFontSize((int) tvDistance.getResources().getDimension(R.dimen.dp_80))
                     .append("M")
-                    .setFontSize(30)
+                    .setFontSize((int) tvDistance.getResources().getDimension(R.dimen.dp_30))
                     .create();
             tvEventTime.setText(eventTime);
         }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java
index f0b7f152e4..b4249e3355 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java
@@ -98,9 +98,9 @@ public class V2XFatigueDrivingWindow extends RelativeLayout
             }
             SpanUtils.with(mTvAddressDistance)
                     .append("" + (int) entity.getDistance())
-                    .setFontSize(80)
+                    .setFontSize((int) getResources().getDimension(R.dimen.dp_80))
                     .append("M")
-                    .setFontSize(30)
+                    .setFontSize((int) getResources().getDimension(R.dimen.dp_30))
                     .create();
             countDownV2XEvent(entity);
         }