From 1bdbb25e94cb444de9b7be93e3076d17c8eb522b Mon Sep 17 00:00:00 2001
From: ningwenqiang <gongduoxiang@163.com>
Date: Thu, 31 Oct 2024 21:13:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=80=E4=B8=8B=E9=A1=B6?=
 =?UTF-8?q?=E9=83=A8=E8=B7=9D=E7=A6=BB=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/src/main/res/layout/view_main_home2.xml  | 36 +++++++++++--------
 .../main/res/layout/view_main_home_com.xml    |  9 ++---
 .../layout/view_main_home_sud_game_list2.xml  |  8 ++---
 main/src/main/res/layout/view_main_me2.xml    | 10 +++---
 4 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/main/src/main/res/layout/view_main_home2.xml b/main/src/main/res/layout/view_main_home2.xml
index a1fa19e54..2077ba6e0 100644
--- a/main/src/main/res/layout/view_main_home2.xml
+++ b/main/src/main/res/layout/view_main_home2.xml
@@ -7,34 +7,40 @@
     android:orientation="vertical">
 
     <ImageView
-        android:id="@+id/cupImg"
+        android:id="@+id/img_trophy"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="38dp"
+        android:layout_marginStart="10dp"
+        android:padding="6dp"
+        android:onClick="mainClick"
+        android:layout_marginTop="32dp"
         android:src="@mipmap/ic_yola_cup"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
-        android:id="@+id/videoImg"
+        android:id="@+id/btn_start"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="38dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="10dp"
+        android:padding="6dp"
+        android:onClick="mainClick"
         android:src="@mipmap/ic_yola_vido"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <View
-        android:id="@+id/searchView"
+        android:id="@+id/btn_search"
         android:layout_width="0dp"
         android:layout_height="34dp"
+        android:clickable="true"
+        android:onClick="mainClick"
         android:background="@drawable/bg_white_radius17"
-        app:layout_constraintBottom_toBottomOf="@+id/cupImg"
+        app:layout_constraintBottom_toBottomOf="@+id/img_trophy"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/cupImg"
+        app:layout_constraintTop_toTopOf="@+id/img_trophy"
         app:layout_constraintWidth_percent="0.66" />
 
     <ImageView
@@ -43,9 +49,9 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:src="@mipmap/ic_yola_search_small"
-        app:layout_constraintBottom_toBottomOf="@+id/searchView"
-        app:layout_constraintStart_toStartOf="@+id/searchView"
-        app:layout_constraintTop_toTopOf="@+id/searchView" />
+        app:layout_constraintBottom_toBottomOf="@+id/btn_search"
+        app:layout_constraintStart_toStartOf="@+id/btn_search"
+        app:layout_constraintTop_toTopOf="@+id/btn_search" />
 
     <TextView
         android:id="@+id/searchTipsTv"
@@ -55,14 +61,14 @@
         android:text="搜主播名字"
         android:textColor="#99000000"
         android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="@+id/searchView"
+        app:layout_constraintBottom_toBottomOf="@+id/btn_search"
         app:layout_constraintStart_toEndOf="@+id/searchImg"
-        app:layout_constraintTop_toTopOf="@+id/searchView" />
+        app:layout_constraintTop_toTopOf="@+id/btn_search" />
 
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/topTitleRecyclerView"
-        app:layout_constraintTop_toBottomOf="@+id/searchView"
+        app:layout_constraintTop_toBottomOf="@+id/btn_search"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:itemCount="1"
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 d4c77ff62..a8ea01968 100644
--- a/main/src/main/res/layout/view_main_home_com.xml
+++ b/main/src/main/res/layout/view_main_home_com.xml
@@ -11,7 +11,7 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="44dp"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="28dp"
         android:background="@android:color/transparent"
         android:fadingEdge="none"
         app:elevation="0dp"
@@ -31,11 +31,12 @@
                 app:layout_constraintTop_toTopOf="parent" />
 
             <ImageView
-                android:id="@+id/searchImg"
+                android:id="@+id/btn_search"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
-                android:padding="7dp"
+                android:padding="6dp"
+                android:onClick="mainClick"
                 android:src="@mipmap/ic_yola_search"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -47,7 +48,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="10dp"
-                android:padding="7dp"
+                android:padding="6dp"
                 android:src="@mipmap/ic_yola_camera"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
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 0eb9920b2..7d4e27496 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
@@ -19,24 +19,24 @@
         android:id="@+id/meTitleTv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="34dp"
         android:text="@string/game"
         android:textColor="@color/color_111111"
         android:textSize="16sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintBottom_toBottomOf="@+id/search"
+        app:layout_constraintTop_toTopOf="@+id/search" />
 
     <ImageView
         android:id="@+id/search"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
+        android:layout_marginTop="32dp"
         android:padding="6dp"
         android:src="@mipmap/ic_yola_search"
-        app:layout_constraintBottom_toBottomOf="@+id/meTitleTv"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/meTitleTv" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/interactive_game_add"
diff --git a/main/src/main/res/layout/view_main_me2.xml b/main/src/main/res/layout/view_main_me2.xml
index b7a4a077a..ddfe0b904 100644
--- a/main/src/main/res/layout/view_main_me2.xml
+++ b/main/src/main/res/layout/view_main_me2.xml
@@ -32,25 +32,25 @@
                 android:id="@+id/meTitleTv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="34dp"
                 android:text="@string/main_me"
-                android:textStyle="bold"
                 android:textColor="@color/color_111111"
                 android:textSize="16sp"
+                android:textStyle="bold"
+                app:layout_constraintBottom_toBottomOf="@+id/img_setting"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="@+id/img_setting" />
 
             <ImageView
                 android:id="@+id/img_setting"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="32dp"
                 android:layout_marginEnd="10dp"
                 android:padding="6dp"
                 android:src="@mipmap/ic_yola_setting"
-                app:layout_constraintBottom_toBottomOf="@+id/meTitleTv"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/meTitleTv" />
+                app:layout_constraintTop_toTopOf="parent" />
 
 
             <com.makeramen.roundedimageview.RoundedImageView