From b3f6d3a3fb247b409c9a0235b147d152eccaecd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Wed, 19 Nov 2025 09:43:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=82=B9=E5=94=B1=E6=88=BF?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/fragment_jukebox.xml  | 10 +++--
 .../main/res/layout/fragment_vocal_range.xml  | 43 ++++++++++---------
 app/build.gradle                              |  6 +--
 gradle.properties                             |  4 +-
 4 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/MainModule/src/main/res/layout/fragment_jukebox.xml b/MainModule/src/main/res/layout/fragment_jukebox.xml
index 12843c3a..119d39bf 100644
--- a/MainModule/src/main/res/layout/fragment_jukebox.xml
+++ b/MainModule/src/main/res/layout/fragment_jukebox.xml
@@ -67,13 +67,15 @@
 
         <com.xscm.moduleutil.widget.CircularImage
             android:id="@+id/ci_user_ava"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_61"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginHorizontal="@dimen/dp_95"
+            android:layout_marginVertical="@dimen/dp_50"
             android:src="@mipmap/microphone"
             app:layout_constraintEnd_toEndOf="@+id/im_performer"
             app:layout_constraintStart_toStartOf="@+id/im_performer"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintBottom_toBottomOf="@+id/im_performer"
+            app:layout_constraintTop_toTopOf="@+id/im_performer" />
 
         <TextView
             android:id="@+id/tv_performer_name"
diff --git a/MainModule/src/main/res/layout/fragment_vocal_range.xml b/MainModule/src/main/res/layout/fragment_vocal_range.xml
index 1bdfa0e3..cdb6db70 100644
--- a/MainModule/src/main/res/layout/fragment_vocal_range.xml
+++ b/MainModule/src/main/res/layout/fragment_vocal_range.xml
@@ -808,11 +808,11 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/dp_12"
-                        app:alignContent="flex_start"
-                        app:alignItems="stretch"
-                        app:flexDirection="row"
                         app:flexWrap="wrap"
-                        app:justifyContent="flex_start">
+                        app:alignItems="stretch"
+                        app:justifyContent="flex_start"
+                        app:flexDirection="row"
+                        app:alignContent="flex_start">
 
                         <LinearLayout
                             android:id="@+id/ll_me_help"
@@ -822,8 +822,8 @@
                             android:layout_weight="1"
                             android:gravity="center"
                             android:orientation="vertical"
-                            app:layout_flexBasisPercent="25%"
-                            app:layout_flexGrow="1">
+                            app:layout_flexGrow="1"
+                            app:layout_flexBasisPercent="25%">
 
                             <ImageView
                                 android:layout_width="@dimen/dp_24"
@@ -847,8 +847,8 @@
                             android:layout_weight="1"
                             android:gravity="center"
                             android:orientation="vertical"
-                            app:layout_flexBasisPercent="25%"
-                            app:layout_flexGrow="1">
+                            app:layout_flexGrow="1"
+                            app:layout_flexBasisPercent="25%">
 
                             <ImageView
                                 android:layout_width="@dimen/dp_24"
@@ -873,8 +873,8 @@
                             android:gravity="center"
                             android:orientation="vertical"
                             android:visibility="visible"
-                            app:layout_flexBasisPercent="25%"
-                            app:layout_flexGrow="1">
+                            app:layout_flexGrow="1"
+                            app:layout_flexBasisPercent="25%">
 
                             <ImageView
                                 android:layout_width="@dimen/dp_24"
@@ -898,8 +898,7 @@
                             android:layout_weight="1"
                             android:gravity="center"
                             android:orientation="vertical"
-                            android:visibility="invisible">
-                            android:visibility="visible"
+                            android:visibility="gone"
                             app:layout_flexGrow="1"
                             app:layout_flexBasisPercent="25%">
 
@@ -917,12 +916,6 @@
                                 android:textSize="@dimen/sp_12" />
                         </LinearLayout>
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/dp_15"
-                            android:orientation="horizontal"
-                            android:visibility="gone"/>
 
                         <LinearLayout
                             android:id="@+id/ll_me_income"
@@ -1014,7 +1007,7 @@
                             android:orientation="vertical"
                             android:visibility="invisible"
                             app:layout_flexBasisPercent="25%"
-                            app:layout_flexGrow="1"></LinearLayout>
+                            app:layout_flexGrow="1"/>
 
                         <LinearLayout
                             android:layout_width="0dp"
@@ -1025,8 +1018,18 @@
                             android:orientation="vertical"
                             android:visibility="invisible"
                             app:layout_flexBasisPercent="25%"
-                            app:layout_flexGrow="1"></LinearLayout>
+                            app:layout_flexGrow="1"/>
 
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="@dimen/dp_46"
+                            android:layout_gravity="bottom"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:orientation="vertical"
+                            android:visibility="invisible"
+                            app:layout_flexGrow="1"
+                            app:layout_flexBasisPercent="25%"/>
 
                     </com.google.android.flexbox.FlexboxLayout>
                 </LinearLayout>
diff --git a/app/build.gradle b/app/build.gradle
index 9ddbd701..fb64297d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -117,9 +117,9 @@ android {
                             def versionName = variant.versionName
                             def versionCode = variant.versionCode
                             // 获取当前时间戳（格式：yyyyMMddHHmmss）
-                            def buildTimes = new Date().format("yyyy-MM-dd_HH_mm_ss")
-//                            def fileName = "羽声_${versionName}_${buildTimes}.apk"
-                            def fileName = "羽声_${buildTimes}.apk"
+                            def buildTimes = new Date().format("yyyy-MM-dd")
+                            def fileName = "羽声_${versionName}_${versionCode}_${buildTimes}.apk"
+//                            def fileName = "羽声_${buildTimes}.apk"
                             output.outputFileName = fileName
                         }
                     }
diff --git a/gradle.properties b/gradle.properties
index 90b7bb32..6be7fae0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,8 +28,8 @@ isBuildModule=false
 #org.gradle.deamon=false
 android.injected.testOnly=false
 
-APP_VERSION_NAME=1.0.5.3
-APP_VERSION_CODE=43
+APP_VERSION_NAME=1.0.6.3
+APP_VERSION_CODE=53
 
 org.gradle.jvm.toolchain.useLegacyAdapters=false
 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15