Merge branch 'dev_MogoAP_eagle-930_210926_8.0.12' into dev/dev_eagle_architecture_upgrade2

modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml

@@ -34,7 +34,6 @@
         android:background="@drawable/module_switch_map_bg"
         android:elevation="@dimen/dp_10"
         android:padding="@dimen/dp_20"
-        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent">
 

modules/mogo-module-push/src/main/res/drawable/module_push_item_background.xml

@@ -3,8 +3,8 @@
     android:shape="rectangle">
     <gradient
         android:angle="135"
-        android:endColor="#33000000"
-        android:startColor="#33000000"
+        android:endColor="#80000000"
+        android:startColor="#80000000"
         android:type="linear" />
     <corners android:radius="@dimen/module_push_ui_bkg_corner" />
 </shape>

modules/mogo-module-push/src/main/res/layout/module_push_dialog_check.xml

@@ -25,6 +25,8 @@
         android:layout_marginTop="@dimen/module_push_dialog_title_margin"
         android:textColor="@android:color/white"
         android:textSize="@dimen/module_push_dialog_title_size"
+        android:text="官方公告"
+        android:textStyle="bold"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />

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,36 +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: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

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>

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>

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>
@@ -17,7 +18,7 @@
     <dimen name="module_push_title_mix_width">394px</dimen>
     <dimen name="module_push_ui_title_textSize">42px</dimen>
     <dimen name="module_push_ui_content_width">567px</dimen>
-    <dimen name="module_push_ui_content_height">100px</dimen>
+    <dimen name="module_push_ui_content_height">120px</dimen>
     <dimen name="module_push_ui_content_marginTop">20px</dimen>
     <dimen name="module_push_ui_content_marginBottom">34px</dimen>
     <dimen name="module_push_ui_title_text_size">34px</dimen>

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>

modules/mogo-module-push/src/main/res/values/colors.xml

@@ -4,7 +4,7 @@
     <color name="module_push_item_title_textColor">#FFFFFF</color>
     <color name="module_push_item_content_textColor">#B2FFFFFF</color>
     <color name="module_push_item_time_textColor">#999999</color>
-    <color name="module_push_item_line_color">#B3FFFFFF</color>
+    <color name="module_push_item_line_color">#FFF</color>
     <color name="module_push_check_color">#5A8EFD</color>
     <color name="module_push_check_dialog_bg_color">#E63B4577</color>
 </resources>

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>
@@ -102,7 +103,7 @@
 
     <dimen name="module_push_ui_content_marginBottom">34px</dimen>
     <dimen name="module_push_ui_content_width">567px</dimen>
-    <dimen name="module_push_ui_content_height">100px</dimen>
+    <dimen name="module_push_ui_content_height">120px</dimen>
 
     <dimen name="module_push_line_width">2px</dimen>
     <dimen name="module_push_line_height">120px</dimen>