From b5fab23e56f58e596fd3d61c1cad451c13b6dfa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Sat, 6 Dec 2025 15:17:41 +0800
Subject: [PATCH] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9=E9=9F=B3=E5=9F=9F?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=EF=BC=8C=E5=BA=95=E9=83=A8=E6=9B=B4=E5=A4=9A?=
 =?UTF-8?q?=E7=9A=84=E5=B8=83=E5=B1=80=202=EF=BC=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=AD=8C=E6=89=8B=E8=AE=A4=E8=AF=81=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/SingerVerificationActivity.java  | 27 ++++++-----
 .../main/res/layout/fragment_vocal_range.xml  | 48 ++++++++++---------
 2 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SingerVerificationActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SingerVerificationActivity.java
index 5070f95d..2ea3c1c2 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SingerVerificationActivity.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SingerVerificationActivity.java
@@ -242,6 +242,18 @@ public class SingerVerificationActivity extends BaseMvpActivity<SingerVerificati
                     mBinding.playButton.setText("试听");
                     mBinding.playButton.setCompoundDrawablesWithIntrinsicBounds(0, R.mipmap.but_st, 0, 0);
                 } else {
+                    // 检查录音文件是否存在
+                    if (recordingFile == null || !recordingFile.exists()) {
+                        Toast.makeText(SingerVerificationActivity.this, "没有录制的文件", Toast.LENGTH_SHORT).show();
+                        return;
+                    }
+
+                    // 检查录音时长
+                    if (recordingDuration <= 0) {
+                        Toast.makeText(SingerVerificationActivity.this, "没有可试听的内容", Toast.LENGTH_SHORT).show();
+                        return;
+                    }
+
                     // 未播放，点击开始播放
                     startPlaying();
                     // 更改按钮状态为"结束"
@@ -480,18 +492,9 @@ public class SingerVerificationActivity extends BaseMvpActivity<SingerVerificati
             recordingFile = recordingSegments.get(0);
         }
 
-        if (recordingFile == null || !recordingFile.exists()) {
-            Toast.makeText(this, "没有录制的文件", Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        // 移除试听时间限制，允许试听任何长度的录音
-        if (recordingDuration <= 0) {
-            Toast.makeText(this, "没有可试听的内容", Toast.LENGTH_SHORT).show();
-            mBinding.playButton.setText("试听");
-            mBinding.playButton.setCompoundDrawablesWithIntrinsicBounds(0, R.mipmap.but_st, 0, 0);
-            return;
-        }
+        // 这些检查已经在点击事件中完成，这里不再需要重复检查
+        // 如果需要保留日志记录，可以添加：
+        LogUtils.d("SingerVerification", "开始播放录音文件: " + recordingFile.getAbsolutePath() + ", 时长: " + recordingDuration + "ms");
 
         try {
             stopRecording();
diff --git a/MainModule/src/main/res/layout/fragment_vocal_range.xml b/MainModule/src/main/res/layout/fragment_vocal_range.xml
index fb161bde..c787a00a 100644
--- a/MainModule/src/main/res/layout/fragment_vocal_range.xml
+++ b/MainModule/src/main/res/layout/fragment_vocal_range.xml
@@ -847,6 +847,31 @@
                         app:flexDirection="row"
                         app:alignContent="flex_start">
 
+                        <LinearLayout
+                            android:id="@+id/iv_hb"
+                            android:layout_width="0dp"
+                            android:layout_height="@dimen/dp_46"
+                            android:layout_gravity="bottom"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:orientation="vertical"
+                            app:layout_flexGrow="1"
+                            app:layout_flexBasisPercent="25%">
+
+                            <ImageView
+                                android:layout_width="@dimen/dp_24"
+                                android:layout_height="@dimen/dp_24"
+                                android:src="@mipmap/me_invitation" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="@dimen/dp_17"
+                                android:layout_marginTop="@dimen/dp_3"
+                                android:text="邀请"
+                                android:textColor="#CCCDC8"
+                                android:textSize="@dimen/sp_12" />
+                        </LinearLayout>
+
                         <LinearLayout
                             android:id="@+id/ll_me_help"
                             android:layout_width="0dp"
@@ -872,30 +897,7 @@
                                 android:textSize="@dimen/sp_12" />
                         </LinearLayout>
 
-                        <LinearLayout
-                            android:id="@+id/iv_hb"
-                            android:layout_width="0dp"
-                            android:layout_height="@dimen/dp_46"
-                            android:layout_gravity="bottom"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:orientation="vertical"
-                            app:layout_flexGrow="1"
-                            app:layout_flexBasisPercent="25%">
 
-                            <ImageView
-                                android:layout_width="@dimen/dp_24"
-                                android:layout_height="@dimen/dp_24"
-                                android:src="@mipmap/me_invitation" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="@dimen/dp_17"
-                                android:layout_marginTop="@dimen/dp_3"
-                                android:text="邀请"
-                                android:textColor="#CCCDC8"
-                                android:textSize="@dimen/sp_12" />
-                        </LinearLayout>
 
                         <LinearLayout
                             android:id="@+id/me_daily"