From 47e4d3dba548f0fe71f6d35ff3a4f160aca9b9fc Mon Sep 17 00:00:00 2001
From: renhaoting <370797079@qq.com>
Date: Thu, 4 Dec 2025 11:42:28 +0800
Subject: [PATCH] =?UTF-8?q?version=20act=20=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../features/version/VersionActivity.kt       |  14 +-
 app/src/main/res/layout/activity_version.xml  | 194 ++----------------
 app/src/main/res/values/strings.xml           |   2 +
 .../ama/core/architecture/util/AndroidUtil.kt |  26 ++-
 4 files changed, 46 insertions(+), 190 deletions(-)

diff --git a/app/src/main/java/com/gamedog/vididin/features/version/VersionActivity.kt b/app/src/main/java/com/gamedog/vididin/features/version/VersionActivity.kt
index 5ed827a..4dff9e9 100644
--- a/app/src/main/java/com/gamedog/vididin/features/version/VersionActivity.kt
+++ b/app/src/main/java/com/gamedog/vididin/features/version/VersionActivity.kt
@@ -4,10 +4,8 @@ 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.AndroidUtil
 import com.gamedog.vididin.R
 import com.gamedog.vididin.main.interfaces.OnTabStyleListener
 import dagger.hilt.android.AndroidEntryPoint
@@ -28,17 +26,15 @@ class VersionActivity : AppViewsActivity<ViewBinding, UiState, ViewModel>(), OnT
         with(binding) {
             titlebar.setBackIconColor(R.color.black)
             titlebar.setTitleText(R.string.version, R.color.black)
+
+
+            tvVersion.text = AndroidUtil.getAppVersionInfo()
         }
 
     }
 
     override fun ViewBinding.initWindowInsets() {
-        ViewCompat.setOnApplyWindowInsetsListener(contentRoot) { v, insets ->
-            val systemBars =
-                insets.getInsets(WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout())
-            v.updatePadding(top = systemBars.top)
-            insets
-        }
+        setImmerseRootView(contentRoot)
     }
 
     override fun ViewBinding.initListeners() {
diff --git a/app/src/main/res/layout/activity_version.xml b/app/src/main/res/layout/activity_version.xml
index f408a91..d1f07e8 100644
--- a/app/src/main/res/layout/activity_version.xml
+++ b/app/src/main/res/layout/activity_version.xml
@@ -13,194 +13,32 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="15dp"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:layout_marginTop="50dp"
         android:orientation="vertical">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_date_win"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:textSize="12sp"
-            android:textColor="@color/gray6"
-            android:text="2025/10/31"
-            />
-
-
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:background="@drawable/bg_records_win"
-            android:layout_marginTop="5dp"
-            android:gravity="center_vertical"
-            android:paddingVertical="5dp"
-            >
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/iv_left_win"
-                android:layout_width="45dp"
-                android:layout_height="45dp"
-                android:src="@mipmap/record_win"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="15dp"
+            android:layout_marginHorizontal="15dp">
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="15sp"
+                android:textColor="@color/gray6"
+                android:text="@string/cur_version"
                 />
 
-            <LinearLayout
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_version"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_marginHorizontal="10dp"
-                android:layout_toRightOf="@+id/iv_left_win"
-                android:layout_toLeftOf="@+id/ll_right_win"
-                android:layout_centerVertical="true"
-                >
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/tv_title_win"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="15sp"
-                    android:textColor="@color/white"
-                    android:text="@string/record_win_item_title"
-                    />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/tv_desc_win"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:textSize="14sp"
-                    android:textColor="@color/white_alpha_99"
-                    android:text="@string/record_win_item_desc"
-                    />
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:id="@+id/ll_right_win"
-                android:layout_width="75dp"
-                android:layout_height="75dp"
-                android:orientation="vertical"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="5dp"
-                android:background="@mipmap/bg_record_win_rgiht"
-                android:paddingHorizontal="6dp"
-                android:gravity="center_horizontal"
-                >
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/tv_win_right_top"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:textStyle="bold"
-                    android:textSize="15sp"
-                    android:textColor="@color/yellow_00"
-                    android:text="Ganhar"
-                    />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/tv_win_right_bottom"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="11dp"
-                    android:textSize="10sp"
-                    android:textColor="@color/green_54"
-                    android:text="Ver detalhes"
-                    />
-            </LinearLayout>
-
-        </RelativeLayout>
-
-
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_date_lost"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:textSize="12sp"
-            android:textColor="@color/gray6"
-            android:text="2025/10/31"
-            />
-
-
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:background="@drawable/bg_records_lost"
-            android:layout_marginTop="5dp"
-            android:gravity="center_vertical"
-            android:paddingVertical="5dp"
-            >
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/iv_left_lost"
-                android:layout_width="45dp"
-                android:layout_height="45dp"
-                android:src="@mipmap/record_lost"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="15dp"
-                />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_marginHorizontal="10dp"
-                android:layout_toRightOf="@+id/iv_left_lost"
-                android:layout_toLeftOf="@+id/ll_right_lost"
-                android:layout_centerVertical="true"
-                >
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/tv_title_lost"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="15sp"
-                    android:textColor="@color/white"
-                    android:text="@string/record_lost_item_title"
-                    />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/tv_desc_lost"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:textSize="14sp"
-                    android:textColor="@color/white_alpha_99"
-                    android:text="@string/record_lost_item_desc"
-                    />
-            </LinearLayout>
-
-
-            <FrameLayout
-                android:id="@+id/ll_right_lost"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
                 android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:layout_marginEnd="5dp"
-                android:background="@mipmap/bg_record_lost_rgiht"
-                android:paddingHorizontal="6dp"
-                android:gravity="center"
-                >
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/tv_lost_right_top"
-                    android:layout_width="75dp"
-                    android:layout_height="75dp"
-                    android:textStyle="bold"
-                    android:gravity="center"
-                    android:layout_gravity="center"
-                    android:textSize="15sp"
-                    android:textColor="@color/gray9"
-                    android:text="@string/not_win"
-                    />
-            </FrameLayout>
+                android:textSize="13sp"
+                android:textStyle="bold"
+                android:textColor="@color/black"
+                />
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0b493cd..2180998 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -106,4 +106,6 @@
     <string name="box_subtask_hint_3_3">Participar de 10 compras gratuitas</string>
     <string name="has_claim_box_cash_hint">Has claimed %f cash successfully.</string>
 
+    <string name="cur_version">Current Version:</string>
+
 </resources>
\ No newline at end of file
diff --git a/core/architecture/src/main/java/com/ama/core/architecture/util/AndroidUtil.kt b/core/architecture/src/main/java/com/ama/core/architecture/util/AndroidUtil.kt
index 501fa8e..0ee31cc 100644
--- a/core/architecture/src/main/java/com/ama/core/architecture/util/AndroidUtil.kt
+++ b/core/architecture/src/main/java/com/ama/core/architecture/util/AndroidUtil.kt
@@ -3,6 +3,7 @@ package com.ama.core.architecture.util
 import android.app.Activity
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
+import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
@@ -64,9 +65,28 @@ class AndroidUtil private constructor() {
 
 
 
+
+
+        fun getAppVersionInfo(): String {
+            return try {
+                val context = BaseApp.appContext()
+                val packageManager = context.packageManager
+                val packageInfo = packageManager.getPackageInfo(context.packageName, 0)
+                val versionName = packageInfo.versionName
+                val versionCode = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.P) {
+                    packageInfo.longVersionCode.toString() // 在 Android 9.0 (Pie) 及以上使用 longVersionCode
+                } else {
+                    @Suppress("DEPRECATION")
+                    packageInfo.versionCode.toString()
+                }
+                //"$versionName ($versionCode)"
+                "$versionName"
+            } catch (e: PackageManager.NameNotFoundException) {
+                "Failed to get app version: ${e.message}"
+            }
+        }
+
+
     }
 
-
-
-
 }
\ No newline at end of file