From 7b70de8f2ea4acb01d997b07b5b38f9f2ce5b8b6 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Wed, 20 Oct 2021 16:11:01 +0800
Subject: [PATCH] =?UTF-8?q?UI-=E5=AE=98=E6=96=B9=E5=85=AC=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/module_push_item.xml  | 27 +++++++------------
 .../src/main/res/values-ldpi/dimens.xml       |  1 +
 .../src/main/res/values-mdpi/dimens.xml       |  1 +
 .../res/values-xhdpi-2560x1440/dimens.xml     |  1 +
 .../src/main/res/values-xhdpi/dimens.xml      |  1 +
 .../src/main/res/values/dimens.xml            |  1 +
 6 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/modules/mogo-module-push/src/main/res/layout/module_push_item.xml b/modules/mogo-module-push/src/main/res/layout/module_push_item.xml
index f70762fece..4cb87856d8 100644
--- a/modules/mogo-module-push/src/main/res/layout/module_push_item.xml
+++ b/modules/mogo-module-push/src/main/res/layout/module_push_item.xml
@@ -25,6 +25,8 @@
         android:layout_marginLeft="@dimen/module_push_ui_app_icon_leftMargin"
         android:layout_marginTop="@dimen/module_push_ui_app_icon_topMargin"
         android:gravity="center_vertical"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@+id/module_push_image"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_goneMarginTop="@dimen/module_push_ui_app_icon_goneTopMargin">
@@ -42,38 +44,29 @@
             android:textSize="@dimen/module_push_ui_title_textSize"
             app:layout_constrainedWidth="true"
             tools:text="官方公告" />
-    </LinearLayout>
-
-    <RelativeLayout
-        android:id="@+id/module_push_rl_content"
-        android:layout_width="@dimen/module_push_ui_content_width"
-        android:layout_height="@dimen/module_push_ui_content_height"
-        android:layout_marginTop="@dimen/module_push_ui_content_marginTop"
-        android:layout_marginBottom="@dimen/module_push_ui_content_marginBottom"
-        app:layout_constraintLeft_toLeftOf="@id/module_push_app_icon_title"
-        app:layout_constraintTop_toBottomOf="@id/module_push_app_icon_title">
 
         <TextView
             android:id="@+id/module_push_content"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_width="@dimen/module_push_ui_content_width"
+            android:layout_height="@dimen/module_push_ui_content_height"
             android:ellipsize="end"
-            android:gravity="center|left"
-            android:maxLines="3"
+            android:layout_marginTop="@dimen/module_push_ui_content_topMargin"
+            android:gravity="top|left"
+            android:maxLines="2"
             android:text="这是测试数据,当前测试数据是为了查看换行的显示效果,如果最多3行呢,怎么显示的呢"
             android:textColor="@android:color/white"
             android:textSize="@dimen/module_push_ui_title_text_size" />
+    </LinearLayout>
 
-    </RelativeLayout>
 
     <View
         android:id="@+id/module_push_line"
         android:layout_width="@dimen/module_push_line_width"
         android:layout_height="@dimen/module_push_line_height"
-        android:layout_marginLeft="@dimen/module_push_line_margin_left"
+        android:layout_marginLeft="@dimen/dp_100"
         android:background="@color/module_push_item_line_color"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@+id/module_push_rl_content"
+        app:layout_constraintLeft_toRightOf="@+id/module_push_app_icon_title"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
diff --git a/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml
index 1f1106b6c5..6a741d060b 100644
--- a/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml
@@ -58,6 +58,7 @@
     <dimen name="module_push_ui_image_marLeft">8px</dimen>
     <dimen name="module_push_ui_app_icon_leftMargin">12px</dimen>
     <dimen name="module_push_ui_app_icon_topMargin">16px</dimen>
+    <dimen name="module_push_ui_content_topMargin">6px</dimen>
     <dimen name="module_push_ui_app_icon_goneTopMargin">19px</dimen>
     <dimen name="module_push_ui_app_icon_size">30px</dimen>
     <dimen name="module_push_ui_title_textSize">16px</dimen>
diff --git a/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml
index 1f1106b6c5..6a741d060b 100644
--- a/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml
@@ -58,6 +58,7 @@
     <dimen name="module_push_ui_image_marLeft">8px</dimen>
     <dimen name="module_push_ui_app_icon_leftMargin">12px</dimen>
     <dimen name="module_push_ui_app_icon_topMargin">16px</dimen>
+    <dimen name="module_push_ui_content_topMargin">6px</dimen>
     <dimen name="module_push_ui_app_icon_goneTopMargin">19px</dimen>
     <dimen name="module_push_ui_app_icon_size">30px</dimen>
     <dimen name="module_push_ui_title_textSize">16px</dimen>
diff --git a/modules/mogo-module-push/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-push/src/main/res/values-xhdpi-2560x1440/dimens.xml
index 8280b9b643..d3d0959788 100644
--- a/modules/mogo-module-push/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/modules/mogo-module-push/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -7,6 +7,7 @@
     <dimen name="module_push_ui_image_corner">30px</dimen>
     <dimen name="module_push_ui_app_icon_leftMargin">21px</dimen>
     <dimen name="module_push_ui_app_icon_topMargin">34px</dimen>
+    <dimen name="module_push_ui_content_topMargin">20px</dimen>
     <dimen name="module_push_ui_app_icon_goneTopMargin">33px</dimen>
     <dimen name="module_push_line_width">2px</dimen>
     <dimen name="module_push_line_height">120px</dimen>
diff --git a/modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml
index c7e71bf8e5..7f784d0108 100644
--- a/modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml
@@ -58,6 +58,7 @@
     <dimen name="module_push_ui_image_marLeft">17px</dimen>
     <dimen name="module_push_ui_app_icon_leftMargin">21px</dimen>
     <dimen name="module_push_ui_app_icon_topMargin">30px</dimen>
+    <dimen name="module_push_ui_content_topMargin">20px</dimen>
     <dimen name="module_push_ui_app_icon_goneTopMargin">33px</dimen>
     <dimen name="module_push_ui_app_icon_size">50px</dimen>
     <dimen name="module_push_ui_title_textSize">30px</dimen>
diff --git a/modules/mogo-module-push/src/main/res/values/dimens.xml b/modules/mogo-module-push/src/main/res/values/dimens.xml
index 061812050f..5738bb1b5f 100644
--- a/modules/mogo-module-push/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-push/src/main/res/values/dimens.xml
@@ -58,6 +58,7 @@
     <dimen name="module_push_ui_image_marLeft">8px</dimen>
     <dimen name="module_push_ui_app_icon_leftMargin">12px</dimen>
     <dimen name="module_push_ui_app_icon_topMargin">16px</dimen>
+    <dimen name="module_push_ui_content_topMargin">6px</dimen>
     <dimen name="module_push_ui_app_icon_goneTopMargin">19px</dimen>
     <dimen name="module_push_ui_app_icon_size">30px</dimen>
     <dimen name="module_push_ui_title_textSize">16px</dimen>