From 7e5cda6bdd247cf40316c2954053d65f023c0670 Mon Sep 17 00:00:00 2001
From: ningwenqiang <gongduoxiang@163.com>
Date: Wed, 6 Nov 2024 17:39:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E6=88=8FUI=20=20=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E9=A1=B6=E9=83=A8UI=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/views/MainHomeViewHolder2.java     |  8 ++++----
 main/src/main/res/layout/view_main_home2.xml           | 10 +++++-----
 main/src/main/res/layout/view_main_home_com.xml        |  2 +-
 .../main/res/layout/view_main_home_sud_game_list2.xml  |  4 ++--
 main/src/main/res/layout/view_main_me2.xml             |  2 +-
 main/src/main/res/layout/view_main_message_head.xml    |  2 +-
 main/src/main/res/values/dimens.xml                    |  5 +++++
 8 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 main/src/main/res/values/dimens.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 871c7e34c..94200c421 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
@@ -48,7 +48,7 @@
         android:src="@mipmap/ic_yola_game_radus"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginEnd="2dp" />
+        />
 
     <ImageView
         android:id="@+id/gold_coin"
diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder2.java b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder2.java
index d853fd558..7557c79b2 100644
--- a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder2.java
+++ b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder2.java
@@ -246,16 +246,16 @@ public class MainHomeViewHolder2 extends AbsMainHomeChildViewHolder implements O
                     mRefreshView.getRefreshView().scrollToPosition(0);
                     mAdapter.clearData();
                     select = bean.getId();
-                    Log.i("MainHomeViewHolder2", bean.getChinese()+"：："+bean.getId());
+                   // Log.i("MainHomeViewHolder2", bean.getChinese()+"：："+bean.getId());
                     boolean flag = false;
                     if (position == 0) {
-                        Log.i("MainHomeViewHolder2", "mLiveOptFollAgent:");
+                   //     Log.i("MainHomeViewHolder2", "mLiveOptFollAgent:");
                         flag= changeLiveOptAgent(mLiveOptFollAgent);
                     } else if (position == 1) {
-                        Log.i("MainHomeViewHolder2", "mLiveOptComAgent:");
+                    //    Log.i("MainHomeViewHolder2", "mLiveOptComAgent:");
                         flag=  changeLiveOptAgent(mLiveOptComAgent);
                     } else {
-                        Log.i("MainHomeViewHolder2", "MainHomeViewHolder2:");
+                    //    Log.i("MainHomeViewHolder2", "MainHomeViewHolder2:");
                         flag= changeLiveOptAgent(MainHomeViewHolder2.this);
                     }
                     typeHot = bean.getEnglish();
diff --git a/main/src/main/res/layout/view_main_home2.xml b/main/src/main/res/layout/view_main_home2.xml
index b106b4a0e..f10d589a9 100644
--- a/main/src/main/res/layout/view_main_home2.xml
+++ b/main/src/main/res/layout/view_main_home2.xml
@@ -21,7 +21,7 @@
         android:layout_marginStart="10dp"
         android:padding="6dp"
         android:onClick="mainClick"
-        android:layout_marginTop="32dp"
+        android:layout_marginTop="@dimen/yola_title_margin_top"
         android:src="@mipmap/ic_yola_cup"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -30,13 +30,13 @@
         android:id="@+id/btn_start"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="32dp"
         android:layout_marginEnd="10dp"
-        android:padding="6dp"
         android:onClick="mainClick"
+        android:padding="6dp"
         android:src="@mipmap/ic_yola_vido"
+        app:layout_constraintBottom_toBottomOf="@+id/img_trophy"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="@+id/img_trophy" />
 
     <View
         android:id="@+id/btn_search"
@@ -100,7 +100,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginTop="15dp"
+        android:layout_marginTop="8dp"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:layout_width="0dp"
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 621db1030..25cdd7218 100644
--- a/main/src/main/res/layout/view_main_home_com.xml
+++ b/main/src/main/res/layout/view_main_home_com.xml
@@ -12,7 +12,7 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="44dp"
-        android:layout_marginTop="28dp"
+        android:layout_marginTop="@dimen/yola_title_margin_top2"
         android:fadingEdge="none"
         app:elevation="0dp"
         android:background="@drawable/bg_transform2white"
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 c480fb161..f6ab1b8a0 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
@@ -32,7 +32,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
-        android:layout_marginTop="32dp"
+        android:layout_marginTop="@dimen/yola_title_margin_top"
         android:padding="6dp"
         android:src="@mipmap/ic_yola_search"
         app:layout_constraintStart_toStartOf="parent"
@@ -107,7 +107,7 @@
         android:id="@+id/house_owner_arrow"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="24dp"
+        android:layout_marginEnd="16dp"
         android:paddingEnd="8dp"
         android:src="@mipmap/ic_yola_game_bot_arrow"
         app:layout_constraintBottom_toBottomOf="@id/hall"
diff --git a/main/src/main/res/layout/view_main_me2.xml b/main/src/main/res/layout/view_main_me2.xml
index 7fb7b0182..4d6f61dc0 100644
--- a/main/src/main/res/layout/view_main_me2.xml
+++ b/main/src/main/res/layout/view_main_me2.xml
@@ -52,7 +52,7 @@
                 android:id="@+id/img_setting"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
+                android:layout_marginTop="@dimen/yola_title_margin_top"
                 android:layout_marginEnd="10dp"
                 android:padding="6dp"
                 android:src="@mipmap/ic_yola_setting"
diff --git a/main/src/main/res/layout/view_main_message_head.xml b/main/src/main/res/layout/view_main_message_head.xml
index 9286fe8de..b7b59763f 100644
--- a/main/src/main/res/layout/view_main_message_head.xml
+++ b/main/src/main/res/layout/view_main_message_head.xml
@@ -21,7 +21,7 @@
         app:layout_constraintStart_toStartOf="parent"
         android:layout_width="match_parent"
         android:layout_height="44dp"
-        android:layout_marginTop="28dp"
+        android:layout_marginTop="@dimen/yola_title_margin_top2"
         android:background="@android:color/transparent"
         android:fadingEdge="none"
         app:elevation="0dp"
diff --git a/main/src/main/res/values/dimens.xml b/main/src/main/res/values/dimens.xml
new file mode 100644
index 000000000..81e1e9007
--- /dev/null
+++ b/main/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="yola_title_margin_top">40dp</dimen>
+    <dimen name="yola_title_margin_top2">36dp</dimen>
+</resources>
\ No newline at end of file