From be95280e9c52ced5e2429a02bf087e6ea7e95770 Mon Sep 17 00:00:00 2001
From: HapeLee <63206378+HapeLee@users.noreply.github.com>
Date: Thu, 14 May 2026 16:01:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E4=B9=A6=E7=95=8C=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/book/audio/AudioPlayActivity.kt    |  8 +++++--
 .../main/res/layout/activity_audio_play.xml   | 23 ++++++++-----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt b/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt
index c40d619f3..5a9a84634 100644
--- a/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt
@@ -101,7 +101,7 @@ class AudioPlayActivity :
     private var secondaryContainerFinalColor: Int = 0
     private var currentJob: Job? = null
     private var wrappedContext: Context? = null
-    private val lyricViewX by lazy { binding.lyricViewX }
+    // private val lyricViewX by lazy { binding.lyricViewX }
     private var lyricOn = false
     private var oldLyric: String? = null
 
@@ -530,7 +530,7 @@ class AudioPlayActivity :
                 binding.tvDurTime.setTextColor(color)
                 binding.tvAllTime.setTextColor(color)
                 // 更新歌词高亮颜色
-                binding.lyricViewX.setCurrentColor(color)
+                // binding.lyricViewX.setCurrentColor(color)
             }
         }
 
@@ -733,6 +733,7 @@ class AudioPlayActivity :
     }
 
     override fun upLyric(lyric: String?) {
+        /*
         if (oldLyric == lyric) return
         oldLyric = lyric
         if (lyric.isNullOrBlank()) {
@@ -776,10 +777,13 @@ class AudioPlayActivity :
                 upLyricP(AudioPlay.durChapterPos)
             }, 100)
         }
+        */
     }
 
     override fun upLyricP(position: Int) {
+        /*
         lyricViewX.updateTime(position.toLong(), false)
+        */
     }
 
     override fun addToBookshelf(book: Book, toc: List<BookChapter>) {
diff --git a/app/src/main/res/layout/activity_audio_play.xml b/app/src/main/res/layout/activity_audio_play.xml
index 53940a769..36d0a2622 100644
--- a/app/src/main/res/layout/activity_audio_play.xml
+++ b/app/src/main/res/layout/activity_audio_play.xml
@@ -40,11 +40,10 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:cardElevation="16dp"
-        android:layout_marginHorizontal="48dp"
-        android:layout_marginTop="0dp"
+        android:layout_marginHorizontal="32dp"
         android:layout_marginBottom="16dp"
-        app:layout_constraintDimensionRatio="16:9"
-
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintBottom_toTopOf="@+id/ll_title"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/title_bar"
@@ -124,16 +123,6 @@
             tools:ignore="SmallSp" />
     </com.google.android.material.card.MaterialCardView>
 
-    <com.dirror.lyricviewx.LyricViewX
-        android:id="@+id/lyric_view_x"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@+id/player_progress"
-        app:layout_constraintTop_toBottomOf="@+id/cd_cover"
-        app:lrcCurrentTextColor="?attr/colorPrimary"
-        app:lrcPadding="16dp" />
-
     <LinearLayout
         android:id="@+id/ll_title"
         android:layout_width="match_parent"
@@ -152,6 +141,7 @@
             android:scrollbars="none"
             android:textSize="20sp"
             android:textStyle="bold"
+            app:layout_constraintBottom_toTopOf="@+id/tv_sub_title"
             tools:text="@string/text" />
 
         <TextView
@@ -163,10 +153,15 @@
             android:textColor="?attr/colorOnSurfaceVariant"
             android:textSize="14sp"
             android:textStyle="bold"
+            app:layout_constraintBottom_toTopOf="@+id/player_progress"
             tools:text="@string/text" />
 
     </LinearLayout>
 
+
+
+
+
     <TextView
         android:id="@+id/tv_dur_time"
         android:layout_width="0dp"