From 4451403f46fb68240718bd35e93875fab898a560 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Wed, 27 Mar 2024 14:10:54 +0800
Subject: [PATCH] =?UTF-8?q?fix=20[=E6=B6=88=E6=81=AF=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=B8=8Eui=E4=B8=8D=E4=B8=80=E8=87=B4]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yunbao/common/manager/OpenAdManager.java  |   1 +
 .../src/main/res/layout/view_main_message.xml | 102 +++++++++---------
 2 files changed, 54 insertions(+), 49 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/manager/OpenAdManager.java b/common/src/main/java/com/yunbao/common/manager/OpenAdManager.java
index 46242290d..8e4e63f81 100644
--- a/common/src/main/java/com/yunbao/common/manager/OpenAdManager.java
+++ b/common/src/main/java/com/yunbao/common/manager/OpenAdManager.java
@@ -191,6 +191,7 @@ public class OpenAdManager {
             if (model.getShowModel() == OpenAdModel.SHOW_DIY) {
                 String nextTime= String.valueOf(System.currentTimeMillis() + (Long.parseLong(model.getSection()) * 60 * 1000));
                 SpUtil.setStringValue("open_ad_popup_time_" + model.getId(), nextTime);
+                Log.i(TAG, "run: 下一次展示时间:"+nextTime+" | "+model.getSection());
                 showMap.remove(model.getId());
             }
             if (model.getModel() == OpenAdModel.MODEL_BOTTOM) {
diff --git a/main/src/main/res/layout/view_main_message.xml b/main/src/main/res/layout/view_main_message.xml
index 919ea127f..35533aa3a 100644
--- a/main/src/main/res/layout/view_main_message.xml
+++ b/main/src/main/res/layout/view_main_message.xml
@@ -142,54 +142,7 @@
                 tools:visibility="visible" />
         </RelativeLayout>
 
-        <RelativeLayout
 
-            android:layout_width="0dp"
-            android:layout_height="110dp"
-            android:layout_weight="1">
-
-
-            <ImageView
-                android:id="@+id/img_system_messages"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:layout_alignBottom="@+id/tv_system_messages"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentEnd="true"
-                android:layout_marginBottom="20dp"
-                android:src="@mipmap/ic_msg_interaction" />
-
-            <TextView
-                android:id="@+id/tv_system_messages"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true"
-                android:gravity="center"
-                android:maxLines="1"
-                android:text="@string/activity_msg_system_message"
-                android:textColor="#333333"
-                android:textSize="13sp"
-                app:autoSizeMaxTextSize="13sp"
-                app:autoSizeMinTextSize="5sp"
-                app:autoSizeStepGranularity="1sp"
-                app:autoSizeTextType="uniform" />
-
-            <TextView
-                android:id="@+id/text_system_messages"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_alignParentEnd="true"
-                android:layout_marginTop="15dp"
-                android:layout_marginEnd="17dp"
-                android:background="@drawable/background_system_message"
-                android:gravity="center"
-                android:text="7"
-                android:textColor="@color/white"
-                android:textSize="12sp"
-                android:visibility="gone" />
-        </RelativeLayout>
 
         <RelativeLayout
             android:layout_width="0dp"
@@ -203,8 +156,10 @@
                 android:layout_alignBottom="@+id/tv_news_interaction"
                 android:layout_alignParentStart="true"
                 android:layout_alignParentEnd="true"
-                android:layout_marginBottom="20dp"
-                android:src="@mipmap/ic_msg_message" />
+                android:layout_marginStart="17dp"
+                android:layout_marginEnd="17dp"
+                android:layout_marginBottom="19dp"
+                android:src="@mipmap/ic_msg_interaction" />
 
             <TextView
                 android:id="@+id/tv_news_interaction"
@@ -238,6 +193,55 @@
                 android:visibility="gone" />
         </RelativeLayout>
 
+        <RelativeLayout
+
+            android:layout_width="0dp"
+            android:layout_height="110dp"
+            android:layout_weight="1">
+
+
+            <ImageView
+                android:id="@+id/img_system_messages"
+                android:layout_width="match_parent"
+                android:layout_height="70dp"
+                android:layout_alignBottom="@+id/tv_system_messages"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentEnd="true"
+                android:layout_marginBottom="20dp"
+                android:src="@mipmap/ic_msg_message" />
+
+            <TextView
+                android:id="@+id/tv_system_messages"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentBottom="true"
+                android:gravity="center"
+                android:maxLines="1"
+                android:text="@string/activity_msg_system_message"
+                android:textColor="#333333"
+                android:textSize="13sp"
+                app:autoSizeMaxTextSize="13sp"
+                app:autoSizeMinTextSize="5sp"
+                app:autoSizeStepGranularity="1sp"
+                app:autoSizeTextType="uniform" />
+
+            <TextView
+                android:id="@+id/text_system_messages"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_alignParentEnd="true"
+                android:layout_marginTop="15dp"
+                android:layout_marginEnd="17dp"
+                android:background="@drawable/background_system_message"
+                android:gravity="center"
+                android:text="7"
+                android:textColor="@color/white"
+                android:textSize="12sp"
+                android:visibility="gone" />
+        </RelativeLayout>
+
         <RelativeLayout
             android:layout_width="0dp"
             android:layout_height="110dp"