From 09abde0c8efffe381b0a0866059054bdaff64c51 Mon Sep 17 00:00:00 2001
From: ningwenqiang <gongduoxiang@163.com>
Date: Fri, 1 Nov 2024 21:10:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=87=86=E5=A4=87=E6=94=B9=E4=BA=86?=
 =?UTF-8?q?=20=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/src/main/res/drawable/bg_f2edd7_10.xml       |  7 +++++++
 .../main/res/layout/item_home_sud_game_list2.xml    |  4 ++--
 .../com/yunbao/main/views/MainMeViewHolder.java     |  4 ++--
 .../yunbao/main/views/MainMessageViewHolder2.java   | 13 ++++++++++++-
 main/src/main/res/layout/view_main_home2.xml        |  1 +
 main/src/main/res/layout/view_main_me2.xml          |  4 ++--
 6 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 common/src/main/res/drawable/bg_f2edd7_10.xml

diff --git a/common/src/main/res/drawable/bg_f2edd7_10.xml b/common/src/main/res/drawable/bg_f2edd7_10.xml
new file mode 100644
index 000000000..7381e2737
--- /dev/null
+++ b/common/src/main/res/drawable/bg_f2edd7_10.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:radius="10dp"/>
+    <solid android:color="#FFF" />
+</shape>
\ No newline at end of file
diff --git a/common/src/main/res/layout/item_home_sud_game_list2.xml b/common/src/main/res/layout/item_home_sud_game_list2.xml
index dc6fe15d1..a684cb6d2 100644
--- a/common/src/main/res/layout/item_home_sud_game_list2.xml
+++ b/common/src/main/res/layout/item_home_sud_game_list2.xml
@@ -6,9 +6,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="16dp"
-    android:layout_marginTop="6dp"
+    android:layout_marginTop="9dp"
     android:layout_marginEnd="16dp"
-    android:background="@mipmap/background_home_sud_game_list">
+    android:background="@drawable/bg_f2edd7_10">
 
     <com.makeramen.roundedimageview.RoundedImageView
         android:id="@+id/avatar"
diff --git a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
index b02f2a30a..484018bbd 100644
--- a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
@@ -388,7 +388,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
                     ZhuangBanActivity.forward(mContext, url);
                 }
             });
-            tv_level.setText(u.getLevel() + "");
+            tv_level.setText("LV "+u.getLevel() );
 
         } else {
             Constants.isAnchor = false;
@@ -412,7 +412,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
                     ZhuangBanActivity.forward(mContext, url);
                 }
             });
-            tv_level.setText(u.getLevel() + "");
+            tv_level.setText("LV "+u.getLevel() );
 
         }
         //修改靓号图标 个人中心
diff --git a/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder2.java b/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder2.java
index 2d5a21831..0b9be211c 100644
--- a/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder2.java
+++ b/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder2.java
@@ -563,13 +563,24 @@ public class MainMessageViewHolder2 extends AbsMainHomeChildViewHolder {
                 DebugUtils.runDebugCode(() -> {
                     if(more!=null){
                         more.setVisibility(View.VISIBLE);
+                        if (moreXPopup==null){
+                            moreXPopup = new XPopup.Builder(mContext).atView(more);
+                            more.setOnClickListener(view -> {
+                                moreXPopup.asCustom(new MsgMoreDialog(mContext)).show();
+                            });
+                        }
                     }
-
                 });
                 if (data.getIsAnchor() == 1 && CommonAppConfig.getInstance().getUserBean().getUsers_type().equals("C")) {
                     userType = 2;//主播B
                     if(more!=null){
                         more.setVisibility(View.VISIBLE);
+                        if (moreXPopup==null){
+                            moreXPopup = new XPopup.Builder(mContext).atView(more);
+                            more.setOnClickListener(view -> {
+                                moreXPopup.asCustom(new MsgMoreDialog(mContext)).show();
+                            });
+                        }
                     }
                     viewPager.setUserInputEnabled(true);
                     //mIndicator.setVisibility(View.VISIBLE);
diff --git a/main/src/main/res/layout/view_main_home2.xml b/main/src/main/res/layout/view_main_home2.xml
index 2077ba6e0..b0e9a41a1 100644
--- a/main/src/main/res/layout/view_main_home2.xml
+++ b/main/src/main/res/layout/view_main_home2.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@mipmap/bg_yola_index"
     android:orientation="vertical">
 
     <ImageView
diff --git a/main/src/main/res/layout/view_main_me2.xml b/main/src/main/res/layout/view_main_me2.xml
index 2a5c63991..d83d78307 100644
--- a/main/src/main/res/layout/view_main_me2.xml
+++ b/main/src/main/res/layout/view_main_me2.xml
@@ -4,8 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@mipmap/bg_yola_index"
     android:orientation="vertical"
+    android:background="@mipmap/bg_yola_index"
     android:paddingBottom="50dp">
 
 
@@ -110,6 +110,7 @@
                 android:layout_height="15dp"
                 android:layout_marginTop="10dp"
                 android:src="@mipmap/good_nub"
+                android:paddingEnd="6dp"
                 android:visibility="gone"
                 app:layout_constraintStart_toStartOf="@+id/name"
                 app:layout_constraintTop_toBottomOf="@+id/name"
@@ -119,7 +120,6 @@
                 android:id="@+id/id_val"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="6dp"
                 android:layout_marginTop="10dp"
                 android:background="@drawable/bg_white_radius17"
                 android:paddingStart="6dp"