From b7ca0babe5f7bd939c563ca5b665b4d77a839256 Mon Sep 17 00:00:00 2001
From: renhaoting <370797079@qq.com>
Date: Fri, 5 Dec 2025 19:08:40 +0800
Subject: [PATCH] =?UTF-8?q?ui=E7=BE=8E=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vididin/features/zero/ZeroBuyActivity.kt  |  12 +-
 .../main/res/drawable/bg_zero_buy_bottom.xml  |   4 +-
 app/src/main/res/layout/activity_zerobuy.xml  | 162 +++++++-----------
 app/src/main/res/values/strings.xml           |   5 +-
 4 files changed, 69 insertions(+), 114 deletions(-)

diff --git a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt
index 4a95608..4ee760a 100644
--- a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt
+++ b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt
@@ -4,14 +4,10 @@ import android.app.Activity
 import android.content.Intent
 import android.view.LayoutInflater
 import androidx.activity.viewModels
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.updatePadding
 import com.ama.core.architecture.appBase.AppViewsActivity
 import com.ama.core.architecture.util.setOnClickBatch
 import com.gamedog.vididin.R
 import com.gamedog.vididin.core.login.login.AccountManager
-import com.gamedog.vididin.main.interfaces.OnTabStyleListener
 import com.gamedog.vididin.router.Router
 import dagger.hilt.android.AndroidEntryPoint
 import kotlin.getValue
@@ -21,7 +17,7 @@ import com.gamedog.vididin.main.MainViewModel as ViewModel
 
 
 @AndroidEntryPoint
-class ZeroBuyActivity : AppViewsActivity<ViewBinding, UiState, ViewModel>(), OnTabStyleListener {
+class ZeroBuyActivity : AppViewsActivity<ViewBinding, UiState, ViewModel>() {
 
     override val mViewModel: ViewModel by viewModels()
     override fun inflateViewBinding(inflater: LayoutInflater) = ViewBinding.inflate(inflater)
@@ -71,16 +67,10 @@ class ZeroBuyActivity : AppViewsActivity<ViewBinding, UiState, ViewModel>(), OnT
         //TODO("Not yet implemented")
     }
 
-    override fun onTabIsDarkFont(isDarkFont: Boolean) {
-        //TODO("Not yet implemented")
-    }
-
-
     private fun gotoLotteryRecords() {
         Router.WinRecord.startActivity(this)
     }
 
-
     companion object {
         internal fun startActivity(activity: Activity) {
             activity.startActivity(Intent(activity.applicationContext, ZeroBuyActivity::class.java))
diff --git a/app/src/main/res/drawable/bg_zero_buy_bottom.xml b/app/src/main/res/drawable/bg_zero_buy_bottom.xml
index 254a2e5..737d3f6 100644
--- a/app/src/main/res/drawable/bg_zero_buy_bottom.xml
+++ b/app/src/main/res/drawable/bg_zero_buy_bottom.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="rectangle"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#33666666" />
+    <solid android:color="#66666666" />
     <corners android:topLeftRadius="23dp" android:topRightRadius="23dp" android:bottomLeftRadius="23dp" android:bottomRightRadius="23dp" />
 </shape>
-
-
diff --git a/app/src/main/res/layout/activity_zerobuy.xml b/app/src/main/res/layout/activity_zerobuy.xml
index 2a02d55..e612591 100644
--- a/app/src/main/res/layout/activity_zerobuy.xml
+++ b/app/src/main/res/layout/activity_zerobuy.xml
@@ -11,20 +11,21 @@
         android:scaleType="centerCrop"
         />
 
-    <com.ama.core.architecture.widget.CustomTitleBar
-        android:id="@+id/titlebar"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        />
+        android:layout_height="match_parent"
+        android:id="@+id/content_root" >
 
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/content_root"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <FrameLayout
+        <com.ama.core.architecture.widget.CustomTitleBar
+            android:id="@+id/titlebar"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content"
+            />
 
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -83,13 +84,15 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
-                        android:padding="15dp"
-                        android:background="@drawable/zero_bg_4_items">
+                        android:paddingTop="15dp"
+                        android:background="@drawable/zero_bg_4_items"
+                        >
 
                         <!--第一行两个-->
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
+                            android:layout_marginHorizontal="15dp"
                             android:orientation="horizontal">
 
                             <LinearLayout
@@ -218,35 +221,66 @@
 
                         </LinearLayout>
 
-
-                        <!--第一行两个-->
+                        <!--参加者-->
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
+                            android:layout_marginTop="20dp"
+                            android:paddingVertical="8dp"
+                            android:paddingHorizontal="15dp"
                             android:orientation="horizontal"
-                            android:layout_marginTop="15dp">
+                            android:layout_marginHorizontal="16dp"
+                            android:gravity="center_vertical"
+                            android:background="@drawable/bg_zero_buy_bottom">
 
-                            <LinearLayout
+                            <androidx.appcompat.widget.AppCompatTextView
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
-                                android:orientation="vertical"
-                                android:background="@mipmap/zero_bg_item">
+                                android:textColor="@color/white"
+                                android:textSize="12sp"
+                                android:text="@string/participar_member"
+                                />
 
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:layout_width="0dp"
+                            <androidx.appcompat.widget.AppCompatImageView
+                                android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:orientation="vertical"
-                                android:layout_marginLeft="15dp"
-                                android:background="@mipmap/zero_bg_item">
-                            </LinearLayout>
+                                android:src="@mipmap/icon_fail"
+                                android:layout_marginStart="5dp"
+                                />
 
                         </LinearLayout>
 
 
+                        <!--提示信息-->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            android:layout_marginTop="13dp"
+                            android:gravity="center"
+                            android:padding="15dp"
+                            android:background="@drawable/bg_zero_buy_bottom_hint">
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:textColor="@color/red_9c"
+                                android:textSize="12sp"
+                                android:textStyle="bold"
+                                android:text="@string/zero_buy_hint_title"
+                                />
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:textColor="@color/red_9c"
+                                android:layout_marginTop="20dp"
+                                android:textSize="10sp"
+                                android:text="@string/zero_buy_hint_content"
+                                />
+
+                        </LinearLayout>
 
                     </LinearLayout>
 
@@ -254,79 +288,13 @@
                 </LinearLayout>
 
 
-                <!--参加者-->
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="20dp"
-                    android:padding="15dp"
-                    android:layout_marginHorizontal="16dp"
-                    android:background="@drawable/bg_zero_buy_bottom">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical">
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="4.5dp"
-                            android:textColor="@color/white"
-                            android:textSize="12sp"
-                            android:text="@string/participar_member"
-                            />
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="4.5dp"
-                            android:textColor="@color/white"
-                            android:textSize="12sp"
-                            android:text="@string/participar_member_2"
-                            />
-                    </LinearLayout>
-
-                </RelativeLayout>
-
-
-                <!--提示信息-->
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_marginTop="30dp"
-                    android:gravity="center"
-                    android:padding="15dp"
-                    android:background="@drawable/bg_zero_buy_bottom_hint">
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textColor="@color/red_9c"
-                        android:textSize="12sp"
-                        android:text="@string/zero_buy_hint_title"
-                        />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textColor="@color/red_9c"
-                        android:layout_marginTop="20dp"
-                        android:textSize="10sp"
-                        android:text="@string/zero_buy_hint_content"
-                        />
-
-                </LinearLayout>
-
-
             </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
+
+    </FrameLayout>
 
 
-
-
-
-        </FrameLayout>
-    </androidx.core.widget.NestedScrollView>
 </FrameLayout>
 
 
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3676270..e8c4c73 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -111,10 +111,9 @@
     <string name="sorte">Sorteio instantâneo:</string>
     <string name="pessoas">pessoas</string>
     <string name="participar">Participar</string>
-    <string name="participar_member">Participe do super sorteio grátis</string>
-    <string name="participar_member_2">Quase 4 milhões de pessoas na jogada!</string>
+    <string name="participar_member">Participe do super sorteio grátis \nQuase 4 milhões de pessoas na jogada!</string>
     <string name="zero_buy_hint_title">Regras para Ganhar：</string>
-    <string name="zero_buy_hint_content"><![CDATA[Número Sorteado = Segundos da Conclusão % Número de Participantes + 1%: Computes the remainder after division by team size.\\n· Gaste Moedas de Propaganda para participar.\n·Draw when ful l& Reembolso automático se não completar]]></string>
+    <string name="zero_buy_hint_content"><![CDATA[Número Sorteado = Segundos da Conclusão % Número de Participantes + 1%: Computes the remainder after division by team size. \n· Gaste Moedas de Propaganda para participar.\n·Draw when ful l& Reembolso automático se não completar]]></string>
     <string name="record_cash_title">Dinheiro</string>
     <string name="record_gold_title">Moedas</string>
     <string name="record_cash_title_hint">Total sacado até o momento:</string>