From 533cc2d0aa0998d1ca5a64f04263203521a7319b Mon Sep 17 00:00:00 2001
From: MUQING <1966944300@qq.com>
Date: Wed, 22 Nov 2023 18:11:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=E5=99=A8=E6=97=A0=E6=92=AD=E6=94=BE=E5=88=97=E8=A1=A8=E9=97=AA?=
 =?UTF-8?q?=E9=80=80=20=E9=9F=B3=E4=B9=90=E6=90=9C=E7=B4=A2=EF=BC=8C=20?=
 =?UTF-8?q?=E6=AD=8C=E8=AF=8DUI=E6=98=BE=E7=A4=BA=EF=BC=8C=20=E4=B8=BB?=
 =?UTF-8?q?=E9=A1=B5=E6=8A=A5=E9=94=99=EF=BC=8C=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=BA=86=E4=B8=80=E4=BA=9B=E4=BD=93=E9=AA=8C=E4=B8=8A=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/.gitignore                              |    3 -
 .idea/.name                                   |    1 -
 .idea/inspectionProfiles/Project_Default.xml  |    8 +-
 .idea/kotlinc.xml                             |    6 -
 .idea/misc.xml                                |    7 +-
 app/build.gradle                              |   38 +-
 app/src/main/AndroidManifest.xml              |   54 +-
 .../java/com/dirror/lyricviewx/ILyricViewX.kt |  257 ----
 .../java/com/dirror/lyricviewx/LyricEntry.kt  |   82 --
 .../java/com/dirror/lyricviewx/LyricUtil.kt   |  289 -----
 .../java/com/dirror/lyricviewx/LyricViewX.kt  | 1096 -----------------
 .../java/com/dirror/lyricviewx/ReadyHelper.kt |   51 -
 .../lyricviewx/extension/BlurMaskFilterExt.kt |   15 -
 .../main/java/com/muqingbfq/MediaPlayer.java  |  227 ++--
 .../com/muqingbfq/MyButtonClickReceiver.java  |   11 +-
 .../muqingbfq/activity_about_software.java    |   21 +-
 .../java/com/muqingbfq/activity_search.java   |  116 +-
 .../main/java/com/muqingbfq/api/playlist.java |   27 -
 .../main/java/com/muqingbfq/api/resource.java |   35 +-
 app/src/main/java/com/muqingbfq/api/url.java  |   34 +-
 app/src/main/java/com/muqingbfq/bfq.java      |  194 +--
 app/src/main/java/com/muqingbfq/bfq_an.java   |   50 +-
 app/src/main/java/com/muqingbfq/bfqkz.java    |   21 +-
 .../java/com/muqingbfq/fragment/bflb_db.java  |    1 -
 .../java/com/muqingbfq/fragment/bfq_db.java   |   73 +-
 .../main/java/com/muqingbfq/fragment/gd.java  |    6 +-
 .../main/java/com/muqingbfq/fragment/mp3.java |    5 +-
 .../java/com/muqingbfq/fragment/search.java   |   38 +-
 .../main/java/com/muqingbfq/fragment/sz.java  |   97 +-
 app/src/main/java/com/muqingbfq/home.java     |  133 +-
 .../main/java/com/muqingbfq/login/enroll.java |   14 +-
 .../java/com/muqingbfq/login/user_logs.java   |    9 +-
 .../com/muqingbfq/login/user_message.java     |   49 +-
 .../java/com/muqingbfq/login/visitor.java     |   23 +-
 app/src/main/java/com/muqingbfq/main.java     |    7 +-
 .../mq/BluetoothMusicController.java          |    3 -
 .../mq/NotificationManagerCompat.java         |   16 +-
 app/src/main/java/com/muqingbfq/mq/gj.java    |   79 +-
 app/src/main/java/com/muqingbfq/mq/llq.java   |    6 -
 app/src/main/java/com/muqingbfq/mq/wj.java    |   48 +-
 app/src/main/java/com/muqingbfq/mq/wl.java    |  105 +-
 app/src/main/java/com/muqingbfq/start.java    |  166 +--
 app/src/main/java/com/muqingbfq/sz.java       |   46 +-
 app/src/main/java/com/muqingbfq/yc.java       |   46 +-
 .../res/drawable/ic_launcher_background.xml   |    2 +-
 .../res/drawable/ic_launcher_foreground.xml   |    4 +-
 .../res/drawable/shape_sheet_dialog_bg.xml    |    4 +-
 .../res/layout/activity_about_software.xml    |   15 +-
 app/src/main/res/layout/activity_enroll.xml   |   21 +-
 app/src/main/res/layout/activity_home.xml     |    6 +-
 app/src/main/res/layout/activity_search.xml   |   90 +-
 app/src/main/res/layout/activity_sz.xml       |   63 +-
 .../main/res/layout/activity_user_logs.xml    |    6 +-
 app/src/main/res/layout/activity_yc.xml       |   19 +-
 app/src/main/res/layout/fragment_bfq.xml      |  116 +-
 app/src/main/res/layout/fragment_bfq_db.xml   |    5 +-
 app/src/main/res/layout/fragment_gd.xml       |    2 -
 app/src/main/res/layout/fragment_mp3.xml      |   11 +-
 app/src/main/res/layout/fragment_search.xml   |    1 -
 app/src/main/res/layout/fragment_sz.xml       |   41 +-
 app/src/main/res/layout/list_text.xml         |   20 +-
 .../main/res/layout/notification_layout.xml   |   70 --
 app/src/main/res/values/strings.xml           |    4 +-
 build.gradle                                  |    2 -
 gradle/wrapper/gradle-wrapper.jar             |  Bin 59203 -> 60756 bytes
 gradle/wrapper/gradle-wrapper.properties      |    2 +-
 gradlew                                       |  275 +++--
 gradlew.bat                                   |   14 +-
 68 files changed, 1278 insertions(+), 3128 deletions(-)
 delete mode 100644 .idea/.gitignore
 delete mode 100644 .idea/.name
 delete mode 100644 .idea/kotlinc.xml
 delete mode 100644 app/src/main/java/com/dirror/lyricviewx/ILyricViewX.kt
 delete mode 100644 app/src/main/java/com/dirror/lyricviewx/LyricEntry.kt
 delete mode 100644 app/src/main/java/com/dirror/lyricviewx/LyricUtil.kt
 delete mode 100644 app/src/main/java/com/dirror/lyricviewx/LyricViewX.kt
 delete mode 100644 app/src/main/java/com/dirror/lyricviewx/ReadyHelper.kt
 delete mode 100644 app/src/main/java/com/dirror/lyricviewx/extension/BlurMaskFilterExt.kt
 delete mode 100644 app/src/main/res/layout/notification_layout.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 359bb53..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index cd4ecd2..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-Cloud_music
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 30f3112..32f0450 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,13 +1,19 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="AndroidLintContentDescription" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AndroidLintHardcodedText" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.io.PrintStream,printf,android.app.DownloadManager,query" />
+      <option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.io.PrintStream,printf,okhttp3.Call,execute,android.app.DownloadManager,query" />
     </inspection_tool>
     <inspection_tool class="DataFlowIssue" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="SUGGEST_NULLABLE_ANNOTATIONS" value="false" />
       <option name="DONT_REPORT_TRUE_ASSERT_STATEMENTS" value="false" />
     </inspection_tool>
+    <inspection_tool class="IgnoreResultOfCall" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="m_reportAllNonLibraryCalls" value="false" />
+      <option name="callCheckString" value="java.io.File,.*,java.io.InputStream,read|skip|available|markSupported,java.io.Reader,read|skip|ready|markSupported,java.lang.AbstractStringBuilder,capacity|codePointAt|codePointBefore|codePointCount|indexOf|lastIndexOf|offsetByCodePoints|substring|subSequence,java.lang.Boolean,.*,java.lang.Byte,.*,java.lang.Character,.*,java.lang.Double,.*,java.lang.Float,.*,java.lang.Integer,.*,java.lang.Long,.*,java.lang.Math,.*,java.lang.Object,equals|hashCode|toString,java.lang.Short,.*,java.lang.StrictMath,.*,java.lang.String,.*,java.lang.Thread,interrupted,java.math.BigDecimal,.*,java.math.BigInteger,.*,java.net.InetAddress,.*,java.net.URI,.*,java.nio.channels.AsynchronousChannelGroup,.*,java.util.Arrays,.*,java.util.Collections,(?!addAll).*,java.util.List,of,java.util.Map,of|ofEntries|entry,java.util.Set,of,java.util.UUID,.*,java.util.concurrent.BlockingQueue,offer|remove,java.util.concurrent.CountDownLatch,await|getCount,java.util.concurrent.ExecutorService,awaitTermination|isShutdown|isTerminated,java.util.concurrent.ForkJoinPool,awaitQuiescence,java.util.concurrent.Semaphore,tryAcquire|availablePermits|isFair|hasQueuedThreads|getQueueLength|getQueuedThreads,java.util.concurrent.locks.Condition,await|awaitNanos|awaitUntil,java.util.concurrent.locks.Lock,tryLock|newCondition,java.util.regex.Matcher,pattern|toMatchResult|start|end|group|groupCount|matches|find|lookingAt|quoteReplacement|replaceAll|replaceFirst|regionStart|regionEnd|hasTransparentBounds|hasAnchoringBounds|hitEnd|requireEnd,java.util.regex.Pattern,.*,java.util.stream.BaseStream,.*,java.util.stream.DoubleStream,.*,java.util.stream.IntStream,.*,java.util.stream.LongStream,.*,java.util.stream.Stream,.*" />
+    </inspection_tool>
     <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
       <option name="processCode" value="true" />
       <option name="processLiterals" value="true" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
deleted file mode 100644
index 568bea1..0000000
--- a/.idea/kotlinc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.6.20" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8978d23..adb8ae0 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,9 +1,4 @@
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 1b3fc8f..ccddee9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,9 +1,15 @@
 plugins {
     id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
-    id 'maven-publish'
 }
 android {
+    signingConfigs {
+        debug {
+            storeFile file('F:\\muqing.jks')
+            storePassword 'muqing153'
+            keyAlias 'muqing'
+            keyPassword 'muqing153'
+        }
+    }
     namespace 'com.muqingbfq'
     compileSdk 33
     defaultConfig {
@@ -12,23 +18,18 @@ android {
         //noinspection OldTargetApi
         targetSdk 31
         versionCode 1
-        versionName "1.5.1"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        versionName "1.6.6"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    buildFeatures {
-        viewBinding true
-    }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-
     android.applicationVariants.configureEach {
         variant ->
             variant.outputs.configureEach {
@@ -36,32 +37,19 @@ android {
                 outputFileName = "Cloud_music-${variant.name}-v${variant.versionName}.apk"
             }
     }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
 }
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.3.0'
     implementation 'com.google.code.gson:gson:2.9.1'
 
     implementation 'com.squareup.okhttp3:okhttp:4.11.0'
     implementation 'com.github.bumptech.glide:glide:4.16.0'
+    implementation 'com.github.Moriafly:LyricViewX:1.4.0-alpha02'
+    implementation 'com.google.android.flexbox:flexbox:3.0.0'
 
-    api "com.github.cy745:EaseView:e11c3208a9"
-    implementation "androidx.dynamicanimation:dynamicanimation-ktx:1.0.0-alpha03"
-}
-afterEvaluate {
-    publishing {
-        publications {
-            release(MavenPublication) {
-                groupId = 'com.github.Moriafly'
-                artifactId = 'LyricViewX'
-                version = '1.4.0-alpha02'
-            }
-        }
-    }
+    implementation("androidx.media3:media3-exoplayer:1.1.1")
+    implementation("androidx.media3:media3-session:1.1.1")
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ffc2db0..acaae7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:ignore="CoarseFineLocation,WrongManifestParent">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
     <uses-permission android:name="android.permission.VIBRATE" />
@@ -22,6 +21,10 @@
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
 
+    <!--悬浮窗权限-->
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW" />
+
     <application
         android:name=".main"
         android:allowBackup="true"
@@ -29,65 +32,50 @@
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:launchMode="singleTask"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.云音乐"
         android:usesCleartextTraffic="true"
-        tools:targetApi="32">
+        tools:targetApi="31">
         <activity
             android:name=".start"
             android:configChanges="uiMode"
             android:exported="true"
-            android:launchMode="singleTop"
             android:theme="@style/Theme.main">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            <intent-filter tools:ignore="AppLinkUrlError">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/plain" />
-            </intent-filter>
         </activity>
-        <activity
-            android:name=".login.enroll" />
-        <activity
-            android:name=".activity_search" />
+        <activity android:name=".login.enroll" />
+        <activity android:name=".activity_search" />
         <activity
             android:name=".bfq"
-            android:noHistory="true"
+            android:configChanges="screenSize|smallestScreenSize|orientation|screenLayout"
             android:exported="true"
-            android:theme="@style/fragment_dialog">
-            <intent-filter>
-                <action android:name="transparent.text.SECONDACTIVITY" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-        <activity android:name=".fragment.mp3"
-            android:noHistory="true" />
-        <activity
-            android:name=".activity_about_software" />
-        <activity
-            android:name=".login.user_logs" />
-        <activity
-            android:name=".sz" />
+            android:theme="@style/fragment_dialog" />
+
+        <activity android:name=".fragment.mp3" />
+        <activity android:name=".activity_about_software" />
+        <activity android:name=".login.user_logs" />
+        <activity android:name=".sz" />
         <activity
             android:name=".home"
             android:configChanges="screenSize|smallestScreenSize|orientation|screenLayout"
-            android:exported="false"
-            android:launchMode="singleTask" />
+            android:exported="false" />
         <activity android:name=".mq.llq" />
+        <activity android:name=".fragment.baseactivity" />
         <activity android:name=".yc" />
 
-        <service android:name=".bfqkz"
+        <service
+            android:name=".bfqkz"
             android:exported="false"
             android:permission="TODO">
             <intent-filter>
-                <action android:name="android.media.browse.MediaBrowserService" />
+                <action android:name="androidx.media3.session.MediaSessionService" />
             </intent-filter>
         </service>
+        <service android:name=".mq.floating" />
         <receiver
             android:name=".MyButtonClickReceiver"
             android:enabled="true"
diff --git a/app/src/main/java/com/dirror/lyricviewx/ILyricViewX.kt b/app/src/main/java/com/dirror/lyricviewx/ILyricViewX.kt
deleted file mode 100644
index d0422ee..0000000
--- a/app/src/main/java/com/dirror/lyricviewx/ILyricViewX.kt
+++ /dev/null
@@ -1,257 +0,0 @@
-package com.dirror.lyricviewx
-
-import android.graphics.Typeface
-import android.graphics.drawable.Drawable
-import android.text.Layout
-import androidx.annotation.ColorInt
-import androidx.annotation.FloatRange
-import androidx.annotation.Px
-import java.io.File
-
-const val GRAVITY_CENTER = 0    // 居中
-const val GRAVITY_LEFT = 1      // 左
-const val GRAVITY_RIGHT = 2     // 右
-
-fun Int.toLayoutAlign(): Layout.Alignment {
-    return when (this) {
-        GRAVITY_LEFT -> Layout.Alignment.ALIGN_NORMAL
-        GRAVITY_CENTER -> Layout.Alignment.ALIGN_CENTER
-        GRAVITY_RIGHT -> Layout.Alignment.ALIGN_OPPOSITE
-        else -> Layout.Alignment.ALIGN_CENTER
-    }
-}
-
-/**
- * LyricViewX 接口
- * 从 LyricViewX 提取，方便管理
- *
- * @author Moriafly
- * @since 2021年1月28日16:29:16
- */
-interface LyricViewXInterface {
-
-    /**
-     * 设置整句之间的间隔高度
-     * @param height px
-     */
-    fun setSentenceDividerHeight(@Px height: Float)
-
-    /**
-     * 设置原句与翻译之间的间隔高度
-     * @param height px
-     */
-    fun setTranslateDividerHeight(@Px height: Float)
-
-    /**
-     * 设置歌词整体的垂直偏移值，配合[setHorizontalOffsetPercent]使用
-     * @param offset px
-     *
-     * @see [setHorizontalOffsetPercent]
-     */
-    fun setHorizontalOffset(@Px offset: Float)
-
-    /**
-     * 设置歌词整体的垂直偏移，相对于控件高度的百分比,0.5f即表示居中，配合[setHorizontalOffset]使用
-     *
-     * @param percent 0.0f ~ 1.0f
-     *
-     * @see [setHorizontalOffset]
-     */
-    fun setHorizontalOffsetPercent(@FloatRange(from = 0.0, to = 1.0) percent: Float)
-
-    /**
-     * 设置翻译相对与原词之间的缩放比例值
-     * @param scaleValue 一般来说 0.8f 是个不错的值
-     */
-    fun setTranslateTextScaleValue(@FloatRange(from = 0.1, to = 2.0) scaleValue: Float)
-
-    /**
-     * 设置文字的对齐方向
-     */
-    fun setTextGravity(gravity: Int)
-
-    /**
-     * 设置非当前行歌词字体颜色 [normalColor]
-     */
-    fun setNormalColor(@ColorInt normalColor: Int)
-
-    /**
-     * 普通歌词文本字体大小 [size]，单位 px
-     */
-    fun setNormalTextSize(@Px size: Float)
-
-    /**
-     * 当前歌词文本字体大小
-     */
-    fun setCurrentTextSize(size: Float)
-
-    /**
-     * 设置当前行歌词的字体颜色
-     */
-    fun setCurrentColor(currentColor: Int)
-
-    /**
-     * 设置拖动歌词时选中歌词的字体颜色
-     */
-    fun setTimelineTextColor(timelineTextColor: Int)
-
-    /**
-     * 设置拖动歌词时时间线的颜色
-     */
-    fun setTimelineColor(timelineColor: Int)
-
-    /**
-     * 设置拖动歌词时右侧时间字体颜色
-     */
-    fun setTimeTextColor(timeTextColor: Int)
-
-    /**
-     * 设置歌词为空时屏幕中央显示的文字 [label]，如“暂无歌词”
-     */
-    fun setLabel(label: String)
-
-    /**
-     * 加载歌词文本
-     * 两种语言的歌词时间戳需要一致
-     *
-     * @param mainLyricText 第一种语言歌词文本
-     * @param secondLyricText 可选，第二种语言歌词文本
-     */
-    fun loadLyric(mainLyricText: String?, secondLyricText: String? = null)
-
-    /**
-     * 加载歌词 [LyricEntry] 集合
-     * 如果你在 Service 等地方自行解析歌词包装成 [LyricEntry] 集合，那么可以使用此方法载入歌词
-     *
-     * @param lyricEntries 歌词集合
-     * @since 1.3.1
-     */
-    fun loadLyric(lyricEntries: List<LyricEntry>)
-
-    /**
-     * 刷新歌词
-     *
-     * @param time 当前播放时间
-     */
-    fun updateTime(time: Long, force: Boolean = false)
-
-    /**
-     * 设置歌词是否允许拖动
-     *
-     * @param draggable 是否允许拖动
-     * @param onPlayClickListener 设置歌词拖动后播放按钮点击监听器，如果允许拖动，则不能为 null
-     */
-    fun setDraggable(draggable: Boolean, onPlayClickListener: OnPlayClickListener?)
-
-    /**
-     * 设置单击
-     */
-    fun setOnSingerClickListener(onSingerClickListener: OnSingleClickListener?)
-
-    /**
-     * 获取当前歌词每句实体，可用于歌词分享
-     *
-     * @return LyricEntry 集合
-     */
-    fun getLyricEntryList(): List<LyricEntry>
-
-    /**
-     * 设置当前歌词每句实体
-     */
-    fun setLyricEntryList(newList: List<LyricEntry>)
-
-    /**
-     * 获取当前行歌词
-     */
-    fun getCurrentLineLyricEntry(): LyricEntry?
-
-    /**
-     * 为歌词设置自定义的字体
-     *
-     * @param file 字体文件
-     */
-    fun setLyricTypeface(file: File)
-
-    /**
-     * 为歌词设置自定义的字体
-     *
-     * @param path 字体文件路径
-     */
-    fun setLyricTypeface(path: String)
-
-    /**
-     * 为歌词设置自定义的字体，可为空，若为空则应清除字体
-     *
-     * @param typeface 字体对象
-     */
-    fun setLyricTypeface(typeface: Typeface?)
-
-    /**
-     * 为歌词的过渡动画设置阻尼比（数值越大，回弹次数越多）
-     *
-     * @param dampingRatio 阻尼比 详见[androidx.dynamicanimation.animation.SpringForce]
-     */
-    fun setDampingRatioForLyric(dampingRatio: Float)
-
-    /**
-     * 为歌词视图的滚动动画设置阻尼比（数值越大，回弹次数越多）
-     *
-     * @param dampingRatio 阻尼比 详见[androidx.dynamicanimation.animation.SpringForce]
-     */
-    fun setDampingRatioForViewPort(dampingRatio: Float)
-
-    /**
-     * 为歌词的过渡动画设置刚度（数值越大，动画越短）
-     *
-     * @param stiffness 刚度 详见[androidx.dynamicanimation.animation.SpringForce]
-     */
-    fun setStiffnessForLyric(stiffness: Float)
-
-    /**
-     * 为歌词视图的滚动动画设置刚度（数值越大，动画越短）
-     *
-     * @param stiffness 刚度 详见[androidx.dynamicanimation.animation.SpringForce]
-     */
-    fun setStiffnessForViewPort(stiffness: Float)
-
-    /**
-     * 设置跳转播放按钮
-     */
-    fun setPlayDrawable(drawable: Drawable)
-
-    /**
-     * 设置是否绘制歌词翻译
-     */
-    fun setIsDrawTranslation(isDrawTranslation: Boolean)
-
-    /**
-     * 是否开启特定的模糊效果
-     */
-    fun setIsEnableBlurEffect(isEnableBlurEffect: Boolean)
-
-    /**
-     * 设置元素的偏移百分比，0.5f即表示居中
-     *
-     * @param itemOffsetPercent 0f ~ 1f 偏移百分比
-     */
-    fun setItemOffsetPercent(@FloatRange(from = 0.0, to = 1.0) itemOffsetPercent: Float)
-}
-
-/**
- * 播放按钮点击监听器，点击后应该跳转到指定播放位置
- */
-interface OnPlayClickListener {
-    /**
-     * 播放按钮被点击，应该跳转到指定播放位置
-     *
-     * @return 是否成功消费该事件，如果成功消费，则会更新UI
-     */
-    fun onPlayClick(time: Long): Boolean
-}
-
-/**
- * 点击歌词布局
- */
-interface OnSingleClickListener {
-    fun onClick()
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/dirror/lyricviewx/LyricEntry.kt b/app/src/main/java/com/dirror/lyricviewx/LyricEntry.kt
deleted file mode 100644
index 17c590a..0000000
--- a/app/src/main/java/com/dirror/lyricviewx/LyricEntry.kt
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.dirror.lyricviewx
-
-import android.os.Build
-import android.text.Layout
-import android.text.StaticLayout
-import android.text.TextPaint
-
-/**
- * 一行歌词实体
- * @since 2021年1月19日09:51:40 Moriafly 基于 LrcEntry 改造，转换为 kt ，移除部分过时方法
- * @param time 歌词时间
- * @param text 歌词文本
- */
-class LyricEntry(val time: Long, val text: String) : Comparable<LyricEntry> {
-
-    /**
-     * 第二文本
-     */
-    var secondText: String? = null
-
-    /**
-     * staticLayout
-     */
-    var staticLayout: StaticLayout? = null
-        private set
-
-    var secondStaticLayout: StaticLayout? = null
-        private set
-
-    @Deprecated("存在不显示翻译的情况，会导致offset发生改变，故不再固定存储offset")
-    /**
-     * 歌词距离视图顶部的距离
-     */
-    var offset = Float.MIN_VALUE
-
-    /**
-     * 初始化
-     * @param textPaint 文本画笔
-     * @param width 宽度
-     * @param align 位置
-     */
-    fun init(
-        textPaint: TextPaint,
-        secondTextPaint: TextPaint,
-        width: Int, align: Layout.Alignment
-    ) {
-        staticLayout = createStaticLayout(text, textPaint, width, align)
-        secondStaticLayout = createStaticLayout(secondText, secondTextPaint, width, align)
-        offset = Float.MIN_VALUE
-    }
-
-    /**
-     * 继承 Comparable 比较
-     * @param other LyricEntry
-     * @return 时间差
-     */
-    override fun compareTo(other: LyricEntry): Int {
-        return (time - other.time).toInt()
-    }
-
-    companion object {
-        fun createStaticLayout(
-            text: String?,
-            paint: TextPaint,
-            width: Number,
-            align: Layout.Alignment
-        ): StaticLayout? {
-            if (text == null || text.isEmpty()) return null
-            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                StaticLayout.Builder
-                    .obtain(text, 0, text.length, paint, width.toInt())
-                    .setAlignment(align)
-                    .setLineSpacing(0f, 1f)
-                    .setIncludePad(false)
-                    .build()
-            } else {
-                StaticLayout(text, paint, width.toInt(), align, 1f, 0f, false)
-            }
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/dirror/lyricviewx/LyricUtil.kt b/app/src/main/java/com/dirror/lyricviewx/LyricUtil.kt
deleted file mode 100644
index cb3b4b4..0000000
--- a/app/src/main/java/com/dirror/lyricviewx/LyricUtil.kt
+++ /dev/null
@@ -1,289 +0,0 @@
-package com.dirror.lyricviewx
-
-import android.animation.ArgbEvaluator
-import android.animation.ValueAnimator
-import android.annotation.SuppressLint
-import android.graphics.Rect
-import android.text.TextUtils
-import android.text.format.DateUtils
-import android.view.MotionEvent
-import java.io.*
-import java.net.HttpURLConnection
-import java.net.URL
-import java.nio.charset.StandardCharsets
-import java.util.*
-import java.util.regex.Pattern
-
-/**
- * 工具类
- * 原 LrcUtils 转 Kotlin
- */
-object LyricUtil {
-
-    private val PATTERN_LINE = Pattern.compile("((\\[\\d\\d:\\d\\d\\.\\d{2,3}])+)(.+)")
-    private val PATTERN_TIME = Pattern.compile("\\[(\\d\\d):(\\d\\d)\\.(\\d{2,3})]")
-    private val argbEvaluator = ArgbEvaluator()
-
-    /**
-     * 从文件解析双语歌词
-     */
-    fun parseLrc(lrcFiles: Array<out File?>?): List<LyricEntry>? {
-        if (lrcFiles == null || lrcFiles.size != 2 || lrcFiles[0] == null) {
-            return null
-        }
-        val mainLrcFile = lrcFiles[0]
-        val secondLrcFile = lrcFiles[1]
-        val mainEntryList = parseLrc(mainLrcFile)
-        val secondEntryList = parseLrc(secondLrcFile)
-        if (mainEntryList != null && secondEntryList != null) {
-            for (mainEntry in mainEntryList) {
-                for (secondEntry in secondEntryList) {
-                    if (mainEntry.time == secondEntry.time) {
-                        mainEntry.secondText = secondEntry.text
-                    }
-                }
-            }
-        }
-        return mainEntryList
-    }
-
-    /**
-     * 从文件解析歌词
-     */
-    private fun parseLrc(lrcFile: File?): List<LyricEntry>? {
-        if (lrcFile == null || !lrcFile.exists()) {
-            return null
-        }
-        val entryList: MutableList<LyricEntry> = ArrayList()
-        try {
-            val br =
-                BufferedReader(InputStreamReader(FileInputStream(lrcFile), StandardCharsets.UTF_8))
-            var line: String
-            while (br.readLine().also { line = it } != null) {
-                val list = parseLine(line)
-                if (list != null && list.isNotEmpty()) {
-                    entryList.addAll(list)
-                }
-            }
-            br.close()
-        } catch (e: IOException) {
-            e.printStackTrace()
-        }
-        entryList.sort()
-        return entryList
-    }
-
-    /**
-     * 从文本解析双语歌词
-     */
-    fun parseLrc(lrcTexts: Array<out String?>?): List<LyricEntry>? {
-        if (lrcTexts == null || lrcTexts.size != 2 || TextUtils.isEmpty(lrcTexts[0])) {
-            return null
-        }
-        val mainLrcText = lrcTexts[0]
-        val secondLrcText = lrcTexts[1]
-        val mainEntryList = mainLrcText?.let { parseLrc(it) }
-
-        /**
-         * 当输入的secondLrcText为空时,按如下格式解析歌词
-         * （音乐标签下载的第二种歌词格式）
-         *
-         *  [00:21.11]いつも待ち合わせより15分前集合
-         *  [00:21.11]总会比相约时间早15分钟集合
-         *  [00:28.32]駅の改札ぬける
-         *  [00:28.32]穿过车站的检票口
-         *  [00:31.39]ざわめきにわくわくだね
-         *  [00:31.39]嘈杂声令内心兴奋不已
-         *  [00:35.23]どこへ向かうかなんて
-         *  [00:35.23]不在意接下来要去哪里
-         */
-        if (TextUtils.isEmpty(secondLrcText)) {
-            var lastEntry: LyricEntry? = null
-            return mainEntryList?.filter { now ->
-                if (lastEntry == null) {
-                    lastEntry = now
-                    return@filter true
-                }
-
-                if (lastEntry!!.time == now.time) {
-                    lastEntry!!.secondText = now.text
-                    lastEntry = null
-                    return@filter false
-                }
-
-                lastEntry = now
-                true
-            }
-        }
-
-        val secondEntryList = secondLrcText?.let { parseLrc(it) }
-        if (mainEntryList != null && secondEntryList != null) {
-            for (mainEntry in mainEntryList) {
-                for (secondEntry in secondEntryList) {
-                    if (mainEntry.time == secondEntry.time) {
-                        mainEntry.secondText = secondEntry.text
-                    }
-                }
-            }
-        }
-        return mainEntryList
-    }
-
-    /**
-     * 从文本解析歌词
-     */
-    private fun parseLrc(lrcText: String): List<LyricEntry>? {
-        var lyricText = lrcText.trim()
-        if (TextUtils.isEmpty(lyricText)) return null
-
-        if (lyricText.startsWith("\uFEFF")) {
-            lyricText = lyricText.replace("\uFEFF", "")
-        }
-
-        // 针对传入 Language="Media Monkey Format"; Lyrics="......"; 的情况
-        lyricText = lyricText.substringAfter("Lyrics=\"")
-            .substringBeforeLast("\";")
-
-        val entryList: MutableList<LyricEntry> = ArrayList()
-        val array = lyricText.split("\\n".toRegex()).toTypedArray()
-        for (line in array) {
-            val list = parseLine(line)
-            if (!list.isNullOrEmpty()) {
-                entryList.addAll(list)
-            }
-        }
-        entryList.sort()
-        return entryList
-    }
-
-    /**
-     * 获取网络文本，需要在工作线程中执行
-     */
-    fun getContentFromNetwork(url: String?, charset: String?): String? {
-        var lrcText: String? = null
-        try {
-            val url = URL(url)
-            val conn = url.openConnection() as HttpURLConnection
-            conn.requestMethod = "GET"
-            conn.connectTimeout = 10000
-            conn.readTimeout = 10000
-            if (conn.responseCode == 200) {
-                val `is` = conn.inputStream
-                val bos = ByteArrayOutputStream()
-                val buffer = ByteArray(1024)
-                var len: Int
-                while (`is`.read(buffer).also { len = it } != -1) {
-                    bos.write(buffer, 0, len)
-                }
-                `is`.close()
-                bos.close()
-                lrcText = bos.toString(charset)
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-        return lrcText
-    }
-
-    /**
-     * 解析一行歌词
-     */
-    private fun parseLine(line: String): List<LyricEntry>? {
-        var lyricLine = line
-        if (TextUtils.isEmpty(lyricLine)) {
-            return null
-        }
-        lyricLine = lyricLine.trim { it <= ' ' }
-        // [00:17.65]让我掉下眼泪的
-        val lineMatcher = PATTERN_LINE.matcher(lyricLine)
-        if (!lineMatcher.matches()) {
-            return null
-        }
-        val times = lineMatcher.group(1)!!
-        val text = lineMatcher.group(3)!!
-        val entryList: MutableList<LyricEntry> = ArrayList()
-
-        // [00:17.65]
-        val timeMatcher = PATTERN_TIME.matcher(times)
-        while (timeMatcher.find()) {
-            val min = timeMatcher.group(1)!!.toLong()
-            val sec = timeMatcher.group(2)!!.toLong()
-            val milString = timeMatcher.group(3)!!
-            var mil = milString.toLong()
-            // 如果毫秒是两位数，需要乘以 10，when 新增支持 1 - 6 位毫秒，很多获取的歌词存在不同的毫秒位数
-            when (milString.length) {
-                1 -> mil *= 100
-                2 -> mil *= 10
-                4 -> mil /= 10
-                5 -> mil /= 100
-                6 -> mil /= 1000
-            }
-            val time = min * DateUtils.MINUTE_IN_MILLIS + sec * DateUtils.SECOND_IN_MILLIS + mil
-            entryList.add(LyricEntry(time, text))
-        }
-        return entryList
-    }
-
-    /**
-     * 转为[分:秒]
-     */
-    fun formatTime(milli: Long): String {
-        val m = (milli / DateUtils.MINUTE_IN_MILLIS).toInt()
-        val s = (milli / DateUtils.SECOND_IN_MILLIS % 60).toInt()
-        val mm = String.format(Locale.getDefault(), "%02d", m)
-        val ss = String.format(Locale.getDefault(), "%02d", s)
-        return "$mm:$ss"
-    }
-
-    /**
-     * BUG java.lang.NoSuchFieldException: No field sDurationScale in class Landroid/animation/ValueAnimator; #3
-     */
-    @SuppressLint("SoonBlockedPrivateApi")
-    @Deprecated("")
-    fun resetDurationScale() {
-        try {
-            val mField = ValueAnimator::class.java.getDeclaredField("sDurationScale")
-            mField.isAccessible = true
-            mField.setFloat(null, 1f)
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    /**
-     * 结合fraction，计算两个值之间的比例
-     */
-    fun calcScaleValue(a: Float, b: Float, f: Float, reverse: Boolean = false): Float {
-        if (b == 0f) return 1f
-        return 1f + ((a - b) / b) * (if (reverse) 1f - f else f)
-    }
-
-    /**
-     * 颜色值插值函数
-     */
-    fun lerpColor(a: Int, b: Int, f: Float): Int {
-        return argbEvaluator.evaluate(f, a, b) as Int
-    }
-
-    /**
-     * 简单的插值函数
-     */
-    fun lerp(from: Float, to: Float, fraction: Float): Float {
-        return from + (to - from) * fraction
-    }
-
-    /**
-     * 判断MotionEvent是否发生在Rect中
-     */
-    fun MotionEvent.insideOf(rect: Rect?): Boolean {
-        rect ?: return false
-        return rect.contains(x.toInt(), y.toInt())
-    }
-
-    fun normalize(min: Float, max: Float, value: Float, limit: Boolean = false): Float {
-        if (min == max) return 1f
-        return ((value - min) / (max - min)).let {
-            if (limit) it.coerceIn(0f, 1f) else it
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/dirror/lyricviewx/LyricViewX.kt b/app/src/main/java/com/dirror/lyricviewx/LyricViewX.kt
deleted file mode 100644
index 4b63579..0000000
--- a/app/src/main/java/com/dirror/lyricviewx/LyricViewX.kt
+++ /dev/null
@@ -1,1096 +0,0 @@
-
-package com.dirror.lyricviewx
-import android.animation.ValueAnimator
-import android.annotation.SuppressLint
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.graphics.Typeface
-import android.graphics.drawable.Drawable
-import android.os.Looper
-import android.text.Layout
-import android.text.StaticLayout
-import android.text.TextPaint
-import android.text.format.DateUtils
-import android.util.AttributeSet
-import android.view.GestureDetector
-import android.view.GestureDetector.SimpleOnGestureListener
-import android.view.MotionEvent
-import android.widget.Scroller
-import androidx.annotation.FloatRange
-import androidx.core.content.ContextCompat
-import androidx.dynamicanimation.animation.SpringForce
-import androidx.dynamicanimation.animation.springAnimationOf
-import androidx.dynamicanimation.animation.withSpringForceProperties
-import com.dirror.lyricviewx.LyricUtil.calcScaleValue
-import com.dirror.lyricviewx.LyricUtil.formatTime
-import com.dirror.lyricviewx.LyricUtil.insideOf
-import com.dirror.lyricviewx.LyricUtil.lerp
-import com.dirror.lyricviewx.LyricUtil.lerpColor
-import com.dirror.lyricviewx.LyricUtil.normalize
-import com.dirror.lyricviewx.extension.BlurMaskFilterExt
-import com.lalilu.easeview.EaseView
-import com.lalilu.easeview.animatevalue.BoolValue
-import com.lalilu.easeview.animatevalue.FloatListAnimateValue
-import com.muqingbfq.R
-import java.io.File
-import kotlin.concurrent.thread
-
-import kotlin.math.abs
-import kotlin.math.max
-
-/**
- * LyricViewX
- *
- * Based on https://github.com/zion223/NeteaseCloudMusic-MVVM Kotlin
- *
- * Thanks:
- * https://github.com/cy745
- */
-open class LyricViewX : EaseView, LyricViewXInterface {
-    constructor(context: Context) : super(context) {
-        init(null)
-    }
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
-        init(attrs)
-    }
-
-    protected val readyHelper = ReadyHelper()
-    private val blurMaskFilterExt = BlurMaskFilterExt()
-
-    /** 单句歌词集合 */
-    private val lyricEntryList: MutableList<LyricEntry> = ArrayList()
-
-    /** 主歌词画笔 */
-    private val lyricPaint = TextPaint()
-
-    /** 副歌词（一般为翻译歌词）画笔 */
-    private val secondLyricPaint = TextPaint()
-
-    /** 时间文字画笔 */
-    private val timePaint = TextPaint()
-
-    private var timeFontMetrics: Paint.FontMetrics? = null
-
-    /** 跳转播放按钮 */
-    private var playDrawable: Drawable? = null
-
-    private var translateDividerHeight = 0f
-    private var sentenceDividerHeight = 0f
-    private var animationDuration: Long = 0
-    private var normalTextColor = 0
-    private var normalTextSize = 0f
-    private var currentTextColor = 0
-    private var currentTextSize = 0f
-    private var translateTextScaleValue = 1f
-    private var timelineTextColor = 0
-    private var timelineColor = 0
-    private var timeTextColor = 0
-    private var drawableWidth = 0
-    private var timeTextWidth = 0
-    private var defaultLabel: String? = null
-    private var lrcPadding = 0f
-    private var onPlayClickListener: OnPlayClickListener? = null
-    private var onSingerClickListener: OnSingleClickListener? = null
-    private var animator: ValueAnimator? = null
-    private var gestureDetector: GestureDetector? = null
-    private var scroller: Scroller? = null
-    private var flag: Any? = null
-    private var isTouching = false
-    private var isFling = false
-    private var textGravity = GRAVITY_CENTER // 歌词显示位置，靠左 / 居中 / 靠右
-    private var horizontalOffset: Float = 0f
-    private var horizontalOffsetPercent: Float = 0.5f
-    private var itemOffsetPercent: Float = 0.5f
-    private var dampingRatioForLyric: Float = SpringForce.DAMPING_RATIO_LOW_BOUNCY
-    private var dampingRatioForViewPort: Float = SpringForce.DAMPING_RATIO_NO_BOUNCY
-    private var stiffnessForLyric: Float = SpringForce.STIFFNESS_LOW
-    private var stiffnessForViewPort: Float = SpringForce.STIFFNESS_VERY_LOW
-
-    private var currentLine = 0            // 当前高亮显示的歌词
-    private val focusLine: Int             // 当前焦点歌词
-        get() = if (isTouching || isFling) centerLine else currentLine
-
-    /**
-     * 获取当前在视图中央的行数
-     */
-    private val centerLine: Int
-        get() {
-            var centerLine = 0
-            var minDistance = Float.MAX_VALUE
-            var tempDistance: Float
-
-            for (i in lyricEntryList.indices) {
-                tempDistance = abs(mViewPortOffset - getOffset(i))
-                if (tempDistance < minDistance) {
-                    minDistance = tempDistance
-                    centerLine = i
-                }
-            }
-            return centerLine
-        }
-
-    /**
-     * 获取歌词宽度
-     */
-    open val lrcWidth: Float
-        get() = width - lrcPadding * 2
-
-    /**
-     * 歌词整体的垂直偏移值
-     */
-    open val startOffset: Float
-        get() = height.toFloat() * horizontalOffsetPercent + horizontalOffset
-
-
-    /**
-     * 原有的mOffset被拆分成两个独立的offset，这样可以更好地让进度和拖拽滚动独立开来
-     */
-    private var mCurrentOffset = 0f             // 实际的歌词进度Offset
-    private var mViewPortOffset = 0f            // 歌词显示窗口的Offset
-
-    private var animateProgress = 0f            // 动画进度
-    private var animateTargetOffset = 0f        // 动画目标Offset
-    private var animateStartOffset = 0f         // 动画起始Offset
-
-    private val viewPortSpringAnimator = springAnimationOf(
-        getter = { mViewPortOffset },
-        setter = { value ->
-            if (!isShowTimeline.value && !isTouching && !isFling) {
-                mViewPortOffset = value
-                invalidate()
-            }
-        }
-    ).withSpringForceProperties {
-        dampingRatio = dampingRatioForViewPort
-        stiffness = stiffnessForViewPort
-        finalPosition = 0f
-    }
-
-    /**
-     * 弹性动画Scroller
-     */
-    private val progressSpringAnimator = springAnimationOf(
-        getter = { mCurrentOffset },
-        setter = { value ->
-            animateProgress = normalize(animateStartOffset, animateTargetOffset, value)
-            mCurrentOffset = value
-
-            if (!isShowTimeline.value && !isTouching && !isFling) {
-                viewPortSpringAnimator.animateToFinalPosition(animateTargetOffset)
-            }
-            invalidate()
-        }
-    ).withSpringForceProperties {
-        dampingRatio = dampingRatioForLyric
-        stiffness = stiffnessForLyric
-        finalPosition = 0f
-    }
-
-    @SuppressLint("CustomViewStyleable")
-    private fun init(attrs: AttributeSet?) {
-        readyHelper.readyState = STATE_INITIALIZING
-        val typedArray = context.obtainStyledAttributes(attrs, R.styleable.LyricView)
-        currentTextSize = typedArray.getDimension(R.styleable.LyricView_lrcTextSize, resources.getDimension(R.dimen.lrc_text_size))
-        normalTextSize = typedArray.getDimension(R.styleable.LyricView_lrcNormalTextSize, resources.getDimension(R.dimen.lrc_text_size))
-        if (normalTextSize == 0f) {
-            normalTextSize = currentTextSize
-        }
-
-        sentenceDividerHeight =
-            typedArray.getDimension(R.styleable.LyricView_lrcSentenceDividerHeight, resources.getDimension(R.dimen.lrc_sentence_divider_height))
-        translateDividerHeight =
-            typedArray.getDimension(R.styleable.LyricView_lrcTranslateDividerHeight, resources.getDimension(R.dimen.lrc_translate_divider_height))
-        val defDuration = resources.getInteger(R.integer.lrc_animation_duration)
-        animationDuration = typedArray.getInt(R.styleable.LyricView_lrcAnimationDuration, defDuration).toLong()
-        animationDuration =
-            if (animationDuration < 0) defDuration.toLong() else animationDuration
-
-        normalTextColor = typedArray.getColor(
-            R.styleable.LyricView_lrcNormalTextColor,
-            ContextCompat.getColor(context, R.color.lrc_normal_text_color)
-        )
-        currentTextColor = typedArray.getColor(
-            R.styleable.LyricView_lrcCurrentTextColor,
-            ContextCompat.getColor(context, R.color.lrc_current_text_color)
-        )
-        timelineTextColor = typedArray.getColor(
-            R.styleable.LyricView_lrcTimelineTextColor,
-            ContextCompat.getColor(context, R.color.lrc_timeline_text_color)
-        )
-        defaultLabel = typedArray.getString(R.styleable.LyricView_lrcLabel)
-        defaultLabel = if (defaultLabel.isNullOrEmpty()) "暂无歌词" else defaultLabel
-        lrcPadding = typedArray.getDimension(R.styleable.LyricView_lrcPadding, 0f)
-        timelineColor = typedArray.getColor(
-            R.styleable.LyricView_lrcTimelineColor,
-            ContextCompat.getColor(context, R.color.lrc_timeline_color)
-        )
-        val timelineHeight = typedArray.getDimension(
-            R.styleable.LyricView_lrcTimelineHeight,
-            resources.getDimension(R.dimen.lrc_timeline_height)
-        )
-        playDrawable = typedArray.getDrawable(R.styleable.LyricView_lrcPlayDrawable)
-        playDrawable = if (playDrawable == null) ContextCompat.getDrawable(
-            context,
-            R.drawable.zt
-        ) else playDrawable
-        timeTextColor = typedArray.getColor(
-            R.styleable.LyricView_lrcTimeTextColor,
-            ContextCompat.getColor(context, R.color.lrc_time_text_color)
-        )
-        val timeTextSize = typedArray.getDimension(
-            R.styleable.LyricView_lrcTimeTextSize,
-            resources.getDimension(R.dimen.lrc_time_text_size)
-        )
-        textGravity = typedArray.getInteger(R.styleable.LyricView_lrcTextGravity, GRAVITY_CENTER)
-        translateTextScaleValue = typedArray.getFloat(R.styleable.LyricView_lrcTranslateTextScaleValue, 1f)
-        horizontalOffset = typedArray.getDimension(R.styleable.LyricView_lrcHorizontalOffset, 0f)
-        horizontalOffsetPercent = typedArray.getDimension(R.styleable.LyricView_lrcHorizontalOffsetPercent, 0.5f)
-        itemOffsetPercent = typedArray.getDimension(R.styleable.LyricView_lrcItemOffsetPercent, 0.5f)
-        isDrawTranslation = typedArray.getBoolean(R.styleable.LyricView_lrcIsDrawTranslation, false)
-        typedArray.recycle()
-        drawableWidth = resources.getDimension(R.dimen.lrc_drawable_width).toInt()
-        timeTextWidth = resources.getDimension(R.dimen.lrc_time_width).toInt()
-        lyricPaint.isAntiAlias = true
-        lyricPaint.textSize = currentTextSize
-        lyricPaint.textAlign = Paint.Align.LEFT
-//        lyricPaint.setShadowLayer(0.1f, 0f, 1f, Color.DKGRAY)
-        secondLyricPaint.isAntiAlias = true
-        secondLyricPaint.textSize = currentTextSize
-        secondLyricPaint.textAlign = Paint.Align.LEFT
-//        secondLyricPaint.setShadowLayer(0.1f, 0f, 1f, Color.DKGRAY)
-        timePaint.isAntiAlias = true
-        timePaint.textSize = timeTextSize
-        timePaint.textAlign = Paint.Align.CENTER
-        timePaint.strokeWidth = timelineHeight
-        timePaint.strokeCap = Paint.Cap.ROUND
-        timeFontMetrics = timePaint.fontMetrics
-        gestureDetector = GestureDetector(context, mSimpleOnGestureListener)
-        gestureDetector!!.setIsLongpressEnabled(false)
-        scroller = Scroller(context)
-    }
-
-    /**
-     * 歌词是否有效
-     * @return true，如果歌词有效，否则false
-     */
-    private fun hasLrc(): Boolean {
-        return lyricEntryList.isNotEmpty()
-    }
-
-    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
-        super.onLayout(changed, left, top, right, bottom)
-        if (changed) {
-            initPlayDrawable()
-            initEntryList()
-            if (hasLrc()) {
-                smoothScrollTo(currentLine)
-            }
-        }
-        readyHelper.readyState = STATE_INITIALIZED
-    }
-
-    private val isShowTimeline = BoolValue().also(::registerValue)
-    private val isEnableBlurEffect = BoolValue().also(::registerValue)
-    private val progressKeeper = FloatListAnimateValue().also(::registerValue)
-    private val blurProgressKeeper = FloatListAnimateValue().also(::registerValue)
-
-    private val heightKeeper = LinkedHashMap<Int, Float>()
-    private val offsetKeeper = LinkedHashMap<Int, Float>()
-    private val minOffsetKeeper = LinkedHashMap<Int, Float>()
-    private val maxOffsetKeeper = LinkedHashMap<Int, Float>()
-
-    private var viewPortStartOffset: Float = 0f
-    private var isDrawTranslationValue = 0f
-    private var isDrawTranslation: Boolean = false
-        set(value) {
-            if (field == value) return
-            field = value
-            viewPortStartOffset = mViewPortOffset
-            isDrawTranslationAnimator.animateToFinalPosition(if (value) 1000f else 0f)
-        }
-    private val isDrawTranslationAnimator = springAnimationOf(
-        getter = { isDrawTranslationValue * 1000f },
-        setter = {
-            isDrawTranslationValue = it / 1000f
-
-            if (!isTouching && !isFling) {
-                viewPortSpringAnimator.cancel()
-
-                val targetOffset = if (isDrawTranslation) getMaxOffset(focusLine) else getMinOffset(focusLine)
-                val animateValue = if (isDrawTranslation) isDrawTranslationValue else 1f - isDrawTranslationValue
-
-                mViewPortOffset = lerp(viewPortStartOffset, targetOffset, animateValue)
-            }
-            invalidate()
-        },
-    ).withSpringForceProperties {
-        dampingRatio = SpringForce.DAMPING_RATIO_NO_BOUNCY
-        stiffness = SpringForce.STIFFNESS_LOW
-        finalPosition = if (isDrawTranslation) 1000f else 0f
-    }
-
-    override fun onPreDraw(canvas: Canvas): Boolean {
-        // 无歌词，只渲染一句无歌词的提示语句
-        if (!hasLrc()) {
-            lyricPaint.color = currentTextColor
-            lyricPaint.textSize = normalTextSize
-            LyricEntry.createStaticLayout(
-                defaultLabel,
-                lyricPaint,
-                lrcWidth,
-                Layout.Alignment.ALIGN_CENTER
-            )?.let {
-                drawText(
-                    canvas = canvas,
-                    staticLayout = it,
-                    calcHeightOnly = false,
-                    yOffset = startOffset,
-                    yClipPercentage = 1f
-                )
-            }
-            return false
-        }
-        return super.onPreDraw(canvas)
-    }
-
-    override fun onDoDraw(canvas: Canvas): Boolean {
-        val centerY = startOffset
-        val currentCenterLine = centerLine
-
-        // 当显示时间线时，需要绘制时间线
-        if (isShowTimeline.value || isShowTimeline.animateValue > 0f) {
-            val alpha = (isShowTimeline.animateValue * 255f).toInt()
-
-            // 绘制播放按钮
-            playDrawable?.let {
-                it.alpha = alpha
-                it.draw(canvas)
-            }
-
-            // 绘制时间线
-            timePaint.color = timelineColor
-            timePaint.alpha = alpha
-            canvas.drawLine(
-                timeTextWidth.toFloat(), centerY,
-                (width - timeTextWidth).toFloat(), centerY, timePaint
-            )
-
-            // 绘制当前时间
-            val timeText = formatTime(lyricEntryList[currentCenterLine].time)
-            val timeX = width - timeTextWidth.toFloat() / 2
-            val timeY = centerY - (timeFontMetrics!!.descent + timeFontMetrics!!.ascent) / 2
-            timePaint.color = timeTextColor
-            timePaint.alpha = alpha
-            canvas.drawText(timeText, timeX, timeY, timePaint)
-        }
-
-        canvas.translate(0f, mViewPortOffset)
-
-        var yOffset = 0f
-        var yMinOffset = 0f
-        var yMaxOffset = 0f
-        var scaleValue: Float
-        var progress: Float
-        var radius: Int
-        var calcHeightOnly: Boolean
-
-        for (i in lyricEntryList.indices) {
-            // 根据上一项所计算得到的offset值，判断当前元素是否在需要绘制的区间，如果不在，则只需要计算高度不进行绘制相关计算
-            calcHeightOnly = getOffset(i - 1) !in (mViewPortOffset - height)..(mViewPortOffset + height)
-            progressKeeper.updateTargetValue(i, if (currentLine == i) animateProgress else 0f)
-            progress = progressKeeper.getValueByIndex(i)
-            scaleValue = 1f
-            radius = 0
-
-            if (!calcHeightOnly) {
-                when {
-                    // 当前行动画未结束
-                    progress > 0f -> {
-                        scaleValue = calcScaleValue(currentTextSize, normalTextSize, progress)
-                        lyricPaint.color = lerpColor(normalTextColor, currentTextColor, progress.coerceIn(0f, 1f))
-                    }
-
-                    isShowTimeline.value && i == currentCenterLine -> {
-                        lyricPaint.color = timelineTextColor
-                    }
-
-                    else -> {
-                        lyricPaint.color = normalTextColor
-                    }
-                }
-                lyricPaint.textSize = normalTextSize
-                secondLyricPaint.textSize = lyricPaint.textSize * translateTextScaleValue
-                secondLyricPaint.color = lyricPaint.color
-
-                if (isEnableBlurEffect.value || isEnableBlurEffect.animateValue > 0f) {
-                    radius = when (i) {
-                        currentCenterLine -> 0
-                        currentCenterLine + 1 -> 3
-                        currentCenterLine + 2, currentCenterLine - 1 -> 7
-                        currentCenterLine + 3, currentCenterLine - 2 -> 11
-                        currentCenterLine + 4, currentCenterLine - 3 -> 20
-                        else -> 20
-                    }
-                    blurProgressKeeper.updateTargetValue(i, radius.toFloat())
-                    radius = blurProgressKeeper.getValueByIndex(i).toInt()
-                    radius = (radius * isEnableBlurEffect.animateValue).toInt()
-                }
-            }
-
-            val itemHeight = drawLyricEntry(
-                canvas = canvas,
-                entry = lyricEntryList[i],
-                calcHeightOnly = calcHeightOnly,
-                yOffset = yOffset,
-                scaleValue = scaleValue,
-                blurRadius = radius,
-            ) { minHeight, maxHeight ->
-                minOffsetKeeper[i] = yMinOffset + calcOffsetOfItem(minHeight, sentenceDividerHeight)
-                yMinOffset += minHeight
-
-                maxOffsetKeeper[i] = yMaxOffset + calcOffsetOfItem(maxHeight, sentenceDividerHeight)
-                yMaxOffset += maxHeight
-            }
-            heightKeeper[i] = itemHeight
-            offsetKeeper[i] = yOffset + calcOffsetOfItem(itemHeight, sentenceDividerHeight)
-            yOffset += itemHeight
-        }
-        return super.onDoDraw(canvas)
-    }
-
-    /**
-     * 画一组歌词语句
-     *
-     * @param calcHeightOnly    是否只计算高度
-     * @param yOffset           歌词中心 Y 坐标
-     * @param scaleValue        缩放比例
-     * @param blurRadius        模糊半径
-     *
-     * @return 该组歌词的实际绘制高度
-     */
-    private fun drawLyricEntry(
-        canvas: Canvas,
-        entry: LyricEntry,
-        calcHeightOnly: Boolean,
-        yOffset: Float,
-        scaleValue: Float,
-        blurRadius: Int,
-        callback: (minHeight: Float, maxHeight: Float) -> Unit = { _, _ -> }
-    ): Float {
-        var tempHeight = 0f
-        var minTempHeight = 0f
-        var maxTempHeight = 0f
-
-        entry.staticLayout?.let {
-            tempHeight += drawText(
-                canvas = canvas,
-                staticLayout = it,
-                calcHeightOnly = calcHeightOnly,
-                yOffset = yOffset,
-                yClipPercentage = 1f,
-                scale = scaleValue,
-                blurRadius = blurRadius
-            )
-            minTempHeight = tempHeight
-            maxTempHeight = tempHeight
-
-            entry.secondStaticLayout?.let { second ->
-                tempHeight += translateDividerHeight * isDrawTranslationValue
-                maxTempHeight += translateDividerHeight
-
-                tempHeight += drawText(
-                    canvas = canvas,
-                    staticLayout = second,
-                    calcHeightOnly = calcHeightOnly,
-                    yOffset = yOffset + tempHeight,
-                    yClipPercentage = isDrawTranslationValue,
-                    alpha = isDrawTranslationValue,
-                    scale = scaleValue,
-                    blurRadius = blurRadius
-                ) { _, max ->
-                    maxTempHeight += max
-                }
-            }
-            tempHeight += sentenceDividerHeight
-            minTempHeight += sentenceDividerHeight
-            maxTempHeight += sentenceDividerHeight
-        }
-        callback(minTempHeight, maxTempHeight)
-        return tempHeight
-    }
-
-    /**
-     * 画一行歌词
-     *
-     * @param calcHeightOnly    是否只计算高度
-     * @param yOffset           歌词中心 Y 坐标
-     * @param yClipPercentage   垂直裁剪比例
-     * @param scale             缩放比例
-     * @param alpha             透明度
-     * @param blurRadius        模糊半径 实现类似AppleMusic的歌词语句的模糊效果
-     *
-     * @return 实际绘制高度
-     */
-    private fun drawText(
-        canvas: Canvas,
-        staticLayout: StaticLayout,
-        calcHeightOnly: Boolean = false,
-        yOffset: Float,
-        @FloatRange(from = 0.0, to = 1.0)
-        yClipPercentage: Float = 1f,
-        scale: Float = 1f,
-        alpha: Float = 1f,
-        blurRadius: Int = 0,
-        callback: (minHeight: Float, maxHeight: Float) -> Unit = { _, _ -> }
-    ): Float {
-        if (staticLayout.lineCount == 0) {
-            callback(0f, 0f)
-            return 0f
-        }
-        if (calcHeightOnly) {
-            callback(0f, staticLayout.height.toFloat())
-            return staticLayout.height * yClipPercentage
-        }
-        val lineHeight = staticLayout.height.toFloat() / staticLayout.lineCount.toFloat()
-
-        var yTemp = 0f                  // y轴临时偏移量
-        var pivotYTemp: Float           // 缩放中心Y坐标
-        var itemActualHeight: Float     // 单行实际绘制高度
-        var actualHeight = 0f           // 实际绘制高度
-
-        staticLayout.paint.alpha = (alpha * 255f).toInt()
-        staticLayout.paint.maskFilter = blurMaskFilterExt.get(blurRadius)
-
-        /**
-         * 由于对StaticLayout整个缩放会使其中间的行间距也被缩放(通过TextPaint的textSize缩放则不会)，
-         * 导致其真实渲染高度大于StaticLayout的height属性的值，同时也没有其他的接口能实现相同的缩放效果(对TextSize缩放会显得卡卡的)
-         *
-         * 所以通过Canvas的clipRect，来分别对StaticLayout的每一行文字进行缩放和绘制(StaticLayout的各行高度是一致的)
-         */
-        repeat(staticLayout.lineCount) {
-            itemActualHeight = lineHeight * yClipPercentage
-            pivotYTemp = yTemp + itemActualHeight - staticLayout.paint.descent()  // TextPaint修改textSize所实现的缩放效果应该就是descent线上的缩放(感觉效果差不多)
-
-            canvas.save()
-            canvas.translate(lrcPadding, yOffset)
-            canvas.clipRect(-lrcPadding, yTemp, staticLayout.width.toFloat() + lrcPadding, yTemp + itemActualHeight)
-
-            // 根据文字的gravity设置缩放基点坐标
-            when (textGravity) {
-                GRAVITY_LEFT -> canvas.scale(scale, scale, 0f, pivotYTemp)
-                GRAVITY_RIGHT -> {
-                    canvas.scale(scale, scale, staticLayout.width.toFloat(), pivotYTemp)
-                }
-
-                GRAVITY_CENTER -> {
-                    canvas.scale(scale, scale, staticLayout.width / 2f, pivotYTemp)
-                }
-            }
-            staticLayout.draw(canvas)
-            canvas.restore()
-            yTemp += itemActualHeight
-            actualHeight += itemActualHeight
-        }
-        callback(0f, staticLayout.height.toFloat())
-        return actualHeight
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    override fun onTouchEvent(event: MotionEvent): Boolean {
-        if (event.action == MotionEvent.ACTION_UP || event.action == MotionEvent.ACTION_CANCEL) {
-            isTouching = false
-            if (hasLrc() && !isFling) {
-                // TODO 应该为Timeline独立设置一个Enable开关, 这样就可以不需要等待Timeline消失
-                postDelayed(hideTimelineRunnable, TIMELINE_KEEP_TIME)
-            }
-        }
-        return gestureDetector!!.onTouchEvent(event)
-    }
-
-    /**
-     * 手势监听器
-     */
-    private val mSimpleOnGestureListener: SimpleOnGestureListener =
-        object : SimpleOnGestureListener() {
-
-            override fun onDown(e: MotionEvent): Boolean {
-                // 有歌词并且设置了 mOnPlayClickListener
-                if (hasLrc() && onPlayClickListener != null) {
-                    scroller!!.forceFinished(true)
-                    removeCallbacks(hideTimelineRunnable)
-                    isTouching = true
-                    invalidate()
-                    return true
-                }
-                return super.onDown(e)
-            }
-
-            override fun onScroll(
-                e1: MotionEvent,
-                e2: MotionEvent,
-                distanceX: Float,
-                distanceY: Float
-            ): Boolean {
-                if (hasLrc()) {
-                    // 如果没显示 Timeline 的时候，distanceY 一段距离后再显示时间线
-                    if (!isShowTimeline.value && abs(distanceY) >= 10) {
-                        // 滚动显示时间线
-                        isShowTimeline.value = true
-                    }
-                    mViewPortOffset += -distanceY
-                    mViewPortOffset.coerceIn(getOffset(lyricEntryList.size - 1), getOffset(0))
-                    invalidate()
-                    return true
-                }
-                return super.onScroll(e1, e2, distanceX, distanceY)
-            }
-
-            override fun onFling(
-                e1: MotionEvent,
-                e2: MotionEvent,
-                velocityX: Float,
-                velocityY: Float
-            ): Boolean {
-                if (hasLrc()) {
-                    scroller!!.fling(
-                        0, mViewPortOffset.toInt(), 0,
-                        velocityY.toInt(), 0, 0,
-                        getOffset(lyricEntryList.size - 1).toInt(),
-                        getOffset(0).toInt()
-                    )
-                    isFling = true
-                    return true
-                }
-                return super.onFling(e1, e2, velocityX, velocityY)
-            }
-
-            override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
-                if (!hasLrc() || !isShowTimeline.value || !e.insideOf(playDrawable?.bounds)) {
-                    onSingerClickListener?.onClick()
-                    return super.onSingleTapConfirmed(e)
-                }
-
-                val centerLine = centerLine
-                val centerLineTime = lyricEntryList[centerLine].time
-                // onPlayClick 消费了才更新 UI
-                if (onPlayClickListener?.onPlayClick(centerLineTime) == true) {
-                    isShowTimeline.value = false
-                    removeCallbacks(hideTimelineRunnable)
-                    smoothScrollTo(centerLine)
-                    invalidate()
-                    return true
-                }
-                return super.onSingleTapConfirmed(e)
-            }
-        }
-
-    private val hideTimelineRunnable = Runnable {
-        if (hasLrc() && isShowTimeline.value) {
-            isShowTimeline.value = false
-            smoothScrollTo(currentLine)
-        }
-    }
-
-    override fun computeScroll() {
-        if (scroller!!.computeScrollOffset()) {
-            mViewPortOffset = scroller!!.currY.toFloat()
-            invalidate()
-        }
-        if (isFling && scroller!!.isFinished) {
-            isFling = false
-            if (hasLrc() && !isTouching) {
-                adjustCenter()
-                postDelayed(hideTimelineRunnable, TIMELINE_KEEP_TIME)
-            }
-        }
-    }
-
-    override fun onDetachedFromWindow() {
-        removeCallbacks(hideTimelineRunnable)
-        super.onDetachedFromWindow()
-    }
-
-    private fun onLrcLoaded(entryList: List<LyricEntry>?) {
-        if (!entryList.isNullOrEmpty()) {
-            lyricEntryList.addAll(entryList)
-        }
-        lyricEntryList.sort()
-        initEntryList()
-        invalidate()
-    }
-
-    private fun initPlayDrawable() {
-        val l = (timeTextWidth - drawableWidth) / 2
-        val t = startOffset.toInt() - drawableWidth / 2
-        val r = l + drawableWidth
-        val b = t + drawableWidth
-        playDrawable!!.setBounds(l, t, r, b)
-    }
-
-    private fun initEntryList() {
-        if (!hasLrc() || width == 0) {
-            return
-        }
-        /**
-         * StaticLayout 根据初始化时传入的 TextSize 计算换行的位置
-         * 如果 [currentTextSize] 与 [normalTextSize] 相差较大，
-         * 则会导致歌词渲染时溢出边界，或行间距不足挤压在一起
-         *
-         * 故计算出可能的最大 TextSize 以后，用其初始化，使 StaticLayout 拥有足够的高度
-         */
-        lyricPaint.textSize = max(currentTextSize, normalTextSize)
-        secondLyricPaint.textSize = lyricPaint.textSize * translateTextScaleValue
-        for (lrcEntry in lyricEntryList) {
-            lrcEntry.init(
-                lyricPaint, secondLyricPaint,
-                lrcWidth.toInt(), textGravity.toLayoutAlign()
-            )
-        }
-        mCurrentOffset = startOffset
-        mViewPortOffset = startOffset
-    }
-
-    private fun reset() {
-        // TODO 待完善reset的逻辑
-        scroller!!.forceFinished(true)
-        isShowTimeline.value = false
-        isTouching = false
-        isFling = false
-        removeCallbacks(hideTimelineRunnable)
-        lyricEntryList.clear()
-        mCurrentOffset = 0f
-        mViewPortOffset = 0f
-        currentLine = 0
-        invalidate()
-    }
-
-    /**
-     * 将中心行微调至正中心
-     */
-    private fun adjustCenter() {
-        smoothScrollTo(currentLine)
-    }
-
-    /**
-     * 平滑滚动过渡到某一行
-     *
-     * @param line 行号
-     */
-    private fun smoothScrollTo(line: Int) {
-        val offset = getOffset(line)
-        animateStartOffset = mCurrentOffset
-        animateTargetOffset = offset
-        progressSpringAnimator.animateToFinalPosition(offset)
-    }
-
-    /**
-     * 二分法查找当前时间应该显示的行数（最后一个 <= time 的行数）
-     */
-    private fun findShowLine(time: Long): Int {
-        var left = 0
-        var right = lyricEntryList.size
-        while (left <= right) {
-            val middle = (left + right) / 2
-            val middleTime = lyricEntryList[middle].time
-            if (time < middleTime) {
-                right = middle - 1
-            } else {
-                if (middle + 1 >= lyricEntryList.size || time < lyricEntryList[middle + 1].time) {
-                    return middle
-                }
-                left = middle + 1
-            }
-        }
-        return 0
-    }
-
-    /**
-     * 计算单个歌词元素的偏移量，用于控制歌词对其中线的位置
-     *
-     * 计算出来的歌词高度包含了分割线的高度，所以需要减去分割线的高度
-     *
-     * @param itemHeight        歌词元素的高度
-     * @param dividerHeight     分割线的高度
-     *
-     * @return 歌词元素的偏移量
-     */
-    protected open fun calcOffsetOfItem(itemHeight: Float, dividerHeight: Float): Float {
-        return (itemHeight - dividerHeight) * itemOffsetPercent
-    }
-
-    /**
-     * 因为添加了 [translateDividerHeight] 用来间隔开歌词与翻译，
-     * 所以直接从 [LyricEntry] 获取高度不可行，
-     * 故使用该 [getLyricHeight] 方法来计算 [LyricEntry] 的高度
-     */
-    @Deprecated("不再单独计算歌词的高度，在绘制时计算并进行更新缓存，所见即所得")
-    open fun getLyricHeight(line: Int): Int {
-        var height = lyricEntryList[line].staticLayout?.height ?: return 0
-        lyricEntryList[line].secondStaticLayout?.height?.let {
-            height += (it + translateDividerHeight).toInt()
-        }
-        return height
-    }
-
-    /**
-     * 获取歌词距离视图顶部的距离
-     */
-    private fun getOffset(line: Int): Float {
-        return startOffset - (offsetKeeper[line] ?: 0f)
-    }
-
-    private fun getMinOffset(line: Int): Float {
-        return startOffset - (minOffsetKeeper[line] ?: 0f)
-    }
-
-    private fun getMaxOffset(line: Int): Float {
-        return startOffset - (maxOffsetKeeper[line] ?: 0f)
-    }
-
-    /**
-     * 在主线程中运行
-     */
-    private fun runOnMain(r: Runnable) {
-        if (Looper.myLooper() == Looper.getMainLooper()) {
-            r.run()
-        } else {
-            post(r)
-        }
-    }
-
-    /**
-     * 以下是公共部分
-     * 用法见接口 [LyricViewXInterface]
-     */
-
-    override fun setSentenceDividerHeight(height: Float) {
-        sentenceDividerHeight = height
-        if (hasLrc()) {
-            smoothScrollTo(currentLine)
-        }
-        postInvalidate()
-    }
-
-    override fun setTranslateDividerHeight(height: Float) {
-        translateDividerHeight = height
-        if (hasLrc()) {
-            smoothScrollTo(currentLine)
-        }
-        postInvalidate()
-    }
-
-    override fun setHorizontalOffset(offset: Float) {
-        horizontalOffset = offset
-        initPlayDrawable()
-        postInvalidate()
-    }
-
-    override fun setHorizontalOffsetPercent(percent: Float) {
-        horizontalOffsetPercent = percent
-        initPlayDrawable()
-        postInvalidate()
-    }
-
-    override fun setTranslateTextScaleValue(scaleValue: Float) {
-        translateTextScaleValue = scaleValue
-        initEntryList()
-        if (hasLrc()) {
-            smoothScrollTo(currentLine)
-        }
-    }
-
-    override fun setTextGravity(gravity: Int) {
-        textGravity = gravity
-        initEntryList()
-        if (hasLrc()) {
-            smoothScrollTo(currentLine)
-        }
-    }
-
-    override fun setNormalColor(normalColor: Int) {
-        normalTextColor = normalColor
-        postInvalidate()
-    }
-
-    override fun setNormalTextSize(size: Float) {
-        normalTextSize = size
-        initEntryList()
-        if (hasLrc()) {
-            smoothScrollTo(currentLine)
-        }
-    }
-
-    override fun setCurrentTextSize(size: Float) {
-        currentTextSize = size
-        initEntryList()
-        if (hasLrc()) {
-            smoothScrollTo(currentLine)
-        }
-    }
-
-    override fun setCurrentColor(currentColor: Int) {
-        currentTextColor = currentColor
-        postInvalidate()
-    }
-
-    override fun setTimelineTextColor(timelineTextColor: Int) {
-        this.timelineTextColor = timelineTextColor
-        postInvalidate()
-    }
-
-    override fun setTimelineColor(timelineColor: Int) {
-        this.timelineColor = timelineColor
-        postInvalidate()
-    }
-
-    override fun setTimeTextColor(timeTextColor: Int) {
-        this.timeTextColor = timeTextColor
-        postInvalidate()
-    }
-
-    override fun setLabel(label: String) {
-        runOnMain {
-            defaultLabel = label
-            this@LyricViewX.invalidate()
-        }
-    }
-
-    override fun loadLyric(mainLyricText: String?, secondLyricText: String?) {
-        runOnMain {
-            reset()
-            val sb = StringBuilder("file://")
-            sb.append(mainLyricText)
-            if (secondLyricText != null) {
-                sb.append("#").append(secondLyricText)
-            }
-            val flag = sb.toString()
-            this@LyricViewX.flag = flag
-            thread {
-                val lrcEntries = LyricUtil.parseLrc(arrayOf(mainLyricText, secondLyricText))
-                runOnMain {
-                    if (flag === flag) {
-                        onLrcLoaded(lrcEntries)
-                        this@LyricViewX.flag = null
-                    }
-                }
-            }
-        }
-    }
-
-    override fun loadLyric(lyricEntries: List<LyricEntry>) {
-        runOnMain {
-            reset()
-            onLrcLoaded(lyricEntries)
-        }
-    }
-
-    override fun updateTime(time: Long, force: Boolean) {
-        // 将方法的执行延后至 View 创建完成后执行
-        readyHelper.whenReady {
-            if (!it) return@whenReady
-            if (hasLrc()) {
-                val line = findShowLine(time)
-                if (line != currentLine) {
-                    runOnMain {
-                        currentLine = line
-                        smoothScrollTo(line)
-                    }
-                }
-            }
-        }
-    }
-
-    override fun setDraggable(draggable: Boolean, onPlayClickListener: OnPlayClickListener?) {
-        this.onPlayClickListener = if (draggable) {
-            requireNotNull(onPlayClickListener) { "if draggable == true, onPlayClickListener must not be null" }
-            onPlayClickListener
-        } else {
-            null
-        }
-    }
-
-    override fun setOnSingerClickListener(onSingerClickListener: OnSingleClickListener?) {
-        this.onSingerClickListener = onSingerClickListener
-    }
-
-    override fun getLyricEntryList(): List<LyricEntry> {
-        return lyricEntryList.toList()
-    }
-
-    override fun setLyricEntryList(newList: List<LyricEntry>) {
-        reset()
-        onLrcLoaded(newList)
-        this@LyricViewX.flag = null
-    }
-
-    override fun getCurrentLineLyricEntry(): LyricEntry? {
-        if (currentLine <= lyricEntryList.lastIndex) {
-            return lyricEntryList[currentLine]
-        }
-        return null
-    }
-
-    override fun setLyricTypeface(file: File) {
-        val typeface = file.takeIf { it.exists() }
-            ?.runCatching { Typeface.createFromFile(this) }
-            ?.getOrNull() ?: return
-
-        setLyricTypeface(typeface)
-    }
-
-    override fun setLyricTypeface(path: String) {
-        setLyricTypeface(File(path))
-    }
-
-    override fun setLyricTypeface(typeface: Typeface?) {
-        lyricPaint.typeface = typeface
-        secondLyricPaint.typeface = typeface
-        postInvalidate()
-    }
-
-    override fun setDampingRatioForLyric(dampingRatio: Float) {
-        dampingRatioForLyric = dampingRatio
-        progressSpringAnimator.spring.dampingRatio = dampingRatio
-    }
-
-    override fun setDampingRatioForViewPort(dampingRatio: Float) {
-        dampingRatioForViewPort = dampingRatio
-        viewPortSpringAnimator.spring.dampingRatio = dampingRatio
-    }
-
-    override fun setStiffnessForLyric(stiffness: Float) {
-        stiffnessForLyric = stiffness
-        progressSpringAnimator.spring.stiffness = stiffness
-    }
-
-    override fun setStiffnessForViewPort(stiffness: Float) {
-        stiffnessForViewPort = stiffness
-        viewPortSpringAnimator.spring.stiffness = stiffness
-    }
-
-    override fun setPlayDrawable(drawable: Drawable) {
-        playDrawable = drawable
-    }
-
-    override fun setIsDrawTranslation(isDrawTranslation: Boolean) {
-        this.isDrawTranslation = isDrawTranslation
-        postInvalidate()
-    }
-
-    override fun setIsEnableBlurEffect(isEnableBlurEffect: Boolean) {
-        this.isEnableBlurEffect.value = isEnableBlurEffect
-        postInvalidate()
-    }
-
-    override fun setItemOffsetPercent(itemOffsetPercent: Float) {
-        this.itemOffsetPercent = itemOffsetPercent
-        postInvalidate()
-    }
-
-    companion object {
-        // 时间线持续时间
-        private const val TIMELINE_KEEP_TIME = 3 * DateUtils.SECOND_IN_MILLIS
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/dirror/lyricviewx/ReadyHelper.kt b/app/src/main/java/com/dirror/lyricviewx/ReadyHelper.kt
deleted file mode 100644
index 9b81331..0000000
--- a/app/src/main/java/com/dirror/lyricviewx/ReadyHelper.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.dirror.lyricviewx
-
-import androidx.annotation.IntDef
-
-const val STATE_CREATED = 1
-const val STATE_INITIALIZING = 2
-const val STATE_INITIALIZED = 3
-const val STATE_ERROR = 4
-
-@IntDef(
-    STATE_CREATED,
-    STATE_INITIALIZING,
-    STATE_INITIALIZED,
-    STATE_ERROR
-)
-@Retention(AnnotationRetention.SOURCE)
-annotation class ReadyState
-
-/**
- * 简单的状态机，根据 [readyState] 的状态决定当前任务的执行或延后与否
- */
-open class ReadyHelper {
-    private var readyCallback: (Boolean) -> Unit = {}
-
-    @ReadyState
-    var readyState: Int = STATE_CREATED
-        set(value) {
-            if (field == value) return
-            when (value) {
-                STATE_INITIALIZED,
-                STATE_ERROR -> synchronized(readyCallback) {
-                    field = value
-                    readyCallback.invoke(value != STATE_ERROR)
-                }
-                else -> field = value
-            }
-        }
-
-    fun whenReady(performAction: (Boolean) -> Unit): Boolean {
-        return when (readyState) {
-            STATE_CREATED, STATE_INITIALIZING -> {
-                readyCallback = performAction
-                false
-            }
-            else -> {
-                performAction(readyState != STATE_ERROR)
-                true
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/dirror/lyricviewx/extension/BlurMaskFilterExt.kt b/app/src/main/java/com/dirror/lyricviewx/extension/BlurMaskFilterExt.kt
deleted file mode 100644
index f5a8558..0000000
--- a/app/src/main/java/com/dirror/lyricviewx/extension/BlurMaskFilterExt.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.dirror.lyricviewx.extension
-
-import android.graphics.BlurMaskFilter
-import android.util.SparseArray
-
-class BlurMaskFilterExt {
-    private val maskFilterCache = SparseArray<BlurMaskFilter>()
-
-    fun get(radius: Int): BlurMaskFilter? {
-        if (radius == 0 || radius > 25) return null
-
-        return maskFilterCache[radius] ?: BlurMaskFilter(radius.toFloat(), BlurMaskFilter.Blur.NORMAL)
-            .also { maskFilterCache.put(radius, it) }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/muqingbfq/MediaPlayer.java b/app/src/main/java/com/muqingbfq/MediaPlayer.java
index 70ed7e1..4688511 100644
--- a/app/src/main/java/com/muqingbfq/MediaPlayer.java
+++ b/app/src/main/java/com/muqingbfq/MediaPlayer.java
@@ -1,115 +1,156 @@
 package com.muqingbfq;
 
+import static com.muqingbfq.bfqkz.xm;
+
 import android.annotation.SuppressLint;
 import android.graphics.Bitmap;
-import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.media3.common.MediaItem;
+import androidx.media3.common.PlaybackException;
+import androidx.media3.common.Player;
+import androidx.media3.exoplayer.ExoPlayer;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.GlideException;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.target.Target;
-import com.muqingbfq.api.url;
+import com.muqingbfq.fragment.Media;
 import com.muqingbfq.fragment.bfq_db;
-import com.muqingbfq.fragment.mp3;
+import com.muqingbfq.mq.gj;
 
-import java.io.IOException;
-import java.util.Timer;
-import java.util.TimerTask;
+public class MediaPlayer {
+    public ExoPlayer build;
+    // 每秒更新一次进度
+    public Runnable updateSeekBar = new Runnable() {
+        @Override
+        public void run() {
+            if (build != null && build.isPlaying() && Media.getlrcView() != null) {
+                long position = build.getCurrentPosition();
+                Media.setProgress((int) position);
+            }
+            main.handler.postDelayed(this, 1000); // 每秒更新一次进度
+        }
+    };
 
-public class MediaPlayer extends android.media.MediaPlayer {
+    @SuppressLint("UnsafeOptInUsageError")
     public MediaPlayer() {
-        this.setOnCompletionListener(mediaPlayer -> {
-/*            if (!home.db.view.isShown()) {
-                home.db.view.setVisibility(View.VISIBLE);
-            }*/
-            int i = bfqkz.getmti(bfqkz.ms);
-            bfqkz.xm = bfqkz.list.get(i);
-            new Thread() {
-                @Override
-                public void run() {
-                    super.run();
-                    bfqkz.mp3(url.hq(bfqkz.xm));
-                }
-            }.start();
-        });
-        this.setOnErrorListener((mediaPlayer, i, i1) -> {
-            bfqkz.list.remove(bfqkz.xm);
-            return false;
-        });
-        resumeTimer();
-    }
-
-    @Override
-    public void pause() throws IllegalStateException {
-        if (isPlaying()) {
-            super.pause();
-            //暂停
-            if (bfq.kg != null) {
-                bfq.kg.setImageResource(R.drawable.zt);
-            }
-            bfq_db.txa.setImageResource(R.drawable.zt);
-            bfqkz.updateNotification();
-        }
-    }
-
-    public Timer timer;
-    public TimerTask timerTask;
-    public void pauseTimer() {
-        if (timer != null) {
-            timer.cancel();
-        }
-    }
-    public void resumeTimer() {
-        timer = new Timer();//定时器
-        timerTask = new TimerTask() {
+        build = new ExoPlayer.Builder(home.appCompatActivity).build();
+        build.addListener(new Player.Listener() {
             @Override
-            public void run() {
-                if (bfqkz.mt.isPlaying() && bfq.getVisibility()) {
-                    int currentPosition = bfqkz.mt.getCurrentPosition();
-                    bfq.tdt.setProgress(currentPosition);
-                    bfq.lrcView.updateTime(currentPosition, true);
+            public void onPlaybackStateChanged(@Player.State int state) {
+                switch (state) {
+                    case Player.STATE_READY:
+                        bfui();
+                        break;
+
+                    case Player.STATE_ENDED:
+                        int i = bfqkz.getmti(bfqkz.ms);
+                        bfqkz.xm = bfqkz.list.get(i);
+                        new Thread() {
+                            @Override
+                            public void run() {
+                                super.run();
+                                bfqkz.mp3(com.muqingbfq.api.
+                                        url.hq(bfqkz.xm));
+                            }
+                        }.start();
+                        break;
+
+                    case Player.STATE_BUFFERING:
+                    case Player.STATE_IDLE:
+                        break;
                 }
+                if (Media.view != null) {
+                    main.handler.removeCallbacks(updateSeekBar); // 在播放开始时启动更新进度
+                    long duration = build.getDuration();
+                    Media.setMax((int) build.getDuration());
+                    Media.setTime_a(bfq_an.getTime(duration));
+                    long position = build.getCurrentPosition();
+                    Media.setProgress((int) position);
+                    main.handler.post(updateSeekBar); // 在播放开始时启动更新进度
+                }
+                // 在这里将进度更新到UI上
             }
-        };
-        timer.scheduleAtFixedRate(timerTask, 0, 500);
+
+
+            @Override
+            public void onPlayerError(@NonNull PlaybackException error) {
+                gj.sc(error);
+                bfqkz.list.remove(bfqkz.xm);
+                Player.Listener.super.onPlayerError(error);
+                int i = bfqkz.getmti(bfqkz.ms);
+                bfqkz.xm = bfqkz.list.get(i);
+                new Thread() {
+                    @Override
+                    public void run() {
+                        super.run();
+                        bfqkz.mp3(com.muqingbfq.api.
+                                url.hq(bfqkz.xm));
+                    }
+                }.start();
+            }
+
+            @Override
+            public void onIsPlayingChanged(boolean isPlaying) {
+                Media.setbf(isPlaying);
+            }
+        });
     }
 
-    @Override
-    public void start() throws IllegalStateException {
-        super.start();
+    public void pause(){
+        if (build.isPlaying()) {
+            build.pause();
+        }
+    }
+
+    public void start(){
         if (bfqkz.xm == null) {
-            bfq_an.xyq();
+            if (bfqkz.list != null && bfqkz.list.size() > 0) {
+                bfq_an.xyq();
+            }
             return;
         }
-        //开始
-        if (bfq.kg != null) {
-            bfq.kg.setImageResource(R.drawable.bf);
-        }
-        bfq_db.txa.setImageResource(R.drawable.bf);
-        bfqkz.updateNotification();
+        build.play();
     }
 
     @SuppressLint("NotifyDataSetChanged")
-    @Override
-    public void setDataSource(String path) throws IOException, IllegalArgumentException, IllegalStateException, SecurityException {
-        super.setDataSource(path);
-        prepare();
-        bfqkz.tdt_max = getDuration();
-        bfqkz.tdt_wz = getCurrentPosition();
+    public void setDataSource(String path) {
+        MediaItem mediaItem = MediaItem.fromUri(path);
+        main.handler.post(() -> {
+            build.setMediaItem(mediaItem);
+            build.prepare();
+            build.setPlayWhenReady(true);
+            start();
+        });
+    }
+
+    public boolean isPlaying() {
+        if (build == null) {
+            return false;
+        }
+        return build.isPlaying();
+    }
+
+    public void seekTo(long a) {
+        build.seekTo(a);
+    }
+
+    @SuppressLint("NotifyDataSetChanged")
+    private void bfui() {
         Glide.with(home.appCompatActivity)
                 .asBitmap()
                 .load(bfqkz.xm.picurl)
-                .addListener(new RequestListener<Bitmap>() {
+                .listener(new RequestListener<Bitmap>() {
                     @Override
                     public boolean onLoadFailed(@Nullable GlideException e, Object model,
                                                 @NonNull Target<Bitmap> target, boolean isFirstResource) {
                         bfqkz.notify.setBitmap(null);
                         return false;
                     }
+
                     @Override
                     public boolean onResourceReady(@NonNull Bitmap bitmap, @NonNull Object model, Target<Bitmap> target,
                                                    @NonNull DataSource dataSource, boolean isFirstResource) {
@@ -118,21 +159,23 @@ public class MediaPlayer extends android.media.MediaPlayer {
                     }
                 })
                 .submit();
-        start();
-        main.handler.post(() -> {
-            if (bfq.name != null) {
-                bfq.tdt.setMax((int) bfqkz.tdt_max);
-                bfq.tdt.setProgress((int) bfqkz.tdt_wz);
-                bfq.time_a.setText(bfq_an.getTime(bfqkz.tdt_max));
-                bfq.name.setText(bfqkz.xm.name);
-                bfq.zz.setText(bfqkz.xm.zz);
-                bfq_an.islike(bfq.like.getContext());
-            }
-            bfq_db.name.setText(bfqkz.xm.name);
-            bfq_db.zz.setText(bfqkz.xm.zz);
-            if (mp3.lbspq != null) {
-                mp3.lbspq.notifyDataSetChanged();
-            }
-        });
+        String name = xm.name, zz = bfqkz.xm.zz;
+        if (Media.view != null) {
+            Media.setProgress(0);
+            Media.setname(name);
+            Media.setzz(zz);
+            bfq_an.islike(Media.view.getContext());
+        }
+        bfq_db.setname(name);
+        bfq_db.setzz(zz);
+        if (bfqkz.notify.notificationManager != null) {
+            bfqkz.notify.notificationBuilder.setContentTitle(name);
+            bfqkz.notify.notificationBuilder.setContentText(zz);
+            bfqkz.notify.notificationManager_notify();
+
+        }
+        if (com.muqingbfq.fragment.mp3.lbspq != null) {
+            com.muqingbfq.fragment.mp3.lbspq.notifyDataSetChanged();
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/muqingbfq/MyButtonClickReceiver.java b/app/src/main/java/com/muqingbfq/MyButtonClickReceiver.java
index b8af591..4eca39d 100644
--- a/app/src/main/java/com/muqingbfq/MyButtonClickReceiver.java
+++ b/app/src/main/java/com/muqingbfq/MyButtonClickReceiver.java
@@ -6,11 +6,13 @@ import android.content.Context;
 import android.content.Intent;
 import android.view.KeyEvent;
 
+import com.muqingbfq.mq.gj;
+
 import java.util.Timer;
 import java.util.TimerTask;
 
 public class MyButtonClickReceiver extends BroadcastReceiver {
-    private Timer timer = new Timer();
+    private final Timer timer = new Timer();
     private static int clickCount;
 
     public MyButtonClickReceiver() {
@@ -130,8 +132,11 @@ public class MyButtonClickReceiver extends BroadcastReceiver {
      * 对蓝牙  播放-暂停
      */
     public static void playOrPause() {
-//        gj.sc(isMusicServiceBound);
-            // 播放/暂停按钮点击事件 if (isMusicServiceBound)
+        if (bfqkz.mt == null) {
+            return;
+        }
+        gj.sc(bfqkz.mt);
+//        gj.sc(isMusicServiceBound);播放/暂停按钮点击事件 if (isMusicServiceBound)
         if (bfqkz.mt.isPlaying()) {
             bfqkz.mt.pause();
         } else {
diff --git a/app/src/main/java/com/muqingbfq/activity_about_software.java b/app/src/main/java/com/muqingbfq/activity_about_software.java
index 6ada786..833c410 100644
--- a/app/src/main/java/com/muqingbfq/activity_about_software.java
+++ b/app/src/main/java/com/muqingbfq/activity_about_software.java
@@ -8,6 +8,9 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 
+import com.muqingbfq.mq.gj;
+import com.muqingbfq.mq.wj;
+
 public class activity_about_software extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -16,12 +19,28 @@ public class activity_about_software extends AppCompatActivity {
         Toolbar toolbar = findViewById(R.id.toolbar);
         try {
             String versionName = getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
-            toolbar.setSubtitle(versionName + " Base");
+            toolbar.setSubtitle(versionName + " Bate");
         } catch (PackageManager.NameNotFoundException e) {
             yc.start(this, e);
         }
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        findViewById(R.id.button1).setOnClickListener(view -> {
+            wj.sc(wj.filesdri + "gx.mq");
+            new Thread() {
+                @Override
+                public void run() {
+                    super.run();
+                    int jianchagengxin = gj.jianchagengxin(activity_about_software.this);
+                    if (jianchagengxin == 400) {
+                        gj.xcts(activity_about_software.this, "无网络");
+                    } else if (jianchagengxin == 0) {
+                        gj.xcts(activity_about_software.this, "已经是最新的客户端了");
+                    }
+                }
+            }.start();
+        });
     }
 
     @Override
diff --git a/app/src/main/java/com/muqingbfq/activity_search.java b/app/src/main/java/com/muqingbfq/activity_search.java
index bf7eb9b..ca9e0bb 100644
--- a/app/src/main/java/com/muqingbfq/activity_search.java
+++ b/app/src/main/java/com/muqingbfq/activity_search.java
@@ -3,6 +3,7 @@ package com.muqingbfq;
 import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.text.Editable;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -17,10 +18,12 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.flexbox.AlignItems;
+import com.google.android.flexbox.FlexDirection;
+import com.google.android.flexbox.FlexWrap;
+import com.google.android.flexbox.FlexboxLayoutManager;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.muqingbfq.fragment.search;
 import com.muqingbfq.mq.gj;
@@ -39,7 +42,7 @@ public class activity_search extends AppCompatActivity {
     private ArrayAdapter<String> adapter;
 
     private JSONObject json = new JSONObject();
-    private List<String> json_list = new ArrayList<>();
+    private final List<String> json_list = new ArrayList<>();
     private final List<String> list = new ArrayList<>();
     ListView listPopupWindow;
     public static AppCompatActivity appCompatActivity;
@@ -54,6 +57,13 @@ public class activity_search extends AppCompatActivity {
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         RecyclerView recyclerView = findViewById(R.id.list_recycler);
+        FlexboxLayoutManager manager = new FlexboxLayoutManager(this);
+        //设置主轴排列方式
+        manager.setFlexDirection(FlexDirection.ROW);
+        //设置是否换行
+        manager.setFlexWrap(FlexWrap.WRAP);
+        manager.setAlignItems(AlignItems.STRETCH);
+        recyclerView.setLayoutManager(manager);
         SearchRecordAdapter recordAdapter = new SearchRecordAdapter();
         recyclerView.setAdapter(recordAdapter);
 
@@ -62,7 +72,6 @@ public class activity_search extends AppCompatActivity {
             if (actionId == EditorInfo.IME_ACTION_SEARCH) {
                 String str = v.getText().toString();
                 if (!str.equals("")) {
-//                    退出activity并返回str数据
                     start(str);
                 }
             }
@@ -81,6 +90,7 @@ public class activity_search extends AppCompatActivity {
                 })
                 .show());
         listPopupWindow = findViewById(R.id.search_recycler);
+//历史记录的LayoutManager
 
         adapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, list);
         listPopupWindow.setAdapter(adapter);
@@ -98,11 +108,7 @@ public class activity_search extends AppCompatActivity {
             start(editText.getText().toString());
 
         });
-        editText.setOnFocusChangeListener((view, b) -> {
-            if (b) {
-                dismiss();
-            }
-        });
+        Object o = new Object();
         editText.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -110,47 +116,40 @@ public class activity_search extends AppCompatActivity {
 
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (TextUtils.isEmpty(s)){
+                    dismiss();
+                    return;
+                }
                 list.clear();
-                if (s.length() < 1) {
-                    list.clear();
-                    adapter.notifyDataSetChanged();
-                    editText.clearFocus();
-                    dismiss();
-                    return;
+                if (listPopupWindow.getVisibility() == View.GONE) {
+                    listPopupWindow.setVisibility(View.VISIBLE);
                 }
-                if (!editText.hasFocus()) {
-                    dismiss();
-                    return;
-                }
-                listPopupWindow.setVisibility(View.VISIBLE);
                 new Thread() {
                     @Override
                     public void run() {
-                        String hq = wl.hq("/search/suggest?keywords=" + s + "&type=mobile");
-                        try {
-                            JSONArray jsonArray = new JSONObject(hq).getJSONObject("result")
-                                    .getJSONArray("allMatch");
-                            int length = jsonArray.length();
-                            for (int i = 0; i < length; i++) {
-                                JSONObject jsonObject = jsonArray.getJSONObject(i);
-                                String keyword = jsonObject.getString("keyword");
-                                list.add(keyword);
+                        synchronized (o) {
+                            String hq = wl.hq("/search/suggest?keywords=" + s + "&type=mobile");
+                            try {
+                                JSONArray jsonArray = new JSONObject(hq).getJSONObject("result")
+                                        .getJSONArray("allMatch");
+                                int length = jsonArray.length();
+                                for (int i = 0; i < length; i++) {
+                                    JSONObject jsonObject = jsonArray.getJSONObject(i);
+                                    String keyword = jsonObject.getString("keyword");
+                                    list.add(keyword);
+                                }
+                                main.handler.post(() -> adapter.notifyDataSetChanged());
+                            } catch (Exception e) {
+                                gj.sc(e);
                             }
-                            main.handler.post(() -> adapter.notifyDataSetChanged());
-                        } catch (Exception e) {
-                            gj.ts(activity_search.this, e);
                         }
-                        super.run();
                     }
                 }.start();
             }
-
             @Override
             public void afterTextChanged(Editable s) {
             }
         });
-        fragmentManager = getSupportFragmentManager();
-        fragmentTransaction = fragmentManager.beginTransaction();
     }
 
     public void dismiss() {
@@ -159,6 +158,9 @@ public class activity_search extends AppCompatActivity {
 
     private void addSearchRecord(String name) {
         try {
+            if (!findViewById(R.id.xxbj1).isShown()) {
+                findViewById(R.id.xxbj1).setVisibility(View.VISIBLE);
+            }
             if (!json.has("list")) {
                 json.put("list", new JSONArray());
             }
@@ -171,7 +173,7 @@ public class activity_search extends AppCompatActivity {
                 adapter.notifyDataSetChanged();
             }
         } catch (JSONException e) {
-            e.printStackTrace();
+            gj.sc(e);
         }
     }
 
@@ -192,27 +194,14 @@ public class activity_search extends AppCompatActivity {
         return super.onOptionsItemSelected(item);
     }
 
-
-    FragmentManager fragmentManager;
-    FragmentTransaction fragmentTransaction;
-
-    com.muqingbfq.fragment.search search;
     public void start(String name) {
         dismiss();
-        if (name.equals("")) {
-            return;
-        }
-        if (search == null) {
-            search = new search(name);
-        }
-        if (!search.isVisible()) {
-            getSupportFragmentManager().beginTransaction()
-                    .add(R.id.search_fragment, search)
-                    .addToBackStack(null).commit();
-        } else {
+        if (!TextUtils.isEmpty(name)) {
+            search search = (com.muqingbfq.fragment.search) getSupportFragmentManager().
+                    findFragmentById(R.id.search_fragment);
             search.setStart(name);
+            addSearchRecord(name);
         }
-        addSearchRecord(name);
     }
 
     class SearchRecordAdapter extends RecyclerView.Adapter<SearchRecordAdapter.ViewHolder> {
@@ -239,7 +228,7 @@ public class activity_search extends AppCompatActivity {
         @NonNull
         @Override
         public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-            View view = View.inflate(parent.getContext(), android.R.layout.simple_list_item_1, null);
+            View view = View.inflate(parent.getContext(), R.layout.list_text, null);
             return new ViewHolder(view);
         }
 
@@ -263,8 +252,23 @@ public class activity_search extends AppCompatActivity {
 
             public ViewHolder(View itemView) {
                 super(itemView);
-                recordTextView = itemView.findViewById(android.R.id.text1);
+                recordTextView = itemView.findViewById(R.id.button);
             }
         }
     }
+
+    @Override
+    public void onBackPressed() {
+        end();
+    }
+
+    private void end() {
+        search search = (com.muqingbfq.fragment.search) getSupportFragmentManager().
+                findFragmentById(R.id.search_fragment);
+        if (search.getVisibility()) {
+            search.setVisibility(false);
+        } else {
+            finish();
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/muqingbfq/api/playlist.java b/app/src/main/java/com/muqingbfq/api/playlist.java
index b608ef5..bcc5ca1 100644
--- a/app/src/main/java/com/muqingbfq/api/playlist.java
+++ b/app/src/main/java/com/muqingbfq/api/playlist.java
@@ -2,7 +2,6 @@ package com.muqingbfq.api;
 
 import android.annotation.SuppressLint;
 
-import com.muqingbfq.bfqkz;
 import com.muqingbfq.fragment.gd;
 import com.muqingbfq.fragment.mp3;
 import com.muqingbfq.main;
@@ -19,13 +18,6 @@ import java.util.List;
 
 public class playlist extends Thread {
     public static final String api = "/playlist/track/all?id=";
-    private String uid;
-
-    public playlist(String uid) {
-        this.uid = uid;
-        start();
-    }
-
     @SuppressLint("NotifyDataSetChanged")
     public static boolean hq(List<xm> list, String uid) {
         list.clear();
@@ -102,23 +94,4 @@ public class playlist extends Thread {
             wj.sc(wj.mp3_xz);
         }
     }
-
-    @Override
-    public void run() {
-        super.run();
-/*        if (uid.equals(wj.mp3_xz)) {
-            playlist.hq_xz(mp3.list);
-        } else if (uid.equals(wj.mp3_like)) {
-            playlist.hq_like(mp3
-            .list);
-        } else {
-            playlist.hq(mp3.list, uid);
-        }
-        if (bfqkz.list == null || bfqkz.list.isEmpty()) {
-            int size = mp3.list.size();
-            for (int i = 0; i < size; i++) {
-                bfqkz.list.add(mp3.list.get(i));
-            }
-        }*/
-    }
 }
diff --git a/app/src/main/java/com/muqingbfq/api/resource.java b/app/src/main/java/com/muqingbfq/api/resource.java
index d87699d..c3cd0b7 100644
--- a/app/src/main/java/com/muqingbfq/api/resource.java
+++ b/app/src/main/java/com/muqingbfq/api/resource.java
@@ -1,5 +1,7 @@
 package com.muqingbfq.api;
 
+import android.text.TextUtils;
+
 import com.muqingbfq.R;
 import com.muqingbfq.main;
 import com.muqingbfq.start;
@@ -12,35 +14,28 @@ import org.json.JSONObject;
 
 import java.util.Iterator;
 import java.util.List;
+
 import com.muqingbfq.xm;
+
 public class resource {
 
     public static void recommend(List<xm> list) {
         String hq;
         JSONObject json;
         try {
-            if (wj.cz(wj.gd_json)&& start.time>System.currentTimeMillis()-3600000) {
+            hq = wl.hq("/recommend/resource?cookie=" + wl.Cookie);
+            if (TextUtils.isEmpty(hq) && wj.cz(wj.gd_json)) {
                 hq = wj.dqwb(wj.gd_json);
-                json = new JSONObject(hq);
-            } else {
-                hq = wl.hq("/recommend/resource?cookie="+wl.Cookie);
-                if (hq == null && wj.cz(wj.gd_json)) {
-                    hq = wj.dqwb(wj.gd_json);
-                    json = new JSONObject(hq);
-                }
-                json = new JSONObject(hq);
-                if (json.getInt("code") == 200) {
-                    wj.xrwb(wj.gd_json, hq);
-                    start.time = System.currentTimeMillis();
-                    main.edit.putLong(main.Time, start.time);
-                    main.edit.commit();
-                }
             }
-            JSONArray recommend = json.getJSONArray("recommend");
-            int length = recommend.length();
-            for (int i = 0; i < length; i++) {
-                JSONObject jsonObject = recommend.getJSONObject(i);
-                add(jsonObject, list);
+            json = new JSONObject(hq);
+            if (json.getInt("code") == 200) {
+                wj.xrwb(wj.gd_json, hq);
+                JSONArray recommend = json.getJSONArray("recommend");
+                int length = recommend.length();
+                for (int i = 0; i < length; i++) {
+                    JSONObject jsonObject = recommend.getJSONObject(i);
+                    add(jsonObject, list);
+                }
             }
         } catch (Exception e) {
             gj.sc("resource tuijian" + e);
diff --git a/app/src/main/java/com/muqingbfq/api/url.java b/app/src/main/java/com/muqingbfq/api/url.java
index 71344c8..16e0ab9 100644
--- a/app/src/main/java/com/muqingbfq/api/url.java
+++ b/app/src/main/java/com/muqingbfq/api/url.java
@@ -1,10 +1,6 @@
 package com.muqingbfq.api;
 
-import android.view.View;
-
-import com.muqingbfq.bfq;
-import com.muqingbfq.home;
-import com.muqingbfq.main;
+import com.muqingbfq.fragment.Media;
 import com.muqingbfq.mq.gj;
 import com.muqingbfq.mq.wj;
 import com.muqingbfq.mq.wl;
@@ -25,32 +21,29 @@ public class url extends Thread {
     }
 
     public static String hq(xm x) {
-        if (bfq.getVisibility() && bfq.lrcView != null && bfq.lrcView.getVisibility() == View.VISIBLE) {
+        if (Media.getlrcView() != null) {
             gc(x.id);
-        } else {
-            lrc = null;
         }
         try {
             if (wj.cz(wj.mp3 + x.id)) {
                 return wj.mp3 + x.id;
             }
             String level = "standard";
-            if (gj.isWiFiConnected()) {
+            boolean wiFiConnected = gj.isWiFiConnected();
+            if (wiFiConnected) {
                 level = "exhigh";
             }
             String hq = wl.hq(api + "?id=" + x.id + "&level=" +
                     level + "&cookie=" + wl.Cookie);
-            gj.sc(hq);
             if (hq == null) {
                 return null;
             }
             JSONObject json = new JSONObject(hq);
             JSONArray data = json.getJSONArray("data");
             JSONObject jsonObject = data.getJSONObject(0);
-
             String url = jsonObject.getString("url");
-            if (wl.xz(url, x)) {
-                url = wj.mp3 + x.id;
+            if (wiFiConnected) {
+                new wl.xz(url, x);
             }
             return url;
         } catch (JSONException e) {
@@ -66,24 +59,17 @@ public class url extends Thread {
     }
 
 
-    public static String lrc, tlyric;
-
     public static void gc(String id) {
-        lrc = null;
-        tlyric = null;
-        JSONObject jsonObject = new JSONObject();
+        String lrc = null, tlyric = null;
+        JSONObject jsonObject;
         try {
             jsonObject = new JSONObject(wl.hq("/lyric?id=" + id));
             lrc = jsonObject.getJSONObject("lrc").getString("lyric");
+            tlyric = jsonObject.getJSONObject("tlyric").getString("lyric");
         } catch (JSONException e) {
             gj.sc("url gc(int id) lrc: " + e);
         }
-        try {
-            tlyric = jsonObject.getJSONObject("tlyric").getString("lyric");
-        } catch (JSONException e) {
-            gj.sc("url gc(int id) tlyric: " + e);
-        }
-        bfq.lrcView.loadLyric(lrc, tlyric);
+        Media.loadLyric(lrc, tlyric);
     }
 
     public static String picurl(String id) {
diff --git a/app/src/main/java/com/muqingbfq/bfq.java b/app/src/main/java/com/muqingbfq/bfq.java
index 7fd4a50..f69cb2e 100644
--- a/app/src/main/java/com/muqingbfq/bfq.java
+++ b/app/src/main/java/com/muqingbfq/bfq.java
@@ -1,193 +1,51 @@
 package com.muqingbfq;
 
-import android.annotation.SuppressLint;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.SeekBar;
-import android.widget.TextView;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.content.ContextCompat;
-import androidx.fragment.app.Fragment;
 
-import com.bumptech.glide.Glide;
-
-import org.json.JSONObject;
+import com.muqingbfq.fragment.Media;
 
 public class bfq extends AppCompatActivity {
-    @SuppressLint("StaticFieldLeak")
-    public static SeekBar tdt;
-    @SuppressLint("StaticFieldLeak")
-    public static TextView name, zz, time_a, time_b;
-    @SuppressLint("StaticFieldLeak")
-    public static ImageView tx;
-    @SuppressLint("StaticFieldLeak")
-    public static ImageView kg, syq, xyq, like;
-    public static com.dirror.lyricviewx.LyricViewX lrcView;
-    @SuppressLint("ResourceType")
+    public static AppCompatActivity context;
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        FrameLayout frameLayout = new FrameLayout(this);
-        // 设置 FrameLayout 的布局参数（可以根据自己的需要进行设置）
-        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
-                FrameLayout.LayoutParams.MATCH_PARENT,   // 宽度为 Match Parent
-                FrameLayout.LayoutParams.MATCH_PARENT);  // 高度为 Match Parent
-        frameLayout.setLayoutParams(params);
-        frameLayout.setId(1);
-        setContentView(frameLayout);
-        getSupportFragmentManager().beginTransaction()
-                .add(frameLayout.getId(), new fragment(this))
-                .commit();
-/*        TypedValue typedValue = new TypedValue();
-        getTheme().resolveAttribute(android.R.attr.windowBackground, typedValue, true);
-        // 设置背景颜色
-        bj = typedValue.data;*/
+        context = this;
+        setContentView(R.layout.activity_bfq);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        toolbar.setNavigationIcon(R.drawable.end);
+        toolbar.setNavigationOnClickListener(view1 -> finish());
+        toolbar.inflateMenu(R.menu.bfq);
+        toolbar.setOnMenuItemClickListener(item -> {
+            if (item.getItemId() == R.id.fx) {
+                if (bfqkz.xm != null) {
+                    com.muqingbfq.mq.gj.fx(this,
+                            "音乐名称：" + bfqkz.xm.name +
+                                    "\n 作者：" + bfqkz.xm.zz +
+                                    "\n 链接：https://music.163.com/#/song?id=" + bfqkz.xm.id);
+                }
+            }
+            return false;
+        });
     }
-    @SuppressLint("StaticFieldLeak")
-    public static View inflate;
-    private static AppCompatActivity context;
     public static Bitmap bitmap;
-    public static class fragment extends Fragment {
-
-        public fragment(AppCompatActivity context) {
-            bfq.context = context;
-        }
-        @Override
-        public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-                                 @Nullable Bundle savedInstanceState) {
-            if (inflate != null) {
-                tx.setImageBitmap(bitmap);
-                return inflate;
-            }
-            inflate = inflater.inflate(R.layout.fragment_bfq, container, false);
-            lrcView = inflate.findViewById(R.id.gc);
-            lrcView.setVisibility(View.GONE);
-            Toolbar toolbar = inflate.findViewById(R.id.toolbar);
-            name = inflate.findViewById(R.id.name);
-            zz = inflate.findViewById(R.id.zz);
-            kg = inflate.findViewById(R.id.kg);
-            xyq = inflate.findViewById(R.id.xyq);
-            syq = inflate.findViewById(R.id.syq);
-            tx = inflate.findViewById(R.id.mttx);
-            tdt = inflate.findViewById(R.id.tdt);
-            time_a = inflate.findViewById(R.id.time_a);
-            time_b = inflate.findViewById(R.id.time_b);
-
-//        lrcView.setIsEnableBlurEffect(true);
-            View kp = inflate.findViewById(R.id.kp1);
-            kp.setOnClickListener(v -> {
-                if (lrcView != null) {
-                    v.setVisibility(View.GONE);
-                    lrcView.setVisibility(View.VISIBLE);
-                    if (com.muqingbfq.api.url.lrc == null) {
-                        new Thread() {
-                            @Override
-                            public void run() {
-                                super.run();
-                                com.muqingbfq.api.url.gc(bfqkz.xm.id);
-                            }
-                        }.start();
-                    }
-                }
-            });
-            toolbar.setNavigationIcon(R.drawable.end);
-            toolbar.setNavigationOnClickListener(view1 -> context.finish());
-            toolbar.inflateMenu(R.menu.bfq);
-            toolbar.setOnMenuItemClickListener(item -> {
-                if (item.getItemId() == R.id.fx) {
-                    com.muqingbfq.mq.gj.fx(context,
-                            "音乐名称：" + name.getText().toString() +
-                                    "\n 作者：" + zz.getText().toString() +
-                                    "\n 链接：https://music.163.com/#/song?id=" + bfqkz.id);
-                }
-                return false;
-            });
-            lrcView.setDraggable(true, (time) -> {
-                com.muqingbfq.bfqkz.mt.seekTo(Math.toIntExact(time));
-                return true;
-            });
-            lrcView.setOnSingerClickListener(() -> {
-                lrcView.setVisibility(View.GONE);
-                kp.setVisibility(View.VISIBLE);
-            });
-            inflate.findViewById(R.id.bfq_list_mp3).
-                    setOnClickListener(view1 -> com.muqingbfq.fragment.bflb_db.start(context));
-
-            bfq_an.kz kz = new bfq_an.kz();
-            kg.setOnClickListener(kz);
-            syq.setOnClickListener(kz);
-            xyq.setOnClickListener(kz);
-            like = inflate.findViewById(R.id.like);
-            ImageView control = inflate.findViewById(R.id.control);
-            control.setOnClickListener(new bfq_an.control(control));
-            UI(inflate);
-            return inflate;
-        }
-        private void UI(View view) {
-//        tdt.getProgressDrawable().
-//                setColorFilter(ContextCompat.getColor(this, R.color.text_tm), PorterDuff.Mode.MULTIPLY);
-//        tdt.getThumb().
-//                setColorFilter(ContextCompat.getColor(this, R.color.text), PorterDuff.Mode.SRC_IN);
-            tdt.setOnSeekBarChangeListener(new bfq_an.tdt());
-
-            like.setOnClickListener(view1 -> {
-                try {
-                    if (bfqkz.like_bool) {
-                        like.setImageTintList(ContextCompat.getColorStateList(view.getContext(), R.color.text));
-                        com.muqingbfq.fragment.gd.like.remove(String.valueOf(bfqkz.xm.id));
-                    } else {
-                        like.setImageTintList(ContextCompat.
-                                getColorStateList(view.getContext(), android.R.color.holo_red_dark));
-                        JSONObject json = new JSONObject();
-                        json.put("name", bfqkz.xm.name);
-                        json.put("zz", bfqkz.xm.zz);
-                        json.put("picUrl", bfqkz.xm.picurl);
-                        com.muqingbfq.fragment.gd.like.put(String.valueOf(bfqkz.xm.id), json);
-                    }
-                    com.muqingbfq.mq.wj.xrwb(com.muqingbfq.mq.wj.mp3_like,
-                            com.muqingbfq.fragment.gd.like.toString());
-                    bfqkz.like_bool = !bfqkz.like_bool;
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            });
-            if (bfqkz.xm != null) {
-                xm xm = bfqkz.xm;
-                name.setText(xm.name);
-                zz.setText(xm.zz);
-                time_a.setText(bfq_an.getTime(bfqkz.tdt_max));
-                tdt.setMax((int) bfqkz.tdt_max);
-                if (bfqkz.mt.isPlaying()) {
-                    kg.setImageResource(R.drawable.bf);
-                }
-                bfq_an.islike(context);
-                Glide.with(context).load(xm.picurl)
-                        .placeholder(R.drawable.icon)
-                        .into(tx);
-            }
-        }
-    }
-
-    public static void start(AppCompatActivity context) {
-        Intent intent = new Intent(context, bfq.class);
+    public static void start(Context context) {
+        Intent intent = new Intent();
+        intent.setClass(context, bfq.class);
+        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         context.startActivity(intent);
-//        home.dialog.show(context.getSupportFragmentManager(), "bfq");
     }
 
     public static boolean getVisibility() {
-        if (inflate == null) {
+        if (Media.view == null) {
             return false;
         }
-        return inflate.isShown();
+        return Media.view.isShown();
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/muqingbfq/bfq_an.java b/app/src/main/java/com/muqingbfq/bfq_an.java
index 85dbeb4..db8d64c 100644
--- a/app/src/main/java/com/muqingbfq/bfq_an.java
+++ b/app/src/main/java/com/muqingbfq/bfq_an.java
@@ -4,14 +4,10 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.SeekBar;
-
-import androidx.core.content.ContextCompat;
 
 import com.muqingbfq.api.url;
+import com.muqingbfq.fragment.Media;
 import com.muqingbfq.fragment.gd;
-import com.muqingbfq.fragment.mp3;
-import com.muqingbfq.mq.gj;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -42,6 +38,9 @@ public class bfq_an {
     }
 
     public static void xyq() {
+        if (bfqkz.list == null) {
+            return;
+        }
         bfqkz.mt.pause();
         int ms = bfqkz.ms;
         if (bfqkz.ms == 0) {
@@ -50,32 +49,6 @@ public class bfq_an {
         bfqkz.xm = bfqkz.list.get(bfqkz.getmti(ms));
         new url(bfqkz.xm);
     }
-
-    public static class tdt implements SeekBar.OnSeekBarChangeListener {
-        //        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm");
-        @Override
-        public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-            bfq.time_b.setText(getTime(progress));
-
-//                bfq.time_b.setText(simpleDateFormat.format(new Date(progress)));
-        }
-
-        @Override
-        public void onStartTrackingTouch(SeekBar seekBar) {
-            // 暂停播放
-             bfqkz.mt.pauseTimer();
-//            bfqkz.mt.pause();
-        }
-
-        @Override
-        public void onStopTrackingTouch(SeekBar seekBar) {
-            // 播放音乐到指定位置
-            bfqkz.mt.seekTo(seekBar.getProgress());
-            bfqkz.mt.resumeTimer();
-//            bfqkz.mt.start();
-        }
-    }
-
     public static class control implements View.OnClickListener {
         public control(ImageView imageView) {
             switch (bfqkz.ms) {
@@ -122,25 +95,14 @@ public class bfq_an {
     public static String getTime(long time) {
         return simpleDateFormat.format(new Date(time));
     }
-
-    public static void UI(boolean bool) {
-        if (bfq.getVisibility()) {
-            bfq.xyq.setEnabled(bool);
-            bfq.syq.setEnabled(bool);
-            bfq.kg.setEnabled(bool);
-            bfq.tdt.setEnabled(bool);
-        }
-    }
     public static void islike(Context context) {
         try {
             gd.like.getJSONObject(String.valueOf(bfqkz.xm.id));
-            bfq.like.setImageTintList(ContextCompat.
-                    getColorStateList(context, android.R.color.holo_red_dark));
             bfqkz.like_bool = true;
+            Media.setlike(true);
         } catch (Exception e) {
-            bfq.like.setImageTintList(ContextCompat.getColorStateList(context, R.color.text));
-            gj.sc("bfq_an islike() :" + e);
             bfqkz.like_bool = false;
+            Media.setlike(false);
         }
     }
 }
diff --git a/app/src/main/java/com/muqingbfq/bfqkz.java b/app/src/main/java/com/muqingbfq/bfqkz.java
index f78ce75..a9fe28f 100644
--- a/app/src/main/java/com/muqingbfq/bfqkz.java
+++ b/app/src/main/java/com/muqingbfq/bfqkz.java
@@ -12,6 +12,7 @@ import androidx.annotation.Nullable;
 import androidx.media.MediaBrowserServiceCompat;
 
 import com.muqingbfq.api.url;
+import com.muqingbfq.mq.BluetoothMusicController;
 import com.muqingbfq.mq.gj;
 
 import java.util.ArrayList;
@@ -19,10 +20,8 @@ import java.util.List;
 import java.util.Random;
 
 public class bfqkz extends MediaBrowserServiceCompat {
-    public static com.muqingbfq.MediaPlayer mt = new com.muqingbfq.MediaPlayer();
-    public static String id;
+    public static com.muqingbfq.MediaPlayer mt;
     public static List<xm> list = new ArrayList<>();
-    public static long tdt_max, tdt_wz;
     public static int ms;
     //    0 循环 1 顺序 2 随机
     public static xm xm;
@@ -52,31 +51,31 @@ public class bfqkz extends MediaBrowserServiceCompat {
             if (xm.picurl == null || xm.picurl.equals("")) {
                 xm.picurl = url.picurl(xm.id);
             }
-            mt.reset();
             mt.setDataSource(id);
         } catch (Exception e) {
-            gj.sc("bfqkz mp3(String id) :" + e);
+            yc.start(home.appCompatActivity, "bfqkz mp3(" + id + ") :" + e);
         }
     }
 
     public static MediaSessionCompat mSession;
     public static MediaMetadataCompat build;
     public static PlaybackStateCompat playback;
-
-
     @Override
     public void onCreate() {
         super.onCreate();
+        if (mt == null) {
+            mt = new com.muqingbfq.MediaPlayer();
+            new BluetoothMusicController(this);
+        }
         mSession = new MediaSessionCompat(this, "MusicService");
         playback=new PlaybackStateCompat.Builder()
                 .setState(PlaybackStateCompat.STATE_NONE,0,1.0f)
                 .build();
-        mSession.setCallback(new MediaSessionCompat.Callback() {
+/*        mSession.setCallback(new MediaSessionCompat.Callback() {
             @Override
             public void onPlay() {
                 mt.start();
             }
-
             @Override
             public void onPause() {
                 // 处理暂停音乐逻辑
@@ -98,15 +97,15 @@ public class bfqkz extends MediaBrowserServiceCompat {
             public void onSkipToPrevious() {
                 // 处理切换到上一首音乐逻辑
             }
-        });//设置回调
+        });*/
         build = new MediaMetadataCompat.Builder()
                 .build();
         mSession.setMetadata(build);
         mSession.setPlaybackState(playback);
-        mSession.setFlags(MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS);
         mSession.setActive(true);
         setSessionToken(mSession.getSessionToken());
         notify = new com.muqingbfq.mq.NotificationManagerCompat(this);
+
     }
 
     @Nullable
diff --git a/app/src/main/java/com/muqingbfq/fragment/bflb_db.java b/app/src/main/java/com/muqingbfq/fragment/bflb_db.java
index fd675e6..8077303 100644
--- a/app/src/main/java/com/muqingbfq/fragment/bflb_db.java
+++ b/app/src/main/java/com/muqingbfq/fragment/bflb_db.java
@@ -75,7 +75,6 @@ public class bflb_db extends BottomSheetDialog {
             holder.name.setTextColor(color);
             holder.zz.setTextColor(color);
             holder.view.setOnClickListener(view -> {
-                bfqkz.id = x.id;
                 if (bfqkz.xm != x) {
                     bfqkz.xm = x;
                     new url(x);
diff --git a/app/src/main/java/com/muqingbfq/fragment/bfq_db.java b/app/src/main/java/com/muqingbfq/fragment/bfq_db.java
index 794baa4..aa564d3 100644
--- a/app/src/main/java/com/muqingbfq/fragment/bfq_db.java
+++ b/app/src/main/java/com/muqingbfq/fragment/bfq_db.java
@@ -2,7 +2,6 @@ package com.muqingbfq.fragment;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -10,9 +9,9 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 
-import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.muqingbfq.R;
 import com.muqingbfq.bfq;
@@ -26,35 +25,61 @@ import java.util.List;
 
 public class bfq_db extends Fragment {
     @SuppressLint("StaticFieldLeak")
-    public static View view;
-    public static TextView name, zz;
-    public static ImageView txa;
-
-
+    private static View view;
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
+        if (view == null) {
+            String jsonList = this.getContext().getSharedPreferences("list", Context.MODE_PRIVATE)
+                    .getString("listData", null); // 获取保存的 JSON 字符串
+            if (jsonList != null) {
+                Type type = new TypeToken<List<xm>>() {
+                }.getType();
+                bfqkz.list = new com.google.gson.Gson().fromJson(jsonList, type); // 将 JSON 字符串转换回列表数据
+            }
+        }
         view = inflater.inflate(R.layout.fragment_bfq_db, container, false);
-        name = view.findViewById(R.id.name);
-        zz = view.findViewById(R.id.zz);
-        txa = view.findViewById(R.id.kg);
-        txa.setOnClickListener(new bfq_an.kz());
-
+        TextView name = view.findViewById(R.id.name);
+        TextView zz = view.findViewById(R.id.zz);
+        view.findViewById(R.id.kg).setOnClickListener(new bfq_an.kz());
         view.findViewById(R.id.txb).setOnClickListener(view -> bflb_db.start(getContext()));
-        view.setOnClickListener(view12 -> bfq.start(home.appCompatActivity));
-
+        view.setOnClickListener(vw -> bfq.start(home.appCompatActivity));
 // 恢复列表数据
-        SharedPreferences sharedPreferences = this.getContext().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE);
-        String jsonList = sharedPreferences.getString("listData", ""); // 获取保存的 JSON 字符串
-        if (!jsonList.isEmpty()) {
-            Gson gson = new Gson();
-            Type type = new TypeToken<List<xm>>() {
-            }.getType();
-            bfqkz.list = gson.fromJson(jsonList, type); // 将 JSON 字符串转换回列表数据
-        } else {
-            view.setVisibility(View.GONE);
+        if (bfqkz.xm != null) {
+            name.setText(bfqkz.xm.name);
+            zz.setText(bfqkz.xm.zz);
+        }
+        if (bfqkz.mt != null) {
+            Media.setbf(bfqkz.mt.isPlaying());
         }
         return view;
     }
+    private static <T extends View> T findViewById(int id) {
+        return view.findViewById(id);
+    }
 
+    public static void setkg(boolean bool) {
+        if (view != null) {
+            ImageView imageView = findViewById(R.id.kg);
+            if (bool) {
+                imageView.setImageResource(R.drawable.bf);
+            } else {
+                imageView.setImageResource(R.drawable.zt);
+            }
+        }
+    }
+
+    public static void setname(String str) {
+        if (view != null) {
+            TextView textView = findViewById(R.id.name);
+            textView.setText(str);
+        }
+    }
+
+    public static void setzz(String str) {
+        if (view != null) {
+            TextView textView = findViewById(R.id.zz);
+            textView.setText(str);
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/muqingbfq/fragment/gd.java b/app/src/main/java/com/muqingbfq/fragment/gd.java
index 9a717a1..1e1c4f2 100644
--- a/app/src/main/java/com/muqingbfq/fragment/gd.java
+++ b/app/src/main/java/com/muqingbfq/fragment/gd.java
@@ -39,7 +39,7 @@ import com.muqingbfq.xm;
 public class gd extends Fragment {
     public static String gdid;
     public static BaseAdapter lbspq;
-    public static List<xm> list = new ArrayList<>();
+    public static List<xm> list;
     public static JSONObject like = new JSONObject();
     GridView gridView;
 
@@ -47,6 +47,7 @@ public class gd extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_gd, container, false);
+        list = new ArrayList<>();
         lbspq = new baseadapter(view.getContext());
         gridView = view.findViewById(R.id.wgbj);
         gridView.setAdapter(lbspq);
@@ -54,7 +55,6 @@ public class gd extends Fragment {
             gdid = main.mp3_csh;
         }
         TabLayout tabLayout = view.findViewById(R.id.tablayout);
-//        tabLayout.removeAllTabs();
         for (String name : new String[]{"推荐", "排行榜", "下载"}) {
             TabLayout.Tab tab = tabLayout.newTab();
             tab.setText(name);
@@ -68,11 +68,9 @@ public class gd extends Fragment {
                 lbspq.notifyDataSetChanged();
                 new thread(tab.getText().toString());
             }
-
             @Override
             public void onTabUnselected(TabLayout.Tab tab) {
             }
-
             @Override
             public void onTabReselected(TabLayout.Tab tab) {
             }
diff --git a/app/src/main/java/com/muqingbfq/fragment/mp3.java b/app/src/main/java/com/muqingbfq/fragment/mp3.java
index 4504922..019f75f 100644
--- a/app/src/main/java/com/muqingbfq/fragment/mp3.java
+++ b/app/src/main/java/com/muqingbfq/fragment/mp3.java
@@ -22,6 +22,7 @@ import com.muqingbfq.api.playlist;
 import com.muqingbfq.api.url;
 import com.muqingbfq.bfq;
 import com.muqingbfq.bfqkz;
+import com.muqingbfq.home;
 import com.muqingbfq.list.MyViewHoder;
 import com.muqingbfq.main;
 import com.muqingbfq.xm;
@@ -49,6 +50,8 @@ public class mp3 extends AppCompatActivity {
         lb.setAdapter(lbspq);
         String id = intent.getStringExtra("id");
         new start(id);
+/*        getSupportFragmentManager().beginTransaction()
+                .add(R.id.bfq_db,home.bfq_db).commit();*/
     }
 
     @SuppressLint("NotifyDataSetChanged")
@@ -105,12 +108,10 @@ public class mp3 extends AppCompatActivity {
             holder.name.setTextColor(color);
             holder.zz.setTextColor(color);
             holder.view.setOnClickListener(view -> {
-                bfqkz.id = x.id;
                 if (bfqkz.xm == null || !bfqkz.xm.id.equals(x.id)) {
                     bfqkz.xm = x;
                     new url(x);
                 }
-//                if (!gd.gdid.equals(bflb_db.gdid)) {
                     bfqkz.list.clear();
                     int size = list.size();
                     for (int i = 0; i < size; i++) {
diff --git a/app/src/main/java/com/muqingbfq/fragment/search.java b/app/src/main/java/com/muqingbfq/fragment/search.java
index e6c5da0..f771007 100644
--- a/app/src/main/java/com/muqingbfq/fragment/search.java
+++ b/app/src/main/java/com/muqingbfq/fragment/search.java
@@ -32,13 +32,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class search extends Fragment {
-
-    String name;
-
-    public search(String name) {
-        this.name = name;
-    }
-
     View view;
     RecyclerView.Adapter<MyViewHoder> lbspq;
     List<xm> list = new ArrayList<>();
@@ -56,20 +49,36 @@ public class search extends Fragment {
         lb.setLayoutManager(manager);
         lbspq = new spq();
         lb.setAdapter(lbspq);
-        new start().start();
+        setVisibility(false);
         return view;
     }
 
-    @SuppressLint("NotifyDataSetChanged")
-    public void setStart(String name) {
-        this.name = name;
-        list.clear();
-        lbspq.notifyDataSetChanged();
-        new start().start();
+    public void setVisibility(boolean bool) {
+        if (bool) {
+            view.setVisibility(View.VISIBLE);
+        } else {
+            view.setVisibility(View.GONE);
+        }
+    }
 
+    public boolean getVisibility() {
+        return view.isShown();
+    }
+
+    public void setStart(String name) {
+        setVisibility(true);
+        list.clear();
+        new start(name);
     }
 
     public class start extends Thread {
+        String name;
+
+        public start(String name) {
+            this.name = name;
+            start();
+        }
+
         @SuppressLint("NotifyDataSetChanged")
         @Override
         public void run() {
@@ -124,7 +133,6 @@ public class search extends Fragment {
             holder.name.setTextColor(color);
             holder.zz.setTextColor(color);
             holder.view.setOnClickListener(view1 -> {
-                bfqkz.id = x.id;
                 if (bfqkz.xm == null || !bfqkz.xm.id.equals(x.id)) {
                     bfqkz.xm = x;
                     new url(x);
diff --git a/app/src/main/java/com/muqingbfq/fragment/sz.java b/app/src/main/java/com/muqingbfq/fragment/sz.java
index 2006a0c..4ad6850 100644
--- a/app/src/main/java/com/muqingbfq/fragment/sz.java
+++ b/app/src/main/java/com/muqingbfq/fragment/sz.java
@@ -2,9 +2,11 @@ package com.muqingbfq.fragment;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.view.View;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -14,11 +16,16 @@ import com.muqingbfq.activity_about_software;
 import com.muqingbfq.home;
 import com.muqingbfq.login.user_logs;
 import com.muqingbfq.login.user_message;
+import com.muqingbfq.main;
+import com.muqingbfq.mq.EditViewDialog;
 import com.muqingbfq.mq.gj;
+import com.muqingbfq.mq.wj;
 import com.muqingbfq.mq.wl;
 
-public class sz {
+import org.json.JSONException;
+import org.json.JSONObject;
 
+public class sz {
     @SuppressLint("StaticFieldLeak")
     public static TextView name, jieshao;
     @SuppressLint("StaticFieldLeak")
@@ -32,13 +39,94 @@ public class sz {
         imageView = view.findViewById(R.id.image);
         view.findViewById(R.id.xdbj).
                 setOnClickListener(v -> {
-                    if (name.getText().equals("登录")) {
+                    if (!wj.cz(wj.filesdri + "user")) {
                         context.startActivity(new Intent(context, user_logs.class));
                     }
                 });
+        name.setOnClickListener(vw -> {
+            if (main.user == null) {
+                context.startActivity(new Intent(context, user_logs.class));
+                return;
+            }
+            EditViewDialog dialog = new EditViewDialog(vw.getContext(), "修改名称");
+            dialog.setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialogInterface, int i) {
+                    EditText viewById = dialog.getEditText();
+                    String s = viewById.getText().toString();
+                    new Thread() {
+                        @Override
+                        public void run() {
+                            super.run();
+                            String s1 = wl.get(main.http + "/setname?user=" + main.user + "&name=" + s);
+                            try {
+                                JSONObject jsonObject = new JSONObject(s1);
+                                if (jsonObject.getInt("code") == 200) {
+                                    setname(s);
+                                }
+                                gj.xcts(home.appCompatActivity, jsonObject.getString("msg"));
+                            } catch (JSONException e) {
+                                throw new RuntimeException(e);
+                            }
+                        }
+                    }.start();
+                }
+            });
+            dialog.show();
+        });
+        jieshao.setOnClickListener(vw -> {
+            if (main.user == null) {
+                context.startActivity(new Intent(context, user_logs.class));
+                return;
+            }
+            EditViewDialog dialog = new EditViewDialog(vw.getContext(), "修改签名");
+            dialog.setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialogInterface, int i) {
+                    EditText viewById = dialog.getEditText();
+                    String s = viewById.getText().toString();
+                    new Thread() {
+                        @Override
+                        public void run() {
+                            super.run();
+                            String s1 = wl.get(main.http + "/setqianming?user=" + main.user + "&qianming=" + s);
+                            try {
+                                JSONObject jsonObject = new JSONObject(s1);
+                                if (jsonObject.getInt("code") == 200) {
+                                    setqianming(s);
+                                }
+                                gj.xcts(home.appCompatActivity, jsonObject.getString("msg"));
+                            } catch (JSONException e) {
+                                throw new RuntimeException(e);
+                            }
+                        }
+                    }.start();
+                }
+            });
+            dialog.show();
+        });
+        imageView.setOnClickListener(vw -> {
+            if (main.user == null) {
+                context.startActivity(new Intent(context, user_logs.class));
+                return;
+            }
+        });
         new user_message();
     }
 
+    public static void setname(String string) {
+        main.handler.post(() -> name.setText(string));
+    }
+    public static void setqianming(String string) {
+        main.handler.post(() -> {
+            if (string == null) {
+                jieshao.setText("");
+            } else {
+                jieshao.setText(string);
+            }
+        });
+    }
+
     public static void switch_sz(Context context, int id) {
         if (id == R.id.a) {
             gj.llq(context, "https://rust.coldmint.top/ftp/muqing/");
@@ -72,8 +160,9 @@ public class sz {
             context.startActivity(new Intent(context, activity_about_software.class));
 //                    关于软件
         } else if (id == R.id.g) {
-            new com.muqingbfq.login.visitor();
-            home.appCompatActivity.finish();
+            wj.sc(wj.filesdri + "user");
+            setname("未登录");
+            setqianming(null);
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/muqingbfq/home.java b/app/src/main/java/com/muqingbfq/home.java
index 8a07ee5..5f4b06a 100644
--- a/app/src/main/java/com/muqingbfq/home.java
+++ b/app/src/main/java/com/muqingbfq/home.java
@@ -5,13 +5,10 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.res.Configuration;
 import android.os.Bundle;
-import android.os.RemoteException;
 import android.support.v4.media.MediaBrowserCompat;
 import android.support.v4.media.session.MediaControllerCompat;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.style.LeadingMarginSpan;
 import android.view.Menu;
 import android.view.MenuItem;
 
@@ -22,95 +19,121 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.drawerlayout.widget.DrawerLayout;
 
 import com.google.android.material.navigation.NavigationView;
-import com.google.gson.Gson;
+import com.muqingbfq.fragment.Media;
 import com.muqingbfq.fragment.bfq_db;
 import com.muqingbfq.mq.gj;
 
+import java.util.List;
+
 public class home extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {
-    public Toolbar toolbar;
-    public static AppCompatActivity appCompatActivity;
-    @SuppressLint("CommitTransaction")
+    @SuppressLint("StaticFieldLeak")
+    public static Context appCompatActivity;
+
+    @SuppressLint({"CommitTransaction", "ObsoleteSdkInt"})
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_home);
         appCompatActivity = this;
         try {
-            toolbar = findViewById(R.id.toolbar);
+            //初始化工具栏
+            Toolbar toolbar = findViewById(R.id.toolbar);
             setSupportActionBar(toolbar);
             DrawerLayout drawerLayout = findViewById(R.id.chct);
             ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
                     this, drawerLayout, toolbar, R.string.app_name, R.string.app_name);
             drawerLayout.addDrawerListener(toggle);
             toggle.syncState();
+            //初始化侧滑
             NavigationView chb = findViewById(R.id.chb);
             chb.setNavigationItemSelectedListener(this);
-            Menu menu = chb.getMenu();
-            for (int i = 0; i < menu.size(); i++) {
-                MenuItem item = menu.getItem(i);
-                SpannableString spannableString = new SpannableString(item.getTitle());
-                spannableString.setSpan(new LeadingMarginSpan.Standard(
-                        26, 26), 0, spannableString.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
-                item.setTitle(spannableString);
-            }
             new com.muqingbfq.fragment.sz(this, chb.getHeaderView(0));
-            getSupportFragmentManager().beginTransaction()
-                    .add(R.id.bfq_db, new bfq_db()).commit();
-            mediaBrowser = new MediaBrowserCompat(this,
-                    new ComponentName(this, bfqkz.class), new MediaBrowserCompat.ConnectionCallback() {
+            //初始化播放器组件
+            if (mediaBrowser == null) {
+                mediaBrowser = new MediaBrowserCompat(this,
+                        new ComponentName(this, bfqkz.class),
+                        connectionCallbacks,
+                        null);
+                mediaBrowser.connect();
+            }
+            //检测更新
+            new gj.jianchagengxin(this);
+        } catch (Exception e) {
+            yc.tc(this, e);
+        }
+    }
+
+    public static MediaBrowserCompat mediaBrowser;
+    private MediaBrowserCompat.ConnectionCallback connectionCallbacks =
+            new MediaBrowserCompat.ConnectionCallback() {
                 @Override
                 public void onConnected() {
-                    // 连接成功后执行的操作
-                    MediaControllerCompat mediaController;
-                    try {
-                        mediaController = new MediaControllerCompat(home.this,
-                                mediaBrowser.getSessionToken());
-                    } catch (RemoteException e) {
-                        throw new RuntimeException(e);
-                    }
-                    MediaControllerCompat.setMediaController(home.this, mediaController);
-
+                    // 已连接到服务，可以开始浏览媒体内容
+                    // 订阅媒体内容
+                    mediaBrowser.subscribe("mediaId", subscriptionCallback);
+                    // 请求当前播放状态
+                    MediaControllerCompat mediaController = new MediaControllerCompat(home.this, mediaBrowser.getSessionToken());
+                    MediaControllerCompat.TransportControls transportControls = mediaController.getTransportControls();
+                    // 执行媒体控制操作
+                    transportControls.play();
                 }
 
                 @Override
                 public void onConnectionSuspended() {
-                    // 连接暂停时执行的操作
-//                    gj.ts(home.this,"zangting");
+                    // 与服务的连接暂停或断开
+                    // 取消订阅媒体内容
+                    mediaBrowser.unsubscribe("mediaId", subscriptionCallback);
+                    // 清除播放状态
+                    MediaControllerCompat mediaController = new MediaControllerCompat(home.this, mediaBrowser.getSessionToken());
+                    MediaControllerCompat.TransportControls transportControls = mediaController.getTransportControls();
+                    // 执行媒体控制操作
+                    transportControls.stop();
                 }
 
                 @Override
                 public void onConnectionFailed() {
-                    // 连接失败时执行的操作
-//                    gj.ts(home.this,"shibai");
+                    // 与服务的连接失败
+                    // 尝试重新连接服务或显示错误信息等
+                }
+            };
+    private MediaBrowserCompat.SubscriptionCallback subscriptionCallback =
+            new MediaBrowserCompat.SubscriptionCallback() {
+                @Override
+                public void onChildrenLoaded(@NonNull String parentId, @NonNull List<MediaBrowserCompat.MediaItem> children) {
+                    // 媒体内容加载完成
+                    // 处理每个媒体项
+                    // ...
                 }
-            }, null);
-            mediaBrowser.connect();
-        } catch (Exception e) {
-            gj.sc(e);
-        }
-    }
 
-    MediaBrowserCompat mediaBrowser;
+                @Override
+                public void onError(@NonNull String parentId) {
+                    // 媒体内容加载失败
+                    // 处理加载失败的情况
+                }
+            };
 
     @Override
     protected void onPause() {
         super.onPause();
+        //在销毁 Activity 之前，系统会先调用 onDestroy()。系统调用此回调的原因如下：
         // 保存列表数据
-        SharedPreferences sharedPreferences = getSharedPreferences("MyPrefs", Context.MODE_PRIVATE);
+        SharedPreferences sharedPreferences = getSharedPreferences("list", Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = sharedPreferences.edit();
-        Gson gson = new Gson();
-        String jsonList = gson.toJson(bfqkz.list); // 将列表数据转换为 JSON 字符串
-        editor.putString("listData", jsonList); // 保存 JSON 字符串到 SharedPreferences
+        String jsonList = new com.google.gson.Gson().toJson(bfqkz.list);
+        editor.putString("listData", jsonList);
         editor.apply();
     }
 
     @Override
-    protected void onDestroy() {
-        super.onDestroy();
-//        mediaBrowser.disconnect();
+    protected void onResume() {
+        super.onResume();
+        getSupportFragmentManager().beginTransaction()
+                .add(R.id.bfq_db, new bfq_db()).commit();
     }
-    private long time;
 
+    private long time;
+    @SuppressLint("StaticFieldLeak")
+    public static com.muqingbfq.fragment.bfq_db bfq_db = new bfq_db();
     @Override
     public void onBackPressed() {
         if (bfqkz.mt.isPlaying()) {
@@ -126,13 +149,11 @@ public class home extends AppCompatActivity implements NavigationView.OnNavigati
             }
         }
     }
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.home, menu);
         return super.onCreateOptionsMenu(menu);
     }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.menu_search) {
@@ -141,12 +162,14 @@ public class home extends AppCompatActivity implements NavigationView.OnNavigati
         }
         return super.onOptionsItemSelected(item);
     }
-
-
     @Override
     public boolean onNavigationItemSelected(@NonNull MenuItem item) {
         com.muqingbfq.fragment.sz.switch_sz(this, item.getItemId());
         return false;
     }
-
+    @Override
+    public void onConfigurationChanged(@NonNull Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        Media.view = null;
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/muqingbfq/login/enroll.java b/app/src/main/java/com/muqingbfq/login/enroll.java
index 4ef0982..10e5234 100644
--- a/app/src/main/java/com/muqingbfq/login/enroll.java
+++ b/app/src/main/java/com/muqingbfq/login/enroll.java
@@ -18,7 +18,7 @@ import org.json.JSONObject;
 
 public class enroll extends AppCompatActivity {
     EditText eduser,edpassword;
-    String user, password;
+    String user , name , password;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -27,10 +27,13 @@ public class enroll extends AppCompatActivity {
         setSupportActionBar(findViewById(R.id.toolbar));
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         Intent intent = getIntent();
+        //获取UID编辑框
         eduser = findViewById(R.id.edit_user);
         eduser.setText(
                 intent.getStringExtra("user"));
+        //设置密码编辑框
         edpassword = findViewById(R.id.edit_password);
+
         findViewById(R.id.edit_cookie).setOnClickListener(view -> new user_logs.erweima(view.getContext()));
         findViewById(R.id.enroll).setOnClickListener(view -> a());
     }
@@ -65,8 +68,11 @@ public class enroll extends AppCompatActivity {
         @Override
         public void run() {
             super.run();
-            String s = wl.get("http://139.196.224.229/muqing/enroll.php?user=" + user + "&password=" + password
-                    + "&cookie" + wl.Cookie);
+            String get = "user=" + user
+                    + "&name=" + name
+                    + "&password=" + password
+                    + "&cookie" + wl.Cookie;
+            String s = wl.get("http://139.196.224.229/muqing/enroll.php?" + get);
             try {
                 JSONObject jsonObject = new JSONObject(s);
                 int code = jsonObject.getInt("code");
@@ -80,6 +86,4 @@ public class enroll extends AppCompatActivity {
             }
         }
     }
-
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/muqingbfq/login/user_logs.java b/app/src/main/java/com/muqingbfq/login/user_logs.java
index 2cc53d7..e28c8d5 100644
--- a/app/src/main/java/com/muqingbfq/login/user_logs.java
+++ b/app/src/main/java/com/muqingbfq/login/user_logs.java
@@ -17,7 +17,6 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 
@@ -25,10 +24,14 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.muqingbfq.R;
 import com.muqingbfq.main;
 import com.muqingbfq.mq.gj;
+import com.muqingbfq.mq.wj;
 import com.muqingbfq.mq.wl;
+import com.muqingbfq.yc;
 
+import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.File;
 import java.util.Objects;
 
 public class user_logs extends AppCompatActivity {
@@ -120,7 +123,7 @@ public class user_logs extends AppCompatActivity {
                         new visitor();
                     }
                     wl.setcookie(cookie);
-                    new user_message();
+                    new user_message(user);
                     user_logs.this.finish();
                 }
             } catch (Exception e) {
@@ -132,7 +135,7 @@ public class user_logs extends AppCompatActivity {
     public static class erweima extends Thread {
         int code = 800;
         String unikey, qrimg, hq;
-        private long time=0;
+        private long time = 0;
         ImageView imageView;
         TextView textView;
         MaterialAlertDialogBuilder materialAlertDialogBuilder;
diff --git a/app/src/main/java/com/muqingbfq/login/user_message.java b/app/src/main/java/com/muqingbfq/login/user_message.java
index 090338b..a288f4e 100644
--- a/app/src/main/java/com/muqingbfq/login/user_message.java
+++ b/app/src/main/java/com/muqingbfq/login/user_message.java
@@ -1,40 +1,55 @@
 package com.muqingbfq.login;
 
+import android.text.TextUtils;
+
 import com.bumptech.glide.Glide;
 import com.muqingbfq.R;
 import com.muqingbfq.fragment.sz;
 import com.muqingbfq.main;
+import com.muqingbfq.mq.gj;
+import com.muqingbfq.mq.wj;
 import com.muqingbfq.mq.wl;
-import com.muqingbfq.yc;
 
 import org.json.JSONObject;
-
 public class user_message extends Thread {
-
-    public user_message() {
+    public user_message(String user) {
+        main.user = user;
         start();
     }
-
+    public user_message() {
+        main.user=wj.dqwb(wj.filesdri + "user");
+        start();
+    }
+    String name = "未登录", signature = "游客模式";
     @Override
     public void run() {
         super.run();
-        String hq = wl.hq("/user/account" + "?cookie=" + wl.Cookie);
         try {
-            JSONObject jsonObject = new JSONObject(hq).getJSONObject("profile");
-            String nickname = jsonObject.getString("nickname");
-            String signature = jsonObject.getString("signature");
-            String avatarUrl = jsonObject.getString("avatarUrl");
-            main.handler.post(() -> {
-                sz.name.setText(nickname);
-                sz.jieshao.setText(signature);
-                Glide.with(sz.imageView)
-                        .load(avatarUrl)
+            if (main.user != null) {
+                String hq = wl.get(main.http + "/getid.php?" + "user=" + main.user);
+                if (!TextUtils.isEmpty(hq)) {
+                    JSONObject json = new JSONObject(hq);
+                    if (json.getInt("code") == 200) {
+                        name = json.getString("name");
+                        signature = json.getString("qianming");
+                        json.put("name", name);
+                        json.put("qianming", signature);
+                        json.put("user", main.user);
+                        wj.xrwb(wj.filesdri + "user", main.user);
+                    }
+                }
+            }
+                main.handler.post(() -> {
+                    sz.name.setText(name);
+                    sz.jieshao.setText(signature);
+                    Glide.with(sz.imageView)
+                        .load(main.http + "/picurl/" + main.user + ".jpg")
                         .placeholder(R.drawable.icon)//图片加载出来前，显示的图片
-                        .error(R.drawable.deleat)//图片加载失败后，显示的图片
+                        .error(R.drawable.icon)//图片加载失败后，显示的图片
                         .into(sz.imageView);
             });
         } catch (Exception e) {
-            yc.start(e);
+            gj.sc(e);
         }
     }
 }
diff --git a/app/src/main/java/com/muqingbfq/login/visitor.java b/app/src/main/java/com/muqingbfq/login/visitor.java
index 9a4e392..f72c899 100644
--- a/app/src/main/java/com/muqingbfq/login/visitor.java
+++ b/app/src/main/java/com/muqingbfq/login/visitor.java
@@ -15,6 +15,7 @@ public class visitor extends Thread {
 
     AppCompatActivity activity;
     Intent intent;
+
     public visitor(AppCompatActivity activity, Intent intent) {
         this.activity = activity;
         this.intent = intent;
@@ -24,6 +25,7 @@ public class visitor extends Thread {
     public visitor() {
         start();
     }
+
     @Override
     public void run() {
         super.run();
@@ -31,23 +33,10 @@ public class visitor extends Thread {
         try {
             JSONObject jsonObject = new JSONObject(hq);
             wl.setcookie(jsonObject.getString("cookie"));
-            if (wj.filesdri == null) {
-                new wj(activity);
-            }
-            if (activity != null) {
-                activity.startActivity(intent);
-                activity.finish();
-            }
-        } catch (JSONException e) {
-            yc.start(activity, e);
-        }
-        try {
-            sleep(1000);
-        } catch (InterruptedException e) {
-            yc.start(activity,e);
-        }
-        if (activity != null) {
-            activity.finish();
+        } catch (Exception e) {
+            com.muqingbfq.mq.gj.sc(e);
         }
+        activity.startActivity(intent);
+        activity.finish();
     }
 }
diff --git a/app/src/main/java/com/muqingbfq/main.java b/app/src/main/java/com/muqingbfq/main.java
index 27fdf48..14a180b 100644
--- a/app/src/main/java/com/muqingbfq/main.java
+++ b/app/src/main/java/com/muqingbfq/main.java
@@ -19,7 +19,7 @@ public class main extends Application {
     public static SharedPreferences.Editor edit;
 
     public static String mp3 = "mp3", mp3_csh,
-            Time = "Time", Cookie = "Cookie";
+     Cookie = "Cookie", user;
 
     @Override
     public void onCreate() {
@@ -27,10 +27,6 @@ public class main extends Application {
         new wj(this);
         sp = getSharedPreferences("Set_up", MODE_PRIVATE);
         edit = sp.edit();
-        if (sp.getLong(Time, 0) == 0) {
-            edit.putLong(Time, System.currentTimeMillis());
-        }
-        start.time = sp.getLong(Time, System.currentTimeMillis());
         boolean bj = false;
         try {
             mp3_csh = sp.getString(mp3, "");
@@ -56,6 +52,5 @@ public class main extends Application {
         if (bj) {
             edit.commit();
         }
-        // 创建全局异常处理器实例 设置全局异常处理器
     }
 }
diff --git a/app/src/main/java/com/muqingbfq/mq/BluetoothMusicController.java b/app/src/main/java/com/muqingbfq/mq/BluetoothMusicController.java
index 1715726..f198d42 100644
--- a/app/src/main/java/com/muqingbfq/mq/BluetoothMusicController.java
+++ b/app/src/main/java/com/muqingbfq/mq/BluetoothMusicController.java
@@ -16,15 +16,12 @@ public class BluetoothMusicController {
 
     public BluetoothMusicController(Context context) {
         this.context = context;
-//        bluetoothReceiver.setOnHeadsetListener(this);
         IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction(BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED);
 
         intentFilter.addAction("android.intent.action.HEADSET_PLUG");
         context.registerReceiver(new MyButtonClickReceiver(), intentFilter);
         registerHeadsetReceiver();
-//        audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-//        setupMediaSession();
     }
 
     public void stop() {
diff --git a/app/src/main/java/com/muqingbfq/mq/NotificationManagerCompat.java b/app/src/main/java/com/muqingbfq/mq/NotificationManagerCompat.java
index 89fbd19..c86a334 100644
--- a/app/src/main/java/com/muqingbfq/mq/NotificationManagerCompat.java
+++ b/app/src/main/java/com/muqingbfq/mq/NotificationManagerCompat.java
@@ -1,7 +1,5 @@
 package com.muqingbfq.mq;
 
-import static com.muqingbfq.bfqkz.xm;
-
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.NotificationChannel;
@@ -15,7 +13,6 @@ import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Build;
-import android.support.v4.media.MediaMetadataCompat;
 import android.support.v4.media.session.PlaybackStateCompat;
 
 import androidx.core.app.ActivityCompat;
@@ -25,11 +22,8 @@ import androidx.media.session.MediaButtonReceiver;
 import com.muqingbfq.MyButtonClickReceiver;
 import com.muqingbfq.R;
 import com.muqingbfq.bfq;
-import com.muqingbfq.bfq_an;
 import com.muqingbfq.bfqkz;
-import com.muqingbfq.fragment.bfq_db;
-import com.muqingbfq.fragment.mp3;
-import com.muqingbfq.home;
+import com.muqingbfq.fragment.Media;
 import com.muqingbfq.start;
 import com.muqingbfq.yc;
 
@@ -62,7 +56,6 @@ public class NotificationManagerCompat {
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
                     | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);// 关键的一步，设置启动模式，两种情况
             PendingIntent pendingIntent = getActivity(context, intent);
-//                    PendingIntent.getActivity(context, 0, intent, flag);
             Intent my = new Intent(context, MyButtonClickReceiver.class);
             pendingIntent_kg = getBroadcast(context, my.
                     setAction("kg"));
@@ -133,15 +126,10 @@ public class NotificationManagerCompat {
                     R.drawable.icon);
         }
         if (notificationManager != null) {
-            notificationBuilder.setContentTitle(xm.name);
-            notificationBuilder.setContentText(xm.zz);
             notificationBuilder.setLargeIcon(bitmap);
             notificationManager.notify(1, notificationBuilder.build());
         }
-        if (bfq.tx != null) {
-            bfq.tx.setImageBitmap(bitmap);
-        }
-
+        Media.setImageBitmap(bitmap);
     }
 
     private NotificationCompat.Builder getNotificationBuilder(Context context) {
diff --git a/app/src/main/java/com/muqingbfq/mq/gj.java b/app/src/main/java/com/muqingbfq/mq/gj.java
index 7535615..77282e8 100644
--- a/app/src/main/java/com/muqingbfq/mq/gj.java
+++ b/app/src/main/java/com/muqingbfq/mq/gj.java
@@ -2,22 +2,17 @@ package com.muqingbfq.mq;
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.res.Configuration;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-import android.graphics.RectF;
 import android.net.Uri;
 import android.util.Log;
 import android.widget.Toast;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.muqingbfq.main;
 import com.muqingbfq.yc;
 
+import org.json.JSONObject;
+
 import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.util.Collections;
@@ -35,7 +30,8 @@ public class gj {
         if (a == null) {
             a = "null";
         }
-        Log.d("云音乐", String.valueOf(a));
+        Log.d("云音乐", a.toString());
+        floating.addtext(a.toString());
     }
 
     public static void llq(Context context, String str) {
@@ -49,11 +45,6 @@ public class gj {
         context.startActivity(shareIntent);
     }
 
-    public static int isDarkTheme(Context context) {
-        return context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
-//        return flag == Configuration.UI_MODE_NIGHT_YES;
-    }
-
     public static boolean isWiFiConnected() {
         try {
             for (NetworkInterface networkInterface : Collections.list(NetworkInterface.getNetworkInterfaces())) {
@@ -71,24 +62,50 @@ public class gj {
         return false;  // 默认为流量网络
     }
 
-    public static Bitmap getRoundedCornerBitmap(Bitmap bitmap, int cornerRadius) {
-        Bitmap output = Bitmap.createBitmap(bitmap.getWidth(), bitmap.getHeight(), Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(output);
+    public static class jianchagengxin extends Thread {
+        Context context;
 
-        final int color = 0xff424242;
-        final Paint paint = new Paint();
-        final Rect rect = new Rect(0, 0, bitmap.getWidth(), bitmap.getHeight());
-        final RectF rectF = new RectF(rect);
+        public jianchagengxin(Context context) {
+            this.context = context;
+            if (!wj.cz(wj.filesdri + "gx.mq")) {
+                start();
+            }
+        }
 
-        paint.setAntiAlias(true);
-        canvas.drawARGB(0, 0, 0, 0);
-        paint.setColor(color);
-        canvas.drawRoundRect(rectF, cornerRadius, cornerRadius, paint);
-
-        paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
-        canvas.drawBitmap(bitmap, rect, rect, paint);
-
-        return output;
+        @Override
+        public void run() {
+            super.run();
+            jianchagengxin(context);
+        }
     }
 
-}
+    public static int jianchagengxin(Context context) {
+        try {
+            String versionName = context.getPackageManager()
+                    .getPackageInfo(context.getPackageName(), 0).versionName;
+            String hq = wl.get(main.http + "/muqingbfq?bb=" + versionName);
+            final JSONObject jsonObject = new JSONObject(hq);
+            boolean code = jsonObject.getInt("code") == 1;
+            String msg = jsonObject.getString("msg");
+            if (code) {
+                String url = jsonObject.getString("url");
+                String bb = jsonObject.getString("bb");
+                main.handler.post(() -> new MaterialAlertDialogBuilder(context)
+                        .setTitle("更新" + bb)
+                        .setMessage(msg+"\n"+"取消后不再提示更新你需要到关于软件手动检测")
+                        .setNegativeButton("取消", (dialogInterface, i) -> {
+                            wj.xrwb(wj.filesdri + "gx.mq", null);
+                        })
+                        .setPositiveButton("更新", (dialogInterface, i) -> context.startActivity(new Intent(Intent.ACTION_VIEW,
+                                Uri.parse(url))))
+//                                    new ApkDownloader(context).downloadAndInstall(url, wj.filesdri))
+                        .show());
+            }
+            //1表示需要更新
+            return code ? 1 : 0;
+        } catch (Exception e) {
+            sc(e);
+        }
+        return 400;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/muqingbfq/mq/llq.java b/app/src/main/java/com/muqingbfq/mq/llq.java
index d0c025b..9d5339f 100644
--- a/app/src/main/java/com/muqingbfq/mq/llq.java
+++ b/app/src/main/java/com/muqingbfq/mq/llq.java
@@ -1,7 +1,6 @@
 package com.muqingbfq.mq;
 
 import android.Manifest;
-import android.annotation.SuppressLint;
 import android.app.DownloadManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -32,19 +31,15 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.muqingbfq.R;
 
 import java.io.File;
-import java.util.Locale;
 
 public class llq extends AppCompatActivity {
     WebView web;
     Toolbar toolbar;
-    @SuppressLint({"DefaultLocale", "ObsoleteSdkInt"})
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_llq);
-
         Intent intent = getIntent();
-
         toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -136,7 +131,6 @@ public class llq extends AppCompatActivity {
             @Override
             public void onProgressChanged(WebView view, int newProgress) {
                 super.onProgressChanged(view, newProgress);
-                gj.sc(newProgress);
                 if (newProgress == 100) {
                     progressBar.setVisibility(View.GONE);
                 } else {
diff --git a/app/src/main/java/com/muqingbfq/mq/wj.java b/app/src/main/java/com/muqingbfq/mq/wj.java
index 73c12e6..c41cd9e 100644
--- a/app/src/main/java/com/muqingbfq/mq/wj.java
+++ b/app/src/main/java/com/muqingbfq/mq/wj.java
@@ -8,7 +8,6 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.InputStreamReader;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -34,39 +33,24 @@ public class wj {
             mp3_xz = gd + mp3_xz;
             mp3_like = gd + mp3_like;
             tx = filesdri + tx;
-            if (!new File(mp3).exists()) {
-                new File(mp3).mkdirs();
-            }
-            if (!new File(gd).exists()) {
-                new File(gd).mkdirs();
-            }
         } catch (Exception e) {
             yc.start(context, e);
         }
     }
 
-    public static boolean new_wj(String string) {
-        File file = new File(string);
-        if (file.getParentFile().exists()) {
-            file.getParentFile().mkdirs();
-        }
-        try {
-            return file.createNewFile();
-        } catch (IOException e) {
-            gj.sc(e);
-        }
-        return false;
-    }
-
     /*
      * 这里定义的是一个文件保存的方法，写入到文件中，所以是输出流
      * */
     public static boolean xrwb(String url, String text) {
+        if (text == null) {
+            text = "";
+        }
         File file = new File(url);
 //如果文件不存在，创建文件
         try {
-            if (file.getParentFile().exists()) {
-                file.getParentFile().mkdirs();
+            File parentFile = file.getParentFile();
+            if (!parentFile.exists()) {
+                parentFile.mkdirs();
             }
             if (!file.exists())
                 file.createNewFile();
@@ -104,6 +88,10 @@ public class wj {
         return new File(url).exists();
     }
 
+    public static boolean cz(File file) {
+        return file.exists();
+    }
+
     public static boolean sc(String url) {
         File file = new File(url);
         return file.delete();
@@ -145,20 +133,4 @@ public class wj {
         }
         return null;
     }
-
-    public static class xrwb extends Thread {
-        String url, text;
-
-        public xrwb(String url, String text) {
-            this.url = url;
-            this.text = text;
-            start();
-        }
-
-        @Override
-        public void run() {
-            super.run();
-            xrwb(url, text);
-        }
-    }
 }
diff --git a/app/src/main/java/com/muqingbfq/mq/wl.java b/app/src/main/java/com/muqingbfq/mq/wl.java
index 88a4cd4..8737859 100644
--- a/app/src/main/java/com/muqingbfq/mq/wl.java
+++ b/app/src/main/java/com/muqingbfq/mq/wl.java
@@ -27,8 +27,9 @@ public class wl {
     }
 
     public static boolean iskong() {
-        return Cookie.equals("") || Cookie == null;
+        return Cookie.equals("");
     }
+
     public static String hq(String url) {
         try {
             OkHttpClient client = new OkHttpClient();
@@ -74,57 +75,59 @@ public class wl {
         @Override
         public void run() {
             super.run();
-            xz(url, x);
+            try {
+                OkHttpClient client = new OkHttpClient();
+                Request request = new Request.Builder()
+                        //访问路径
+                        .url(url)
+                        .build();
+                Call call = client.newCall(request);
+                Response response = call.execute();
+                if (response.isSuccessful()) {
+                    ResponseBody body = response.body();
+                    if (body != null) {
+                        File file = new File(wj.mp3, String.valueOf(x.id));
+                        if (!file.getParentFile().exists()) {
+                            file.getParentFile().mkdirs();
+                        }
+                        InputStream inputStream = body.byteStream();
+                        FileOutputStream fileOutputStream =
+                                new FileOutputStream(file);
+                        // 替换为实际要保存的文件路径
+                        byte[] buffer = new byte[4096];
+                        int bytesRead;
+                        while ((bytesRead = inputStream.read(buffer)) != -1) {
+                            fileOutputStream.write(buffer, 0, bytesRead);
+                        }
+                        fileOutputStream.close();
+                        inputStream.close();
+                    }
+                }
+                JSONObject jsonObject = new JSONObject();
+                if (wj.cz(wj.mp3_xz)) {
+                    jsonObject = new JSONObject(wj.dqwb(wj.mp3_xz));
+                } else {
+                    jsonObject.put("songs", new JSONArray());
+                }
+                JSONArray songs = jsonObject.getJSONArray("songs");
+                if (songs.length() > 30) {
+                    songs.remove(0);
+                    String id = songs.getJSONObject(0).getString("id");
+                    gj.sc(wj.mp3 + id);
+                    new File(wj.mp3+id).delete();
+                }
+                File file = new File(wj.mp3);
+                JSONObject json = new JSONObject();
+                json.put("id", x.id);
+                json.put("name", x.name);
+                json.put("zz", x.zz);
+                json.put("picUrl", x.picurl);
+                songs.put(json);
+                wj.xrwb(wj.mp3_xz, jsonObject.toString());
+            } catch (Exception e) {
+                gj.sc("wl xz " + e);
+            }
         }
     }
 
-    public static boolean xz(String url, final xm x) {
-        try {
-            OkHttpClient client = new OkHttpClient();
-            Request request = new Request.Builder()
-                    //访问路径
-                    .url(url)
-                    .build();
-            Call call = client.newCall(request);
-            Response response = call.execute();
-            if (response.isSuccessful()) {
-                ResponseBody body = response.body();
-                if (body != null) {
-                    File file = new File(wj.mp3, String.valueOf(x.id));
-                    InputStream inputStream = body.byteStream();
-                    FileOutputStream fileOutputStream =
-                            new FileOutputStream(file);
-                    // 替换为实际要保存的文件路径
-                    byte[] buffer = new byte[4096];
-                    int bytesRead;
-                    while ((bytesRead = inputStream.read(buffer)) != -1) {
-                        fileOutputStream.write(buffer, 0, bytesRead);
-                    }
-                    fileOutputStream.close();
-                    inputStream.close();
-                }
-            }
-            JSONObject jsonObject = new JSONObject();
-            if (wj.cz(wj.mp3_xz)) {
-                jsonObject = new JSONObject(wj.dqwb(wj.mp3_xz));
-            } else {
-                jsonObject.put("songs", new JSONArray());
-            }
-            JSONArray songs = jsonObject.getJSONArray("songs");
-            if (songs.length() > 30) {
-                songs.remove(0);
-            }
-            JSONObject json = new JSONObject();
-            json.put("id", x.id);
-            json.put("name", x.name);
-            json.put("zz", x.zz);
-            json.put("picUrl", x.picurl);
-            songs.put(json);
-            wj.xrwb(wj.mp3_xz, jsonObject.toString());
-            return true;
-        } catch (Exception e) {
-            gj.sc("wl xz " + e);
-        }
-        return false;
-    }
 }
diff --git a/app/src/main/java/com/muqingbfq/start.java b/app/src/main/java/com/muqingbfq/start.java
index a5aa18b..f0199c7 100644
--- a/app/src/main/java/com/muqingbfq/start.java
+++ b/app/src/main/java/com/muqingbfq/start.java
@@ -1,171 +1,51 @@
 package com.muqingbfq;
 
-import android.Manifest;
 import android.annotation.SuppressLint;
-import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.media.MediaPlayer;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Environment;
-import android.provider.Settings;
 import android.util.DisplayMetrics;
-import android.widget.Toast;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
-import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
 
 import com.muqingbfq.login.visitor;
-import com.muqingbfq.mq.gj;
 import com.muqingbfq.mq.wj;
 import com.muqingbfq.mq.wl;
 
 public class start extends AppCompatActivity {
-    public static int ztl, dhl;
     Intent home;
 
     @RequiresApi(api = Build.VERSION_CODES.O)
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        try {
-            home = new Intent(this, home.class);
-            ztl = getNavigationBarHeight(this);
-            dhl = getStatusBarHeight(this);
-            DisplayMetrics dm = getResources().getDisplayMetrics();
-            main.k = dm.widthPixels;
-            main.g = dm.heightPixels;
-        } catch (Exception e) {
-            yc.start(this, e);
-        }
-        if (Build.VERSION.SDK_INT >= 33) {
-            int checkPermission =
-                    ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS);
-            if (checkPermission != PackageManager.PERMISSION_GRANTED) {
-                //动态申请
-                ActivityCompat.requestPermissions(this, new String[]{
-                        Manifest.permission.POST_NOTIFICATIONS}, REQUEST_EXTERNAL_STORAGE);
-            } else {
-                startApp();
-            }
-        } else {
-            startApp();
-        }
-//        checkPermission();
-    }
-
-    public static long time;
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-    }
-
-    public static int getStatusBarHeight(Context context) {
-        int result = 0;
-        @SuppressLint({"InternalInsetResource", "DiscouragedApi"}) int resourceId = context.getResources().getIdentifier("status_bar_height", "dimen", "android");
-        if (resourceId > 0) {
-            result = context.getResources().getDimensionPixelSize(resourceId);
-        }
-        return result;
-    }
-
-    private int getNavigationBarHeight(Context context) {
-        Resources resources = context.getResources();
-        @SuppressLint({"InternalInsetResource", "DiscouragedApi"}) int resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android");
-        return resources.getDimensionPixelSize(resourceId);
-    }
-
-    private static final int REQUEST_EXTERNAL_STORAGE = 1;
-    private static final String[] PERMISSIONS_STORAGE = {android.Manifest.permission.READ_EXTERNAL_STORAGE, android.Manifest.permission.WRITE_EXTERNAL_STORAGE};
-
-    private AlertDialog dialog;
-
-    @SuppressLint("ObsoleteSdkInt")
-    private void checkPermission() {
-        //检查权限（NEED_PERMISSION）是否被授权 PackageManager.PERMISSION_GRANTED表示同意授权
-        if (Build.VERSION.SDK_INT >= 30) {
-            if (!Environment.isExternalStorageManager()) {
-                if (dialog != null) {
-                    dialog.dismiss();
-                    dialog = null;
-                }
-                dialog = new AlertDialog.Builder(this).setTitle("提示")//设置标题
-                        .setMessage("请开启文件访问权限，否则无法正常使用本应用！").setNegativeButton("取消", (dialog, i) -> dialog.dismiss()).setPositiveButton("确定", (dialog, which) -> {
-                            dialog.dismiss();
-                            Intent intent = new Intent(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION);
-                            startActivity(intent);
-                        }).create();
-                dialog.show();
-            } else {
-                gj.sc("Android 11以上，当前已有权限");
-                startApp();
-            }
-        } else {
-            if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
-                if (ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-                    //申请权限
-                    if (dialog != null) {
-                        dialog.dismiss();
-                        dialog = null;
-                    }
-                    dialog = new AlertDialog.Builder(this).setTitle("提示")//设置标题
-                            .setMessage("请开启文件访问权限，否则无法正常使用本应用！").setPositiveButton("确定", (dialog, which) -> {
-                                dialog.dismiss();
-                                ActivityCompat.requestPermissions(this, PERMISSIONS_STORAGE, REQUEST_EXTERNAL_STORAGE);
-                            }).create();
-                    dialog.show();
-                } else {
-                    gj.sc("Android 6.0以上，11以下，当前已有权限");
-                    startApp();
-                }
-            } else {
-                gj.sc("Android 6.0以下，已获取权限");
-                startApp();
-            }
-        }
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (requestCode == REQUEST_EXTERNAL_STORAGE) {
-            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                Toast.makeText(this, "授权成功！", Toast.LENGTH_SHORT).show();
-            } else {
-                Toast.makeText(this, "授权被拒绝！", Toast.LENGTH_SHORT).show();
-            }
-        }
+        home = new Intent(this, home.class);
+        DisplayMetrics dm = getResources().getDisplayMetrics();
+        main.k = dm.widthPixels;
+        main.g = dm.heightPixels;
         startApp();
     }
-
-        private void startApp() {
-            SharedPreferences theme = getSharedPreferences("theme", MODE_PRIVATE);
-            @SuppressLint("CommitPrefEdits") SharedPreferences.Editor edit = theme.edit();
-            int i = theme.getInt("theme", AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
-            if (i == -1) {
-                edit.putInt("theme", AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
-            }
-            AppCompatDelegate.setDefaultNightMode(i);
-
-            wl.Cookie = main.sp.getString(main.Cookie, "");
-            if (wl.Cookie.equals("")) {
-                new visitor(this, home);
-            } else {
-                if (wj.filesdri == null) {
-                    new wj(this);
-                }
-                startActivity(home);
-                finish();
-            }
+    private void startApp() {
+        SharedPreferences theme = getSharedPreferences("theme", MODE_PRIVATE);
+        @SuppressLint("CommitPrefEdits") SharedPreferences.Editor edit = theme.edit();
+        int i = theme.getInt("theme", AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+        if (i == AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM) {
+            edit.putInt("theme", AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+            edit.apply();
         }
+        AppCompatDelegate.setDefaultNightMode(i);
+        wl.Cookie = main.sp.getString(main.Cookie, "");
+        if (wj.filesdri == null) {
+            new wj(this);
+        }
+        if (wl.Cookie.equals("")) {
+            new visitor(this, home);
+        } else {
+            startActivity(home);
+            finish();
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/muqingbfq/sz.java b/app/src/main/java/com/muqingbfq/sz.java
index 5043912..9e782e1 100644
--- a/app/src/main/java/com/muqingbfq/sz.java
+++ b/app/src/main/java/com/muqingbfq/sz.java
@@ -1,9 +1,17 @@
 package com.muqingbfq;
 
 import android.annotation.SuppressLint;
+import android.content.Intent;
 import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
+import android.provider.Settings;
+import android.view.LayoutInflater;
 import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
@@ -20,7 +28,15 @@ public class sz extends AppCompatActivity {
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        UI();
+//        UI();
+//        kaifazhe();
+    }
+
+    /**
+     * 建立底部浮动栏的方法
+     */
+    public void CreateFloatView(){
+            View mFloatView = LayoutInflater.from(getBaseContext()).inflate(R.layout.fragment_bfq_db,null);
     }
 
     @SuppressLint("ApplySharedPref")
@@ -70,4 +86,32 @@ public class sz extends AppCompatActivity {
         }
         return super.onOptionsItemSelected(item);
     }
+
+    public void kaifazhe() {
+        MaterialSwitch materialSwitch = findViewById(R.id.switch_kfz);
+        materialSwitch.setOnCheckedChangeListener((compoundButton, b) -> {
+            if (b) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
+                        !Settings.canDrawOverlays(this)) {
+                    Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
+                            Uri.parse("package:" + getPackageName()));
+                    startActivityForResult(intent, 114511);
+                } else {
+                    com.muqingbfq.mq.floating.start(sz.this);
+                }
+            } else {
+                com.muqingbfq.mq.floating.end(sz.this);
+            }
+        });
+    }
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 114511) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && Settings.canDrawOverlays(this)) {
+                com.muqingbfq.mq.floating.start(sz.this);
+            }
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/muqingbfq/yc.java b/app/src/main/java/com/muqingbfq/yc.java
index 29ff654..09813b4 100644
--- a/app/src/main/java/com/muqingbfq/yc.java
+++ b/app/src/main/java/com/muqingbfq/yc.java
@@ -1,26 +1,49 @@
 package com.muqingbfq;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
+import android.provider.Settings;
+import android.util.DisplayMetrics;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 public class yc extends AppCompatActivity {
     public static Object exception;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_yc);
         TextView text = findViewById(R.id.text);
-        try {
-            text.setText(exception.toString());
-        } catch (Exception e) {
-            Toast.makeText(this, e.toString(), Toast.LENGTH_SHORT).show();
-        }
+
+        String deviceModel = Build.MODEL;
+        String deviceManufacturer = Build.MANUFACTURER;
+        String osVersion = Build.VERSION.RELEASE;
+        int sdkVersion = Build.VERSION.SDK_INT;
+        @SuppressLint("HardwareIds") String deviceId = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID);
+        DisplayMetrics metrics = getResources().getDisplayMetrics();
+        int widthPixels = metrics.widthPixels;
+        int heightPixels = metrics.heightPixels;
+        float density = metrics.density;
+        int densityDpi = metrics.densityDpi;
+// 假设你已经获取到了手机信息，保存在相应的变量中
+        String wb = "设备型号：" + deviceModel + "\n"
+                + "制造商：" + deviceManufacturer + "\n"
+                + "设备ID：" + deviceId + "\n"
+                + "操作系统版本：" + osVersion + "\n"
+                + "SDK版本：" + sdkVersion + "\n"
+                + "屏幕尺寸：" + widthPixels + "x" + heightPixels + "\n"
+                + "屏幕密度：" + density + "\n"
+                + "密度DPI：" + densityDpi + "\n" +
+                "异常信息： " + exception.toString();
+        text.setText(wb);
     }
 
     public static void start(Object e) {
@@ -29,6 +52,15 @@ public class yc extends AppCompatActivity {
 
     public static void start(Context context, Object e) {
         yc.exception = e;
-        context.startActivity(new Intent(context,yc.class));
+        context.startActivity(new Intent(context, yc.class));
+    }
+
+    public static void tc(Context context, Object exception) {
+        new MaterialAlertDialogBuilder(context)
+                .setTitle("不是特别重要的警告")
+                .setMessage(exception.toString())
+                .setNegativeButton("无视", null)
+                .setPositiveButton("分享", null)
+                .show();
     }
 }
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
index a22bf42..539a267 100644
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="80"
     android:viewportHeight="80">
     <path
-        android:fillColor="@color/bj"
+        android:fillColor="#FFFFFF"
         android:pathData="M0,0h80v80h-80z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index a5b12f6..fb5ffb9 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -9,9 +9,9 @@
       android:translateY="261.6889">
     <path
         android:pathData="M995,538.7c-13.8,-8.9 -30.3,-12 -46.4,-8.5l-182.9,39.3c-28.2,6.1 -48.6,31.4 -48.6,60.2v224.6c0,21.8 -17.7,39.5 -39.6,39.5 -21.8,0 -39.5,-17.7 -39.5,-39.5s17.7,-39.6 39.5,-39.6c15.4,0 27.8,-12.4 27.8,-27.8s-12.4,-27.8 -27.8,-27.8c-52.4,0 -95.1,42.7 -95.1,95.2 0,52.4 42.7,95.1 95.1,95.1 52.5,0 95.1,-42.7 95.1,-95.1V629.8c0,-2.9 2,-5.3 4.8,-5.9l182.9,-39.3c1.9,-0.5 3.6,0.2 4.5,0.8 1,0.6 2.2,1.8 2.7,5V814c0,21.8 -17.7,39.6 -39.6,39.6 -10.5,0 -20.5,-4.1 -27.9,-11.6 -7.5,-7.5 -11.6,-17.4 -11.6,-28 0,-21.8 17.7,-39.6 39.6,-39.6 15.4,0 27.8,-12.4 27.8,-27.8s-12.4,-27.8 -27.8,-27.8c-52.5,0 -95.1,42.7 -95.1,95.1 0,25.4 9.9,49.3 27.9,67.3s41.8,27.9 67.2,27.9c52.5,0 95.1,-42.7 95.1,-95.1V590.5c0,-4.4 -0.5,-8.7 -1.4,-12.9 -3.4,-16.1 -12.9,-29.9 -26.7,-38.9z"
-        android:fillColor="@color/text"/>
+        android:fillColor="#000000"/>
     <path
         android:pathData="M338.3,315.1c35.3,-63.9 90.4,-114.1 158.6,-143.6 81.4,-35.2 171.7,-36.6 254.1,-3.9 106.7,42.3 183,134.9 204.1,247.8 3.1,16.7 17.7,28.4 34.1,28.4 2.1,0 4.3,-0.2 6.4,-0.6 18.9,-3.5 31.3,-21.7 27.8,-40.5C997.9,266.2 905.7,154.1 776.6,103c-99.7,-39.5 -208.8,-37.8 -307.3,4.7 -92.5,40 -165.1,111.6 -206.4,202.8 -48.9,3.6 -96.2,19.8 -137.8,48C62.2,400.9 19.7,465.3 5.3,539.7c-14.4,74.4 1,150 43.5,212.9 52.9,78.3 140.8,125 235.2,125h153.3c19.2,0 34.7,-15.6 34.7,-34.7s-15.6,-34.7 -34.7,-34.7H284c-71.3,0 -137.7,-35.3 -177.7,-94.4C74.2,666.3 62.6,609.3 73.5,553c10.9,-56.2 43,-104.8 90.5,-136.9 47.5,-32.1 104.5,-43.7 160.8,-32.8 56.2,10.9 104.8,43 136.9,90.5 10.7,15.9 32.3,20.1 48.2,9.3 15.9,-10.7 20.1,-32.3 9.3,-48.2 -42.4,-62.8 -106.6,-105.3 -180.9,-119.8z"
-        android:fillColor="@color/text"/>
+        android:fillColor="#000000"/>
   </group>
 </vector>
diff --git a/app/src/main/res/drawable/shape_sheet_dialog_bg.xml b/app/src/main/res/drawable/shape_sheet_dialog_bg.xml
index 6eab874..9385757 100644
--- a/app/src/main/res/drawable/shape_sheet_dialog_bg.xml
+++ b/app/src/main/res/drawable/shape_sheet_dialog_bg.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners
-        android:topLeftRadius="15dp"
-        android:topRightRadius="15dp" />
+        android:topLeftRadius="16dp"
+        android:topRightRadius="16dp" />
     <solid android:color="@color/bj" />
 </shape>
diff --git a/app/src/main/res/layout/activity_about_software.xml b/app/src/main/res/layout/activity_about_software.xml
index 80fca98..9b06be2 100644
--- a/app/src/main/res/layout/activity_about_software.xml
+++ b/app/src/main/res/layout/activity_about_software.xml
@@ -48,12 +48,21 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="6dp">
+        android:padding="6dp"
+        android:orientation="vertical">
+
         <Button
+            android:id="@+id/button1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/jianchagegnxin"
+            android:textColor="@color/bj" />
+
+        <Button
+            android:id="@+id/button2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/juanzeng"
-            android:textColor="@color/bj"
-            tools:ignore="VisualLintButtonSize" />
+            android:textColor="@color/bj" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_enroll.xml b/app/src/main/res/layout/activity_enroll.xml
index 1e9c452..e7b46d4 100644
--- a/app/src/main/res/layout/activity_enroll.xml
+++ b/app/src/main/res/layout/activity_enroll.xml
@@ -18,39 +18,32 @@
         android:id="@+id/user1"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
         android:orientation="vertical">
-
         <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="50dp"
-            android:layout_marginEnd="16dp"
-            android:hint="用户名/账号">
-
+            android:layout_marginTop="20dp"
+            android:hint="UID">
             <EditText
                 android:id="@+id/edit_user"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:inputType="textEmailAddress" />
         </com.google.android.material.textfield.TextInputLayout>
-
         <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
             android:layout_marginTop="20dp"
-            android:layout_marginEnd="16dp"
+            app:passwordToggleEnabled="true"
             android:hint="密码">
-
             <EditText
                 android:id="@+id/edit_password"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:inputType="textPassword" />
-
         </com.google.android.material.textfield.TextInputLayout>
-
         <Button
             android:id="@+id/edit_cookie"
             android:layout_width="wrap_content"
@@ -58,8 +51,6 @@
             android:text="绑定网易云音乐"
             android:layout_margin="16dp"
             android:layout_gravity="end"/>
-
-
         <Button
             android:id="@+id/enroll"
             android:layout_width="match_parent"
@@ -69,5 +60,5 @@
             android:layout_marginEnd="16dp"
             android:text="注册"
             android:textColor="@color/bj" />
-    </LinearLayout>=
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 077afe8..f2e3ddb 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -28,10 +28,12 @@
                 android:layout_weight="1"
                 android:name="com.muqingbfq.fragment.gd"
                 tools:layout="@layout/fragment_gd" />
-            <FrameLayout
+            <androidx.fragment.app.FragmentContainerView
                 android:id="@+id/bfq_db"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:name="com.muqingbfq.fragment.bfq_db"
+                tools:layout="@layout/fragment_bfq_db" />
         </androidx.appcompat.widget.LinearLayoutCompat>
         <com.google.android.material.navigation.NavigationView
             android:id="@+id/chb"
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index f78917a..891f7c3 100644
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -27,53 +26,60 @@
             tools:ignore="TextContrastCheck,VisualLintTextFieldSize" />
     </androidx.appcompat.widget.Toolbar>
     <RelativeLayout
-        android:id="@+id/xxbj1"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/toolbar"
-        android:orientation="vertical">
+        android:layout_height="0dp"
+        android:layout_weight="1">
         <LinearLayout
-            android:id="@+id/xxbj2"
+            android:id="@+id/xxbj1"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:padding="6dp"
-            tools:ignore="UseCompoundDrawables">
-            <TextView
-                android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/lishijilu"
-                android:textColor="@color/text"
-                android:textSize="26sp" />
-            <ImageView
-                android:id="@+id/deleat"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:layout_marginEnd="16dp"
-                android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:contentDescription="@string/deleat"
-                android:src="@drawable/deleat" />
+                android:orientation="horizontal"
+                android:padding="6dp"
+                tools:ignore="UseCompoundDrawables">
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/lishijilu"
+                    android:textColor="@color/text"
+                    android:textSize="26sp" />
+                <ImageView
+                    android:id="@+id/deleat"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:layout_marginEnd="16dp"
+                    android:background="?android:attr/selectableItemBackgroundBorderless"
+                    android:contentDescription="@string/deleat"
+                    android:src="@drawable/deleat" />
+            </LinearLayout>
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/list_recycler"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"/>
         </LinearLayout>
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/list_recycler"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_below="@id/xxbj2"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-        <FrameLayout
+        <androidx.fragment.app.FragmentContainerView
             android:id="@+id/search_fragment"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"
+            android:name="com.muqingbfq.fragment.search"
+            tools:layout="@layout/fragment_search" />
+        <ListView
+            android:id="@+id/search_recycler"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone"
+            android:background="@color/bj"/>
     </RelativeLayout>
-
-    <ListView
-        android:id="@+id/search_recycler"
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/bfq_db"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/toolbar"
-        android:visibility="gone"
-        android:background="@color/bj"/>
+        android:layout_height="wrap_content"
+        android:name="com.muqingbfq.fragment.bfq_db"
+        tools:layout="@layout/fragment_bfq_db" />
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_sz.xml b/app/src/main/res/layout/activity_sz.xml
index e2f6897..b632ff9 100644
--- a/app/src/main/res/layout/activity_sz.xml
+++ b/app/src/main/res/layout/activity_sz.xml
@@ -16,36 +16,57 @@
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:padding="16dp">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="主题模式"
-                android:textSize="20dp" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
 
-            <com.google.android.material.materialswitch.MaterialSwitch
-                android:id="@+id/switch_a1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:checked="true"
-                android:text="根据系统" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="主题模式"
+                    android:textSize="20sp" />
 
-            <com.google.android.material.materialswitch.MaterialSwitch
-                android:id="@+id/switch_a2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="26dp"
-                android:enabled="false"
-                android:text="深色模式" />
+                <com.google.android.material.materialswitch.MaterialSwitch
+                    android:id="@+id/switch_a1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:checked="true"
+                    android:text="根据系统" />
 
+                <com.google.android.material.materialswitch.MaterialSwitch
+                    android:id="@+id/switch_a2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="26dp"
+                    android:enabled="false"
+                    android:text="深色模式" />
+            </LinearLayout>
+
+
+            <com.google.android.material.divider.MaterialDivider
+                android:id="@+id/materialDivider"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"  />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <com.google.android.material.materialswitch.MaterialSwitch
+                    android:id="@+id/switch_kfz"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="开发者模式" />
+
+            </LinearLayout>
         </LinearLayout>
-
-
     </androidx.core.widget.NestedScrollView>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_user_logs.xml b/app/src/main/res/layout/activity_user_logs.xml
index acc6ae3..c603b37 100644
--- a/app/src/main/res/layout/activity_user_logs.xml
+++ b/app/src/main/res/layout/activity_user_logs.xml
@@ -33,7 +33,8 @@
             android:layout_marginStart="16dp"
             android:layout_marginTop="50dp"
             android:layout_marginEnd="16dp"
-            android:hint="用户名/账号">
+            android:hint="UID">
+
             <EditText
                 android:id="@+id/edit_user"
                 android:layout_width="match_parent"
@@ -52,7 +53,8 @@
                 android:id="@+id/edit_password"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:inputType="textPassword" />
+                android:inputType="textPassword"
+                android:textColorHint="#546E7A" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/activity_yc.xml b/app/src/main/res/layout/activity_yc.xml
index 5c18125..98e3488 100644
--- a/app/src/main/res/layout/activity_yc.xml
+++ b/app/src/main/res/layout/activity_yc.xml
@@ -4,16 +4,25 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:gravity="center"
-    android:padding="16dp"
     tools:context=".yc">
     <TextView
         android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
         android:textColor="@android:color/holo_red_dark"
         android:textSize="18sp"
         android:textStyle="bold"
-        android:gravity="center"
+        android:padding="16dp"
         tools:text="出现异常" />
+
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/fx"/>
+
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/quxiao" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_bfq.xml b/app/src/main/res/layout/fragment_bfq.xml
index ea5f7c2..80166d2 100644
--- a/app/src/main/res/layout/fragment_bfq.xml
+++ b/app/src/main/res/layout/fragment_bfq.xml
@@ -2,66 +2,65 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/bfq"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:fillViewport="true"
     android:orientation="vertical">
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:title="">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-            <TextView
-                android:id="@+id/name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:text="@string/name"
-                android:textColor="@color/text"
-                android:textSize="16sp" />
-            <TextView
-                android:id="@+id/zz"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:maxLines="2"
-                android:text="@string/zz" />
-        </LinearLayout>
-    </androidx.appcompat.widget.Toolbar>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:orientation="horizontal">
-        <LinearLayout
+        android:orientation="vertical">
+        <RelativeLayout
             android:id="@+id/kp1"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:gravity="center"
-            android:layout_weight="1">
+            android:layout_weight="1"
+            android:gravity="center_vertical"
+            tools:ignore="NestedWeights">
             <com.google.android.material.card.MaterialCardView
+                android:id="@+id/view1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:cardCornerRadius="16dp"
+                android:layout_centerHorizontal="true"
                 app:cardUseCompatPadding="true">
                 <ImageView
                     android:id="@+id/mttx"
                     android:layout_width="260dp"
                     android:layout_height="260dp"
+                    android:importantForAccessibility="no"
                     android:scaleType="fitXY"
                     android:src="@drawable/icon" />
             </com.google.android.material.card.MaterialCardView>
-        </LinearLayout>
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/view1"
+                android:layout_alignStart="@id/view1"
+                android:orientation="vertical">
+                <TextView
+                    android:id="@+id/name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:text="@string/name"
+                    android:textColor="@color/text"
+                    android:textSize="26sp" />
+                <TextView
+                    android:id="@+id/zz"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:maxLines="2"
+                    android:text="@string/zz"
+                    android:textSize="20sp" />
+            </LinearLayout>
+
+        </RelativeLayout>
         <com.dirror.lyricviewx.LyricViewX
             android:id="@+id/gc"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_weight="1"
+            android:layout_weight="3"
             app:lrcCurrentTextColor="@color/text"
             app:lrcLabel="@string/app_name"
             app:lrcNormalTextSize="16sp"
@@ -70,75 +69,85 @@
             app:lrcTimelineTextColor="@color/text_tm"
             tools:ignore="MissingConstraints" />
     </LinearLayout>
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:paddingEnd="16dp"
-        android:paddingStart="16dp">
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp">
+
         <ImageView
             android:id="@+id/like"
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:src="@mipmap/like"
-            app:tint="@color/text" />
+            app:tint="@color/text"
+            tools:ignore="ContentDescription" />
     </LinearLayout>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
+        android:orientation="horizontal"
         android:paddingStart="3dp"
-        android:paddingEnd="3dp"
-        android:orientation="horizontal">
+        android:paddingEnd="3dp">
+
         <TextView
             android:id="@+id/time_a"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/_00_00"/>
+            android:text="@string/_00_00" />
+
         <SeekBar
             android:id="@+id/tdt"
             android:layout_width="0dp"
             android:layout_height="48dp"
             android:layout_weight="1"
             android:clickable="true"
-            android:padding="6dp"
-            android:focusable="true" />
+            android:focusable="true"
+            android:padding="6dp" />
+
         <TextView
             android:id="@+id/time_b"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/_00_00"/>
+            android:text="@string/_00_00" />
     </LinearLayout>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingEnd="20dp"
-        android:paddingStart="20dp"
-        android:paddingBottom="26dp"
         android:gravity="center"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp"
+        android:paddingBottom="26dp">
+
         <ImageView
             android:id="@+id/control"
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:layout_marginEnd="26dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/mt_sx" />
+            android:src="@drawable/mt_sx"
+            tools:ignore="ContentDescription" />
+
         <ImageView
             android:id="@+id/syq"
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:layout_marginEnd="12dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/syq" />
+            android:src="@drawable/syq"
+            tools:ignore="ContentDescription" />
+
         <ImageView
             android:id="@+id/kg"
             android:layout_width="46dp"
             android:layout_height="46dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/zt" />
+            android:src="@drawable/zt"
+            tools:ignore="ContentDescription" />
 
         <ImageView
             android:id="@+id/xyq"
@@ -146,13 +155,16 @@
             android:layout_height="36dp"
             android:layout_marginStart="12dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:importantForAccessibility="no"
             android:src="@drawable/xyq" />
+
         <ImageView
             android:id="@+id/bfq_list_mp3"
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:layout_marginStart="26dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/cd" />
+            android:src="@drawable/cd"
+            tools:ignore="ContentDescription" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_bfq_db.xml b/app/src/main/res/layout/fragment_bfq_db.xml
index 8144c0f..3d4aeb7 100644
--- a/app/src/main/res/layout/fragment_bfq_db.xml
+++ b/app/src/main/res/layout/fragment_bfq_db.xml
@@ -5,8 +5,7 @@
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     app:cardUseCompatPadding="true"
-    app:cardCornerRadius="16dp"
-    tools:context=".fragment.bfq_db">
+    app:cardCornerRadius="16dp">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -56,9 +55,9 @@
                 android:layout_width="36dp"
                 android:layout_height="36dp"
                 android:layout_margin="6dp"
+                app:tint="@color/text"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
                 android:src="@drawable/cd" />
         </LinearLayout>
     </LinearLayout>
-
 </com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_gd.xml b/app/src/main/res/layout/fragment_gd.xml
index 7f812f2..b2878cc 100644
--- a/app/src/main/res/layout/fragment_gd.xml
+++ b/app/src/main/res/layout/fragment_gd.xml
@@ -3,7 +3,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
-
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/tablayout"
         android:layout_width="match_parent"
@@ -16,5 +15,4 @@
         android:columnWidth="120dp"
         android:numColumns="auto_fit"
         android:stretchMode="columnWidth" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_mp3.xml b/app/src/main/res/layout/fragment_mp3.xml
index 3356050..c37c31c 100644
--- a/app/src/main/res/layout/fragment_mp3.xml
+++ b/app/src/main/res/layout/fragment_mp3.xml
@@ -2,8 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical">
-
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
@@ -11,5 +11,12 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/lb"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/bfq_db"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:name="com.muqingbfq.fragment.bfq_db"
+        tools:layout="@layout/fragment_bfq_db" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index f97f67a..69fba5c 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
diff --git a/app/src/main/res/layout/fragment_sz.xml b/app/src/main/res/layout/fragment_sz.xml
index 08bb813..270aa26 100644
--- a/app/src/main/res/layout/fragment_sz.xml
+++ b/app/src/main/res/layout/fragment_sz.xml
@@ -8,12 +8,13 @@
     tools:context=".fragment.sz"
     android:fitsSystemWindows="true"
     android:focusable="true">
-    <RelativeLayout
+    <LinearLayout
         android:id="@+id/xdbj"
         android:layout_margin="6dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="6dp"
+        android:orientation="horizontal"
         tools:ignore="UselessParent">
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/cardview"
@@ -27,21 +28,27 @@
                 android:layout_height="match_parent"
                 android:src="@drawable/icon" />
         </com.google.android.material.card.MaterialCardView>
-        <TextView
-            android:id="@+id/sz_text1"
-            android:layout_width="match_parent"
+        <LinearLayout
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_toEndOf="@id/cardview"
-            android:text="@string/denglu"
-            android:textSize="26sp" />
-        <TextView
-            android:id="@+id/sz_text2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/sz_text1"
-            android:layout_marginTop="6dp"
-            android:layout_marginBottom="35dp"
-            android:layout_toEndOf="@id/cardview"
-            android:text="我是一名小小的游客" />
-    </RelativeLayout>
+            android:layout_weight="1"
+            android:orientation="vertical">
+            <TextView
+                android:id="@+id/sz_text1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_toEndOf="@id/cardview"
+                android:text="@string/denglu"
+                android:textSize="26sp" />
+            <TextView
+                android:id="@+id/sz_text2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/sz_text1"
+                android:layout_marginTop="6dp"
+                android:layout_marginBottom="35dp"
+                android:layout_toEndOf="@id/cardview"
+                android:text="我是一名小小的游客" />
+        </LinearLayout>
+    </LinearLayout>
 </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/list_text.xml b/app/src/main/res/layout/list_text.xml
index bf785c0..504cb62 100644
--- a/app/src/main/res/layout/list_text.xml
+++ b/app/src/main/res/layout/list_text.xml
@@ -2,14 +2,18 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/ui_editview"
-    android:layout_margin="6dp"
-    android:padding="16dp">
-    <TextView
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <Button
+        android:id="@+id/button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/text"
-        android:textColor="@color/text"
-        android:textSize="16sp"
-        android:text="@string/name"/>
+        android:text="@string/app_name"
+        android:backgroundTint="@android:color/transparent"
+        android:textColor="?attr/colorOnSurface"
+        android:textAppearance="?attr/textAppearanceLabelLarge"
+        android:layout_marginStart="6dp"
+        app:strokeColor="?attr/colorOnSurface"
+        app:strokeWidth="1dp"
+        app:elevation="0dp"
+        app:rippleColor="?attr/colorOnSurface"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/notification_layout.xml b/app/src/main/res/layout/notification_layout.xml
deleted file mode 100644
index da1ef19..0000000
--- a/app/src/main/res/layout/notification_layout.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <ImageView
-        android:id="@+id/logo"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:padding="6dp"
-        android:src="@drawable/icon" />
-    <LinearLayout
-        android:id="@+id/xxbj1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_toEndOf="@+id/logo"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:text="@string/name"
-            android:textColor="@color/text"
-            android:textSize="16sp" />
-
-        <TextView
-            android:id="@+id/zz"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:text="@string/zz"
-            android:textSize="14sp" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/xxbj1"
-        android:layout_alignBottom="@id/logo"
-        android:layout_toEndOf="@+id/logo"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/syq"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:background="@drawable/bw"
-            android:src="@drawable/syq" />
-
-        <ImageView
-            android:id="@+id/kg"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:background="@drawable/bw"
-            android:src="@drawable/zt" />
-
-        <ImageView
-            android:id="@+id/xyq"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:background="@drawable/bw"
-            android:src="@drawable/xyq" />
-
-    </LinearLayout>
-</RelativeLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0f1b3dc..deb90c0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -24,7 +24,7 @@
     <string name="tuichudenglu">退出登录</string>
     <string name="search">搜索</string>
     <string name="about">关于软件</string>
-    <string name="juanzeng">捐赠软件</string>
+    <string name="juanzeng">投币</string>
     <string name="fuwuzhongxing">服务中心</string>
     <string name="shezhizhongxing">设置中心</string>
     <string name="chucunqingli">储存清理</string>
@@ -37,6 +37,8 @@
     <string name="_00_00">00:00</string>
     <string name="music">音乐</string>
     <string name="Playlist">歌单</string>
+    <string name="quxiao">取消</string>
+    <string name="jianchagegnxin">检查更新</string>
     <string-array name="gd_list">
         <item>下载歌单</item>
         <item>收藏歌单（不可用)</item>
diff --git a/build.gradle b/build.gradle
index f1a88cd..7ffeefa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,4 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     id 'com.android.application' version '8.1.0' apply false
-    id 'com.android.library' version '7.1.3' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.20' apply false
 }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..249e5832f090a2944b7473328c07c9755baa3196 100644
GIT binary patch
delta 21931
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

delta 20228
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b49c0ae..f75e219 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Sat Oct 21 17:18:56 CST 2023
+#Sat Nov 18 17:46:31 CST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
diff --git a/gradlew b/gradlew
index 4f906e0..a69d9cb 100644
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,101 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 107acd3..f127cfd 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal