From 4748956c8f96f20ec37f9ff7953e0aaeb87b0ec2 Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 10 Nov 2020 17:20:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?UI=20=20=E5=87=BA=E7=8E=B0=E5=8A=A8?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/item_v2x_scennario_history.xml | 4 ++-- .../main/res/layout/item_v2x_scennario_history_other_help.xml | 2 +- .../src/main/res/layout/window_road_event_detail.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml index da50969a5e..a119d15ca1 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml @@ -47,8 +47,9 @@ android:id="@+id/ivIconP" android:layout_width="@dimen/module_v2x_history_event_icon_size" android:layout_height="@dimen/module_v2x_history_event_icon_size" - android:layout_marginEnd="@dimen/dp_16" + android:layout_marginEnd="@dimen/dp_26" android:src="@drawable/icon_illegal_parking" + app:layout_constraintRight_toLeftOf="@+id/tvAddress" app:layout_constraintLeft_toLeftOf="@+id/tagEventType" app:layout_constraintTop_toBottomOf="@+id/tagEventType" app:layout_constraintTop_toTopOf="@+id/tvAddress" /> @@ -57,7 +58,6 @@ android:id="@+id/tvAddress" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="@dimen/dp_12" android:layout_marginTop="@dimen/dp_24" android:layout_marginRight="@dimen/dp_30" android:ellipsize="end" diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index a7b3b43599..83ff056b82 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml @@ -11,7 +11,7 @@ android:id="@+id/tagEventType" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="@dimen/module_v2x_surrounding_item_bottom_image_height" + android:layout_marginStart="@dimen/dp_36" android:layout_marginTop="@dimen/dp_24" android:background="@drawable/bg_v2x_event_type_orange" android:gravity="center" diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml index cb599e80c8..028b4ceb1f 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml @@ -26,7 +26,7 @@ android:layout_height="@dimen/dp_88" android:layout_marginEnd="@dimen/dp_28" android:layout_marginBottom="@dimen/dp_40" - android:background="@drawable/icon_window_close2" + android:background="@drawable/v2x_panel_close" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" /> From aca75acee71e437c67f5b74b7b79142eb50817e1 Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 10 Nov 2020 17:29:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=8B=89=E4=BC=B8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/module/common/view/CustomRatingBar.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/CustomRatingBar.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/CustomRatingBar.java index d7cab5bbb4..8403901eef 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/CustomRatingBar.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/CustomRatingBar.java @@ -230,7 +230,6 @@ public class CustomRatingBar extends LinearLayout { layout.setMargins(0, 0, Math.round(elementPadding), 0);//设置每颗星星在线性布局的间距 imageView.setLayoutParams(layout); imageView.setAdjustViewBounds(true); - imageView.setScaleType(ImageView.ScaleType.FIT_XY); imageView.setImageDrawable(elementEmptyDrawable); imageView.setMinimumWidth((int) elementWidth); imageView.setMaxWidth((int) elementWidth);