From 1019bac08571539d16926264fd98123bb9b78f13 Mon Sep 17 00:00:00 2001
From: ningwenqiang <gongduoxiang@163.com>
Date: Sat, 2 Nov 2024 13:41:20 +0800
Subject: [PATCH] =?UTF-8?q?UI=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/item_home_sud_game_list2.xml   |  2 +-
 .../com/yunbao/main/adapter/MainHomeComAdapter2.java   |  5 +++++
 main/src/main/res/drawable/bg_transform2white.xml      |  7 +++++++
 main/src/main/res/layout/view_homemain.xml             | 10 +++++-----
 main/src/main/res/layout/view_main_home2.xml           |  9 ++++++++-
 main/src/main/res/layout/view_main_home_com.xml        |  4 ++--
 main/src/main/res/layout/view_main_home_com_hot.xml    |  4 +++-
 .../main/res/layout/view_main_home_sud_game_list2.xml  |  8 +++++++-
 main/src/main/res/layout/view_main_me2.xml             | 10 ++++++----
 9 files changed, 44 insertions(+), 15 deletions(-)
 create mode 100644 main/src/main/res/drawable/bg_transform2white.xml

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 b95f6027b..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
@@ -8,7 +8,7 @@
     android:layout_marginStart="16dp"
     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/adapter/MainHomeComAdapter2.java b/main/src/main/java/com/yunbao/main/adapter/MainHomeComAdapter2.java
index 3bd93a6ad..7b92a8ab4 100644
--- a/main/src/main/java/com/yunbao/main/adapter/MainHomeComAdapter2.java
+++ b/main/src/main/java/com/yunbao/main/adapter/MainHomeComAdapter2.java
@@ -149,6 +149,11 @@ public class MainHomeComAdapter2 extends RefreshAdapter<ActiveBean> {
             if (bean == null) {
                 return;
             }
+            if(position==0){
+                topLine.setVisibility(View.GONE);
+            }else {
+                topLine.setVisibility(View.VISIBLE);
+            }
             ImgLoader.display(mContext, bean.getUser_avatar(), author);
             name.setText(bean.getUser_name());
             time.setText(bean.getCreate_time());
diff --git a/main/src/main/res/drawable/bg_transform2white.xml b/main/src/main/res/drawable/bg_transform2white.xml
new file mode 100644
index 000000000..0c7304aa5
--- /dev/null
+++ b/main/src/main/res/drawable/bg_transform2white.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="@android:color/transparent"
+        android:endColor="@android:color/white"
+        android:angle="270" />
+</shape>
\ No newline at end of file
diff --git a/main/src/main/res/layout/view_homemain.xml b/main/src/main/res/layout/view_homemain.xml
index 910f96984..e2c5886d2 100644
--- a/main/src/main/res/layout/view_homemain.xml
+++ b/main/src/main/res/layout/view_homemain.xml
@@ -51,7 +51,7 @@
                     app:tbn_icon_size="25dp"
                     app:tbn_text_color_checked="@color/colorMainTab"
                     app:tbn_text_color_unchecked="@color/gray1"
-                    app:tbn_text_size="11sp"
+                    app:tbn_text_size="9sp"
                     app:tbn_tip="@string/main_home" />
 
                 <com.yunbao.common.custom.TabButton
@@ -62,7 +62,7 @@
                     app:tbn_icon_size="25dp"
                     app:tbn_text_color_checked="@color/colorMainTab"
                     app:tbn_text_color_unchecked="@color/gray1"
-                    app:tbn_text_size="11sp"
+                    app:tbn_text_size="9sp"
                     app:tbn_tip="@string/live" />
 
                 <com.yunbao.common.custom.TabButton
@@ -73,7 +73,7 @@
                     app:tbn_icon_size="25dp"
                     app:tbn_text_color_checked="@color/colorMainTab"
                     app:tbn_text_color_unchecked="@color/gray1"
-                    app:tbn_text_size="11sp"
+                    app:tbn_text_size="9sp"
                     app:tbn_tip="@string/game" />
 
                 <com.yunbao.common.custom.TabButton
@@ -84,7 +84,7 @@
                     app:tbn_icon_size="25dp"
                     app:tbn_text_color_checked="@color/colorMainTab"
                     app:tbn_text_color_unchecked="@color/gray1"
-                    app:tbn_text_size="11sp"
+                    app:tbn_text_size="9sp"
                     app:tbn_tip="@string/chat" />
 
                 <com.yunbao.common.custom.TabButton
@@ -95,7 +95,7 @@
                     app:tbn_icon_size="25dp"
                     app:tbn_text_color_checked="@color/colorMainTab"
                     app:tbn_text_color_unchecked="@color/gray1"
-                    app:tbn_text_size="11sp"
+                    app:tbn_text_size="9sp"
                     app:tbn_tip="@string/main_me" />
 
             </com.yunbao.common.custom.TabButtonGroup>
diff --git a/main/src/main/res/layout/view_main_home2.xml b/main/src/main/res/layout/view_main_home2.xml
index b0e9a41a1..e1794fd05 100644
--- a/main/src/main/res/layout/view_main_home2.xml
+++ b/main/src/main/res/layout/view_main_home2.xml
@@ -4,9 +4,16 @@
     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">
 
+    <View
+        android:layout_width="match_parent"
+        android:background="@mipmap/bg_yola_index"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintDimensionRatio="1.512"
+        android:layout_height="0dp"/>
+
     <ImageView
         android:id="@+id/img_trophy"
         android:layout_width="wrap_content"
diff --git a/main/src/main/res/layout/view_main_home_com.xml b/main/src/main/res/layout/view_main_home_com.xml
index a4ebe4e39..621db1030 100644
--- a/main/src/main/res/layout/view_main_home_com.xml
+++ b/main/src/main/res/layout/view_main_home_com.xml
@@ -13,9 +13,9 @@
         android:layout_width="match_parent"
         android:layout_height="44dp"
         android:layout_marginTop="28dp"
-        android:background="@android:color/transparent"
         android:fadingEdge="none"
         app:elevation="0dp"
+        android:background="@drawable/bg_transform2white"
         app:layout_behavior="com.yunbao.common.custom.FixAppBarLayoutBehavior">
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -77,7 +77,7 @@
         android:id="@+id/viewPager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/white"
         android:overScrollMode="never"
+        android:background="@color/white"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 </LinearLayout>
\ No newline at end of file
diff --git a/main/src/main/res/layout/view_main_home_com_hot.xml b/main/src/main/res/layout/view_main_home_com_hot.xml
index c4fc13261..d3d2292a4 100644
--- a/main/src/main/res/layout/view_main_home_com_hot.xml
+++ b/main/src/main/res/layout/view_main_home_com_hot.xml
@@ -19,8 +19,10 @@
         android:layout_width="match_parent"
         android:layout_height="4dp"
         android:background="#F3F4F9" />
+
     <com.yunbao.common.custom.CommonRefreshView
         android:id="@+id/refreshView"
+        android:background="@color/white"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginLeft="4dp"
@@ -39,12 +41,12 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:alpha="0"
+            android:visibility="gone"
             android:background="#80000000" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/white"
             android:overScrollMode="never"
             android:paddingBottom="10dp" />
 
diff --git a/main/src/main/res/layout/view_main_home_sud_game_list2.xml b/main/src/main/res/layout/view_main_home_sud_game_list2.xml
index 237302711..e5138f7dd 100644
--- a/main/src/main/res/layout/view_main_home_sud_game_list2.xml
+++ b/main/src/main/res/layout/view_main_home_sud_game_list2.xml
@@ -4,10 +4,16 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:src="@mipmap/bg_yola_index"
     android:orientation="vertical">
 
 
+    <View
+        android:layout_width="match_parent"
+        android:background="@mipmap/bg_yola_index"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintDimensionRatio="1.512"
+        android:layout_height="0dp"/>
 
     <TextView
         android:id="@+id/meTitleTv"
diff --git a/main/src/main/res/layout/view_main_me2.xml b/main/src/main/res/layout/view_main_me2.xml
index c70a2a38c..57591d5eb 100644
--- a/main/src/main/res/layout/view_main_me2.xml
+++ b/main/src/main/res/layout/view_main_me2.xml
@@ -292,8 +292,9 @@
             <View
                 android:id="@+id/vipBgView"
                 android:layout_width="0dp"
-                android:layout_height="72dp"
+                android:layout_height="0dp"
                 android:layout_marginTop="8dp"
+                app:layout_constraintDimensionRatio="2.333"
                 android:background="@drawable/bg_me_data"
                 app:layout_constraintStart_toStartOf="@+id/bgView"
                 app:layout_constraintTop_toBottomOf="@+id/bgView"
@@ -336,7 +337,7 @@
                 android:paddingEnd="2dp"
                 android:text="@string/open_noble_text"
                 android:textColor="#777777"
-                android:textSize="10sp"
+                android:textSize="9sp"
                 app:layout_constraintBottom_toBottomOf="@+id/vipBgView"
                 app:layout_constraintEnd_toEndOf="@id/vipBgView"
                 app:layout_constraintStart_toEndOf="@+id/user_noble_ico"
@@ -346,8 +347,9 @@
             <View
                 android:id="@+id/gudBgView"
                 android:layout_width="0dp"
-                android:layout_height="72dp"
+                android:layout_height="0dp"
                 android:layout_marginTop="8dp"
+                app:layout_constraintDimensionRatio="2.333"
                 android:background="@drawable/bg_me_data"
                 app:layout_constraintEnd_toEndOf="@+id/bgView"
                 app:layout_constraintTop_toBottomOf="@+id/bgView"
@@ -390,7 +392,7 @@
                 android:paddingEnd="2dp"
                 android:text="@string/guard_for_your_beloved_one"
                 android:textColor="#777777"
-                android:textSize="10sp"
+                android:textSize="9sp"
                 app:layout_constraintBottom_toBottomOf="@+id/gudBgView"
                 app:layout_constraintEnd_toEndOf="@id/gudBgView"
                 app:layout_constraintStart_toEndOf="@+id/user_guard_ico"