diff --git a/README.md b/README.md
index d906fd5ab..781c9b056 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ flutter --version
 Android相关版本：
 > JDK: 21.0.4
 > gradle: 8.10.2
-> kotlin: 1.9.22
+> kotlin: 2.0.20
 > minSdk: 21
 > targetSdk: 34
 > compileSdk: 34
diff --git a/android/app/build.gradle b/android/app/build.gradle
index ef0053198..daf084773 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -96,8 +96,8 @@ flutter {
 }
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.9.0'
-    implementation 'org.conscrypt:conscrypt-android:2.5.2'
+    api 'androidx.annotation:annotation:1.9.0'
+    api 'org.conscrypt:conscrypt-android:2.5.2'
 }
 
 ext.abiCodes = ["x86_64": 1, "armeabi-v7a": 2, "arm64-v8a": 3]
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index ac7fe57c9..e82d417c0 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.orz12.PiliPalaX">
+    xmlns:tools="http://schemas.android.com/tools">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 69700ea57..9c8914714 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.orz12.PiliPalaX">
+    xmlns:tools="http://schemas.android.com/tools"
+    >
     <queries>
         <intent>
             <action android:name="android.intent.action.VIEW" />
@@ -39,7 +40,6 @@
         android:label="PiliPalaX"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        xmlns:tools="http://schemas.android.com/tools"
         android:enableOnBackInvokedCallback="false"
         android:allowBackup="false"
         android:fullBackupContent="false"
@@ -193,6 +193,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" tools:ignore="ProtectedPermissions"/>
     <!--
       Media access permissions.
       Android 13 or higher.
diff --git a/android/app/src/main/kotlin/com/orz12/PiliPalaX/MainActivity.kt b/android/app/src/main/kotlin/com/orz12/PiliPalaX/MainActivity.kt
index ecd9158fc..1707322dd 100644
--- a/android/app/src/main/kotlin/com/orz12/PiliPalaX/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/orz12/PiliPalaX/MainActivity.kt
@@ -3,7 +3,7 @@ package com.orz12.PiliPalaX
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 //import io.flutter.plugin.common.MethodChannel
-//import com.ryanheise.audioservice.AudioServiceActivity
+import com.ryanheise.audioservice.AudioServiceActivity
 import com.ryanheise.audioservice.AudioServicePlugin
 import android.os.Build
 import android.os.Bundle
@@ -13,7 +13,7 @@ import android.content.Context
 import androidx.annotation.NonNull
 
 //class AudioServiceActivity : FlPiPActivity() {
-class MainActivity : FlPiPActivity() {
+class MainActivity: FlPiPActivity() {
 //    private lateinit var methodChannel: MethodChannel
 
     override fun provideFlutterEngine(context: Context): FlutterEngine {
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index 4143d885b..988b8ca4f 100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.orz12.PiliPalaX">
+    >
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/android/build.gradle b/android/build.gradle
index 22731cbcb..568d5a93c 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -48,6 +48,45 @@ subprojects {
                     namespace project.group
                 }
             }
+
+            // Task to ensure namespace and remove package attribute
+            project.tasks.register("fixManifestsAndNamespace") {
+                doLast {
+                    // Ensure namespace in build.gradle
+                    def buildGradleFile = file("${project.projectDir}/build.gradle")
+                    if (buildGradleFile.exists()) {
+                        def buildGradleContent = buildGradleFile.getText('UTF-8')
+                        def manifestFile = file("${project.projectDir}/src/main/AndroidManifest.xml")
+                        if (manifestFile.exists()) {
+                            def manifestContent = manifestFile.getText('UTF-8')
+                            def packageName = manifestContent.find(/package="([^"]+)"/) { match, p -> p }
+                            if (packageName && !buildGradleContent.contains("namespace")) {
+                                println "Setting namespace in ${buildGradleFile}"
+                                buildGradleContent = buildGradleContent.replaceFirst(
+                                        /android\s*\{/, "android {\n    namespace '${packageName}'"
+                                )
+                                buildGradleFile.write(buildGradleContent, 'UTF-8')
+                            }
+                        }
+                    }
+
+                    // Remove package attribute from AndroidManifest.xml
+                    def manifests = fileTree(dir: project.projectDir, includes: ['**/AndroidManifest.xml'])
+                    manifests.each { File manifestFile ->
+                        def manifestContent = manifestFile.getText('UTF-8')
+                        if (manifestContent.contains('package=')) {
+                            println "Removing package attribute from ${manifestFile}"
+                            manifestContent = manifestContent.replaceAll(/package="[^"]*"/, '')
+                            manifestFile.write(manifestContent, 'UTF-8')
+                        }
+                    }
+                }
+            }
+
+            // Ensure the task runs before the build process
+            project.tasks.matching { it.name.startsWith("preBuild") }.all {
+                dependsOn project.tasks.named("fixManifestsAndNamespace")
+            }
         }
     }
     project.buildDir = "${rootProject.buildDir}/${project.name}"
@@ -59,3 +98,7 @@ subprojects {
 tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
+
+ext {
+    kotlin_version = '2.0.20'
+}
diff --git a/lib/common/constants.dart b/lib/common/constants.dart
index 1640da498..6cc1de3f1 100644
--- a/lib/common/constants.dart
+++ b/lib/common/constants.dart
@@ -21,7 +21,7 @@ class Constants {
   static const String traceId =
       '11111111111111111111111111111111:1111111111111111:0:0';
   static const String userAgent =
-  'Mozilla/5.0 BiliDroid/1.46.2 (bbcallen@gmail.com) os/android model/vivo mobi_app/android_hd build/1462100 channel/yingyongbao innerVer/1462100 osVer/14 network/2';
+  'Mozilla/5.0 BiliDroid/1.46.2 (bbcallen@gmail.com) os/android model/vivo mobi_app/android_hd build/2001100 channel/yingyongbao innerVer/2001100 osVer/14 network/2';
   static const String statistics = '%7B%22appId%22%3A5%2C%22platform%22%3A3%2C%22version%22%3A%221.46.2%22%2C%22abtest%22%3A%22%22%7D';
   //Uri.encodeComponent('{"appId": 5,"platform": 3,"version": "1.46.2","abtest": ""}');
 
diff --git a/lib/common/widgets/audio_video_progress_bar.dart b/lib/common/widgets/audio_video_progress_bar.dart
index eec15bcfb..fd2bcf343 100644
--- a/lib/common/widgets/audio_video_progress_bar.dart
+++ b/lib/common/widgets/audio_video_progress_bar.dart
@@ -5,6 +5,8 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 
+import '../../utils/utils.dart';
+
 /// This is where the current time and total time labels should appear in
 /// relation to the progress bar.
 enum TimeLabelLocation {
@@ -1102,7 +1104,9 @@ class _RenderProgressBar extends RenderBox {
     // description
     config.textDirection = TextDirection.ltr;
     config.label = '进度条'; //'Progress bar';
-    config.value = '${(_thumbValue * 100).round()}%';
+    config.value = '${(_thumbValue * 100).round()}%，'
+        '已播放${Utils.durationReadFormat(Utils.timeFormat(progress.inSeconds))}，'
+        '共${Utils.durationReadFormat(Utils.timeFormat(total.inSeconds))}';
 
     // increase action
     config.onIncrease = increaseAction;
diff --git a/lib/common/widgets/badge.dart b/lib/common/widgets/badge.dart
index 9db23e090..85793d5f5 100644
--- a/lib/common/widgets/badge.dart
+++ b/lib/common/widgets/badge.dart
@@ -68,7 +68,7 @@ class PBadge extends StatelessWidget {
         border: Border.all(color: borderColor),
       ),
       child: Text(
-        text ?? "",
+        text == "ketang" ? "课堂" : text ?? "",
         style: TextStyle(
           height: 1,
           fontSize: fs ?? fontSize,
diff --git a/lib/common/widgets/spring_physics.dart b/lib/common/widgets/spring_physics.dart
index aaf582825..dd33beb52 100644
--- a/lib/common/widgets/spring_physics.dart
+++ b/lib/common/widgets/spring_physics.dart
@@ -10,7 +10,7 @@ class CustomTabBarViewScrollPhysics extends ScrollPhysics {
 
   @override
   SpringDescription get spring => const SpringDescription(
-    mass: 100,
+    mass: 40,
     stiffness: 10,
     damping: 1,
   );
diff --git a/lib/common/widgets/video_card_v.dart b/lib/common/widgets/video_card_v.dart
index f76ef8909..b6940eabe 100644
--- a/lib/common/widgets/video_card_v.dart
+++ b/lib/common/widgets/video_card_v.dart
@@ -36,6 +36,7 @@ class VideoCardV extends StatelessWidget {
 
   void onPushDetail(heroTag) async {
     String goto = videoItem.goto;
+    print("goto $goto");
     switch (goto) {
       case 'bangumi':
         if (videoItem.bangumiBadge == '电影') {
@@ -63,12 +64,17 @@ class VideoCardV extends StatelessWidget {
         }
         break;
       case 'av':
+        print("currentRoute: ${Get.currentRoute}");
         String bvid = videoItem.bvid ?? IdUtils.av2bv(videoItem.aid);
-        Get.toNamed('/video?bvid=$bvid&cid=${videoItem.cid}', arguments: {
-          // 'videoItem': videoItem,
-          'pic': videoItem.pic,
-          'heroTag': heroTag,
-        });
+        Get.toNamed(
+          '/video?bvid=$bvid&cid=${videoItem.cid}',
+          arguments: {
+            // 'videoItem': videoItem,
+            'pic': videoItem.pic,
+            'heroTag': heroTag,
+          },
+          // preventDuplicates: false,
+        );
         break;
       // 动态
       case 'picture':
diff --git a/lib/common/widgets/video_popup_menu.dart b/lib/common/widgets/video_popup_menu.dart
index 8b7e4f932..484a18a92 100644
--- a/lib/common/widgets/video_popup_menu.dart
+++ b/lib/common/widgets/video_popup_menu.dart
@@ -47,16 +47,21 @@ class VideoCustomActions {
         }
         if (videoItem is RecVideoItemAppModel) {
           RecVideoItemAppModel v = videoItem as RecVideoItemAppModel;
-          ThreePoint? tp = v.threePoint;
-          if (tp == null) {
-            SmartDialog.showToast("未能获取threePoint");
+          // ThreePoint? tp = v.threePoint;
+          // if (tp == null) {
+          //   SmartDialog.showToast("未能获取threePoint");
+          //   return;
+          // }
+          // if (tp.dislikeReasons == null && tp.feedbacks == null) {
+          //   SmartDialog.showToast("未能获取dislikeReasons或feedbacks");
+          //   return;
+          // }
+          if (v.dislikeReasons == null) {
+            SmartDialog.showToast("未能获取dislikeReasons");
             return;
           }
-          if (tp.dislikeReasons == null && tp.feedbacks == null) {
-            SmartDialog.showToast("未能获取dislikeReasons或feedbacks");
-            return;
-          }
-          Widget actionButton(DislikeReason? r, FeedbackReason? f) {
+          Widget actionButton(DislikeReason? r) {
+            //, FeedbackReason? f) {
             return ElevatedButton(
               style: ElevatedButton.styleFrom(
                 padding:
@@ -66,16 +71,17 @@ class VideoCustomActions {
                 SmartDialog.showLoading(msg: '正在提交');
                 var res = await VideoHttp.feedDislike(
                   reasonId: r?.id,
-                  feedbackId: f?.id,
+                  // feedbackId: f?.id,
                   id: v.param!,
                   goto: v.goto!,
                 );
                 SmartDialog.dismiss();
-                SmartDialog.showToast(
-                    res['status'] ? (r?.toast ?? f?.toast) : res['msg']);
+                SmartDialog.showToast(res['status'] ? (r?.toast) : res['msg']);
+                // res['status'] ? (r?.toast ?? f?.toast) : res['msg']);
                 Get.back();
               },
-              child: Text(r?.name ?? f?.name ?? '未知'),
+              child: Text(r?.name ?? '未知'),
+              // child: Text(r?.name ?? f?.name ?? '未知'),
             );
           }
 
@@ -87,32 +93,32 @@ class VideoCustomActions {
                 content: SingleChildScrollView(
                   child: Column(
                     children: [
-                      if (tp.dislikeReasons != null)
+                      if (v.dislikeReasons != null)
                         const Padding(
                           padding: EdgeInsets.symmetric(vertical: 8.0),
                           child: Text('我不想看'),
                         ),
-                      if (tp.dislikeReasons != null)
-                        Wrap(
-                          spacing: 5.0,
-                          runSpacing: 2.0,
-                          children: tp.dislikeReasons!.map((item) {
-                            return actionButton(item, null);
-                          }).toList(),
-                        ),
-                      if (tp.feedbacks != null)
-                        const Padding(
-                          padding: EdgeInsets.symmetric(vertical: 8.0),
-                          child: Text('反馈'),
-                        ),
-                      if (tp.feedbacks != null)
+                      if (v.dislikeReasons != null)
                         Wrap(
                           spacing: 5.0,
                           runSpacing: 2.0,
-                          children: tp.feedbacks!.map((item) {
-                            return actionButton(null, item);
+                          children: v.dislikeReasons!.map((item) {
+                            return actionButton(item);
                           }).toList(),
                         ),
+                      // if (tp.feedbacks != null)
+                      //   const Padding(
+                      //     padding: EdgeInsets.symmetric(vertical: 8.0),
+                      //     child: Text('反馈'),
+                      //   ),
+                      // if (tp.feedbacks != null)
+                      //   Wrap(
+                      //     spacing: 5.0,
+                      //     runSpacing: 2.0,
+                      //     children: tp.feedbacks!.map((item) {
+                      //       return actionButton(null, item);
+                      //     }).toList(),
+                      //   ),
                       //分割线
                       const Divider(),
                       ElevatedButton(
diff --git a/lib/http/api.dart b/lib/http/api.dart
index 7a6a16c38..8fe49cb13 100644
--- a/lib/http/api.dart
+++ b/lib/http/api.dart
@@ -223,7 +223,7 @@ class Api {
       'https://s.search.bilibili.com/main/suggest';
 
   // 分类搜索
-  static const String searchByType = '/x/web-interface/search/type';
+  static const String searchByType = '/x/web-interface/wbi/search/type';
 
   // 记录视频播放进度
   // https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/video/report.md
@@ -614,6 +614,9 @@ class Api {
   /// 排行榜
   static const String getRankApi = "/x/web-interface/ranking/v2";
 
+  /// 分区视频
+  static const String getRegionApi = "/x/web-interface/dynamic/region";
+
   /// 取消订阅-合集
   static const String unfavSeason = '/x/v3/fav/season/unfav';
 
diff --git a/lib/http/html.dart b/lib/http/html.dart
index 47206215c..520c73fe9 100644
--- a/lib/http/html.dart
+++ b/lib/http/html.dart
@@ -1,3 +1,7 @@
+import 'dart:io';
+
+import 'package:dio/dio.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:html/dom.dart';
 import 'package:html/parser.dart';
 import 'index.dart';
@@ -84,8 +88,9 @@ class HtmlHttp {
         .group(1)!
         .replaceAll(r'\u002F', '/')
         .split('@')[0];
-    // print(avatar);
+    print("avatar: $avatar");
     String uname = authorHeader.querySelector('.up-name')!.text.trim();
+    print("uname: $uname");
     // 动态详情
     Element opusDetail = appDom.querySelector('.article-content')!;
     // 发布时间
@@ -94,8 +99,7 @@ class HtmlHttp {
     // print(updateTime);
 
     //
-    String opusContent =
-        opusDetail.querySelector('#read-article-holder')?.innerHtml ?? '';
+    String opusContent = opusDetail.innerHtml ?? '';
     RegExp digitRegExp = RegExp(r'\d+');
     Iterable<Match> matches = digitRegExp.allMatches(id);
     String number = matches.first.group(0)!;
diff --git a/lib/http/init.dart b/lib/http/init.dart
index 7d3f16796..775dde11e 100644
--- a/lib/http/init.dart
+++ b/lib/http/init.dart
@@ -11,6 +11,7 @@ import 'package:dio_cookie_manager/dio_cookie_manager.dart';
 // import 'package:dio_http2_adapter/dio_http2_adapter.dart';
 import 'package:hive/hive.dart';
 import 'package:PiliPalaX/utils/id_utils.dart';
+import '../utils/login.dart';
 import '../utils/storage.dart';
 import '../utils/utils.dart';
 import 'api.dart';
@@ -81,6 +82,23 @@ class Request {
     return token;
   }
 
+  static Future<String> getBUVID() async {
+    List<Cookie> cookies = await cookieManager.cookieJar
+        .loadForRequest(Uri.parse(HttpString.apiBaseUrl));
+    // String token = '';
+    print("cookies $cookies");
+    if (cookies.where((e) => e.name == 'Buvid').isNotEmpty) {
+      return cookies.firstWhere((e) => e.name == 'Buvid').value;
+    }
+    return LoginUtils.buvid();
+  }
+
+  static String getRandomSessionId() {
+    // 返回8位随机16进制数
+    return List.generate(8, (index) => Random().nextInt(16).toRadixString(16))
+        .join();
+  }
+
   static setOptionsHeaders(userInfo, bool status) {
     if (status) {
       dio.options.headers['x-bili-mid'] = userInfo.mid.toString();
diff --git a/lib/http/login.dart b/lib/http/login.dart
index 6c122d7c1..32abc4180 100644
--- a/lib/http/login.dart
+++ b/lib/http/login.dart
@@ -107,7 +107,7 @@ class LoginHttp {
     int timestamp = DateTime.now().millisecondsSinceEpoch;
     var data = {
       'appkey': Constants.appKey,
-      'build': '1462100',
+      'build': '2001100',
       'buvid': buvid,
       'c_locale': 'zh_CN',
       'channel': 'yingyongbao',
@@ -160,7 +160,7 @@ class LoginHttp {
   //   dynamic publicKey = RSAKeyParser().parse(key);
   //   var params = {
   //     'appkey': Constants.appKey,
-  //     'build': '1462100',
+  //     'build': '2001100',
   //     'buvid': buvid,
   //     'c_locale': 'zh_CN',
   //     'channel': 'yingyongbao',
@@ -214,7 +214,7 @@ class LoginHttp {
     Map<String, dynamic> data = {
       'appkey': Constants.appKey,
       'bili_local_id': deviceId,
-      'build': '1462100',
+      'build': '2001100',
       'buvid': buvid,
       'c_locale': 'zh_CN',
       'channel': 'yingyongbao',
@@ -291,7 +291,7 @@ class LoginHttp {
     Map<String, dynamic> data = {
       'appkey': Constants.appKey,
       'bili_local_id': deviceId,
-      'build': '1462100',
+      'build': '2001100',
       'buvid': buvid,
       'c_locale': 'zh_CN',
       'captcha_key': captchaKey,
@@ -390,20 +390,20 @@ class LoginHttp {
   static Future safeCenterSmsCode({
     String? smsType,
     required String tmpCode,
-    required String geeChallenge,
-    required String geeSeccode,
-    required String geeValidate,
-    required String recaptchaToken,
+    String? geeChallenge,
+    String? geeSeccode,
+    String? geeValidate,
+    String? recaptchaToken,
     required String refererUrl,
   }) async {
     Map<String, dynamic> data = {
       'disable_rcmd': '0',
       'sms_type': smsType ?? 'loginTelCheck',
       'tmp_code': tmpCode,
-      'gee_challenge': geeChallenge,
-      'gee_seccode': geeSeccode,
-      'gee_validate': geeValidate,
-      'recaptcha_token': recaptchaToken,
+      if (geeChallenge != null) 'gee_challenge': geeChallenge,
+      if (geeSeccode != null) 'gee_seccode': geeSeccode,
+      if (geeValidate != null) 'gee_validate': geeValidate,
+      if (recaptchaToken != null) 'recaptcha_token': recaptchaToken,
     };
     String sign = Utils.appSign(
       data,
@@ -411,6 +411,7 @@ class LoginHttp {
       Constants.appSec,
     );
     data['sign'] = sign;
+    print(data);
     var res = await Request().post(
       Api.safeCenterSmsCode,
       data: data,
@@ -483,7 +484,7 @@ class LoginHttp {
   }) async {
     Map<String, dynamic> data = {
       'appkey': Constants.appKey,
-      'build': '1462100',
+      'build': '2001100',
       'buvid': buvid,
       // 'c_locale': 'zh_CN',
       // 'channel': 'yingyongbao',
diff --git a/lib/http/video.dart b/lib/http/video.dart
index 3ca56ec22..72c1ce6bd 100644
--- a/lib/http/video.dart
+++ b/lib/http/video.dart
@@ -79,7 +79,7 @@ class VideoHttp {
               '')
           : '',
       'appkey': Constants.appKey,
-      'build': '1462100',
+      'build': '2001100',
       'c_locale': 'zh_CN',
       'channel': 'yingyongbao',
       'column': '4',
@@ -795,4 +795,30 @@ class VideoHttp {
       return {'status': false, 'data': [], 'msg': err};
     }
   }
+
+  // 视频分区
+  static Future getRegionVideoList(int tid, int pn, int ps) async {
+    var res = await Request().get(Api.getRegionApi, data: {
+      'rid': tid,
+      'pn': pn,
+      'ps': ps,
+    });
+    print("getRegionVideoList: $res");
+    if (res.data['code'] == 0) {
+      List<HotVideoItemModel> list = [];
+      List<int> blackMidsList = localCache
+          .get(LocalCacheKey.blackMidsList, defaultValue: [-1])
+          .map<int>((e) => e as int)
+          .toList();
+      print(res.data['data']['archives']);
+      for (var i in res.data['data']['archives']) {
+        if (!blackMidsList.contains(i['owner']['mid'])) {
+          list.add(HotVideoItemModel.fromJson(i));
+        }
+      }
+      return {'status': true, 'data': list};
+    } else {
+      return {'status': false, 'data': [], 'msg': res.data['message']};
+    }
+  }
 }
diff --git a/lib/main.dart b/lib/main.dart
index fa6b9a060..8d0641f58 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,5 +1,10 @@
 import 'dart:io';
 
+// import 'package:PiliPalaX/plugin/pl_player/android_window.dart';
+import 'package:PiliPalaX/plugin/pl_player/view.dart';
+
+// import 'package:android_window/android_window.dart';
+// import 'package:android_window/main.dart' as android_window;
 import 'package:PiliPalaX/utils/cache_manage.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_displaymode/flutter_displaymode.dart';
@@ -25,6 +30,29 @@ import 'package:media_kit/media_kit.dart'; // Provides [Player], [Media], [Playl
 import 'package:PiliPalaX/utils/recommend_filter.dart';
 import 'package:catcher_2/catcher_2.dart';
 import './services/loggeer.dart';
+import 'package:flex_seed_scheme/flex_seed_scheme.dart';
+
+/// mainName must be the same as the method name
+// @pragma('vm:entry-point')
+// void androidWindow() async {
+//   WidgetsFlutterBinding.ensureInitialized();
+//   MediaKit.ensureInitialized();
+//   await GStorage.init();
+//   await setupServiceLocator();
+//   Request();
+//   await Request.setCookie();
+//   runApp(
+//     ClipRRect(
+//       borderRadius: BorderRadius.circular(12),
+//       child: MaterialApp(
+//         debugShowCheckedModeBanner: false,
+//         theme: ThemeData.light(),
+//         darkTheme: ThemeData.dark(),
+//         home: const AndroidWindowApp(),
+//       ),
+//     ),
+//   );
+// }
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -107,14 +135,18 @@ class MyApp extends StatelessWidget {
             ['color'];
     Color brandColor = defaultColor;
     // 主题模式
-    ThemeType currentThemeValue = ThemeType.values[setting
-        .get(SettingBoxKey.themeMode, defaultValue: ThemeType.system.code)];
+    ThemeMode currentThemeValue = ThemeType
+        .values[setting.get(SettingBoxKey.themeMode,
+            defaultValue: ThemeType.system.code)]
+        .toThemeMode;
     // 是否动态取色
     bool isDynamicColor =
         setting.get(SettingBoxKey.dynamicColor, defaultValue: true);
     // 字体缩放大小
     double textScale =
         setting.get(SettingBoxKey.defaultTextScale, defaultValue: 1.0);
+    FlexSchemeVariant variant = FlexSchemeVariant
+        .values[setting.get(SettingBoxKey.schemeVariant, defaultValue: 10)];
 
     // 强制设置高帧率
     if (Platform.isAndroid) {
@@ -142,13 +174,15 @@ class MyApp extends StatelessWidget {
           darkColorScheme = darkDynamic.harmonized();
         } else {
           // dynamic取色失败，采用品牌色
-          lightColorScheme = ColorScheme.fromSeed(
-            seedColor: brandColor,
+          lightColorScheme = SeedColorScheme.fromSeeds(
+            primaryKey: brandColor,
             brightness: Brightness.light,
+            variant: variant,
           );
-          darkColorScheme = ColorScheme.fromSeed(
-            seedColor: brandColor,
+          darkColorScheme = SeedColorScheme.fromSeeds(
+            primaryKey: brandColor,
             brightness: Brightness.dark,
+            variant: variant,
           );
         }
         // 图片缓存
@@ -156,39 +190,18 @@ class MyApp extends StatelessWidget {
         return GetMaterialApp(
           // showSemanticsDebugger: true,
           title: 'PiliPalaX',
-          theme: ThemeData(
-            // fontFamily: 'HarmonyOS',
-            colorScheme: currentThemeValue == ThemeType.dark
-                ? darkColorScheme
-                : lightColorScheme,
-            useMaterial3: true,
-            snackBarTheme: SnackBarThemeData(
-              actionTextColor: lightColorScheme.primary,
-              backgroundColor: lightColorScheme.secondaryContainer,
-              closeIconColor: lightColorScheme.secondary,
-              contentTextStyle: TextStyle(color: lightColorScheme.secondary),
-              elevation: 20,
-            ),
-            pageTransitionsTheme: const PageTransitionsTheme(
-              builders: <TargetPlatform, PageTransitionsBuilder>{
-                TargetPlatform.android: PredictiveBackPageTransitionsBuilder(),
-              },
-            ),
+          theme: _getThemeData(
+            colorScheme: lightColorScheme,
+            isDynamic: lightDynamic != null && isDynamicColor,
+            variant: variant,
           ),
-          darkTheme: ThemeData(
-            // fontFamily: 'HarmonyOS',
-            colorScheme: currentThemeValue == ThemeType.light
-                ? lightColorScheme
-                : darkColorScheme,
-            useMaterial3: true,
-            snackBarTheme: SnackBarThemeData(
-              actionTextColor: darkColorScheme.primary,
-              backgroundColor: darkColorScheme.secondaryContainer,
-              closeIconColor: darkColorScheme.secondary,
-              contentTextStyle: TextStyle(color: darkColorScheme.secondary),
-              elevation: 20,
-            ),
+          darkTheme: _getThemeData(
+            colorScheme: darkColorScheme,
+            isDynamic: darkDynamic != null && isDynamicColor,
+            isDark: true,
+            variant: variant,
           ),
+          themeMode: currentThemeValue,
           localizationsDelegates: const [
             GlobalCupertinoLocalizations.delegate,
             GlobalMaterialLocalizations.delegate,
@@ -217,4 +230,56 @@ class MyApp extends StatelessWidget {
       }),
     );
   }
+
+  ThemeData _getThemeData({
+    required ColorScheme colorScheme,
+    required bool isDynamic,
+    bool isDark = false,
+    required FlexSchemeVariant variant,
+  }) {
+    return ThemeData(
+      colorScheme: colorScheme,
+      useMaterial3: true,
+      appBarTheme: AppBarTheme(
+        elevation: 0,
+        titleSpacing: 0,
+        centerTitle: false,
+        scrolledUnderElevation: 0,
+        backgroundColor: isDynamic ? null : colorScheme.surface,
+        titleTextStyle: TextStyle(fontSize: 16, color: colorScheme.onSurface),
+      ),
+      navigationBarTheme: NavigationBarThemeData(
+        surfaceTintColor: isDynamic ? colorScheme.onSurfaceVariant : null,
+      ),
+      snackBarTheme: SnackBarThemeData(
+        actionTextColor: colorScheme.primary,
+        backgroundColor: colorScheme.secondaryContainer,
+        closeIconColor: colorScheme.secondary,
+        contentTextStyle: TextStyle(color: colorScheme.secondary),
+        elevation: 20,
+      ),
+      pageTransitionsTheme: const PageTransitionsTheme(
+        builders: <TargetPlatform, PageTransitionsBuilder>{
+          TargetPlatform.android: ZoomPageTransitionsBuilder(
+            allowEnterRouteSnapshotting: false,
+          ),
+        },
+      ),
+      popupMenuTheme: PopupMenuThemeData(
+        surfaceTintColor: isDynamic ? colorScheme.onSurfaceVariant : null,
+      ),
+      cardTheme: CardTheme(
+        elevation: 1,
+        surfaceTintColor: isDark ? colorScheme.onSurfaceVariant : null,
+        shadowColor: Colors.transparent,
+      ),
+      // dialogTheme: DialogTheme(
+      //   surfaceTintColor: isDark ? colorScheme.onSurfaceVariant : null,
+      // ),
+      progressIndicatorTheme: ProgressIndicatorThemeData(
+        refreshBackgroundColor: colorScheme.onSecondary,
+      ),
+    );
+  }
+
 }
diff --git a/lib/models/common/side_bar_position.dart b/lib/models/common/side_bar_position.dart
new file mode 100644
index 000000000..7bf6343d7
--- /dev/null
+++ b/lib/models/common/side_bar_position.dart
@@ -0,0 +1,28 @@
+enum SideBarPosition {
+  none,
+  leftFixed,
+  rightFixed,
+  leftHorizontal,
+  rightHorizontal
+}
+
+extension SideBarPositionDesc on SideBarPosition {
+  String get values => [
+        'none',
+        'left_fixed',
+        'right_fixed',
+        'left_horizontal',
+        'right_horizontal'
+      ][index];
+  String get labels => ['不使用侧栏', '左侧常驻', '右侧常驻', '左侧（仅横屏）', '右侧（仅横屏）'][index];
+}
+
+extension SideBarPositionCode on SideBarPosition {
+  int get code => index;
+  static SideBarPosition? fromCode(int code) {
+    if (code >= 0 && code < SideBarPosition.values.length) {
+      return SideBarPosition.values[code];
+    }
+    return null;
+  }
+}
diff --git a/lib/models/common/theme_type.dart b/lib/models/common/theme_type.dart
index d2dac7520..6e5fb7b96 100644
--- a/lib/models/common/theme_type.dart
+++ b/lib/models/common/theme_type.dart
@@ -1,3 +1,5 @@
+import 'package:flutter/material.dart';
+
 enum ThemeType {
   light,
   dark,
@@ -11,3 +13,7 @@ extension ThemeTypeDesc on ThemeType {
 extension ThemeTypeCode on ThemeType {
   int get code => [0, 1, 2][index];
 }
+
+extension ThemeTypeToThemeMode on ThemeType {
+  ThemeMode get toThemeMode => [ThemeMode.light, ThemeMode.dark, ThemeMode.system][index];
+}
diff --git a/lib/models/home/rcmd/result.dart b/lib/models/home/rcmd/result.dart
index 95e7b7106..cb03adeb3 100644
--- a/lib/models/home/rcmd/result.dart
+++ b/lib/models/home/rcmd/result.dart
@@ -22,7 +22,7 @@ class RecVideoItemAppModel {
     this.bangumiBadge,
     this.cardType,
     this.adInfo,
-    this.threePoint,
+    this.dislikeReasons,
     this.desc,
   });
 
@@ -48,7 +48,7 @@ class RecVideoItemAppModel {
 
   String? cardType;
   Map? adInfo;
-  ThreePoint? threePoint;
+  List<DislikeReason>? dislikeReasons;
   String? desc;
 
   RecVideoItemAppModel.fromJson(Map<String, dynamic> json) {
@@ -56,9 +56,7 @@ class RecVideoItemAppModel {
         ? json['player_args']['aid']
         : int.parse(json['param'] ?? '-1');
     aid = json['player_args'] != null ? json['player_args']['aid'] : -1;
-    bvid = json['player_args'] != null
-        ? IdUtils.av2bv(json['player_args']['aid'])
-        : '';
+    bvid = aid != -1 ? IdUtils.av2bv(aid!) : '';
     cid = json['player_args'] != null ? json['player_args']['cid'] : -1;
     pic = json['cover'];
     stat = RcmdStat.fromJson(json);
@@ -68,7 +66,7 @@ class RecVideoItemAppModel {
     //duration = json['cover_right_text'];
     title = json['title'];
     owner = RcmdOwner.fromJson(json);
-    rcmdReason = json['bottom_rcmd_reason'] ?? json['top_rcmd_reason'];
+    rcmdReason = json['rcmd_reason'];
     // 由于app端api并不会直接返回与owner的关注状态
     // 所以借用推荐原因是否为“已关注”、“新关注”判别关注状态，从而与web端接口等效
     isFollowed = (rcmdReason == '已关注') || (rcmdReason == '新关注') ? 1 : 0;
@@ -89,9 +87,14 @@ class RecVideoItemAppModel {
 
     cardType = json['card_type'];
     adInfo = json['ad_info'];
-    threePoint = json['three_point'] != null
-        ? ThreePoint.fromJson(json['three_point'])
-        : null;
+    json['three_point_v2']?.forEach((v) {
+      if (v['type'] == 'dislike' && v['reasons'] != null) {
+        dislikeReasons = <DislikeReason>[];
+        v['reasons'].forEach((vi) {
+          dislikeReasons!.add(DislikeReason.fromJson(vi));
+        });
+      }
+    });
     desc = json['desc'];
   }
 }
@@ -127,34 +130,34 @@ class RcmdOwner {
     mid = json['args']['up_id'] ?? -1;
   }
 }
-
-class ThreePoint {
-  ThreePoint({
-    this.dislikeReasons,
-    this.feedbacks,
-    this.watchLater,
-  });
-
-  List<DislikeReason>? dislikeReasons;
-  List<FeedbackReason>? feedbacks;
-  int? watchLater;
-
-  ThreePoint.fromJson(Map<String, dynamic> json) {
-    if (json['dislike_reasons'] != null) {
-      dislikeReasons = [];
-      json['dislike_reasons'].forEach((v) {
-        dislikeReasons!.add(DislikeReason.fromJson(v));
-      });
-    }
-    if (json['feedbacks'] != null) {
-      feedbacks = [];
-      json['feedbacks'].forEach((v) {
-        feedbacks!.add(FeedbackReason.fromJson(v));
-      });
-    }
-    watchLater = json['watch_later'];
-  }
-}
+//
+// class ThreePoint {
+//   ThreePoint({
+//     this.dislikeReasons,
+//     this.feedbacks,
+//     this.watchLater,
+//   });
+//
+//   List<DislikeReason>? dislikeReasons;
+//   List<FeedbackReason>? feedbacks;
+//   int? watchLater;
+//
+//   ThreePoint.fromJson(Map<String, dynamic> json) {
+//     if (json['dislike_reasons'] != null) {
+//       dislikeReasons = [];
+//       json['dislike_reasons'].forEach((v) {
+//         dislikeReasons!.add(DislikeReason.fromJson(v));
+//       });
+//     }
+//     if (json['feedbacks'] != null) {
+//       feedbacks = [];
+//       json['feedbacks'].forEach((v) {
+//         feedbacks!.add(FeedbackReason.fromJson(v));
+//       });
+//     }
+//     watchLater = json['watch_later'];
+//   }
+// }
 
 class DislikeReason {
   DislikeReason({
@@ -174,20 +177,20 @@ class DislikeReason {
   }
 }
 
-class FeedbackReason {
-  FeedbackReason({
-    this.id,
-    this.name,
-    this.toast,
-  });
-
-  int? id;
-  String? name;
-  String? toast;
-
-  FeedbackReason.fromJson(Map<String, dynamic> json) {
-    id = json['id'];
-    name = json['name'];
-    toast = json['toast'];
-  }
-}
+// class FeedbackReason {
+//   FeedbackReason({
+//     this.id,
+//     this.name,
+//     this.toast,
+//   });
+//
+//   int? id;
+//   String? name;
+//   String? toast;
+//
+//   FeedbackReason.fromJson(Map<String, dynamic> json) {
+//     id = json['id'];
+//     name = json['name'];
+//     toast = json['toast'];
+//   }
+// }
diff --git a/lib/pages/about/index.dart b/lib/pages/about/index.dart
index de94b4337..02c583533 100644
--- a/lib/pages/about/index.dart
+++ b/lib/pages/about/index.dart
@@ -472,7 +472,7 @@ class AboutController extends GetxController {
   //   }
   // }
   aPay() {
-    SmartDialog.showToast('新接口来不及写了，直接来群里找作者吧');
+    SmartDialog.showToast('感谢你的喜欢，给个Star就行~');
   }
 
   // 日志
diff --git a/lib/pages/bangumi/view.dart b/lib/pages/bangumi/view.dart
index 68b8ac40b..de2458263 100644
--- a/lib/pages/bangumi/view.dart
+++ b/lib/pages/bangumi/view.dart
@@ -74,6 +74,8 @@ class _BangumiPageState extends State<BangumiPage>
   Widget build(BuildContext context) {
     super.build(context);
     return RefreshIndicator(
+      displacement: 10.0,
+      edgeOffset: 10.0,
       onRefresh: () async {
         await _bangumiController.queryBangumiListFeed();
         return _bangumiController.queryBangumiFollow();
diff --git a/lib/pages/blacklist/index.dart b/lib/pages/blacklist/index.dart
index ab3ac4023..d065df7d4 100644
--- a/lib/pages/blacklist/index.dart
+++ b/lib/pages/blacklist/index.dart
@@ -67,6 +67,8 @@ class _BlackListPageState extends State<BlackListPage> {
         ),
       ),
       body: RefreshIndicator(
+        displacement: 10.0,
+        edgeOffset: 10.0,
         onRefresh: () async => await _blackListController.queryBlacklist(),
         child: FutureBuilder(
           future: _futureBuilderFuture,
diff --git a/lib/pages/dynamics/detail/view.dart b/lib/pages/dynamics/detail/view.dart
index 92c7f2161..c5f32bf3d 100644
--- a/lib/pages/dynamics/detail/view.dart
+++ b/lib/pages/dynamics/detail/view.dart
@@ -210,6 +210,8 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
         // actions: _detailModel != null ? appBarAction() : [],
       ),
       body: RefreshIndicator(
+        displacement: 10.0,
+        edgeOffset: 10.0,
         onRefresh: () async {
           await _dynamicDetailController.queryReplyList(reqType: 'init');
         },
diff --git a/lib/pages/dynamics/tab/view.dart b/lib/pages/dynamics/tab/view.dart
index 7939711ce..dd2a0bede 100644
--- a/lib/pages/dynamics/tab/view.dart
+++ b/lib/pages/dynamics/tab/view.dart
@@ -82,6 +82,8 @@ class _DynamicsTabPageState extends State<DynamicsTabPage>
     super.build(context);
     // print(widget.dynamicsType + widget.mid.value.toString());
     return RefreshIndicator(
+        displacement: 10.0,
+        edgeOffset: 10.0,
         // key:
         //     ValueKey<String>(widget.dynamicsType + widget.mid.value.toString()),
         onRefresh: () async {
diff --git a/lib/pages/dynamics/view.dart b/lib/pages/dynamics/view.dart
index d849760cb..bbe7d9ec7 100644
--- a/lib/pages/dynamics/view.dart
+++ b/lib/pages/dynamics/view.dart
@@ -53,7 +53,7 @@ class _DynamicsPageState extends State<DynamicsPage>
         });
       }
     });
-    upPanelPosition = UpPanelPosition.values[setting.get(
+    upPanelPosition = UpPanelPosition.values[GStorage.setting.get(
         SettingBoxKey.upPanelPosition,
         defaultValue: UpPanelPosition.leftFixed.code)];
     print('upPanelPosition: $upPanelPosition');
diff --git a/lib/pages/fan/view.dart b/lib/pages/fan/view.dart
index eac766f5e..5d49df6e2 100644
--- a/lib/pages/fan/view.dart
+++ b/lib/pages/fan/view.dart
@@ -61,6 +61,8 @@ class _FansPageState extends State<FansPage> {
         ),
       ),
       body: RefreshIndicator(
+        displacement: 10.0,
+        edgeOffset: 10.0,
         onRefresh: () async => await _fansController.queryFans('init'),
         child: CustomScrollView(
             physics: const AlwaysScrollableScrollPhysics(),
diff --git a/lib/pages/follow/widgets/follow_list.dart b/lib/pages/follow/widgets/follow_list.dart
index 5854d6d99..ed35069d7 100644
--- a/lib/pages/follow/widgets/follow_list.dart
+++ b/lib/pages/follow/widgets/follow_list.dart
@@ -49,6 +49,8 @@ class _FollowListState extends State<FollowList> {
   @override
   Widget build(BuildContext context) {
     return RefreshIndicator(
+      displacement: 10.0,
+      edgeOffset: 10.0,
       onRefresh: () async => await widget.ctr.queryFollowings('init'),
       child: FutureBuilder(
         future: _futureBuilderFuture,
diff --git a/lib/pages/follow/widgets/owner_follow_list.dart b/lib/pages/follow/widgets/owner_follow_list.dart
index ecbb22fcb..6b238ffaf 100644
--- a/lib/pages/follow/widgets/owner_follow_list.dart
+++ b/lib/pages/follow/widgets/owner_follow_list.dart
@@ -79,6 +79,8 @@ class _OwnerFollowListState extends State<OwnerFollowList>
   Widget build(BuildContext context) {
     super.build(context);
     return RefreshIndicator(
+      displacement: 10.0,
+      edgeOffset: 10.0,
       onRefresh: () async => await followUpGroup('init'),
       child: FutureBuilder(
         future: _futureBuilderFuture,
diff --git a/lib/pages/history/view.dart b/lib/pages/history/view.dart
index afc3dcb55..46fb7992d 100644
--- a/lib/pages/history/view.dart
+++ b/lib/pages/history/view.dart
@@ -173,6 +173,8 @@ class _HistoryPageState extends State<HistoryPage> {
         ),
       ),
       body: RefreshIndicator(
+        displacement: 10.0,
+        edgeOffset: 10.0,
         onRefresh: () async {
           await _historyController.onRefresh();
           return;
diff --git a/lib/pages/home/controller.dart b/lib/pages/home/controller.dart
index faaaf8eb2..76abb32a3 100644
--- a/lib/pages/home/controller.dart
+++ b/lib/pages/home/controller.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:PiliPalaX/models/common/side_bar_position.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
@@ -29,7 +30,8 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
   late List<String> tabbarSort;
   RxString defaultSearch = ''.obs;
   late bool enableGradientBg;
-  late bool useSideBar;
+  // late bool useSideBar;
+  late SideBarPosition sideBarPosition;
 
   @override
   void onInit() {
@@ -44,7 +46,10 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
     }
     enableGradientBg =
         setting.get(SettingBoxKey.enableGradientBg, defaultValue: true);
-    useSideBar = setting.get(SettingBoxKey.useSideBar, defaultValue: false);
+    // useSideBar = setting.get(SettingBoxKey.useSideBar, defaultValue: false);
+    sideBarPosition = SideBarPositionCode.fromCode(setting.get(
+        SettingBoxKey.sideBarPosition,
+        defaultValue: SideBarPosition.none.code))!;
     // 进行tabs配置
     setTabConfig();
   }
@@ -128,6 +133,7 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
         context: context,
         useSafeArea: true,
         builder: (_) => const Dialog(
+              insetPadding: EdgeInsets.zero,
               child: MinePage(),
             ));
   }
diff --git a/lib/pages/home/view.dart b/lib/pages/home/view.dart
index 212a0eaa4..341ae0884 100644
--- a/lib/pages/home/view.dart
+++ b/lib/pages/home/view.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:PiliPalaX/models/common/side_bar_position.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:get/get.dart';
@@ -59,7 +60,12 @@ class _HomePageState extends State<HomePage>
       ),
       body: Column(
         children: [
-          if (!_homeController.useSideBar)
+          if (_homeController.sideBarPosition == SideBarPosition.none ||
+              ((_homeController.sideBarPosition ==
+                          SideBarPosition.leftHorizontal ||
+                      _homeController.sideBarPosition ==
+                          SideBarPosition.rightHorizontal) &&
+                  MediaQuery.of(context).orientation == Orientation.portrait))
             CustomAppBar(
               stream: _homeController.hideSearchBar
                   ? stream
diff --git a/lib/pages/hot/view.dart b/lib/pages/hot/view.dart
index 16b72dd2b..898255e33 100644
--- a/lib/pages/hot/view.dart
+++ b/lib/pages/hot/view.dart
@@ -73,6 +73,8 @@ class _HotPageState extends State<HotPage> with AutomaticKeepAliveClientMixin {
   Widget build(BuildContext context) {
     super.build(context);
     return RefreshIndicator(
+      displacement: 10.0,
+      edgeOffset: 10.0,
       onRefresh: () async {
         return await _hotController.onRefresh();
       },
diff --git a/lib/pages/live/view.dart b/lib/pages/live/view.dart
index 8fa36af33..5ddf30e30 100644
--- a/lib/pages/live/view.dart
+++ b/lib/pages/live/view.dart
@@ -81,6 +81,8 @@ class _LivePageState extends State<LivePage>
         borderRadius: BorderRadius.all(StyleString.imgRadius),
       ),
       child: RefreshIndicator(
+        displacement: 10.0,
+        edgeOffset: 10.0,
         onRefresh: () async {
           return await _liveController.onRefresh();
         },
diff --git a/lib/pages/live_room/view.dart b/lib/pages/live_room/view.dart
index 0b179c238..2ba0ec166 100644
--- a/lib/pages/live_room/view.dart
+++ b/lib/pages/live_room/view.dart
@@ -1,6 +1,8 @@
 import 'dart:io';
 
+import 'package:PiliPalaX/services/service_locator.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_floating/floating/manager/floating_manager.dart';
 import 'package:get/get.dart';
 import 'package:PiliPalaX/common/widgets/network_img_layer.dart';
 import 'package:PiliPalaX/plugin/pl_player/index.dart';
@@ -29,7 +31,8 @@ class _LiveRoomPageState extends State<LiveRoomPage> {
     super.initState();
     videoSourceInit();
     _futureBuilderFuture = _liveRoomController.queryLiveInfo();
-    plPlayerController!.autoEnterFullscreen();
+    plPlayerController!.autoEnterFullScreen();
+    floatingManager.closeFloating(globalId);
   }
 
   Future<void> videoSourceInit() async {
diff --git a/lib/pages/live_room/widgets/bottom_control.dart b/lib/pages/live_room/widgets/bottom_control.dart
index 96f1ddc57..1a945a651 100644
--- a/lib/pages/live_room/widgets/bottom_control.dart
+++ b/lib/pages/live_room/widgets/bottom_control.dart
@@ -103,7 +103,7 @@ class _BottomControlState extends State<BottomControl> {
                   // } else {}
                 },
                 icon: const Icon(
-                  Icons.picture_in_picture_outlined,
+                  Icons.picture_in_picture_alt,
                   size: 18,
                   color: Colors.white,
                 ),
diff --git a/lib/pages/login/controller.dart b/lib/pages/login/controller.dart
index f727b9219..8bd22e2ee 100644
--- a/lib/pages/login/controller.dart
+++ b/lib/pages/login/controller.dart
@@ -305,7 +305,6 @@ class LoginPageController extends GetxController
         SmartDialog.showToast(data['message']);
         // return;
         //{"code":0,"message":"0","ttl":1,"data":{"status":2,"message":"本次登录环境存在风险, 需使用手机号进行验证或绑定","url":"https://passport.bilibili.com/h5-app/passport/risk/verify?tmp_token=9e785433940891dfa78f033fb7928181&request_id=e5a6d6480df04097870be56c6e60f7ef&source=risk","token_info":null,"cookie_info":null,"sso":null,"is_new":false,"is_tourist":false}}
-        //todo: 后续登录流程：https://ivan.hanloth.cn/archives/530/
         String url = data['url']!;
         Uri currentUri = Uri.parse(url);
         var safeCenterRes = await LoginHttp.safeCenterGetInfo(
@@ -353,14 +352,18 @@ class LoginPageController extends GetxController
               child: const Text("发送验证码 "),
               onPressed: () async {
                 var preCaptureRes = await LoginHttp.preCapture();
-                if (!preCaptureRes['status']) {
+                if (!preCaptureRes['status'] || preCaptureRes['data'] == null) {
                   SmartDialog.showToast("获取验证码失败，请尝试其它登录方式\n"
-                      "(${preCaptureRes['code']}) ${preCaptureRes['msg']}");
+                      "(${preCaptureRes['code']}) ${preCaptureRes['msg']} ${preCaptureRes['data']}");
+                }
+                String? geeGt = preCaptureRes['data']['gee_gt'];
+                String? geeChallenge = preCaptureRes['data']['gee_challenge'];
+                captchaData.token = preCaptureRes['data']['recaptcha_token'];
+                if (!isGeeArgumentValid(geeGt, geeChallenge)) {
+                  SmartDialog.showToast("获取极验参数为空，请尝试其它登录方式\n"
+                      "(${preCaptureRes['code']}) ${preCaptureRes['msg']} ${preCaptureRes['data']}");
                   return;
                 }
-                String geeGt = preCaptureRes['data']['gee_gt']!;
-                String geeChallenge = preCaptureRes['data']['gee_challenge'];
-                captchaData.token = preCaptureRes['data']['recaptcha_token']!;
 
                 getCaptcha(geeGt, geeChallenge, () async {
                   print("captchaData");
@@ -372,9 +375,9 @@ class LoginPageController extends GetxController
                       await LoginHttp.safeCenterSmsCode(
                     tmpCode: currentUri.queryParameters['tmp_token']!,
                     geeChallenge: geeChallenge,
-                    geeSeccode: captchaData.seccode!,
-                    geeValidate: captchaData.validate!,
-                    recaptchaToken: captchaData.token!,
+                    geeSeccode: captchaData.seccode,
+                    geeValidate: captchaData.validate,
+                    recaptchaToken: captchaData.token,
                     refererUrl: url,
                   );
                   if (!safeCenterSendSmsCodeRes['status']) {
@@ -538,87 +541,111 @@ class LoginPageController extends GetxController
     //     guestId = guestIdRes['data']['guest_id'];
     //   }
     // }
-    var preCaptureRes = await LoginHttp.preCapture();
-    if (!preCaptureRes['status']) {
-      SmartDialog.showToast("获取验证码失败，请尝试其它登录方式\n"
-          "(${preCaptureRes['code']}) ${preCaptureRes['msg']}");
-      return;
-    }
-    String geeGt = preCaptureRes['data']['gee_gt']!;
-    String geeChallenge = preCaptureRes['data']['gee_challenge'];
-    captchaData.token = preCaptureRes['data']['recaptcha_token']!;
-
-    getCaptcha(geeGt, geeChallenge, () async {
-      // print("captchaData");
-      // print(captchaData);
-      // print(currentUri.queryParameters['tmp_token']!);
-      // print(geeChallenge);
-      //
-      // var safeCenterSendSmsCodeRes =
-      // await LoginHttp.safeCenterSmsCode(
-      //   tmpCode: currentUri.queryParameters['tmp_token']!,
-      //   geeChallenge: geeChallenge,
-      //   geeSeccode: captchaData.seccode!,
-      //   geeValidate: captchaData.validate!,
-      //   recaptchaToken: captchaData.token!,
-      //   refererUrl: url,
-      // );
-      // if (!safeCenterSendSmsCodeRes['status']) {
-      //   SmartDialog.showToast("发送短信验证码失败，请尝试其它登录方式\n"
-      //       "(${safeCenterSendSmsCodeRes['code']}) ${safeCenterSendSmsCodeRes['msg']}");
-      //   return;
-      // }
-      // SmartDialog.showToast("短信验证码已发送，请查收");
-      // captchaKey = safeCenterSendSmsCodeRes['data']['captcha_key'];
-
-      var res = await LoginHttp.sendSmsCode(
-        tel: telTextController.text,
-        cid: selectedCountryCodeId['country_id'],
-        // deviceTouristId: guestId,
-        gee_validate: captchaData.validate!,
-        gee_seccode: captchaData.seccode!,
-        gee_challenge: geeChallenge,
-        recaptcha_token: captchaData.token!,
-      );
-      print(res);
-      if (res['status']) {
-        SmartDialog.showToast('发送成功');
-        smsSendTimestamp = DateTime.now().millisecondsSinceEpoch;
-        smsSendCooldown.value = 60;
-        captchaKey = res['data']['captcha_key'];
-        smsSendCooldownTimer =
-            Timer.periodic(const Duration(seconds: 1), (timer) {
-          smsSendCooldown.value = 60 - timer.tick;
-          if (smsSendCooldown <= 0) {
-            smsSendCooldownTimer?.cancel();
-            smsSendCooldown.value = 0;
+    // var preCaptureRes = await LoginHttp.preCapture();
+    // if (!preCaptureRes['status']) {
+    //   SmartDialog.showToast("获取验证码失败，请尝试其它登录方式\n"
+    //       "(${preCaptureRes['code']}) ${preCaptureRes['msg']}");
+    //   return;
+    // }
+    // String geeGt = preCaptureRes['data']['gee_gt']!;
+    // String geeChallenge = preCaptureRes['data']['gee_challenge'];
+    // captchaData.token = preCaptureRes['data']['recaptcha_token']!;
+
+    // getCaptcha(geeGt, geeChallenge, () async {
+    // print("captchaData");
+    // print(captchaData);
+    // print(currentUri.queryParameters['tmp_token']!);
+    // print(geeChallenge);
+    //
+    // var safeCenterSendSmsCodeRes =
+    // await LoginHttp.safeCenterSmsCode(
+    //   tmpCode: currentUri.queryParameters['tmp_token']!,
+    //   geeChallenge: geeChallenge,
+    //   geeSeccode: captchaData.seccode!,
+    //   geeValidate: captchaData.validate!,
+    //   recaptchaToken: captchaData.token!,
+    //   refererUrl: url,
+    // );
+    // if (!safeCenterSendSmsCodeRes['status']) {
+    //   SmartDialog.showToast("发送短信验证码失败，请尝试其它登录方式\n"
+    //       "(${safeCenterSendSmsCodeRes['code']}) ${safeCenterSendSmsCodeRes['msg']}");
+    //   return;
+    // }
+    // SmartDialog.showToast("短信验证码已发送，请查收");
+    // captchaKey = safeCenterSendSmsCodeRes['data']['captcha_key'];
+
+    var res = await LoginHttp.sendSmsCode(
+      tel: telTextController.text,
+      cid: selectedCountryCodeId['country_id'],
+      // deviceTouristId: guestId,
+      gee_validate: captchaData.validate,
+      gee_seccode: captchaData.seccode,
+      gee_challenge: captchaData.geetest?.challenge,
+      recaptcha_token: captchaData.token,
+    );
+    print(res);
+    if (res['status']) {
+      SmartDialog.showToast('发送成功');
+      smsSendTimestamp = DateTime.now().millisecondsSinceEpoch;
+      smsSendCooldown.value = 60;
+      captchaKey = res['data']['captcha_key'];
+      smsSendCooldownTimer =
+          Timer.periodic(const Duration(seconds: 1), (timer) {
+        smsSendCooldown.value = 60 - timer.tick;
+        if (smsSendCooldown <= 0) {
+          smsSendCooldownTimer?.cancel();
+          smsSendCooldown.value = 0;
+        }
+      });
+    } else {
+      // handle login result
+      switch (res['code']) {
+        case 0:
+        case -105:
+          String? captureUrl = res['data']?['recaptcha_url'];
+          String? geeGt;
+          String? geeChallenge;
+          if (captureUrl != null && captureUrl.isNotEmpty) {
+            Uri captureUri = Uri.parse(captureUrl);
+            captchaData.token = captureUri.queryParameters['recaptcha_token'];
+            geeGt = captureUri.queryParameters['gee_gt'];
+            geeChallenge = captureUri.queryParameters['gee_challenge'];
           }
-        });
-      } else {
-        // handle login result
-        switch (res['code']) {
-          case 0:
-          case -105:
-            String captureUrl = res['data']?['recaptcha_url'] ?? "";
-            if (captureUrl == "") {
-              SmartDialog.showToast(
-                  '验证信息错误：${res["msg"]}\n返回内容：${res["data"]}');
+
+          if (!isGeeArgumentValid(geeGt, geeChallenge)) {
+            print('验证信息错误：${res["msg"]}\n返回内容：${res["data"]}，尝试另一个验证码接口');
+            var preCaptureRes = await LoginHttp.preCapture();
+            if (!preCaptureRes['status'] || preCaptureRes['data'] == null) {
+              SmartDialog.showToast("获取验证码失败，请尝试其它登录方式\n"
+                  "(${preCaptureRes['code']}) ${preCaptureRes['msg']} ${preCaptureRes['data']}");
               return;
             }
-            Uri captureUri = Uri.parse(captureUrl);
-            captchaData.token = captureUri.queryParameters['recaptcha_token']!;
-            String geeGt = captureUri.queryParameters['gee_gt']!;
-            String geeChallenge = captureUri.queryParameters['gee_challenge']!;
-            getCaptcha(geeGt, geeChallenge, () {
-              sendSmsCode();
-            });
-            break;
-          default:
-            SmartDialog.showToast(res['msg']);
-            // login failed
-            break;
-        }
+            geeGt = preCaptureRes['data']['gee_gt'];
+            geeChallenge = preCaptureRes['data']['gee_challenge'];
+            captchaData.token = preCaptureRes['data']['recaptcha_token'];
+          }
+
+          if (!isGeeArgumentValid(geeGt, geeChallenge)) {
+            SmartDialog.showToast("获取验证码失败，请尝试其它登录方式\n");
+            return;
+          }
+
+          getCaptcha(geeGt, geeChallenge, () {
+            sendSmsCode();
+          });
+          break;
+        default:
+          SmartDialog.showToast(res['msg']);
+          // login failed
+          break;
       }
-    });
+    }
+    // });
+  }
+
+  bool isGeeArgumentValid(String? geeGt, String? geeChallenge) {
+    return geeGt?.isNotEmpty == true &&
+        geeChallenge?.isNotEmpty == true &&
+        captchaData.token?.isNotEmpty == true;
   }
 }
diff --git a/lib/pages/login/view.dart b/lib/pages/login/view.dart
index 17624dd2d..52b1694a9 100644
--- a/lib/pages/login/view.dart
+++ b/lib/pages/login/view.dart
@@ -44,8 +44,10 @@ class _LoginPageState extends State<LoginPage> {
         const Text('使用 bilibili 官方 App 扫码登录'),
         const SizedBox(height: 20),
         Obx(() => Text('剩余有效时间: ${_loginPageCtr.qrCodeLeftTime} 秒',
-            style:
-                const TextStyle(fontFeatures: [FontFeature.tabularFigures()]))),
+            style: TextStyle(
+                fontFeatures: const [FontFeature.tabularFigures()],
+                color: Theme.of(context).colorScheme.primaryFixedDim))),
+        const SizedBox(height: 5),
         Row(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
@@ -89,29 +91,57 @@ class _LoginPageState extends State<LoginPage> {
           ],
         ),
         RepaintBoundary(
-            key: globalKey,
-            child: Obx(() => QrImageView(
-                  backgroundColor: Theme.of(context).colorScheme.surface,
-                  eyeStyle: QrEyeStyle(
-                    eyeShape: QrEyeShape.square,
-                    color: Theme.of(context).colorScheme.primary,
-                  ),
-                  dataModuleStyle: QrDataModuleStyle(
-                    dataModuleShape: QrDataModuleShape.square,
-                    color: Theme.of(context).colorScheme.secondary,
-                  ),
-                  data: _loginPageCtr.codeInfo.value['data']?['url'] ?? "",
-                  size: 200,
-                  semanticsLabel: '二维码',
-                ))),
+          key: globalKey,
+          child: Obx(() {
+            if (_loginPageCtr.codeInfo.value['data']?['url'] == null) {
+              return const SizedBox(
+                  height: 200,
+                  width: 200,
+                  child: Center(
+                      child: CircularProgressIndicator(
+                    semanticsLabel: '二维码加载中',
+                  )));
+            }
+            final theme = Theme.of(context).colorScheme;
+            final isDarkMode = theme.brightness == Brightness.dark;
+
+            final bgColor = isDarkMode ? theme.onSurface : theme.surface;
+            final dataColor = isDarkMode ? theme.onSecondary : theme.secondary;
+            final eyeColor = isDarkMode ? theme.onPrimary : theme.primary;
+
+            return QrImageView(
+              backgroundColor: bgColor,
+              eyeStyle: QrEyeStyle(
+                eyeShape: QrEyeShape.square,
+                color: eyeColor,
+              ),
+              dataModuleStyle: QrDataModuleStyle(
+                dataModuleShape: QrDataModuleShape.square,
+                color: dataColor,
+              ),
+              data: _loginPageCtr.codeInfo.value['data']!['url']!,
+              size: 200,
+              semanticsLabel: '二维码',
+            );
+          }),
+        ),
         const SizedBox(height: 10),
-        Obx(() => Text(_loginPageCtr.statusQRCode.value)),
+        Obx(() => Text(
+              _loginPageCtr.statusQRCode.value,
+              style: TextStyle(
+                  color: Theme.of(context).colorScheme.secondaryFixedDim),
+            )),
         Obx(() => GestureDetector(
               onTap: () {
                 //以外部方式打开此链接
-                launchUrlString(
-                    _loginPageCtr.codeInfo.value['data']?['url'] ?? "",
-                    mode: LaunchMode.externalApplication);
+                // launchUrlString(
+                //     _loginPageCtr.codeInfo.value['data']?['url'] ?? "",
+                //     mode: LaunchMode.externalApplication);
+                // 复制到剪贴板
+                Clipboard.setData(ClipboardData(
+                    text: _loginPageCtr.codeInfo.value['data']?['url'] ?? ""));
+                SmartDialog.showToast('已复制到剪贴板，可粘贴至已登录的app私信处发送，然后点击已发送的链接打开',
+                    displayTime: const Duration(seconds: 5));
               },
               child: Padding(
                 padding:
@@ -254,7 +284,7 @@ class _LoginPageState extends State<LoginPage> {
         ),
         OutlinedButton.icon(
           onPressed: _loginPageCtr.loginByPassword,
-          icon: const Icon(Icons.login_outlined),
+          icon: const Icon(Icons.login),
           label: const Text('登录'),
         ),
         const SizedBox(height: 20),
@@ -366,7 +396,7 @@ class _LoginPageState extends State<LoginPage> {
                     child: TextField(
                       controller: _loginPageCtr.smsCodeTextController,
                       decoration: const InputDecoration(
-                        prefixIcon: Icon(Icons.key),
+                        prefixIcon: Icon(Icons.email),
                         border: InputBorder.none,
                         labelText: '验证码',
                       ),
@@ -391,7 +421,7 @@ class _LoginPageState extends State<LoginPage> {
         const SizedBox(height: 20),
         OutlinedButton.icon(
           onPressed: _loginPageCtr.loginBySmsCode,
-          icon: const Icon(Icons.login_outlined),
+          icon: const Icon(Icons.login),
           label: const Text('登录'),
         ),
         const SizedBox(height: 20),
@@ -430,17 +460,23 @@ class _LoginPageState extends State<LoginPage> {
                 dividerHeight: 0,
                 tabs: const [
                   Tab(
-                      child: Row(
-                          mainAxisSize: MainAxisSize.min,
-                          children: [Icon(Icons.lock), Text(' 密码')])),
+                    child: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [Icon(Icons.lock), Text(' 密码')],
+                    ),
+                  ),
                   Tab(
-                      child: Row(
-                          mainAxisSize: MainAxisSize.min,
-                          children: [Icon(Icons.key), Text(' 短信')])),
+                    child: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [Icon(Icons.email), Text(' 短信')],
+                    ),
+                  ),
                   Tab(
-                      child: Row(
-                          mainAxisSize: MainAxisSize.min,
-                          children: [Icon(Icons.qr_code), Text(' 扫码')])),
+                    child: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [Icon(Icons.qr_code), Text(' 扫码')],
+                    ),
+                  ),
                 ],
                 controller: _loginPageCtr.tabController,
               ))
@@ -450,7 +486,7 @@ class _LoginPageState extends State<LoginPage> {
               ? TabBar(
                   tabs: const [
                     Tab(icon: Icon(Icons.lock), text: '密码'),
-                    Tab(icon: Icon(Icons.key), text: '短信'),
+                    Tab(icon: Icon(Icons.email), text: '短信'),
                     Tab(icon: Icon(Icons.qr_code), text: '扫码'),
                   ],
                   controller: _loginPageCtr.tabController,
diff --git a/lib/pages/main/view.dart b/lib/pages/main/view.dart
index 96163b0e7..446438b0d 100644
--- a/lib/pages/main/view.dart
+++ b/lib/pages/main/view.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:PiliPalaX/models/common/side_bar_position.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:get/get.dart';
@@ -29,7 +30,8 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
   int? _lastSelectTime; //上次点击时间
   Box setting = GStorage.setting;
   late bool enableMYBar;
-  late bool useSideBar;
+  // late bool useSideBar;
+  late SideBarPosition sideBarPosition;
   late bool enableGradientBg;
 
   @override
@@ -39,7 +41,10 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
     _mainController.pageController =
         PageController(initialPage: _mainController.selectedIndex);
     enableMYBar = setting.get(SettingBoxKey.enableMYBar, defaultValue: true);
-    useSideBar = setting.get(SettingBoxKey.useSideBar, defaultValue: false);
+    // useSideBar = setting.get(SettingBoxKey.useSideBar, defaultValue: false);
+    sideBarPosition = SideBarPositionCode.fromCode(setting.get(
+        SettingBoxKey.sideBarPosition,
+        defaultValue: SideBarPosition.none.code))!;
     enableGradientBg =
         setting.get(SettingBoxKey.enableGradientBg, defaultValue: true);
   }
@@ -101,13 +106,128 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
 
   @override
   void dispose() async {
-    await GStorage.close();
-    EventBus().off(EventName.loginEvent);
+    // await GStorage.close();
+    // EventBus().off(EventName.loginEvent);
     super.dispose();
   }
 
+  Widget sideBar() => SizedBox(
+        width: context.width * 0.0387 +
+            36.801 +
+            MediaQuery.of(context).padding.left,
+        child: NavigationRail(
+          groupAlignment: 1,
+          minWidth: context.width * 0.0286 + 28.56,
+          backgroundColor: Colors.transparent,
+          selectedIndex: _mainController.selectedIndex,
+          onDestinationSelected: (value) => setIndex(value),
+          labelType: NavigationRailLabelType.none,
+          leading: UserAndSearchVertical(ctr: _homeController),
+          destinations: _mainController.navigationBars
+              .map(
+                (e) => NavigationRailDestination(
+                  icon: Badge(
+                    label: _mainController.dynamicBadgeType ==
+                            DynamicBadgeMode.number
+                        ? Text(e['count'].toString())
+                        : null,
+                    padding: const EdgeInsets.symmetric(horizontal: 4),
+                    isLabelVisible: _mainController.dynamicBadgeType !=
+                            DynamicBadgeMode.hidden &&
+                        e['count'] > 0,
+                    child: e['icon'],
+                    backgroundColor: Theme.of(context).colorScheme.primary,
+                    textColor: Theme.of(context).colorScheme.onInverseSurface,
+                  ),
+                  selectedIcon: e['selectIcon'],
+                  label: Text(e['label']),
+                  padding:
+                      EdgeInsets.symmetric(vertical: 0.01 * context.height),
+                ),
+              )
+              .toList(),
+          trailing: SizedBox(height: 0.1 * context.height),
+        ),
+      );
+
+  Widget verticalDivider() => VerticalDivider(
+        width: 1,
+        indent: MediaQuery.of(context).padding.top,
+        endIndent: MediaQuery.of(context).padding.bottom,
+        color: Theme.of(context).colorScheme.outline.withOpacity(0.06),
+      );
+
+  Widget navigationBar() => NavigationBar(
+        // backgroundColor: Theme.of(context)
+        //     .colorScheme
+        //     .onInverseSurface,
+        onDestinationSelected: (value) => setIndex(value),
+        selectedIndex: _mainController.selectedIndex,
+        destinations: _mainController.navigationBars.map((e) {
+          return NavigationDestination(
+            icon: Badge(
+              label: _mainController.dynamicBadgeType == DynamicBadgeMode.number
+                  ? Text(e['count'].toString())
+                  : null,
+              padding: const EdgeInsets.fromLTRB(6, 0, 6, 0),
+              isLabelVisible:
+                  _mainController.dynamicBadgeType != DynamicBadgeMode.hidden &&
+                      e['count'] > 0,
+              child: e['icon'],
+              backgroundColor: Theme.of(context).colorScheme.primary,
+              textColor: Theme.of(context).colorScheme.onInverseSurface,
+            ),
+            selectedIcon: e['selectIcon'],
+            label: e['label'],
+          );
+        }).toList(),
+      );
+
+  Widget bottomNavigationBar() => BottomNavigationBar(
+        // backgroundColor: Theme.of(context)
+        //     .colorScheme
+        //     .onInverseSurface,
+        currentIndex: _mainController.selectedIndex,
+        onTap: (value) => setIndex(value),
+        iconSize: 16,
+        selectedFontSize: 12,
+        unselectedFontSize: 12,
+        type: BottomNavigationBarType.fixed,
+        // selectedItemColor:
+        //     Theme.of(context).colorScheme.primary, // 选中项的颜色
+        // unselectedItemColor:
+        //     Theme.of(context).colorScheme.onSurface,
+        items: _mainController.navigationBars.map((e) {
+          return BottomNavigationBarItem(
+            icon: Badge(
+              label: _mainController.dynamicBadgeType == DynamicBadgeMode.number
+                  ? Text(e['count'].toString())
+                  : null,
+              padding: const EdgeInsets.fromLTRB(6, 0, 6, 0),
+              isLabelVisible:
+                  _mainController.dynamicBadgeType != DynamicBadgeMode.hidden &&
+                      e['count'] > 0,
+              child: e['icon'],
+              backgroundColor: Theme.of(context).colorScheme.primary,
+              textColor: Theme.of(context).colorScheme.onInverseSurface,
+            ),
+            activeIcon: e['selectIcon'],
+            label: e['label'],
+          );
+        }).toList(),
+      );
+
   @override
   Widget build(BuildContext context) {
+    bool usingLeftSideBar() =>
+        sideBarPosition == SideBarPosition.leftFixed ||
+        sideBarPosition == SideBarPosition.leftHorizontal &&
+            MediaQuery.of(context).orientation == Orientation.landscape;
+
+    bool usingRightSideBar() =>
+        sideBarPosition == SideBarPosition.rightFixed ||
+        sideBarPosition == SideBarPosition.rightHorizontal &&
+            MediaQuery.of(context).orientation == Orientation.landscape;
     return PopScope(
       canPop: false,
       onPopInvokedWithResult: (bool didPop, Object? result) async {
@@ -157,55 +277,8 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
             Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                if (useSideBar)
-                  SizedBox(
-                    width: context.width * 0.0387 +
-                        36.801 +
-                        MediaQuery.of(context).padding.left,
-                    child: NavigationRail(
-                      groupAlignment: 1,
-                      minWidth: context.width * 0.0286 + 28.56,
-                      backgroundColor: Colors.transparent,
-                      selectedIndex: _mainController.selectedIndex,
-                      onDestinationSelected: (value) => setIndex(value),
-                      labelType: NavigationRailLabelType.none,
-                      leading: UserAndSearchVertical(ctr: _homeController),
-                      destinations: _mainController.navigationBars
-                          .map((e) => NavigationRailDestination(
-                                icon: Badge(
-                                  label: _mainController.dynamicBadgeType ==
-                                          DynamicBadgeMode.number
-                                      ? Text(e['count'].toString())
-                                      : null,
-                                  padding:
-                                      const EdgeInsets.symmetric(horizontal: 4),
-                                  isLabelVisible:
-                                      _mainController.dynamicBadgeType !=
-                                              DynamicBadgeMode.hidden &&
-                                          e['count'] > 0,
-                                  child: e['icon'],
-                                  backgroundColor:
-                                      Theme.of(context).colorScheme.primary,
-                                  textColor: Theme.of(context)
-                                      .colorScheme
-                                      .onInverseSurface,
-                                ),
-                                selectedIcon: e['selectIcon'],
-                                label: Text(e['label']),
-                                padding: EdgeInsets.symmetric(
-                                    vertical: 0.01 * context.height),
-                              ))
-                          .toList(),
-                      trailing: SizedBox(height: 0.1 * context.height),
-                    ),
-                  ),
-                VerticalDivider(
-                  width: 1,
-                  indent: MediaQuery.of(context).padding.top,
-                  endIndent: MediaQuery.of(context).padding.bottom,
-                  color:
-                      Theme.of(context).colorScheme.outline.withOpacity(0.06),
-                ),
+                if (usingLeftSideBar()) ...[sideBar(), verticalDivider()],
+                if (usingRightSideBar()) SizedBox(width: context.width * 0.004),
                 Expanded(
                   child: PageView(
                     physics: const NeverScrollableScrollPhysics(),
@@ -217,11 +290,12 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
                     children: _mainController.pages,
                   ),
                 ),
-                if (useSideBar) SizedBox(width: context.width * 0.004),
+                if (usingLeftSideBar()) SizedBox(width: context.width * 0.004),
+                if (usingRightSideBar()) ...[sideBar(), verticalDivider()],
               ],
             )
           ]),
-          bottomNavigationBar: useSideBar
+          bottomNavigationBar: usingLeftSideBar() || usingRightSideBar()
               ? null
               : StreamBuilder(
                   stream: _mainController.hideTabBar
@@ -233,78 +307,8 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
                       curve: Curves.easeInOutCubicEmphasized,
                       duration: const Duration(milliseconds: 500),
                       offset: Offset(0, snapshot.data ? 0 : 1),
-                      child: enableMYBar
-                          ? NavigationBar(
-                              backgroundColor: Theme.of(context)
-                                  .colorScheme
-                                  .onInverseSurface,
-                              onDestinationSelected: (value) => setIndex(value),
-                              selectedIndex: _mainController.selectedIndex,
-                              destinations:
-                                  _mainController.navigationBars.map((e) {
-                                return NavigationDestination(
-                                  icon: Badge(
-                                    label: _mainController.dynamicBadgeType ==
-                                            DynamicBadgeMode.number
-                                        ? Text(e['count'].toString())
-                                        : null,
-                                    padding:
-                                        const EdgeInsets.fromLTRB(6, 0, 6, 0),
-                                    isLabelVisible:
-                                        _mainController.dynamicBadgeType !=
-                                                DynamicBadgeMode.hidden &&
-                                            e['count'] > 0,
-                                    child: e['icon'],
-                                    backgroundColor:
-                                        Theme.of(context).colorScheme.primary,
-                                    textColor: Theme.of(context)
-                                        .colorScheme
-                                        .onInverseSurface,
-                                  ),
-                                  selectedIcon: e['selectIcon'],
-                                  label: e['label'],
-                                );
-                              }).toList(),
-                            )
-                          : BottomNavigationBar(
-                              backgroundColor: Theme.of(context)
-                                  .colorScheme
-                                  .onInverseSurface,
-                              currentIndex: _mainController.selectedIndex,
-                              onTap: (value) => setIndex(value),
-                              iconSize: 16,
-                              selectedFontSize: 12,
-                              unselectedFontSize: 12,
-                              type: BottomNavigationBarType.fixed,
-                              // selectedItemColor:
-                              //     Theme.of(context).colorScheme.primary, // 选中项的颜色
-                              // unselectedItemColor:
-                              //     Theme.of(context).colorScheme.onSurface,
-                              items: _mainController.navigationBars.map((e) {
-                                return BottomNavigationBarItem(
-                                  icon: Badge(
-                                    label: _mainController.dynamicBadgeType ==
-                                            DynamicBadgeMode.number
-                                        ? Text(e['count'].toString())
-                                        : null,
-                                    padding:
-                                        const EdgeInsets.fromLTRB(6, 0, 6, 0),
-                                    isLabelVisible:
-                                        _mainController.dynamicBadgeType !=
-                                                DynamicBadgeMode.hidden &&
-                                            e['count'] > 0,
-                                    child: e['icon'],
-                                    backgroundColor:
-                                        Theme.of(context).colorScheme.primary,
-                                    textColor: Theme.of(context)
-                                        .colorScheme
-                                        .onInverseSurface,
-                                  ),
-                                  activeIcon: e['selectIcon'],
-                                  label: e['label'],
-                                );
-                              }).toList(),
-                            ),
+                      child:
+                          enableMYBar ? navigationBar() : bottomNavigationBar(),
                     );
                   },
                 ),
diff --git a/lib/pages/member/controller.dart b/lib/pages/member/controller.dart
index d2e4a2bd2..16cc85449 100644
--- a/lib/pages/member/controller.dart
+++ b/lib/pages/member/controller.dart
@@ -42,9 +42,9 @@ class MemberController extends GetxController with GetTickerProviderStateMixin {
     super.onInit();
     mid = mid ?? int.parse(Get.parameters['mid']!);
     userInfo = userInfoCache.get('userInfoCache');
-    ownerMid = userInfo != null ? userInfo.mid : -1;
-    face.value = Get.arguments['face'] ?? '';
-    heroTag = Get.arguments['heroTag'] ?? '';
+    ownerMid = userInfo?.mid ?? -1;
+    face.value = Get.arguments?['face'] ?? '';
+    heroTag = Get.arguments?['heroTag'] ?? '';
     tabController = TabController(length: 3, vsync: this);
     relationSearch();
   }
@@ -272,16 +272,16 @@ class MemberController extends GetxController with GetTickerProviderStateMixin {
     return res;
   }
 
-  // 跳转查看动态
-  void pushDynamicsPage() => Get.toNamed('/memberDynamics?mid=$mid');
-
-  // 跳转查看投稿
-  void pushArchivesPage() => Get.toNamed('/memberArchive?mid=$mid');
-
-  // 跳转查看专栏
-  void pushSeasonsPage() {}
-  // 跳转查看最近投币
-  void pushRecentCoinsPage() async {
-    if (recentCoinsList.isNotEmpty) {}
-  }
+  // // 跳转查看动态
+  // void pushDynamicsPage() => Get.toNamed('/memberDynamics?mid=$mid');
+  //
+  // // 跳转查看投稿
+  // void pushArchivesPage() => Get.toNamed('/memberArchive?mid=$mid');
+  //
+  // // 跳转查看专栏
+  // void pushSeasonsPage() {}
+  // // 跳转查看最近投币
+  // void pushRecentCoinsPage() async {
+  //   if (recentCoinsList.isNotEmpty) {}
+  // }
 }
diff --git a/lib/pages/member/view.dart b/lib/pages/member/view.dart
index 17a2c4901..13f55304e 100644
--- a/lib/pages/member/view.dart
+++ b/lib/pages/member/view.dart
@@ -37,7 +37,7 @@ class _MemberPageState extends State<MemberPage>
   void initState() {
     super.initState();
     mid = int.parse(Get.parameters['mid']!);
-    heroTag = Get.arguments['heroTag'] ?? Utils.makeHeroTag(mid);
+    heroTag = Get.arguments?['heroTag'] ?? Utils.makeHeroTag(mid);
     _memberController = Get.put(MemberController(), tag: heroTag);
     _futureBuilderFuture = _memberController.getInfo();
     // _memberSeasonsFuture = _memberController.getMemberSeasons();
diff --git a/lib/pages/member_archive/view.dart b/lib/pages/member_archive/view.dart
index e33bf9d28..828178491 100644
--- a/lib/pages/member_archive/view.dart
+++ b/lib/pages/member_archive/view.dart
@@ -51,6 +51,8 @@ class _MemberArchivePageState extends State<MemberArchivePage> {
         return true;
       },
       child: RefreshIndicator(
+        displacement: 10.0,
+        edgeOffset: 10.0,
         onRefresh: _memberArchivesController.onRefresh, // 下拉刷新时触发的异步操作
         child: CustomScrollView(
           physics: const ClampingScrollPhysics(),
diff --git a/lib/pages/member_dynamics/view.dart b/lib/pages/member_dynamics/view.dart
index 98bd1367e..23f47b456 100644
--- a/lib/pages/member_dynamics/view.dart
+++ b/lib/pages/member_dynamics/view.dart
@@ -61,6 +61,8 @@ class _MemberDynamicsPageState extends State<MemberDynamicsPage> {
         return true;
       },
       child: RefreshIndicator(
+        displacement: 10.0,
+        edgeOffset: 10.0,
         onRefresh: _memberDynamicController.onRefresh, // 下拉刷新时触发的异步操作
         child: CustomScrollView(
           physics: const ClampingScrollPhysics(),
diff --git a/lib/pages/member_seasons_and_series/view.dart b/lib/pages/member_seasons_and_series/view.dart
index 4f088b327..1e6d2ad2a 100644
--- a/lib/pages/member_seasons_and_series/view.dart
+++ b/lib/pages/member_seasons_and_series/view.dart
@@ -70,6 +70,8 @@ class _MemberSeasonsAndSeriesPageState
         return true;
       },
       child: RefreshIndicator(
+        displacement: 10.0,
+        edgeOffset: 10.0,
         onRefresh: _ctr.onRefresh,
         child: CustomScrollView(
           physics: const ClampingScrollPhysics(),
diff --git a/lib/pages/mine/controller.dart b/lib/pages/mine/controller.dart
index 60485a2e6..9f27c2d05 100644
--- a/lib/pages/mine/controller.dart
+++ b/lib/pages/mine/controller.dart
@@ -252,7 +252,7 @@ class MineController extends GetxController {
       SmartDialog.showToast('账号未登录');
       return;
     }
-    Get.toNamed('/memberDynamics?mid=${userInfo.value.mid}',
+    Get.toNamed('/member?mid=${userInfo.value.mid}',
         preventDuplicates: false);
   }
 }
diff --git a/lib/pages/mine/view.dart b/lib/pages/mine/view.dart
index 6b885fc5b..0fcb0e980 100644
--- a/lib/pages/mine/view.dart
+++ b/lib/pages/mine/view.dart
@@ -40,25 +40,29 @@ class _MinePageState extends State<MinePage> {
     return IntrinsicWidth(
         child: Column(
       mainAxisSize: MainAxisSize.min,
-      crossAxisAlignment: CrossAxisAlignment.center,
-      // mainAxisAlignment: MainAxisAlignment.center,
+      mainAxisAlignment: MainAxisAlignment.center,
       children: [
         const SizedBox(height: 8),
         Row(
-            mainAxisSize: MainAxisSize.min,
+            // mainAxisSize: MainAxisSize.min,
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
               const SizedBox(width: 12),
               Image.asset(
                 'assets/images/logo/logo_android_2.png',
-                width: 35,
+                width: 30,
               ),
               const SizedBox(width: 5),
               Text(
                 'PiliPalaX',
-                style: Theme.of(context).textTheme.titleMedium,
+                style: Theme.of(context).textTheme.titleSmall,
+              ),
+              const Expanded(
+                flex: 255,
+                child: SizedBox(
+                  width: 10,
+                ),
               ),
-              const SizedBox(width: 30),
               IconButton(
                 iconSize: 40.0,
                 padding: const EdgeInsets.all(8),
@@ -147,214 +151,249 @@ class _MinePageState extends State<MinePage> {
         fontSize: Theme.of(context).textTheme.titleMedium!.fontSize,
         color: Theme.of(context).colorScheme.primary,
         fontWeight: FontWeight.bold);
-    return Column(mainAxisSize: MainAxisSize.min, children: [
-      Row(
+    return Column(
         mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.center,
         children: [
-          const SizedBox(width: 20),
-          GestureDetector(
-            onTap: () => _mineController.onLogin(),
-            child: ClipOval(
-              child: Container(
-                width: 70,
-                height: 70,
-                color: Theme.of(context).colorScheme.onInverseSurface,
-                child: Center(
-                  child: _mineController.userInfo.value.face != null
-                      ? NetworkImgLayer(
-                          src: _mineController.userInfo.value.face,
-                          semanticsLabel: '头像',
-                          width: 70,
-                          height: 70)
-                      : Image.asset(
-                          'assets/images/noface.jpeg',
-                          semanticLabel: "默认头像",
-                        ),
-                ),
-              ),
-            ),
-          ),
-          const SizedBox(width: 16),
-          IntrinsicWidth(
-              child: Column(
+          Row(
             mainAxisSize: MainAxisSize.min,
-            mainAxisAlignment: MainAxisAlignment.center,
-            crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              Row(
+              // const SizedBox(width: 20),
+              GestureDetector(
+                onTap: () => _mineController.onLogin(),
+                child: ClipOval(
+                  child: Container(
+                    width: 55,
+                    height: 55,
+                    color: Theme.of(context).colorScheme.onInverseSurface,
+                    child: Center(
+                      child: _mineController.userInfo.value.face != null
+                          ? NetworkImgLayer(
+                              src: _mineController.userInfo.value.face,
+                              semanticsLabel: '头像',
+                              width: 55,
+                              height: 55)
+                          : Image.asset(
+                              'assets/images/noface.jpeg',
+                              semanticLabel: "默认头像",
+                            ),
+                    ),
+                  ),
+                ),
+              ),
+              const SizedBox(width: 13),
+              IntrinsicWidth(
+                  child: Column(
                 mainAxisSize: MainAxisSize.min,
+                mainAxisAlignment: MainAxisAlignment.center,
+                crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  Text(
-                    _mineController.userInfo.value.uname ?? '点击头像登录',
-                    style: Theme.of(context).textTheme.titleMedium,
+                  Row(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Text(
+                        _mineController.userInfo.value.uname ?? '点击头像登录',
+                        style: Theme.of(context).textTheme.titleMedium,
+                      ),
+                      const SizedBox(width: 4),
+                      Image.asset(
+                        'assets/images/lv/lv${_mineController.userInfo.value.levelInfo?.currentLevel ?? '0'}.png',
+                        height: 10,
+                        semanticLabel:
+                            '等级：${_mineController.userInfo.value.levelInfo?.currentLevel ?? '0'}',
+                      ),
+                    ],
                   ),
-                  const SizedBox(width: 4),
-                  Image.asset(
-                    'assets/images/lv/lv${_mineController.userInfo.value.levelInfo != null ? _mineController.userInfo.value.levelInfo!.currentLevel : '0'}.png',
-                    height: 10,
-                    semanticLabel:
-                        '等级：${_mineController.userInfo.value.levelInfo != null ? _mineController.userInfo.value.levelInfo!.currentLevel : '0'}',
+                  const SizedBox(height: 8),
+                  Text.rich(TextSpan(children: [
+                    TextSpan(
+                        text: '硬币',
+                        style: TextStyle(
+                            fontSize: Theme.of(context)
+                                    .textTheme
+                                    .labelSmall!
+                                    .fontSize! -
+                                2,
+                            color: Theme.of(context).colorScheme.outline)),
+                    const WidgetSpan(
+                        alignment: PlaceholderAlignment.baseline,
+                        baseline: TextBaseline.alphabetic,
+                        child: SizedBox(width: 1.5)),
+                    TextSpan(
+                        text: (_mineController.userInfo.value.money ?? '-')
+                            .toString(),
+                        style: TextStyle(
+                            fontSize: Theme.of(context)
+                                .textTheme
+                                .labelSmall!
+                                .fontSize,
+                            fontWeight: FontWeight.bold,
+                            color: Theme.of(context).colorScheme.primary)),
+                    const WidgetSpan(
+                        alignment: PlaceholderAlignment.baseline,
+                        baseline: TextBaseline.alphabetic,
+                        child: SizedBox(width: 5)),
+                    TextSpan(
+                        text: "经验",
+                        style: TextStyle(
+                            fontSize: Theme.of(context)
+                                    .textTheme
+                                    .labelSmall!
+                                    .fontSize! -
+                                2,
+                            color: Theme.of(context).colorScheme.outline)),
+                    const WidgetSpan(
+                        alignment: PlaceholderAlignment.baseline,
+                        baseline: TextBaseline.alphabetic,
+                        child: SizedBox(width: 1.5)),
+                    TextSpan(
+                        text: "${levelInfo?.currentExp ?? '-'}",
+                        semanticsLabel: "当前${levelInfo?.currentExp ?? '-'}",
+                        style: TextStyle(
+                            fontSize: Theme.of(context)
+                                .textTheme
+                                .labelSmall!
+                                .fontSize,
+                            fontWeight: FontWeight.bold,
+                            color: Theme.of(context).colorScheme.primary)),
+                    TextSpan(
+                        text: "/${levelInfo?.nextExp ?? '-'}",
+                        semanticsLabel: "升级需${levelInfo?.nextExp ?? '-'}",
+                        style: TextStyle(
+                            fontSize: Theme.of(context)
+                                .textTheme
+                                .labelSmall!
+                                .fontSize!,
+                            color: Theme.of(context).colorScheme.outline)),
+                  ])),
+                  // const SizedBox(height: 4),
+                  // Text.rich(TextSpan(children: [
+                  // ])),
+                  // Text.rich(
+                  //     textAlign: TextAlign.right,
+                  //     TextSpan(children: [
+                  //
+                  //     ])),
+                  const SizedBox(height: 4),
+                  SizedBox(
+                    width: 140,
+                    child: LinearProgressIndicator(
+                      minHeight: 2,
+                      value: levelInfo != null
+                          ? (levelInfo.currentExp! / levelInfo.nextExp!)
+                          : 0,
+                      backgroundColor:
+                          Theme.of(context).colorScheme.inversePrimary,
+                      valueColor: AlwaysStoppedAnimation<Color>(
+                          Theme.of(context).colorScheme.primary),
+                    ),
                   ),
                 ],
-              ),
-              const SizedBox(height: 8),
-              Text.rich(TextSpan(children: [
-                TextSpan(
-                    text: '硬币 ',
-                    style: TextStyle(
-                        fontSize:
-                            Theme.of(context).textTheme.labelSmall!.fontSize,
-                        color: Theme.of(context).colorScheme.outline)),
-                TextSpan(
-                    text: (_mineController.userInfo.value.money ?? '-')
-                        .toString(),
-                    style: TextStyle(
-                        fontSize:
-                            Theme.of(context).textTheme.labelSmall!.fontSize,
-                        fontWeight: FontWeight.bold,
-                        color: Theme.of(context).colorScheme.primary)),
-                TextSpan(
-                    text: "  经验 ",
-                    style: TextStyle(
-                        fontSize:
-                            Theme.of(context).textTheme.labelSmall!.fontSize,
-                        color: Theme.of(context).colorScheme.outline)),
-                TextSpan(
-                    text: "${levelInfo?.currentExp ?? '-'}",
-                    semanticsLabel: "当前${levelInfo?.currentExp ?? '-'}",
-                    style: TextStyle(
-                        fontSize:
-                            Theme.of(context).textTheme.labelSmall!.fontSize,
-                        fontWeight: FontWeight.bold,
-                        color: Theme.of(context).colorScheme.primary)),
-                TextSpan(
-                    text: "/${levelInfo?.nextExp ?? '-'}",
-                    semanticsLabel: "升级需${levelInfo?.nextExp ?? '-'}",
-                    style: TextStyle(
-                        fontSize:
-                            Theme.of(context).textTheme.labelSmall!.fontSize,
-                        color: Theme.of(context).colorScheme.outline)),
-              ])),
-              // const SizedBox(height: 4),
-              // Text.rich(TextSpan(children: [
-              // ])),
-              // Text.rich(
-              //     textAlign: TextAlign.right,
-              //     TextSpan(children: [
-              //
-              //     ])),
-              const SizedBox(height: 4),
-              LinearProgressIndicator(
-                minHeight: 2,
-                value: levelInfo != null
-                    ? (levelInfo.currentExp! / levelInfo.nextExp!)
-                    : 0,
-                backgroundColor: Theme.of(context).colorScheme.inversePrimary,
-                valueColor: AlwaysStoppedAnimation<Color>(
-                    Theme.of(context).colorScheme.primary),
-              ),
+              )),
+              // const SizedBox(width: 20),
             ],
-          )),
-          const SizedBox(width: 20),
-        ],
-      ),
-      const SizedBox(height: 10),
-      SizedBox(
-          width: 240,
-          height: 100,
-          child: GridView.count(
-            padding: EdgeInsets.zero,
-            physics: const NeverScrollableScrollPhysics(),
-            crossAxisCount: 3,
-            children: [
-              InkWell(
-                onTap: () => _mineController.pushDynamic(),
-                borderRadius: StyleString.mdRadius,
-                child: Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    AnimatedSwitcher(
-                      duration: const Duration(milliseconds: 400),
-                      transitionBuilder:
-                          (Widget child, Animation<double> animation) {
-                        return ScaleTransition(scale: animation, child: child);
-                      },
-                      child: Text(
-                          (_mineController.userStat.value.dynamicCount ?? '-')
-                              .toString(),
-                          key: ValueKey<String>(_mineController
-                              .userStat.value.dynamicCount
-                              .toString()),
-                          style: style),
-                    ),
-                    const SizedBox(height: 8),
-                    Text(
-                      '动态',
-                      style: Theme.of(context).textTheme.labelMedium,
-                    ),
-                  ],
-                ),
-              ),
-              InkWell(
-                onTap: () => _mineController.pushFollow(),
-                borderRadius: StyleString.mdRadius,
-                child: Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    AnimatedSwitcher(
-                      duration: const Duration(milliseconds: 400),
-                      transitionBuilder:
-                          (Widget child, Animation<double> animation) {
-                        return ScaleTransition(scale: animation, child: child);
-                      },
-                      child: Text(
-                          (_mineController.userStat.value.following ?? '-')
-                              .toString(),
-                          key: ValueKey<String>(_mineController
-                              .userStat.value.following
-                              .toString()),
-                          style: style),
-                    ),
-                    const SizedBox(height: 8),
-                    Text(
-                      '关注',
-                      style: Theme.of(context).textTheme.labelMedium,
+          ),
+          const SizedBox(height: 10),
+          SizedBox(
+              width: 240,
+              height: 100,
+              child: GridView.count(
+                padding: EdgeInsets.zero,
+                physics: const NeverScrollableScrollPhysics(),
+                crossAxisCount: 3,
+                children: [
+                  InkWell(
+                    onTap: () => _mineController.pushDynamic(),
+                    borderRadius: StyleString.mdRadius,
+                    child: Column(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        AnimatedSwitcher(
+                          duration: const Duration(milliseconds: 400),
+                          transitionBuilder:
+                              (Widget child, Animation<double> animation) {
+                            return ScaleTransition(
+                                scale: animation, child: child);
+                          },
+                          child: Text(
+                              (_mineController.userStat.value.dynamicCount ??
+                                      '-')
+                                  .toString(),
+                              key: ValueKey<String>(_mineController
+                                  .userStat.value.dynamicCount
+                                  .toString()),
+                              style: style),
+                        ),
+                        const SizedBox(height: 8),
+                        Text(
+                          '动态',
+                          style: Theme.of(context).textTheme.labelMedium,
+                        ),
+                      ],
                     ),
-                  ],
-                ),
-              ),
-              InkWell(
-                onTap: () => _mineController.pushFans(),
-                borderRadius: StyleString.mdRadius,
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    AnimatedSwitcher(
-                      duration: const Duration(milliseconds: 400),
-                      transitionBuilder:
-                          (Widget child, Animation<double> animation) {
-                        return ScaleTransition(scale: animation, child: child);
-                      },
-                      child: Text(
-                          (_mineController.userStat.value.follower ?? '-')
-                              .toString(),
-                          key: ValueKey<String>(_mineController
-                              .userStat.value.follower
-                              .toString()),
-                          style: style),
+                  ),
+                  InkWell(
+                    onTap: () => _mineController.pushFollow(),
+                    borderRadius: StyleString.mdRadius,
+                    child: Column(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        AnimatedSwitcher(
+                          duration: const Duration(milliseconds: 400),
+                          transitionBuilder:
+                              (Widget child, Animation<double> animation) {
+                            return ScaleTransition(
+                                scale: animation, child: child);
+                          },
+                          child: Text(
+                              (_mineController.userStat.value.following ?? '-')
+                                  .toString(),
+                              key: ValueKey<String>(_mineController
+                                  .userStat.value.following
+                                  .toString()),
+                              style: style),
+                        ),
+                        const SizedBox(height: 8),
+                        Text(
+                          '关注',
+                          style: Theme.of(context).textTheme.labelMedium,
+                        ),
+                      ],
                     ),
-                    const SizedBox(height: 8),
-                    Text(
-                      '粉丝',
-                      style: Theme.of(context).textTheme.labelMedium,
+                  ),
+                  InkWell(
+                    onTap: () => _mineController.pushFans(),
+                    borderRadius: StyleString.mdRadius,
+                    child: Column(
+                      mainAxisSize: MainAxisSize.min,
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        AnimatedSwitcher(
+                          duration: const Duration(milliseconds: 400),
+                          transitionBuilder:
+                              (Widget child, Animation<double> animation) {
+                            return ScaleTransition(
+                                scale: animation, child: child);
+                          },
+                          child: Text(
+                              (_mineController.userStat.value.follower ?? '-')
+                                  .toString(),
+                              key: ValueKey<String>(_mineController
+                                  .userStat.value.follower
+                                  .toString()),
+                              style: style),
+                        ),
+                        const SizedBox(height: 8),
+                        Text(
+                          '粉丝',
+                          style: Theme.of(context).textTheme.labelMedium,
+                        ),
+                      ],
                     ),
-                  ],
-                ),
-              ),
-            ],
-          )),
-    ]);
+                  ),
+                ],
+              )),
+        ]);
   }
 }
 
diff --git a/lib/pages/msg_feed_top/at_me/view.dart b/lib/pages/msg_feed_top/at_me/view.dart
index d5180743b..3b01dbda2 100644
--- a/lib/pages/msg_feed_top/at_me/view.dart
+++ b/lib/pages/msg_feed_top/at_me/view.dart
@@ -41,6 +41,8 @@ class _AtMePageState extends State<AtMePage> {
         title: const Text('@我的'),
       ),
       body: RefreshIndicator(
+        displacement: 10.0,
+        edgeOffset: 10.0,
         onRefresh: () async {
           await _atMeController.onRefresh();
         },
diff --git a/lib/pages/msg_feed_top/like_me/view.dart b/lib/pages/msg_feed_top/like_me/view.dart
index d231c8d3a..8c7c150d2 100644
--- a/lib/pages/msg_feed_top/like_me/view.dart
+++ b/lib/pages/msg_feed_top/like_me/view.dart
@@ -42,6 +42,8 @@ class _LikeMePageState extends State<LikeMePage> {
         title: const Text('收到的赞'),
       ),
       body: RefreshIndicator(
+        displacement: 10.0,
+        edgeOffset: 10.0,
         onRefresh: () async {
           await _likeMeController.onRefresh();
         },
diff --git a/lib/pages/msg_feed_top/reply_me/view.dart b/lib/pages/msg_feed_top/reply_me/view.dart
index 6b170ac74..a1e1374a4 100644
--- a/lib/pages/msg_feed_top/reply_me/view.dart
+++ b/lib/pages/msg_feed_top/reply_me/view.dart
@@ -42,6 +42,8 @@ class _ReplyMePageState extends State<ReplyMePage> {
         title: const Text('回复我的'),
       ),
       body: RefreshIndicator(
+        displacement: 10.0,
+        edgeOffset: 10.0,
         onRefresh: () async {
           await _replyMeController.onRefresh();
         },
diff --git a/lib/pages/msg_feed_top/sys_msg/view.dart b/lib/pages/msg_feed_top/sys_msg/view.dart
index da35fa4e7..aa93153c4 100644
--- a/lib/pages/msg_feed_top/sys_msg/view.dart
+++ b/lib/pages/msg_feed_top/sys_msg/view.dart
@@ -41,6 +41,8 @@ class _SysMsgPageState extends State<SysMsgPage> {
         title: const Text('系统通知'),
       ),
       body: RefreshIndicator(
+        displacement: 10.0,
+        edgeOffset: 10.0,
         onRefresh: () async {
           await _sysMsgController.onRefresh();
         },
diff --git a/lib/pages/rank/zone/controller.dart b/lib/pages/rank/zone/controller.dart
index 83b276a81..2559e9cf6 100644
--- a/lib/pages/rank/zone/controller.dart
+++ b/lib/pages/rank/zone/controller.dart
@@ -10,12 +10,20 @@ class ZoneController extends GetxController {
   bool isLoadingMore = false;
   bool flag = false;
   List<OverlayEntry?> popupDialog = <OverlayEntry?>[];
-  int zoneID = 0;
+  int? rid;
+  int? tid;
 
   // 获取推荐
-  Future queryRankFeed(type, rid) async {
-    zoneID = rid;
-    var res = await VideoHttp.getRankVideoList(zoneID);
+  Future queryRankFeed(String type, int? rid, int? tid) async {
+    print('queryRankFeed: $type, $rid, $tid');
+    this.rid = rid;
+    this.tid = tid;
+    late dynamic res;
+    if (rid != null) {
+      res = await VideoHttp.getRankVideoList(rid);
+    } else {
+      res = await VideoHttp.getRegionVideoList(tid!, 1, 50);
+    }
     if (res['status']) {
       if (type == 'init') {
         videoList.value = res['data'];
@@ -33,12 +41,12 @@ class ZoneController extends GetxController {
 
   // 下拉刷新
   Future onRefresh() async {
-    queryRankFeed('onRefresh', zoneID);
+    queryRankFeed('onRefresh', rid, tid);
   }
 
   // 上拉加载
   Future onLoad() async {
-    queryRankFeed('onLoad', zoneID);
+    queryRankFeed('onLoad', rid, tid);
   }
 
   // 返回顶部并刷新
diff --git a/lib/pages/rank/zone/view.dart b/lib/pages/rank/zone/view.dart
index 444188bb3..8adddc1a4 100644
--- a/lib/pages/rank/zone/view.dart
+++ b/lib/pages/rank/zone/view.dart
@@ -16,9 +16,12 @@ import 'package:PiliPalaX/pages/rank/zone/index.dart';
 import '../../../utils/grid.dart';
 
 class ZonePage extends StatefulWidget {
-  const ZonePage({super.key, required this.rid});
+  const ZonePage({super.key, this.rid, this.tid})
+      : assert(
+            rid != null || tid != null, 'Either rid or tid must be provided');
 
-  final int rid;
+  final int? rid;
+  final int? tid;
 
   @override
   State<ZonePage> createState() => _ZonePageState();
@@ -36,8 +39,10 @@ class _ZonePageState extends State<ZonePage>
   @override
   void initState() {
     super.initState();
-    _zoneController = Get.put(ZoneController(), tag: widget.rid.toString());
-    _futureBuilderFuture = _zoneController.queryRankFeed('init', widget.rid);
+    _zoneController =
+        Get.put(ZoneController(), tag: (widget.rid ?? widget.tid).toString());
+    _futureBuilderFuture =
+        _zoneController.queryRankFeed('init', widget.rid, widget.tid);
     scrollController = _zoneController.scrollController;
     StreamController<bool> mainStream =
         Get.find<MainController>().bottomBarStream;
@@ -76,6 +81,8 @@ class _ZonePageState extends State<ZonePage>
   Widget build(BuildContext context) {
     super.build(context);
     return RefreshIndicator(
+      displacement: 10.0,
+      edgeOffset: 10.0,
       onRefresh: () async {
         return await _zoneController.onRefresh();
       },
@@ -89,7 +96,7 @@ class _ZonePageState extends State<ZonePage>
             sliver: FutureBuilder(
               future: _futureBuilderFuture,
               builder: (context, snapshot) {
-                if (snapshot.connectionState == ConnectionState.done) {
+                if (snapshot.connectionState == ConnectionState.done && snapshot.hasData) {
                   Map data = snapshot.data as Map;
                   if (data['status']) {
                     return Obx(
@@ -121,8 +128,8 @@ class _ZonePageState extends State<ZonePage>
                       errMsg: data['msg'],
                       fn: () {
                         setState(() {
-                          _futureBuilderFuture =
-                              _zoneController.queryRankFeed('init', widget.rid);
+                          _futureBuilderFuture = _zoneController.queryRankFeed(
+                              'init', widget.rid, widget.tid);
                         });
                       },
                     );
diff --git a/lib/pages/rcmd/view.dart b/lib/pages/rcmd/view.dart
index 9cdb3e9d1..d7ca86dc1 100644
--- a/lib/pages/rcmd/view.dart
+++ b/lib/pages/rcmd/view.dart
@@ -79,6 +79,8 @@ class _RcmdPageState extends State<RcmdPage>
         borderRadius: BorderRadius.all(StyleString.imgRadius),
       ),
       child: RefreshIndicator(
+        displacement: 10.0,
+        edgeOffset: 10.0,
         onRefresh: () async {
           await _rcmdController.onRefresh();
           await Future.delayed(const Duration(milliseconds: 300));
diff --git a/lib/pages/search_panel/view.dart b/lib/pages/search_panel/view.dart
index 5d884362d..b90ec9f82 100644
--- a/lib/pages/search_panel/view.dart
+++ b/lib/pages/search_panel/view.dart
@@ -68,6 +68,8 @@ class _SearchPanelState extends State<SearchPanel>
   Widget build(BuildContext context) {
     super.build(context);
     return RefreshIndicator(
+      displacement: 10.0,
+      edgeOffset: 10.0,
       onRefresh: () async {
         await _searchPanelController.onRefresh();
       },
diff --git a/lib/pages/setting/extra_setting.dart b/lib/pages/setting/extra_setting.dart
index 78e2a7ffa..7d39ca329 100644
--- a/lib/pages/setting/extra_setting.dart
+++ b/lib/pages/setting/extra_setting.dart
@@ -5,6 +5,7 @@ import 'package:PiliPalaX/models/common/dynamics_type.dart';
 import 'package:PiliPalaX/models/common/reply_sort_type.dart';
 import 'package:PiliPalaX/pages/setting/widgets/select_dialog.dart';
 import 'package:PiliPalaX/utils/storage.dart';
+import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 
 import '../home/index.dart';
 import 'controller.dart';
@@ -215,6 +216,13 @@ class _ExtraSettingState extends State<ExtraSetting> {
             setKey: SettingBoxKey.defaultShowComment,
             defaultVal: false,
           ),
+          SetSwitchItem(
+            title: '默认展开简介',
+            subTitle: '竖屏布局也在视频详情页默认展开简介',
+            leading: Icon(MdiIcons.arrowExpandDown),
+            setKey: SettingBoxKey.defaultExpandIntroduction,
+            defaultVal: false,
+          ),
           ListTile(
             dense: false,
             title: Text('评论展示', style: titleStyle),
diff --git a/lib/pages/setting/pages/color_select.dart b/lib/pages/setting/pages/color_select.dart
index 5ca070764..e329254b4 100644
--- a/lib/pages/setting/pages/color_select.dart
+++ b/lib/pages/setting/pages/color_select.dart
@@ -1,3 +1,4 @@
+import 'package:flex_seed_scheme/flex_seed_scheme.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
@@ -13,6 +14,8 @@ class ColorSelectPage extends StatefulWidget {
 
 class _ColorSelectPageState extends State<ColorSelectPage> {
   final ColorSelectController ctr = Get.put(ColorSelectController());
+  FlexSchemeVariant _dynamicSchemeVariant = FlexSchemeVariant.values[
+      GStorage.setting.get(SettingBoxKey.schemeVariant, defaultValue: 10)];
 
   @override
   Widget build(BuildContext context) {
@@ -25,6 +28,55 @@ class _ColorSelectPageState extends State<ColorSelectPage> {
       ),
       body: ListView(
         children: [
+          Builder(
+            builder: (context) => ListTile(
+              title: const Text('调色板风格'),
+              leading: Container(
+                width: 40,
+                alignment: Alignment.center,
+                child: const Icon(Icons.palette_outlined),
+              ),
+              subtitle: Text(
+                _dynamicSchemeVariant.description,
+                style: const TextStyle(fontSize: 12),
+              ),
+              trailing: PopupMenuButton(
+                initialValue: _dynamicSchemeVariant,
+                onSelected: (item) async {
+                  _dynamicSchemeVariant = item;
+                  await GStorage.setting
+                      .put(SettingBoxKey.schemeVariant, item.index);
+                  (context as Element).markNeedsBuild();
+                  Get.forceAppUpdate();
+                },
+                itemBuilder: (context) => FlexSchemeVariant.values
+                    .map((item) => PopupMenuItem<FlexSchemeVariant>(
+                          value: item,
+                          child: Text(item.variantName),
+                        ))
+                    .toList(),
+                child: Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    Text(
+                      _dynamicSchemeVariant.variantName,
+                      style: TextStyle(
+                        height: 1,
+                        fontSize: 13,
+                        color: Theme.of(context).colorScheme.primary,
+                      ),
+                      strutStyle: const StrutStyle(leading: 0, height: 1),
+                    ),
+                    Icon(
+                      size: 20,
+                      Icons.keyboard_arrow_right,
+                      color: Theme.of(context).colorScheme.primary,
+                    )
+                  ],
+                ),
+              ),
+            ),
+          ),
           Obx(
             () => RadioListTile(
               value: 0,
diff --git a/lib/pages/setting/pages/gesture_select.dart b/lib/pages/setting/pages/gesture_select.dart
new file mode 100644
index 000000000..9667a98f9
--- /dev/null
+++ b/lib/pages/setting/pages/gesture_select.dart
@@ -0,0 +1,117 @@
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:hive/hive.dart';
+import 'package:PiliPalaX/utils/storage.dart';
+
+import 'package:PiliPalaX/plugin/pl_player/models/player_middle_gesture.dart';
+import 'package:PiliPalaX/plugin/pl_player/models/player_gesture_action.dart';
+
+class GestureSelectPage extends StatefulWidget {
+  const GestureSelectPage({super.key});
+
+  @override
+  State<GestureSelectPage> createState() => _GestureSelectPageState();
+}
+
+class _GestureSelectPageState extends State<GestureSelectPage> {
+  Box setting = GStorage.setting;
+  late Map<PlayerMiddleGesture, PlayerGestureAction> gestureAction;
+  late Map<int, int> gestureCodeMap;
+
+  @override
+  void initState() {
+    super.initState();
+    gestureCodeMap = Map<int, int>.from(
+        setting.get(SettingBoxKey.playerGestureActionMap, defaultValue: {
+      PlayerMiddleGesture.nonFullScreenUp.code:
+          PlayerGestureAction.toggleFullScreen.code,
+      PlayerMiddleGesture.nonFullScreenDown.code:
+          PlayerGestureAction.pipInside.code,
+      PlayerMiddleGesture.fullScreenUp.code: PlayerGestureAction.pipInside.code,
+      PlayerMiddleGesture.fullScreenDown.code:
+          PlayerGestureAction.toggleFullScreen.code,
+    }));
+    gestureAction = Map.fromEntries(
+      PlayerMiddleGesture.values.map(
+        (e) => MapEntry(
+          e,
+          PlayerGestureActionCode.fromCode(gestureCodeMap[e.code]!)!,
+        ),
+      ),
+    );
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+
+  String getGestureActionDescription(
+      PlayerMiddleGesture gesture, PlayerGestureAction action) {
+    if (action == PlayerGestureAction.toggleFullScreen) {
+      if (gesture == PlayerMiddleGesture.nonFullScreenUp ||
+          gesture == PlayerMiddleGesture.nonFullScreenDown) {
+        return '进入全屏';
+      } else if (gesture == PlayerMiddleGesture.fullScreenUp ||
+          gesture == PlayerMiddleGesture.fullScreenDown) {
+        return '退出全屏';
+      }
+    }
+    return action.description;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    TextStyle titleStyle = Theme.of(context).textTheme.titleMedium!;
+    TextStyle subTitleStyle = Theme.of(context)
+        .textTheme
+        .titleMedium!
+        .copyWith(color: Theme.of(context).colorScheme.outline);
+
+    return Scaffold(
+      appBar: AppBar(
+        centerTitle: false,
+        title: Text(
+          '播放器中部手势设置',
+          style: Theme.of(context).textTheme.titleMedium,
+        ),
+      ),
+      body: ListView(
+        children: [
+          for (var gesture in PlayerMiddleGesture.values)
+            ListTile(
+                title: Text(gesture.description, style: titleStyle),
+                trailing: PopupMenuButton(
+                  initialValue: gestureAction[gesture],
+                  onSelected: (action) async {
+                    gestureAction[gesture] = action;
+                    gestureCodeMap[gesture.code] = action.code;
+                    await setting.put(
+                        SettingBoxKey.playerGestureActionMap, gestureCodeMap);
+                    setState(() {});
+                  },
+                  itemBuilder: (context) => PlayerGestureAction.values
+                      .map((action) => PopupMenuItem<PlayerGestureAction>(
+                            value: action,
+                            child: Text(
+                                getGestureActionDescription(gesture, action)),
+                          ))
+                      .toList(),
+                  child: Row(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Text(
+                        getGestureActionDescription(
+                            gesture, gestureAction[gesture]!),
+                        style: subTitleStyle,
+                      ),
+                      const Icon(Icons.arrow_drop_down),
+                    ],
+                  ),
+                )),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/pages/setting/play_setting.dart b/lib/pages/setting/play_setting.dart
index 966faaae7..be7933c24 100644
--- a/lib/pages/setting/play_setting.dart
+++ b/lib/pages/setting/play_setting.dart
@@ -8,8 +8,11 @@ import 'package:PiliPalaX/pages/setting/widgets/select_dialog.dart';
 import 'package:PiliPalaX/plugin/pl_player/index.dart';
 import 'package:PiliPalaX/services/service_locator.dart';
 import 'package:PiliPalaX/utils/storage.dart';
+import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 
-import '../../models/video/play/subtitle.dart';
+import 'package:PiliPalaX/plugin/pl_player/models/player_middle_gesture.dart';
+import 'package:PiliPalaX/plugin/pl_player/models/player_gesture_action.dart';
+import 'package:PiliPalaX/models/video/play/subtitle.dart';
 import 'widgets/switch_item.dart';
 
 class PlaySetting extends StatefulWidget {
@@ -24,6 +27,7 @@ class _PlaySettingState extends State<PlaySetting> {
   late String defaultSubtitlePreference;
   late int defaultFullScreenMode;
   late int defaultBtmProgressBehavior;
+  late Map<PlayerMiddleGesture, PlayerGestureAction> defaultMiddleGestureAction;
 
   @override
   void initState() {
@@ -84,12 +88,29 @@ class _PlaySettingState extends State<PlaySetting> {
             defaultVal: true,
           ),
           const SetSwitchItem(
-            title: '双击快退/快进',
+            title: '左右侧双击快退/快进',
             subTitle: '左侧双击快退/右侧双击快进，关闭则双击均为暂停/播放',
             leading: Icon(Icons.touch_app_outlined),
             setKey: SettingBoxKey.enableQuickDouble,
             defaultVal: true,
           ),
+          ListTile(
+            dense: false,
+            title: Text('中部上下滑动手势', style: titleStyle),
+            leading: Icon(MdiIcons.gestureSwipeVertical),
+            subtitle: Text(
+              '设置视频画面中间部分滑动手势对应的操作',
+              style: subTitleStyle,
+            ),
+            onTap: () => Get.toNamed('/gestureSetting'),
+          ),
+          SetSwitchItem(
+            title: '全屏时显示额外功能',
+            subTitle: '添加【锁定】与【截图】按钮',
+            leading: Icon(MdiIcons.oneUp),
+            setKey: SettingBoxKey.enableExtraButtonOnFullScreen,
+            defaultVal: true,
+          ),
           ListTile(
             dense: false,
             title: Text('自动启用字幕', style: titleStyle),
@@ -120,7 +141,7 @@ class _PlaySettingState extends State<PlaySetting> {
           ),
           const SetSwitchItem(
             title: '竖屏扩大展示',
-            subTitle: '小屏竖屏视频宽高比由16:9扩大至1:1（不支持收起）；横屏适配时，扩大至9:16',
+            subTitle: '半屏竖屏视频宽高比由16:9扩大至1:1（不支持收起）；横屏适配时，扩大至9:16',
             leading: Icon(Icons.expand_outlined),
             setKey: SettingBoxKey.enableVerticalExpand,
             defaultVal: false,
@@ -144,8 +165,7 @@ class _PlaySettingState extends State<PlaySetting> {
               subTitle: '开启后延长至30秒，便于屏幕阅读器滑动切换控件焦点',
               leading: Icon(Icons.timer_outlined),
               setKey: SettingBoxKey.enableLongShowControl,
-              defaultVal: false
-          ),
+              defaultVal: false),
           const SetSwitchItem(
             title: '全向旋转',
             subTitle: '小屏可受重力转为临时全屏，若系统锁定旋转仍触发请关闭，关闭会影响横屏适配',
@@ -156,18 +176,24 @@ class _PlaySettingState extends State<PlaySetting> {
           SetSwitchItem(
             title: '后台播放',
             subTitle: '进入后台时继续播放',
-            leading: Icon(Icons.motion_photos_pause_outlined),
+            leading: Icon(MdiIcons.locationExit),
             setKey: SettingBoxKey.continuePlayInBackground,
             defaultVal: false,
             callFn: (val) {
               SmartDialog.showToast('如果该设置未生效，请重启');
             },
           ),
-          if (Platform.isAndroid)
+          const SetSwitchItem(
+              title: '应用内小窗',
+              subTitle: '离开播放页时，以小窗形式继续播放',
+              leading: Icon(Icons.tab_unselected_outlined),
+              setKey: SettingBoxKey.autoMiniPlayer,
+              defaultVal: false),
+          if (Platform.isAndroid || Platform.isIOS)
             SetSwitchItem(
                 title: '后台画中画',
                 subTitle: '进入后台时以小窗形式（PiP）播放',
-                leading: const Icon(Icons.picture_in_picture_outlined),
+                leading: const Icon(Icons.picture_in_picture_alt),
                 setKey: SettingBoxKey.autoPiP,
                 defaultVal: false,
                 callFn: (val) {
@@ -179,19 +205,26 @@ class _PlaySettingState extends State<PlaySetting> {
                 }),
           if (Platform.isAndroid)
             const SetSwitchItem(
-              title: '画中画不加载弹幕',
+              title: '后台画中画不加载弹幕',
               subTitle: '当弹幕开关开启时，小窗屏蔽弹幕以获得较好的体验',
               leading: Icon(Icons.comments_disabled_outlined),
               setKey: SettingBoxKey.pipNoDanmaku,
               defaultVal: true,
             ),
-          const SetSwitchItem(
-            title: '全屏手势反向',
-            subTitle: '默认播放器中部向上滑动进入全屏，向下退出\n开启后向下全屏，向上退出',
-            leading: Icon(Icons.swap_vert_outlined),
-            setKey: SettingBoxKey.fullScreenGestureReverse,
-            defaultVal: false,
-          ),
+          // const SetSwitchItem(
+          //   title: '全屏手势方向',
+          //   subTitle: '关闭时，在播放器中部向上滑动进入全屏，向下退出\n开启时，向下全屏，向上退出',
+          //   leading: Icon(Icons.swap_vert_outlined),
+          //   setKey: SettingBoxKey.fullScreenGestureReverse,
+          //   defaultVal: false,
+          // ),
+          // SetSwitchItem(
+          //   title: '启用应用内小窗手势',
+          //   subTitle: '与全屏手势相反方向滑动时，触发应用内小窗',
+          //   leading: Icon(MdiIcons.gestureSwipeVertical),
+          //   setKey: SettingBoxKey.enableFloatingWindowGesture,
+          //   defaultVal: true,
+          // ),
           const SetSwitchItem(
             title: '观看人数',
             subTitle: '展示同时在看人数',
@@ -253,6 +286,13 @@ class _PlaySettingState extends State<PlaySetting> {
               }
             },
           ),
+          const SetSwitchItem(
+            title: '调节系统亮度（需权限）',
+            subTitle: '若打开自动亮度，可能调节后无变化；关闭则调节应用内亮度（仅在本app生效，且生效期间可能会忽略系统亮度变化）',
+            leading: Icon(Icons.brightness_6_outlined),
+            setKey: SettingBoxKey.setSystemBrightness,
+            defaultVal: false,
+          ),
           const SetSwitchItem(
             title: '后台音频服务',
             subTitle: '避免画中画没有播放暂停功能',
diff --git a/lib/pages/setting/style_setting.dart b/lib/pages/setting/style_setting.dart
index 9898060e9..26aaa13eb 100644
--- a/lib/pages/setting/style_setting.dart
+++ b/lib/pages/setting/style_setting.dart
@@ -13,6 +13,7 @@ import 'package:PiliPalaX/utils/global_data.dart';
 import 'package:PiliPalaX/utils/storage.dart';
 
 import '../../models/common/dynamic_badge_mode.dart';
+import '../../models/common/side_bar_position.dart';
 import '../../models/common/up_panel_position.dart';
 import '../../plugin/pl_player/utils/fullscreen.dart';
 import '../../models/common/nav_bar_config.dart';
@@ -36,6 +37,7 @@ class _StyleSettingState extends State<StyleSetting> {
   late ThemeType _tempThemeValue;
   late double maxRowWidth;
   late UpPanelPosition upPanelPosition;
+  late SideBarPosition sideBarPosition;
 
   @override
   void initState() {
@@ -47,6 +49,9 @@ class _StyleSettingState extends State<StyleSetting> {
     upPanelPosition = UpPanelPosition.values[setting.get(
         SettingBoxKey.upPanelPosition,
         defaultValue: UpPanelPosition.leftFixed.code)];
+    sideBarPosition = SideBarPositionCode.fromCode(setting.get(
+        SettingBoxKey.sideBarPosition,
+        defaultValue: SideBarPosition.none.code))!;
   }
 
   @override
@@ -82,13 +87,41 @@ class _StyleSettingState extends State<StyleSetting> {
                   SmartDialog.showToast('已关闭横屏适配');
                 }
               }),
-          const SetSwitchItem(
-            title: '改用侧边栏',
-            subTitle: '开启后底栏与顶栏被替换，且相关设置失效',
-            leading: Icon(Icons.chrome_reader_mode_outlined),
-            setKey: SettingBoxKey.useSideBar,
-            defaultVal: false,
-            needReboot: true,
+          // const SetSwitchItem(
+          //   title: '改用侧边栏',
+          //   subTitle: '开启后底栏与顶栏被替换，且相关设置失效',
+          //   leading: Icon(Icons.chrome_reader_mode_outlined),
+          //   setKey: SettingBoxKey.useSideBar,
+          //   defaultVal: false,
+          //   needReboot: true,
+          // ),
+          ListTile(
+            dense: false,
+            title: Text('主页侧栏布局', style: titleStyle),
+            leading: const Icon(Icons.chrome_reader_mode_outlined),
+            subtitle: Text(
+                '当前主页侧边栏位置：${sideBarPosition.labels}，开启后底栏与顶栏将被替换为侧栏，横屏或折叠屏推荐使用',
+                style: subTitleStyle),
+            onTap: () async {
+              SideBarPosition? result = await showDialog(
+                context: context,
+                builder: (context) {
+                  return SelectDialog<SideBarPosition>(
+                    title: '侧边栏显示位置',
+                    value: sideBarPosition,
+                    values: SideBarPosition.values.map((e) {
+                      return {'title': e.labels, 'value': e};
+                    }).toList(),
+                  );
+                },
+              );
+              if (result != null) {
+                sideBarPosition = result;
+                setting.put(SettingBoxKey.sideBarPosition, result.code);
+                SmartDialog.showToast('重启生效');
+                setState(() {});
+              }
+            },
           ),
           const SetSwitchItem(
             title: 'MD3样式底栏',
diff --git a/lib/pages/setting/video_setting.dart b/lib/pages/setting/video_setting.dart
index 6e4d840ba..ee35b04c1 100644
--- a/lib/pages/setting/video_setting.dart
+++ b/lib/pages/setting/video_setting.dart
@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:hive/hive.dart';
 import 'package:PiliPalaX/models/video/play/quality.dart';
 import 'package:PiliPalaX/models/video/play/CDN.dart';
@@ -79,26 +80,31 @@ class _VideoSettingState extends State<VideoSetting> {
             defaultVal: true,
           ),
           ListTile(
-            enabled: false,
-            onTap: null,
+            // enabled: false,
+            // onTap: null,
             title: Text("b站定向流量支持", style: titleStyle),
-            subtitle:
-                Text("若套餐含b站定向流量，则会自动使用。可查阅运营商的流量记录确认。", style: subTitleStyle),
+            subtitle: Text("若有b站定向流量且未使用代理等，则会自动使用。可查阅运营商的流量记录确认，此功能无法关闭。",
+                style: subTitleStyle),
             leading: const Icon(Icons.perm_data_setting_outlined),
             trailing: Transform.scale(
               alignment: Alignment.centerRight, // 缩放Switch的大小后保持右侧对齐, 避免右侧空隙过大
               scale: 0.8,
               child: Switch(
-                  thumbIcon: WidgetStateProperty.resolveWith<Icon?>(
-                      (Set<WidgetState> states) {
-                    if (states.isNotEmpty &&
-                        states.first == WidgetState.selected) {
-                      return const Icon(Icons.done);
-                    }
-                    return null; // All other states will use the default thumbIcon.
-                  }),
-                  value: true,
-                  onChanged: null),
+                thumbIcon: WidgetStateProperty.resolveWith<Icon?>(
+                    (Set<WidgetState> states) {
+                  if (states.isNotEmpty &&
+                      states.first == WidgetState.selected) {
+                    return const Icon(Icons.lock_outline_rounded);
+                  }
+                  return null; // All other states will use the default thumbIcon.
+                }),
+                value: true,
+                onChanged: (bool value) {
+                  if (!value) {
+                    SmartDialog.showToast('由于app使用的均为官方接口，此功能无法关闭');
+                  }
+                },
+              ),
             ),
           ),
           ListTile(
@@ -247,14 +253,14 @@ class _VideoSettingState extends State<VideoSetting> {
               title: '优先使用 OpenSL ES 输出音频',
               leading: Icon(Icons.speaker_outlined),
               subTitle:
-                  '关闭则优先使用AudioTrack输出音频（此项即mpv的--ao），若遇系统音效丢失、无声、音画不同步等问题请尝试关闭。',
+                  '关闭则优先使用AudioTrack输出音频（此项即mpv的--ao），若遇系统音效丢失、无声、音画不同步等问题请尝试切换。',
               setKey: SettingBoxKey.useOpenSLES,
-              defaultVal: true,
+              defaultVal: false,
             ),
           const SetSwitchItem(
             title: '扩大缓冲区',
             leading: Icon(Icons.storage_outlined),
-            subTitle: '默认缓冲区为视频3MB/直播16MB，开启后为32MB/64MB，加载时间变长',
+            subTitle: '默认缓冲区为视频4MB/直播16MB，开启后为32MB/64MB，加载时间变长',
             setKey: SettingBoxKey.expandBuffer,
             defaultVal: false,
           ),
diff --git a/lib/pages/video/controller.dart b/lib/pages/video/controller.dart
index 5dfdc738f..3aacfb66f 100644
--- a/lib/pages/video/controller.dart
+++ b/lib/pages/video/controller.dart
@@ -26,6 +26,8 @@ class VideoDetailController extends GetxController
   /// 路由传参
   String bvid = Get.parameters['bvid']!;
   RxInt cid = int.parse(Get.parameters['cid']!).obs;
+  // 用于小窗返回
+  bool resumePlay = Get.parameters['resume']?.toLowerCase() == 'true';
   RxInt danmakuCid = 0.obs;
   String heroTag = Get.arguments['heroTag'];
   // 视频详情
@@ -55,7 +57,7 @@ class VideoDetailController extends GetxController
   RxBool isShowCover = true.obs;
   // 硬解
   RxBool enableHA = true.obs;
-  RxString hwdec = 'auto-safe'.obs;
+  RxString hwdec = 'auto'.obs;
 
   /// 本地存储
   Box userInfoCache = GStorage.userInfo;
@@ -115,7 +117,7 @@ class VideoDetailController extends GetxController
         setting.get(SettingBoxKey.defaultShowComment, defaultValue: false);
     tabCtr = TabController(
         length: 2, vsync: this, initialIndex: defaultShowComment ? 1 : 0);
-    autoPlay.value =
+    autoPlay.value = resumePlay ||
         setting.get(SettingBoxKey.autoPlayEnable, defaultValue: true);
     if (autoPlay.value) {
       isShowCover.value = false;
@@ -140,7 +142,7 @@ class VideoDetailController extends GetxController
     }
     enableHA.value = setting.get(SettingBoxKey.enableHA, defaultValue: true);
     hwdec.value = setting.get(SettingBoxKey.hardwareDecoding,
-        defaultValue: Platform.isAndroid ? 'auto-safe' : 'auto');
+        defaultValue: 'auto'); //Platform.isAndroid ? 'auto-safe' : 'auto');
     if (userInfo == null ||
         localCache.get(LocalCacheKey.historyPause) == true) {
       enableHeart = false;
@@ -280,44 +282,47 @@ class VideoDetailController extends GetxController
     bool autoplay = true,
   }) async {
     /// 设置/恢复 屏幕亮度
-    if (brightness != null) {
-      ScreenBrightness().setScreenBrightness(brightness!);
-    }
+    // if (brightness != null) {
+    //   ScreenBrightness().setScreenBrightness(brightness!);
+    // }
     plPlayerController ??= PlPlayerController.getInstance();
     headerControl ??= HeaderControl(
       controller: plPlayerController,
       videoDetailCtr: this,
       heroTag: heroTag,
     );
-    await plPlayerController!.setDataSource(
-      DataSource(
-        videoSource: video ?? videoUrl,
-        audioSource: audio ?? audioUrl,
-        type: DataSourceType.network,
-        httpHeaders: {
-          'user-agent':
-              'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36',
-          'referer': HttpString.baseUrl
-        },
-      ),
-      // 硬解
-      enableHA: enableHA.value,
-      hwdec: hwdec.value,
-      seekTo: seekToTime ?? defaultST,
-      duration: duration ?? data.timeLength == null
-          ? null
-          : Duration(milliseconds: data.timeLength!),
-      // 宽>高 水平 否则 垂直
-      direction: firstVideo.width != null && firstVideo.height != null
-          ? ((firstVideo.width! - firstVideo.height!) > 0
-              ? 'horizontal'
-              : 'vertical')
-          : null,
-      bvid: bvid,
-      cid: cid.value,
-      enableHeart: enableHeart,
-      autoplay: autoplay,
-    );
+    print("resumePlay:${resumePlay},isFirstTime:${isFirstTime}");
+    if (!resumePlay) {
+      await plPlayerController!.setDataSource(
+        DataSource(
+          videoSource: video ?? videoUrl,
+          audioSource: audio ?? audioUrl,
+          type: DataSourceType.network,
+          httpHeaders: {
+            'user-agent':
+                'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36',
+            'referer': HttpString.baseUrl
+          },
+        ),
+        // 硬解
+        enableHA: enableHA.value,
+        hwdec: hwdec.value,
+        seekTo: seekToTime ?? defaultST,
+        duration: duration ?? data.timeLength == null
+            ? null
+            : Duration(milliseconds: data.timeLength!),
+        // 宽>高 水平 否则 垂直
+        direction: firstVideo.width != null && firstVideo.height != null
+            ? ((firstVideo.width! - firstVideo.height!) > 0
+                ? 'horizontal'
+                : 'vertical')
+            : null,
+        bvid: bvid,
+        cid: cid.value,
+        enableHeart: enableHeart,
+        autoplay: autoplay,
+      );
+    }
 
     /// 开启自动全屏时，在player初始化完成后立即传入headerControl
     plPlayerController!.headerControl = headerControl;
diff --git a/lib/pages/video/introduction/bangumi/controller.dart b/lib/pages/video/introduction/bangumi/controller.dart
index ffc917d2c..4871aca10 100644
--- a/lib/pages/video/introduction/bangumi/controller.dart
+++ b/lib/pages/video/introduction/bangumi/controller.dart
@@ -1,3 +1,4 @@
+import 'package:PiliPalaX/plugin/pl_player/controller.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
@@ -27,6 +28,7 @@ class BangumiIntroController extends GetxController {
   var epId = Get.parameters['epId'] != null
       ? int.tryParse(Get.parameters['epId']!)
       : null;
+  String heroTag = Get.arguments['heroTag'];
 
   // 是否预渲染 骨架屏
   bool preRender = false;
@@ -61,6 +63,9 @@ class BangumiIntroController extends GetxController {
   // 关注状态 默认未关注
   RxMap followStatus = {}.obs;
   int _tempThemeValue = -1;
+  RxInt lastPlayCid = Get.parameters['cid'] != null
+      ? int.tryParse(Get.parameters['cid']!)!.obs
+      : 0.obs;
   var userInfo;
 
   @override
@@ -91,7 +96,7 @@ class BangumiIntroController extends GetxController {
     userLogin = userInfo != null;
     bangumiDetail.listen((value) {
       final VideoDetailController videoDetailCtr =
-          Get.find<VideoDetailController>(tag: Get.arguments['heroTag']);
+          Get.find<VideoDetailController>(tag: heroTag);
       final cid = videoDetailCtr.cid.value;
       final current =
           value.episodes?.firstWhere((element) => element.cid == cid);
@@ -105,6 +110,11 @@ class BangumiIntroController extends GetxController {
     });
   }
 
+  void openVideoDetail() {
+    Get.toNamed(
+        '/video?bvid=$bvid&cid=${lastPlayCid.value}&seasonId=$seasonId&epId=$epId&resume=true');
+  }
+
   // 获取番剧简介&选集
   Future queryBangumiIntro() async {
     if (userLogin) {
@@ -296,18 +306,19 @@ class BangumiIntroController extends GetxController {
   Future changeSeasonOrbangu(bvid, cid, aid) async {
     // 重新获取视频资源
     VideoDetailController videoDetailCtr =
-        Get.find<VideoDetailController>(tag: Get.arguments['heroTag']);
+        Get.find<VideoDetailController>(tag: heroTag);
     videoDetailCtr.bvid = bvid;
     videoDetailCtr.cid.value = cid;
     videoDetailCtr.danmakuCid.value = cid;
     videoDetailCtr.queryVideoUrl();
+    lastPlayCid.value = cid;
     // 触发媒体通知更新
     bangumiDetail.refresh();
     // 重新请求评论
     try {
       /// 未渲染回复组件时可能异常
       VideoReplyController videoReplyCtr =
-          Get.find<VideoReplyController>(tag: Get.arguments['heroTag']);
+          Get.find<VideoReplyController>(tag: heroTag);
       videoReplyCtr.aid = aid;
       videoReplyCtr.queryReplyList(type: 'init');
     } catch (_) {}
@@ -341,14 +352,11 @@ class BangumiIntroController extends GetxController {
     if (bangumiDetail.value.episodes != null) {
       episodes = bangumiDetail.value.episodes!;
     }
-    VideoDetailController videoDetailCtr =
-        Get.find<VideoDetailController>(tag: Get.arguments['heroTag']);
-    int currentIndex =
-        episodes.indexWhere((e) => e.cid == videoDetailCtr.cid.value);
+    int currentIndex = episodes.indexWhere((e) => e.cid == lastPlayCid.value);
     int prevIndex = currentIndex - 1;
-    PlayRepeat platRepeat = videoDetailCtr.plPlayerController!.playRepeat;
+    PlayRepeat playRepeat = PlPlayerController.getInstance().playRepeat;
     if (prevIndex < 0) {
-      if (platRepeat == PlayRepeat.listCycle) {
+      if (playRepeat == PlayRepeat.listCycle) {
         prevIndex = episodes.length - 1;
       } else {
         return false;
@@ -361,28 +369,39 @@ class BangumiIntroController extends GetxController {
     return true;
   }
 
+  bool hasNextEpisode() {
+    late List episodes;
+    if (bangumiDetail.value.episodes == null) {
+      return false;
+    }
+    episodes = bangumiDetail.value.episodes!;
+    PlayRepeat playRepeat = PlPlayerController.getInstance().playRepeat;
+    if (playRepeat == PlayRepeat.listCycle) {
+      return true;
+    }
+    int currentIndex = episodes.indexWhere((e) => e.cid == lastPlayCid.value);
+    return currentIndex < episodes.length - 1;
+  }
+
   /// 列表循环或者顺序播放时，自动播放下一个；自动连播时，播放相关视频
   bool nextPlay() {
     late List episodes;
-    VideoDetailController videoDetailCtr =
-        Get.find<VideoDetailController>(tag: Get.arguments['heroTag']);
-    PlayRepeat platRepeat = videoDetailCtr.plPlayerController!.playRepeat;
+    PlayRepeat playRepeat = PlPlayerController.getInstance().playRepeat;
 
     if (bangumiDetail.value.episodes != null) {
       episodes = bangumiDetail.value.episodes!;
     } else {
-      if (platRepeat == PlayRepeat.autoPlayRelated) {
+      if (playRepeat == PlayRepeat.autoPlayRelated) {
         return playRelated();
       }
     }
-    int currentIndex =
-        episodes.indexWhere((e) => e.cid == videoDetailCtr.cid.value);
+    int currentIndex = episodes.indexWhere((e) => e.cid == lastPlayCid.value);
     int nextIndex = currentIndex + 1;
     // 列表循环
     if (nextIndex == episodes.length - 1) {
-      if (platRepeat == PlayRepeat.listCycle) {
+      if (playRepeat == PlayRepeat.listCycle) {
         nextIndex = 0;
-      } else if (platRepeat == PlayRepeat.autoPlayRelated) {
+      } else if (playRepeat == PlayRepeat.autoPlayRelated) {
         return playRelated();
       } else {
         return false;
diff --git a/lib/pages/video/introduction/bangumi/view.dart b/lib/pages/video/introduction/bangumi/view.dart
index c56699f71..5922951e3 100644
--- a/lib/pages/video/introduction/bangumi/view.dart
+++ b/lib/pages/video/introduction/bangumi/view.dart
@@ -16,6 +16,7 @@ import 'package:PiliPalaX/pages/video/introduction/widgets/fav_panel.dart';
 import 'package:PiliPalaX/utils/feed_back.dart';
 
 import 'package:PiliPalaX/utils/utils.dart';
+import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'controller.dart';
 import '../widgets/bangumi_intro_detail.dart';
 
@@ -381,8 +382,8 @@ class _BangumiInfoState extends State<BangumiInfo> {
               mainAxisAlignment: MainAxisAlignment.spaceAround,
               children: <Widget>[
                 Obx(() => ActionItem(
-                      icon: const Icon(FontAwesomeIcons.thumbsUp),
-                      selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp),
+                  icon: const Icon(Icons.thumb_up_outlined),
+                  selectIcon: const Icon(Icons.thumb_up),
                       onTap:
                           handleState(bangumiIntroController.actionLikeVideo),
                       selectStatus: bangumiIntroController.hasLike.value,
@@ -395,8 +396,8 @@ class _BangumiInfoState extends State<BangumiInfo> {
                     )),
                 Obx(
                   () => ActionItem(
-                      icon: const Icon(FontAwesomeIcons.b),
-                      selectIcon: const Icon(FontAwesomeIcons.b),
+                      icon: const Icon(Icons.offline_bolt_outlined),
+                      selectIcon: const Icon(Icons.offline_bolt),
                       onTap:
                           handleState(bangumiIntroController.actionCoinVideo),
                       selectStatus: bangumiIntroController.hasCoin.value,
@@ -409,8 +410,8 @@ class _BangumiInfoState extends State<BangumiInfo> {
                 ),
                 Obx(
                   () => ActionItem(
-                      icon: const Icon(FontAwesomeIcons.star),
-                      selectIcon: const Icon(FontAwesomeIcons.solidStar),
+                      icon: Icon(MdiIcons.starPlusOutline),
+                      selectIcon: Icon(MdiIcons.star),
                       onTap: () => showFavBottomSheet(),
                       selectStatus: bangumiIntroController.hasFav.value,
                       loadingStatus: false,
@@ -421,8 +422,8 @@ class _BangumiInfoState extends State<BangumiInfo> {
                           : Utils.numFormat(bangumiItem!.stat!['favorite']!)),
                 ),
                 ActionItem(
-                  icon: const Icon(FontAwesomeIcons.comment),
-                  selectIcon: const Icon(FontAwesomeIcons.reply),
+                  icon: Icon(MdiIcons.chatOutline),
+                  selectIcon: Icon(MdiIcons.reply),
                   onTap: () => videoDetailCtr.tabCtr.animateTo(1),
                   selectStatus: false,
                   loadingStatus: false,
@@ -432,7 +433,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
                       : Utils.numFormat(bangumiItem!.stat!['reply']!),
                 ),
                 ActionItem(
-                    icon: const Icon(FontAwesomeIcons.shareFromSquare),
+                    icon: const Icon(Icons.share_outlined),
                     onTap: () => bangumiIntroController.actionShareVideo(),
                     selectStatus: false,
                     loadingStatus: false,
diff --git a/lib/pages/video/introduction/detail/controller.dart b/lib/pages/video/introduction/detail/controller.dart
index c6d224fd6..7159b7c6d 100644
--- a/lib/pages/video/introduction/detail/controller.dart
+++ b/lib/pages/video/introduction/detail/controller.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:PiliPalaX/plugin/pl_player/controller.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
@@ -72,7 +73,6 @@ class VideoIntroController extends GetxController {
   Timer? timer;
   bool isPaused = false;
   String heroTag = '';
-  late ModelResult modelResult;
   Rx<Map<String, dynamic>> queryVideoIntroData =
       Rx<Map<String, dynamic>>({"status": true});
 
@@ -115,9 +115,7 @@ class VideoIntroController extends GetxController {
     queryVideoIntro();
 
     videoDetail.listen((value) {
-
       if ((value.pages?.length ?? 0) > 1) {
-
         final VideoDetailController videoDetailCtr =
             Get.find<VideoDetailController>(tag: heroTag);
         final cid = videoDetailCtr.cid.value;
@@ -129,19 +127,21 @@ class VideoIntroController extends GetxController {
             value.title ?? "",
             Duration(seconds: current?.duration ?? 0),
             value.pic ?? "");
-
       } else {
-
         videoPlayerServiceHandler.onVideoDetailChange(
             value.title ?? "",
             value.owner?.name ?? "",
             Duration(seconds: value.duration ?? 0),
             value.pic ?? "");
-
       }
     });
   }
 
+  void openVideoDetail() {
+    Get.toNamed('/video?bvid=$bvid&cid=${lastPlayCid.value}&resume=true',
+        arguments: {'heroTag': heroTag});
+  }
+
   // 获取视频简介&分p
   void queryVideoIntro() async {
     var result = await VideoHttp.videoIntro(bvid: bvid);
@@ -551,13 +551,10 @@ class VideoIntroController extends GetxController {
     final int currentIndex =
         episodes.indexWhere((e) => e.cid == lastPlayCid.value);
     int prevIndex = currentIndex - 1;
-    final VideoDetailController videoDetailCtr =
-        Get.find<VideoDetailController>(tag: heroTag);
-    final PlayRepeat platRepeat = videoDetailCtr.plPlayerController!.playRepeat;
-
+    PlayRepeat playRepeat = PlPlayerController.getInstance().playRepeat;
     // 列表循环
     if (prevIndex < 0) {
-      if (platRepeat == PlayRepeat.listCycle) {
+      if (playRepeat == PlayRepeat.listCycle) {
         prevIndex = episodes.length - 1;
       } else {
         return false;
@@ -570,6 +567,32 @@ class VideoIntroController extends GetxController {
     return true;
   }
 
+  // 是否有下一集（必须存在分p、分集）
+  bool hasNextEpisode() {
+    final List episodes = [];
+    if (videoDetail.value.ugcSeason != null) {
+      final UgcSeason ugcSeason = videoDetail.value.ugcSeason!;
+      final List<SectionItem> sections = ugcSeason.sections!;
+      for (int i = 0; i < sections.length; i++) {
+        final List<EpisodeItem> episodesList = sections[i].episodes!;
+        episodes.addAll(episodesList);
+      }
+    } else if (videoDetail.value.pages != null) {
+      final List<Part> pages = videoDetail.value.pages!;
+      episodes.addAll(pages);
+    }
+    if (episodes.isEmpty) {
+      return false;
+    }
+    PlayRepeat playRepeat = PlPlayerController.getInstance().playRepeat;
+    if (playRepeat == PlayRepeat.listCycle) {
+      return true;
+    }
+    final int currentIndex =
+        episodes.indexWhere((e) => e.cid == lastPlayCid.value);
+    return currentIndex < episodes.length - 1;
+  }
+
   /// 列表循环或者顺序播放时，自动播放下一个
   bool nextPlay() {
     final List episodes = [];
@@ -586,15 +609,7 @@ class VideoIntroController extends GetxController {
       final List<Part> pages = videoDetail.value.pages!;
       episodes.addAll(pages);
     }
-    late VideoDetailController videoDetailCtr;
-    PlayRepeat playRepeat = PlayRepeat.listCycle;
-    try {
-      videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
-      playRepeat = videoDetailCtr.plPlayerController!.playRepeat;
-    } catch (_) {
-      return false;
-    }
-
+    PlayRepeat playRepeat = PlPlayerController.getInstance().playRepeat;
     if (episodes.isEmpty) {
       if (playRepeat == PlayRepeat.autoPlayRelated) {
         return playRelated();
@@ -668,17 +683,18 @@ class VideoIntroController extends GetxController {
 
   // ai总结
   Future aiConclusion() async {
-    SmartDialog.showLoading(msg: '正在生产ai总结');
+    SmartDialog.showLoading(msg: '正在查询AI总结');
     final res = await VideoHttp.aiConclusion(
       bvid: bvid,
       cid: lastPlayCid.value,
       upMid: videoDetail.value.owner!.mid!,
     );
     SmartDialog.dismiss();
-    if (res['status']) {
-      modelResult = res['data'].modelResult;
-    } else {
-      SmartDialog.showToast("当前视频可能暂不支持AI视频总结");
+    if (!res['status']) {
+      SmartDialog.showNotify(
+          msg: "当前视频暂未生产AI视频总结",
+          notifyType: NotifyType.warning,
+          displayTime: const Duration(seconds: 1));
     }
     return res;
   }
diff --git a/lib/pages/video/introduction/detail/view.dart b/lib/pages/video/introduction/detail/view.dart
index 8540214d0..bda30665e 100644
--- a/lib/pages/video/introduction/detail/view.dart
+++ b/lib/pages/video/introduction/detail/view.dart
@@ -1,4 +1,6 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/rendering.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
@@ -108,9 +110,12 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
 
   late final bool loadingStatus; // 加载状态
 
+  bool? isExpanded;
+
   late int mid;
   late String memberHeroTag;
   late bool enableAi;
+  late bool defaultExpandIntroduction;
   bool isProcessing = false;
   void Function()? handleState(Future Function() action) {
     return isProcessing
@@ -132,6 +137,11 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
 
     loadingStatus = widget.loadingStatus;
     enableAi = setting.get(SettingBoxKey.enableAi, defaultValue: true);
+    defaultExpandIntroduction = setting
+        .get(SettingBoxKey.defaultExpandIntroduction, defaultValue: true);
+    if (defaultExpandIntroduction) {
+      isExpanded = true;
+    }
   }
 
   // 收藏
@@ -199,17 +209,6 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
         arguments: {'face': face, 'heroTag': memberHeroTag});
   }
 
-  // ai总结
-  showAiBottomSheet() {
-    showBottomSheet(
-      context: context,
-      enableDrag: true,
-      builder: (BuildContext context) {
-        return AiDetail(modelResult: videoIntroController.modelResult);
-      },
-    );
-  }
-
   @override
   Widget build(BuildContext context) {
     final ThemeData t = Theme.of(context);
@@ -217,7 +216,6 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
       builder: (BuildContext context, SliverConstraints constraints) {
         bool isHorizontal = constraints.crossAxisExtent >
             constraints.viewportMainAxisExtent * 1.25;
-        bool isExpanded = isHorizontal;
         return SliverPadding(
           padding: const EdgeInsets.only(
               left: StyleString.safeSpace,
@@ -294,103 +292,102 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                 minLeadingWidth: 0,
                 minVerticalPadding: 0,
                 child: ExpansionTile(
-                  initiallyExpanded: isHorizontal,
+                  initiallyExpanded: isExpanded ?? isHorizontal,
                   collapsedShape: const RoundedRectangleBorder(),
                   shape: const RoundedRectangleBorder(),
-                  showTrailingIcon: false,
+                  // showTrailingIcon: false,
                   onExpansionChanged: (bool expanded) {
                     feedBack();
+                    print(expanded);
                     setState(() {
                       isExpanded = expanded;
                     });
                   },
-                  title: Text(
-                    widget.videoDetail?.title ?? videoItem['title'] ?? "",
-                    // !loadingStatus
-                    //     ? "${widget.videoDetail?.title}"
-                    //     : videoItem['title'] ?? "",
-                    style: const TextStyle(
-                      fontSize: 16,
-                      fontWeight: FontWeight.w500,
+                  title: GestureDetector(
+                    onLongPress: () {
+                      feedBack();
+                      String title =
+                          widget.videoDetail?.title ?? videoItem['title'] ?? "";
+                      Clipboard.setData(ClipboardData(text: title));
+                      SmartDialog.showToast("已复制标题：「$title」到剪贴板");
+                    },
+                    child: Text(
+                      widget.videoDetail?.title ?? videoItem['title'] ?? "",
+                      // !loadingStatus
+                      //     ? "${widget.videoDetail?.title}"
+                      //     : videoItem['title'] ?? "",
+                      style: const TextStyle(
+                        fontSize: 16,
+                        height: 1.3,
+                        fontWeight: FontWeight.w500,
+                      ),
+                      maxLines: isExpanded ?? isHorizontal ? 999 : 2,
+                      overflow: TextOverflow.ellipsis,
                     ),
-                    maxLines: isExpanded ? 999 : 2,
-                    overflow: TextOverflow.ellipsis,
                   ),
-                  subtitle: Padding(
-                    padding: const EdgeInsets.only(top: 7),
-                    child: Row(
-                      children: <Widget>[
-                        StatView(
-                          theme: 'gray',
-                          view: !loadingStatus
-                              ? widget.videoDetail?.stat?.view ?? '-'
-                              : videoItem['stat']?.view ?? '-',
-                          size: 'medium',
-                        ),
-                        const SizedBox(width: 10),
-                        StatDanMu(
-                          theme: 'gray',
-                          danmu: !loadingStatus
-                              ? widget.videoDetail?.stat?.danmu ?? '-'
-                              : videoItem['stat']?.danmu ?? '-',
-                          size: 'medium',
+                  subtitle: Row(
+                    children: <Widget>[
+                      StatView(
+                        theme: 'gray',
+                        view: !loadingStatus
+                            ? widget.videoDetail?.stat?.view ?? '-'
+                            : videoItem['stat']?.view ?? '-',
+                        size: 'medium',
+                      ),
+                      const SizedBox(width: 10),
+                      StatDanMu(
+                        theme: 'gray',
+                        danmu: !loadingStatus
+                            ? widget.videoDetail?.stat?.danmu ?? '-'
+                            : videoItem['stat']?.danmu ?? '-',
+                        size: 'medium',
+                      ),
+                      const SizedBox(width: 10),
+                      Text(
+                        Utils.dateFormat(
+                            !loadingStatus
+                                ? widget.videoDetail?.pubdate
+                                : videoItem['pubdate'],
+                            formatType: 'detail'),
+                        style: TextStyle(
+                          fontSize: 12,
+                          color: t.colorScheme.outline,
                         ),
+                      ),
+                      if (MineController.anonymity) ...<Widget>[
                         const SizedBox(width: 10),
-                        Text(
-                          Utils.dateFormat(
-                              !loadingStatus
-                                  ? widget.videoDetail?.pubdate
-                                  : videoItem['pubdate'],
-                              formatType: 'detail'),
-                          style: TextStyle(
-                            fontSize: 12,
-                            color: t.colorScheme.outline,
-                          ),
+                        Icon(
+                          MdiIcons.incognito,
+                          size: 15,
+                          color: t.colorScheme.outline,
+                          semanticLabel: '无痕',
                         ),
-                        if (MineController.anonymity) ...<Widget>[
-                          const SizedBox(width: 10),
-                          Icon(
-                            MdiIcons.incognito,
-                            size: 15,
-                            color: t.colorScheme.outline,
-                            semanticLabel: '无痕',
-                          ),
-                        ],
-                        const SizedBox(width: 10),
-                        if (videoIntroController.isShowOnlineTotal)
-                          Obx(
-                            () => Text(
-                              '${videoIntroController.total.value}人在看',
-                              style: TextStyle(
-                                fontSize: 12,
-                                color: t.colorScheme.outline,
-                              ),
+                      ],
+                      const SizedBox(width: 10),
+                      if (videoIntroController.isShowOnlineTotal)
+                        Obx(
+                          () => Text(
+                            '${videoIntroController.total.value}人在看',
+                            style: TextStyle(
+                              fontSize: 12,
+                              color: t.colorScheme.outline,
                             ),
                           ),
-                        const Spacer(),
-                        if (enableAi)
-                          Semantics(
-                              label: 'AI总结',
-                              child: GestureDetector(
-                                onTap: () async {
-                                  final res =
-                                      await videoIntroController.aiConclusion();
-                                  if (res['status']) {
-                                    showAiBottomSheet();
-                                  }
-                                },
-                                child: Image.asset('assets/images/ai.png',
-                                    height: 22),
-                              )),
-                        const SizedBox(width: 10),
-                      ],
-                    ),
+                        ),
+                      const Spacer(),
+                      const SizedBox(width: 10),
+                    ],
                   ),
                   children: [
                     Row(children: [
                       if (widget.videoDetail != null)
                         Expanded(
-                            child: IntroDetail(videoDetail: widget.videoDetail))
+                          child: IntroDetail(
+                            videoDetail: widget.videoDetail,
+                            enableAi: enableAi,
+                            aiConclusion: videoIntroController.aiConclusion,
+                          ),
+                        )
                     ]),
                   ],
                 ),
@@ -492,8 +489,8 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
           children: <Widget>[
             Obx(
               () => ActionItem(
-                  icon: const Icon(FontAwesomeIcons.thumbsUp),
-                  selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp),
+                  icon: const Icon(Icons.thumb_up_outlined),
+                  selectIcon: const Icon(Icons.thumb_up),
                   onTap: handleState(videoIntroController.actionLikeVideo),
                   onLongPress: handleState(videoIntroController.actionOneThree),
                   selectStatus: videoIntroController.hasLike.value,
@@ -505,8 +502,8 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
             ),
             Obx(
               () => ActionItem(
-                  icon: const Icon(FontAwesomeIcons.thumbsDown),
-                  selectIcon: const Icon(FontAwesomeIcons.solidThumbsDown),
+                  icon: const Icon(Icons.thumb_down_outlined),
+                  selectIcon: const Icon(Icons.thumb_down),
                   onTap: handleState(videoIntroController.actionDislikeVideo),
                   selectStatus: videoIntroController.hasDislike.value,
                   loadingStatus: loadingStatus,
@@ -521,8 +518,8 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
             //     text: '稍后再看'),
             Obx(
               () => ActionItem(
-                  icon: const Icon(FontAwesomeIcons.b),
-                  selectIcon: const Icon(FontAwesomeIcons.b),
+                  icon: const Icon(Icons.offline_bolt_outlined),
+                  selectIcon: const Icon(Icons.offline_bolt),
                   onTap: handleState(videoIntroController.actionCoinVideo),
                   selectStatus: videoIntroController.hasCoin.value,
                   loadingStatus: loadingStatus,
@@ -533,8 +530,8 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
             ),
             Obx(
               () => ActionItem(
-                  icon: const Icon(FontAwesomeIcons.star),
-                  selectIcon: const Icon(FontAwesomeIcons.solidStar),
+                  icon: Icon(MdiIcons.starPlusOutline),
+                  selectIcon: Icon(MdiIcons.star),
                   onTap: () => showFavBottomSheet(),
                   onLongPress: () => showFavBottomSheet(type: 'longPress'),
                   selectStatus: videoIntroController.hasFav.value,
@@ -545,7 +542,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                       : '-'),
             ),
             ActionItem(
-                icon: const Icon(FontAwesomeIcons.comment),
+                icon: Icon(MdiIcons.chatOutline),
                 onTap: () => videoDetailCtr.tabCtr
                     .animateTo(videoDetailCtr.tabCtr.index == 1 ? 0 : 1),
                 selectStatus: false,
@@ -555,7 +552,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                     ? Utils.numFormat(widget.videoDetail!.stat!.reply!)
                     : '评论'),
             ActionItem(
-                icon: const Icon(FontAwesomeIcons.shareFromSquare),
+                icon: const Icon(Icons.share_outlined),
                 onTap: () => videoIntroController.actionShareVideo(),
                 selectStatus: false,
                 loadingStatus: loadingStatus,
@@ -584,7 +581,8 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
       const SizedBox(width: 8),
       Obx(
         () => ActionRowItem(
-          icon: const Icon(FontAwesomeIcons.b),
+          icon: Icon(MdiIcons.starFourPointsOutline),
+          selectIcon: Icon(MdiIcons.starFourPoints),
           onTap: handleState(videoIntroController.actionCoinVideo),
           selectStatus: videoIntroController.hasCoin.value,
           loadingStatus: loadingStatus,
diff --git a/lib/pages/video/introduction/widgets/action_item.dart b/lib/pages/video/introduction/widgets/action_item.dart
index 6071c448c..d2d7a12ff 100644
--- a/lib/pages/video/introduction/widgets/action_item.dart
+++ b/lib/pages/video/introduction/widgets/action_item.dart
@@ -43,7 +43,8 @@ class ActionItem extends StatelessWidget {
                   // const SizedBox(height: 2),
                   Icon(
                     selectStatus ? selectIcon!.icon! : icon!.icon!,
-                    size: 18,
+                    size: 22,
+                    opticalSize: 1,
                     color: selectStatus
                         ? Theme.of(context).colorScheme.primary
                         : Theme.of(context).colorScheme.outline,
diff --git a/lib/pages/video/introduction/widgets/intro_detail.dart b/lib/pages/video/introduction/widgets/intro_detail.dart
index b3ecf1dae..9b58e5e8e 100644
--- a/lib/pages/video/introduction/widgets/intro_detail.dart
+++ b/lib/pages/video/introduction/widgets/intro_detail.dart
@@ -1,46 +1,117 @@
+import 'package:PiliPalaX/models/video/ai.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
-import 'package:PiliPalaX/common/widgets/stat/danmu.dart';
-import 'package:PiliPalaX/common/widgets/stat/view.dart';
 import 'package:PiliPalaX/utils/utils.dart';
 
+import 'package:PiliPalaX/pages/rank/zone/view.dart';
+
+import '../../../../http/video.dart';
+import '../../widgets/ai_detail.dart';
+
 class IntroDetail extends StatelessWidget {
   const IntroDetail({
     super.key,
     this.videoDetail,
+    required this.enableAi,
+    required this.aiConclusion,
   });
   final dynamic videoDetail;
+  final bool enableAi;
+  final Future<dynamic> Function() aiConclusion;
 
   @override
   Widget build(BuildContext context) {
+    InlineSpan? span = buildContent(context, videoDetail!);
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: <Widget>[
-        Text(
-          videoDetail!.bvid!,
-          style: const TextStyle(fontSize: 13),
-        ),
-        const SizedBox(height: 4),
-        Text.rich(
-          style: const TextStyle(
-            height: 1.4,
-            // fontSize: 13,
+        Row(children: [
+          if (videoDetail!.tname != null && videoDetail.tid != null)
+            TextButton(
+              onPressed: () {
+                Navigator.push(
+                  context,
+                  MaterialPageRoute(
+                    builder: (context) => Scaffold(
+                      appBar: AppBar(
+                        title: Text(videoDetail!.tname!,
+                            style: Theme.of(context).textTheme.titleMedium),
+                      ),
+                      body: ZonePage(tid: videoDetail!.tid!),
+                    ),
+                  ),
+                );
+              },
+              // 移除按钮外边距
+              style: ButtonStyle(
+                padding: WidgetStateProperty.all(
+                    const EdgeInsets.symmetric(vertical: 6, horizontal: 10)),
+                minimumSize: WidgetStateProperty.all(Size.zero),
+                tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                shape: WidgetStateProperty.all(
+                  RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(8),
+                    side: BorderSide(
+                        width: 1, color: Theme.of(context).colorScheme.primary),
+                  ),
+                ),
+              ),
+              child: Text(
+                videoDetail!.tname ?? '',
+                style: TextStyle(
+                  color: Theme.of(context).colorScheme.primary,
+                  fontSize: 13,
+                  height: 1,
+                ),
+              ),
+            ),
+          const SizedBox(width: 8),
+          SelectableText(
+            key: PageStorageKey<String>(videoDetail!.bvid!),
+            videoDetail!.bvid!,
+            style: const TextStyle(fontSize: 13),
           ),
-          TextSpan(
-            children: [
-              buildContent(context, videoDetail!),
-            ],
+          const SizedBox(width: 5),
+          if (enableAi)
+            Semantics(
+                label: 'AI总结',
+                child: GestureDetector(
+                  onTap: () async {
+                    final res = await aiConclusion();
+                    if (res['status'] && context.mounted) {
+                      showAiBottomSheet(context, res['data'].modelResult);
+                    }
+                  },
+                  child: Image.asset('assets/images/ai.png', height: 24),
+                )),
+        ]),
+        if (span != null) ...[
+          const SizedBox(height: 4),
+          SelectableText.rich(
+            key: PageStorageKey<String>('${videoDetail!.bvid!}intro'),
+            style: const TextStyle(
+              height: 1.4,
+              // fontSize: 13,
+            ),
+            TextSpan(
+              children: [span],
+            ),
           ),
-        ),
+        ],
       ],
     );
   }
 
-  InlineSpan buildContent(BuildContext context, content) {
+  InlineSpan? buildContent(BuildContext context, content) {
     final List descV2 = content.descV2;
-    // type
+    if (descV2.isEmpty) {
+      return null;
+    }
+    if (descV2.length == 1 && descV2[0].type == 1 && descV2[0].rawText == '-') {
+      return null;
+    }
     // 1 普通文本
     // 2 @用户
     final List<TextSpan> spanChildren = List.generate(descV2.length, (index) {
@@ -113,4 +184,15 @@ class IntroDetail extends StatelessWidget {
     });
     return TextSpan(children: spanChildren);
   }
+
+  // ai总结
+  showAiBottomSheet(context, modelResult) {
+    showBottomSheet(
+      context: context,
+      enableDrag: true,
+      builder: (BuildContext context) {
+        return AiDetail(modelResult: modelResult);
+      },
+    );
+  }
 }
diff --git a/lib/pages/video/reply/view.dart b/lib/pages/video/reply/view.dart
index 5fdee2c47..5d69ae304 100644
--- a/lib/pages/video/reply/view.dart
+++ b/lib/pages/video/reply/view.dart
@@ -131,6 +131,8 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
   Widget build(BuildContext context) {
     super.build(context);
     return RefreshIndicator(
+      displacement: 10.0,
+      edgeOffset: 10.0,
       onRefresh: () async {
         await _videoReplyController.queryReplyList(type: 'init');
       },
diff --git a/lib/pages/video/reply_reply/view.dart b/lib/pages/video/reply_reply/view.dart
index 472bfadd5..e8cb182f4 100644
--- a/lib/pages/video/reply_reply/view.dart
+++ b/lib/pages/video/reply_reply/view.dart
@@ -104,6 +104,8 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
           ),
           Expanded(
             child: RefreshIndicator(
+              displacement: 10.0,
+              edgeOffset: 10.0,
               onRefresh: () async {
                 setState(() {});
                 _videoReplyReplyController.currentPage = 0;
diff --git a/lib/pages/video/view.dart b/lib/pages/video/view.dart
index 2c301938b..b2ed4b4c5 100644
--- a/lib/pages/video/view.dart
+++ b/lib/pages/video/view.dart
@@ -3,8 +3,10 @@ import 'dart:io';
 import 'dart:math';
 import 'dart:ui';
 
+import 'package:PiliPalaX/services/service_locator.dart';
 import 'package:auto_orientation/auto_orientation.dart';
 import 'package:fl_pip/fl_pip.dart';
+// import 'package:fl_pip/fl_pip.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
@@ -27,6 +29,8 @@ import 'package:PiliPalaX/utils/storage.dart';
 import '../../../services/shutdown_timer_service.dart';
 import 'widgets/header_control.dart';
 import 'package:PiliPalaX/common/widgets/spring_physics.dart';
+import 'package:flutter_floating/floating/floating.dart';
+import 'package:flutter_floating/floating/manager/floating_manager.dart';
 
 class VideoDetailPage extends StatefulWidget {
   const VideoDetailPage({super.key});
@@ -54,7 +58,6 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   late Future _futureBuilderFuture;
   // 自动退出全屏
   late bool autoExitFullscreen;
-  late bool autoPlayEnable;
   late bool horizontalScreen;
   late bool enableVerticalExpand;
   late bool autoPiP;
@@ -76,6 +79,10 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       heroTag = Get.arguments['heroTag'];
     }
     videoDetailController = Get.put(VideoDetailController(), tag: heroTag);
+    if (!videoDetailController.autoPlay.value &&
+        floatingManager.containsFloating(globalId)) {
+      PlPlayerController.pauseIfExists();
+    }
     videoIntroController = Get.put(VideoIntroController(), tag: heroTag);
     // videoIntroController.videoDetail.listen((value) {
     //   if (!context.mounted) return;
@@ -97,8 +104,6 @@ class _VideoDetailPageState extends State<VideoDetailPage>
         setting.get(SettingBoxKey.enableAutoExit, defaultValue: true);
     horizontalScreen =
         setting.get(SettingBoxKey.horizontalScreen, defaultValue: false);
-    autoPlayEnable =
-        setting.get(SettingBoxKey.autoPlayEnable, defaultValue: true);
     autoPiP = setting.get(SettingBoxKey.autoPiP, defaultValue: false);
     pipNoDanmaku = setting.get(SettingBoxKey.pipNoDanmaku, defaultValue: true);
     enableVerticalExpand =
@@ -109,6 +114,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
         SettingBoxKey.videoPlayerShowStatusBarBackgroundColor,
         defaultValue: false);
     if (removeSafeArea) hideStatusBar();
+    floatingManager.closeFloating(globalId);
     videoSourceInit();
     appbarStreamListen();
     // lifecycleListener();
@@ -146,31 +152,42 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       plPlayerController = videoDetailController.plPlayerController;
       plPlayerController!.addStatusLister(playerListener);
       listenFullScreenStatus();
-      await plPlayerController!.autoEnterFullscreen();
-      Future.wait([_futureBuilderFuture]).then((result) {
-        autoEnterPip();
+      await plPlayerController!.autoEnterFullScreen();
+      // Future.wait([_futureBuilderFuture]).then((result) {
+      //   autoEnterPip();
+      // });
+    } else {
+      _futureBuilderFuture.then((value) async {
+        if (value['status']) {
+          // fix: 手动播放首个视频前媒体通知不完整
+          videoPlayerServiceHandler.onStatusChange(PlayerStatus.paused, false);
+          videoDetailController.playerInit(autoplay: false);
+          plPlayerController = videoDetailController.plPlayerController;
+          plPlayerController!.addStatusLister(playerListener);
+          listenFullScreenStatus();
+        }
       });
     }
   }
 
-  void autoEnterPip() {
-    String top = Get.currentRoute;
-    if (autoPiP && (top.startsWith('/video') || top.startsWith('/live'))) {
-      FlPiP().enable(
-          ios: FlPiPiOSConfig(
-              enabledWhenBackground: true,
-              videoPath: videoDetailController.videoUrl,
-              audioPath: videoDetailController.audioUrl,
-              packageName: null),
-          android: FlPiPAndroidConfig(
-            enabledWhenBackground: true,
-            aspectRatio: Rational(
-              videoDetailController.data.dash!.video!.first.width!,
-              videoDetailController.data.dash!.video!.first.height!,
-            ),
-          ));
-    }
-  }
+  // void autoEnterPip() {
+  //   String top = Get.currentRoute;
+  //   if (autoPiP && (top.startsWith('/video') || top.startsWith('/live') || floatingManager.containsFloating(globalId))) {
+  //     FlPiP().enable(
+  //         ios: FlPiPiOSConfig(
+  //             enabledWhenBackground: true,
+  //             videoPath: videoDetailController.videoUrl,
+  //             audioPath: videoDetailController.audioUrl,
+  //             packageName: null),
+  //         android: FlPiPAndroidConfig(
+  //           enabledWhenBackground: true,
+  //           aspectRatio: Rational(
+  //             videoDetailController.data.dash!.video!.first.width!,
+  //             videoDetailController.data.dash!.video!.first.height!,
+  //           ),
+  //         ));
+  //   }
+  // }
 
   // 流
   appbarStreamListen() {
@@ -180,39 +197,51 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   // 播放器状态监听
   void playerListener(PlayerStatus? status) async {
     playerStatus = status!;
-    if (status == PlayerStatus.completed) {
-      shutdownTimerService.handleWaitingFinished();
-      bool notExitFlag = false;
-
-      /// 顺序播放 列表循环
-      if (plPlayerController!.playRepeat != PlayRepeat.pause &&
-          plPlayerController!.playRepeat != PlayRepeat.singleCycle) {
-        if (videoDetailController.videoType == SearchType.video) {
-          notExitFlag = videoIntroController.nextPlay();
+    switch (status) {
+      case PlayerStatus.playing:
+        if (videoDetailController.isShowCover.value) {
+          videoDetailController.isShowCover.value = false;
         }
-        if (videoDetailController.videoType == SearchType.media_bangumi) {
-          notExitFlag = bangumiIntroController.nextPlay();
+        break;
+      case PlayerStatus.completed:
+        shutdownTimerService.handleWaitingFinished();
+        bool notExitFlag = false;
+
+        /// 顺序播放 列表循环
+        if (plPlayerController!.playRepeat != PlayRepeat.pause &&
+            plPlayerController!.playRepeat != PlayRepeat.singleCycle) {
+          if (videoDetailController.videoType == SearchType.video) {
+            notExitFlag = videoIntroController.nextPlay();
+          }
+          if (videoDetailController.videoType == SearchType.media_bangumi) {
+            notExitFlag = bangumiIntroController.nextPlay();
+          }
         }
-      }
 
-      /// 单个循环
-      if (plPlayerController!.playRepeat == PlayRepeat.singleCycle) {
-        notExitFlag = true;
-        plPlayerController!.play(repeat: true);
-      }
+        /// 单个循环
+        if (plPlayerController!.playRepeat == PlayRepeat.singleCycle) {
+          notExitFlag = true;
+          plPlayerController!.play(repeat: true);
+        }
 
-      // 结束播放退出全屏
-      if (!notExitFlag && autoExitFullscreen) {
-        plPlayerController!.triggerFullScreen(status: false);
-      }
-      // 播放完展示控制栏
-      // if (videoDetailController.floating != null && !notExitFlag) {
-      //   PiPStatus currentStatus =
-      //       await videoDetailController.floating!.pipStatus;
-      //   if (currentStatus == PiPStatus.disabled) {
-      //     plPlayerController!.onLockControl(false);
-      //   }
-      // }
+        // 结束播放退出全屏
+        if (!notExitFlag && autoExitFullscreen) {
+          plPlayerController!.triggerFullScreen(status: false);
+        }
+        // 播放完展示控制栏
+        // if (videoDetailController.floating != null && !notExitFlag) {
+        //   PiPStatus currentStatus =
+        //       await videoDetailController.floating!.pipStatus;
+        //   if (currentStatus == PiPStatus.disabled) {
+        //     plPlayerController!.onLockControl(false);
+        //   }
+        // }
+        break;
+      case PlayerStatus.paused:
+        break;
+      case PlayerStatus.disabled:
+        videoDetailController.isShowCover.value = true;
+        break;
     }
   }
 
@@ -223,14 +252,14 @@ class _VideoDetailPageState extends State<VideoDetailPage>
 
   /// 未开启自动播放时触发播放
   Future<void> handlePlay() async {
-    videoDetailController.isShowCover.value = false;
-    await videoDetailController.playerInit();
-    plPlayerController = videoDetailController.plPlayerController;
-    plPlayerController!.addStatusLister(playerListener);
-    listenFullScreenStatus();
-    await plPlayerController!.autoEnterFullscreen();
+    if (plPlayerController == null) {
+      SmartDialog.showToast('播放器初始化失败，请重新进入本页面');
+      return;
+    }
+    plPlayerController!.play();
+    await plPlayerController!.autoEnterFullScreen();
     videoDetailController.autoPlay.value = true;
-    autoEnterPip();
+    // autoEnterPip();
   }
 
   // // 生命周期监听
@@ -262,9 +291,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
         // hideStatusBar();
       }
       isFullScreen.value = status;
-      if (mounted) {
-        setState(() {});
-      }
+      // if (mounted) {
+      //   setState(() {});
+      // }
       // if (!status) {
       // showStatusBar();
       // if (horizontalScreen) {
@@ -280,8 +309,6 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   void dispose() {
     // floating.dispose();
     // videoDetailController.floating?.dispose();
-    videoIntroController.videoDetail.close();
-    bangumiIntroController.bangumiDetail.close();
     videoDetailController.cid.close();
     if (!horizontalScreen) {
       AutoOrientation.portraitUpMode();
@@ -289,10 +316,14 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     shutdownTimerService.handleWaitingFinished();
     // _bufferedListener?.cancel();
     if (plPlayerController != null) {
-      plPlayerController!.removeStatusLister(playerListener);
-      fullScreenStatusListener.cancel();
-      plPlayerController!.disable();
-      // plPlayerController!.dispose();
+      if (!floatingManager.containsFloating(globalId)) {
+        videoIntroController.videoDetail.close();
+        bangumiIntroController.bangumiDetail.close();
+        plPlayerController!.removeStatusLister(playerListener);
+        fullScreenStatusListener.cancel();
+        plPlayerController!.disable();
+        // plPlayerController!.dispose();
+      }
     }
     // videoPlayerServiceHandler.onVideoDetailDispose();
     VideoDetailPage.routeObserver.unsubscribe(this);
@@ -306,11 +337,11 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   // 离开当前页面时
   void didPushNext() async {
     // _bufferedListener?.cancel();
-
-    /// 开启
-    if (plPlayerController != null) {
+    if (!triggerFloatingWindowWhenLeaving() &&
+        !floatingManager.containsFloating(globalId)) {
       videoDetailController.defaultST = plPlayerController!.position.value;
       videoIntroController.isPaused = true;
+      plPlayerController!.pause();
       plPlayerController!.removeStatusLister(playerListener);
       fullScreenStatusListener.cancel();
       plPlayerController!.disable();
@@ -330,6 +361,11 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     //   setState(() => {});
     // }
     videoDetailController.isFirstTime = false;
+    if (!videoDetailController.autoPlay.value &&
+        floatingManager.containsFloating(globalId)) {
+      PlPlayerController.pauseIfExists();
+    }
+    floatingManager.closeFloating(globalId);
     // final bool autoplay = autoPlayEnable;
     videoDetailController.playerInit(
         autoplay: videoDetailController.autoPlay.value);
@@ -377,6 +413,15 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     super.didPopNext();
   }
 
+  bool triggerFloatingWindowWhenLeaving() {
+    if (GStorage.setting.get('autoMiniPlayer', defaultValue: false) &&
+        plPlayerController?.playerStatus.status.value == PlayerStatus.playing) {
+      return plPlayerController!
+          .triggerFloatingWindow(videoIntroController, bangumiIntroController);
+    }
+    return false;
+  }
+
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
@@ -422,7 +467,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       builder: (BuildContext context, AsyncSnapshot snapshot) {
         if (snapshot.hasData && snapshot.data['status']) {
           return Obx(
-            () => !videoDetailController.autoPlay.value ||
+            () => (!videoDetailController.autoPlay.value &&
+                        videoDetailController.isShowCover.value) ||
                     plPlayerController == null ||
                     plPlayerController!.videoController == null
                 ? nil
@@ -526,6 +572,13 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                 ),
           body: Column(
             children: [
+              // const SizedBox(
+              //   height: 300,
+              //   child:
+              //     TextButton(onPressed: (){
+              //
+              //     })
+              // ),
               Obx(
                 () {
                   double videoHeight = context.width * 9 / 16;
@@ -578,6 +631,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                               !horizontalScreen) {
                             verticalScreenForTwoSeconds();
                           }
+                          if (didPop) {
+                            triggerFloatingWindowWhenLeaving();
+                          }
                         },
                         child: Stack(
                           children: <Widget>[
@@ -711,6 +767,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                       !horizontalScreen) {
                     verticalScreenForTwoSeconds();
                   }
+                  if (didPop) {
+                    triggerFloatingWindowWhenLeaving();
+                  }
                 },
                 child: Stack(children: <Widget>[
                   // if (isShowing) plPlayer,
@@ -806,6 +865,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                     !horizontalScreen) {
                   verticalScreenForTwoSeconds();
                 }
+                if (didPop) {
+                  triggerFloatingWindowWhenLeaving();
+                }
               },
               child: Stack(children: <Widget>[
                 // if (isShowing) plPlayer,
@@ -901,6 +963,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                       !horizontalScreen) {
                     verticalScreenForTwoSeconds();
                   }
+                  if (didPop) {
+                    triggerFloatingWindowWhenLeaving();
+                  }
                 },
                 child: Stack(
                   children: <Widget>[
@@ -1003,6 +1068,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                         !horizontalScreen) {
                       verticalScreenForTwoSeconds();
                     }
+                    if (didPop) {
+                      triggerFloatingWindowWhenLeaving();
+                    }
                   },
                   child: Stack(
                     children: <Widget>[
@@ -1188,6 +1256,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
               ),
       );
   Widget autoChoose(Widget childWhenDisabled) {
+    if (!Platform.isAndroid) {
+      return childWhenDisabled;
+    }
     return PiPBuilder(builder: (PiPStatusInfo? statusInfo) {
       print("PiPStatusInfo${statusInfo?.status}");
       switch (statusInfo?.status) {
@@ -1201,6 +1272,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
           return childWhenDisabled;
       }
     });
+    // return childWhenDisabled;
     // if (Platform.isAndroid) {
     //   return PiPSwitcher(
     //     childWhenDisabled: childWhenDisabled,
diff --git a/lib/pages/video/widgets/header_control.dart b/lib/pages/video/widgets/header_control.dart
index 3403db583..033808ee8 100644
--- a/lib/pages/video/widgets/header_control.dart
+++ b/lib/pages/video/widgets/header_control.dart
@@ -1,7 +1,9 @@
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
 
+// import 'package:fl_pip/fl_pip.dart';
 import 'package:fl_pip/fl_pip.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -55,11 +57,11 @@ class _HeaderControlState extends State<HeaderControl> {
   final Box<dynamic> localCache = GStorage.localCache;
   final Box<dynamic> videoStorage = GStorage.video;
   double buttonSpace = 8;
-  bool isFullScreen = false;
+  // bool isFullScreen = false;
   late String heroTag;
   late VideoIntroController videoIntroController;
   late VideoDetailData videoDetail;
-  late StreamSubscription<bool> fullScreenStatusListener;
+  // late StreamSubscription<bool> fullScreenStatusListener;
   late bool horizontalScreen;
   RxString now = ''.obs;
   late Timer clock;
@@ -69,7 +71,7 @@ class _HeaderControlState extends State<HeaderControl> {
   void initState() {
     super.initState();
     videoInfo = widget.videoDetailCtr!.data;
-    listenFullScreenStatus();
+    // listenFullScreenStatus();
     heroTag = widget.heroTag;
     // if (Get.arguments != null && Get.arguments['heroTag'] != null) {
     //   heroTag = Get.arguments['heroTag'];
@@ -82,24 +84,24 @@ class _HeaderControlState extends State<HeaderControl> {
     startClock();
   }
 
-  void listenFullScreenStatus() {
-    // fullScreenStatusListener = widget
-    //     .videoDetailCtr!.plPlayerController!.isFullScreen
-    fullScreenStatusListener =
-        widget.controller!.isFullScreen.listen((bool status) {
-      isFullScreen = status;
-
-      /// TODO setState() called after dispose()
-      if (mounted) {
-        setState(() {});
-      }
-    });
-  }
+  // void listenFullScreenStatus() {
+  //   // fullScreenStatusListener = widget
+  //   //     .videoDetailCtr!.plPlayerController!.isFullScreen
+  //   fullScreenStatusListener =
+  //       widget.controller!.isFullScreen.listen((bool status) {
+  //     isFullScreen = status;
+  //
+  //     /// TODO setState() called after dispose()
+  //     if (mounted) {
+  //       setState(() {});
+  //     }
+  //   });
+  // }
 
   @override
   void dispose() {
     // widget.floating?.dispose();
-    fullScreenStatusListener.cancel();
+    // fullScreenStatusListener.cancel();
     clock.cancel();
     super.dispose();
   }
@@ -235,29 +237,31 @@ class _HeaderControlState extends State<HeaderControl> {
                       trailing: Row(
                         mainAxisSize: MainAxisSize.min,
                         children: [
-                          ActionRowLineItem(
-                            onTap: () {
-                              Get.back();
-                              widget.controller!.setOnlyPlayAudio(null);
-                            },
-                            text: " 听视频 ",
-                            selectStatus:
-                                widget.controller!.onlyPlayAudio.value,
+                          Obx(
+                            () => ActionRowLineItem(
+                              key: const Key('onlyPlayAudio'),
+                              onTap: () {
+                                widget.controller!.setOnlyPlayAudio(null);
+                              },
+                              text: " 听视频 ",
+                              selectStatus:
+                                  widget.controller!.onlyPlayAudio.value,
+                            ),
                           ),
                           const SizedBox(width: 10),
                           // const SizedBox(width: 10),
-                          ActionRowLineItem(
+                          Obx(
+                            () => ActionRowLineItem(
+                              key: const Key('continuePlayInBackground'),
                               onTap: () {
-                                Get.back();
                                 widget.controller!
                                     .setContinuePlayInBackground(null);
                               },
                               text: " 后台播放 ",
                               selectStatus: widget
-                                  .controller!
-                                  .continuePlayInBackground
-                                  .value //continuePlayInBackground,
-                              )
+                                  .controller!.continuePlayInBackground.value,
+                            ),
+                          ),
                         ],
                       ),
                     ),
@@ -966,9 +970,9 @@ class _HeaderControlState extends State<HeaderControl> {
     final List blockTypes = widget.controller!.blockTypes;
     // 显示区域
     final List<Map<String, dynamic>> showAreas = [
-      {'value': 0.25, 'label': '1/4屏'},
+      {'value': 0.25, 'label': '1/4'},
       {'value': 0.5, 'label': '半屏'},
-      {'value': 0.75, 'label': '3/4屏'},
+      {'value': 0.75, 'label': '3/4'},
       {'value': 1.0, 'label': '满屏'},
     ];
     // 智能云屏蔽
@@ -1141,6 +1145,7 @@ class _HeaderControlState extends State<HeaderControl> {
                         ],
                         const Spacer(),
                         ActionRowLineItem(
+                          key: const Key('massiveMode'),
                           onTap: () {
                             massiveMode = !massiveMode;
                             widget.controller!.massiveMode = massiveMode;
@@ -1432,15 +1437,170 @@ class _HeaderControlState extends State<HeaderControl> {
     });
   }
 
+  Widget shootDanmakuButton() {
+    return SizedBox(
+      width: 42,
+      height: 34,
+      child: IconButton(
+        tooltip: '发弹幕',
+        style: ButtonStyle(
+          padding: WidgetStateProperty.all(EdgeInsets.zero),
+        ),
+        onPressed: () => showShootDanmakuSheet(),
+        icon: Icon(
+          MdiIcons.pencilPlusOutline,
+          size: 21,
+          color: Colors.white,
+        ),
+      ),
+    );
+  }
+
+  Widget danmakuSwitcher() {
+    return SizedBox(
+      width: 42,
+      height: 34,
+      child: Obx(
+        () => IconButton(
+          tooltip: "${widget.controller!.isOpenDanmu.value ? '关闭' : '开启'}弹幕",
+          style: ButtonStyle(
+            padding: WidgetStateProperty.all(EdgeInsets.zero),
+          ),
+          onPressed: () {
+            widget.controller!.isOpenDanmu.value =
+                !widget.controller!.isOpenDanmu.value;
+            setting.put(SettingBoxKey.enableShowDanmaku,
+                widget.controller!.isOpenDanmu.value);
+            SmartDialog.showToast(
+                "已${widget.controller!.isOpenDanmu.value ? '开启' : '关闭'}弹幕",
+                displayTime: const Duration(seconds: 1));
+          },
+          icon: Icon(
+            widget.controller!.isOpenDanmu.value
+                ? Icons.subtitles_outlined
+                : Icons.subtitles_off_outlined,
+            size: 24,
+            color: Colors.white,
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget pipButton() {
+    return SizedBox(
+      width: 42,
+      height: 34,
+      child: IconButton(
+        tooltip: '画中画',
+        style: ButtonStyle(
+          padding: WidgetStateProperty.all(EdgeInsets.zero),
+        ),
+        onPressed: () async {
+          Player? player = widget.controller?.videoPlayerController;
+          if (player == null) {
+            SmartDialog.showToast('播放器未初始化');
+            return;
+          }
+          print(widget.controller!.dataSource.videoSource);
+          print(widget.controller!.dataSource.audioSource);
+          widget.controller!.controls = false;
+          FlPiP().enable(
+            ios: FlPiPiOSConfig(
+                videoPath: widget.videoDetailCtr!.videoUrl,
+                audioPath: widget.videoDetailCtr!.audioUrl,
+                packageName: null),
+            android: FlPiPAndroidConfig(
+              aspectRatio: Rational(
+                widget.videoDetailCtr!.data.dash!.video!.first.width!,
+                widget.videoDetailCtr!.data.dash!.video!.first.height!,
+              ),
+            ),
+          );
+        },
+        icon: Icon(
+          MdiIcons.pictureInPictureBottomRight,
+          size: 21.5,
+          color: Colors.white,
+        ),
+      ),
+    );
+  }
+
+  Widget likeVideoButton() {
+    return SizedBox(
+      width: 42,
+      height: 34,
+      child: IconButton(
+        tooltip: videoIntroController.hasLike.value ? '已点赞' : '点赞',
+        style: ButtonStyle(
+          padding: WidgetStateProperty.all(EdgeInsets.zero),
+        ),
+        onPressed: () async {
+          videoIntroController.actionLikeVideo();
+        },
+        icon: Obx(() => Icon(
+              videoIntroController.hasLike.value
+                  ? Icons.thumb_up
+                  : Icons.thumb_up_outlined,
+              size: 22,
+              color: Colors.white,
+            )),
+      ),
+    );
+  }
+
+  Widget coinVideoButton() {
+    return SizedBox(
+      width: 42,
+      height: 34,
+      child: IconButton(
+        tooltip: videoIntroController.hasCoin.value ? '已投币' : '投币',
+        style: ButtonStyle(
+          padding: WidgetStateProperty.all(EdgeInsets.zero),
+        ),
+        onPressed: () async {
+          videoIntroController.actionCoinVideo();
+        },
+        icon: Obx(() => Icon(
+              videoIntroController.hasCoin.value
+                  ? Icons.offline_bolt
+                  : Icons.offline_bolt_outlined,
+              size: 23,
+              color: Colors.white,
+            )),
+      ),
+    );
+  }
+
+  Widget shareButton() {
+    return SizedBox(
+      width: 42,
+      height: 34,
+      child: IconButton(
+        tooltip: '分享',
+        style: ButtonStyle(
+          padding: WidgetStateProperty.all(EdgeInsets.zero),
+        ),
+        onPressed: () async {
+          videoIntroController.actionShareVideo();
+        },
+        icon: const Icon(
+          Icons.share,
+          size: 22,
+          color: Colors.white,
+        ),
+      ),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
-    final _ = widget.controller!;
-    // final bool isLandscape =
-    //     MediaQuery.of(context).orientation == Orientation.landscape;
-    bool equivalentFullScreen = !isFullScreen &&
-        !horizontalScreen &&
-        MediaQuery.of(context).orientation == Orientation.landscape;
-    return LayoutBuilder(builder: (context, boxConstraints) {
+    return Obx(() {
+      bool equivalentFullScreen() =>
+          !widget.controller!.isFullScreen.value &&
+          !horizontalScreen &&
+          MediaQuery.of(context).orientation == Orientation.landscape;
       return AppBar(
         backgroundColor: Colors.transparent,
         foregroundColor: Colors.white,
@@ -1450,9 +1610,14 @@ class _HeaderControlState extends State<HeaderControl> {
         centerTitle: false,
         automaticallyImplyLeading: false,
         titleSpacing: 10,
-        title: Row(
-          children: [
-            SizedBox(
+        toolbarHeight:
+            widget.controller!.isFullScreen.value || equivalentFullScreen()
+                ? 100
+                : null,
+        title: Column(mainAxisAlignment: MainAxisAlignment.start, children: [
+          Row(
+            children: [
+              SizedBox(
                 width: 42,
                 height: 34,
                 child: IconButton(
@@ -1473,279 +1638,128 @@ class _HeaderControlState extends State<HeaderControl> {
                       Get.back();
                     }
                   },
-                )),
-            if (!isFullScreen ||
-                MediaQuery.of(context).orientation != Orientation.portrait)
-              SizedBox(
-                  width: 42,
-                  height: 34,
-                  child: IconButton(
-                    tooltip: '返回主页',
-                    icon: const Icon(
-                      FontAwesomeIcons.house,
-                      size: 15,
-                      color: Colors.white,
-                    ),
-                    onPressed: () async {
-                      // 销毁播放器实例
-                      // await widget.controller!.dispose(type: 'all');
-                      if (mounted) {
-                        Navigator.popUntil(
-                            context, (Route<dynamic> route) => route.isFirst);
-                      }
-                    },
-                  )),
-            if ((videoIntroController.videoDetail.value.title != null) &&
-                (isFullScreen || equivalentFullScreen))
-              Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  ConstrainedBox(
-                    constraints: BoxConstraints(
-                        maxWidth: boxConstraints.maxWidth / 2 - 60,
-                        maxHeight: 25),
-                    child: Marquee(
-                      text: videoIntroController.videoDetail.value.title!,
-                      style: const TextStyle(
-                        color: Colors.white,
-                        fontSize: 16,
-                      ),
-                      scrollAxis: Axis.horizontal,
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      blankSpace: 200,
-                      velocity: 40,
-                      startAfter: const Duration(seconds: 1),
-                      showFadingOnlyWhenScrolling: true,
-                      fadingEdgeStartFraction: 0,
-                      fadingEdgeEndFraction: 0.1,
-                      numberOfRounds: 1,
-                      startPadding: 0,
-                      accelerationDuration: const Duration(seconds: 1),
-                      accelerationCurve: Curves.linear,
-                      decelerationDuration: const Duration(milliseconds: 500),
-                      decelerationCurve: Curves.easeOut,
-                    ),
-                  ),
-                  if (videoIntroController.isShowOnlineTotal)
-                    Text(
-                      '${videoIntroController.total.value}人正在看',
-                      style: const TextStyle(
-                        color: Colors.white,
-                        fontSize: 11,
-                      ),
-                    )
-                ],
+                ),
               ),
-            const Spacer(),
-            if (MediaQuery.of(context).orientation == Orientation.landscape &&
-                (isFullScreen || !horizontalScreen)) ...[
-              // const Spacer(),
-              // show current datetime
-              Obx(
-                () => Text(
-                  now.value,
-                  style: const TextStyle(
+              SizedBox(
+                width: 42,
+                height: 34,
+                child: IconButton(
+                  tooltip: '返回主页',
+                  icon: const Icon(
+                    FontAwesomeIcons.house,
+                    size: 15,
                     color: Colors.white,
-                    fontSize: 13,
                   ),
+                  onPressed: () async {
+                    // 销毁播放器实例
+                    // await widget.controller!.dispose();
+                    if (mounted) {
+                      // Navigator.popUntil(
+                      //     context, (Route<dynamic> route) => route.isFirst);
+                      if (Get.previousRoute == '/') {
+                        Get.back();
+                        return;
+                      }
+                      Get.offAllNamed('/');
+                    }
+                  },
                 ),
               ),
-              const SizedBox(
-                width: 15,
-              ),
-            ],
-            // ComBtn(
-            //   icon: const Icon(
-            //     FontAwesomeIcons.cropSimple,
-            //     size: 15,
-            //     color: Colors.white,
-            //   ),
-            //   fuc: () => _.screenshot(),
-            // ),
-            SizedBox(
-              width: 42,
-              height: 34,
-              child: IconButton(
-                tooltip: '发弹幕',
-                style: ButtonStyle(
-                  padding: WidgetStateProperty.all(EdgeInsets.zero),
-                ),
-                onPressed: () => showShootDanmakuSheet(),
-                icon: const Icon(
-                  Icons.add_comment_outlined,
-                  size: 19,
-                  color: Colors.white,
-                ),
-              ),
-            ),
-            SizedBox(
-              width: 42,
-              height: 34,
-              child: Obx(
-                () => IconButton(
-                  tooltip: "${_.isOpenDanmu.value ? '关闭' : '开启'}弹幕",
+              const SizedBox(width: 10),
+              if ((videoIntroController.videoDetail.value.title != null) &&
+                  (widget.controller!.isFullScreen.value ||
+                      equivalentFullScreen()))
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        videoIntroController.videoDetail.value.title!,
+                        style: const TextStyle(
+                          color: Colors.white,
+                          fontSize: 16,
+                        ),
+                      ),
+                      if (videoIntroController.isShowOnlineTotal)
+                        Text(
+                          '${videoIntroController.total.value}人正在看',
+                          style: const TextStyle(
+                            color: Colors.white,
+                            fontSize: 11,
+                          ),
+                        )
+                    ],
+                  ),
+                )
+              else
+                const Spacer(),
+              // ComBtn(
+              //   icon: const Icon(
+              //     FontAwesomeIcons.cropSimple,
+              //     size: 15,
+              //     color: Colors.white,
+              //   ),
+              //   fuc: () => _.screenshot(),
+              // ),
+              if (!widget.controller!.isFullScreen.value &&
+                  !equivalentFullScreen()) ...[
+                shootDanmakuButton(),
+                danmakuSwitcher(),
+                pipButton(),
+              ],
+              SizedBox(
+                width: 42,
+                height: 34,
+                child: IconButton(
+                  tooltip: "更多设置",
                   style: ButtonStyle(
                     padding: WidgetStateProperty.all(EdgeInsets.zero),
                   ),
-                  onPressed: () {
-                    _.isOpenDanmu.value = !_.isOpenDanmu.value;
-                    setting.put(
-                        SettingBoxKey.enableShowDanmaku, _.isOpenDanmu.value);
-                    SmartDialog.showToast(
-                        "已${_.isOpenDanmu.value ? '开启' : '关闭'}弹幕",
-                        displayTime: const Duration(seconds: 1));
-                  },
-                  icon: Icon(
-                    _.isOpenDanmu.value
-                        ? Icons.comment_outlined
-                        : Icons.comments_disabled_outlined,
+                  onPressed: () => showSettingSheet(),
+                  icon: const Icon(
+                    Icons.more_vert_outlined,
                     size: 19,
                     color: Colors.white,
                   ),
                 ),
               ),
-            ),
-            SizedBox(
-              width: 42,
-              height: 34,
-              child: IconButton(
-                tooltip: '画中画',
-                style: ButtonStyle(
-                  padding: WidgetStateProperty.all(EdgeInsets.zero),
-                ),
-                onPressed: () async {
-                  Player? player = widget.controller?.videoPlayerController;
-                  if (player == null) {
-                    SmartDialog.showToast('播放器未初始化');
-                    return;
-                  }
-                  print(widget.controller!.dataSource.videoSource);
-                  print(widget.controller!.dataSource.audioSource);
-                  widget.controller!.controls = false;
-                  FlPiP().enable(
-                      ios: FlPiPiOSConfig(
-                          videoPath: widget.videoDetailCtr!.videoUrl,
-                          audioPath: widget.videoDetailCtr!.audioUrl,
-                          packageName: null),
-                      android: FlPiPAndroidConfig(
-                        aspectRatio: Rational(
-                          widget.videoDetailCtr!.data.dash!.video!.first.width!,
-                          widget
-                              .videoDetailCtr!.data.dash!.video!.first.height!,
-                        ),
-                        // createNewEngine: true,
-                      ));
-                  // bool canUsePiP = widget.floating != null &&
-                  //     await widget.floating!.isPipAvailable;
-                  // widget.controller!.hiddenControls(false);
-                  // if (canUsePiP) {
-                  //   bool enableBackgroundPlay = setting.get(
-                  //       SettingBoxKey.enableBackgroundPlay,
-                  //       defaultValue: true);
-                  //   if (!enableBackgroundPlay) {
-                  //     // SmartDialog.showToast('建议开启【后台播放】功能\n避免画中画没有暂停按钮');
-                  //     // await Future.delayed(const Duration(seconds: 2), () {
-                  //     // });
-                  //     ScaffoldMessenger.of(context).showSnackBar(
-                  //       SnackBar(
-                  //         content: Column(children: <Widget>[
-                  //           const Row(
-                  //             children: <Widget>[
-                  //               Icon(
-                  //                 Icons.check,
-                  //                 color: Colors.green,
-                  //               ),
-                  //               SizedBox(width: 10),
-                  //               Text('画中画',
-                  //                   style:
-                  //                       TextStyle(fontSize: 15, height: 1.5))
-                  //             ],
-                  //           ),
-                  //           const SizedBox(height: 10),
-                  //           const Text(
-                  //               '建议开启【后台音频服务】\n'
-                  //               '避免画中画没有暂停按钮',
-                  //               style:
-                  //                   TextStyle(fontSize: 12.5, height: 1.5)),
-                  //           Row(children: [
-                  //             TextButton(
-                  //                 style: ButtonStyle(
-                  //                   foregroundColor:
-                  //                       WidgetStateProperty.resolveWith(
-                  //                           (states) {
-                  //                     return Theme.of(context)
-                  //                         .snackBarTheme
-                  //                         .actionTextColor;
-                  //                   }),
-                  //                 ),
-                  //                 onPressed: () async {
-                  //                   _.setBackgroundPlay(true);
-                  //                   SmartDialog.showToast("请重新载入本页面刷新");
-                  //                   // Get.back();
-                  //                 },
-                  //                 child: const Text('启用后台音频服务')),
-                  //             const SizedBox(width: 10),
-                  //             TextButton(
-                  //                 style: ButtonStyle(
-                  //                   foregroundColor:
-                  //                       WidgetStateProperty.resolveWith(
-                  //                           (states) {
-                  //                     return Theme.of(context)
-                  //                         .snackBarTheme
-                  //                         .actionTextColor;
-                  //                   }),
-                  //                 ),
-                  //                 onPressed: () {},
-                  //                 child: const Text('不启用'))
-                  //           ])
-                  //         ]),
-                  //         duration: const Duration(seconds: 2),
-                  //         showCloseIcon: true,
-                  //       ),
-                  //     );
-                  //     await Future.delayed(const Duration(seconds: 3), () {});
-                  //   }
-                  //   final Rational aspectRatio = Rational(
-                  //     widget.videoDetailCtr!.data.dash!.video!.first.width!,
-                  //     widget.videoDetailCtr!.data.dash!.video!.first.height!,
-                  //   );
-                  //   if (!context.mounted) return;
-                  //   await widget.floating!.enable(ImmediatePiP(
-                  //     aspectRatio: aspectRatio,
-                  //     sourceRectHint: Rectangle<int>(
-                  //       0,
-                  //       0,
-                  //       context.width.toInt(),
-                  //       context.height.toInt(),
-                  //     ),
-                  //   ));
-                  // } else {}
-                },
-                icon: const Icon(
-                  Icons.picture_in_picture_outlined,
-                  size: 19,
-                  color: Colors.white,
-                ),
-              ),
-            ),
-            SizedBox(
-              width: 42,
-              height: 34,
-              child: IconButton(
-                tooltip: "更多设置",
-                style: ButtonStyle(
-                  padding: WidgetStateProperty.all(EdgeInsets.zero),
-                ),
-                onPressed: () => showSettingSheet(),
-                icon: const Icon(
-                  Icons.more_vert_outlined,
-                  size: 19,
-                  color: Colors.white,
+            ],
+          ),
+          SizedBox(
+              height:
+                  MediaQuery.of(context).orientation == Orientation.landscape
+                      ? 2
+                      : 15),
+          // if ((isFullScreen || !horizontalScreen))
+          // const Spacer(),
+          // show current datetime
+          if (widget.controller!.isFullScreen.value || equivalentFullScreen())
+            Row(mainAxisAlignment: MainAxisAlignment.spaceAround, children: [
+              Obx(
+                () => Text(
+                  "   ${now.value}",
+                  style: const TextStyle(
+                    color: Colors.white,
+                    fontSize: 11,
+                    fontFeatures: [FontFeature.tabularFigures()],
+                  ),
+                  semanticsLabel: '当前时间：'
+                      '${now.value.split(':')[0]}点'
+                      '${now.value.split(':')[1]}分',
                 ),
               ),
-            ),
-          ],
-        ),
+              const SizedBox(width: 1.5),
+              if (widget.controller!.isFullScreen.value)
+                const SizedBox(width: 42),
+              for (var i = 0; i < 11; i++) const SizedBox(width: 0),
+              likeVideoButton(),
+              coinVideoButton(),
+              shootDanmakuButton(),
+              danmakuSwitcher(),
+              pipButton(),
+              shareButton(),
+            ]),
+        ]),
       );
     });
   }
diff --git a/lib/pages/whisper/view.dart b/lib/pages/whisper/view.dart
index bcf69a13b..9897812f8 100644
--- a/lib/pages/whisper/view.dart
+++ b/lib/pages/whisper/view.dart
@@ -61,6 +61,8 @@ class _WhisperPageState extends State<WhisperPage> {
         ],
       ),
       body: RefreshIndicator(
+        displacement: 10.0,
+        edgeOffset: 10.0,
         onRefresh: () async {
           await _whisperController.queryMsgFeedUnread();
           await _whisperController.onRefresh();
diff --git a/lib/pages/whisper_detail/view.dart b/lib/pages/whisper_detail/view.dart
index 867754ea4..cb70c9e01 100644
--- a/lib/pages/whisper_detail/view.dart
+++ b/lib/pages/whisper_detail/view.dart
@@ -180,6 +180,8 @@ class _WhisperDetailPageState extends State<WhisperDetailPage>
             );
           }
           return RefreshIndicator(
+              displacement: 10.0,
+              edgeOffset: 10.0,
               onRefresh: _whisperDetailController.querySessionMsg,
               child: ListView.builder(
                 itemCount: messageList.length,
diff --git a/lib/pages/whisper_detail/widget/chat_item.dart b/lib/pages/whisper_detail/widget/chat_item.dart
index 462448fe9..87dbcb186 100644
--- a/lib/pages/whisper_detail/widget/chat_item.dart
+++ b/lib/pages/whisper_detail/widget/chat_item.dart
@@ -365,6 +365,72 @@ class ChatItem extends StatelessWidget {
                   ],
                 ],
               ));
+        case MsgType.article_card:
+          return GestureDetector(
+            onTap: () async {
+              Get.toNamed('/htmlRender', parameters: {
+                'url': "https://www.bilibili.com/read/cv${content['rid']}/",
+                // 'url': url.startsWith('//') ? url.split('//').last : url,
+                'title': content['title'] ?? "",
+                'id': "cv${content['rid']}",
+                'dynamicType': "read" //content['template_id'] ?? "",
+              });
+              return;
+              try {
+                SmartDialog.showLoading();
+                var bvid = content["bvid"];
+                final int cid = await SearchHttp.ab2c(bvid: bvid);
+                final String heroTag = Utils.makeHeroTag(bvid);
+                SmartDialog.dismiss<dynamic>().then(
+                  (e) => Get.toNamed<dynamic>('/video?bvid=$bvid&cid=$cid',
+                      arguments: <String, String?>{
+                        'pic': content['cover'],
+                        'heroTag': heroTag,
+                      }),
+                );
+              } catch (err) {
+                SmartDialog.dismiss();
+                SmartDialog.showToast(err.toString());
+              }
+            },
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Row(
+                  children: [
+                    for (var i in content['image_urls'])
+                      NetworkImgLayer(
+                        width: 130,
+                        height: 130 * 9 / 16,
+                        src: i,
+                      ),
+                  ],
+                ),
+                const SizedBox(height: 6),
+                SelectableText(
+                  content['title'] ?? "",
+                  style: TextStyle(
+                    letterSpacing: 0.6,
+                    height: 1.5,
+                    color: textColor(context),
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+                const SizedBox(height: 1),
+                SelectableText(
+                  content['summary'] ?? "",
+                  style: TextStyle(
+                    letterSpacing: 0.6,
+                    height: 1.5,
+                    color: textColor(context).withOpacity(0.6),
+                    fontSize: 12,
+                    overflow: TextOverflow.ellipsis,
+                  ),
+                  maxLines: 2,
+                ),
+              ],
+            ),
+          );
         default:
           return Text(
             content != null && content != ''
diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart
index 349818991..6dd796582 100644
--- a/lib/plugin/pl_player/controller.dart
+++ b/lib/plugin/pl_player/controller.dart
@@ -1,15 +1,25 @@
 // ignore_for_file: avoid_print
 
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
+import 'dart:math';
 import 'dart:typed_data';
 
 import 'package:easy_debounce/easy_throttle.dart';
+import 'package:fl_pip/fl_pip.dart';
 import 'package:flutter/material.dart';
+// import 'package:android_window/main.dart' as android_window;
+// import 'android_window.dart';
+import 'package:flutter_floating/floating/assist/floating_slide_type.dart';
+import 'package:flutter_floating/floating/floating.dart';
+import 'package:flutter_floating/floating/manager/floating_manager.dart';
+import 'package:flutter_floating/floating_increment.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:flutter_volume_controller/flutter_volume_controller.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
+import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:media_kit/media_kit.dart';
 import 'package:media_kit_video/media_kit_video.dart';
 import 'package:canvas_danmaku/canvas_danmaku.dart';
@@ -20,11 +30,13 @@ import 'package:PiliPalaX/plugin/pl_player/models/play_repeat.dart';
 import 'package:PiliPalaX/services/service_locator.dart';
 import 'package:PiliPalaX/utils/feed_back.dart';
 import 'package:PiliPalaX/utils/storage.dart';
-import 'package:screen_brightness/screen_brightness.dart';
+// import 'package:screen_brightness/screen_brightness.dart';
 import 'package:universal_platform/universal_platform.dart';
-
 import '../../models/video/play/subtitle.dart';
 import '../../pages/video/controller.dart';
+import '../../pages/video/introduction/bangumi/controller.dart';
+import '../../pages/video/introduction/detail/controller.dart';
+// import '../../pages/video/controller.dart';
 // import 'package:wakelock_plus/wakelock_plus.dart';
 
 Box videoStorage = GStorage.video;
@@ -61,6 +73,7 @@ class PlPlayerController {
   final Rx<Duration> _duration = Rx(Duration.zero);
   final RxInt durationSeconds = 0.obs;
   final Rx<Duration> _buffered = Rx(Duration.zero);
+  final Rx<String> _playerLog = Rx("");
   final RxInt bufferedSeconds = 0.obs;
 
   final Rx<int> _playerCount = Rx(0);
@@ -84,8 +97,9 @@ class PlPlayerController {
 
   final Rx<BoxFit> _videoFit = Rx(videoFitType.first['attr']);
   final Rx<String> _videoFitDesc = Rx(videoFitType.first['desc']);
-  late StreamSubscription<DataStatus> _dataListenerForVideoFit;
-  late StreamSubscription<DataStatus> _dataListenerForEnterFullscreen;
+  StreamSubscription<DataStatus>? _dataListenerForVideoFit;
+  StreamSubscription<DataStatus>? _dataListenerForEnterFullScreen;
+  StreamSubscription<PlayerStatus>? _playerListenerForEnterPip;
 
   /// 后台播放
   Rx<bool> _continuePlayInBackground = false.obs;
@@ -159,6 +173,9 @@ class PlPlayerController {
   Rx<Duration> get buffered => _buffered;
   Stream<Duration> get onBufferedChanged => _buffered.stream;
 
+  /// 视频日志
+  Rx<String> get playerLog => _playerLog;
+
   // 视频静音
   Rx<bool> get mute => _mute;
   Stream<bool> get onMuteChanged => _mute.stream;
@@ -264,29 +281,39 @@ class PlPlayerController {
   // 播放顺序相关
   PlayRepeat playRepeat = PlayRepeat.pause;
 
+  List<StreamSubscription> subscriptions = [];
+
   void updateSliderPositionSecond() {
-    int newSecond = _sliderPosition.value.inSeconds;
+    int newSecond =
+        (_sliderPosition.value.inMicroseconds / Duration.microsecondsPerSecond)
+            .ceil();
     if (sliderPositionSeconds.value != newSecond) {
       sliderPositionSeconds.value = newSecond;
     }
   }
 
   void updatePositionSecond() {
-    int newSecond = _position.value.inSeconds;
+    int newSecond =
+        (_position.value.inMicroseconds / Duration.microsecondsPerSecond)
+            .ceil();
     if (positionSeconds.value != newSecond) {
       positionSeconds.value = newSecond;
     }
   }
 
   void updateDurationSecond() {
-    int newSecond = _duration.value.inSeconds;
+    int newSecond =
+        (_duration.value.inMicroseconds / Duration.microsecondsPerSecond)
+            .ceil();
     if (durationSeconds.value != newSecond) {
       durationSeconds.value = newSecond;
     }
   }
 
   void updateBufferedSecond() {
-    int newSecond = _buffered.value.inSeconds;
+    int newSecond =
+        (_buffered.value.inMicroseconds / Duration.microsecondsPerSecond)
+            .ceil();
     if (bufferedSeconds.value != newSecond) {
       bufferedSeconds.value = newSecond;
     }
@@ -379,7 +406,6 @@ class PlPlayerController {
       speedsList.add(i.value);
     }
     speedsList.sort();
-
     // _playerEventSubs = onPlayerStatusChanged.listen((PlayerStatus status) {
     //   if (status == PlayerStatus.playing) {
     //     WakelockPlus.enable();
@@ -387,6 +413,40 @@ class PlPlayerController {
     //     WakelockPlus.disable();
     //   }
     // });
+    enableAutoPip();
+  }
+
+  void enableAutoPip() async {
+    if (!GStorage.setting.get(SettingBoxKey.autoPiP, defaultValue: false)) {
+      return;
+    }
+    if (!await FlPiP().isAvailable) return;
+    _playerListenerForEnterPip =
+        onPlayerStatusChanged.listen((PlayerStatus status) async {
+      if (status != PlayerStatus.playing) {
+        bool isActive = (await FlPiP().isActive)?.status == PiPStatus.enabled;
+        if (isActive) return;
+        FlPiP().disable();
+        print('disabled pip');
+        return;
+      }
+      print('enable pip');
+      FlPiP().enable(
+        ios: FlPiPiOSConfig(
+            enabledWhenBackground: true,
+            videoPath: dataSource.videoSource!,
+            audioPath: dataSource.audioSource!,
+            packageName: 'PiliPalaX'),
+        android: FlPiPAndroidConfig(
+          enabledWhenBackground: true,
+          aspectRatio: Rational(
+            direction.value == 'vertical' ? 9 : 16,
+            direction.value == 'horizontal' ? 9 : 16,
+          ),
+        ),
+      );
+      print('enabled pip');
+    });
   }
 
   // 获取实例 传参
@@ -522,11 +582,11 @@ class PlPlayerController {
     int bufferSize =
         setting.get(SettingBoxKey.expandBuffer, defaultValue: false)
             ? (videoType.value == 'live' ? 64 * 1024 * 1024 : 32 * 1024 * 1024)
-            : (videoType.value == 'live' ? 16 * 1024 * 1024 : 3 * 1024 * 1024);
+            : (videoType.value == 'live' ? 16 * 1024 * 1024 : 4 * 1024 * 1024);
     Player player = _videoPlayerController ??
         Player(
           configuration: PlayerConfiguration(
-            // 默认缓冲 3M 大小
+            // 默认缓冲 4M 大小
             bufferSize: bufferSize,
           ),
         );
@@ -536,7 +596,7 @@ class PlPlayerController {
     //  音量不一致
     if (Platform.isAndroid) {
       await pp.setProperty("volume-max", "100");
-      String ao = setting.get(SettingBoxKey.useOpenSLES, defaultValue: true)
+      String ao = setting.get(SettingBoxKey.useOpenSLES, defaultValue: false)
           ? "opensles,audiotrack"
           : "audiotrack,opensles";
       await pp.setProperty("ao", ao);
@@ -672,15 +732,15 @@ class PlPlayerController {
     }
   }
 
-  Future<void> autoEnterFullscreen() async {
+  Future<void> autoEnterFullScreen() async {
     bool autoEnterFullscreen = GStorage.setting
         .get(SettingBoxKey.enableAutoEnter, defaultValue: false);
     if (autoEnterFullscreen) {
       Future.delayed(const Duration(milliseconds: 500), () {
         if (dataStatus.status.value != DataStatus.loaded) {
-          _dataListenerForEnterFullscreen = dataStatus.status.listen((status) {
+          _dataListenerForEnterFullScreen = dataStatus.status.listen((status) {
             if (status == DataStatus.loaded) {
-              _dataListenerForEnterFullscreen.cancel();
+              _dataListenerForEnterFullScreen?.cancel();
               triggerFullScreen(status: true);
             }
           });
@@ -691,7 +751,6 @@ class PlPlayerController {
     }
   }
 
-  List<StreamSubscription> subscriptions = [];
   final List<Function(Duration position)> _positionListeners = [];
   final List<Function(PlayerStatus status)> _statusListeners = [];
 
@@ -798,9 +857,9 @@ class PlPlayerController {
         //   }
         // }),
         // 媒体通知监听
-        onPlayerStatusChanged.listen((PlayerStatus event) {
-          videoPlayerServiceHandler.onStatusChange(event, isBuffering.value);
-        }),
+        // onPlayerStatusChanged.listen((PlayerStatus event) {
+        //   videoPlayerServiceHandler.onStatusChange(event, isBuffering.value);
+        // }),
         onPositionChanged.listen((Duration event) {
           EasyThrottle.throttle(
               'mediaServicePosition',
@@ -940,6 +999,7 @@ class PlPlayerController {
 
   // 感觉用这个管理状态也不是很好用
   void disable() async {
+    if (floatingManager.containsFloating(globalId)) return;
     String top = Get.currentRoute;
     print("top:$top");
     if (!top.startsWith('/video') && !top.startsWith('/live')) {
@@ -1034,32 +1094,31 @@ class PlPlayerController {
   }
 
   /// 亮度
-  Future<void> getCurrentBrightness() async {
-    try {
-      _currentBrightness.value = await ScreenBrightness().current;
-    } catch (e) {
-      throw 'Failed to get current brightness';
-      //return 0;
-    }
-  }
+  // Future<void> getCurrentBrightness() async {
+  //   try {
+  //     _currentBrightness.value = await ScreenBrightness().current;
+  //   } catch (e) {
+  //     throw 'Failed to get current brightness';
+  //     //return 0;
+  //   }
+  // }
 
-  Future<void> setBrightness(double brightness) async {
-    try {
-      this.brightness.value = brightness;
-      ScreenBrightness().setScreenBrightness(brightness);
-      // setVideoBrightness();
-    } catch (e) {
-      throw 'Failed to set brightness';
-    }
-  }
+  // Future<void> setBrightness(double brightness) async {
+  //   try {
+  //     this.brightness.value = brightness;
+  //     await ScreenBrightness.instance.setSystemScreenBrightness(brightness);
+  //   } catch (e) {
+  //     throw 'Failed to set brightness';
+  //   }
+  // }
 
-  Future<void> resetBrightness() async {
-    try {
-      await ScreenBrightness().resetScreenBrightness();
-    } catch (e) {
-      throw 'Failed to reset brightness';
-    }
-  }
+  // Future<void> resetBrightness() async {
+  //   try {
+  //     await ScreenBrightness().resetScreenBrightness();
+  //   } catch (e) {
+  //     throw 'Failed to reset brightness';
+  //   }
+  // }
 
   /// Toggle Change the videofit accordingly
   void toggleVideoFit() {
@@ -1124,7 +1183,7 @@ class PlPlayerController {
         attr = BoxFit.contain;
         _dataListenerForVideoFit = dataStatus.status.listen((status) {
           if (status == DataStatus.loaded) {
-            _dataListenerForVideoFit.cancel();
+            _dataListenerForVideoFit?.cancel();
             int fitValue =
                 videoStorage.get(VideoBoxKey.cacheVideoFit, defaultValue: 0);
             var attr = videoFitType[fitValue]['attr'];
@@ -1196,6 +1255,196 @@ class PlPlayerController {
     _isFullScreen.value = val;
   }
 
+  // 应用内小窗
+  bool triggerFloatingWindow(VideoIntroController? videoIntroController,
+      BangumiIntroController? bangumiIntroController) {
+    if (videoController == null) {
+      return false;
+    }
+    Widget iconButton(IconData icon, VoidCallback onPressed) {
+      return Expanded(
+        child: IconButton(
+          constraints: const BoxConstraints(),
+          style: ButtonStyle(
+            backgroundColor: WidgetStateProperty.resolveWith<Color>(
+                (Set<WidgetState> states) {
+              return Theme.of(Get.context!)
+                  .colorScheme
+                  .surface
+                  .withOpacity(0.9);
+            }),
+            shape: WidgetStateProperty.all(
+              RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(0),
+              ),
+            ),
+          ),
+          onPressed: onPressed,
+          icon: Icon(icon, color: Theme.of(Get.context!).colorScheme.onSurface),
+        ),
+      );
+    }
+
+    const TextStyle subTitleStyle = TextStyle(
+      height: 1.3,
+      fontSize: 60.0,
+      letterSpacing: 0.1,
+      wordSpacing: 0.1,
+      color: Color(0xffffffff),
+      fontWeight: FontWeight.normal,
+      backgroundColor: Color(0xaa000000),
+    );
+
+    print("enterPip");
+    print(videoIntroController);
+    print(bangumiIntroController);
+    bool isLive =
+        videoIntroController == null && bangumiIntroController == null;
+    double? videoHeight = videoPlayerController?.state.height?.toDouble();
+    double? videoWidth = videoPlayerController?.state.width?.toDouble();
+    // bool isVertical = direction.value == 'vertical';
+    // 长宽比
+    double aspectRatio =
+        direction.value == 'horizontal' ? 9.0 / 16.0 : 16.0 / 9.0;
+
+    if (videoWidth != null && videoHeight != null) {
+      if ((videoWidth > videoHeight) ^ (direction.value != 'horizontal')) {
+        aspectRatio = videoHeight / videoWidth;
+      }
+    }
+    print('videoHeight: $videoHeight');
+    print('videoWidth: $videoWidth');
+    print('direction.value: ${direction.value}');
+    print('aspectRatio: $aspectRatio');
+    double floatingWidth = aspectRatio > 1 ? 150.0 : 240.0;
+    double extentHeight = 40.0;
+    double floatingHeight = floatingWidth * aspectRatio + extentHeight;
+
+    Widget baseWindow = SizedBox(
+      width: floatingWidth,
+      height: floatingHeight,
+      child: Column(
+        children: [
+          SizedBox(
+            width: floatingWidth,
+            height: floatingHeight - extentHeight,
+            child: InkWell(
+              onTap: () {
+                if (videoIntroController != null) {
+                  videoIntroController.openVideoDetail();
+                } else if (bangumiIntroController != null) {
+                  bangumiIntroController.openVideoDetail();
+                } else {
+                  pauseIfExists();
+                }
+                floatingManager.closeFloating(globalId);
+              },
+              child: Video(
+                controller: videoController!,
+                controls: NoVideoControls,
+                pauseUponEnteringBackgroundMode:
+                    !_continuePlayInBackground.value,
+                resumeUponEnteringForegroundMode: true,
+                // 字幕尺寸调节
+                subtitleViewConfiguration: const SubtitleViewConfiguration(
+                    style: subTitleStyle, padding: EdgeInsets.all(24.0)),
+                fit: BoxFit.contain,
+              ),
+            ),
+          ),
+          SizedBox(
+            width: floatingWidth,
+            height: extentHeight,
+            child: Row(children: [
+              // if (videoIntroController != null &&
+              //         videoIntroController.hasNextEpisode() ||
+              //     bangumiIntroController != null &&
+              //         bangumiIntroController.hasNextEpisode())
+              // iconButton(Icons.skip_next, () {
+              //   if (videoIntroController != null) {
+              //     videoIntroController.nextPlay();
+              //   } else if (bangumiIntroController != null) {
+              //     bangumiIntroController.nextPlay();
+              //   }
+              // }),
+              if (!isLive)
+                iconButton(
+                  MdiIcons.rewind10,
+                  () => seekTo(position.value - const Duration(seconds: 10),
+                      type: 'slide'),
+                ),
+              if (!isLive)
+                Obx(
+                  () => iconButton(
+                    playerStatus.playing ? Icons.pause : Icons.play_arrow,
+                    () => togglePlay(),
+                  ),
+                ),
+              if (!isLive)
+                iconButton(
+                  MdiIcons.fastForward10,
+                  () => seekTo(position.value + const Duration(seconds: 10),
+                      type: 'slide'),
+                ),
+              iconButton(Icons.close, () {
+                floatingManager.closeFloating(globalId);
+                pauseIfExists();
+              }),
+            ]),
+          ),
+        ],
+      ),
+    );
+    // pauseIfExists();
+    // int maxLength = max(videoPlayerController!.state.width!,
+    //     videoPlayerController!.state.height!);
+    // if (maxLength <= 0) {
+    //   SmartDialog.showToast('视频尺寸异常，无法开启小窗');
+    //   return;
+    // }
+    // // dp 转像素
+    // double lengthLimit = 0.8 *
+    //     min(Get.width, Get.height) *
+    //     MediaQuery.of(Get.context!).devicePixelRatio;
+    // android_window.open(
+    //   size: Size(
+    //     videoPlayerController!.state.width! / maxLength * lengthLimit,
+    //     videoPlayerController!.state.height! / maxLength * lengthLimit,
+    //   ),
+    //   position: const Offset(100, 300),
+    // );
+    // await Future.delayed(const Duration(milliseconds: 300));
+    // dataSource.startAt = position.value;
+    // final response = await android_window.post(
+    //   'play',
+    //   // dataSource,
+    //   json.encode(dataSource.toJson()),
+    // );
+    // SmartDialog.showToast(response.toString());
+
+    // if (floatingWindow != null) {
+    //   floatingWindow!.close();
+    // }
+    // floatingManager.closeFloating(globalId);
+    floatingWindow = floatingManager.createFloating(
+      globalId,
+      Floating(
+        ClipRRect(
+          borderRadius: BorderRadius.circular(16.0),
+          child: baseWindow,
+        ),
+        isPosCache: true,
+        slideType: FloatingSlideType.onRightAndTop,
+        right: 10,
+        top: 100,
+        moveOpacity: 0.5,
+        slideBottomHeight: 20,
+      ),
+    );
+    floatingWindow!.open(Get.context!);
+    return true;
+  }
+
   // 全屏
   Future<void> triggerFullScreen({bool status = true}) async {
     stopScreenTimer();
@@ -1209,6 +1458,7 @@ class PlPlayerController {
 
       /// 按照视频宽高比决定全屏方向
       toggleFullScreen(true);
+      await Future.delayed(const Duration(milliseconds: 10));
 
       /// 进入全屏
       if (mode == FullScreenMode.none) {
@@ -1274,6 +1524,8 @@ class PlPlayerController {
     if (videoType.value == 'live') {
       return;
     }
+    // print("playerStatus.status.value: ${playerStatus.status.value}");
+    // print("type: $type");
     bool isComplete = playerStatus.status.value == PlayerStatus.completed ||
         type == 'completed';
     // 播放状态变化时，更新
@@ -1285,8 +1537,8 @@ class PlPlayerController {
       );
       return;
     }
-    // 正常播放时，间隔5秒更新一次
-    if (progress - _heartDuration >= 5) {
+    // 正常播放时，间隔3秒更新一次
+    if (progress - _heartDuration >= 3) {
       _heartDuration = progress;
       await VideoHttp.heartBeat(
         bvid: _bvid,
@@ -1341,6 +1593,9 @@ class PlPlayerController {
 
       // playerStatus.status.close();
       // dataStatus.status.close();
+      _dataListenerForVideoFit?.cancel();
+      _dataListenerForEnterFullScreen?.cancel();
+      _playerListenerForEnterPip?.cancel();
 
       if (_videoPlayerController != null) {
         var pp = _videoPlayerController!.platform as NativePlayer;
diff --git a/lib/plugin/pl_player/models/bottom_control_type.dart b/lib/plugin/pl_player/models/bottom_control_type.dart
index 0d582d197..c74b77ba1 100644
--- a/lib/plugin/pl_player/models/bottom_control_type.dart
+++ b/lib/plugin/pl_player/models/bottom_control_type.dart
@@ -4,6 +4,7 @@ enum BottomControlType {
   next,
   time,
   space,
+  spaceButton,
   episode,
   fit,
   subtitle,
diff --git a/lib/plugin/pl_player/models/bottom_progress_behavior.dart b/lib/plugin/pl_player/models/bottom_progress_behavior.dart
index 9914258f8..000008903 100644
--- a/lib/plugin/pl_player/models/bottom_progress_behavior.dart
+++ b/lib/plugin/pl_player/models/bottom_progress_behavior.dart
@@ -11,13 +11,11 @@ extension BtmProgresBehaviorDesc on BtmProgressBehavior {
 }
 
 extension BtmProgresBehaviorCode on BtmProgressBehavior {
-  static final List<int> _codeList = [0, 1, 2, 3];
-  int get code => _codeList[index];
+  int get code => index;
 
   static BtmProgressBehavior? fromCode(int code) {
-    final index = _codeList.indexOf(code);
-    if (index != -1) {
-      return BtmProgressBehavior.values[index];
+    if (code >= 0 && code < BtmProgressBehavior.values.length) {
+      return BtmProgressBehavior.values[code];
     }
     return null;
   }
diff --git a/lib/plugin/pl_player/models/data_source.dart b/lib/plugin/pl_player/models/data_source.dart
index 2fbc65b3b..c9232bfaf 100644
--- a/lib/plugin/pl_player/models/data_source.dart
+++ b/lib/plugin/pl_player/models/data_source.dart
@@ -41,6 +41,7 @@ class DataSource {
     String? audioSource,
     String? subFiles,
     DataSourceType? type,
+    Duration? startAt,
     Map<String, String>? httpHeaders,
   }) {
     return DataSource(
@@ -52,4 +53,29 @@ class DataSource {
       httpHeaders: httpHeaders ?? this.httpHeaders,
     );
   }
+
+  // from json
+  factory DataSource.fromJson(Map<String, dynamic> json) {
+    return DataSource(
+      file: json['file'],
+      videoSource: json['videoSource'],
+      audioSource: json['audioSource'],
+      subFiles: json['subFiles'],
+      type: DataSourceType.values.byName(json['type']),
+      httpHeaders: json['httpHeaders']?.map<String, String>(
+          (String key, dynamic value) => MapEntry(key, value!.toString())),
+    );
+  }
+
+  // toJson
+  Map<String, dynamic> toJson() {
+    return {
+      'file': file,
+      'videoSource': videoSource,
+      'audioSource': audioSource,
+      'subFiles': subFiles,
+      'type': type.name,
+      'httpHeaders': httpHeaders,
+    };
+  }
 }
diff --git a/lib/plugin/pl_player/models/fullscreen_mode.dart b/lib/plugin/pl_player/models/fullscreen_mode.dart
index b7af5ce79..83bf7f8ff 100644
--- a/lib/plugin/pl_player/models/fullscreen_mode.dart
+++ b/lib/plugin/pl_player/models/fullscreen_mode.dart
@@ -8,7 +8,7 @@ enum FullScreenMode {
   vertical,
   // 始终横屏
   horizontal,
-  // 屏幕长宽比<1.25或为竖屏视频时竖屏，否则横屏
+  // 屏幕长宽比<1.25时强制竖屏，否则按视频方向
   ratio,
   // 强制重力转屏（仅安卓）
   gravity,
@@ -17,22 +17,20 @@ enum FullScreenMode {
 extension FullScreenModeDesc on FullScreenMode {
   String get description => [
         '按视频方向（默认）',
-        '不改变当前方向',
+        '不改变当前方向（平板推荐）',
         '强制竖屏',
         '强制横屏',
-        '屏幕长宽比<1.25或为竖屏视频时竖屏，否则横屏',
-        '忽略系统方向锁定，强制按重力转屏（仅安卓）'
+        '屏幕长宽比<1.25时均竖屏，否则按视频方向',
+        '忽略系统方向锁定，按重力转屏（仅安卓）'
       ][index];
 }
 
 extension FullScreenModeCode on FullScreenMode {
-  static final List<int> _codeList = [0, 1, 2, 3, 4, 5];
-  int get code => _codeList[index];
+  int get code => index;
 
   static FullScreenMode? fromCode(int code) {
-    final index = _codeList.indexOf(code);
-    if (index != -1) {
-      return FullScreenMode.values[index];
+    if (code >= 0 && code < FullScreenMode.values.length) {
+      return FullScreenMode.values[code];
     }
     return null;
   }
diff --git a/lib/plugin/pl_player/models/play_repeat.dart b/lib/plugin/pl_player/models/play_repeat.dart
index c614087d3..15ccf7f75 100644
--- a/lib/plugin/pl_player/models/play_repeat.dart
+++ b/lib/plugin/pl_player/models/play_repeat.dart
@@ -16,13 +16,5 @@ extension PlayRepeatExtension on PlayRepeat {
   ];
   String get description => _descList[index];
 
-  static final List<double> _valueList = [
-    1,
-    2,
-    3,
-    4,
-    5,
-  ];
-  double get value => _valueList[index];
-  double get defaultValue => _valueList[1];
+  int get value => index + 1; //兼容历史配置
 }
diff --git a/lib/plugin/pl_player/models/player_gesture_action.dart b/lib/plugin/pl_player/models/player_gesture_action.dart
new file mode 100644
index 000000000..6b705aeab
--- /dev/null
+++ b/lib/plugin/pl_player/models/player_gesture_action.dart
@@ -0,0 +1,22 @@
+enum PlayerGestureAction {
+  none,
+  toggleFullScreen,
+  pipInside,
+  pipOutside,
+  backToHome,
+}
+
+extension PlayerGestureActionDesc on PlayerGestureAction {
+  String get description => ['无', '进入/退出全屏', '应用内小窗', '应用外小窗', '返回主页'][index];
+}
+
+extension PlayerGestureActionCode on PlayerGestureAction {
+  int get code => index;
+
+  static PlayerGestureAction? fromCode(int code) {
+    if (code >= 0 && code < PlayerGestureAction.values.length) {
+      return PlayerGestureAction.values[code];
+    }
+    return null;
+  }
+}
diff --git a/lib/plugin/pl_player/models/player_middle_gesture.dart b/lib/plugin/pl_player/models/player_middle_gesture.dart
new file mode 100644
index 000000000..9234ae948
--- /dev/null
+++ b/lib/plugin/pl_player/models/player_middle_gesture.dart
@@ -0,0 +1,22 @@
+// 播放器中部手势
+enum PlayerMiddleGesture {
+  nonFullScreenUp,
+  nonFullScreenDown,
+  fullScreenUp,
+  fullScreenDown,
+}
+
+extension PlayerMiddleGestureDesc on PlayerMiddleGesture {
+  String get description => ['非全屏时上滑', '非全屏时下滑', '全屏时上滑', '全屏时下滑'][index];
+}
+
+extension PlayerMiddleGestureCode on PlayerMiddleGesture {
+  int get code => index;
+
+  static PlayerMiddleGesture? fromCode(int code) {
+    if (code >= 0 && code < PlayerMiddleGesture.values.length) {
+      return PlayerMiddleGesture.values[code];
+    }
+    return null;
+  }
+}
diff --git a/lib/plugin/pl_player/view.dart b/lib/plugin/pl_player/view.dart
index 62dadd422..32d9ab9de 100644
--- a/lib/plugin/pl_player/view.dart
+++ b/lib/plugin/pl_player/view.dart
@@ -1,12 +1,13 @@
 import 'dart:async';
 import 'dart:io';
+import 'dart:math';
 import 'dart:ui';
 
 import 'package:PiliPalaX/pages/video/introduction/detail/controller.dart';
 import 'package:PiliPalaX/utils/id_utils.dart';
 import 'package:easy_debounce/easy_throttle.dart';
+import 'package:fl_pip/fl_pip.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:flutter_volume_controller/flutter_volume_controller.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@@ -31,6 +32,8 @@ import '../../utils/utils.dart';
 import 'models/bottom_control_type.dart';
 import 'models/bottom_progress_behavior.dart';
 import 'models/play_status.dart';
+import 'models/player_gesture_action.dart';
+import 'models/player_middle_gesture.dart';
 import 'widgets/app_bar_ani.dart';
 import 'widgets/backward_seek.dart';
 import 'widgets/bottom_control.dart';
@@ -90,7 +93,11 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
   late FullScreenMode mode;
   late int defaultBtmProgressBehavior;
   late bool enableQuickDouble;
-  late bool fullScreenGestureReverse;
+  // late bool fullScreenGestureReverse;
+  // late bool enableFloatingWindowGesture;
+  late Map<PlayerMiddleGesture, PlayerGestureAction> middleGestureAction;
+  late bool setSystemBrightness;
+  late bool enableExtraButtonOnFullScreen;
 
   Offset _initialFocalPoint = Offset.zero;
   String? _gestureType;
@@ -181,8 +188,32 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
         defaultValue: BtmProgressBehavior.values.first.code);
     enableQuickDouble =
         setting.get(SettingBoxKey.enableQuickDouble, defaultValue: true);
-    fullScreenGestureReverse = setting
-        .get(SettingBoxKey.fullScreenGestureReverse, defaultValue: false);
+    // fullScreenGestureReverse = setting
+    //     .get(SettingBoxKey.fullScreenGestureReverse, defaultValue: false);
+    // enableFloatingWindowGesture = setting
+    //     .get(SettingBoxKey.enableFloatingWindowGesture, defaultValue: true);
+    setSystemBrightness =
+        setting.get(SettingBoxKey.setSystemBrightness, defaultValue: false);
+    enableExtraButtonOnFullScreen = setting
+        .get(SettingBoxKey.enableExtraButtonOnFullScreen, defaultValue: true);
+    Map<int, int> gestureCodeMap = Map<int, int>.from(
+        setting.get(SettingBoxKey.playerGestureActionMap, defaultValue: {
+      PlayerMiddleGesture.nonFullScreenUp.code:
+          PlayerGestureAction.toggleFullScreen.code,
+      PlayerMiddleGesture.nonFullScreenDown.code:
+          PlayerGestureAction.pipInside.code,
+      PlayerMiddleGesture.fullScreenUp.code: PlayerGestureAction.pipInside.code,
+      PlayerMiddleGesture.fullScreenDown.code:
+          PlayerGestureAction.toggleFullScreen.code,
+    }));
+    middleGestureAction = Map.fromEntries(
+      PlayerMiddleGesture.values.map(
+        (e) => MapEntry(
+          e,
+          PlayerGestureActionCode.fromCode(gestureCodeMap[e.code]!)!,
+        ),
+      ),
+    );
     Future.microtask(() async {
       try {
         FlutterVolumeController.updateShowSystemUI(true);
@@ -197,12 +228,22 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
 
     Future.microtask(() async {
       try {
-        _brightnessValue.value = await ScreenBrightness().current;
-        ScreenBrightness().onCurrentBrightnessChanged.listen((double value) {
-          if (mounted) {
-            _brightnessValue.value = value;
-          }
-        });
+        _brightnessValue.value = await ScreenBrightness.instance.system;
+        if (setSystemBrightness) {
+          ScreenBrightness.instance.onSystemScreenBrightnessChanged
+              .listen((value) {
+            if (mounted) {
+              _brightnessValue.value = value;
+            }
+          });
+        } else {
+          ScreenBrightness.instance.onApplicationScreenBrightnessChanged
+              .listen((value) {
+            if (mounted) {
+              _brightnessValue.value = value;
+            }
+          });
+        }
       } catch (_) {}
     });
   }
@@ -226,8 +267,15 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
 
   Future<void> setBrightness(double value) async {
     try {
-      await ScreenBrightness().setScreenBrightness(value);
-    } catch (_) {}
+      // await ScreenBrightness().setScreenBrightness(value);
+      if (setSystemBrightness) {
+        await ScreenBrightness.instance.setSystemScreenBrightness(value);
+      } else {
+        await ScreenBrightness.instance.setApplicationScreenBrightness(value);
+      }
+    } catch (e) {
+      print(e);
+    }
     _brightnessIndicator.value = true;
     _brightnessTimer?.cancel();
     _brightnessTimer = Timer(const Duration(milliseconds: 200), () {
@@ -271,8 +319,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
             bool? res;
             if (videoIntroController != null) {
               res = videoIntroController!.prevPlay();
-            }
-            if (bangumiIntroController != null) {
+            } else if (bangumiIntroController != null) {
               res = bangumiIntroController!.prevPlay();
             }
             if (res == false) {
@@ -303,8 +350,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
             bool? res;
             if (videoIntroController != null) {
               res = videoIntroController!.nextPlay();
-            }
-            if (bangumiIntroController != null) {
+            } else if (bangumiIntroController != null) {
               res = bangumiIntroController!.nextPlay();
             }
             if (res == false) {
@@ -349,7 +395,8 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
       ),
 
       /// 空白占位
-      BottomControlType.space: const Spacer(),
+      BottomControlType.space: const SizedBox(width: 0),
+      BottomControlType.spaceButton: const SizedBox(width: 42),
 
       /// 选集
       BottomControlType.episode: Container(
@@ -419,7 +466,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
       /// 字幕
       BottomControlType.subtitle: Obx(
         () => _.vttSubtitles.isEmpty
-            ? const SizedBox.shrink()
+            ? const SizedBox(width: 42, height: 30)
             : SizedBox(
                 width: 42,
                 height: 30,
@@ -448,8 +495,8 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                     height: 30,
                     alignment: Alignment.center,
                     child: const Icon(
-                      Icons.closed_caption_off_outlined,
-                      size: 22,
+                      Icons.closed_caption,
+                      size: 25,
                       color: Colors.white,
                       semanticLabel: '字幕',
                     ),
@@ -501,7 +548,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
               icon: Icon(
                 _.isFullScreen.value ? Icons.fullscreen_exit : Icons.fullscreen,
                 semanticLabel: _.isFullScreen.value ? '退出全屏' : '全屏',
-                size: 24,
+                size: 25,
                 color: Colors.white,
               ),
               fuc: () => _.triggerFullScreen(status: !_.isFullScreen.value),
@@ -512,13 +559,16 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
     var userSpecifyItem = widget.bottomList ??
         [
           BottomControlType.playOrPause,
-          BottomControlType.time,
+          // BottomControlType.time,
           if (anySeason) BottomControlType.pre,
           if (anySeason) BottomControlType.next,
-          BottomControlType.space,
+          for (var i = 0; i < 12; i++) BottomControlType.space,
+          if (!anySeason)
+            for (var i = 0; i < 3; i++) BottomControlType.spaceButton,
+          // if (!_.isFullScreen.value) BottomControlType.spaceButton,
+          BottomControlType.subtitle,
           if (anySeason) BottomControlType.episode,
           if (_.isFullScreen.value) BottomControlType.fit,
-          BottomControlType.subtitle,
           BottomControlType.speed,
           BottomControlType.fullscreen,
         ];
@@ -598,7 +648,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                     // 左边区域
                     _gestureType = 'left';
                   } else if (tapPosition < sectionWidth * 2) {
-                    // 全屏
+                    // 全屏/应用内小窗
                     _gestureType = 'center';
                   } else {
                     // 右边区域
@@ -626,41 +676,107 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                 _.onChangedSliderStart();
               } else if (_gestureType == 'left') {
                 // 左边区域 👈
-                final double level = renderBox.size.height * 3;
+                final double level =
+                    min(renderBox.size.height, renderBox.size.width) * 2.0;
+                print("level:$level");
                 final double brightness =
                     _brightnessValue.value - delta.dy / level;
+                print("brightness:$brightness");
                 final double result = brightness.clamp(0.0, 1.0);
+                print("result:$result");
                 setBrightness(result);
               } else if (_gestureType == 'center') {
-                // 全屏
-                const double threshold = 2.5; // 滑动阈值
+                // 全屏/应用内小窗
+                const double threshold = 2.8; // 滑动阈值
                 double cumulativeDy =
                     details.localFocalPoint.dy - _initialFocalPoint.dy;
 
-                void fullScreenTrigger(bool status) {
+                // void fullScreenTrigger(bool status) {
+                //   EasyThrottle.throttle(
+                //       'fullScreen', const Duration(milliseconds: 800),
+                //       () async {
+                //     await _.triggerFullScreen(status: status);
+                //   });
+                // }
+
+                void floatingWindowTrigger() {
+                  _.triggerFloatingWindow(
+                      videoIntroController, bangumiIntroController);
+                  // Future.delayed(const Duration(milliseconds: 10), () {
+                  if (!Get.previousRoute.startsWith('/video') &&
+                      !Get.previousRoute.startsWith('/live')) {
+                    Get.back();
+                    return;
+                  }
+                  while (Get.rawRoute?.settings.name?.startsWith('/video') ==
+                          true ||
+                      Get.rawRoute?.settings.name?.startsWith('/live') ==
+                          true) {
+                    Get.removeRoute(Get.rawRoute!);
+                  }
+                }
+
+                void actionTrigger(PlayerGestureAction action) {
                   EasyThrottle.throttle(
-                      'fullScreen', const Duration(milliseconds: 800),
+                      'floatingWindow', const Duration(milliseconds: 800),
                       () async {
-                    await _.triggerFullScreen(status: status);
+                    switch (action) {
+                      case PlayerGestureAction.none:
+                        break;
+                      case PlayerGestureAction.toggleFullScreen:
+                        _.triggerFullScreen(status: !_.isFullScreen.value);
+                        break;
+                      case PlayerGestureAction.pipInside:
+                        floatingWindowTrigger();
+                        break;
+                      case PlayerGestureAction.pipOutside:
+                        // lib/pages/video/widgets/header_control.dart
+
+                        print(_.dataSource.videoSource);
+                        print(_.dataSource.audioSource);
+                        _.controls = false;
+                        FlPiP().enable(
+                          ios: FlPiPiOSConfig(
+                              videoPath: _.dataSource.videoSource ?? "",
+                              audioPath: _.dataSource.audioSource ?? "",
+                              packageName: null),
+                          android: FlPiPAndroidConfig(
+                            aspectRatio: Rational(
+                                _.videoPlayerController!.state.width!,
+                                _.videoPlayerController!.state.height!),
+                          ),
+                        );
+                        break;
+                      case PlayerGestureAction.backToHome:
+                        // lib/pages/video/widgets/header_control.dart
+                        if (Get.previousRoute == '/') {
+                          Get.back();
+                          return;
+                        }
+                        Get.offAllNamed('/');
+                        break;
+                    }
                   });
                 }
 
                 if (cumulativeDy > threshold) {
-                  _gestureType = 'center_down';
-                  if (_.isFullScreen.value ^ fullScreenGestureReverse) {
-                    fullScreenTrigger(fullScreenGestureReverse);
-                  }
-                  // print('center_down:$cumulativeDy');
+                  _gestureType = 'middle_down';
+                  actionTrigger(middleGestureAction[_.isFullScreen.value
+                      ? PlayerMiddleGesture.fullScreenDown
+                      : PlayerMiddleGesture.nonFullScreenDown]!);
+
+                  // print('middle_down:$cumulativeDy');
                 } else if (cumulativeDy < -threshold) {
-                  _gestureType = 'center_up';
-                  if (!_.isFullScreen.value ^ fullScreenGestureReverse) {
-                    fullScreenTrigger(!fullScreenGestureReverse);
-                  }
-                  // print('center_up:$cumulativeDy');
+                  _gestureType = 'middle_up';
+                  actionTrigger(middleGestureAction[_.isFullScreen.value
+                      ? PlayerMiddleGesture.fullScreenUp
+                      : PlayerMiddleGesture.nonFullScreenUp]!);
+                  // print('middle_up:$cumulativeDy');
                 }
               } else if (_gestureType == 'right') {
                 // 右边区域
-                final double level = renderBox.size.height * 0.5;
+                final double level =
+                    min(renderBox.size.height, renderBox.size.width) * 0.5;
                 EasyThrottle.throttle(
                     'setVolume', const Duration(milliseconds: 20), () {
                   final double volume = _volumeValue.value - delta.dy / level;
@@ -687,8 +803,8 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                   !_.continuePlayInBackground.value,
               resumeUponEnteringForegroundMode: true,
               // 字幕尺寸调节
-              subtitleViewConfiguration: SubtitleViewConfiguration(
-                  style: subTitleStyle, padding: const EdgeInsets.all(24.0)),
+              subtitleViewConfiguration: const SubtitleViewConfiguration(
+                  style: subTitleStyle, padding: EdgeInsets.all(24.0)),
               fit: _.videoFit.value,
             ),
           ),
@@ -750,8 +866,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                         children: [
                           Obx(() {
                             return Text(
-                              Utils.timeFormat(
-                                  _.sliderTempPosition.value.inSeconds),
+                              Utils.timeFormat(_.sliderPositionSeconds.value),
                               style: textStyle,
                             );
                           }),
@@ -760,9 +875,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                           const SizedBox(width: 2),
                           Obx(
                             () => Text(
-                              _.duration.value.inMinutes >= 60
-                                  ? printDurationWithHours(_.duration.value)
-                                  : printDuration(_.duration.value),
+                              Utils.timeFormat(_.durationSeconds.value),
                               style: textStyle,
                             ),
                           ),
@@ -1027,6 +1140,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                     bufferedBarColor:
                         Theme.of(context).colorScheme.primary.withOpacity(0.4),
                     timeLabelLocation: TimeLabelLocation.none,
+                    // timeLabelLocation: TimeLabelLocation.sides,
                     thumbColor: colorTheme,
                     barHeight: 3.5,
                     thumbRadius: draggingFixedProgressBar.value ? 7 : 2.5,
@@ -1074,41 +1188,44 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
         ),
 
         // 锁
-        Obx(
-          () => Visibility(
-            visible: _.videoType.value != 'live',
-            child: Align(
-              alignment: Alignment.centerLeft,
-              child: FractionalTranslation(
-                translation: const Offset(1, -0.4),
-                child: Visibility(
-                  visible: _.showControls.value &&
-                      (_.isFullScreen.value || _.controlsLock.value),
-                  child: ComBtn(
-                    icon: Icon(
-                      _.controlsLock.value
-                          ? FontAwesomeIcons.lock
-                          : FontAwesomeIcons.lockOpen,
-                      semanticLabel: _.controlsLock.value ? '解锁' : '锁定',
-                      size: 15,
-                      color: Colors.white,
-                    ),
-                    fuc: () => _.onLockControl(!_.controlsLock.value),
+        SafeArea(
+            child: Obx(
+          () => Align(
+            alignment: Alignment.centerLeft,
+            child: FractionalTranslation(
+              translation: const Offset(1, -0.4),
+              child: Visibility(
+                visible: _.videoType.value != 'live' &&
+                    enableExtraButtonOnFullScreen &&
+                    _.showControls.value &&
+                    (_.isFullScreen.value || _.controlsLock.value),
+                child: ComBtn(
+                  icon: Icon(
+                    _.controlsLock.value
+                        ? FontAwesomeIcons.lock
+                        : FontAwesomeIcons.lockOpen,
+                    semanticLabel: _.controlsLock.value ? '解锁' : '锁定',
+                    size: 15,
+                    color: Colors.white,
                   ),
+                  fuc: () => _.onLockControl(!_.controlsLock.value),
                 ),
               ),
             ),
           ),
-        ),
+        )),
 
         // 截图
-        Obx(
+        SafeArea(
+            child: Obx(
           () => Align(
             alignment: Alignment.centerRight,
             child: FractionalTranslation(
               translation: const Offset(-1, -0.4),
               child: Visibility(
-                visible: _.showControls.value && _.isFullScreen.value,
+                visible: _.showControls.value &&
+                    _.isFullScreen.value &&
+                    enableExtraButtonOnFullScreen,
                 child: ComBtn(
                   icon: const Icon(
                     Icons.photo_camera,
@@ -1173,45 +1290,50 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
               ),
             ),
           ),
-        ),
+        )),
         //
         Obx(() {
           if (_.dataStatus.loading || _.isBuffering.value) {
             return Center(
-                child: GestureDetector(
-                    onTap: () {
-                      _.refreshPlayer();
-                    },
-                    child: Container(
-                      padding: const EdgeInsets.all(30),
-                      decoration: const BoxDecoration(
-                        shape: BoxShape.circle,
-                        gradient: RadialGradient(
-                          colors: [Colors.black26, Colors.transparent],
-                        ),
-                      ),
-                      child: Column(mainAxisSize: MainAxisSize.min, children: [
-                        Image.asset(
-                          'assets/images/loading.gif',
-                          height: 25,
-                          semanticLabel: "加载中",
-                        ),
-                        if (_.isBuffering.value)
-                          Obx(() {
-                            if (_.buffered.value == Duration.zero) {
-                              return const Text('Buffering...',
-                                  style: TextStyle(
-                                      color: Colors.white, fontSize: 12));
-                            }
-                            String bufferStr = _.buffered.toString();
-                            return Text(
-                              bufferStr.substring(0, bufferStr.length - 3),
-                              style: const TextStyle(
-                                  color: Colors.white, fontSize: 12),
-                            );
-                          }),
-                      ]),
-                    )));
+              child: GestureDetector(
+                onTap: () {
+                  _.refreshPlayer();
+                },
+                child: Container(
+                  padding: const EdgeInsets.all(30),
+                  decoration: const BoxDecoration(
+                    shape: BoxShape.circle,
+                    gradient: RadialGradient(
+                      colors: [Colors.black26, Colors.transparent],
+                    ),
+                  ),
+                  child: Column(mainAxisSize: MainAxisSize.min, children: [
+                    Image.asset(
+                      'assets/images/loading.gif',
+                      height: 25,
+                      semanticLabel: "加载中",
+                    ),
+                    if (_.isBuffering.value)
+                      Obx(() {
+                        if (_.buffered.value == Duration.zero) {
+                          return const Text(
+                            'Buffering...',
+                            style: TextStyle(color: Colors.white, fontSize: 12),
+                            semanticsLabel: '',
+                          );
+                        }
+                        String bufferStr = _.buffered.toString();
+                        return Text(
+                          bufferStr.substring(0, bufferStr.length - 3),
+                          style: const TextStyle(
+                              color: Colors.white, fontSize: 12),
+                          semanticsLabel: '',
+                        );
+                      }),
+                  ]),
+                ),
+              ),
+            );
           } else {
             return const SizedBox();
           }
diff --git a/lib/plugin/pl_player/widgets/app_bar_ani.dart b/lib/plugin/pl_player/widgets/app_bar_ani.dart
index b2cd75469..e14691f26 100644
--- a/lib/plugin/pl_player/widgets/app_bar_ani.dart
+++ b/lib/plugin/pl_player/widgets/app_bar_ani.dart
@@ -36,7 +36,7 @@ class AppBarAni extends StatelessWidget implements PreferredSizeWidget {
                   end: Alignment.topCenter,
                   colors: <Color>[
                     Colors.transparent,
-                    Colors.black54,
+                    Colors.black87,
                   ],
                   tileMode: TileMode.mirror,
                 )
@@ -45,12 +45,12 @@ class AppBarAni extends StatelessWidget implements PreferredSizeWidget {
                   end: Alignment.bottomCenter,
                   colors: <Color>[
                     Colors.transparent,
-                    Colors.black54,
+                    Colors.black87,
                   ],
                   tileMode: TileMode.mirror,
                 ),
         ),
-        child: SafeArea(bottom: false, child: child),
+        child: SafeArea(bottom: false, left: false, child: child),
       ),
     );
   }
diff --git a/lib/plugin/pl_player/widgets/bottom_control.dart b/lib/plugin/pl_player/widgets/bottom_control.dart
index e826753c6..1575c6eb8 100644
--- a/lib/plugin/pl_player/widgets/bottom_control.dart
+++ b/lib/plugin/pl_player/widgets/bottom_control.dart
@@ -30,7 +30,7 @@ class BottomControl extends StatelessWidget implements PreferredSizeWidget {
     double lastAnnouncedValue = -1;
     return Container(
       color: Colors.transparent,
-      height: 90,
+      height: 70 + (_.isFullScreen.value ? Get.height * 0.08 : 0),
       padding: const EdgeInsets.symmetric(horizontal: 10),
       child: Column(
         mainAxisAlignment: MainAxisAlignment.end,
@@ -44,7 +44,10 @@ class BottomControl extends StatelessWidget implements PreferredSizeWidget {
                 return nil;
               }
               return Padding(
-                padding: const EdgeInsets.only(left: 10, right: 10, bottom: 7),
+                padding: EdgeInsets.only(
+                    left: 10,
+                    right: 10,
+                    bottom: 5 + (_.isFullScreen.value ? Get.height * 0.01 : 0)),
                 child: Semantics(
                     // label: '${(value / max * 100).round()}%',
                     value: '${(value / max * 100).round()}%',
@@ -56,7 +59,9 @@ class BottomControl extends StatelessWidget implements PreferredSizeWidget {
                       progressBarColor: colorTheme,
                       baseBarColor: Colors.white.withOpacity(0.2),
                       bufferedBarColor: colorTheme.withOpacity(0.4),
-                      timeLabelLocation: TimeLabelLocation.none,
+                      timeLabelLocation: TimeLabelLocation.sides,
+                      timeLabelTextStyle: const TextStyle(color: Colors.white),
+                      // timeLabelLocation: TimeLabelLocation.none,
                       thumbColor: colorTheme,
                       barHeight: 3.5,
                       thumbRadius: 7,
@@ -92,9 +97,11 @@ class BottomControl extends StatelessWidget implements PreferredSizeWidget {
             },
           ),
           Row(
+            mainAxisAlignment: MainAxisAlignment.spaceAround,
             children: [...buildBottomControl!],
           ),
-          const SizedBox(height: 12),
+          const SizedBox(height: 9),
+          if (_.isFullScreen.value) SizedBox(height: Get.height * 0.07),
         ],
       ),
     );
diff --git a/lib/plugin/pl_player/widgets/play_pause_btn.dart b/lib/plugin/pl_player/widgets/play_pause_btn.dart
index 294be6fde..0bf00c54d 100644
--- a/lib/plugin/pl_player/widgets/play_pause_btn.dart
+++ b/lib/plugin/pl_player/widgets/play_pause_btn.dart
@@ -79,7 +79,7 @@ class PlayOrPauseButtonState extends State<PlayOrPauseButton>
             progress: animation,
             icon: AnimatedIcons.play_pause,
             color: Colors.white,
-            size: 20,
+            size: 24,
             // size: widget.iconSize ?? _theme(context).buttonBarButtonSize,
             // color: widget.iconColor ?? _theme(context).buttonBarButtonColor,
           ),
diff --git a/lib/router/app_pages.dart b/lib/router/app_pages.dart
index f54c80ee7..530c9deb2 100644
--- a/lib/router/app_pages.dart
+++ b/lib/router/app_pages.dart
@@ -35,6 +35,8 @@ import '../pages/member_search/index.dart';
 import '../pages/member_season/view.dart';
 import '../pages/member_series/view.dart';
 import '../pages/msg_feed_top/sys_msg/view.dart';
+import '../pages/rank/view.dart';
+import '../pages/rank/zone/view.dart';
 import '../pages/search/index.dart';
 import '../pages/search_result/index.dart';
 import '../pages/setting/extra_setting.dart';
@@ -42,6 +44,7 @@ import '../pages/setting/index.dart';
 import '../pages/setting/pages/color_select.dart';
 import '../pages/setting/pages/display_mode.dart';
 import '../pages/setting/pages/font_size_select.dart';
+import '../pages/setting/pages/gesture_select.dart';
 import '../pages/setting/pages/home_tabbar_set.dart';
 import '../pages/setting/pages/play_speed_set.dart';
 import '../pages/setting/recommend_setting.dart';
@@ -128,6 +131,7 @@ class Routes {
     //
     CustomGetPage(name: '/blackListPage', page: () => const BlackListPage()),
     CustomGetPage(name: '/colorSetting', page: () => const ColorSelectPage()),
+    CustomGetPage(name: '/gestureSetting', page: () => const GestureSelectPage()),
     // 开发人员选项
     CustomGetPage(name: '/hiddenSetting', page: () => const HiddenSetting()),
     // 首页tabbar
diff --git a/lib/services/audio_handler.dart b/lib/services/audio_handler.dart
index 3b2113191..40132939e 100644
--- a/lib/services/audio_handler.dart
+++ b/lib/services/audio_handler.dart
@@ -4,6 +4,7 @@ import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:PiliPalaX/plugin/pl_player/index.dart';
 import 'package:PiliPalaX/utils/storage.dart';
+import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 
 Future<VideoPlayerServiceHandler> initAudioService() async {
   return await AudioService.init(
@@ -59,11 +60,11 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
 
   Future<void> setMediaItem(MediaItem newMediaItem) async {
     if (!enableBackgroundPlay) return;
-    print("此时调用栈为：");
-    print(newMediaItem);
-    print(newMediaItem.title);
-    debugPrint(StackTrace.current.toString());
-    print(Get.currentRoute);
+    // print("此时调用栈为：");
+    // print(newMediaItem);
+    // print(newMediaItem.title);
+    // debugPrint(StackTrace.current.toString());
+    // print(Get.currentRoute);
     // if (!Get.currentRoute.startsWith('/video') && !Get.currentRoute.startsWith('/live')) {
     //   return;
     // }
@@ -72,7 +73,7 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
 
   Future<void> setPlaybackState(PlayerStatus status, bool isBuffering) async {
     if (!enableBackgroundPlay) return;
-
+    // print("isBuffering2: $isBuffering");
     final AudioProcessingState processingState;
     final playing = status == PlayerStatus.playing;
     if (status == PlayerStatus.disabled) {
@@ -80,20 +81,22 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
     } else if (status == PlayerStatus.completed) {
       processingState = AudioProcessingState.completed;
     } else if (isBuffering) {
-      processingState = AudioProcessingState.buffering;
+      // tmp_fix: 手动播放前媒体通知无限buffer状态
+      // processingState = AudioProcessingState.buffering;
+      processingState = AudioProcessingState.ready;
     } else {
       processingState = AudioProcessingState.ready;
     }
+    print("processingState: $processingState");
 
     playbackState.add(playbackState.value.copyWith(
-      processingState:
-          isBuffering ? AudioProcessingState.buffering : processingState,
+      processingState: processingState,
       controls: [
-        MediaControl.rewind,
-        // .copyWith(androidIcon: 'drawable/ic_baseline_replay_10_24'),
+        MediaControl.rewind
+            .copyWith(androidIcon: 'drawable/ic_baseline_replay_10_24'),
         if (playing) MediaControl.pause else MediaControl.play,
-        MediaControl.fastForward,
-        // .copyWith(androidIcon: 'drawable/ic_baseline_forward_10_24'),
+        MediaControl.fastForward
+            .copyWith(androidIcon: 'drawable/ic_baseline_forward_10_24'),
       ],
       playing: playing,
       systemActions: const {
@@ -104,7 +107,11 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
 
   onStatusChange(PlayerStatus status, bool isBuffering) {
     if (!enableBackgroundPlay) return;
+    // print("此时调用栈为：");
+    // debugPrint(StackTrace.current.toString());
+    // print("isBuffering: $isBuffering");
     // if (_item.isEmpty) return;
+    // isBuffering = false;
     setPlaybackState(status, isBuffering);
   }
 
@@ -114,6 +121,7 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
     // print('当前调用栈为：');
     // print(StackTrace.current);
     if (!PlPlayerController.instanceExists()) return;
+    print("artUri: $artUri");
     MediaItem mediaItem = MediaItem(
       id: UniqueKey().toString(),
       title: title ?? "",
diff --git a/lib/services/service_locator.dart b/lib/services/service_locator.dart
index e4497660d..c864bb2d9 100644
--- a/lib/services/service_locator.dart
+++ b/lib/services/service_locator.dart
@@ -1,8 +1,13 @@
 import 'audio_handler.dart';
 import 'audio_session.dart';
+import 'package:flutter_floating/floating/assist/floating_slide_type.dart';
+import 'package:flutter_floating/floating/floating.dart';
+import 'package:flutter_floating/floating/manager/floating_manager.dart';
 
 late VideoPlayerServiceHandler videoPlayerServiceHandler;
 late AudioSessionHandler audioSessionHandler;
+Floating? floatingWindow;
+const globalId = 'global_floating_window';
 
 Future<void> setupServiceLocator() async {
   final audio = await initAudioService();
diff --git a/lib/utils/feed_back.dart b/lib/utils/feed_back.dart
index 4a29af212..1070773fa 100644
--- a/lib/utils/feed_back.dart
+++ b/lib/utils/feed_back.dart
@@ -2,8 +2,8 @@ import 'package:flutter/services.dart';
 import 'package:hive/hive.dart';
 import 'storage.dart';
 
-Box<dynamic> setting = GStorage.setting;
 void feedBack() {
+  Box<dynamic> setting = GStorage.setting;
   // 设置中是否开启
   final bool enable =
       setting.get(SettingBoxKey.feedBackEnable, defaultValue: false) as bool;
diff --git a/lib/utils/login.dart b/lib/utils/login.dart
index 3a6a2ae80..81d42afe0 100644
--- a/lib/utils/login.dart
+++ b/lib/utils/login.dart
@@ -40,11 +40,13 @@ class LoginUtils {
     for (var i = 0; i < 6; i++) {
       var min = 0;
       var max = 0xff;
-      var num = (random.nextInt(max - min + 1) + min).toRadixString(16);
+      var num =
+          (random.nextInt(max - min + 1) + min).toRadixString(16).toUpperCase();
       mac.add(num);
     }
 
-    var md5Str = md5.convert(utf8.encode(mac.join(':'))).toString();
+    var md5Str =
+        md5.convert(utf8.encode(mac.join(':'))).toString().toUpperCase();
     var md5Arr = md5Str.split('');
     return 'XY${md5Arr[2]}${md5Arr[12]}${md5Arr[22]}$md5Str';
   }
@@ -67,11 +69,11 @@ class LoginUtils {
 
     final Random random = Random(); // Random.secure();
     final String randomHex32 =
-    List.generate(32, (index) => random.nextInt(16).toRadixString(16))
-        .join();
+        List.generate(32, (index) => random.nextInt(16).toRadixString(16))
+            .join();
     final String randomHex16 =
-    List.generate(16, (index) => random.nextInt(16).toRadixString(16))
-        .join();
+        List.generate(16, (index) => random.nextInt(16).toRadixString(16))
+            .join();
 
     final String deviceID = randomHex32 + yyyyMMddHHmmss + randomHex16;
 
diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart
index 8f592ee22..0afa4eca0 100644
--- a/lib/utils/storage.dart
+++ b/lib/utils/storage.dart
@@ -118,17 +118,21 @@ class SettingBoxKey {
       CDNService = 'CDNService',
       disableAudioCDN = 'disableAudioCDN',
       // enableCDN = 'enableCDN',
+      autoMiniPlayer = 'autoMiniPlayer',
       autoPiP = 'autoPiP',
       pipNoDanmaku = 'pipNoDanmaku',
       enableAutoLongPressSpeed = 'enableAutoLongPressSpeed',
       subtitlePreference = 'subtitlePreference',
-
+      playerGestureActionMap = 'playerGestureActionMap',
       // youtube 双击快进快退
       enableQuickDouble = 'enableQuickDouble',
-      fullScreenGestureReverse = 'fullScreenGestureReverse',
+      enableExtraButtonOnFullScreen = 'enableExtraButtonOnFullScreen',
+      // fullScreenGestureReverse = 'fullScreenGestureReverse',
+      // enableFloatingWindowGesture = 'enableFloatingWindowGesture',
       enableShowDanmaku = 'enableShowDanmaku',
       enableBackgroundPlay = 'enableBackgroundPlay',
       continuePlayInBackground = 'continuePlayInBackground',
+      setSystemBrightness = 'setSystemBrightness',
 
       /// 隐私
       anonymity = 'anonymity',
@@ -148,6 +152,7 @@ class SettingBoxKey {
       autoUpdate = 'autoUpdate',
       autoClearCache = 'autoClearCache',
       defaultShowComment = 'defaultShowComment',
+      defaultExpandIntroduction = 'defaultExpandIntroduction',
       replySortType = 'replySortType',
       defaultDynamicType = 'defaultDynamicType',
       enableHotKey = 'enableHotKey',
@@ -179,6 +184,7 @@ class SettingBoxKey {
       defaultTextScale = 'textScale',
       dynamicColor = 'dynamicColor', // bool
       customColor = 'customColor', // 自定义主题色
+      schemeVariant = 'schemeVariant',
       enableSingleRow = 'enableSingleRow', // 首页单列
       displayMode = 'displayMode',
       maxRowWidth = 'maxRowWidth', // 首页列最大宽度（dp）
@@ -188,7 +194,8 @@ class SettingBoxKey {
       dynamicsWaterfallFlow = 'dynamicsWaterfallFlow', // 动态瀑布流
       upPanelPosition = 'upPanelPosition', // up主面板位置
       dynamicsShowAllFollowedUp = 'dynamicsShowAllFollowedUp', // 动态显示全部关注up
-      useSideBar = 'useSideBar',
+      // useSideBar = 'useSideBar',
+      sideBarPosition = 'sideBarPosition',
       enableMYBar = 'enableMYBar',
       hideSearchBar = 'hideSearchBar', // 收起顶栏
       hideTabBar = 'hideTabBar', // 收起底栏
@@ -218,7 +225,7 @@ class VideoBoxKey {
   // 视频比例
   static const String videoFit = 'videoFit',
       // 亮度
-      videoBrightness = 'videoBrightness',
+      // videoBrightness = 'videoBrightness',
       // 倍速
       videoSpeed = 'videoSpeed',
       // 播放顺序
diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart
index bd7392cf8..36bff3e23 100644
--- a/lib/utils/utils.dart
+++ b/lib/utils/utils.dart
@@ -309,7 +309,48 @@ class Utils {
 
   // 版本对比
   static bool needUpdate(localVersion, remoteVersion) {
-    return localVersion != remoteVersion;
+    // 1.0.22-alpha.13+174 is newer then 1.0.22-beta.12+174
+    // 1.0.22-beta.13+174 is newer then 1.0.22-alpha.13+174
+    // 1.0.23+174 is newer than 1.0.22-beta.13+174
+    print('localVersion: $localVersion, remoteVersion: $remoteVersion');
+    if (localVersion == remoteVersion) {
+      return false;
+    }
+    List<String> localVersionList0 = localVersion.split('+');
+    List<String> remoteVersionList0 = remoteVersion.split('+');
+    // 如果version code不同，则直接返回
+    if (localVersionList0[1] != remoteVersionList0[1]) {
+      return int.parse(localVersionList0[1]) < int.parse(remoteVersionList0[1]);
+    }
+    // 判断version name
+    List<String> localVersionList = localVersionList0[0].split('-');
+    List<String> remoteVersionList = remoteVersionList0[0].split('-');
+    if (localVersionList[0] != remoteVersionList[0]) {
+      List<String> localVersionParts = localVersionList[0].split('.');
+      List<String> remoteVersionParts = remoteVersionList[0].split('.');
+      int len = min(localVersionParts.length, remoteVersionParts.length);
+      for (int i = 0; i < len; i++) {
+        if (int.parse(localVersionParts[i]) !=
+            int.parse(remoteVersionParts[i])) {
+          return int.parse(localVersionParts[i]) <
+              int.parse(remoteVersionParts[i]);
+        }
+      }
+      return localVersionParts.length < remoteVersionParts.length;
+    } else if (localVersionList.length == 1 || remoteVersionList.length == 1) {
+      return localVersionList.length < remoteVersionList.length;
+    } else {
+      List<String> localVersionParts = localVersionList[1].split('.');
+      List<String> remoteVersionParts = remoteVersionList[1].split('.');
+      if (localVersionParts.length > 1 && remoteVersionParts.length > 1) {
+        if (localVersionParts[1] != remoteVersionParts[1]) {
+          return int.parse(localVersionParts[1]) <
+              int.parse(remoteVersionParts[1]);
+        }
+        return localVersionParts[0].compareTo(remoteVersionParts[0]) < 0;
+      }
+      return localVersionParts[0].compareTo(remoteVersionParts[0]) < 0;
+    }
   }
 
   // 检查更新
diff --git a/pubspec.lock b/pubspec.lock
index 031ec2b31..39bf779a0 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -42,10 +42,10 @@ packages:
     dependency: "direct main"
     description:
       name: app_links
-      sha256: ad1a6d598e7e39b46a34f746f9a8b011ee147e4c275d407fa457e7a62f84dd99
+      sha256: "433df2e61b10519407475d7f69e470789d23d593f28224c38ba1068597be7950"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "6.3.2"
+    version: "6.3.3"
   app_links_linux:
     dependency: transitive
     description:
@@ -74,10 +74,10 @@ packages:
     dependency: transitive
     description:
       name: archive
-      sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
+      sha256: "08064924cbf0ab88280a0c3f60db9dd24fec693927e725ecb176f16c629d1cb8"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.6.1"
+    version: "4.0.1"
   args:
     dependency: transitive
     description:
@@ -106,18 +106,18 @@ packages:
     dependency: "direct main"
     description:
       name: audio_service
-      sha256: "9dd5ba7e77567b290c35908b1950d61485b4dfdd3a0ac398e98cfeec04651b75"
+      sha256: f6c8191bef6b843da34675dd0731ad11d06094c36b691ffcf3148a4feb2e585f
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.18.15"
+    version: "0.18.16"
   audio_service_platform_interface:
     dependency: transitive
     description:
       name: audio_service_platform_interface
-      sha256: "8431a455dac9916cc9ee6f7da5620a666436345c906ad2ebb7fa41d18b3c1bf4"
+      sha256: "6283782851f6c8b501b60904a32fc7199dc631172da0629d7301e66f672ab777"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.1"
+    version: "0.1.3"
   audio_service_web:
     dependency: transitive
     description:
@@ -130,10 +130,10 @@ packages:
     dependency: "direct main"
     description:
       name: audio_session
-      sha256: "343e83bc7809fbda2591a49e525d6b63213ade10c76f15813be9aed6657b3261"
+      sha256: b2a26ba8b7efa1790d6460e82971fde3e398cfbe2295df9dea22f3499d2c12a7
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.21"
+    version: "0.1.23"
   auto_orientation:
     dependency: "direct main"
     description:
@@ -244,18 +244,18 @@ packages:
     description:
       path: "."
       ref: main
-      resolved-ref: "66ebd5f7c214435d303371ed556730eecb6d065d"
+      resolved-ref: f1f99f9755b2a6a238a650d1c023f4ffb53533e9
       url: "https://github.com/orz12/canvas_danmaku.git"
     source: git
-    version: "0.2.1"
+    version: "0.2.2"
   catcher_2:
     dependency: "direct main"
     description:
       name: catcher_2
-      sha256: "31d860ab5641600681e00b66b00d90960a4caa02d71c63362dc9f54ecbf2c87d"
+      sha256: b3bebe77f31452f15f8fafa20ac5625311d7173c62f1884733479ee07dfd7c1b
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.1"
+    version: "2.1.0"
   characters:
     dependency: transitive
     description:
@@ -308,10 +308,10 @@ packages:
     dependency: "direct main"
     description:
       name: connectivity_plus
-      sha256: "876849631b0c7dc20f8b471a2a03142841b482438e3b707955464f5ffca3e4c3"
+      sha256: e0817759ec6d2d8e57eb234e6e57d2173931367a865850c7acea40d4b4f9c27d
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "6.1.0"
+    version: "6.1.1"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
@@ -372,10 +372,10 @@ packages:
     dependency: "direct main"
     description:
       name: custom_sliding_segmented_control
-      sha256: "53c3e931c3ae1f696085d1ec70ac8e934da836595a9b7d9b88fdd0fcbf2a5574"
+      sha256: eca54f37c999351522a6aa82bf451241df05ae4e231d593f77034615251034eb
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.8.3"
+    version: "1.8.4"
   dart_style:
     dependency: transitive
     description:
@@ -404,10 +404,10 @@ packages:
     dependency: transitive
     description:
       name: device_info_plus_platform_interface
-      sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba"
+      sha256: "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "7.0.1"
+    version: "7.0.2"
   dio:
     dependency: "direct main"
     description:
@@ -516,18 +516,18 @@ packages:
     dependency: "direct main"
     description:
       name: extended_text
-      sha256: b0cdd240b4ddf61d18d7e33e7775195971f2d033bd69706fa897446dc96c3b81
+      sha256: d8d8c9aaf5a97590a2ed249c896eda4f3e761cfc60d3edf0cbe1384348e38466
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "14.1.0"
+    version: "14.2.0"
   extended_text_library:
     dependency: transitive
     description:
       name: extended_text_library
-      sha256: "55d09098ec56fab0d9a8a68950ca0bbf2efa1327937f7cec6af6dfa066234829"
+      sha256: "13d99f8a10ead472d5e2cf4770d3d047203fe5054b152e9eb5dc692a71befbba"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "12.0.0"
+    version: "12.0.1"
   fading_edge_scrollview:
     dependency: "direct overridden"
     description:
@@ -576,6 +576,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.2.0"
+  flex_seed_scheme:
+    dependency: "direct main"
+    description:
+      name: flex_seed_scheme
+      sha256: "7639d2c86268eff84a909026eb169f008064af0fb3696a651b24b0fa24a40334"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.4.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -597,6 +605,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.6.0"
+  flutter_floating:
+    dependency: "direct main"
+    description:
+      name: flutter_floating
+      sha256: "0ff6a47c29a213c426005d248c6afe93fa76e308abbbbd6c8a35689daf11a997"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.8"
   flutter_html:
     dependency: "direct main"
     description:
@@ -638,10 +654,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_native_splash
-      sha256: ee5c9bd2b74ea8676442fd4ab876b5d41681df49276488854d6c81a5377c0ef1
+      sha256: "1152ab0067ca5a2ebeb862fe0a762057202cceb22b7e62692dcbabf6483891bb"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.4.2"
+    version: "2.4.3"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -654,18 +670,18 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_smart_dialog
-      sha256: "7932ab58440379094c6a568efc329d322c6dd740e5a553080f2d56a71ed53752"
+      sha256: d7b915461fdc9bb8111d23a709b4ce910dbc4b9bef0fbd941655f74bf7de09a6
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.9.8+3"
+    version: "4.9.8+5"
   flutter_svg:
     dependency: "direct main"
     description:
       name: flutter_svg
-      sha256: "1b7723a814d84fb65869ea7115cdb3ee7c3be5a27a755c1ec60e049f6b9fcbb2"
+      sha256: "54900a1a1243f3c4a5506d853a2b5c2dbc38d5f27e52a52618a8054401431123"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.11"
+    version: "2.0.16"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -675,10 +691,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_volume_controller
-      sha256: fa4c36dfe7ef7f423704f34ab8e64e00b4a30a90aa6e56f251e9dba649efcd7f
+      sha256: "15f2c25bc4632ac5e8d42a208fe07c3224a4ee66b155d1ac86945b3db2bb58d9"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.3.2"
+    version: "1.3.3"
   flutter_web_plugins:
     dependency: transitive
     description: flutter
@@ -688,10 +704,10 @@ packages:
     dependency: transitive
     description:
       name: fluttertoast
-      sha256: "95f349437aeebe524ef7d6c9bde3e6b4772717cf46a0eb6a3ceaddc740b297cc"
+      sha256: "24467dc20bbe49fd63e57d8e190798c4d22cbbdac30e54209d153a15273721d1"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "8.2.8"
+    version: "8.2.10"
   font_awesome_flutter:
     dependency: "direct main"
     description:
@@ -824,10 +840,10 @@ packages:
     dependency: transitive
     description:
       name: image
-      sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d
+      sha256: "20842a5ad1555be624c314b0c0cc0566e8ece412f61e859a42efeb6d4101a26c"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.3.0"
+    version: "4.5.0"
   intl:
     dependency: transitive
     description:
@@ -840,18 +856,18 @@ packages:
     dependency: transitive
     description:
       name: io
-      sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
+      sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   js:
     dependency: transitive
     description:
       name: js
-      sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.7.1"
+    version: "0.6.7"
   json_annotation:
     dependency: transitive
     description:
@@ -920,10 +936,10 @@ packages:
     dependency: "direct main"
     description:
       name: logger
-      sha256: "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32"
+      sha256: be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.4.0"
+    version: "2.5.0"
   logging:
     dependency: transitive
     description:
@@ -944,10 +960,10 @@ packages:
     dependency: transitive
     description:
       name: mailer
-      sha256: "21fde1497c79f402cb5fa7c50abd58927d360139e492546c941ee10767684fac"
+      sha256: e907087cd00719898c493f720dd326af73b00b406ab4af8e79f15d7c5fc24035
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "6.2.0"
+    version: "6.3.0"
   marquee:
     dependency: "direct main"
     description:
@@ -983,11 +999,10 @@ packages:
   media_kit:
     dependency: "direct main"
     description:
-      path: media_kit
-      ref: main
-      resolved-ref: "374622c34451fcbdcb3c81a84311eb6f26a23fde"
-      url: "https://github.com/media-kit/media-kit.git"
-    source: git
+      name: media_kit
+      sha256: "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
     version: "1.1.11"
   media_kit_libs_android_video:
     dependency: transitive
@@ -1048,11 +1063,10 @@ packages:
   media_kit_video:
     dependency: "direct main"
     description:
-      path: media_kit_video
-      ref: main
-      resolved-ref: "374622c34451fcbdcb3c81a84311eb6f26a23fde"
-      url: "https://github.com/media-kit/media-kit.git"
-    source: git
+      name: media_kit_video
+      sha256: "2cc3b966679963ba25a4ce5b771e532a521ebde7c6aa20e9802bec95d9916c8f"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
     version: "1.2.5"
   meta:
     dependency: transitive
@@ -1099,26 +1113,26 @@ packages:
     dependency: transitive
     description:
       name: package_config
-      sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
+      sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   package_info_plus:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: df3eb3e0aed5c1107bb0fdb80a8e82e778114958b1c5ac5644fb1ac9cae8a998
+      sha256: "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "8.1.0"
+    version: "8.1.2"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
       name: package_info_plus_platform_interface
-      sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66
+      sha256: a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   path:
     dependency: "direct main"
     description:
@@ -1147,18 +1161,18 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
+      sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.2.12"
+    version: "2.2.15"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
+      sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   path_provider_linux:
     dependency: transitive
     description:
@@ -1211,10 +1225,10 @@ packages:
     dependency: transitive
     description:
       name: permission_handler_html
-      sha256: af26edbbb1f2674af65a8f4b56e1a6f526156bc273d0e65dd8075fab51c78851
+      sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.3+2"
+    version: "0.1.3+5"
   permission_handler_platform_interface:
     dependency: transitive
     description:
@@ -1271,6 +1285,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.5.1"
+  posix:
+    dependency: transitive
+    description:
+      name: posix
+      sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "6.0.1"
   protobuf:
     dependency: "direct main"
     description:
@@ -1283,10 +1305,10 @@ packages:
     dependency: transitive
     description:
       name: pub_semver
-      sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
+      sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   pubspec_parse:
     dependency: transitive
     description:
@@ -1331,26 +1353,26 @@ packages:
     dependency: transitive
     description:
       name: safe_local_storage
-      sha256: e9a21b6fec7a8aa62cc2585ff4c1b127df42f3185adbd2aca66b47abe2e80236
+      sha256: ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.1"
+    version: "1.0.2"
   saver_gallery:
     dependency: "direct main"
     description:
       name: saver_gallery
-      sha256: "35f838453cbf17d4b710d0783ced0d2c9aeb79a607f290684b9c3c798c22beb8"
+      sha256: bf59475e50b73d666630bed7a5fdb621fed92d637f64e3c61ce81653ec6a833c
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.0.10"
+    version: "4.0.1"
   screen_brightness:
-    dependency: "direct main"
+    dependency: "direct overridden"
     description:
       name: screen_brightness
-      sha256: a43fdbccd5b90044f68057412dde7715cd7499a4c24f5d5da7e01ed4cf41e0af
+      sha256: a9a98666045ad4ea0d82bca09fe5f007b8440e315075dc948c1507a9b72ee41f
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.0+2"
+    version: "2.0.1"
   screen_brightness_android:
     dependency: transitive
     description:
@@ -1387,10 +1409,10 @@ packages:
     dependency: transitive
     description:
       name: screen_brightness_windows
-      sha256: fa97ae838c42f762f04d2d70adb3d957350d6a84e3598ec800e269e7c466eedd
+      sha256: "5edbfb1dcaedf960f6858efac8ca45d6c18faae17df86e2c03137d3a563ea155"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   scrollable_positioned_list:
     dependency: "direct main"
     description:
@@ -1403,26 +1425,26 @@ packages:
     dependency: transitive
     description:
       name: sentry
-      sha256: "033287044a6644a93498969449d57c37907e56f5cedb17b88a3ff20a882261dd"
+      sha256: "0c2bb3c23c074130f60b2f6ee0851bd3714021758ac86df87fdd7cde6783feff"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "8.9.0"
+    version: "8.11.0"
   share_plus:
     dependency: "direct main"
     description:
       name: share_plus
-      sha256: "3af2cda1752e5c24f2fc04b6083b40f013ffe84fb90472f30c6499a9213d5442"
+      sha256: "6327c3f233729374d0abaafd61f6846115b2a481b4feddd8534211dc10659400"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "10.1.1"
+    version: "10.1.3"
   share_plus_platform_interface:
     dependency: transitive
     description:
       name: share_plus_platform_interface
-      sha256: c57c0bbfec7142e3a0f55633be504b796af72e60e3c791b44d5a017b985f7a48
+      sha256: cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "5.0.1"
+    version: "5.0.2"
   shelf:
     dependency: transitive
     description:
@@ -1435,10 +1457,10 @@ packages:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
+      sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -1480,10 +1502,10 @@ packages:
     dependency: transitive
     description:
       name: sqflite
-      sha256: "79a297dc3cc137e758c6a4baf83342b039e5a6d2436fcdf3f96a00adaaf2ad62"
+      sha256: "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   sqflite_android:
     dependency: transitive
     description:
@@ -1496,18 +1518,18 @@ packages:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: "4468b24876d673418a7b7147e5a08a715b4998a7ae69227acafaab762e0e5490"
+      sha256: "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.5.4+5"
+    version: "2.5.4+6"
   sqflite_darwin:
     dependency: transitive
     description:
       name: sqflite_darwin
-      sha256: "769733dddf94622d5541c73e4ddc6aa7b252d865285914b6fcd54a63c4b4f027"
+      sha256: "96a698e2bc82bd770a4d6aab00b42396a7c63d9e33513a56945cbccb594c2474"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.4.1-1"
+    version: "2.4.1"
   sqflite_platform_interface:
     dependency: transitive
     description:
@@ -1592,10 +1614,10 @@ packages:
     dependency: transitive
     description:
       name: timing
-      sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
+      sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
   typed_data:
     dependency: transitive
     description:
@@ -1624,10 +1646,10 @@ packages:
     dependency: transitive
     description:
       name: uri_parser
-      sha256: ff4d2c720aca3f4f7d5445e23b11b2d15ef8af5ddce5164643f38ff962dcb270
+      sha256: "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.0.0"
+    version: "2.0.2"
   url_launcher:
     dependency: "direct main"
     description:
@@ -1648,26 +1670,26 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e
+      sha256: "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "6.3.1"
+    version: "6.3.2"
   url_launcher_linux:
     dependency: transitive
     description:
       name: url_launcher_linux
-      sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af
+      sha256: "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.2.0"
+    version: "3.2.1"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672"
+      sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.2.1"
+    version: "3.2.2"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -1704,10 +1726,10 @@ packages:
     dependency: transitive
     description:
       name: vector_graphics
-      sha256: "0b9149c6ddb013818075b072b9ddc1b89a5122fff1275d4648d297086b46c4f0"
+      sha256: "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.12"
+    version: "1.1.15"
   vector_graphics_codec:
     dependency: transitive
     description:
@@ -1720,10 +1742,10 @@ packages:
     dependency: transitive
     description:
       name: vector_graphics_compiler
-      sha256: f3b9b6e4591c11394d4be4806c63e72d3a41778547b2c1e2a8a04fadcfd7d173
+      sha256: "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.12"
+    version: "1.1.16"
   vector_math:
     dependency: transitive
     description:
@@ -1784,10 +1806,10 @@ packages:
     dependency: "direct main"
     description:
       name: waterfall_flow
-      sha256: "11538b0d890458e55e6248b177732495d20893cfc7e85d7e8dbf4fdce61c9f10"
+      sha256: "8932d290186ab81459d1bae4ee8583739c0f4cdf62d828e71da361a340584b36"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.0.3"
+    version: "3.1.0"
   web:
     dependency: transitive
     description:
@@ -1832,10 +1854,10 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: "74693a212d990b32e0b7055d27db973a18abf31c53942063948cdfaaef9787ba"
+      sha256: "3d535126f7244871542b2f0b0fcf94629c9a14883250461f9abe1a6644c1c379"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.0.0"
+    version: "4.2.0"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
@@ -1848,18 +1870,18 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: d4034901d96357beb1b6717ebf7d583c88e40cfc6eb85fe76dd1bf0979a9f251
+      sha256: b7e92f129482460951d96ef9a46b49db34bd2e1621685de26e9eaafd9674e7eb
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.16.0"
+    version: "3.16.3"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: "84ba388638ed7a8cb3445a320c8273136ab2631cd5f2c57888335504ddab1bc2"
+      sha256: "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "5.8.0"
+    version: "5.9.0"
   win32_registry:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index b7249511b..e551a10fc 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.22-beta.12+1743
+version: 1.0.23+114514
 
 environment:
   sdk: ">=2.19.6 <3.0.0"
@@ -50,7 +50,7 @@ dependencies:
   # 图片
   cached_network_image: ^3.4.1
   extended_image: ^8.2.0
-  saver_gallery: ^3.0.1
+  saver_gallery: ^4.0.0
 
   # QRCode
   qr_flutter: ^4.1.0
@@ -89,25 +89,27 @@ dependencies:
   encrypt: ^5.0.3
 
   # 视频播放器
-  media_kit:
-    git:
-      url: https://github.com/media-kit/media-kit.git
-      ref: main
-      path: media_kit
-  media_kit_video:
-    git:
-      url: https://github.com/media-kit/media-kit.git
-      ref: main
-      path: media_kit_video
+  media_kit: ^1.1.11
+#    git:
+#      url: https://github.com/media-kit/media-kit.git
+#      ref: main
+#      path: media_kit
+  media_kit_video: ^1.2.5
+#    git:
+#      url: https://github.com/media-kit/media-kit.git
+#      ref: main
+#      path: media_kit_video
   media_kit_libs_video: ^1.0.5
-
+#    git:
+#      url: https://github.com/media-kit/media-kit.git
+#      ref: main
+#      path: libs/universal/media_kit_libs_video
   # 媒体通知
   audio_service: ^0.18.15
   audio_session: ^0.1.21
 
   # 音量、亮度、屏幕控制
-  flutter_volume_controller: ^1.3.1
-  screen_brightness: ^2.0.0+2
+  flutter_volume_controller: ^1.3.3
   wakelock_plus: ^1.2.8
   universal_platform: ^1.0.0+1
   auto_orientation:
@@ -140,6 +142,13 @@ dependencies:
   status_bar_control: ^3.2.1
   # 代理
   system_proxy: ^0.1.0
+  # 应用内悬浮窗
+  flutter_floating: ^1.0.8
+  # 安卓全局悬浮窗
+#  android_window:
+#    git:
+#      url: https://github.com/orz12/flutter-android-window.git
+#      ref: main
   # pip
   fl_pip: ^3.2.0
   # html解析
@@ -160,21 +169,27 @@ dependencies:
   marquee: ^2.2.3
   #富文本
   extended_text: ^14.0.1
+  # 调色板
+  flex_seed_scheme: ^3.4.1
+#  android_window: ^0.4.0
 dependency_overrides:
   mime:
     git: https://github.com/orz12/mime.git
   fading_edge_scrollview: ^4.1.1
   rxdart: ^0.28.0
-  media_kit:
-    git:
-      url: https://github.com/media-kit/media-kit.git
-      ref: main
-      path: media_kit
+  screen_brightness: ^2.0.1
+#  media_kit:
+#    git:
+#      url: https://github.com/media-kit/media-kit.git
+#      ref: main
+#      path: media_kit
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
 
+#  pigeon: ^22.6.1
+
   # The "flutter_lints" package below contains a set of recommended lints to
   # encourage good coding practices. The lint set provided by the package is
   # activated in the `analysis_options.yaml` file located at the root of your