mod: read schame补充

Feature custom bottom control

.github/workflows/beta_ci.yml

@@ -0,0 +1,208 @@
+name: Pilipala Beta
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - "main"
+    paths-ignore:
+      - "**.md"
+      - "**.txt"
+      - ".github/**"
+      - ".idea/**"
+      - "!.github/workflows/**"
+
+jobs:
+  update_version:
+    name: Read and update version
+    runs-on: ubuntu-latest
+
+    outputs:
+      # 定义输出变量 version，以便在其他job中引用
+      new_version: ${{ steps.version.outputs.new_version }}
+      last_commit: ${{ steps.get-last-commit.outputs.last_commit }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref_name }}
+          fetch-depth: 0
+
+      - name: 获取first parent commit次数
+        id: get-first-parent-commit-count
+        run: |
+          version=$(yq e .version pubspec.yaml | cut -d "+" -f 1)
+          recent_release_tag=$(git tag -l | grep $version | egrep -v "[-|+]" || true)
+          if [[ "x$recent_release_tag" == "x" ]]; then
+            echo "当前版本tag不存在，请手动生成tag."
+            exit 1
+          fi
+          git log --oneline --first-parent $recent_release_tag..HEAD
+          first_parent_commit_count=$(git rev-list --first-parent --count $recent_release_tag..HEAD)
+          echo "count=$first_parent_commit_count" >> $GITHUB_OUTPUT
+
+      - name: 获取最后一次提交
+        id: get-last-commit
+        run: |
+          last_commit=$(git log -1 --pretty="%h %s" --first-parent)
+          echo "last_commit=$last_commit" >> $GITHUB_OUTPUT
+
+      - name: 更新版本号
+        id: version
+        run: |
+          # 读取版本号
+          VERSION=$(yq e .version pubspec.yaml | cut -d "+" -f 1)
+
+          # 获取GitHub Actions的run_number
+          #RUN_NUMBER=${{ github.run_number }}
+
+          # 构建新版本号
+          NEW_VERSION=$VERSION-beta.${{ steps.get-first-parent-commit-count.outputs.count }}
+
+          # 输出新版本号
+          echo "New version: $NEW_VERSION"
+
+          # 设置新版本号为输出变量
+          echo "new_version=$NEW_VERSION" >>$GITHUB_OUTPUT
+
+  android:
+    name: Build CI (Android)
+    needs: update_version
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref_name }}
+
+      - name: 构建Java环境
+        uses: actions/setup-java@v3
+        with:
+          distribution: "zulu"
+          java-version: "17"
+          token: ${{secrets.GIT_TOKEN}}
+
+      - name: 检查缓存
+        uses: actions/cache@v2
+        id: cache-flutter
+        with:
+          path: /root/flutter-sdk
+          key: ${{ runner.os }}-flutter-${{ hashFiles('**/pubspec.lock') }}
+
+      - name: 安装Flutter
+        if: steps.cache-flutter.outputs.cache-hit != 'true'
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: 3.16.5
+          channel: any
+
+      - name: 下载项目依赖
+        run: flutter pub get
+
+      - name: 解码生成 jks
+        run: echo $KEYSTORE_BASE64 | base64 -di > android/app/vvex.jks
+        env:
+          KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
+
+      - name: 更新版本号
+        id: version
+        run: |
+          # 更新pubspec.yaml文件中的版本号
+          sed -i "s/version: .*+/version: ${{ needs.update_version.outputs.new_version }}+/g" pubspec.yaml
+
+      - name: flutter build apk
+        run: flutter build apk --release --split-per-abi
+        env:
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD}}
+
+      - name: 重命名应用
+        run: |
+          for file in build/app/outputs/flutter-apk/app-*.apk; do
+            if [[ $file =~ app-(.?*)release.apk ]]; then
+              new_file_name="build/app/outputs/flutter-apk/Pili-${BASH_REMATCH[1]}v${{ needs.update_version.outputs.new_version }}.apk"
+              mv "$file" "$new_file_name"
+            fi
+          done
+
+      - name: 上传
+        uses: actions/upload-artifact@v3
+        with:
+          name: Pilipala-Beta
+          path: |
+            build/app/outputs/flutter-apk/Pili-*.apk
+
+  iOS:
+    name: Build CI (iOS)
+    needs: update_version
+    runs-on: macos-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref_name }}
+
+      - name: 安装Flutter
+        if: steps.cache-flutter.outputs.cache-hit != 'true'
+        uses: subosito/flutter-action@v2.10.0
+        with:
+          cache: true
+          flutter-version: 3.16.5
+
+      - name: 更新版本号
+        id: version
+        run: |
+          # 更新pubspec.yaml文件中的版本号
+          sed -i "" "s/version: .*+/version: ${{ needs.update_version.outputs.new_version }}+/g" pubspec.yaml
+
+      - name: flutter build ipa
+        run: |
+          flutter build ios --release --no-codesign 
+          ln -sf ./build/ios/iphoneos Payload
+          zip -r9 app.ipa Payload/runner.app
+
+      - name: 重命名应用
+        run: |
+          DATE=${{ steps.date.outputs.date }}
+          for file in app.ipa; do
+            new_file_name="build/Pili-v${{ needs.update_version.outputs.new_version }}.ipa"
+            mv "$file" "$new_file_name"
+          done
+
+      - name: 上传
+        uses: actions/upload-artifact@v3
+        with:
+          if-no-files-found: error
+          name: Pilipala-Beta
+          path: |
+            build/Pili-*.ipa
+
+  upload:
+    runs-on: ubuntu-latest
+
+    needs:
+      - update_version
+      - android
+      - iOS
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: Pilipala-Beta
+          path: ./Pilipala-Beta
+
+      - name: 发送到Telegram频道
+        uses: xireiki/channel-post@v1.0.7
+        with:
+          bot_token: ${{ secrets.BOT_TOKEN }}
+          chat_id: ${{ secrets.CHAT_ID }}
+          large_file: true
+          api_id: ${{ secrets.TELEGRAM_API_ID }}
+          api_hash: ${{ secrets.TELEGRAM_API_HASH }}
+          method: sendFile
+          path: Pilipala-Beta/*
+          parse_mode: Markdown
+          context: "*Beta版本: v${{ needs.update_version.outputs.new_version }}*\n更新内容: [${{ needs.update_version.outputs.last_commit }}](${{ github.event.head_commit.url }})"

android/app/src/main/AndroidManifest.xml

@@ -223,6 +223,10 @@
                     android:pathPattern="/mobile/video/.*" />
                 <data android:scheme="https" android:host="www.bilibili.com"
                     android:pathPattern="/mobile/video/.*" />
+                <data android:scheme="https" android:host="b23.tv"
+                    android:pathPattern="/*" />
+                <data android:scheme="https" android:host="space.bilibili.com"
+                    android:pathPattern="/*" />
 
             </intent-filter>
         </activity>

assets/images/video/danmu_close.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" data-pointer="none" viewBox="0 0 24 24"><path fill-rule="evenodd" d="m8.085 4.891-.999-1.499a1.008 1.008 0 0 1 1.679-1.118l1.709 2.566c.54-.008 1.045-.012 1.515-.012h.13c.345 0 .707.003 1.088.007l1.862-2.59a1.008 1.008 0 0 1 1.637 1.177l-1.049 1.46c.788.02 1.631.046 2.53.078 1.958.069 3.468 1.6 3.74 3.507.088.613.13 2.158.16 3.276l.001.027c.01.333.017.63.025.856a.987.987 0 0 1-1.974.069c-.008-.23-.016-.539-.025-.881v-.002c-.028-1.103-.066-2.541-.142-3.065-.143-1.004-.895-1.78-1.854-1.813-2.444-.087-4.466-.13-6.064-.131-1.598 0-3.619.044-6.063.13a2.037 2.037 0 0 0-1.945 1.748c-.15 1.04-.225 2.341-.225 3.904 0 1.874.11 3.474.325 4.798.154.949.95 1.66 1.91 1.708a97.58 97.58 0 0 0 5.416.139.988.988 0 0 1 0 1.975c-2.196 0-3.61-.047-5.513-.141A4.012 4.012 0 0 1 2.197 17.7c-.236-1.446-.351-3.151-.351-5.116 0-1.64.08-3.035.245-4.184A4.013 4.013 0 0 1 5.92 4.96c.761-.027 1.483-.05 2.164-.069Zm4.436 4.707h-1.32v4.63h2.222v.848h-2.618v1.078h2.431a5.01 5.01 0 0 1 3.575-3.115V9.598h-1.276a8.59 8.59 0 0 0 .748-1.42l-1.089-.384a14.232 14.232 0 0 1-.814 1.804h-1.518l.693-.308a8.862 8.862 0 0 0-.814-1.408l-1.045.352c.297.396.572.847.825 1.364Zm-4.18 3.564.154-1.485h1.98V8.289h-3.2v.979h2.067v1.43H7.483l-.308 3.454h2.277c0 1.166-.044 1.925-.12 2.277-.078.352-.386.528-.936.528-.308 0-.616-.022-.902-.055l.297 1.067.062.004c.285.02.551.04.818.04 1.001-.066 1.562-.418 1.694-1.056.11-.638.176-1.903.176-3.795h-2.2Zm7.458.11v-.858h-1.254v.858H15.8Zm-2.376-.858v.858h-1.199v-.858h1.2Zm-1.199-.946h1.2v-.902h-1.2v.902Zm2.321 0v-.902H15.8v.902h-1.254Zm3.517 10.594a4 4 0 1 0 0-8 4 4 0 0 0 0 8Zm-.002-1.502a2.5 2.5 0 0 1-2.217-3.657l3.326 3.398a2.49 2.49 0 0 1-1.109.259Zm2.5-2.5c0 .42-.103.815-.286 1.162l-3.328-3.401a2.5 2.5 0 0 1 3.614 2.239Z" clip-rule="evenodd"></path></svg>

assets/images/video/danmu_open.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" data-pointer="none" viewBox="0 0 24 24" id="svgcontent" overflow="visible" width="24" height="24" x="597" y="286"><g class="layer" style="pointer-events:all"><title style="pointer-events:inherit">Layer 1</title><path fill-rule="evenodd" d="M11.99,4.83C11.52,4.83 11.01,4.83 10.47,4.84L8.76,2.27A1.01,1.01 0 0 0 7.09,3.39L8.08,4.89C7.4,4.91 6.68,4.93 5.92,4.96A4.01,4.01 0 0 0 2.09,8.4C1.93,9.55 1.85,10.94 1.85,12.58C1.85,14.55 1.96,16.25 2.2,17.7A4.01,4.01 0 0 0 5.96,21.06L6.86,21.11C8.07,21.17 8.67,21.2 10.47,21.2A0.99,0.99 0 0 0 10.47,19.23C8.71,19.23 8.13,19.2 6.97,19.14L6.06,19.09A2.04,2.04 0 0 1 4.15,17.38C3.93,16.06 3.82,14.46 3.82,12.58C3.82,11.02 3.9,9.72 4.05,8.68C4.19,7.7 5.01,6.97 5.99,6.93C8.43,6.85 10.46,6.8 12.05,6.8C13.65,6.8 15.67,6.85 18.12,6.93C19.08,6.97 19.83,7.74 19.97,8.75C20.05,9.27 20.09,10.71 20.11,11.81L20.11,11.81C20.12,12.16 20.13,12.46 20.14,12.69A0.99,0.99 0 1 0 22.11,12.63C22.1,12.4 22.1,12.1 22.09,11.77L22.09,11.74C22.06,10.62 22.01,9.08 21.93,8.47C21.65,6.56 20.14,5.03 18.19,4.96C17.29,4.93 16.44,4.9 15.66,4.88L16.71,3.42A1.01,1.01 0 0 0 15.07,2.24L13.21,4.83C12.83,4.83 12.46,4.83 12.12,4.83L11.99,4.83zM12.51,9.6L11.19,9.6L11.19,14.23L13.41,14.23L13.41,15.08L10.79,15.08L10.79,16.16L13.41,16.16L13.42,16.84C13.78,16.86 14.13,17 14.43,17.24L14.54,17.24L14.54,16.16L17.23,16.16L17.23,15.08L14.53,15.08L14.53,14.23L16.8,14.23L16.8,9.6L15.52,9.6A8.59,8.59 0 0 0 16.27,8.18L15.18,7.8A14.23,14.23 0 0 1 14.37,9.6L12.85,9.6L13.54,9.3A8.86,8.86 0 0 0 12.73,7.89L11.68,8.24C11.98,8.64 12.26,9.09 12.51,9.6zM8.33,13.17L8.48,11.68L10.46,11.68L10.46,8.29L7.26,8.29L7.26,9.27L9.33,9.27L9.33,10.7L7.47,10.7L7.16,14.16L9.44,14.16C9.44,15.32 9.4,16.08 9.32,16.43C9.24,16.79 8.94,16.96 8.39,16.96C8.08,16.96 7.77,16.94 7.48,16.91L7.78,17.97L7.84,17.98C8.13,18 8.39,18.02 8.66,18.02C9.66,17.95 10.22,17.6 10.35,16.96C10.46,16.32 10.53,15.06 10.53,13.17L8.33,13.17zM15.79,13.28L15.79,12.42L14.53,12.42L14.53,13.28L15.79,13.28zM13.41,12.42L13.41,13.28L12.21,13.28L12.21,12.42L13.41,12.42zM12.21,11.47L13.41,11.47L13.41,10.57L12.21,10.57L12.21,11.47zM14.53,11.47L14.53,10.57L15.79,10.57L15.79,11.47L14.53,11.47z" clip-rule="evenodd" id="svg_1"></path><path fill="#000000" fill-rule="evenodd" d="M22.85,14.63A1,1 0 0 0 21.43,14.7L16.34,20.41L14.13,18.13L14.03,18.04L14.02,18.04A1,1 0 0 0 12.7,19.53L15.66,22.57L15.76,22.66L15.76,22.66C16.17,22.98 16.76,22.93 17.12,22.54L22.93,16.03L23.01,15.93L23.01,15.92A1,1 0 0 0 22.85,14.63z" clip-rule="evenodd" id="svg_2"></path></g></svg>

change_log/1.0.20.0303.md

@@ -0,0 +1,31 @@
+## 1.0.20
+
+
+### 功能
++ 评论区增加表情
++ 首页渐变背景开关
++ 媒体库显示「我的订阅」
++ 评论区链接解析
++ 默认启动页设置
+
+### 修复
++ 评论区内容重复
++ pip相关问题
++ 播放多p视频评论不刷新
++ 视频评论翻页重复
+
+### 优化
++ url scheme优化
++ 图片预览放大
++ 图片加载速度
++ 视频评论区复制
++ 全屏显示视频标题
++ 网络异常处理
+
+  
+
+  
+
+
+更多更新日志可在Github上查看
+问题反馈、功能建议请查看「关于」页面。

change_log/1.0.21.0306.md

@@ -0,0 +1,9 @@
+## 1.0.21
+
+### 修复
++ 推荐视频全屏问题
++ 番剧全屏播放时灰屏问题
++ 评论回调导致页面卡死问题
+
+更多更新日志可在Github上查看
+问题反馈、功能建议请查看「关于」页面。

ios/Podfile.lock

@@ -9,6 +9,7 @@ PODS:
     - Flutter
   - connectivity_plus (0.0.1):
     - Flutter
+    - FlutterMacOS
     - ReachabilitySwift
   - device_info_plus (0.0.1):
     - Flutter
@@ -38,7 +39,7 @@ PODS:
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - permission_handler_apple (9.1.1):
+  - permission_handler_apple (9.3.0):
     - Flutter
   - ReachabilitySwift (5.0.0)
   - saver_gallery (0.0.1):
@@ -71,7 +72,7 @@ DEPENDENCIES:
   - audio_service (from `.symlinks/plugins/audio_service/ios`)
   - audio_session (from `.symlinks/plugins/audio_session/ios`)
   - auto_orientation (from `.symlinks/plugins/auto_orientation/ios`)
-  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
+  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/darwin`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - Flutter (from `Flutter`)
   - flutter_mailer (from `.symlinks/plugins/flutter_mailer/ios`)
@@ -113,7 +114,7 @@ EXTERNAL SOURCES:
   auto_orientation:
     :path: ".symlinks/plugins/auto_orientation/ios"
   connectivity_plus:
-    :path: ".symlinks/plugins/connectivity_plus/ios"
+    :path: ".symlinks/plugins/connectivity_plus/darwin"
   device_info_plus:
     :path: ".symlinks/plugins/device_info_plus/ios"
   Flutter:
@@ -166,7 +167,7 @@ SPEC CHECKSUMS:
   audio_service: f509d65da41b9521a61f1c404dd58651f265a567
   audio_session: 4f3e461722055d21515cf3261b64c973c062f345
   auto_orientation: 102ed811a5938d52c86520ddd7ecd3a126b5d39d
-  connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
+  connectivity_plus: e2dad488011aeb593e219360e804c43cc1af5770
   device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_mailer: 2ef5a67087bc8c6c4cefd04a178bf1ae2c94cd83
@@ -180,7 +181,7 @@ SPEC CHECKSUMS:
   media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
   package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
-  permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
+  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
   saver_gallery: 2b4e584106fde2407ab51560f3851564963e6b78
   screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
@@ -193,7 +194,7 @@ SPEC CHECKSUMS:
   volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
   wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
   webview_cookie_manager: eaf920722b493bd0f7611b5484771ca53fed03f7
-  webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a
+  webview_flutter_wkwebview: 4f3e50f7273d31e5500066ed267e3ae4309c5ae4
 
 PODFILE CHECKSUM: 637cd290bed23275b5f5ffcc7eb1e73d0a5fb2be
 

lib/common/widgets/network_img_layer.dart

@@ -36,7 +36,7 @@ class NetworkImgLayer extends StatelessWidget {
     final int defaultImgQuality = GlobalData().imgQuality;
     final String imageUrl =
         '${src!.startsWith('//') ? 'https:${src!}' : src!}@${quality ?? defaultImgQuality}q.webp';
-    print(imageUrl);
+    // print(imageUrl);
     int? memCacheWidth, memCacheHeight;
     double aspectRatio = (width / height).toDouble();
 

lib/common/widgets/video_card_h.dart

@@ -38,6 +38,10 @@ class VideoCardH extends StatelessWidget {
   Widget build(BuildContext context) {
     final int aid = videoItem.aid;
     final String bvid = videoItem.bvid;
+    String type = 'video';
+    try {
+      type = videoItem.type;
+    } catch (_) {}
     final String heroTag = Utils.makeHeroTag(aid);
     return GestureDetector(
       onLongPress: () {
@@ -53,6 +57,10 @@ class VideoCardH extends StatelessWidget {
       child: InkWell(
         onTap: () async {
           try {
+            if (type == 'ketang') {
+              SmartDialog.showToast('课堂视频暂不支持播放');
+              return;
+            }
             final int cid =
                 videoItem.cid ?? await SearchHttp.ab2c(aid: aid, bvid: bvid);
             Get.toNamed('/video?bvid=$bvid&cid=$cid',
@@ -95,12 +103,20 @@ class VideoCardH extends StatelessWidget {
                                   height: maxHeight,
                                 ),
                               ),
-                              PBadge(
+                              if (videoItem.duration != 0)
-                                text: Utils.timeFormat(videoItem.duration!),
+                                PBadge(
-                                right: 6.0,
+                                  text: Utils.timeFormat(videoItem.duration!),
-                                bottom: 6.0,
+                                  right: 6.0,
-                                type: 'gray',
+                                  bottom: 6.0,
-                              ),
+                                  type: 'gray',
+                                ),
+                              if (type != 'video')
+                                PBadge(
+                                  text: type,
+                                  left: 6.0,
+                                  bottom: 6.0,
+                                  type: 'primary',
+                                ),
                               // if (videoItem.rcmdReason != null &&
                               //     videoItem.rcmdReason.content != '')
                               //   pBadge(videoItem.rcmdReason.content, context,

lib/common/widgets/video_card_v.dart

@@ -231,6 +231,7 @@ class VideoContent extends StatelessWidget {
               const SizedBox(height: 2),
               VideoStat(
                 videoItem: videoItem,
+                crossAxisCount: crossAxisCount,
               ),
             ],
             if (crossAxisCount == 1) const SizedBox(height: 4),
@@ -294,6 +295,7 @@ class VideoContent extends StatelessWidget {
                   ),
                   VideoStat(
                     videoItem: videoItem,
+                    crossAxisCount: crossAxisCount,
                   ),
                   const Spacer(),
                 ],
@@ -317,10 +319,12 @@ class VideoContent extends StatelessWidget {
 
 class VideoStat extends StatelessWidget {
   final dynamic videoItem;
+  final int crossAxisCount;
 
   const VideoStat({
     Key? key,
     required this.videoItem,
+    required this.crossAxisCount,
   }) : super(key: key);
 
   @override
@@ -337,7 +341,7 @@ class VideoStat extends StatelessWidget {
           danmu: videoItem.stat.danmu,
         ),
         if (videoItem is RecVideoItemModel) ...<Widget>[
-          const Spacer(),
+          crossAxisCount > 1 ? const Spacer() : const SizedBox(width: 8),
           RichText(
             maxLines: 1,
             text: TextSpan(

lib/http/api.dart

@@ -499,4 +499,8 @@ class Api {
 
   /// 发送私信
   static const String sendMsg = '${HttpString.tUrl}/web_im/v1/web_im/send_msg';
+
+  /// 排行榜
+  static const String getRankApi = "/x/web-interface/ranking/v2";
+
 }

lib/http/interceptor.dart

@@ -45,10 +45,13 @@ class ApiInterceptor extends Interceptor {
   void onError(DioException err, ErrorInterceptorHandler handler) async {
     // 处理网络请求错误
     // handler.next(err);
-    SmartDialog.showToast(
+    String url = err.requestOptions.uri.toString();
-      await dioError(err),
+    if (!url.contains('heartBeat')) {
-      displayType: SmartToastType.onlyRefresh,
+      SmartDialog.showToast(
-    );
+        await dioError(err),
+        displayType: SmartToastType.onlyRefresh,
+      );
+    }
     super.onError(err, handler);
   }
 
@@ -75,23 +78,24 @@ class ApiInterceptor extends Interceptor {
   }
 
   static Future<String> checkConnect() async {
-    final ConnectivityResult connectivityResult =
+    final List<ConnectivityResult> connectivityResult =
         await Connectivity().checkConnectivity();
-    switch (connectivityResult) {
+    if (connectivityResult.contains(ConnectivityResult.mobile)) {
-      case ConnectivityResult.mobile:
+      return '正在使用移动流量';
-        return '正在使用移动流量';
+    } else if (connectivityResult.contains(ConnectivityResult.wifi)) {
-      case ConnectivityResult.wifi:
+      return '正在使用wifi';
-        return '正在使用wifi';
+    } else if (connectivityResult.contains(ConnectivityResult.ethernet)) {
-      case ConnectivityResult.ethernet:
+      return '正在使用局域网';
-        return '正在使用局域网';
+    } else if (connectivityResult.contains(ConnectivityResult.vpn)) {
-      case ConnectivityResult.vpn:
+      return '正在使用代理网络';
-        return '正在使用代理网络';
+    } else if (connectivityResult.contains(ConnectivityResult.bluetooth)) {
-      case ConnectivityResult.other:
+      return '正在使用蓝牙网络';
-        return '正在使用其他网络';
+    } else if (connectivityResult.contains(ConnectivityResult.other)) {
-      case ConnectivityResult.none:
+      return '正在使用其他网络';
-        return '未连接到任何网络';
+    } else if (connectivityResult.contains(ConnectivityResult.none)) {
-      default:
+      return '未连接到任何网络';
-        return '';
+    } else {
+      return '';
     }
   }
 }

lib/http/msg.dart

@@ -31,14 +31,14 @@ class MsgHttp {
       } catch (err) {
         return {
           'status': false,
-          'date': [],
+          'data': [],
           'msg': err.toString(),
         };
       }
     } else {
       return {
         'status': false,
-        'date': [],
+        'data': [],
         'msg': res.data['message'],
       };
     }

lib/http/video.dart

@@ -475,4 +475,27 @@ class VideoHttp {
       return {'status': false, 'data': []};
     }
   }
+
+  // 视频排行
+  static Future getRankVideoList(int rid) async {
+    try {
+      var rankApi = "${Api.getRankApi}?rid=$rid&type=all";
+      var res = await Request().get(rankApi);
+      if (res.data['code'] == 0) {
+        List<HotVideoItemModel> list = [];
+        List<int> blackMidsList =
+            setting.get(SettingBoxKey.blackMidsList, defaultValue: [-1]);
+        for (var i in res.data['data']['list']) {
+          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']};
+      }
+    } catch (err) {
+      return {'status': false, 'data': [], 'msg': err};
+    }
+  }
 }

lib/main.dart

@@ -16,6 +16,7 @@ import 'package:pilipala/pages/search/index.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/router/app_pages.dart';
 import 'package:pilipala/pages/main/view.dart';
+import 'package:pilipala/services/disable_battery_opt.dart';
 import 'package:pilipala/services/service_locator.dart';
 import 'package:pilipala/utils/app_scheme.dart';
 import 'package:pilipala/utils/data.dart';
@@ -71,6 +72,7 @@ void main() async {
     ));
     Data.init();
     PiliSchame.init();
+    DisableBatteryOpt();
   });
 }
 

lib/models/common/dynamics_type.dart

@@ -7,5 +7,5 @@ enum DynamicsType {
 
 extension BusinessTypeExtension on DynamicsType {
   String get values => ['all', 'video', 'pgc', 'article'][index];
-  String get labels => ['全部', '视频', '追番', '专栏'][index];
+  String get labels => ['全部', '投稿', '番剧', '专栏'][index];
 }

lib/models/common/gesture_mode.dart

@@ -0,0 +1,12 @@
+enum FullScreenGestureMode {
+  /// 从上滑到下
+  fromToptoBottom,
+
+  /// 从下滑到上
+  fromBottomtoTop,
+}
+
+extension FullScreenGestureModeExtension on FullScreenGestureMode {
+  String get values => ['fromToptoBottom', 'fromBottomtoTop'][index];
+  String get labels => ['从上往下滑进入全屏', '从下往上滑进入全屏'][index];
+}

lib/models/common/index.dart

@@ -0,0 +1,4 @@
+library commonn_model;
+
+export './business_type.dart';
+export './gesture_mode.dart';

lib/models/common/nav_bar_config.dart

@@ -0,0 +1,56 @@
+import 'package:flutter/material.dart';
+
+List defaultNavigationBars = [
+  {
+    'id': 0,
+    'icon': const Icon(
+      Icons.home_outlined,
+      size: 21,
+    ),
+    'selectIcon': const Icon(
+      Icons.home,
+      size: 21,
+    ),
+    'label': "首页",
+    'count': 0,
+  },
+  {
+    'id': 1,
+    'icon': const Icon(
+      Icons.trending_up,
+      size: 21,
+    ),
+    'selectIcon': const Icon(
+      Icons.trending_up_outlined,
+      size: 21,
+    ),
+    'label': "排行榜",
+    'count': 0,
+  },
+  {
+    'id': 2,
+    'icon': const Icon(
+      Icons.motion_photos_on_outlined,
+      size: 21,
+    ),
+    'selectIcon': const Icon(
+      Icons.motion_photos_on,
+      size: 21,
+    ),
+    'label': "动态",
+    'count': 0,
+  },
+  {
+    'id': 3,
+    'icon': const Icon(
+      Icons.video_collection_outlined,
+      size: 20,
+    ),
+    'selectIcon': const Icon(
+      Icons.video_collection,
+      size: 21,
+    ),
+    'label': "媒体库",
+    'count': 0,
+  }
+];

lib/models/common/rank_type.dart

@@ -0,0 +1,240 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/pages/rank/zone/index.dart';
+
+enum RandType {
+  all,
+  creation,
+  animation,
+  music,
+  dance,
+  game,
+  knowledge,
+  technology,
+  sport,
+  car,
+  life,
+  food,
+  animal,
+  madness,
+  fashion,
+  entertainment,
+  film,
+  origin,
+  rookie
+}
+
+extension RankTypeDesc on RandType {
+  String get description => [
+        '全站',
+        '国创相关',
+        '动画',
+        '音乐',
+        '舞蹈',
+        '游戏',
+        '知识',
+        '科技',
+        '运动',
+        '汽车',
+        '生活',
+        '美食',
+        '动物圈',
+        '鬼畜',
+        '时尚',
+        '娱乐',
+        '影视'
+      ][index];
+
+  String get id => [
+        'all',
+        'creation',
+        'animation',
+        'music',
+        'dance',
+        'game',
+        'knowledge',
+        'technology',
+        'sport',
+        'car',
+        'life',
+        'food',
+        'animal',
+        'madness',
+        'fashion',
+        'entertainment',
+        'film'
+      ][index];
+}
+
+List tabsConfig = [
+  {
+    'icon': const Icon(
+      Icons.live_tv_outlined,
+      size: 15,
+    ),
+    'label': '全站',
+    'type': RandType.all,
+    'ctr': Get.put<ZoneController>,
+    'page': const ZonePage(rid: 0),
+  },
+  {
+    'icon': const Icon(
+      Icons.live_tv_outlined,
+      size: 15,
+    ),
+    'label': '国创相关',
+    'type': RandType.creation,
+    'ctr': Get.put<ZoneController>,
+    'page': const ZonePage(rid: 168),
+  },
+  {
+    'icon': const Icon(
+      Icons.live_tv_outlined,
+      size: 15,
+    ),
+    'label': '动画',
+    'type': RandType.animation,
+    'ctr': Get.put<ZoneController>,
+    'page': const ZonePage(rid: 1),
+  },
+  {
+    'icon': const Icon(
+      Icons.live_tv_outlined,
+      size: 15,
+    ),
+    'label': '音乐',
+    'type': RandType.music,
+    'ctr': Get.put<ZoneController>,
+    'page': const ZonePage(rid: 3),
+  },
+  {
+    'icon': const Icon(
+      Icons.live_tv_outlined,
+      size: 15,
+    ),
+    'label': '舞蹈',
+    'type': RandType.dance,
+    'ctr': Get.put<ZoneController>,
+    'page': const ZonePage(rid: 129),
+  },
+  {
+    'icon': const Icon(
+      Icons.live_tv_outlined,
+      size: 15,
+    ),
+    'label': '游戏',
+    'type': RandType.game,
+    'ctr': Get.put<ZoneController>,
+    'page': const ZonePage(rid: 4),
+  },
+  {
+    'icon': const Icon(
+      Icons.live_tv_outlined,
+      size: 15,
+    ),
+    'label': '知识',
+    'type': RandType.knowledge,
+    'ctr': Get.put<ZoneController>,
+    'page': const ZonePage(rid: 36),
+  },
+  {
+    'icon': const Icon(
+      Icons.live_tv_outlined,
+      size: 15,
+    ),
+    'label': '科技',
+    'type': RandType.technology,
+    'ctr': Get.put<ZoneController>,
+    'page': const ZonePage(rid: 188),
+  },
+  {
+    'icon': const Icon(
+      Icons.live_tv_outlined,
+      size: 15,
+    ),
+    'label': '运动',
+    'type': RandType.sport,
+    'ctr': Get.put<ZoneController>,
+    'page': const ZonePage(rid: 234),
+  },
+  {
+    'icon': const Icon(
+      Icons.live_tv_outlined,
+      size: 15,
+    ),
+    'label': '汽车',
+    'type': RandType.car,
+    'ctr': Get.put<ZoneController>,
+    'page': const ZonePage(rid: 223),
+  },
+  {
+    'icon': const Icon(
+      Icons.live_tv_outlined,
+      size: 15,
+    ),
+    'label': '生活',
+    'type': RandType.life,
+    'ctr': Get.put<ZoneController>,
+    'page': const ZonePage(rid: 160),
+  },
+  {
+    'icon': const Icon(
+      Icons.live_tv_outlined,
+      size: 15,
+    ),
+    'label': '美食',
+    'type': RandType.food,
+    'ctr': Get.put<ZoneController>,
+    'page': const ZonePage(rid: 211),
+  },
+  {
+    'icon': const Icon(
+      Icons.live_tv_outlined,
+      size: 15,
+    ),
+    'label': '动物圈',
+    'type': RandType.animal,
+    'ctr': Get.put<ZoneController>,
+    'page': const ZonePage(rid: 217),
+  },
+  {
+    'icon': const Icon(
+      Icons.live_tv_outlined,
+      size: 15,
+    ),
+    'label': '鬼畜',
+    'type': RandType.madness,
+    'ctr': Get.put<ZoneController>,
+    'page': const ZonePage(rid: 119),
+  },
+  {
+    'icon': const Icon(
+      Icons.live_tv_outlined,
+      size: 15,
+    ),
+    'label': '时尚',
+    'type': RandType.fashion,
+    'ctr': Get.put<ZoneController>,
+    'page': const ZonePage(rid: 155),
+  },
+  {
+    'icon': const Icon(
+      Icons.live_tv_outlined,
+      size: 15,
+    ),
+    'label': '娱乐',
+    'type': RandType.entertainment,
+    'ctr': Get.put<ZoneController>,
+    'page': const ZonePage(rid: 5),
+  },
+  {
+    'icon': const Icon(
+      Icons.live_tv_outlined,
+      size: 15,
+    ),
+    'label': '影视',
+    'type': RandType.film,
+    'ctr': Get.put<ZoneController>,
+    'page': const ZonePage(rid: 181),
+  }
+];

lib/models/dynamics/up.dart

@@ -2,18 +2,28 @@ class FollowUpModel {
   FollowUpModel({
     this.liveUsers,
     this.upList,
+    this.liveList,
+    this.myInfo,
   });
 
   LiveUsers? liveUsers;
   List<UpItem>? upList;
+  List<LiveUserItem>? liveList;
+  MyInfo? myInfo;
 
   FollowUpModel.fromJson(Map<String, dynamic> json) {
     liveUsers = json['live_users'] != null
         ? LiveUsers.fromJson(json['live_users'])
         : null;
+    liveList = json['live_users'] != null
+        ? json['live_users']['items']
+            .map<LiveUserItem>((e) => LiveUserItem.fromJson(e))
+            .toList()
+        : [];
     upList = json['up_list'] != null
         ? json['up_list'].map<UpItem>((e) => UpItem.fromJson(e)).toList()
         : [];
+    myInfo = json['my_info'] != null ? MyInfo.fromJson(json['my_info']) : null;
   }
 }
 
@@ -93,3 +103,21 @@ class UpItem {
     uname = json['uname'];
   }
 }
+
+class MyInfo {
+  MyInfo({
+    this.face,
+    this.mid,
+    this.name,
+  });
+
+  String? face;
+  int? mid;
+  String? name;
+
+  MyInfo.fromJson(Map<String, dynamic> json) {
+    face = json['face'];
+    mid = json['mid'];
+    name = json['name'];
+  }
+}

lib/models/live/quality.dart

@@ -0,0 +1,43 @@
+enum LiveQuality {
+  dolby,
+  super4K,
+  origin,
+  bluRay,
+  superHD,
+  smooth,
+  flunt,
+}
+
+extension LiveQualityCode on LiveQuality {
+  static final List<int> _codeList = [
+    30000,
+    20000,
+    10000,
+    400,
+    250,
+    150,
+    80,
+  ];
+  int get code => _codeList[index];
+
+  static LiveQuality? fromCode(int code) {
+    final index = _codeList.indexOf(code);
+    if (index != -1) {
+      return LiveQuality.values[index];
+    }
+    return null;
+  }
+}
+
+extension VideoQualityDesc on LiveQuality {
+  static final List<String> _descList = [
+    '杜比',
+    '4K',
+    '原画',
+    '蓝光',
+    '超清',
+    '高清',
+    '流畅',
+  ];
+  get description => _descList[index];
+}

lib/models/search/result.dart

@@ -85,7 +85,9 @@ class SearchVideoItemModel {
     // title = json['title'].replaceAll(RegExp(r'<.*?>'), '');
     title = Em.regTitle(json['title']);
     description = json['description'];
-    pic = 'https:${json['pic']}';
+    pic = json['pic'] != null && json['pic'].startsWith('//')
+        ? 'https:${json['pic']}'
+        : json['pic'] ?? '';
     videoReview = json['video_review'];
     pubdate = json['pubdate'];
     senddate = json['senddate'];

lib/models/user/fav_folder.dart

@@ -15,7 +15,7 @@ class FavFolderData {
         ? json['list']
             .map<FavFolderItemData>((e) => FavFolderItemData.fromJson(e))
             .toList()
-        : [FavFolderItemData()];
+        : <FavFolderItemData>[];
     hasMore = json['has_more'];
   }
 }

lib/pages/about/index.dart

@@ -201,7 +201,6 @@ class _AboutPageState extends State<AboutPage> {
                 var cleanStatus = await CacheManage().clearCacheAll();
                 if (cleanStatus) {
                   getCacheSize();
-                  SmartDialog.showToast('清除成功');
                 }
               },
               title: const Text('清除缓存'),
@@ -254,12 +253,16 @@ class AboutController extends GetxController {
   // 获取远程版本
   Future getRemoteApp() async {
     var result = await Request().get(Api.latestApp, extra: {'ua': 'pc'});
+    isLoading.value = false;
+    if (result.data == null || result.data.isEmpty) {
+      SmartDialog.showToast('获取远程版本失败，请检查网络');
+      return;
+    }
     data = LatestDataModel.fromJson(result.data);
     remoteAppInfo = data;
     remoteVersion.value = data.tagName!;
     isUpdate.value =
         Utils.needUpdate(currentVersion.value, remoteVersion.value);
-    isLoading.value = false;
   }
 
   // 跳转下载/本地更新
@@ -277,7 +280,7 @@ class AboutController extends GetxController {
 
   githubRelease() {
     launchUrl(
-      Uri.parse('https://github.com/guozhigq/pilipala/release'),
+      Uri.parse('https://github.com/guozhigq/pilipala/releases'),
       mode: LaunchMode.externalApplication,
     );
   }

lib/pages/bangumi/controller.dart

@@ -7,8 +7,8 @@ import 'package:pilipala/utils/storage.dart';
 
 class BangumiController extends GetxController {
   final ScrollController scrollController = ScrollController();
-  RxList<BangumiListItemModel> bangumiList = [BangumiListItemModel()].obs;
+  RxList<BangumiListItemModel> bangumiList = <BangumiListItemModel>[].obs;
-  RxList<BangumiListItemModel> bangumiFollowList = [BangumiListItemModel()].obs;
+  RxList<BangumiListItemModel> bangumiFollowList = <BangumiListItemModel>[].obs;
   int _currentPage = 1;
   bool isLoadingMore = true;
   Box userInfoCache = GStrorage.userInfo;

lib/pages/bangumi/introduction/controller.dart

@@ -25,13 +25,6 @@ class BangumiIntroController extends GetxController {
       ? int.tryParse(Get.parameters['epId']!)
       : null;
 
-  // 是否预渲染 骨架屏
-  bool preRender = false;
-
-  // 视频详情 上个页面传入
-  Map? videoItem = {};
-  BangumiInfoModel? bangumiItem;
-
   // 请求状态
   RxBool isLoading = false.obs;
 
@@ -63,27 +56,6 @@ class BangumiIntroController extends GetxController {
   @override
   void onInit() {
     super.onInit();
-    if (Get.arguments.isNotEmpty as bool) {
-      if (Get.arguments.containsKey('bangumiItem') as bool) {
-        preRender = true;
-        bangumiItem = Get.arguments['bangumiItem'];
-        // bangumiItem!['pic'] = args.pic;
-        // if (args.title is String) {
-        //   videoItem!['title'] = args.title;
-        // } else {
-        //   String str = '';
-        //   for (Map map in args.title) {
-        //     str += map['text'];
-        //   }
-        //   videoItem!['title'] = str;
-        // }
-        // if (args.stat != null) {
-        //   videoItem!['stat'] = args.stat;
-        // }
-        // videoItem!['pubdate'] = args.pubdate;
-        // videoItem!['owner'] = args.owner;
-      }
-    }
     userInfo = userInfoCache.get('userInfoCache');
     userLogin = userInfo != null;
   }
@@ -183,20 +155,21 @@ class BangumiIntroController extends GetxController {
             actions: [
               TextButton(onPressed: () => Get.back(), child: const Text('取消')),
               TextButton(
-                  onPressed: () async {
+                onPressed: () async {
-                    var res = await VideoHttp.coinVideo(
+                  var res = await VideoHttp.coinVideo(
-                        bvid: bvid, multiply: _tempThemeValue);
+                      bvid: bvid, multiply: _tempThemeValue);
-                    if (res['status']) {
+                  if (res['status']) {
-                      SmartDialog.showToast('投币成功 👏');
+                    SmartDialog.showToast('投币成功 👏');
-                      hasCoin.value = true;
+                    hasCoin.value = true;
-                      bangumiDetail.value.stat!['coins'] =
+                    bangumiDetail.value.stat!['coins'] =
-                          bangumiDetail.value.stat!['coins'] + _tempThemeValue;
+                        bangumiDetail.value.stat!['coins'] + _tempThemeValue;
-                    } else {
+                  } else {
-                      SmartDialog.showToast(res['msg']);
+                    SmartDialog.showToast(res['msg']);
-                    }
+                  }
-                    Get.back();
+                  Get.back();
-                  },
+                },
-                  child: const Text('确定'))
+                child: const Text('确定'),
+              )
             ],
           );
         });

lib/pages/bangumi/introduction/view.dart

@@ -12,11 +12,10 @@ import 'package:pilipala/models/bangumi/info.dart';
 import 'package:pilipala/pages/bangumi/widgets/bangumi_panel.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/pages/video/detail/introduction/widgets/action_item.dart';
-import 'package:pilipala/pages/video/detail/introduction/widgets/action_row_item.dart';
 import 'package:pilipala/pages/video/detail/introduction/widgets/fav_panel.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/storage.dart';
-
+import '../../../common/widgets/http_error.dart';
 import 'controller.dart';
 import 'widgets/intro_detail.dart';
 
@@ -51,9 +50,6 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
     cid = widget.cid!;
     bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag);
     videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
-    bangumiIntroController.bangumiDetail.listen((BangumiInfoModel value) {
-      bangumiDetail = value;
-    });
     _futureBuilderFuture = bangumiIntroController.queryBangumiIntro();
     videoDetailCtr.cid.listen((int p0) {
       cid = p0;
@@ -68,27 +64,32 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
       future: _futureBuilderFuture,
       builder: (BuildContext context, AsyncSnapshot snapshot) {
         if (snapshot.connectionState == ConnectionState.done) {
+          if (snapshot.data == null) {
+            return const SliverToBoxAdapter(child: SizedBox());
+          }
           if (snapshot.data['status']) {
             // 请求成功
-
+            return Obx(
-            return BangumiInfo(
+              () => BangumiInfo(
-              loadingStatus: false,
+                bangumiDetail: bangumiIntroController.bangumiDetail.value,
-              bangumiDetail: bangumiDetail,
+                cid: cid,
-              cid: cid,
+              ),
             );
           } else {
             // 请求错误
-            // return HttpError(
+            return HttpError(
-            //   errMsg: snapshot.data['msg'],
+              errMsg: snapshot.data['msg'],
-            //   fn: () => Get.back(),
+              fn: () => Get.back(),
-            // );
+            );
-            return const SizedBox();
           }
         } else {
-          return BangumiInfo(
+          return const SliverToBoxAdapter(
-            loadingStatus: true,
+            child: SizedBox(
-            bangumiDetail: bangumiDetail,
+              height: 100,
-            cid: cid,
+              child: Center(
+                child: CircularProgressIndicator(),
+              ),
+            ),
           );
         }
       },
@@ -99,12 +100,10 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
 class BangumiInfo extends StatefulWidget {
   const BangumiInfo({
     super.key,
-    this.loadingStatus = false,
     this.bangumiDetail,
     this.cid,
   });
 
-  final bool loadingStatus;
   final BangumiInfoModel? bangumiDetail;
   final int? cid;
 
@@ -117,7 +116,6 @@ class _BangumiInfoState extends State<BangumiInfo> {
   late final BangumiIntroController bangumiIntroController;
   late final VideoDetailController videoDetailCtr;
   Box localCache = GStrorage.localCache;
-  late final BangumiInfoModel? bangumiItem;
   late double sheetHeight;
   int? cid;
   bool isProcessing = false;
@@ -136,13 +134,10 @@ class _BangumiInfoState extends State<BangumiInfo> {
     super.initState();
     bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag);
     videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
-    bangumiItem = bangumiIntroController.bangumiItem;
     sheetHeight = localCache.get('sheetHeight');
     cid = widget.cid!;
-    print('cid:  $cid');
     videoDetailCtr.cid.listen((p0) {
       cid = p0;
-      print('cid:  $cid');
       setState(() {});
     });
   }
@@ -182,207 +177,155 @@ class _BangumiInfoState extends State<BangumiInfo> {
       padding: const EdgeInsets.only(
           left: StyleString.safeSpace, right: StyleString.safeSpace, top: 20),
       sliver: SliverToBoxAdapter(
-        child: !widget.loadingStatus || bangumiItem != null
+          child: Column(
-            ? Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
-                crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Stack(
                 children: [
-                  Row(
+                  NetworkImgLayer(
-                    crossAxisAlignment: CrossAxisAlignment.start,
+                    width: 105,
-                    children: [
+                    height: 160,
-                      Stack(
+                    src: widget.bangumiDetail!.cover!,
-                        children: [
+                  ),
-                          NetworkImgLayer(
+                  PBadge(
-                            width: 105,
+                    text: '评分 ${widget.bangumiDetail!.rating!['score']!}',
-                            height: 160,
+                    top: null,
-                            src: !widget.loadingStatus
+                    right: 6,
-                                ? widget.bangumiDetail!.cover!
+                    bottom: 6,
-                                : bangumiItem!.cover!,
+                    left: null,
-                          ),
+                  ),
-                          if (bangumiItem != null &&
+                ],
-                              bangumiItem!.rating != null)
+              ),
-                            PBadge(
+              const SizedBox(width: 10),
-                              text:
+              Expanded(
-                                  '评分 ${!widget.loadingStatus ? widget.bangumiDetail!.rating!['score']! : bangumiItem!.rating!['score']!}',
+                child: InkWell(
-                              top: null,
+                  onTap: () => showIntroDetail(),
-                              right: 6,
+                  child: SizedBox(
-                              bottom: 6,
+                    height: 158,
-                              left: null,
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        Row(
+                          children: [
+                            Expanded(
+                              child: Text(
+                                widget.bangumiDetail!.title!,
+                                style: const TextStyle(
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.w500,
+                                ),
+                                maxLines: 1,
+                                overflow: TextOverflow.ellipsis,
+                              ),
                             ),
-                        ],
+                            const SizedBox(width: 20),
-                      ),
+                            SizedBox(
-                      const SizedBox(width: 10),
+                              width: 34,
-                      Expanded(
+                              height: 34,
-                        child: InkWell(
+                              child: IconButton(
-                          onTap: () => showIntroDetail(),
+                                style: ButtonStyle(
-                          child: SizedBox(
+                                  padding: MaterialStateProperty.all(
-                            height: 158,
+                                      EdgeInsets.zero),
-                            child: Column(
+                                  backgroundColor:
-                              crossAxisAlignment: CrossAxisAlignment.start,
+                                      MaterialStateProperty.resolveWith(
-                              mainAxisSize: MainAxisSize.min,
+                                          (Set<MaterialState> states) {
-                              children: [
+                                    return t.colorScheme.primaryContainer
-                                Row(
+                                        .withOpacity(0.7);
-                                  children: [
+                                  }),
-                                    Expanded(
-                                      child: Text(
-                                        !widget.loadingStatus
-                                            ? widget.bangumiDetail!.title!
-                                            : bangumiItem!.title!,
-                                        style: const TextStyle(
-                                          fontSize: 16,
-                                          fontWeight: FontWeight.w500,
-                                        ),
-                                        maxLines: 1,
-                                        overflow: TextOverflow.ellipsis,
-                                      ),
-                                    ),
-                                    const SizedBox(width: 20),
-                                    SizedBox(
-                                      width: 34,
-                                      height: 34,
-                                      child: IconButton(
-                                        style: ButtonStyle(
-                                          padding: MaterialStateProperty.all(
-                                              EdgeInsets.zero),
-                                          backgroundColor:
-                                              MaterialStateProperty.resolveWith(
-                                                  (Set<MaterialState> states) {
-                                            return t
-                                                .colorScheme.primaryContainer
-                                                .withOpacity(0.7);
-                                          }),
-                                        ),
-                                        onPressed: () =>
-                                            bangumiIntroController.bangumiAdd(),
-                                        icon: Icon(
-                                          Icons.favorite_border_rounded,
-                                          color: t.colorScheme.primary,
-                                          size: 22,
-                                        ),
-                                      ),
-                                    ),
-                                  ],
                                 ),
-                                Row(
+                                onPressed: () =>
-                                  children: [
+                                    bangumiIntroController.bangumiAdd(),
-                                    StatView(
+                                icon: Icon(
-                                      theme: 'gray',
+                                  Icons.favorite_border_rounded,
-                                      view: !widget.loadingStatus
+                                  color: t.colorScheme.primary,
-                                          ? widget.bangumiDetail!.stat!['views']
+                                  size: 22,
-                                          : bangumiItem!.stat!['views'],
-                                      size: 'medium',
-                                    ),
-                                    const SizedBox(width: 6),
-                                    StatDanMu(
-                                      theme: 'gray',
-                                      danmu: !widget.loadingStatus
-                                          ? widget
-                                              .bangumiDetail!.stat!['danmakus']
-                                          : bangumiItem!.stat!['danmakus'],
-                                      size: 'medium',
-                                    ),
-                                  ],
                                 ),
-                                const SizedBox(height: 6),
+                              ),
-                                Row(
-                                  children: [
-                                    Text(
-                                      !widget.loadingStatus
-                                          ? (widget.bangumiDetail!.areas!
-                                                  .isNotEmpty
-                                              ? widget.bangumiDetail!.areas!
-                                                  .first['name']
-                                              : '')
-                                          : (bangumiItem!.areas!.isNotEmpty
-                                              ? bangumiItem!
-                                                  .areas!.first['name']
-                                              : ''),
-                                      style: TextStyle(
-                                        fontSize: 12,
-                                        color: t.colorScheme.outline,
-                                      ),
-                                    ),
-                                    const SizedBox(width: 6),
-                                    Text(
-                                      !widget.loadingStatus
-                                          ? widget.bangumiDetail!
-                                              .publish!['pub_time_show']
-                                          : bangumiItem!
-                                              .publish!['pub_time_show'],
-                                      style: TextStyle(
-                                        fontSize: 12,
-                                        color: t.colorScheme.outline,
-                                      ),
-                                    ),
-                                  ],
-                                ),
-                                // const SizedBox(height: 4),
-                                Text(
-                                  !widget.loadingStatus
-                                      ? widget.bangumiDetail!.newEp!['desc']
-                                      : bangumiItem!.newEp!['desc'],
-                                  style: TextStyle(
-                                    fontSize: 12,
-                                    color: t.colorScheme.outline,
-                                  ),
-                                ),
-                                // const SizedBox(height: 10),
-                                const Spacer(),
-                                Text(
-                                  '简介：${!widget.loadingStatus ? widget.bangumiDetail!.evaluate! : bangumiItem!.evaluate!}',
-                                  maxLines: 3,
-                                  overflow: TextOverflow.ellipsis,
-                                  style: TextStyle(
-                                    fontSize: 13,
-                                    color: t.colorScheme.outline,
-                                  ),
-                                ),
-                              ],
                             ),
+                          ],
+                        ),
+                        Row(
+                          children: [
+                            StatView(
+                              theme: 'gray',
+                              view: widget.bangumiDetail!.stat!['views'],
+                              size: 'medium',
+                            ),
+                            const SizedBox(width: 6),
+                            StatDanMu(
+                              theme: 'gray',
+                              danmu: widget.bangumiDetail!.stat!['danmakus'],
+                              size: 'medium',
+                            ),
+                          ],
+                        ),
+                        const SizedBox(height: 6),
+                        Row(
+                          children: [
+                            Text(
+                              (widget.bangumiDetail!.areas!.isNotEmpty
+                                  ? widget.bangumiDetail!.areas!.first['name']
+                                  : ''),
+                              style: TextStyle(
+                                fontSize: 12,
+                                color: t.colorScheme.outline,
+                              ),
+                            ),
+                            const SizedBox(width: 6),
+                            Text(
+                              widget.bangumiDetail!.publish!['pub_time_show'],
+                              style: TextStyle(
+                                fontSize: 12,
+                                color: t.colorScheme.outline,
+                              ),
+                            ),
+                          ],
+                        ),
+                        Text(
+                          widget.bangumiDetail!.newEp!['desc'],
+                          style: TextStyle(
+                            fontSize: 12,
+                            color: t.colorScheme.outline,
                           ),
                         ),
-                      ),
+                        const Spacer(),
-                    ],
+                        Text(
+                          '简介：${widget.bangumiDetail!.evaluate!}',
+                          maxLines: 3,
+                          overflow: TextOverflow.ellipsis,
+                          style: TextStyle(
+                            fontSize: 13,
+                            color: t.colorScheme.outline,
+                          ),
+                        ),
+                      ],
+                    ),
                   ),
-                  const SizedBox(height: 6),
-                  // 点赞收藏转发 布局样式1
-                  // SingleChildScrollView(
-                  //   padding: const EdgeInsets.only(top: 7, bottom: 7),
-                  //   scrollDirection: Axis.horizontal,
-                  //   child: actionRow(
-                  //     context,
-                  //     bangumiIntroController,
-                  //     videoDetailCtr,
-                  //   ),
-                  // ),
-                  // 点赞收藏转发 布局样式2
-                  actionGrid(context, bangumiIntroController),
-                  // 番剧分p
-                  if ((!widget.loadingStatus &&
-                          widget.bangumiDetail!.episodes!.isNotEmpty) ||
-                      bangumiItem != null &&
-                          bangumiItem!.episodes!.isNotEmpty) ...[
-                    BangumiPanel(
-                      pages: bangumiItem != null
-                          ? bangumiItem!.episodes!
-                          : widget.bangumiDetail!.episodes!,
-                      cid: cid ??
-                          (bangumiItem != null
-                              ? bangumiItem!.episodes!.first.cid
-                              : widget.bangumiDetail!.episodes!.first.cid),
-                      sheetHeight: sheetHeight,
-                      changeFuc: (bvid, cid, aid) => bangumiIntroController
-                          .changeSeasonOrbangu(bvid, cid, aid),
-                    )
-                  ],
-                ],
-              )
-            : const SizedBox(
-                height: 100,
-                child: Center(
-                  child: CircularProgressIndicator(),
                 ),
               ),
-      ),
+            ],
+          ),
+          const SizedBox(height: 6),
+
+          /// 点赞收藏转发
+          actionGrid(context, bangumiIntroController),
+          // 番剧分p
+          if (widget.bangumiDetail!.episodes!.isNotEmpty) ...[
+            BangumiPanel(
+              pages: widget.bangumiDetail!.episodes!,
+              cid: cid ?? widget.bangumiDetail!.episodes!.first.cid,
+              sheetHeight: sheetHeight,
+              changeFuc: (bvid, cid, aid) =>
+                  bangumiIntroController.changeSeasonOrbangu(bvid, cid, aid),
+              bangumiDetail: bangumiIntroController.bangumiDetail.value,
+            )
+          ],
+        ],
+      )),
     );
   }
 
@@ -402,57 +345,44 @@ class _BangumiInfoState extends State<BangumiInfo> {
               children: <Widget>[
                 Obx(
                   () => ActionItem(
-                      icon: const Icon(FontAwesomeIcons.thumbsUp),
+                    icon: const Icon(FontAwesomeIcons.thumbsUp),
-                      selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp),
+                    selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp),
-                      onTap:
+                    onTap: handleState(bangumiIntroController.actionLikeVideo),
-                          handleState(bangumiIntroController.actionLikeVideo),
+                    selectStatus: bangumiIntroController.hasLike.value,
-                      selectStatus: bangumiIntroController.hasLike.value,
+                    text: widget.bangumiDetail!.stat!['likes']!.toString(),
-                      loadingStatus: false,
+                  ),
-                      text: !widget.loadingStatus
-                          ? widget.bangumiDetail!.stat!['likes']!.toString()
-                          : bangumiItem!.stat!['likes']!.toString()),
                 ),
                 Obx(
                   () => ActionItem(
-                      icon: const Icon(FontAwesomeIcons.b),
+                    icon: const Icon(FontAwesomeIcons.b),
-                      selectIcon: const Icon(FontAwesomeIcons.b),
+                    selectIcon: const Icon(FontAwesomeIcons.b),
-                      onTap:
+                    onTap: handleState(bangumiIntroController.actionCoinVideo),
-                          handleState(bangumiIntroController.actionCoinVideo),
+                    selectStatus: bangumiIntroController.hasCoin.value,
-                      selectStatus: bangumiIntroController.hasCoin.value,
+                    text: widget.bangumiDetail!.stat!['coins']!.toString(),
-                      loadingStatus: false,
+                  ),
-                      text: !widget.loadingStatus
-                          ? widget.bangumiDetail!.stat!['coins']!.toString()
-                          : bangumiItem!.stat!['coins']!.toString()),
                 ),
                 Obx(
                   () => ActionItem(
-                      icon: const Icon(FontAwesomeIcons.star),
+                    icon: const Icon(FontAwesomeIcons.star),
-                      selectIcon: const Icon(FontAwesomeIcons.solidStar),
+                    selectIcon: const Icon(FontAwesomeIcons.solidStar),
-                      onTap: () => showFavBottomSheet(),
+                    onTap: () => showFavBottomSheet(),
-                      selectStatus: bangumiIntroController.hasFav.value,
+                    selectStatus: bangumiIntroController.hasFav.value,
-                      loadingStatus: false,
+                    text: widget.bangumiDetail!.stat!['favorite']!.toString(),
-                      text: !widget.loadingStatus
+                  ),
-                          ? widget.bangumiDetail!.stat!['favorite']!.toString()
-                          : bangumiItem!.stat!['favorite']!.toString()),
                 ),
                 ActionItem(
                   icon: const Icon(FontAwesomeIcons.comment),
                   selectIcon: const Icon(FontAwesomeIcons.reply),
                   onTap: () => videoDetailCtr.tabCtr.animateTo(1),
                   selectStatus: false,
-                  loadingStatus: false,
+                  text: widget.bangumiDetail!.stat!['reply']!.toString(),
-                  text: !widget.loadingStatus
-                      ? widget.bangumiDetail!.stat!['reply']!.toString()
-                      : bangumiItem!.stat!['reply']!.toString(),
                 ),
                 ActionItem(
-                    icon: const Icon(FontAwesomeIcons.shareFromSquare),
+                  icon: const Icon(FontAwesomeIcons.shareFromSquare),
-                    onTap: () => bangumiIntroController.actionShareVideo(),
+                  onTap: () => bangumiIntroController.actionShareVideo(),
-                    selectStatus: false,
+                  selectStatus: false,
-                    loadingStatus: false,
+                  text: widget.bangumiDetail!.stat!['share']!.toString(),
-                    text: !widget.loadingStatus
+                ),
-                        ? widget.bangumiDetail!.stat!['share']!.toString()
-                        : bangumiItem!.stat!['share']!.toString()),
               ],
             ),
           ),
@@ -460,63 +390,4 @@ class _BangumiInfoState extends State<BangumiInfo> {
       );
     });
   }
-
-  Widget actionRow(BuildContext context, videoIntroController, videoDetailCtr) {
-    return Row(children: [
-      Obx(
-        () => ActionRowItem(
-          icon: const Icon(FontAwesomeIcons.thumbsUp),
-          onTap: handleState(videoIntroController.actionLikeVideo),
-          selectStatus: videoIntroController.hasLike.value,
-          loadingStatus: widget.loadingStatus,
-          text: !widget.loadingStatus
-              ? widget.bangumiDetail!.stat!['likes']!.toString()
-              : '-',
-        ),
-      ),
-      const SizedBox(width: 8),
-      Obx(
-        () => ActionRowItem(
-          icon: const Icon(FontAwesomeIcons.b),
-          onTap: handleState(videoIntroController.actionCoinVideo),
-          selectStatus: videoIntroController.hasCoin.value,
-          loadingStatus: widget.loadingStatus,
-          text: !widget.loadingStatus
-              ? widget.bangumiDetail!.stat!['coins']!.toString()
-              : '-',
-        ),
-      ),
-      const SizedBox(width: 8),
-      Obx(
-        () => ActionRowItem(
-          icon: const Icon(FontAwesomeIcons.heart),
-          onTap: () => showFavBottomSheet(),
-          selectStatus: videoIntroController.hasFav.value,
-          loadingStatus: widget.loadingStatus,
-          text: !widget.loadingStatus
-              ? widget.bangumiDetail!.stat!['favorite']!.toString()
-              : '-',
-        ),
-      ),
-      const SizedBox(width: 8),
-      ActionRowItem(
-        icon: const Icon(FontAwesomeIcons.comment),
-        onTap: () {
-          videoDetailCtr.tabCtr.animateTo(1);
-        },
-        selectStatus: false,
-        loadingStatus: widget.loadingStatus,
-        text: !widget.loadingStatus
-            ? widget.bangumiDetail!.stat!['reply']!.toString()
-            : '-',
-      ),
-      const SizedBox(width: 8),
-      ActionRowItem(
-          icon: const Icon(FontAwesomeIcons.share),
-          onTap: () => videoIntroController.actionShareVideo(),
-          selectStatus: false,
-          loadingStatus: widget.loadingStatus,
-          text: '转发'),
-    ]);
-  }
 }

lib/pages/bangumi/widgets/bangumi_panel.dart

@@ -14,12 +14,14 @@ class BangumiPanel extends StatefulWidget {
     this.cid,
     this.sheetHeight,
     this.changeFuc,
+    this.bangumiDetail,
   });
 
   final List<EpisodeItem> pages;
   final int? cid;
   final double? sheetHeight;
   final Function? changeFuc;
+  final BangumiInfoModel? bangumiDetail;
 
   @override
   State<BangumiPanel> createState() => _BangumiPanelState();
@@ -65,6 +67,47 @@ class _BangumiPanelState extends State<BangumiPanel> {
     super.dispose();
   }
 
+  Widget buildPageListItem(
+    EpisodeItem page,
+    int index,
+    bool isCurrentIndex,
+  ) {
+    Color primary = Theme.of(context).colorScheme.primary;
+    return ListTile(
+      onTap: () {
+        Get.back();
+        setState(() {
+          changeFucCall(page, index);
+        });
+      },
+      dense: false,
+      leading: isCurrentIndex
+          ? Image.asset(
+              'assets/images/live.gif',
+              color: primary,
+              height: 12,
+            )
+          : null,
+      title: Text(
+        '第${page.title}话  ${page.longTitle!}',
+        style: TextStyle(
+          fontSize: 14,
+          color: isCurrentIndex
+              ? primary
+              : Theme.of(context).colorScheme.onSurface,
+        ),
+      ),
+      trailing: page.badge != null
+          ? Text(
+              page.badge!,
+              style: TextStyle(
+                color: Theme.of(context).colorScheme.primary,
+              ),
+            )
+          : const SizedBox(),
+    );
+  }
+
   void showBangumiPanel() {
     showBottomSheet(
       context: context,
@@ -105,38 +148,22 @@ class _BangumiPanelState extends State<BangumiPanel> {
                   Expanded(
                     child: Material(
                       child: ScrollablePositionedList.builder(
-                        itemCount: widget.pages.length,
+                        itemCount: widget.pages.length + 1,
-                        itemBuilder: (BuildContext context, int index) =>
+                        itemBuilder: (BuildContext context, int index) {
-                            ListTile(
+                          bool isLastItem = index == widget.pages.length;
-                          onTap: () {
+                          bool isCurrentIndex = currentIndex == index;
-                            setState(() {
+                          return isLastItem
-                              changeFucCall(widget.pages[index], index);
+                              ? SizedBox(
-                            });
+                                  height:
-                          },
+                                      MediaQuery.of(context).padding.bottom +
-                          dense: false,
+                                          20,
-                          leading: index == currentIndex
-                              ? Image.asset(
-                                  'assets/images/live.gif',
-                                  color: Theme.of(context).colorScheme.primary,
-                                  height: 12,
                                 )
-                              : null,
+                              : buildPageListItem(
-                          title: Text(
+                                  widget.pages[index],
-                            '第${index + 1}话  ${widget.pages[index].longTitle!}',
+                                  index,
-                            style: TextStyle(
+                                  isCurrentIndex,
-                              fontSize: 14,
+                                );
-                              color: index == currentIndex
+                        },
-                                  ? Theme.of(context).colorScheme.primary
-                                  : Theme.of(context).colorScheme.onSurface,
-                            ),
-                          ),
-                          trailing: widget.pages[index].badge != null
-                              ? Image.asset(
-                                  'assets/images/big-vip.png',
-                                  height: 20,
-                                )
-                              : const SizedBox(),
-                        ),
                         itemScrollController: itemScrollController,
                       ),
                     ),
@@ -178,11 +205,11 @@ class _BangumiPanelState extends State<BangumiPanel> {
     return Column(
       children: [
         Padding(
-          padding: const EdgeInsets.only(top: 10, bottom: 6),
+          padding: const EdgeInsets.only(top: 10, bottom: 10),
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
-              const Text('合集 '),
+              const Text('选集 '),
               Expanded(
                 child: Text(
                   ' 正在播放：${widget.pages[currentIndex].longTitle}',
@@ -202,7 +229,7 @@ class _BangumiPanelState extends State<BangumiPanel> {
                   ),
                   onPressed: () => showBangumiPanel(),
                   child: Text(
-                    '全${widget.pages.length}话',
+                    '${widget.bangumiDetail!.newEp!['desc']}',
                     style: const TextStyle(fontSize: 13),
                   ),
                 ),
@@ -255,23 +282,15 @@ class _BangumiPanelState extends State<BangumiPanel> {
                               ),
                               const SizedBox(width: 2),
                               if (widget.pages[i].badge != null) ...[
-                                if (widget.pages[i].badge == '会员') ...[
+                                const Spacer(),
-                                  Image.asset(
+                                Text(
-                                    'assets/images/big-vip.png',
+                                  widget.pages[i].badge!,
-                                    height: 16,
+                                  style: TextStyle(
+                                    fontSize: 12,
+                                    color:
+                                        Theme.of(context).colorScheme.primary,
                                   ),
-                                ],
+                                ),
-                                if (widget.pages[i].badge != '会员') ...[
-                                  const Spacer(),
-                                  Text(
-                                    widget.pages[i].badge!,
-                                    style: TextStyle(
-                                      fontSize: 11,
-                                      color:
-                                          Theme.of(context).colorScheme.primary,
-                                    ),
-                                  ),
-                                ],
                               ]
                             ],
                           ),

lib/pages/blacklist/index.dart

@@ -139,7 +139,7 @@ class BlackListController extends GetxController {
   int currentPage = 1;
   int pageSize = 50;
   RxInt total = 0.obs;
-  RxList<BlackListItem> blackList = [BlackListItem()].obs;
+  RxList<BlackListItem> blackList = <BlackListItem>[].obs;
 
   Future queryBlacklist({type = 'init'}) async {
     if (type == 'init') {

lib/pages/dynamics/controller.dart

@@ -20,7 +20,7 @@ import 'package:pilipala/utils/utils.dart';
 class DynamicsController extends GetxController {
   int page = 1;
   String? offset = '';
-  RxList<DynamicItemModel> dynamicsList = [DynamicItemModel()].obs;
+  RxList<DynamicItemModel> dynamicsList = <DynamicItemModel>[].obs;
   Rx<DynamicsType> dynamicsType = DynamicsType.values[0].obs;
   RxString dynamicsTypeLabel = '全部'.obs;
   final ScrollController scrollController = ScrollController();
@@ -105,7 +105,7 @@ class DynamicsController extends GetxController {
 
   onSelectType(value) async {
     dynamicsType.value = filterTypeList[value]['value'];
-    dynamicsList.value = [DynamicItemModel()];
+    dynamicsList.value = <DynamicItemModel>[];
     page = 1;
     initialValue.value = value;
     await queryFollowDynamic();
@@ -249,8 +249,8 @@ class DynamicsController extends GetxController {
       return {'status': false, 'msg': '账号未登录'};
     }
     if (type == 'init') {
-      upData.value.upList = [];
+      upData.value.upList = <UpItem>[];
-      upData.value.liveUsers = LiveUsers();
+      upData.value.liveList = <LiveUserItem>[];
     }
     var res = await DynamicsHttp.followUp();
     if (res['status']) {
@@ -258,20 +258,23 @@ class DynamicsController extends GetxController {
       if (upData.value.upList!.isEmpty) {
         mid.value = -1;
       }
+      upData.value.upList!.insertAll(0, [
+        UpItem(face: '', uname: '全部动态', mid: -1),
+        UpItem(face: userInfo.face, uname: '我', mid: userInfo.mid),
+      ]);
     }
     return res;
   }
 
   onSelectUp(mid) async {
     dynamicsType.value = DynamicsType.values[0];
-    dynamicsList.value = [DynamicItemModel()];
+    dynamicsList.value = <DynamicItemModel>[];
     page = 1;
     queryFollowDynamic();
   }
 
   onRefresh() async {
     page = 1;
-    print('onRefresh');
     await queryFollowUp();
     await queryFollowDynamic();
   }
@@ -293,7 +296,7 @@ class DynamicsController extends GetxController {
     dynamicsType.value = DynamicsType.values[0];
     initialValue.value = 0;
     SmartDialog.showToast('还原默认加载');
-    dynamicsList.value = [DynamicItemModel()];
+    dynamicsList.value = <DynamicItemModel>[];
     queryFollowDynamic();
   }
 }

lib/pages/dynamics/detail/controller.dart

@@ -17,7 +17,7 @@ class DynamicDetailController extends GetxController {
   int currentPage = 0;
   bool isLoadingMore = false;
   RxString noMore = ''.obs;
-  RxList<ReplyItemModel> replyList = [ReplyItemModel()].obs;
+  RxList<ReplyItemModel> replyList = <ReplyItemModel>[].obs;
   RxInt acount = 0.obs;
   final ScrollController scrollController = ScrollController();
 

lib/pages/dynamics/view.dart

@@ -14,6 +14,7 @@ import 'package:pilipala/pages/main/index.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/storage.dart';
 
+import '../mine/controller.dart';
 import 'controller.dart';
 import 'widgets/dynamic_panel.dart';
 import 'widgets/up_panel.dart';
@@ -28,6 +29,7 @@ class DynamicsPage extends StatefulWidget {
 class _DynamicsPageState extends State<DynamicsPage>
     with AutomaticKeepAliveClientMixin {
   final DynamicsController _dynamicsController = Get.put(DynamicsController());
+  final MineController mineController = Get.put(MineController());
   late Future _futureBuilderFuture;
   late Future _futureBuilderFutureUp;
   Box userInfoCache = GStrorage.userInfo;
@@ -256,6 +258,14 @@ class _DynamicsPageState extends State<DynamicsPage>
                         }
                       },
                     );
+                  } else if (data['msg'] == "账号未登录") {
+                    return HttpError(
+                      errMsg: data['msg'],
+                      btnText: "去登录",
+                      fn: () {
+                        mineController.onLogin();
+                      },
+                    );
                   } else {
                     return HttpError(
                       errMsg: data['msg'],

lib/pages/dynamics/widgets/article_panel.dart

@@ -34,25 +34,25 @@ Widget articlePanel(item, context, {floor = 1}) {
           ),
           const SizedBox(height: 8),
         ],
-        Text(
+        // Text(
-          item.modules.moduleDynamic.major.opus.title,
+        //   item.modules.moduleDynamic.major.opus.title,
-          style: Theme.of(context)
+        //   style: Theme.of(context)
-              .textTheme
+        //       .textTheme
-              .titleMedium!
+        //       .titleMedium!
-              .copyWith(fontWeight: FontWeight.bold),
+        //       .copyWith(fontWeight: FontWeight.bold),
-        ),
+        // ),
-        const SizedBox(height: 2),
+        // const SizedBox(height: 2),
-        if (item.modules.moduleDynamic.major.opus.summary.text !=
+        // if (item.modules.moduleDynamic.major.opus.summary.text !=
-            'undefined') ...[
+        //     'undefined') ...[
-          Text(
+        //   Text(
-            item.modules.moduleDynamic.major.opus.summary.richTextNodes.first
+        //     item.modules.moduleDynamic.major.opus.summary.richTextNodes.first
-                .text,
+        //         .text,
-            maxLines: 4,
+        //     maxLines: 4,
-            style: const TextStyle(height: 1.55),
+        //     style: const TextStyle(height: 1.55),
-            overflow: TextOverflow.ellipsis,
+        //     overflow: TextOverflow.ellipsis,
-          ),
+        //   ),
-          const SizedBox(height: 2),
+        //   const SizedBox(height: 2),
-        ],
+        // ],
         picWidget(item, context)
       ],
     ),

lib/pages/dynamics/widgets/content_panel.dart

@@ -45,7 +45,9 @@ class _ContentState extends State<Content> {
     if (len == 1) {
       OpusPicsModel pictureItem = pics.first;
       picList.add(pictureItem.url!);
-      spanChilds.add(const TextSpan(text: '\n'));
+
+      /// 图片上方的空白间隔
+      // spanChilds.add(const TextSpan(text: '\n'));
       spanChilds.add(
         WidgetSpan(
           child: LayoutBuilder(

lib/pages/dynamics/widgets/rich_node_panel.dart

@@ -19,6 +19,17 @@ InlineSpan richNode(item, context) {
       // 动态页面 richTextNodes 层级可能与主页动态层级不同
       richTextNodes =
           item.modules.moduleDynamic.major.opus.summary.richTextNodes;
+      if (item.modules.moduleDynamic.major.opus.title != null) {
+        spanChilds.add(
+          TextSpan(
+            text: item.modules.moduleDynamic.major.opus.title + '\n',
+            style: Theme.of(context)
+                .textTheme
+                .titleMedium!
+                .copyWith(fontWeight: FontWeight.bold),
+          ),
+        );
+      }
     }
     if (richTextNodes == null || richTextNodes.isEmpty) {
       return spacer;

lib/pages/dynamics/widgets/up_panel.dart

@@ -1,16 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:hive/hive.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/models/dynamics/up.dart';
 import 'package:pilipala/models/live/item.dart';
 import 'package:pilipala/pages/dynamics/controller.dart';
 import 'package:pilipala/utils/feed_back.dart';
-import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
 
 class UpPanel extends StatefulWidget {
-  final FollowUpModel? upData;
+  final FollowUpModel upData;
   const UpPanel(this.upData, {Key? key}) : super(key: key);
 
   @override
@@ -24,38 +22,22 @@ class _UpPanelState extends State<UpPanel> {
   List<UpItem> upList = [];
   List<LiveUserItem> liveList = [];
   static const itemPadding = EdgeInsets.symmetric(horizontal: 5, vertical: 0);
-  Box userInfoCache = GStrorage.userInfo;
+  late MyInfo userInfo;
-  var userInfo;
 
-  @override
+  void listFormat() {
-  void initState() {
+    userInfo = widget.upData.myInfo!;
-    super.initState();
+    upList = widget.upData.upList!;
-    upList = widget.upData!.upList!;
+    liveList = widget.upData.liveList!;
-    if (widget.upData!.liveUsers != null) {
-      liveList = widget.upData!.liveUsers!.items!;
-    }
-    upList.insert(
-      0,
-      UpItem(face: '', uname: '全部动态', mid: -1),
-    );
-    userInfo = userInfoCache.get('userInfoCache');
-    upList.insert(
-      1,
-      UpItem(
-        face: userInfo.face,
-        uname: '我',
-        mid: userInfo.mid,
-      ),
-    );
   }
 
   @override
   Widget build(BuildContext context) {
+    listFormat();
     return SliverPersistentHeader(
       floating: true,
       pinned: false,
       delegate: _SliverHeaderDelegate(
-          height: 126,
+          height: liveList.isNotEmpty || upList.isNotEmpty ? 126 : 0,
           child: Column(
             mainAxisAlignment: MainAxisAlignment.start,
             crossAxisAlignment: CrossAxisAlignment.start,
@@ -90,7 +72,7 @@ class _UpPanelState extends State<UpPanel> {
                 color: Theme.of(context).colorScheme.background,
                 child: Row(
                   children: [
-                    Expanded(
+                    Flexible(
                       child: ListView(
                         scrollDirection: Axis.horizontal,
                         controller: scrollController,

lib/pages/fan/controller.dart

@@ -10,7 +10,7 @@ class FansController extends GetxController {
   int pn = 1;
   int ps = 20;
   int total = 0;
-  RxList<FansItemModel> fansList = [FansItemModel()].obs;
+  RxList<FansItemModel> fansList = <FansItemModel>[].obs;
   late int mid;
   late String name;
   var userInfo;

lib/pages/fav_detail/controller.dart

@@ -16,7 +16,7 @@ class FavDetailController extends GetxController {
   RxMap favInfo = {}.obs;
   RxList favList = [].obs;
   RxString loadingText = '加载中...'.obs;
-  int mediaCount = 0;
+  RxInt mediaCount = 0.obs;
 
   @override
   void onInit() {
@@ -29,7 +29,7 @@ class FavDetailController extends GetxController {
   }
 
   Future<dynamic> queryUserFavFolderDetail({type = 'init'}) async {
-    if (type == 'onLoad' && favList.length >= mediaCount) {
+    if (type == 'onLoad' && favList.length >= mediaCount.value) {
       loadingText.value = '没有更多了';
       return;
     }
@@ -43,11 +43,11 @@ class FavDetailController extends GetxController {
       favInfo.value = res['data'].info;
       if (currentPage == 1 && type == 'init') {
         favList.value = res['data'].medias;
-        mediaCount = res['data'].info['media_count'];
+        mediaCount.value = res['data'].info['media_count'];
       } else if (type == 'onLoad') {
         favList.addAll(res['data'].medias);
       }
-      if (favList.length >= mediaCount) {
+      if (favList.length >= mediaCount.value) {
         loadingText.value = '没有更多了';
       }
     }

lib/pages/fav_detail/view.dart

@@ -84,7 +84,7 @@ class _FavDetailPageState extends State<FavDetailPage> {
                             style: Theme.of(context).textTheme.titleMedium,
                           ),
                           Text(
-                            '共${_favDetailController.item!.mediaCount!}条视频',
+                            '共${_favDetailController.mediaCount}条视频',
                             style: Theme.of(context).textTheme.labelMedium,
                           )
                         ],
@@ -175,7 +175,7 @@ class _FavDetailPageState extends State<FavDetailPage> {
               padding: const EdgeInsets.only(top: 15, bottom: 8, left: 14),
               child: Obx(
                 () => Text(
-                  '共${_favDetailController.favList.length}条视频',
+                  '共${_favDetailController.mediaCount}条视频',
                   style: TextStyle(
                       fontSize:
                           Theme.of(context).textTheme.labelMedium!.fontSize,

lib/pages/history/controller.dart

@@ -88,8 +88,10 @@ class HistoryController extends GetxController {
   // 观看历史暂停状态
   Future historyStatus() async {
     var res = await UserHttp.historyStatus();
-    pauseStatus.value = res.data['data'];
+    if (res.data['code'] == 0) {
-    localCache.put(LocalCacheKey.historyPause, res.data['data']);
+      pauseStatus.value = res.data['data'];
+      localCache.put(LocalCacheKey.historyPause, res.data['data']);
+    }
   }
 
   // 清空观看历史

lib/pages/home/controller.dart

@@ -34,8 +34,6 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
     userInfo = userInfoCache.get('userInfoCache');
     userLogin.value = userInfo != null;
     userFace.value = userInfo != null ? userInfo.face : '';
-    // 进行tabs配置
-    setTabConfig();
     hideSearchBar =
         setting.get(SettingBoxKey.hideSearchBar, defaultValue: true);
     if (setting.get(SettingBoxKey.enableSearchWord, defaultValue: true)) {
@@ -43,6 +41,8 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
     }
     enableGradientBg =
         setting.get(SettingBoxKey.enableGradientBg, defaultValue: true);
+    // 进行tabs配置
+    setTabConfig();
   }
 
   void onRefresh() {
@@ -91,19 +91,21 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
       vsync: this,
     );
     // 监听 tabController 切换
-    tabController.animation!.addListener(() {
+    if (enableGradientBg) {
-      if (tabController.indexIsChanging) {
+      tabController.animation!.addListener(() {
-        if (initialIndex.value != tabController.index) {
+        if (tabController.indexIsChanging) {
-          initialIndex.value = tabController.index;
+          if (initialIndex.value != tabController.index) {
+            initialIndex.value = tabController.index;
+          }
+        } else {
+          final int temp = tabController.animation!.value.round();
+          if (initialIndex.value != temp) {
+            initialIndex.value = temp;
+            tabController.index = initialIndex.value;
+          }
         }
-      } else {
+      });
-        final int temp = tabController.animation!.value.round();
+    }
-        if (initialIndex.value != temp) {
-          initialIndex.value = temp;
-          tabController.index = initialIndex.value;
-        }
-      }
-    });
   }
 
   void searchDefault() async {

lib/pages/home/view.dart

@@ -415,13 +415,16 @@ class SearchBar extends StatelessWidget {
                 ),
                 const SizedBox(width: 10),
                 Obx(
-                  () => Text(
+                  () => Expanded(
-                    ctr!.defaultSearch.value,
+                    child: Text(
-                    maxLines: 1,
+                      ctr!.defaultSearch.value,
-                    overflow: TextOverflow.ellipsis,
+                      maxLines: 1,
-                    style: TextStyle(color: colorScheme.outline),
+                      overflow: TextOverflow.ellipsis,
+                      style: TextStyle(color: colorScheme.outline),
+                    ),
                   ),
                 ),
+                const SizedBox(width: 15),
               ],
             ),
           ),

lib/pages/hot/controller.dart

@@ -7,7 +7,7 @@ class HotController extends GetxController {
   final ScrollController scrollController = ScrollController();
   final int _count = 20;
   int _currentPage = 1;
-  RxList<HotVideoItemModel> videoList = [HotVideoItemModel()].obs;
+  RxList<HotVideoItemModel> videoList = <HotVideoItemModel>[].obs;
   bool isLoadingMore = false;
   bool flag = false;
   OverlayEntry? popupDialog;

lib/pages/live_room/controller.dart

@@ -1,6 +1,8 @@
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/http/constants.dart';
 import 'package:pilipala/http/live.dart';
+import 'package:pilipala/models/live/quality.dart';
 import 'package:pilipala/models/live/room_info.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
 import '../../models/live/room_info_h5.dart';
@@ -19,10 +21,16 @@ class LiveRoomController extends GetxController {
       PlPlayerController.getInstance(videoType: 'live');
   Rx<RoomInfoH5Model> roomInfoH5 = RoomInfoH5Model().obs;
   late bool enableCDN;
+  late int currentQn;
+  int? tempCurrentQn;
+  late List<Map<String, dynamic>> acceptQnList;
+  RxString currentQnDesc = ''.obs;
 
   @override
   void onInit() {
     super.onInit();
+    currentQn = setting.get(SettingBoxKey.defaultLiveQa,
+        defaultValue: LiveQuality.values.last.code);
     roomId = int.parse(Get.parameters['roomid']!);
     if (Get.arguments != null) {
       liveItem = Get.arguments['liveItem'];
@@ -57,11 +65,28 @@ class LiveRoomController extends GetxController {
   }
 
   Future queryLiveInfo() async {
-    var res = await LiveHttp.liveRoomInfo(roomId: roomId, qn: 10000);
+    var res = await LiveHttp.liveRoomInfo(roomId: roomId, qn: currentQn);
     if (res['status']) {
       List<CodecItem> codec =
           res['data'].playurlInfo.playurl.stream.first.format.first.codec;
       CodecItem item = codec.first;
+      // 以服务端返回的码率为准
+      currentQn = item.currentQn!;
+      if (tempCurrentQn != null && tempCurrentQn == currentQn) {
+        SmartDialog.showToast('画质切换失败，请检查登录状态');
+      }
+      List acceptQn = item.acceptQn!;
+      acceptQnList = acceptQn.map((e) {
+        return {
+          'code': e,
+          'desc': LiveQuality.values
+              .firstWhere((element) => element.code == e)
+              .description,
+        };
+      }).toList();
+      currentQnDesc.value = LiveQuality.values
+          .firstWhere((element) => element.code == currentQn)
+          .description;
       String videoUrl = enableCDN
           ? VideoUtils.getCdnUrl(item)
           : (item.urlInfo?.first.host)! +
@@ -90,4 +115,17 @@ class LiveRoomController extends GetxController {
     }
     return res;
   }
+
+  // 修改画质
+  void changeQn(int qn) async {
+    tempCurrentQn = currentQn;
+    if (currentQn == qn) {
+      return;
+    }
+    currentQn = qn;
+    currentQnDesc.value = LiveQuality.values
+        .firstWhere((element) => element.code == currentQn)
+        .description;
+    await queryLiveInfo();
+  }
 }

lib/pages/live_room/widgets/bottom_control.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:floating/floating.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/models/video/play/url.dart';
 import 'package:pilipala/pages/live_room/index.dart';
@@ -29,7 +30,6 @@ class BottomControl extends StatefulWidget implements PreferredSizeWidget {
 
 class _BottomControlState extends State<BottomControl> {
   late PlayUrlModel videoInfo;
-  List<PlaySpeed> playSpeed = PlaySpeed.values;
   TextStyle subTitleStyle = const TextStyle(fontSize: 12);
   TextStyle titleStyle = const TextStyle(fontSize: 14);
   Size get preferredSize => const Size(double.infinity, kToolbarHeight);
@@ -84,6 +84,30 @@ class _BottomControlState extends State<BottomControl> {
           //   ),
           // ),
           // const SizedBox(width: 4),
+          SizedBox(
+            width: 30,
+            child: PopupMenuButton<int>(
+              padding: EdgeInsets.zero,
+              onSelected: (value) {
+                widget.liveRoomCtr!.changeQn(value);
+              },
+              child: Obx(
+                () => Text(
+                  widget.liveRoomCtr!.currentQnDesc.value,
+                  style: const TextStyle(color: Colors.white, fontSize: 13),
+                ),
+              ),
+              itemBuilder: (BuildContext context) {
+                return widget.liveRoomCtr!.acceptQnList.map((e) {
+                  return PopupMenuItem<int>(
+                    value: e['code'],
+                    child: Text(e['desc']),
+                  );
+                }).toList();
+              },
+            ),
+          ),
+          const SizedBox(width: 10),
           if (Platform.isAndroid) ...[
             SizedBox(
               width: 34,
@@ -111,7 +135,7 @@ class _BottomControlState extends State<BottomControl> {
                 ),
               ),
             ),
-            const SizedBox(width: 4),
+            const SizedBox(width: 10),
           ],
           ComBtn(
             icon: const Icon(

lib/pages/main/controller.dart

@@ -9,54 +9,20 @@ import 'package:pilipala/http/common.dart';
 import 'package:pilipala/pages/dynamics/index.dart';
 import 'package:pilipala/pages/home/view.dart';
 import 'package:pilipala/pages/media/index.dart';
+import 'package:pilipala/pages/rank/index.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
 import '../../models/common/dynamic_badge_mode.dart';
+import '../../models/common/nav_bar_config.dart';
 
 class MainController extends GetxController {
   List<Widget> pages = <Widget>[
     const HomePage(),
+    const RankPage(),
     const DynamicsPage(),
     const MediaPage(),
   ];
-  RxList navigationBars = [
+  RxList navigationBars = defaultNavigationBars.obs;
-    {
-      'icon': const Icon(
-        Icons.home_outlined,
-        size: 21,
-      ),
-      'selectIcon': const Icon(
-        Icons.home,
-        size: 21,
-      ),
-      'label': "首页",
-      'count': 0,
-    },
-    {
-      'icon': const Icon(
-        Icons.motion_photos_on_outlined,
-        size: 21,
-      ),
-      'selectIcon': const Icon(
-        Icons.motion_photos_on,
-        size: 21,
-      ),
-      'label': "动态",
-      'count': 0,
-    },
-    {
-      'icon': const Icon(
-        Icons.video_collection_outlined,
-        size: 20,
-      ),
-      'selectIcon': const Icon(
-        Icons.video_collection,
-        size: 21,
-      ),
-      'label': "媒体库",
-      'count': 0,
-    }
-  ].obs;
   final StreamController<bool> bottomBarStream =
       StreamController<bool>.broadcast();
   Box setting = GStrorage.setting;
@@ -75,6 +41,10 @@ class MainController extends GetxController {
       Utils.checkUpdata();
     }
     hideTabBar = setting.get(SettingBoxKey.hideTabBar, defaultValue: true);
+    int defaultHomePage =
+        setting.get(SettingBoxKey.defaultHomePage, defaultValue: 0) as int;
+    selectedIndex = defaultNavigationBars
+        .indexWhere((item) => item['id'] == defaultHomePage);
     var userInfo = userInfoCache.get('userInfoCache');
     userLogin.value = userInfo != null;
     dynamicBadgeType.value = DynamicBadgeMode.values[setting.get(

lib/pages/main/view.dart

@@ -7,6 +7,7 @@ import 'package:pilipala/models/common/dynamic_badge_mode.dart';
 import 'package:pilipala/pages/dynamics/index.dart';
 import 'package:pilipala/pages/home/index.dart';
 import 'package:pilipala/pages/media/index.dart';
+import 'package:pilipala/pages/rank/index.dart';
 import 'package:pilipala/utils/event_bus.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/storage.dart';
@@ -22,6 +23,7 @@ class MainApp extends StatefulWidget {
 class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
   final MainController _mainController = Get.put(MainController());
   final HomeController _homeController = Get.put(HomeController());
+  final RankController _rankController = Get.put(RankController());
   final DynamicsController _dynamicController = Get.put(DynamicsController());
   final MediaController _mediaController = Get.put(MediaController());
 
@@ -57,6 +59,21 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
       _homeController.flag = false;
     }
 
+    if (currentPage is RankPage) {
+      if (_rankController.flag) {
+        // 单击返回顶部 双击并刷新
+        if (DateTime.now().millisecondsSinceEpoch - _lastSelectTime! < 500) {
+          _rankController.onRefresh();
+        } else {
+          _rankController.animateToTop();
+        }
+        _lastSelectTime = DateTime.now().millisecondsSinceEpoch;
+      }
+      _rankController.flag = true;
+    } else {
+      _rankController.flag = false;
+    }
+
     if (currentPage is DynamicsPage) {
       if (_dynamicController.flag) {
         // 单击返回顶部 双击并刷新

lib/pages/media/view.dart

@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:get/get.dart';
+import 'package:media_kit/media_kit.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/models/user/fav_folder.dart';
 import 'package:pilipala/pages/main/index.dart';
@@ -102,7 +103,11 @@ class _MediaPageState extends State<MediaPage>
             ],
             Obx(() => mediaController.userLogin.value
                 ? favFolder(mediaController, context)
-                : const SizedBox())
+                : const SizedBox()),
+            SizedBox(
+              height: MediaQuery.of(context).padding.bottom +
+                  kBottomNavigationBarHeight,
+            )
           ],
         ),
       ),

lib/pages/member/controller.dart

@@ -20,7 +20,7 @@ class MemberController extends GetxController {
   Box userInfoCache = GStrorage.userInfo;
   late int ownerMid;
   // 投稿列表
-  RxList<VListItemModel>? archiveList = [VListItemModel()].obs;
+  RxList<VListItemModel>? archiveList = <VListItemModel>[].obs;
   dynamic userInfo;
   RxInt attribute = (-1).obs;
   RxString attributeText = '关注'.obs;

lib/pages/preview/view.dart

@@ -135,115 +135,103 @@ class _ImagePreviewState extends State<ImagePreview>
       ),
       body: Stack(
         children: [
-          DismissiblePage(
+          GestureDetector(
-            backgroundColor: Colors.transparent,
+            onLongPress: () => onOpenMenu(),
-            onDismissed: () {
+            child: ExtendedImageGesturePageView.builder(
-              Navigator.of(context).pop();
+              controller: ExtendedPageController(
-            },
+                initialPage: _previewController.initialPage.value,
-            // Note that scrollable widget inside DismissiblePage might limit the functionality
+                pageSpacing: 0,
-            // If scroll direction matches DismissiblePage direction
-            direction: DismissiblePageDismissDirection.down,
-            disabled: _dismissDisabled,
-            isFullScreen: true,
-            child: GestureDetector(
-              onLongPress: () => onOpenMenu(),
-              child: ExtendedImageGesturePageView.builder(
-                controller: ExtendedPageController(
-                  initialPage: _previewController.initialPage.value,
-                  pageSpacing: 0,
-                ),
-                onPageChanged: (int index) =>
-                    _previewController.onChange(index),
-                canScrollPage: (GestureDetails? gestureDetails) =>
-                    gestureDetails!.totalScale! <= 1.0,
-                itemCount: widget.imgList!.length,
-                itemBuilder: (BuildContext context, int index) {
-                  return ExtendedImage.network(
-                    widget.imgList![index],
-                    fit: BoxFit.contain,
-                    mode: ExtendedImageMode.gesture,
-                    onDoubleTap: (ExtendedImageGestureState state) {
-                      final Offset? pointerDownPosition =
-                          state.pointerDownPosition;
-                      final double? begin = state.gestureDetails!.totalScale;
-                      double end;
-
-                      //remove old
-                      _doubleClickAnimation
-                          ?.removeListener(_doubleClickAnimationListener);
-
-                      //stop pre
-                      _doubleClickAnimationController.stop();
-
-                      //reset to use
-                      _doubleClickAnimationController.reset();
-
-                      if (begin == doubleTapScales[0]) {
-                        setState(() {
-                          _dismissDisabled = true;
-                        });
-                        end = doubleTapScales[1];
-                      } else {
-                        setState(() {
-                          _dismissDisabled = false;
-                        });
-                        end = doubleTapScales[0];
-                      }
-
-                      _doubleClickAnimationListener = () {
-                        state.handleDoubleTap(
-                            scale: _doubleClickAnimation!.value,
-                            doubleTapPosition: pointerDownPosition);
-                      };
-                      _doubleClickAnimation = _doubleClickAnimationController
-                          .drive(Tween<double>(begin: begin, end: end));
-
-                      _doubleClickAnimation!
-                          .addListener(_doubleClickAnimationListener);
-
-                      _doubleClickAnimationController.forward();
-                    },
-                    // ignore: body_might_complete_normally_nullable
-                    loadStateChanged: (ExtendedImageState state) {
-                      if (state.extendedImageLoadState == LoadState.loading) {
-                        final ImageChunkEvent? loadingProgress =
-                            state.loadingProgress;
-                        final double? progress =
-                            loadingProgress?.expectedTotalBytes != null
-                                ? loadingProgress!.cumulativeBytesLoaded /
-                                    loadingProgress.expectedTotalBytes!
-                                : null;
-                        return Center(
-                          child: Column(
-                            mainAxisAlignment: MainAxisAlignment.center,
-                            crossAxisAlignment: CrossAxisAlignment.center,
-                            children: <Widget>[
-                              SizedBox(
-                                width: 150.0,
-                                child: LinearProgressIndicator(
-                                  value: progress,
-                                  color: Colors.white,
-                                ),
-                              ),
-                              // const SizedBox(height: 10.0),
-                              // Text('${((progress ?? 0.0) * 100).toInt()}%',),
-                            ],
-                          ),
-                        );
-                      }
-                    },
-                    initGestureConfigHandler: (ExtendedImageState state) {
-                      return GestureConfig(
-                        inPageView: true,
-                        initialScale: 1.0,
-                        maxScale: 5.0,
-                        animationMaxScale: 6.0,
-                        initialAlignment: InitialAlignment.center,
-                      );
-                    },
-                  );
-                },
               ),
+              onPageChanged: (int index) => _previewController.onChange(index),
+              canScrollPage: (GestureDetails? gestureDetails) =>
+                  gestureDetails!.totalScale! <= 1.0,
+              itemCount: widget.imgList!.length,
+              itemBuilder: (BuildContext context, int index) {
+                return ExtendedImage.network(
+                  widget.imgList![index],
+                  fit: BoxFit.contain,
+                  mode: ExtendedImageMode.gesture,
+                  onDoubleTap: (ExtendedImageGestureState state) {
+                    final Offset? pointerDownPosition =
+                        state.pointerDownPosition;
+                    final double? begin = state.gestureDetails!.totalScale;
+                    double end;
+
+                    //remove old
+                    _doubleClickAnimation
+                        ?.removeListener(_doubleClickAnimationListener);
+
+                    //stop pre
+                    _doubleClickAnimationController.stop();
+
+                    //reset to use
+                    _doubleClickAnimationController.reset();
+
+                    if (begin == doubleTapScales[0]) {
+                      setState(() {
+                        _dismissDisabled = true;
+                      });
+                      end = doubleTapScales[1];
+                    } else {
+                      setState(() {
+                        _dismissDisabled = false;
+                      });
+                      end = doubleTapScales[0];
+                    }
+
+                    _doubleClickAnimationListener = () {
+                      state.handleDoubleTap(
+                          scale: _doubleClickAnimation!.value,
+                          doubleTapPosition: pointerDownPosition);
+                    };
+                    _doubleClickAnimation = _doubleClickAnimationController
+                        .drive(Tween<double>(begin: begin, end: end));
+
+                    _doubleClickAnimation!
+                        .addListener(_doubleClickAnimationListener);
+
+                    _doubleClickAnimationController.forward();
+                  },
+                  // ignore: body_might_complete_normally_nullable
+                  loadStateChanged: (ExtendedImageState state) {
+                    if (state.extendedImageLoadState == LoadState.loading) {
+                      final ImageChunkEvent? loadingProgress =
+                          state.loadingProgress;
+                      final double? progress =
+                          loadingProgress?.expectedTotalBytes != null
+                              ? loadingProgress!.cumulativeBytesLoaded /
+                                  loadingProgress.expectedTotalBytes!
+                              : null;
+                      return Center(
+                        child: Column(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          crossAxisAlignment: CrossAxisAlignment.center,
+                          children: <Widget>[
+                            SizedBox(
+                              width: 150.0,
+                              child: LinearProgressIndicator(
+                                value: progress,
+                                color: Colors.white,
+                              ),
+                            ),
+                            // const SizedBox(height: 10.0),
+                            // Text('${((progress ?? 0.0) * 100).toInt()}%',),
+                          ],
+                        ),
+                      );
+                    }
+                  },
+                  initGestureConfigHandler: (ExtendedImageState state) {
+                    return GestureConfig(
+                      inPageView: true,
+                      initialScale: 1.0,
+                      maxScale: 5.0,
+                      animationMaxScale: 6.0,
+                      initialAlignment: InitialAlignment.center,
+                    );
+                  },
+                );
+              },
             ),
           ),
           Positioned(
@@ -251,33 +239,49 @@ class _ImagePreviewState extends State<ImagePreview>
             right: 0,
             bottom: 0,
             child: Container(
-              padding: EdgeInsets.only(
+                padding: EdgeInsets.only(
-                  bottom: MediaQuery.of(context).padding.bottom + 30),
+                    left: 20,
-              decoration: const BoxDecoration(
+                    right: 20,
-                gradient: LinearGradient(
+                    bottom: MediaQuery.of(context).padding.bottom + 30),
-                  begin: Alignment.topCenter,
+                decoration: const BoxDecoration(
-                  end: Alignment.bottomCenter,
+                  gradient: LinearGradient(
-                  colors: <Color>[
+                    begin: Alignment.topCenter,
-                    Colors.transparent,
+                    end: Alignment.bottomCenter,
-                    Colors.black87,
+                    colors: <Color>[
+                      Colors.transparent,
+                      Colors.black87,
+                    ],
+                    tileMode: TileMode.mirror,
+                  ),
+                ),
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    widget.imgList!.length > 1
+                        ? Obx(
+                            () => Text.rich(
+                              textAlign: TextAlign.center,
+                              TextSpan(
+                                  style: const TextStyle(
+                                      color: Colors.white, fontSize: 16),
+                                  children: [
+                                    TextSpan(
+                                        text: _previewController.currentPage
+                                            .toString()),
+                                    const TextSpan(text: ' / '),
+                                    TextSpan(
+                                        text:
+                                            widget.imgList!.length.toString()),
+                                  ]),
+                            ),
+                          )
+                        : const SizedBox(),
+                    IconButton(
+                      onPressed: () => Get.back(),
+                      icon: const Icon(Icons.close, color: Colors.white),
+                    ),
                   ],
-                  tileMode: TileMode.mirror,
+                )),
-                ),
-              ),
-              child: Obx(
-                () => Text.rich(
-                  textAlign: TextAlign.center,
-                  TextSpan(
-                      style: const TextStyle(color: Colors.white, fontSize: 15),
-                      children: [
-                        TextSpan(
-                            text: _previewController.currentPage.toString()),
-                        const TextSpan(text: ' / '),
-                        TextSpan(text: widget.imgList!.length.toString()),
-                      ]),
-                ),
-              ),
-            ),
           ),
         ],
       ),

lib/pages/rank/controller.dart

@@ -0,0 +1,70 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:hive/hive.dart';
+import 'package:pilipala/models/common/rank_type.dart';
+import 'package:pilipala/utils/storage.dart';
+
+class RankController extends GetxController with GetTickerProviderStateMixin {
+  bool flag = false;
+  late RxList tabs = [].obs;
+  RxInt initialIndex = 1.obs;
+  late TabController tabController;
+  late List tabsCtrList;
+  late List<Widget> tabsPageList;
+  Box setting = GStrorage.setting;
+  late final StreamController<bool> searchBarStream =
+      StreamController<bool>.broadcast();
+  late bool enableGradientBg;
+
+  @override
+  void onInit() {
+    super.onInit();
+    enableGradientBg =
+        setting.get(SettingBoxKey.enableGradientBg, defaultValue: true);
+    // 进行tabs配置
+    setTabConfig();
+  }
+
+  void onRefresh() {
+    int index = tabController.index;
+    var ctr = tabsCtrList[index];
+    ctr().onRefresh();
+  }
+
+  void animateToTop() {
+    int index = tabController.index;
+    var ctr = tabsCtrList[index];
+    ctr().animateToTop();
+  }
+
+  void setTabConfig() async {
+    tabs.value = tabsConfig;
+    initialIndex.value = 0;
+    tabsCtrList = tabs.map((e) => e['ctr']).toList();
+    tabsPageList = tabs.map<Widget>((e) => e['page']).toList();
+
+    tabController = TabController(
+      initialIndex: initialIndex.value,
+      length: tabs.length,
+      vsync: this,
+    );
+    // 监听 tabController 切换
+    if (enableGradientBg) {
+      tabController.animation!.addListener(() {
+        if (tabController.indexIsChanging) {
+          if (initialIndex.value != tabController.index) {
+            initialIndex.value = tabController.index;
+          }
+        } else {
+          final int temp = tabController.animation!.value.round();
+          if (initialIndex.value != temp) {
+            initialIndex.value = temp;
+            tabController.index = initialIndex.value;
+          }
+        }
+      });
+    }
+  }
+}

lib/pages/rank/index.dart

@@ -0,0 +1,4 @@
+library rank;
+
+export './controller.dart';
+export './view.dart';

lib/pages/rank/view.dart

@@ -0,0 +1,149 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/utils/feed_back.dart';
+import './controller.dart';
+
+class RankPage extends StatefulWidget {
+  const RankPage({Key? key}) : super(key: key);
+
+  @override
+  State<RankPage> createState() => _RankPageState();
+}
+
+class _RankPageState extends State<RankPage>
+    with AutomaticKeepAliveClientMixin, TickerProviderStateMixin {
+  final RankController _rankController = Get.put(RankController());
+  List videoList = [];
+  late Stream<bool> stream;
+
+  @override
+  bool get wantKeepAlive => true;
+
+  @override
+  void initState() {
+    super.initState();
+    stream = _rankController.searchBarStream.stream;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    super.build(context);
+    Brightness currentBrightness = MediaQuery.of(context).platformBrightness;
+    // 设置状态栏图标的亮度
+    if (_rankController.enableGradientBg) {
+      SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
+        statusBarIconBrightness: currentBrightness == Brightness.light
+            ? Brightness.dark
+            : Brightness.light,
+      ));
+    }
+    return Scaffold(
+      extendBody: true,
+      extendBodyBehindAppBar: false,
+      appBar: _rankController.enableGradientBg
+          ? null
+          : AppBar(toolbarHeight: 0, elevation: 0),
+      body: Stack(
+        children: [
+          // gradient background
+          if (_rankController.enableGradientBg) ...[
+            Align(
+              alignment: Alignment.topLeft,
+              child: Opacity(
+                opacity: 0.6,
+                child: Container(
+                  width: MediaQuery.of(context).size.width,
+                  height: MediaQuery.of(context).size.height,
+                  decoration: BoxDecoration(
+                    gradient: LinearGradient(
+                        colors: [
+                          Theme.of(context)
+                              .colorScheme
+                              .primary
+                              .withOpacity(0.9),
+                          Theme.of(context)
+                              .colorScheme
+                              .primary
+                              .withOpacity(0.5),
+                          Theme.of(context).colorScheme.surface
+                        ],
+                        begin: Alignment.topLeft,
+                        end: Alignment.bottomRight,
+                        stops: const [0, 0.0034, 0.34]),
+                  ),
+                ),
+              ),
+            ),
+          ],
+          Column(
+            children: [
+              const CustomAppBar(),
+              if (_rankController.tabs.length > 1) ...[
+                const SizedBox(height: 4),
+                SizedBox(
+                  width: double.infinity,
+                  height: 42,
+                  child: Align(
+                    alignment: Alignment.center,
+                    child: TabBar(
+                      controller: _rankController.tabController,
+                      tabs: [
+                        for (var i in _rankController.tabs)
+                          Tab(text: i['label'])
+                      ],
+                      isScrollable: true,
+                      dividerColor: Colors.transparent,
+                      enableFeedback: true,
+                      splashBorderRadius: BorderRadius.circular(10),
+                      tabAlignment: TabAlignment.center,
+                      onTap: (value) {
+                        feedBack();
+                        if (_rankController.initialIndex.value == value) {
+                          _rankController.tabsCtrList[value]().animateToTop();
+                        }
+                        _rankController.initialIndex.value = value;
+                      },
+                    ),
+                  ),
+                ),
+              ] else ...[
+                const SizedBox(height: 6),
+              ],
+              Expanded(
+                child: TabBarView(
+                  controller: _rankController.tabController,
+                  children: _rankController.tabsPageList,
+                ),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
+  final double height;
+
+  const CustomAppBar({
+    super.key,
+    this.height = kToolbarHeight,
+  });
+
+  @override
+  Size get preferredSize => Size.fromHeight(height);
+
+  @override
+  Widget build(BuildContext context) {
+    final double top = MediaQuery.of(context).padding.top;
+    return Container(
+      width: MediaQuery.of(context).size.width,
+      height: top,
+      color: Colors.transparent,
+    );
+  }
+}

lib/pages/rank/zone/controller.dart

@@ -0,0 +1,53 @@
+import 'package:get/get.dart';
+import 'package:flutter/material.dart';
+import 'package:pilipala/http/video.dart';
+import 'package:pilipala/models/model_hot_video_item.dart';
+
+class ZoneController extends GetxController {
+  final ScrollController scrollController = ScrollController();
+  RxList<HotVideoItemModel> videoList = <HotVideoItemModel>[].obs;
+  bool isLoadingMore = false;
+  bool flag = false;
+  OverlayEntry? popupDialog;
+  int zoneID = 0;
+
+  // 获取推荐
+  Future queryRankFeed(type, rid) async {
+    zoneID = rid;
+    var res = await VideoHttp.getRankVideoList(zoneID);
+    if (res['status']) {
+      if (type == 'init') {
+        videoList.value = res['data'];
+      } else if (type == 'onRefresh') {
+        videoList.clear();
+        videoList.addAll(res['data']);
+      } else if (type == 'onLoad') {
+        videoList.clear();
+        videoList.addAll(res['data']);
+      }
+    }
+    isLoadingMore = false;
+    return res;
+  }
+
+  // 下拉刷新
+  Future onRefresh() async {
+    queryRankFeed('onRefresh', zoneID);
+  }
+
+  // 上拉加载
+  Future onLoad() async {
+    queryRankFeed('onLoad', zoneID);
+  }
+
+  // 返回顶部并刷新
+  void animateToTop() async {
+    if (scrollController.offset >=
+        MediaQuery.of(Get.context!).size.height * 5) {
+      scrollController.jumpTo(0);
+    } else {
+      await scrollController.animateTo(0,
+          duration: const Duration(milliseconds: 500), curve: Curves.easeInOut);
+    }
+  }
+}

lib/pages/rank/zone/index.dart

@@ -0,0 +1,4 @@
+library rank.zone;
+
+export './controller.dart';
+export './view.dart';

lib/pages/rank/zone/view.dart

@@ -0,0 +1,148 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/constants.dart';
+import 'package:pilipala/common/widgets/animated_dialog.dart';
+import 'package:pilipala/common/widgets/overlay_pop.dart';
+import 'package:pilipala/common/skeleton/video_card_h.dart';
+import 'package:pilipala/common/widgets/http_error.dart';
+import 'package:pilipala/common/widgets/video_card_h.dart';
+import 'package:pilipala/pages/home/index.dart';
+import 'package:pilipala/pages/main/index.dart';
+import 'package:pilipala/pages/rank/zone/index.dart';
+
+class ZonePage extends StatefulWidget {
+  const ZonePage({Key? key, required this.rid}) : super(key: key);
+
+  final int rid;
+
+  @override
+  State<ZonePage> createState() => _ZonePageState();
+}
+
+class _ZonePageState extends State<ZonePage> {
+  final ZoneController _zoneController = Get.put(ZoneController());
+  List videoList = [];
+  Future? _futureBuilderFuture;
+  late ScrollController scrollController;
+
+  @override
+  void initState() {
+    super.initState();
+    _futureBuilderFuture = _zoneController.queryRankFeed('init', widget.rid);
+    scrollController = _zoneController.scrollController;
+    StreamController<bool> mainStream =
+        Get.find<MainController>().bottomBarStream;
+    StreamController<bool> searchBarStream =
+        Get.find<HomeController>().searchBarStream;
+    scrollController.addListener(
+      () {
+        if (scrollController.position.pixels >=
+            scrollController.position.maxScrollExtent - 200) {
+          if (!_zoneController.isLoadingMore) {
+            _zoneController.isLoadingMore = true;
+            _zoneController.onLoad();
+          }
+        }
+
+        final ScrollDirection direction =
+            scrollController.position.userScrollDirection;
+        if (direction == ScrollDirection.forward) {
+          mainStream.add(true);
+          searchBarStream.add(true);
+        } else if (direction == ScrollDirection.reverse) {
+          mainStream.add(false);
+          searchBarStream.add(false);
+        }
+      },
+    );
+  }
+
+  @override
+  void dispose() {
+    scrollController.removeListener(() {});
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return RefreshIndicator(
+      onRefresh: () async {
+        return await _zoneController.onRefresh();
+      },
+      child: CustomScrollView(
+        controller: _zoneController.scrollController,
+        slivers: [
+          SliverPadding(
+            // 单列布局 EdgeInsets.zero
+            padding:
+                const EdgeInsets.fromLTRB(0, StyleString.safeSpace - 5, 0, 0),
+            sliver: FutureBuilder(
+              future: _futureBuilderFuture,
+              builder: (context, snapshot) {
+                if (snapshot.connectionState == ConnectionState.done) {
+                  Map data = snapshot.data as Map;
+                  if (data['status']) {
+                    return Obx(
+                      () => SliverList(
+                        delegate: SliverChildBuilderDelegate((context, index) {
+                          return VideoCardH(
+                            videoItem: _zoneController.videoList[index],
+                            showPubdate: true,
+                            longPress: () {
+                              _zoneController.popupDialog = _createPopupDialog(
+                                  _zoneController.videoList[index]);
+                              Overlay.of(context)
+                                  .insert(_zoneController.popupDialog!);
+                            },
+                            longPressEnd: () {
+                              _zoneController.popupDialog?.remove();
+                            },
+                          );
+                        }, childCount: _zoneController.videoList.length),
+                      ),
+                    );
+                  } else {
+                    return HttpError(
+                      errMsg: data['msg'],
+                      fn: () {
+                        setState(() {
+                          _futureBuilderFuture =
+                              _zoneController.queryRankFeed('init', widget.rid);
+                        });
+                      },
+                    );
+                  }
+                } else {
+                  // 骨架屏
+                  return SliverList(
+                    delegate: SliverChildBuilderDelegate((context, index) {
+                      return const VideoCardHSkeleton();
+                    }, childCount: 10),
+                  );
+                }
+              },
+            ),
+          ),
+          SliverToBoxAdapter(
+            child: SizedBox(
+              height: MediaQuery.of(context).padding.bottom + 10,
+            ),
+          )
+        ],
+      ),
+    );
+  }
+
+  OverlayEntry _createPopupDialog(videoItem) {
+    return OverlayEntry(
+      builder: (context) => AnimatedDialog(
+        closeFn: _zoneController.popupDialog?.remove,
+        child: OverlayPop(
+            videoItem: videoItem, closeFn: _zoneController.popupDialog?.remove),
+      ),
+    );
+  }
+}

lib/pages/search/controller.dart

@@ -15,7 +15,7 @@ class SSearchController extends GetxController {
   Box histiryWord = GStrorage.historyword;
   List historyCacheList = [];
   RxList historyList = [].obs;
-  RxList<SearchSuggestItem> searchSuggestList = [SearchSuggestItem()].obs;
+  RxList<SearchSuggestItem> searchSuggestList = <SearchSuggestItem>[].obs;
   final _debouncer =
       Debouncer(delay: const Duration(milliseconds: 200)); // 设置延迟时间
   String hintText = '搜索';
@@ -115,7 +115,7 @@ class SSearchController extends GetxController {
 
   onLongSelect(word) {
     int index = historyList.indexOf(word);
-    historyList.value = historyList.removeAt(index);
+    historyList.removeAt(index);
     historyList.refresh();
     histiryWord.put('cacheList', historyList);
   }

lib/pages/setting/controller.dart

@@ -8,6 +8,7 @@ import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/login.dart';
 import 'package:pilipala/utils/storage.dart';
 import '../../models/common/dynamic_badge_mode.dart';
+import '../../models/common/nav_bar_config.dart';
 import '../main/index.dart';
 import 'widgets/select_dialog.dart';
 
@@ -23,6 +24,7 @@ class SettingController extends GetxController {
   Rx<ThemeType> themeType = ThemeType.system.obs;
   var userInfo;
   Rx<DynamicBadgeMode> dynamicBadgeType = DynamicBadgeMode.number.obs;
+  RxInt defaultHomePage = 0.obs;
 
   @override
   void onInit() {
@@ -40,6 +42,8 @@ class SettingController extends GetxController {
     dynamicBadgeType.value = DynamicBadgeMode.values[setting.get(
         SettingBoxKey.dynamicBadgeMode,
         defaultValue: DynamicBadgeMode.number.code)];
+    defaultHomePage.value =
+        setting.get(SettingBoxKey.defaultHomePage, defaultValue: 0);
   }
 
   loginOut() async {
@@ -110,4 +114,24 @@ class SettingController extends GetxController {
       SmartDialog.showToast('设置成功');
     }
   }
+
+  // 设置默认启动页
+  seteDefaultHomePage(BuildContext context) async {
+    int? result = await showDialog(
+      context: context,
+      builder: (context) {
+        return SelectDialog<int>(
+            title: '首页启动页',
+            value: defaultHomePage.value,
+            values: defaultNavigationBars.map((e) {
+              return {'title': e['label'], 'value': e['id']};
+            }).toList());
+      },
+    );
+    if (result != null) {
+      defaultHomePage.value = result;
+      setting.put(SettingBoxKey.defaultHomePage, result);
+      SmartDialog.showToast('设置成功，重启生效');
+    }
+  }
 }

lib/pages/setting/extra_setting.dart

@@ -173,6 +173,12 @@ class _ExtraSettingState extends State<ExtraSetting> {
             setKey: SettingBoxKey.enableAi,
             defaultVal: true,
           ),
+          const SetSwitchItem(
+            title: '相关视频推荐',
+            subTitle: '视频详情页推荐相关视频',
+            setKey: SettingBoxKey.enableRelatedVideo,
+            defaultVal: true,
+          ),
           ListTile(
             dense: false,
             title: Text('评论展示', style: titleStyle),

lib/pages/setting/pages/home_tabbar_set.dart

@@ -40,10 +40,6 @@ class _TabbarSetPageState extends State<TabbarSetPage> {
         .where((i) => tabbarSort.contains((i['type'] as TabType).id))
         .map<String>((i) => (i['type'] as TabType).id)
         .toList();
-    if (sortedTabbar.isEmpty) {
-      SmartDialog.showToast('请至少设置一项！');
-      return;
-    }
     settingStorage.put(SettingBoxKey.tabbarSort, sortedTabbar);
     SmartDialog.showToast('保存成功，下次启动时生效');
   }

lib/pages/setting/pages/play_gesture_set.dart

@@ -0,0 +1,88 @@
+import 'package:flutter/material.dart';
+import 'package:hive/hive.dart';
+import 'package:pilipala/utils/global_data.dart';
+
+import '../../../models/common/gesture_mode.dart';
+import '../../../utils/storage.dart';
+import '../widgets/select_dialog.dart';
+import '../widgets/switch_item.dart';
+
+class PlayGesturePage extends StatefulWidget {
+  const PlayGesturePage({super.key});
+
+  @override
+  State<PlayGesturePage> createState() => _PlayGesturePageState();
+}
+
+class _PlayGesturePageState extends State<PlayGesturePage> {
+  Box setting = GStrorage.setting;
+  late int fullScreenGestureMode;
+
+  @override
+  void initState() {
+    super.initState();
+    fullScreenGestureMode = setting.get(SettingBoxKey.fullScreenGestureMode,
+        defaultValue: FullScreenGestureMode.values.last.index);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    TextStyle titleStyle = Theme.of(context).textTheme.titleMedium!;
+    TextStyle subTitleStyle = Theme.of(context)
+        .textTheme
+        .labelMedium!
+        .copyWith(color: Theme.of(context).colorScheme.outline);
+    return Scaffold(
+      appBar: AppBar(
+        centerTitle: false,
+        titleSpacing: 0,
+        title: Text(
+          '手势设置',
+          style: Theme.of(context).textTheme.titleMedium,
+        ),
+      ),
+      body: ListView(
+        children: [
+          ListTile(
+            dense: false,
+            title: Text('全屏手势', style: titleStyle),
+            subtitle: Text(
+              '通过手势快速进入全屏',
+              style: subTitleStyle,
+            ),
+            onTap: () async {
+              String? result = await showDialog(
+                context: context,
+                builder: (context) {
+                  return SelectDialog<String>(
+                      title: '全屏手势',
+                      value: FullScreenGestureMode
+                          .values[fullScreenGestureMode].values,
+                      values: FullScreenGestureMode.values.map((e) {
+                        return {'title': e.labels, 'value': e.values};
+                      }).toList());
+                },
+              );
+              if (result != null) {
+                GlobalData().fullScreenGestureMode = FullScreenGestureMode
+                    .values
+                    .firstWhere((element) => element.values == result);
+                fullScreenGestureMode =
+                    GlobalData().fullScreenGestureMode.index;
+                setting.put(
+                    SettingBoxKey.fullScreenGestureMode, fullScreenGestureMode);
+                setState(() {});
+              }
+            },
+          ),
+          const SetSwitchItem(
+            title: '双击快退/快进',
+            subTitle: '左侧双击快退，右侧双击快进',
+            setKey: SettingBoxKey.enableQuickDouble,
+            defaultVal: true,
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/pages/setting/pages/play_speed_set.dart

@@ -17,6 +17,7 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
   Box videoStorage = GStrorage.video;
   Box settingStorage = GStrorage.setting;
   late double playSpeedDefault;
+  late List<double> playSpeedSystem;
   late double longPressSpeedDefault;
   late List customSpeedsList;
   late bool enableAutoLongPressSpeed;
@@ -53,6 +54,9 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
   @override
   void initState() {
     super.initState();
+    // 系统预设倍速
+    playSpeedSystem =
+        videoStorage.get(VideoBoxKey.playSpeedSystem, defaultValue: playSpeed);
     // 默认倍速
     playSpeedDefault =
         videoStorage.get(VideoBoxKey.playSpeedDefault, defaultValue: 1.0);
@@ -64,6 +68,7 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
         videoStorage.get(VideoBoxKey.customSpeedsList, defaultValue: []);
     enableAutoLongPressSpeed = settingStorage
         .get(SettingBoxKey.enableAutoLongPressSpeed, defaultValue: false);
+    // 开启动态长按倍速时不展示
     if (enableAutoLongPressSpeed) {
       Map newItem = sheetMenu[1];
       newItem['show'] = false;
@@ -123,7 +128,7 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
   }
 
   // 设定倍速弹窗
-  void showBottomSheet(type, i) {
+  void showBottomSheet(String type, int i) {
     showModalBottomSheet<void>(
       context: context,
       isScrollControlled: true,
@@ -159,18 +164,11 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
   }
 
   //
-  void menuAction(type, index, id) async {
+  void menuAction(type, int index, id) async {
     double chooseSpeed = 1.0;
-    if (type == 'system' && id == -1) {
-      SmartDialog.showToast('系统预设倍速不支持删除');
-      return;
-    }
     // 获取当前选中的倍速值
-    if (type == 'system') {
+    chooseSpeed =
-      chooseSpeed = PlaySpeed.values[index].value;
+        type == 'system' ? playSpeedSystem[index] : customSpeedsList[index];
-    } else {
-      chooseSpeed = customSpeedsList[index];
-    }
     // 设置
     if (id == 1) {
       // 设置默认倍速
@@ -182,17 +180,22 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
       videoStorage.put(
           VideoBoxKey.longPressSpeedDefault, longPressSpeedDefault);
     } else if (id == -1) {
-      if (customSpeedsList[index] == playSpeedDefault) {
+      late List speedsList =
-        playSpeedDefault = 1.0;
+          type == 'system' ? playSpeedSystem : customSpeedsList;
-        videoStorage.put(VideoBoxKey.playSpeedDefault, playSpeedDefault);
+      if (speedsList[index] == playSpeedDefault) {
+        SmartDialog.showToast('默认倍速不可删除');
       }
-      if (customSpeedsList[index] == longPressSpeedDefault) {
+      if (speedsList[index] == longPressSpeedDefault) {
         longPressSpeedDefault = 2.0;
         videoStorage.put(
             VideoBoxKey.longPressSpeedDefault, longPressSpeedDefault);
       }
-      customSpeedsList.removeAt(index);
+      speedsList.removeAt(index);
-      await videoStorage.put(VideoBoxKey.customSpeedsList, customSpeedsList);
+      await videoStorage.put(
+          type == 'system'
+              ? VideoBoxKey.playSpeedSystem
+              : VideoBoxKey.customSpeedsList,
+          speedsList);
     }
     setState(() {});
     SmartDialog.showToast('操作成功');
@@ -249,38 +252,40 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
                     subtitle: Text(longPressSpeedDefault.toString()),
                   )
                 : const SizedBox(),
-            Padding(
+            if (playSpeedSystem.isNotEmpty) ...[
-              padding: const EdgeInsets.only(
+              Padding(
-                left: 14,
+                padding: const EdgeInsets.only(
-                right: 14,
+                  left: 14,
-                bottom: 10,
+                  right: 14,
-                top: 20,
+                  bottom: 10,
+                  top: 20,
+                ),
+                child: Text(
+                  '系统预设倍速',
+                  style: Theme.of(context).textTheme.titleMedium,
+                ),
               ),
-              child: Text(
+              Padding(
-                '系统预设倍速',
+                padding: const EdgeInsets.only(
-                style: Theme.of(context).textTheme.titleMedium,
+                  left: 18,
-              ),
+                  right: 18,
-            ),
+                  bottom: 30,
-            Padding(
+                ),
-              padding: const EdgeInsets.only(
+                child: Wrap(
-                left: 18,
+                  alignment: WrapAlignment.start,
-                right: 18,
+                  spacing: 8,
-                bottom: 30,
+                  runSpacing: 2,
-              ),
+                  children: [
-              child: Wrap(
+                    for (int i = 0; i < playSpeedSystem.length; i++) ...[
-                alignment: WrapAlignment.start,
+                      FilledButton.tonal(
-                spacing: 8,
+                        onPressed: () => showBottomSheet('system', i),
-                runSpacing: 2,
+                        child: Text(playSpeedSystem[i].toString()),
-                children: [
+                      ),
-                  for (var i in PlaySpeed.values) ...[
+                    ]
-                    FilledButton.tonal(
+                  ],
-                      onPressed: () => showBottomSheet('system', i.index),
+                ),
-                      child: Text(i.description),
+              )
-                    ),
+            ],
-                  ]
-                ],
-              ),
-            ),
             Padding(
                 padding: const EdgeInsets.only(
                   left: 14,

lib/pages/setting/play_setting.dart

@@ -7,8 +7,10 @@ import 'package:pilipala/models/video/play/quality.dart';
 import 'package:pilipala/pages/setting/widgets/select_dialog.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
 import 'package:pilipala/services/service_locator.dart';
+import 'package:pilipala/utils/global_data.dart';
 import 'package:pilipala/utils/storage.dart';
 
+import '../../models/live/quality.dart';
 import 'widgets/switch_item.dart';
 
 class PlaySetting extends StatefulWidget {
@@ -21,6 +23,7 @@ class PlaySetting extends StatefulWidget {
 class _PlaySettingState extends State<PlaySetting> {
   Box setting = GStrorage.setting;
   late dynamic defaultVideoQa;
+  late dynamic defaultLiveQa;
   late dynamic defaultAudioQa;
   late dynamic defaultDecode;
   late int defaultFullScreenMode;
@@ -31,6 +34,8 @@ class _PlaySettingState extends State<PlaySetting> {
     super.initState();
     defaultVideoQa = setting.get(SettingBoxKey.defaultVideoQa,
         defaultValue: VideoQuality.values.last.code);
+    defaultLiveQa = setting.get(SettingBoxKey.defaultLiveQa,
+        defaultValue: LiveQuality.values.last.code);
     defaultAudioQa = setting.get(SettingBoxKey.defaultAudioQa,
         defaultValue: AudioQuality.values.last.code);
     defaultDecode = setting.get(SettingBoxKey.defaultDecode,
@@ -73,6 +78,12 @@ class _PlaySettingState extends State<PlaySetting> {
             title: Text('倍速设置', style: titleStyle),
             subtitle: Text('设置视频播放速度', style: subTitleStyle),
           ),
+          ListTile(
+            dense: false,
+            onTap: () => Get.toNamed('/playerGestureSet'),
+            title: Text('手势设置', style: titleStyle),
+            subtitle: Text('设置播放器手势', style: subTitleStyle),
+          ),
           const SetSwitchItem(
             title: '开启1080P',
             subTitle: '免登录查看1080P视频',
@@ -134,23 +145,25 @@ class _PlaySettingState extends State<PlaySetting> {
             setKey: SettingBoxKey.enableAutoBrightness,
             defaultVal: false,
           ),
-          const SetSwitchItem(
-            title: '双击快退/快进',
-            subTitle: '左侧双击快退，右侧双击快进',
-            setKey: SettingBoxKey.enableQuickDouble,
-            defaultVal: true,
-          ),
           const SetSwitchItem(
             title: '弹幕开关',
             subTitle: '展示弹幕',
             setKey: SettingBoxKey.enableShowDanmaku,
             defaultVal: false,
           ),
+          SetSwitchItem(
+              title: '控制栏动画',
+              subTitle: '播放器控制栏显示动画效果',
+              setKey: SettingBoxKey.enablePlayerControlAnimation,
+              defaultVal: true,
+              callFn: (bool val) {
+                GlobalData().enablePlayerControlAnimation = val;
+              }),
           ListTile(
             dense: false,
-            title: Text('默认画质', style: titleStyle),
+            title: Text('默认视频画质', style: titleStyle),
             subtitle: Text(
-              '当前画质${VideoQualityCode.fromCode(defaultVideoQa)!.description!}',
+              '当前默认画质${VideoQualityCode.fromCode(defaultVideoQa)!.description!}',
               style: subTitleStyle,
             ),
             onTap: () async {
@@ -158,7 +171,7 @@ class _PlaySettingState extends State<PlaySetting> {
                 context: context,
                 builder: (context) {
                   return SelectDialog<int>(
-                      title: '默认画质',
+                      title: '默认视频画质',
                       value: defaultVideoQa,
                       values: VideoQuality.values.reversed.map((e) {
                         return {'title': e.description, 'value': e.code};
@@ -172,6 +185,32 @@ class _PlaySettingState extends State<PlaySetting> {
               }
             },
           ),
+          ListTile(
+            dense: false,
+            title: Text('默认直播画质', style: titleStyle),
+            subtitle: Text(
+              '当前默认画质${LiveQualityCode.fromCode(defaultLiveQa)!.description!}',
+              style: subTitleStyle,
+            ),
+            onTap: () async {
+              int? result = await showDialog(
+                context: context,
+                builder: (context) {
+                  return SelectDialog<int>(
+                      title: '默认直播画质',
+                      value: defaultLiveQa,
+                      values: LiveQuality.values.reversed.map((e) {
+                        return {'title': e.description, 'value': e.code};
+                      }).toList());
+                },
+              );
+              if (result != null) {
+                defaultLiveQa = result;
+                setting.put(SettingBoxKey.defaultLiveQa, result);
+                setState(() {});
+              }
+            },
+          ),
           ListTile(
             dense: false,
             title: Text('默认音质', style: titleStyle),

lib/pages/setting/style_setting.dart

@@ -12,6 +12,7 @@ import 'package:pilipala/utils/global_data.dart';
 import 'package:pilipala/utils/storage.dart';
 
 import '../../models/common/dynamic_badge_mode.dart';
+import '../../models/common/nav_bar_config.dart';
 import 'controller.dart';
 import 'widgets/switch_item.dart';
 
@@ -29,7 +30,6 @@ class _StyleSettingState extends State<StyleSetting> {
 
   Box setting = GStrorage.setting;
   late int picQuality;
-  late double toastOpacity;
   late ThemeType _tempThemeValue;
   late dynamic defaultCustomRows;
 
@@ -37,7 +37,6 @@ class _StyleSettingState extends State<StyleSetting> {
   void initState() {
     super.initState();
     picQuality = setting.get(SettingBoxKey.defaultPicQa, defaultValue: 10);
-    toastOpacity = setting.get(SettingBoxKey.defaultToastOp, defaultValue: 1.0);
     _tempThemeValue = settingController.themeType.value;
     defaultCustomRows = setting.get(SettingBoxKey.customRows, defaultValue: 2);
   }
@@ -267,6 +266,14 @@ class _StyleSettingState extends State<StyleSetting> {
                 '当前主题：${colorSelectController.type.value == 0 ? '动态取色' : '指定颜色'}',
                 style: subTitleStyle)),
           ),
+          ListTile(
+            dense: false,
+            onTap: () => settingController.seteDefaultHomePage(context),
+            title: Text('默认启动页', style: titleStyle),
+            subtitle: Obx(() => Text(
+                '当前启动页：${defaultNavigationBars.firstWhere((e) => e['id'] == settingController.defaultHomePage.value)['label']}',
+                style: subTitleStyle)),
+          ),
           ListTile(
             dense: false,
             onTap: () => Get.toNamed('/fontSizeSetting'),

lib/pages/video/detail/controller.dart

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
+import 'package:ns_danmaku/ns_danmaku.dart';
 import 'package:pilipala/http/constants.dart';
 import 'package:pilipala/http/video.dart';
 import 'package:pilipala/models/common/reply_type.dart';
@@ -19,6 +20,7 @@ import 'package:pilipala/utils/utils.dart';
 import 'package:pilipala/utils/video_utils.dart';
 import 'package:screen_brightness/screen_brightness.dart';
 
+import '../../../http/danmaku.dart';
 import '../../../utils/id_utils.dart';
 import 'widgets/header_control.dart';
 
@@ -91,6 +93,7 @@ class VideoDetailController extends GetxController
   late int cacheAudioQa;
 
   PersistentBottomSheetController? replyReplyBottomSheetCtr;
+  late bool enableRelatedVideo;
 
   @override
   void onInit() {
@@ -113,7 +116,8 @@ class VideoDetailController extends GetxController
     autoPlay.value =
         setting.get(SettingBoxKey.autoPlayEnable, defaultValue: true);
     enableHA.value = setting.get(SettingBoxKey.enableHA, defaultValue: true);
-
+    enableRelatedVideo =
+        setting.get(SettingBoxKey.enableRelatedVideo, defaultValue: true);
     if (userInfo == null ||
         localCache.get(LocalCacheKey.historyPause) == true) {
       enableHeart = false;
@@ -128,6 +132,8 @@ class VideoDetailController extends GetxController
       controller: plPlayerController,
       videoDetailCtr: this,
       floating: floating,
+      bvid: bvid,
+      videoType: videoType,
     );
     // CDN优化
     enableCDN = setting.get(SettingBoxKey.enableCDN, defaultValue: true);
@@ -381,4 +387,86 @@ class VideoDetailController extends GetxController
         ? replyReplyBottomSheetCtr!.close()
         : print('replyReplyBottomSheetCtr is null');
   }
+
+  /// 发送弹幕
+  void showShootDanmakuSheet() {
+    final TextEditingController textController = TextEditingController();
+    bool isSending = false; // 追踪是否正在发送
+    showDialog(
+      context: Get.context!,
+      builder: (BuildContext context) {
+        // TODO: 支持更多类型和颜色的弹幕
+        return AlertDialog(
+          title: const Text('发送弹幕'),
+          content: StatefulBuilder(
+              builder: (BuildContext context, StateSetter setState) {
+            return TextField(
+              controller: textController,
+            );
+          }),
+          actions: [
+            TextButton(
+              onPressed: () => Get.back(),
+              child: Text(
+                '取消',
+                style: TextStyle(color: Theme.of(context).colorScheme.outline),
+              ),
+            ),
+            StatefulBuilder(
+                builder: (BuildContext context, StateSetter setState) {
+              return TextButton(
+                onPressed: isSending
+                    ? null
+                    : () async {
+                        final String msg = textController.text;
+                        if (msg.isEmpty) {
+                          SmartDialog.showToast('弹幕内容不能为空');
+                          return;
+                        } else if (msg.length > 100) {
+                          SmartDialog.showToast('弹幕内容不能超过100个字符');
+                          return;
+                        }
+                        setState(() {
+                          isSending = true; // 开始发送，更新状态
+                        });
+                        //修改按钮文字
+                        // SmartDialog.showToast('弹幕发送中,\n$msg');
+                        final dynamic res = await DanmakaHttp.shootDanmaku(
+                          oid: cid.value,
+                          msg: textController.text,
+                          bvid: bvid,
+                          progress:
+                              plPlayerController.position.value.inMilliseconds,
+                          type: 1,
+                        );
+                        setState(() {
+                          isSending = false; // 发送结束，更新状态
+                        });
+                        if (res['status']) {
+                          SmartDialog.showToast('发送成功');
+                          // 发送成功，自动预览该弹幕，避免重新请求
+                          // TODO: 暂停状态下预览弹幕仍会移动与计时，可考虑添加到dmSegList或其他方式实现
+                          plPlayerController.danmakuController?.addItems([
+                            DanmakuItem(
+                              msg,
+                              color: Colors.white,
+                              time: plPlayerController
+                                  .position.value.inMilliseconds,
+                              type: DanmakuItemType.scroll,
+                              isSend: true,
+                            )
+                          ]);
+                          Get.back();
+                        } else {
+                          SmartDialog.showToast('发送失败，错误信息为${res['msg']}');
+                        }
+                      },
+                child: Text(isSending ? '发送中...' : '发送'),
+              );
+            })
+          ],
+        );
+      },
+    );
+  }
 }

lib/pages/video/detail/introduction/controller.dart

@@ -22,15 +22,9 @@ import '../related/index.dart';
 import 'widgets/group_panel.dart';
 
 class VideoIntroController extends GetxController {
+  VideoIntroController({required this.bvid});
   // 视频bvid
-  String bvid = Get.parameters['bvid']!;
+  String bvid;
-
-  // 是否预渲染 骨架屏
-  bool preRender = false;
-
-  // 视频详情 上个页面传入
-  Map? videoItem = {};
-
   // 请求状态
   RxBool isLoading = false.obs;
 
@@ -73,26 +67,6 @@ class VideoIntroController extends GetxController {
     try {
       heroTag = Get.arguments['heroTag'];
     } catch (_) {}
-    if (Get.arguments.isNotEmpty) {
-      if (Get.arguments.containsKey('videoItem')) {
-        preRender = true;
-        var args = Get.arguments['videoItem'];
-        var keys = Get.arguments.keys.toList();
-        videoItem!['pic'] = args.pic;
-        if (args.title is String) {
-          videoItem!['title'] = args.title;
-        } else {
-          String str = '';
-          for (Map map in args.title) {
-            str += map['text'];
-          }
-          videoItem!['title'] = str;
-        }
-        videoItem!['stat'] = keys.contains('stat') && args.stat;
-        videoItem!['pubdate'] = keys.contains('pubdate') && args.pubdate;
-        videoItem!['owner'] = keys.contains('owner') && args.owner;
-      }
-    }
     userLogin = userInfo != null;
     lastPlayCid.value = int.parse(Get.parameters['cid']!);
     isShowOnlineTotal =
@@ -111,10 +85,9 @@ class VideoIntroController extends GetxController {
       if (videoDetail.value.pages!.isNotEmpty && lastPlayCid.value == 0) {
         lastPlayCid.value = videoDetail.value.pages!.first.cid!;
       }
-      // Get.find<VideoDetailController>(tag: heroTag).tabs.value = [
+      final VideoDetailController videoDetailCtr =
-      //   '简介',
+          Get.find<VideoDetailController>(tag: heroTag);
-      //   '评论 ${result['data']!.stat!.reply}'
+      videoDetailCtr.tabs.value = ['简介', '评论 ${result['data']?.stat?.reply}'];
-      // ];
       // 获取到粉丝数再返回
       await queryUserStat();
     }

lib/pages/video/detail/introduction/view.dart

@@ -15,16 +15,17 @@ import 'package:pilipala/pages/video/detail/widgets/ai_detail.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
-
 import 'widgets/action_item.dart';
-import 'widgets/action_row_item.dart';
 import 'widgets/fav_panel.dart';
 import 'widgets/intro_detail.dart';
 import 'widgets/page.dart';
 import 'widgets/season.dart';
 
 class VideoIntroPanel extends StatefulWidget {
-  const VideoIntroPanel({super.key});
+  final String bvid;
+  final String? cid;
+
+  const VideoIntroPanel({super.key, required this.bvid, this.cid});
 
   @override
   State<VideoIntroPanel> createState() => _VideoIntroPanelState();
@@ -47,7 +48,8 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
 
     /// fix 全屏时参数丢失
     heroTag = Get.arguments['heroTag'];
-    videoIntroController = Get.put(VideoIntroController(), tag: heroTag);
+    videoIntroController =
+        Get.put(VideoIntroController(bvid: widget.bvid), tag: heroTag);
     _futureBuilderFuture = videoIntroController.queryVideoIntro();
     videoIntroController.videoDetail.listen((value) {
       videoDetail = value;
@@ -74,9 +76,9 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
             // 请求成功
             return Obx(
               () => VideoInfo(
-                loadingStatus: false,
                 videoDetail: videoIntroController.videoDetail.value,
                 heroTag: heroTag,
+                bvid: widget.bvid,
               ),
             );
           } else {
@@ -91,10 +93,13 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
             );
           }
         } else {
-          return VideoInfo(
+          return const SliverToBoxAdapter(
-            loadingStatus: true,
+            child: SizedBox(
-            videoDetail: videoDetail,
+              height: 100,
-            heroTag: heroTag,
+              child: Center(
+                child: CircularProgressIndicator(),
+              ),
+            ),
           );
         }
       },
@@ -103,31 +108,28 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
 }
 
 class VideoInfo extends StatefulWidget {
-  final bool loadingStatus;
   final VideoDetailData? videoDetail;
   final String? heroTag;
+  final String bvid;
 
-  const VideoInfo(
+  const VideoInfo({
-      {Key? key, this.loadingStatus = false, this.videoDetail, this.heroTag})
+    Key? key,
-      : super(key: key);
+    this.videoDetail,
+    this.heroTag,
+    required this.bvid,
+  }) : super(key: key);
 
   @override
   State<VideoInfo> createState() => _VideoInfoState();
 }
 
 class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
-  // final String heroTag = Get.arguments['heroTag'];
   late String heroTag;
   late final VideoIntroController videoIntroController;
   late final VideoDetailController videoDetailCtr;
-  late final Map<dynamic, dynamic> videoItem;
-
   final Box<dynamic> localCache = GStrorage.localCache;
   final Box<dynamic> setting = GStrorage.setting;
   late double sheetHeight;
-
-  late final bool loadingStatus; // 加载状态
-
   late final dynamic owner;
   late final dynamic follower;
   late final dynamic followStatus;
@@ -149,16 +151,13 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
   void initState() {
     super.initState();
     heroTag = widget.heroTag!;
-    videoIntroController = Get.put(VideoIntroController(), tag: heroTag);
+    videoIntroController =
+        Get.put(VideoIntroController(bvid: widget.bvid), tag: heroTag);
     videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
-    videoItem = videoIntroController.videoItem!;
     sheetHeight = localCache.get('sheetHeight');
 
-    loadingStatus = widget.loadingStatus;
+    owner = widget.videoDetail!.owner;
-    owner = loadingStatus ? videoItem['owner'] : widget.videoDetail!.owner;
+    follower = Utils.numFormat(videoIntroController.userStat['follower']);
-    follower = loadingStatus
-        ? '-'
-        : Utils.numFormat(videoIntroController.userStat['follower']);
     followStatus = videoIntroController.followStatus;
     enableAi = setting.get(SettingBoxKey.enableAi, defaultValue: true);
   }
@@ -212,9 +211,6 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
 
   // 视频介绍
   showIntroDetail() {
-    if (loadingStatus) {
-      return;
-    }
     feedBack();
     showBottomSheet(
       context: context,
@@ -228,13 +224,9 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
   // 用户主页
   onPushMember() {
     feedBack();
-    mid = !loadingStatus
+    mid = widget.videoDetail!.owner!.mid!;
-        ? widget.videoDetail!.owner!.mid
-        : videoItem['owner'].mid;
     memberHeroTag = Utils.makeHeroTag(mid);
-    String face = !loadingStatus
+    String face = widget.videoDetail!.owner!.face!;
-        ? widget.videoDetail!.owner!.face
-        : videoItem['owner'].face;
     Get.toNamed('/member?mid=$mid',
         arguments: {'face': face, 'heroTag': memberHeroTag});
   }
@@ -256,223 +248,186 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
     final Color outline = t.colorScheme.outline;
     return SliverPadding(
       padding: const EdgeInsets.only(
-          left: StyleString.safeSpace, right: StyleString.safeSpace, top: 10),
+        left: StyleString.safeSpace,
+        right: StyleString.safeSpace,
+        top: 16,
+      ),
       sliver: SliverToBoxAdapter(
-        child: !loadingStatus
+          child: Column(
-            ? Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
-                crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
-                children: [
+          GestureDetector(
-                  GestureDetector(
+            behavior: HitTestBehavior.translucent,
-                    behavior: HitTestBehavior.translucent,
+            onTap: () => showIntroDetail(),
-                    onTap: () => showIntroDetail(),
+            child: Text(
-                    child: Text(
+              widget.videoDetail!.title!,
-                      !loadingStatus
+              style: const TextStyle(
-                          ? widget.videoDetail!.title
+                fontSize: 18,
-                          : videoItem['title'],
+                fontWeight: FontWeight.bold,
-                      style: const TextStyle(
+              ),
-                        fontSize: 18,
+              maxLines: 2,
-                        fontWeight: FontWeight.bold,
+              overflow: TextOverflow.ellipsis,
-                      ),
+            ),
-                      maxLines: 2,
+          ),
-                      overflow: TextOverflow.ellipsis,
+          Stack(
-                    ),
+            children: [
-                  ),
+              GestureDetector(
-                  Stack(
+                behavior: HitTestBehavior.translucent,
+                onTap: () => showIntroDetail(),
+                child: Padding(
+                  padding: const EdgeInsets.only(top: 7, bottom: 6),
+                  child: Row(
                     children: [
-                      GestureDetector(
+                      StatView(
-                        behavior: HitTestBehavior.translucent,
+                        theme: 'gray',
-                        onTap: () => showIntroDetail(),
+                        view: widget.videoDetail!.stat!.view,
-                        child: Padding(
+                        size: 'medium',
-                          padding: const EdgeInsets.only(top: 7, bottom: 6),
+                      ),
-                          child: Row(
+                      const SizedBox(width: 10),
-                            children: [
+                      StatDanMu(
-                              StatView(
+                        theme: 'gray',
-                                theme: 'gray',
+                        danmu: widget.videoDetail!.stat!.danmaku,
-                                view: !loadingStatus
+                        size: 'medium',
-                                    ? widget.videoDetail!.stat!.view
+                      ),
-                                    : videoItem['stat'].view,
+                      const SizedBox(width: 10),
-                                size: 'medium',
+                      Text(
-                              ),
+                        Utils.dateFormat(widget.videoDetail!.pubdate,
-                              const SizedBox(width: 10),
+                            formatType: 'detail'),
-                              StatDanMu(
+                        style: TextStyle(
-                                theme: 'gray',
+                          fontSize: 12,
-                                danmu: !loadingStatus
+                          color: t.colorScheme.outline,
-                                    ? widget.videoDetail!.stat!.danmaku
-                                    : videoItem['stat'].danmaku,
-                                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,
-                                ),
-                              ),
-                              const SizedBox(width: 10),
-                              if (videoIntroController.isShowOnlineTotal)
-                                Obx(
-                                  () => Text(
-                                    '${videoIntroController.total.value}人在看',
-                                    style: TextStyle(
-                                      fontSize: 12,
-                                      color: t.colorScheme.outline,
-                                    ),
-                                  ),
-                                ),
-                            ],
-                          ),
                         ),
                       ),
-                      if (enableAi)
+                      const SizedBox(width: 10),
-                        Positioned(
+                      if (videoIntroController.isShowOnlineTotal)
-                          right: 10,
+                        Obx(
-                          top: 6,
+                          () => Text(
-                          child: GestureDetector(
+                            '${videoIntroController.total.value}人在看',
-                            onTap: () async {
-                              final res =
-                                  await videoIntroController.aiConclusion();
-                              if (res['status']) {
-                                showAiBottomSheet();
-                              }
-                            },
-                            child:
-                                Image.asset('assets/images/ai.png', height: 22),
-                          ),
-                        )
-                    ],
-                  ),
-                  // 点赞收藏转发 布局样式1
-                  // SingleChildScrollView(
-                  //   padding: const EdgeInsets.only(top: 7, bottom: 7),
-                  //   scrollDirection: Axis.horizontal,
-                  //   child: actionRow(
-                  //     context,
-                  //     videoIntroController,
-                  //     videoDetailCtr,
-                  //   ),
-                  // ),
-                  // 点赞收藏转发 布局样式2
-                  actionGrid(context, videoIntroController),
-                  // 合集
-                  if (!loadingStatus &&
-                      widget.videoDetail!.ugcSeason != null) ...[
-                    Obx(
-                      () => SeasonPanel(
-                        ugcSeason: widget.videoDetail!.ugcSeason!,
-                        cid: videoIntroController.lastPlayCid.value != 0
-                            ? videoIntroController.lastPlayCid.value
-                            : widget.videoDetail!.pages!.first.cid,
-                        sheetHeight: sheetHeight,
-                        changeFuc: (bvid, cid, aid) => videoIntroController
-                            .changeSeasonOrbangu(bvid, cid, aid),
-                      ),
-                    )
-                  ],
-                  if (!loadingStatus &&
-                      widget.videoDetail!.pages != null &&
-                      widget.videoDetail!.pages!.length > 1) ...[
-                    Obx(() => PagesPanel(
-                          pages: widget.videoDetail!.pages!,
-                          cid: videoIntroController.lastPlayCid.value,
-                          sheetHeight: sheetHeight,
-                          changeFuc: (cid) =>
-                              videoIntroController.changeSeasonOrbangu(
-                                  videoIntroController.bvid, cid, null),
-                        ))
-                  ],
-                  GestureDetector(
-                    onTap: onPushMember,
-                    child: Container(
-                      padding: const EdgeInsets.symmetric(
-                          vertical: 12, horizontal: 4),
-                      child: Row(
-                        children: [
-                          NetworkImgLayer(
-                            type: 'avatar',
-                            src: loadingStatus
-                                ? owner.face
-                                : widget.videoDetail!.owner!.face,
-                            width: 34,
-                            height: 34,
-                            fadeInDuration: Duration.zero,
-                            fadeOutDuration: Duration.zero,
-                          ),
-                          const SizedBox(width: 10),
-                          Text(owner.name,
-                              style: const TextStyle(fontSize: 13)),
-                          const SizedBox(width: 6),
-                          Text(
-                            follower,
                             style: TextStyle(
-                              fontSize: t.textTheme.labelSmall!.fontSize,
+                              fontSize: 12,
-                              color: outline,
+                              color: t.colorScheme.outline,
                             ),
                           ),
-                          const Spacer(),
+                        ),
-                          Obx(() => AnimatedOpacity(
+                    ],
-                                opacity: loadingStatus ||
-                                        videoIntroController
-                                            .followStatus.isEmpty
-                                    ? 0
-                                    : 1,
-                                duration: const Duration(milliseconds: 50),
-                                child: SizedBox(
-                                  height: 32,
-                                  child: Obx(
-                                    () => videoIntroController
-                                            .followStatus.isNotEmpty
-                                        ? TextButton(
-                                            onPressed: videoIntroController
-                                                .actionRelationMod,
-                                            style: TextButton.styleFrom(
-                                              padding: const EdgeInsets.only(
-                                                  left: 8, right: 8),
-                                              foregroundColor:
-                                                  followStatus['attribute'] != 0
-                                                      ? outline
-                                                      : t.colorScheme.onPrimary,
-                                              backgroundColor:
-                                                  followStatus['attribute'] != 0
-                                                      ? t.colorScheme
-                                                          .onInverseSurface
-                                                      : t.colorScheme
-                                                          .primary, // 设置按钮背景色
-                                            ),
-                                            child: Text(
-                                              followStatus['attribute'] != 0
-                                                  ? '已关注'
-                                                  : '关注',
-                                              style: TextStyle(
-                                                  fontSize: t.textTheme
-                                                      .labelMedium!.fontSize),
-                                            ),
-                                          )
-                                        : ElevatedButton(
-                                            onPressed: videoIntroController
-                                                .actionRelationMod,
-                                            child: const Text('关注'),
-                                          ),
-                                  ),
-                                ),
-                              )),
-                        ],
-                      ),
-                    ),
                   ),
-                ],
-              )
-            : const SizedBox(
-                height: 100,
-                child: Center(
-                  child: CircularProgressIndicator(),
                 ),
               ),
-      ),
+              if (enableAi)
+                Positioned(
+                  right: 10,
+                  top: 6,
+                  child: GestureDetector(
+                    onTap: () async {
+                      final res = await videoIntroController.aiConclusion();
+                      if (res['status']) {
+                        showAiBottomSheet();
+                      }
+                    },
+                    child: Image.asset('assets/images/ai.png', height: 22),
+                  ),
+                )
+            ],
+          ),
+
+          /// 点赞收藏转发
+          actionGrid(context, videoIntroController),
+          // 合集
+          if (widget.videoDetail!.ugcSeason != null) ...[
+            Obx(
+              () => SeasonPanel(
+                ugcSeason: widget.videoDetail!.ugcSeason!,
+                cid: videoIntroController.lastPlayCid.value != 0
+                    ? videoIntroController.lastPlayCid.value
+                    : widget.videoDetail!.pages!.first.cid,
+                sheetHeight: sheetHeight,
+                changeFuc: (bvid, cid, aid) =>
+                    videoIntroController.changeSeasonOrbangu(bvid, cid, aid),
+              ),
+            )
+          ],
+          if (widget.videoDetail!.pages != null &&
+              widget.videoDetail!.pages!.length > 1) ...[
+            Obx(() => PagesPanel(
+                  pages: widget.videoDetail!.pages!,
+                  cid: videoIntroController.lastPlayCid.value,
+                  sheetHeight: sheetHeight,
+                  changeFuc: (cid) => videoIntroController.changeSeasonOrbangu(
+                      videoIntroController.bvid, cid, null),
+                ))
+          ],
+          GestureDetector(
+            onTap: onPushMember,
+            child: Container(
+              padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 4),
+              child: Row(
+                children: [
+                  NetworkImgLayer(
+                    type: 'avatar',
+                    src: widget.videoDetail!.owner!.face,
+                    width: 34,
+                    height: 34,
+                    fadeInDuration: Duration.zero,
+                    fadeOutDuration: Duration.zero,
+                  ),
+                  const SizedBox(width: 10),
+                  Text(owner.name, style: const TextStyle(fontSize: 13)),
+                  const SizedBox(width: 6),
+                  Text(
+                    follower,
+                    style: TextStyle(
+                      fontSize: t.textTheme.labelSmall!.fontSize,
+                      color: outline,
+                    ),
+                  ),
+                  const Spacer(),
+                  Obx(() => AnimatedOpacity(
+                        opacity:
+                            videoIntroController.followStatus.isEmpty ? 0 : 1,
+                        duration: const Duration(milliseconds: 50),
+                        child: SizedBox(
+                          height: 32,
+                          child: Obx(
+                            () => videoIntroController.followStatus.isNotEmpty
+                                ? TextButton(
+                                    onPressed:
+                                        videoIntroController.actionRelationMod,
+                                    style: TextButton.styleFrom(
+                                      padding: const EdgeInsets.only(
+                                          left: 8, right: 8),
+                                      foregroundColor:
+                                          followStatus['attribute'] != 0
+                                              ? outline
+                                              : t.colorScheme.onPrimary,
+                                      backgroundColor:
+                                          followStatus['attribute'] != 0
+                                              ? t.colorScheme.onInverseSurface
+                                              : t.colorScheme
+                                                  .primary, // 设置按钮背景色
+                                    ),
+                                    child: Text(
+                                      followStatus['attribute'] != 0
+                                          ? '已关注'
+                                          : '关注',
+                                      style: TextStyle(
+                                          fontSize: t
+                                              .textTheme.labelMedium!.fontSize),
+                                    ),
+                                  )
+                                : ElevatedButton(
+                                    onPressed:
+                                        videoIntroController.actionRelationMod,
+                                    child: const Text('关注'),
+                                  ),
+                          ),
+                        ),
+                      )),
+                ],
+              ),
+            ),
+          ),
+        ],
+      )),
     );
   }
 
@@ -494,10 +449,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                   selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp),
                   onTap: handleState(videoIntroController.actionLikeVideo),
                   selectStatus: videoIntroController.hasLike.value,
-                  loadingStatus: loadingStatus,
+                  text: widget.videoDetail!.stat!.like!.toString()),
-                  text: !loadingStatus
-                      ? widget.videoDetail!.stat!.like!.toString()
-                      : '-'),
             ),
             // ActionItem(
             //     icon: const Icon(FontAwesomeIcons.clock),
@@ -507,104 +459,38 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
             //     text: '稍后再看'),
             Obx(
               () => ActionItem(
-                  icon: const Icon(FontAwesomeIcons.b),
+                icon: const Icon(FontAwesomeIcons.b),
-                  selectIcon: const Icon(FontAwesomeIcons.b),
+                selectIcon: const Icon(FontAwesomeIcons.b),
-                  onTap: handleState(videoIntroController.actionCoinVideo),
+                onTap: handleState(videoIntroController.actionCoinVideo),
-                  selectStatus: videoIntroController.hasCoin.value,
+                selectStatus: videoIntroController.hasCoin.value,
-                  loadingStatus: loadingStatus,
+                text: widget.videoDetail!.stat!.coin!.toString(),
-                  text: !loadingStatus
+              ),
-                      ? widget.videoDetail!.stat!.coin!.toString()
-                      : '-'),
             ),
             Obx(
               () => ActionItem(
-                  icon: const Icon(FontAwesomeIcons.star),
+                icon: const Icon(FontAwesomeIcons.star),
-                  selectIcon: const Icon(FontAwesomeIcons.solidStar),
+                selectIcon: const Icon(FontAwesomeIcons.solidStar),
-                  onTap: () => showFavBottomSheet(),
+                onTap: () => showFavBottomSheet(),
-                  onLongPress: () => showFavBottomSheet(type: 'longPress'),
+                onLongPress: () => showFavBottomSheet(type: 'longPress'),
-                  selectStatus: videoIntroController.hasFav.value,
+                selectStatus: videoIntroController.hasFav.value,
-                  loadingStatus: loadingStatus,
+                text: widget.videoDetail!.stat!.favorite!.toString(),
-                  text: !loadingStatus
+              ),
-                      ? widget.videoDetail!.stat!.favorite!.toString()
-                      : '-'),
             ),
             ActionItem(
-                icon: const Icon(FontAwesomeIcons.comment),
+              icon: const Icon(FontAwesomeIcons.comment),
-                onTap: () => videoDetailCtr.tabCtr.animateTo(1),
+              onTap: () => videoDetailCtr.tabCtr.animateTo(1),
-                selectStatus: false,
+              selectStatus: false,
-                loadingStatus: loadingStatus,
+              text: widget.videoDetail!.stat!.reply!.toString(),
-                text: !loadingStatus
+            ),
-                    ? widget.videoDetail!.stat!.reply!.toString()
-                    : '评论'),
             ActionItem(
-                icon: const Icon(FontAwesomeIcons.shareFromSquare),
+              icon: const Icon(FontAwesomeIcons.shareFromSquare),
-                onTap: () => videoIntroController.actionShareVideo(),
+              onTap: () => videoIntroController.actionShareVideo(),
-                selectStatus: false,
+              selectStatus: false,
-                loadingStatus: loadingStatus,
+              text: '分享',
-                text: '分享'),
+            ),
           ],
         ),
       );
     });
   }
-
-  Widget actionRow(BuildContext context, videoIntroController, videoDetailCtr) {
-    return Row(children: <Widget>[
-      Obx(
-        () => ActionRowItem(
-          icon: const Icon(FontAwesomeIcons.thumbsUp),
-          onTap: handleState(videoIntroController.actionLikeVideo),
-          selectStatus: videoIntroController.hasLike.value,
-          loadingStatus: loadingStatus,
-          text:
-              !loadingStatus ? widget.videoDetail!.stat!.like!.toString() : '-',
-        ),
-      ),
-      const SizedBox(width: 8),
-      Obx(
-        () => ActionRowItem(
-          icon: const Icon(FontAwesomeIcons.b),
-          onTap: handleState(videoIntroController.actionCoinVideo),
-          selectStatus: videoIntroController.hasCoin.value,
-          loadingStatus: loadingStatus,
-          text:
-              !loadingStatus ? widget.videoDetail!.stat!.coin!.toString() : '-',
-        ),
-      ),
-      const SizedBox(width: 8),
-      Obx(
-        () => ActionRowItem(
-          icon: const Icon(FontAwesomeIcons.heart),
-          onTap: () => showFavBottomSheet(),
-          onLongPress: () => showFavBottomSheet(type: 'longPress'),
-          selectStatus: videoIntroController.hasFav.value,
-          loadingStatus: loadingStatus,
-          text: !loadingStatus
-              ? widget.videoDetail!.stat!.favorite!.toString()
-              : '-',
-        ),
-      ),
-      const SizedBox(width: 8),
-      ActionRowItem(
-        icon: const Icon(FontAwesomeIcons.comment),
-        onTap: () {
-          videoDetailCtr.tabCtr.animateTo(1);
-        },
-        selectStatus: false,
-        loadingStatus: loadingStatus,
-        text:
-            !loadingStatus ? widget.videoDetail!.stat!.reply!.toString() : '-',
-      ),
-      const SizedBox(width: 8),
-      ActionRowItem(
-          icon: const Icon(FontAwesomeIcons.share),
-          onTap: () => videoIntroController.actionShareVideo(),
-          selectStatus: false,
-          loadingStatus: loadingStatus,
-          // text: !loadingStatus
-          //     ? widget.videoDetail!.stat!.share!.toString()
-          //     : '-',
-          text: '转发'),
-    ]);
-  }
 }

lib/pages/video/detail/introduction/widgets/action_item.dart

@@ -7,7 +7,6 @@ class ActionItem extends StatelessWidget {
   final Icon? selectIcon;
   final Function? onTap;
   final Function? onLongPress;
-  final bool? loadingStatus;
   final String? text;
   final bool selectStatus;
 
@@ -17,7 +16,6 @@ class ActionItem extends StatelessWidget {
     this.selectIcon,
     this.onTap,
     this.onLongPress,
-    this.loadingStatus,
     this.text,
     this.selectStatus = false,
   }) : super(key: key);
@@ -43,25 +41,15 @@ class ActionItem extends StatelessWidget {
               : Icon(icon!.icon!,
                   size: 18, color: Theme.of(context).colorScheme.outline),
           const SizedBox(height: 6),
-          AnimatedOpacity(
+          Text(
-            opacity: loadingStatus! ? 0 : 1,
+            text ?? '',
-            duration: const Duration(milliseconds: 200),
+            style: TextStyle(
-            child: AnimatedSwitcher(
+              color: selectStatus
-              duration: const Duration(milliseconds: 300),
+                  ? Theme.of(context).colorScheme.primary
-              transitionBuilder: (Widget child, Animation<double> animation) {
+                  : Theme.of(context).colorScheme.outline,
-                return ScaleTransition(scale: animation, child: child);
+              fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
-              },
-              child: Text(
-                text ?? '',
-                key: ValueKey<String>(text ?? ''),
-                style: TextStyle(
-                    color: selectStatus
-                        ? Theme.of(context).colorScheme.primary
-                        : Theme.of(context).colorScheme.outline,
-                    fontSize: Theme.of(context).textTheme.labelSmall!.fontSize),
-              ),
             ),
-          ),
+          )
         ],
       ),
     );

lib/pages/video/detail/introduction/widgets/intro_detail.dart

@@ -23,7 +23,10 @@ class IntroDetail extends StatelessWidget {
     sheetHeight = localCache.get('sheetHeight');
     return Container(
         color: Theme.of(context).colorScheme.background,
-        padding: const EdgeInsets.only(left: 14, right: 14),
+        padding: EdgeInsets.only(
+            left: 14,
+            right: 14,
+            bottom: MediaQuery.of(context).padding.bottom + 20),
         height: sheetHeight,
         child: Column(
           children: [

lib/pages/video/detail/introduction/widgets/page.dart

@@ -56,6 +56,37 @@ class _PagesPanelState extends State<PagesPanel> {
     super.dispose();
   }
 
+  Widget buildEpisodeListItem(
+    Part episode,
+    int index,
+    bool isCurrentIndex,
+  ) {
+    Color primary = Theme.of(context).colorScheme.primary;
+    return ListTile(
+      onTap: () {
+        changeFucCall(episode, index);
+        Get.back();
+      },
+      dense: false,
+      leading: isCurrentIndex
+          ? Image.asset(
+              'assets/images/live.gif',
+              color: primary,
+              height: 12,
+            )
+          : null,
+      title: Text(
+        episode.pagePart!,
+        style: TextStyle(
+          fontSize: 14,
+          color: isCurrentIndex
+              ? primary
+              : Theme.of(context).colorScheme.onSurface,
+        ),
+      ),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     return Column(
@@ -131,39 +162,25 @@ class _PagesPanelState extends State<PagesPanel> {
                                   child: Material(
                                     child: ListView.builder(
                                       controller: _scrollController,
-                                      itemCount: episodes.length,
+                                      itemCount: episodes.length + 1,
                                       itemBuilder:
                                           (BuildContext context, int index) {
-                                        return ListTile(
+                                        bool isLastItem =
-                                          onTap: () {
+                                            index == episodes.length;
-                                            changeFucCall(
+                                        bool isCurrentIndex =
-                                                episodes[index], index);
+                                            currentIndex == index;
-                                            Get.back();
+                                        return isLastItem
-                                          },
+                                            ? SizedBox(
-                                          dense: false,
+                                                height: MediaQuery.of(context)
-                                          leading: index == currentIndex
+                                                        .padding
-                                              ? Image.asset(
+                                                        .bottom +
-                                                  'assets/images/live.gif',
+                                                    20,
-                                                  color: Theme.of(context)
+                                              )
-                                                      .colorScheme
+                                            : buildEpisodeListItem(
-                                                      .primary,
+                                                episodes[index],
-                                                  height: 12,
+                                                index,
-                                                )
+                                                isCurrentIndex,
-                                              : null,
+                                              );
-                                          title: Text(
-                                            episodes[index].pagePart!,
-                                            style: TextStyle(
-                                              fontSize: 14,
-                                              color: index == currentIndex
-                                                  ? Theme.of(context)
-                                                      .colorScheme
-                                                      .primary
-                                                  : Theme.of(context)
-                                                      .colorScheme
-                                                      .onSurface,
-                                            ),
-                                          ),
-                                        );
                                       },
                                     ),
                                   ),
@@ -192,6 +209,7 @@ class _PagesPanelState extends State<PagesPanel> {
             itemCount: widget.pages.length,
             itemExtent: 150,
             itemBuilder: (BuildContext context, int i) {
+              bool isCurrentIndex = currentIndex == i;
               return Container(
                 width: 150,
                 margin: const EdgeInsets.only(right: 10),
@@ -206,7 +224,7 @@ class _PagesPanelState extends State<PagesPanel> {
                           vertical: 8, horizontal: 8),
                       child: Row(
                         children: <Widget>[
-                          if (i == currentIndex) ...<Widget>[
+                          if (isCurrentIndex) ...<Widget>[
                             Image.asset(
                               'assets/images/live.gif',
                               color: Theme.of(context).colorScheme.primary,
@@ -220,7 +238,7 @@ class _PagesPanelState extends State<PagesPanel> {
                             maxLines: 1,
                             style: TextStyle(
                                 fontSize: 13,
-                                color: i == currentIndex
+                                color: isCurrentIndex
                                     ? Theme.of(context).colorScheme.primary
                                     : Theme.of(context).colorScheme.onSurface),
                             overflow: TextOverflow.ellipsis,

lib/pages/video/detail/introduction/widgets/season.dart

@@ -80,6 +80,34 @@ class _SeasonPanelState extends State<SeasonPanel> {
     super.dispose();
   }
 
+  Widget buildEpisodeListItem(
+    EpisodeItem episode,
+    int index,
+    bool isCurrentIndex,
+  ) {
+    Color primary = Theme.of(context).colorScheme.primary;
+    return ListTile(
+      onTap: () => changeFucCall(episode, index),
+      dense: false,
+      leading: isCurrentIndex
+          ? Image.asset(
+              'assets/images/live.gif',
+              color: primary,
+              height: 12,
+            )
+          : null,
+      title: Text(
+        episode.title!,
+        style: TextStyle(
+          fontSize: 14,
+          color: isCurrentIndex
+              ? primary
+              : Theme.of(context).colorScheme.onSurface,
+        ),
+      ),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     return Builder(builder: (BuildContext context) {
@@ -133,33 +161,23 @@ class _SeasonPanelState extends State<SeasonPanel> {
                         Expanded(
                           child: Material(
                             child: ScrollablePositionedList.builder(
-                              itemCount: episodes.length,
+                              itemCount: episodes.length + 1,
-                              itemBuilder: (BuildContext context, int index) =>
+                              itemBuilder: (BuildContext context, int index) {
-                                  ListTile(
+                                bool isLastItem = index == episodes.length;
-                                onTap: () =>
+                                bool isCurrentIndex = currentIndex == index;
-                                    changeFucCall(episodes[index], index),
+                                return isLastItem
-                                dense: false,
+                                    ? SizedBox(
-                                leading: index == currentIndex
+                                        height: MediaQuery.of(context)
-                                    ? Image.asset(
+                                                .padding
-                                        'assets/images/live.gif',
+                                                .bottom +
-                                        color: Theme.of(context)
+                                            20,
-                                            .colorScheme
-                                            .primary,
-                                        height: 12,
                                       )
-                                    : null,
+                                    : buildEpisodeListItem(
-                                title: Text(
+                                        episodes[index],
-                                  episodes[index].title!,
+                                        index,
-                                  style: TextStyle(
+                                        isCurrentIndex,
-                                    fontSize: 14,
+                                      );
-                                    color: index == currentIndex
+                              },
-                                        ? Theme.of(context).colorScheme.primary
-                                        : Theme.of(context)
-                                            .colorScheme
-                                            .onSurface,
-                                  ),
-                                ),
-                              ),
                               itemScrollController: itemScrollController,
                             ),
                           ),

lib/pages/video/detail/reply/controller.dart

@@ -22,7 +22,7 @@ class VideoReplyController extends GetxController {
   String? replyLevel;
   // rpid 请求楼中楼回复
   String? rpid;
-  RxList<ReplyItemModel> replyList = [ReplyItemModel()].obs;
+  RxList<ReplyItemModel> replyList = <ReplyItemModel>[].obs;
   // 当前页
   int currentPage = 0;
   bool isLoadingMore = false;
@@ -62,6 +62,7 @@ class VideoReplyController extends GetxController {
       noMore.value = '';
     }
     if (noMore.value == '没有更多了') {
+      isLoadingMore = false;
       return;
     }
     final res = await ReplyHttp.replyList(

lib/pages/video/detail/reply/view.dart

@@ -134,13 +134,13 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
     super.build(context);
     return RefreshIndicator(
       onRefresh: () async {
-        _videoReplyController.currentPage = 0;
+        return await _videoReplyController.queryReplyList(type: 'init');
-        return await _videoReplyController.queryReplyList();
       },
       child: Stack(
         children: [
           CustomScrollView(
             controller: scrollController,
+            physics: const AlwaysScrollableScrollPhysics(),
             key: const PageStorageKey<String>('评论'),
             slivers: <Widget>[
               SliverPersistentHeader(
@@ -148,35 +148,14 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                 floating: true,
                 delegate: _MySliverPersistentHeaderDelegate(
                   child: Container(
-                    height: 45,
+                    height: 40,
-                    padding: const EdgeInsets.fromLTRB(12, 0, 6, 0),
+                    padding: const EdgeInsets.fromLTRB(12, 6, 6, 0),
-                    decoration: BoxDecoration(
-                      color: Theme.of(context).colorScheme.background,
-                      border: Border(
-                        bottom: BorderSide(
-                            color: Theme.of(context)
-                                .colorScheme
-                                .outline
-                                .withOpacity(0.1)),
-                      ),
-                    ),
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
-                        Obx(
+                        Text(
-                          () => AnimatedSwitcher(
+                          '${_videoReplyController.sortTypeLabel.value}评论',
-                            duration: const Duration(milliseconds: 400),
+                          style: const TextStyle(fontSize: 13),
-                            transitionBuilder:
-                                (Widget child, Animation<double> animation) {
-                              return ScaleTransition(
-                                  scale: animation, child: child);
-                            },
-                            child: Text(
-                              '共${_videoReplyController.count.value}条回复',
-                              key: ValueKey<int>(
-                                  _videoReplyController.count.value),
-                            ),
-                          ),
                         ),
                         SizedBox(
                           height: 35,
@@ -184,10 +163,12 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                             onPressed: () =>
                                 _videoReplyController.queryBySort(),
                             icon: const Icon(Icons.sort, size: 16),
-                            label: Obx(() => Text(
+                            label: Obx(
-                                  _videoReplyController.sortTypeLabel.value,
+                              () => Text(
-                                  style: const TextStyle(fontSize: 13),
+                                _videoReplyController.sortTypeLabel.value,
-                                )),
+                                style: const TextStyle(fontSize: 13),
+                              ),
+                            ),
                           ),
                         )
                       ],
@@ -329,8 +310,8 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
 
 class _MySliverPersistentHeaderDelegate extends SliverPersistentHeaderDelegate {
   _MySliverPersistentHeaderDelegate({required this.child});
-  final double _minExtent = 45;
+  final double _minExtent = 40;
-  final double _maxExtent = 45;
+  final double _maxExtent = 40;
   final Widget child;
 
   @override

lib/pages/video/detail/reply/widgets/reply_item.dart

@@ -280,7 +280,7 @@ class ReplyItem extends StatelessWidget {
                     // 完成评论，数据添加
                     if (value != null && value['data'] != null)
                       {
-                        addReply!(value['data'])
+                        addReply?.call(value['data'])
                         // replyControl.replies.add(value['data']),
                       }
                   });
@@ -498,7 +498,7 @@ InlineSpan buildContent(
       return str;
     });
   }
-  // content.message = content.message.replaceAll(RegExp(r"\{vote:.*?\}"), ' ');
+  content.message = content.message.replaceAll(RegExp(r"\{vote:.*?\}"), ' ');
   content.message = content.message
       .replaceAll('&', '&')
       .replaceAll('&lt;', '<')
@@ -506,29 +506,33 @@ InlineSpan buildContent(
       .replaceAll('&quot;', '"')
       .replaceAll('&apos;', "'")
       .replaceAll('&nbsp;', ' ');
-  // print("content.jumpUrl.keys:" + content.jumpUrl.keys.toString());
   // 构建正则表达式
   final List<String> specialTokens = [
     ...content.emote.keys,
     ...content.topicsMeta?.keys?.map((e) => '#$e#') ?? [],
     ...content.atNameToMid.keys.map((e) => '@$e'),
-    ...content.jumpUrl.keys.map((e) =>
-        e.replaceAll('?', '\\?').replaceAll('+', '\\+').replaceAll('*', '\\*')),
   ];
+  List<dynamic> jumpUrlKeysList = content.jumpUrl.keys.map((e) {
+    return e.replaceAllMapped(
+        RegExp(r'[?+*]'), (match) => '\\${match.group(0)}');
+  }).toList();
 
   String patternStr = specialTokens.map(RegExp.escape).join('|');
   if (patternStr.isNotEmpty) {
     patternStr += "|";
   }
   patternStr += r'(\b(?:\d+[:：])?[0-5]?[0-9][:：][0-5]?[0-9]\b)';
+  if (jumpUrlKeysList.isNotEmpty) {
+    patternStr += '|${jumpUrlKeysList.join('|')}';
+  }
   final RegExp pattern = RegExp(patternStr);
   List<String> matchedStrs = [];
   void addPlainTextSpan(str) {
     spanChilds.add(TextSpan(
         text: str,
         recognizer: TapGestureRecognizer()
-          ..onTap =
+          ..onTap = () =>
-              () => replyReply(replyItem.root == 0 ? replyItem : fReplyItem)));
+              replyReply?.call(replyItem.root == 0 ? replyItem : fReplyItem)));
   }
 
   // 分割文本并处理每个部分
@@ -599,7 +603,6 @@ InlineSpan buildContent(
           ),
         );
       } else {
-        print("matchStr=$matchStr");
         String appUrlSchema = '';
         final bool enableWordRe = setting.get(SettingBoxKey.enableWordRe,
             defaultValue: false) as bool;
@@ -639,6 +642,11 @@ InlineSpan buildContent(
                       } else {
                         final String redirectUrl =
                             await UrlUtils.parseRedirectUrl(matchStr);
+                        if (redirectUrl == matchStr) {
+                          Clipboard.setData(ClipboardData(text: matchStr));
+                          SmartDialog.showToast('地址可能有误');
+                          return;
+                        }
                         final String pathSegment = Uri.parse(redirectUrl).path;
                         final String lastPathSegment =
                             pathSegment.split('/').last;

lib/pages/video/detail/reply_new/view.dart

@@ -109,21 +109,26 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
   @override
   void didChangeMetrics() {
     super.didChangeMetrics();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
+    final String routePath = Get.currentRoute;
-      // 键盘高度
+    if (mounted &&
-      final viewInsets = EdgeInsets.fromViewPadding(
+        (routePath.startsWith('/video') ||
-          View.of(context).viewInsets, View.of(context).devicePixelRatio);
+            routePath.startsWith('/dynamicDetail'))) {
-      _debouncer.run(() {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
-        if (mounted) {
+        // 键盘高度
-          if (keyboardHeight == 0 && emoteHeight == 0) {
+        final viewInsets = EdgeInsets.fromViewPadding(
-            setState(() {
+            View.of(context).viewInsets, View.of(context).devicePixelRatio);
-              emoteHeight = keyboardHeight =
+        _debouncer.run(() {
-                  keyboardHeight == 0.0 ? viewInsets.bottom : keyboardHeight;
+          if (mounted) {
-            });
+            if (keyboardHeight == 0 && emoteHeight == 0) {
+              setState(() {
+                emoteHeight = keyboardHeight =
+                    keyboardHeight == 0.0 ? viewInsets.bottom : keyboardHeight;
+              });
+            }
           }
-        }
+        });
       });
-    });
+    }
   }
 
   @override
@@ -131,11 +136,15 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
     WidgetsBinding.instance.removeObserver(this);
     _replyContentController.dispose();
     replyContentFocusNode.removeListener(() {});
+    replyContentFocusNode.dispose();
     super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
+    double keyboardHeight = EdgeInsets.fromViewPadding(
+            View.of(context).viewInsets, View.of(context).devicePixelRatio)
+        .bottom;
     return Container(
       clipBehavior: Clip.hardEdge,
       decoration: BoxDecoration(

lib/pages/video/detail/reply_reply/controller.dart

@@ -12,7 +12,7 @@ class VideoReplyReplyController extends GetxController {
   // rpid 请求楼中楼回复
   String? rpid;
   ReplyType replyType = ReplyType.video;
-  RxList<ReplyItemModel> replyList = [ReplyItemModel()].obs;
+  RxList<ReplyItemModel> replyList = <ReplyItemModel>[].obs;
   // 当前页
   int currentPage = 0;
   bool isLoadingMore = false;
@@ -30,6 +30,9 @@ class VideoReplyReplyController extends GetxController {
     if (type == 'init') {
       currentPage = 0;
     }
+    if (isLoadingMore) {
+      return;
+    }
     isLoadingMore = true;
     final res = await ReplyHttp.replyReplyList(
       oid: aid!,
@@ -41,7 +44,7 @@ class VideoReplyReplyController extends GetxController {
       final List<ReplyItemModel> replies = res['data'].replies;
       if (replies.isNotEmpty) {
         noMore.value = '加载中...';
-        if (replyList.length == res['data'].page.count) {
+        if (replies.length == res['data'].page.count) {
           noMore.value = '没有更多了';
         }
         currentPage++;
@@ -50,21 +53,6 @@ class VideoReplyReplyController extends GetxController {
         noMore.value = currentPage == 0 ? '还没有评论' : '没有更多了';
       }
       if (type == 'init') {
-        // List<ReplyItemModel> replies = res['data'].replies;
-        // 添加置顶回复
-        // if (res['data'].upper.top != null) {
-        //   bool flag = false;
-        //   for (var i = 0; i < res['data'].topReplies.length; i++) {
-        //     if (res['data'].topReplies[i].rpid == res['data'].upper.top.rpid) {
-        //       flag = true;
-        //     }
-        //   }
-        //   if (!flag) {
-        //     replies.insert(0, res['data'].upper.top);
-        //   }
-        // }
-        // replies.insertAll(0, res['data'].topReplies);
-        // res['data'].replies = replies;
         replyList.value = replies;
       } else {
         // 每次回复之后，翻页请求有且只有相同的一条回复数据

lib/pages/video/detail/reply_reply/view.dart

@@ -54,7 +54,8 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
       () {
         if (scrollController.position.pixels >=
             scrollController.position.maxScrollExtent - 300) {
-          EasyThrottle.throttle('replylist', const Duration(seconds: 2), () {
+          EasyThrottle.throttle('replylist', const Duration(milliseconds: 200),
+              () {
             _videoReplyReplyController.queryReplyList(type: 'onLoad');
           });
         }
@@ -92,7 +93,7 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
                     icon: const Icon(Icons.close, size: 20),
                     onPressed: () {
                       _videoReplyReplyController.currentPage = 0;
-                      widget.closePanel!();
+                      widget.closePanel?.call;
                       Navigator.pop(context);
                     },
                   ),
@@ -184,6 +185,8 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
                                             .add(replyItem);
                                       },
                                       replyType: widget.replyType,
+                                      replyReply: (replyItem) =>
+                                          replyReply(replyItem),
                                     );
                                   }
                                 },

lib/pages/video/detail/view.dart

@@ -5,10 +5,11 @@ import 'dart:ui';
 import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart';
 import 'package:floating/floating.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
 import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
-import 'package:nil/nil.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/http/user.dart';
 import 'package:pilipala/models/common/search_type.dart';
@@ -23,9 +24,8 @@ import 'package:pilipala/plugin/pl_player/models/play_repeat.dart';
 import 'package:pilipala/services/service_locator.dart';
 import 'package:pilipala/utils/storage.dart';
 
-import 'package:pilipala/plugin/pl_player/utils/fullscreen.dart';
 import '../../../services/shutdown_timer_service.dart';
-import 'widgets/header_control.dart';
+import 'widgets/app_bar.dart';
 
 class VideoDetailPage extends StatefulWidget {
   const VideoDetailPage({Key? key}) : super(key: key);
@@ -38,7 +38,7 @@ class VideoDetailPage extends StatefulWidget {
 
 class _VideoDetailPageState extends State<VideoDetailPage>
     with TickerProviderStateMixin, RouteAware {
-  late VideoDetailController videoDetailController;
+  late VideoDetailController vdCtr;
   PlPlayerController? plPlayerController;
   final ScrollController _extendNestCtr = ScrollController();
   late StreamController<double> appbarStream;
@@ -58,27 +58,25 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   late bool autoExitFullcreen;
   late bool autoPlayEnable;
   late bool autoPiP;
-  final Floating floating = Floating();
+  late Floating floating;
-  // 生命周期监听
-  late final AppLifecycleListener _lifecycleListener;
   bool isShowing = true;
 
   @override
   void initState() {
     super.initState();
     heroTag = Get.arguments['heroTag'];
-    videoDetailController = Get.put(VideoDetailController(), tag: heroTag);
+    vdCtr = Get.put(VideoDetailController(), tag: heroTag);
-    videoIntroController = Get.put(VideoIntroController(), tag: heroTag);
+    videoIntroController = Get.put(
+        VideoIntroController(bvid: Get.parameters['bvid']!),
+        tag: heroTag);
     videoIntroController.videoDetail.listen((value) {
-      videoPlayerServiceHandler.onVideoDetailChange(
+      videoPlayerServiceHandler.onVideoDetailChange(value, vdCtr.cid.value);
-          value, videoDetailController.cid.value);
     });
     bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag);
     bangumiIntroController.bangumiDetail.listen((value) {
-      videoPlayerServiceHandler.onVideoDetailChange(
+      videoPlayerServiceHandler.onVideoDetailChange(value, vdCtr.cid.value);
-          value, videoDetailController.cid.value);
     });
-    videoDetailController.cid.listen((p0) {
+    vdCtr.cid.listen((p0) {
       videoPlayerServiceHandler.onVideoDetailChange(
           bangumiIntroController.bangumiDetail.value, p0);
     });
@@ -91,15 +89,18 @@ class _VideoDetailPageState extends State<VideoDetailPage>
 
     videoSourceInit();
     appbarStreamListen();
-    lifecycleListener();
     fullScreenStatusListener();
+    if (Platform.isAndroid) {
+      floating = vdCtr.floating!;
+      autoEnterPip();
+    }
   }
 
   // 获取视频资源，初始化播放器
   Future<void> videoSourceInit() async {
-    _futureBuilderFuture = videoDetailController.queryVideoUrl();
+    _futureBuilderFuture = vdCtr.queryVideoUrl();
-    if (videoDetailController.autoPlay.value) {
+    if (vdCtr.autoPlay.value) {
-      plPlayerController = videoDetailController.plPlayerController;
+      plPlayerController = vdCtr.plPlayerController;
       plPlayerController!.addStatusLister(playerListener);
     }
   }
@@ -128,10 +129,10 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       /// 顺序播放 列表循环
       if (plPlayerController!.playRepeat != PlayRepeat.pause &&
           plPlayerController!.playRepeat != PlayRepeat.singleCycle) {
-        if (videoDetailController.videoType == SearchType.video) {
+        if (vdCtr.videoType == SearchType.video) {
           videoIntroController.nextPlay();
         }
-        if (videoDetailController.videoType == SearchType.media_bangumi) {
+        if (vdCtr.videoType == SearchType.media_bangumi) {
           bangumiIntroController.nextPlay();
         }
       }
@@ -143,13 +144,16 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       }
       // 播放完展示控制栏
       try {
-        PiPStatus currentStatus =
+        PiPStatus currentStatus = await vdCtr.floating!.pipStatus;
-            await videoDetailController.floating!.pipStatus;
         if (currentStatus == PiPStatus.disabled) {
           plPlayerController!.onLockControl(false);
         }
       } catch (_) {}
     }
+    if (Platform.isAndroid) {
+      floating.toggleAutoPip(
+          autoEnter: status == PlayerStatus.playing && autoPiP);
+    }
   }
 
   // 继续播放或重新播放
@@ -161,38 +165,17 @@ class _VideoDetailPageState extends State<VideoDetailPage>
 
   /// 未开启自动播放时触发播放
   Future<void> handlePlay() async {
-    await videoDetailController.playerInit();
+    await vdCtr.playerInit();
-    plPlayerController = videoDetailController.plPlayerController;
+    plPlayerController = vdCtr.plPlayerController;
     plPlayerController!.addStatusLister(playerListener);
-    videoDetailController.autoPlay.value = true;
+    vdCtr.autoPlay.value = true;
-    videoDetailController.isShowCover.value = false;
+    vdCtr.isShowCover.value = false;
-  }
-
-  // 生命周期监听
-  void lifecycleListener() {
-    _lifecycleListener = AppLifecycleListener(
-      onResume: () => _handleTransition('resume'),
-      // 后台
-      onInactive: () => _handleTransition('inactive'),
-      // 在Android和iOS端不生效
-      onHide: () => _handleTransition('hide'),
-      onShow: () => _handleTransition('show'),
-      onPause: () => _handleTransition('pause'),
-      onRestart: () => _handleTransition('restart'),
-      onDetach: () => _handleTransition('detach'),
-      // 只作用于桌面端
-      onExitRequested: () {
-        ScaffoldMessenger.maybeOf(context)
-            ?.showSnackBar(const SnackBar(content: Text("拦截应用退出")));
-        return Future.value(AppExitResponse.cancel);
-      },
-    );
   }
 
   void fullScreenStatusListener() {
     plPlayerController?.isFullScreen.listen((bool isFullScreen) {
       if (isFullScreen) {
-        videoDetailController.hiddenReplyReplyPanel();
+        vdCtr.hiddenReplyReplyPanel();
       }
     });
   }
@@ -204,12 +187,15 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       plPlayerController!.removeStatusLister(playerListener);
       plPlayerController!.dispose();
     }
-    if (videoDetailController.floating != null) {
+    if (vdCtr.floating != null) {
-      videoDetailController.floating!.dispose();
+      vdCtr.floating!.dispose();
     }
     videoPlayerServiceHandler.onVideoDetailDispose();
-    floating.dispose();
+    if (Platform.isAndroid) {
-    _lifecycleListener.dispose();
+      floating.toggleAutoPip(autoEnter: false);
+      floating.dispose();
+    }
+    appbarStream.close();
     super.dispose();
   }
 
@@ -219,10 +205,10 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     /// 开启
     if (setting.get(SettingBoxKey.enableAutoBrightness, defaultValue: false)
         as bool) {
-      videoDetailController.brightness = plPlayerController!.brightness.value;
+      vdCtr.brightness = plPlayerController!.brightness.value;
     }
     if (plPlayerController != null) {
-      videoDetailController.defaultST = plPlayerController!.position.value;
+      vdCtr.defaultST = plPlayerController!.position.value;
       videoIntroController.isPaused = true;
       plPlayerController!.removeStatusLister(playerListener);
       plPlayerController!.pause();
@@ -238,17 +224,16 @@ class _VideoDetailPageState extends State<VideoDetailPage>
         plPlayerController!.videoPlayerController != null) {
       setState(() => isShowing = true);
     }
-    videoDetailController.isFirstTime = false;
+    vdCtr.isFirstTime = false;
     final bool autoplay = autoPlayEnable;
-    videoDetailController.playerInit(autoplay: autoplay);
+    vdCtr.playerInit(autoplay: autoplay);
 
     /// 未开启自动播放时，未播放跳转下一页返回/播放后跳转下一页返回
-    videoDetailController.autoPlay.value =
+    vdCtr.autoPlay.value = !vdCtr.isShowCover.value;
-        !videoDetailController.isShowCover.value;
     videoIntroController.isPaused = false;
     if (_extendNestCtr.position.pixels == 0 && autoplay) {
       await Future.delayed(const Duration(milliseconds: 300));
-      plPlayerController?.seekTo(videoDetailController.defaultST);
+      plPlayerController?.seekTo(vdCtr.defaultST);
       plPlayerController?.play();
     }
     plPlayerController?.addStatusLister(playerListener);
@@ -262,37 +247,187 @@ class _VideoDetailPageState extends State<VideoDetailPage>
         .subscribe(this, ModalRoute.of(context)! as PageRoute);
   }
 
-  void _handleTransition(String name) {
-    switch (name) {
-      case 'inactive':
-        if (plPlayerController != null &&
-            playerStatus == PlayerStatus.playing) {
-          autoEnterPip();
-        }
-        break;
-    }
-  }
-
   void autoEnterPip() {
     final String routePath = Get.currentRoute;
-    final bool isPortrait =
+    if (autoPiP && routePath.startsWith('/video')) {
-        MediaQuery.of(context).orientation == Orientation.portrait;
+      floating.toggleAutoPip(autoEnter: autoPiP);
-
-    /// TODO 横屏全屏状态下误触pip
-    if (autoPiP && routePath.startsWith('/video') && isPortrait) {
-      floating.enable(
-          aspectRatio: Rational(
-        videoDetailController.data.dash!.video!.first.width!,
-        videoDetailController.data.dash!.video!.first.height!,
-      ));
     }
   }
 
   @override
   Widget build(BuildContext context) {
-    final double videoHeight = MediaQuery.sizeOf(context).width * 9 / 16;
+    // final double videoHeight = MediaQuery.sizeOf(context).width * 9 / 16;
+    final sizeContext = MediaQuery.sizeOf(context);
+    final _context = MediaQuery.of(context);
+    late double defaultVideoHeight = sizeContext.width * 9 / 16;
+    late RxDouble videoHeight = defaultVideoHeight.obs;
     final double pinnedHeaderHeight =
-        statusBarHeight + kToolbarHeight + videoHeight;
+        statusBarHeight + kToolbarHeight + videoHeight.value;
+    // ignore: no_leading_underscores_for_local_identifiers
+
+    // 竖屏
+    final bool isPortrait = _context.orientation == Orientation.portrait;
+    // 横屏
+    final bool isLandscape = _context.orientation == Orientation.landscape;
+    final Rx<bool> isFullScreen = plPlayerController?.isFullScreen ?? false.obs;
+    // 全屏时高度撑满
+    if (isLandscape || isFullScreen.value == true) {
+      videoHeight.value = Get.size.height;
+      enterFullScreen();
+    } else {
+      videoHeight.value = defaultVideoHeight;
+      exitFullScreen();
+    }
+
+    /// 播放器面板
+    Widget videoPlayerPanel = FutureBuilder(
+      future: _futureBuilderFuture,
+      builder: (BuildContext context, AsyncSnapshot snapshot) {
+        if (snapshot.hasData && snapshot.data['status']) {
+          return Obx(
+            () {
+              return !vdCtr.autoPlay.value
+                  ? const SizedBox()
+                  : PLVideoPlayer(
+                      controller: plPlayerController!,
+                      headerControl: vdCtr.headerControl,
+                      danmuWidget: Obx(
+                        () => PlDanmaku(
+                          key: Key(vdCtr.danmakuCid.value.toString()),
+                          cid: vdCtr.danmakuCid.value,
+                          playerController: plPlayerController!,
+                        ),
+                      ),
+                    );
+            },
+          );
+        } else {
+          // 加载失败异常处理
+          return const SizedBox();
+        }
+      },
+    );
+
+    /// tabbar
+    Widget tabbarBuild = Container(
+      width: double.infinity,
+      height: 45,
+      decoration: BoxDecoration(
+        border: Border(
+          bottom: BorderSide(
+            width: 1,
+            color: Theme.of(context).dividerColor.withOpacity(0.1),
+          ),
+        ),
+      ),
+      child: Material(
+        child: Row(
+          children: [
+            Flexible(
+              flex: 1,
+              child: Obx(
+                () => TabBar(
+                  padding: EdgeInsets.zero,
+                  controller: vdCtr.tabCtr,
+                  labelStyle: const TextStyle(fontSize: 13),
+                  labelPadding:
+                      const EdgeInsets.symmetric(horizontal: 10.0), // 设置每个标签的宽度
+                  dividerColor: Colors.transparent,
+                  tabs: vdCtr.tabs
+                      .map(
+                        (String name) => Tab(text: name),
+                      )
+                      .toList(),
+                ),
+              ),
+            ),
+            Flexible(
+                flex: 1,
+                child: Center(
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.end,
+                    children: [
+                      SizedBox(
+                        height: 32,
+                        child: TextButton(
+                          style: ButtonStyle(
+                            padding: MaterialStateProperty.all(EdgeInsets.zero),
+                          ),
+                          onPressed: () => vdCtr.showShootDanmakuSheet(),
+                          child:
+                              const Text('发弹幕', style: TextStyle(fontSize: 12)),
+                        ),
+                      ),
+                      SizedBox(
+                        width: 38,
+                        height: 38,
+                        child: Obx(
+                          () => IconButton(
+                            onPressed: () {
+                              plPlayerController?.isOpenDanmu.value =
+                                  !(plPlayerController?.isOpenDanmu.value ??
+                                      false);
+                            },
+                            icon: !(plPlayerController?.isOpenDanmu.value ??
+                                    false)
+                                ? SvgPicture.asset(
+                                    'assets/images/video/danmu_close.svg',
+                                  )
+                                : SvgPicture.asset(
+                                    'assets/images/video/danmu_open.svg',
+                                    // ignore: deprecated_member_use
+                                    color:
+                                        Theme.of(context).colorScheme.primary,
+                                  ),
+                          ),
+                        ),
+                      ),
+                      const SizedBox(width: 14),
+                    ],
+                  ),
+                )),
+          ],
+        ),
+      ),
+    );
+
+    /// 手动播放
+    Widget handlePlayPanel() {
+      return Stack(
+        children: [
+          GestureDetector(
+            onTap: () {
+              handlePlay();
+            },
+            child: NetworkImgLayer(
+              type: 'emote',
+              src: vdCtr.videoItem['pic'],
+              width: Get.width,
+              height: videoHeight.value,
+            ),
+          ),
+          Positioned(
+            top: 0,
+            left: 0,
+            right: 0,
+            child: buildCustomAppBar(),
+          ),
+          Positioned(
+            right: 12,
+            bottom: 10,
+            child: IconButton(
+                tooltip: '播放',
+                onPressed: () => handlePlay(),
+                icon: Image.asset(
+                  'assets/images/play.png',
+                  width: 60,
+                  height: 60,
+                )),
+          ),
+        ],
+      );
+    }
+
     Widget childWhenDisabled = SafeArea(
       top: MediaQuery.of(context).orientation == Orientation.portrait &&
           plPlayerController?.isFullScreen.value == true,
@@ -304,7 +439,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
         children: [
           Scaffold(
             resizeToAvoidBottomInset: false,
-            key: videoDetailController.scaffoldKey,
+            key: vdCtr.scaffoldKey,
             backgroundColor: Colors.black,
             appBar: PreferredSize(
               preferredSize: const Size.fromHeight(0),
@@ -330,21 +465,19 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                       return SliverAppBar(
                         automaticallyImplyLeading: false,
                         // 假装使用一个非空变量，避免Obx检测不到而罢工
-                        pinned: videoDetailController.autoPlay.value ^
+                        pinned: vdCtr.autoPlay.value,
-                            false ^
-                            videoDetailController.autoPlay.value,
                         elevation: 0,
                         scrolledUnderElevation: 0,
                         forceElevated: innerBoxIsScrolled,
                         expandedHeight: MediaQuery.of(context).orientation ==
                                     Orientation.landscape ||
                                 plPlayerController?.isFullScreen.value == true
-                            ? MediaQuery.sizeOf(context).height -
+                            ? (MediaQuery.sizeOf(context).height -
                                 (MediaQuery.of(context).orientation ==
                                         Orientation.landscape
                                     ? 0
-                                    : MediaQuery.of(context).padding.top)
+                                    : MediaQuery.of(context).padding.top))
-                            : videoHeight,
+                            : videoHeight.value,
                         backgroundColor: Colors.black,
                         flexibleSpace: FlexibleSpaceBar(
                           background: PopScope(
@@ -364,134 +497,27 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                               child: LayoutBuilder(
                                 builder: (BuildContext context,
                                     BoxConstraints boxConstraints) {
-                                  final double maxWidth =
+                                  // final double maxWidth =
-                                      boxConstraints.maxWidth;
+                                  //     boxConstraints.maxWidth;
-                                  final double maxHeight =
+                                  // final double maxHeight =
-                                      boxConstraints.maxHeight;
+                                  //     boxConstraints.maxHeight;
                                   return Stack(
                                     children: <Widget>[
-                                      if (isShowing)
+                                      if (isShowing) videoPlayerPanel,
-                                        FutureBuilder(
-                                          future: _futureBuilderFuture,
-                                          builder: (BuildContext context,
-                                              AsyncSnapshot snapshot) {
-                                            if (snapshot.hasData &&
-                                                snapshot.data['status']) {
-                                              return Obx(
-                                                () =>
-                                                    !videoDetailController
-                                                            .autoPlay.value
-                                                        ? nil
-                                                        : PLVideoPlayer(
-                                                            controller:
-                                                                plPlayerController!,
-                                                            headerControl:
-                                                                videoDetailController
-                                                                    .headerControl,
-                                                            danmuWidget: Obx(
-                                                              () => PlDanmaku(
-                                                                key: Key(videoDetailController
-                                                                    .danmakuCid
-                                                                    .value
-                                                                    .toString()),
-                                                                cid: videoDetailController
-                                                                    .danmakuCid
-                                                                    .value,
-                                                                playerController:
-                                                                    plPlayerController!,
-                                                              ),
-                                                            ),
-                                                          ),
-                                              );
-                                            } else {
-                                              return const SizedBox();
-                                            }
-                                          },
-                                        ),
 
                                       /// 关闭自动播放时 手动播放
-                                      if (!videoDetailController
+                                      Obx(
-                                          .autoPlay.value) ...<Widget>[
+                                        () => Visibility(
-                                        Obx(
+                                          visible: !vdCtr.autoPlay.value &&
-                                          () => Visibility(
+                                              vdCtr.isShowCover.value,
-                                            visible: videoDetailController
+                                          child: Positioned(
-                                                .isShowCover.value,
+                                            top: 0,
-                                            child: Positioned(
+                                            left: 0,
-                                              top: 0,
+                                            right: 0,
-                                              left: 0,
+                                            child: handlePlayPanel(),
-                                              right: 0,
-                                              child: GestureDetector(
-                                                onTap: () {
-                                                  handlePlay();
-                                                },
-                                                child: NetworkImgLayer(
-                                                  type: 'emote',
-                                                  src: videoDetailController
-                                                      .videoItem['pic'],
-                                                  width: maxWidth,
-                                                  height: maxHeight,
-                                                ),
-                                              ),
-                                            ),
                                           ),
                                         ),
-                                        Obx(
+                                      ),
-                                          () => Visibility(
-                                              visible: videoDetailController
-                                                      .isShowCover.value &&
-                                                  videoDetailController
-                                                      .isEffective.value,
-                                              child: Stack(
-                                                children: [
-                                                  Positioned(
-                                                    top: 0,
-                                                    left: 0,
-                                                    right: 0,
-                                                    child: AppBar(
-                                                      primary: false,
-                                                      foregroundColor:
-                                                          Colors.white,
-                                                      elevation: 0,
-                                                      scrolledUnderElevation: 0,
-                                                      backgroundColor:
-                                                          Colors.transparent,
-                                                      actions: [
-                                                        IconButton(
-                                                          tooltip: '稍后再看',
-                                                          onPressed: () async {
-                                                            var res = await UserHttp
-                                                                .toViewLater(
-                                                                    bvid: videoDetailController
-                                                                        .bvid);
-                                                            SmartDialog
-                                                                .showToast(
-                                                                    res['msg']);
-                                                          },
-                                                          icon: const Icon(Icons
-                                                              .history_outlined),
-                                                        ),
-                                                        const SizedBox(
-                                                            width: 14)
-                                                      ],
-                                                    ),
-                                                  ),
-                                                  Positioned(
-                                                    right: 12,
-                                                    bottom: 10,
-                                                    child: IconButton(
-                                                        tooltip: '播放',
-                                                        onPressed: () =>
-                                                            handlePlay(),
-                                                        icon: Image.asset(
-                                                          'assets/images/play.png',
-                                                          width: 60,
-                                                          height: 60,
-                                                        )),
-                                                  ),
-                                                ],
-                                              )),
-                                        ),
-                                      ]
                                     ],
                                   );
                                 },
@@ -502,18 +528,16 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                   ),
                 ];
               },
-              // pinnedHeaderSliverHeightBuilder: () {
+
-              //   return playerStatus != PlayerStatus.playing
-              //       ? statusBarHeight + kToolbarHeight
-              //       : pinnedHeaderHeight;
-              // },
               /// 不收回
               pinnedHeaderSliverHeightBuilder: () {
                 return MediaQuery.of(context).orientation ==
                             Orientation.landscape ||
                         plPlayerController?.isFullScreen.value == true
                     ? MediaQuery.sizeOf(context).height
-                    : pinnedHeaderHeight;
+                    : playerStatus != PlayerStatus.playing
+                        ? kToolbarHeight
+                        : pinnedHeaderHeight;
               },
               onlyOneScrollInBody: true,
               body: ColoredBox(
@@ -521,53 +545,23 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                 color: Theme.of(context).colorScheme.background,
                 child: Column(
                   children: [
-                    Opacity(
+                    tabbarBuild,
-                      opacity: 0,
-                      child: SizedBox(
-                        width: double.infinity,
-                        height: 0,
-                        child: Obx(
-                          () => TabBar(
-                            controller: videoDetailController.tabCtr,
-                            dividerColor: Colors.transparent,
-                            indicatorColor:
-                                Theme.of(context).colorScheme.background,
-                            tabs: videoDetailController.tabs
-                                .map((String name) => Tab(text: name))
-                                .toList(),
-                          ),
-                        ),
-                      ),
-                    ),
                     Expanded(
                       child: TabBarView(
-                        controller: videoDetailController.tabCtr,
+                        controller: vdCtr.tabCtr,
                         children: <Widget>[
                           Builder(
                             builder: (BuildContext context) {
                               return CustomScrollView(
                                 key: const PageStorageKey<String>('简介'),
                                 slivers: <Widget>[
-                                  if (videoDetailController.videoType ==
+                                  if (vdCtr.videoType == SearchType.video) ...[
-                                      SearchType.video) ...[
+                                    VideoIntroPanel(bvid: vdCtr.bvid),
-                                    const VideoIntroPanel(),
+                                  ] else if (vdCtr.videoType ==
-                                  ] else if (videoDetailController.videoType ==
                                       SearchType.media_bangumi) ...[
                                     Obx(() => BangumiIntroPanel(
-                                        cid: videoDetailController.cid.value)),
+                                        cid: vdCtr.cid.value)),
                                   ],
-                                  // if (videoDetailController.videoType ==
-                                  //     SearchType.video) ...[
-                                  //   SliverPersistentHeader(
-                                  //     floating: true,
-                                  //     pinned: true,
-                                  //     delegate: SliverHeaderDelegate(
-                                  //       height: 50,
-                                  //       child:
-                                  //           const MenuRow(loadingStatus: false),
-                                  //     ),
-                                  //   ),
-                                  // ],
                                   SliverToBoxAdapter(
                                     child: Divider(
                                       indent: 12,
@@ -577,15 +571,17 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                           .withOpacity(0.06),
                                     ),
                                   ),
-                                  RelatedVideoPanel(),
+                                  if (vdCtr.videoType == SearchType.video &&
+                                      vdCtr.enableRelatedVideo)
+                                    const RelatedVideoPanel(),
                                 ],
                               );
                             },
                           ),
                           Obx(
                             () => VideoReplyPanel(
-                              bvid: videoDetailController.bvid,
+                              bvid: vdCtr.bvid,
-                              oid: videoDetailController.oid.value,
+                              oid: vdCtr.oid.value,
                             ),
                           )
                         ],
@@ -599,58 +595,73 @@ class _VideoDetailPageState extends State<VideoDetailPage>
 
           /// 重新进入会刷新
           // 播放完成/暂停播放
-          // StreamBuilder(
+          StreamBuilder(
-          //   stream: appbarStream.stream,
+            stream: appbarStream.stream,
-          //   initialData: 0,
+            initialData: 0,
-          //   builder: ((context, snapshot) {
+            builder: ((context, snapshot) {
-          //     return ScrollAppBar(
+              return ScrollAppBar(
-          //       snapshot.data!.toDouble(),
+                snapshot.data!.toDouble(),
-          //       () => continuePlay(),
+                () => continuePlay(),
-          //       playerStatus,
+                playerStatus,
-          //       null,
+                null,
-          //     );
+              );
-          //   }),
+            }),
-          // )
+          )
         ],
       ),
     );
-    Widget childWhenEnabled = FutureBuilder(
+
-      key: Key(heroTag),
-      future: _futureBuilderFuture,
-      builder: (BuildContext context, AsyncSnapshot snapshot) {
-        if (snapshot.hasData && snapshot.data['status']) {
-          return Obx(
-            () => !videoDetailController.autoPlay.value
-                ? const SizedBox()
-                : PLVideoPlayer(
-                    controller: plPlayerController!,
-                    headerControl: HeaderControl(
-                      controller: plPlayerController,
-                      videoDetailCtr: videoDetailController,
-                    ),
-                    danmuWidget: Obx(
-                      () => PlDanmaku(
-                        key: Key(
-                            videoDetailController.danmakuCid.value.toString()),
-                        cid: videoDetailController.danmakuCid.value,
-                        playerController: plPlayerController!,
-                      ),
-                    ),
-                  ),
-          );
-        } else {
-          return nil;
-        }
-      },
-    );
     if (Platform.isAndroid) {
       return PiPSwitcher(
         childWhenDisabled: childWhenDisabled,
-        childWhenEnabled: childWhenEnabled,
+        childWhenEnabled: videoPlayerPanel,
         floating: floating,
       );
     } else {
       return childWhenDisabled;
     }
   }
+
+  Widget buildCustomAppBar() {
+    return AppBar(
+      backgroundColor: Colors.transparent, // 使背景透明
+      foregroundColor: Colors.white,
+      elevation: 0,
+      scrolledUnderElevation: 0,
+      primary: false,
+      centerTitle: false,
+      automaticallyImplyLeading: false,
+      titleSpacing: 0,
+      title: Container(
+        height: kToolbarHeight,
+        padding: const EdgeInsets.symmetric(horizontal: 14),
+        decoration: const BoxDecoration(
+            gradient: LinearGradient(
+          begin: Alignment.bottomCenter,
+          end: Alignment.topCenter,
+          colors: <Color>[
+            Colors.transparent,
+            Colors.black54,
+          ],
+          tileMode: TileMode.mirror,
+        )),
+        child: Row(
+          children: [
+            ComBtn(
+              icon: const Icon(FontAwesomeIcons.arrowLeft, size: 15),
+              fuc: () => Get.back(),
+            ),
+            const Spacer(),
+            ComBtn(
+              icon: const Icon(Icons.history_outlined, size: 22),
+              fuc: () async {
+                var res = await UserHttp.toViewLater(bvid: vdCtr.bvid);
+                SmartDialog.showToast(res['msg']);
+              },
+            ),
+          ],
+        ),
+      ),
+    );
+  }
 }

lib/pages/video/detail/widgets/header_control.dart

@@ -1,5 +1,4 @@
 import 'dart:io';
-import 'dart:math';
 
 import 'package:floating/floating.dart';
 import 'package:flutter/material.dart';
@@ -17,8 +16,8 @@ import 'package:pilipala/pages/video/detail/introduction/widgets/menu_row.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
 import 'package:pilipala/plugin/pl_player/models/play_repeat.dart';
 import 'package:pilipala/utils/storage.dart';
-import 'package:pilipala/http/danmaku.dart';
 import 'package:pilipala/services/shutdown_timer_service.dart';
+import '../../../../models/common/search_type.dart';
 import '../../../../models/video_detail_res.dart';
 import '../introduction/index.dart';
 
@@ -27,11 +26,15 @@ class HeaderControl extends StatefulWidget implements PreferredSizeWidget {
     this.controller,
     this.videoDetailCtr,
     this.floating,
+    this.bvid,
+    this.videoType,
     super.key,
   });
   final PlPlayerController? controller;
   final VideoDetailController? videoDetailCtr;
   final Floating? floating;
+  final String? bvid;
+  final SearchType? videoType;
 
   @override
   State<HeaderControl> createState() => _HeaderControlState();
@@ -42,7 +45,6 @@ class HeaderControl extends StatefulWidget implements PreferredSizeWidget {
 
 class _HeaderControlState extends State<HeaderControl> {
   late PlayUrlModel videoInfo;
-  List<PlaySpeed> playSpeed = PlaySpeed.values;
   static const TextStyle subTitleStyle = TextStyle(fontSize: 12);
   static const TextStyle titleStyle = TextStyle(fontSize: 14);
   Size get preferredSize => const Size(double.infinity, kToolbarHeight);
@@ -62,7 +64,8 @@ class _HeaderControlState extends State<HeaderControl> {
     speedsList = widget.controller!.speedsList;
     fullScreenStatusListener();
     heroTag = Get.arguments['heroTag'];
-    videoIntroController = Get.put(VideoIntroController(), tag: heroTag);
+    videoIntroController =
+        Get.put(VideoIntroController(bvid: widget.bvid!), tag: heroTag);
   }
 
   void fullScreenStatusListener() {
@@ -73,7 +76,11 @@ class _HeaderControlState extends State<HeaderControl> {
       } else {
         showTitle = false;
       }
-      setState(() {});
+
+      /// TODO setState() called after dispose()
+      if (mounted) {
+        setState(() {});
+      }
     });
   }
 
@@ -211,88 +218,6 @@ class _HeaderControlState extends State<HeaderControl> {
     );
   }
 
-  /// 发送弹幕
-  void showShootDanmakuSheet() {
-    final TextEditingController textController = TextEditingController();
-    bool isSending = false; // 追踪是否正在发送
-    showDialog(
-      context: Get.context!,
-      builder: (BuildContext context) {
-        // TODO: 支持更多类型和颜色的弹幕
-        return AlertDialog(
-          title: const Text('发送弹幕（测试）'),
-          content: StatefulBuilder(
-              builder: (BuildContext context, StateSetter setState) {
-            return TextField(
-              controller: textController,
-            );
-          }),
-          actions: [
-            TextButton(
-              onPressed: () => Get.back(),
-              child: Text(
-                '取消',
-                style: TextStyle(color: Theme.of(context).colorScheme.outline),
-              ),
-            ),
-            StatefulBuilder(
-                builder: (BuildContext context, StateSetter setState) {
-              return TextButton(
-                onPressed: isSending
-                    ? null
-                    : () async {
-                        final String msg = textController.text;
-                        if (msg.isEmpty) {
-                          SmartDialog.showToast('弹幕内容不能为空');
-                          return;
-                        } else if (msg.length > 100) {
-                          SmartDialog.showToast('弹幕内容不能超过100个字符');
-                          return;
-                        }
-                        setState(() {
-                          isSending = true; // 开始发送，更新状态
-                        });
-                        //修改按钮文字
-                        // SmartDialog.showToast('弹幕发送中,\n$msg');
-                        final dynamic res = await DanmakaHttp.shootDanmaku(
-                          oid: widget.videoDetailCtr!.cid.value,
-                          msg: textController.text,
-                          bvid: widget.videoDetailCtr!.bvid,
-                          progress:
-                              widget.controller!.position.value.inMilliseconds,
-                          type: 1,
-                        );
-                        setState(() {
-                          isSending = false; // 发送结束，更新状态
-                        });
-                        if (res['status']) {
-                          SmartDialog.showToast('发送成功');
-                          // 发送成功，自动预览该弹幕，避免重新请求
-                          // TODO: 暂停状态下预览弹幕仍会移动与计时，可考虑添加到dmSegList或其他方式实现
-                          widget.controller!.danmakuController!.addItems([
-                            DanmakuItem(
-                              msg,
-                              color: Colors.white,
-                              time: widget
-                                  .controller!.position.value.inMilliseconds,
-                              type: DanmakuItemType.scroll,
-                              isSend: true,
-                            )
-                          ]);
-                          Get.back();
-                        } else {
-                          SmartDialog.showToast('发送失败，错误信息为${res['msg']}');
-                        }
-                      },
-                child: Text(isSending ? '发送中...' : '发送'),
-              );
-            })
-          ],
-        );
-      },
-    );
-  }
-
   /// 定时关闭
   void scheduleExit() async {
     const List<int> scheduleTimeChoices = [
@@ -1104,14 +1029,16 @@ class _HeaderControlState extends State<HeaderControl> {
             },
           ),
           SizedBox(width: buttonSpace),
-          if (showTitle && isLandscape) ...[
+          if (showTitle &&
+              isLandscape &&
+              widget.videoType == SearchType.video) ...[
             Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 ConstrainedBox(
-                  constraints: BoxConstraints(maxWidth: 200),
+                  constraints: const BoxConstraints(maxWidth: 200),
                   child: Text(
-                    videoIntroController.videoDetail.value.title!,
+                    videoIntroController.videoDetail.value.title ?? '',
                     style: const TextStyle(
                       color: Colors.white,
                       fontSize: 16,
@@ -1154,41 +1081,6 @@ class _HeaderControlState extends State<HeaderControl> {
           //   ),
           //   fuc: () => _.screenshot(),
           // ),
-          SizedBox(
-            width: 56,
-            height: 34,
-            child: TextButton(
-              style: ButtonStyle(
-                padding: MaterialStateProperty.all(EdgeInsets.zero),
-              ),
-              onPressed: () => showShootDanmakuSheet(),
-              child: const Text(
-                '发弹幕',
-                style: textStyle,
-              ),
-            ),
-          ),
-          SizedBox(
-            width: 34,
-            height: 34,
-            child: Obx(
-              () => IconButton(
-                style: ButtonStyle(
-                  padding: MaterialStateProperty.all(EdgeInsets.zero),
-                ),
-                onPressed: () {
-                  _.isOpenDanmu.value = !_.isOpenDanmu.value;
-                },
-                icon: Icon(
-                  _.isOpenDanmu.value
-                      ? Icons.subtitles_outlined
-                      : Icons.subtitles_off_outlined,
-                  size: 19,
-                  color: Colors.white,
-                ),
-              ),
-            ),
-          ),
           SizedBox(width: buttonSpace),
           if (Platform.isAndroid) ...<Widget>[
             SizedBox(

lib/pages/webview/controller.dart

@@ -131,13 +131,13 @@ class WebviewController extends GetxController {
         Get.back();
       } else {
         // 获取用户信息失败
-        SmartDialog.showToast(result.msg);
+        SmartDialog.showToast(result['msg']);
-        Clipboard.setData(ClipboardData(text: result.msg.toString()));
+        Clipboard.setData(ClipboardData(text: result['msg']));
       }
     } catch (e) {
       SmartDialog.showNotify(msg: e.toString(), notifyType: NotifyType.warning);
       content = content + e.toString();
+      Clipboard.setData(ClipboardData(text: content));
     }
-    Clipboard.setData(ClipboardData(text: content));
   }
 }

lib/pages/whisper/view.dart

@@ -180,7 +180,8 @@ class _WhisperPageState extends State<WhisperPage> {
                                                       sessionList[i]
                                                               .lastMsg
                                                               .content[
-                                                          'reply_content'])
+                                                          'reply_content'] ??
+                                                      '不支持的消息类型')
                                                   : '不支持的消息类型',
                                               maxLines: 1,
                                               overflow: TextOverflow.ellipsis,

lib/pages/whisper_detail/view.dart

@@ -51,27 +51,31 @@ class _WhisperDetailPageState extends State<WhisperDetailPage>
   @override
   void didChangeMetrics() {
     super.didChangeMetrics();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
+    final String routePath = Get.currentRoute;
-      // 键盘高度
+    if (mounted && routePath.startsWith('/whisper_detail')) {
-      final viewInsets = EdgeInsets.fromViewPadding(
+      WidgetsBinding.instance.addPostFrameCallback((_) {
-          View.of(context).viewInsets, View.of(context).devicePixelRatio);
+        // 键盘高度
-      _debouncer.run(() {
+        final viewInsets = EdgeInsets.fromViewPadding(
-        if (mounted) {
+            View.of(context).viewInsets, View.of(context).devicePixelRatio);
-          if (keyboardHeight == 0) {
+        _debouncer.run(() {
-            setState(() {
+          if (mounted) {
-              emoteHeight = keyboardHeight =
+            if (keyboardHeight == 0) {
-                  keyboardHeight == 0.0 ? viewInsets.bottom : keyboardHeight;
+              setState(() {
-            });
+                emoteHeight = keyboardHeight =
+                    keyboardHeight == 0.0 ? viewInsets.bottom : keyboardHeight;
+              });
+            }
           }
-        }
+        });
       });
-    });
+    }
   }
 
   @override
   void dispose() {
     WidgetsBinding.instance.removeObserver(this);
     replyContentFocusNode.removeListener(() {});
+    replyContentFocusNode.dispose();
     super.dispose();
   }
 

lib/plugin/pl_player/controller.dart

@@ -277,8 +277,7 @@ class PlPlayerController {
     danmakuDurationVal =
         localCache.get(LocalCacheKey.danmakuDuration, defaultValue: 4.0);
     // 描边粗细
-    strokeWidth =
+    strokeWidth = localCache.get(LocalCacheKey.strokeWidth, defaultValue: 1.5);
-        localCache.get(LocalCacheKey.strokeWidth, defaultValue: 1.5);
     playRepeat = PlayRepeat.values.toList().firstWhere(
           (e) =>
               e.value ==
@@ -293,11 +292,19 @@ class PlPlayerController {
       _longPressSpeed.value = videoStorage
           .get(VideoBoxKey.longPressSpeedDefault, defaultValue: 2.0);
     }
+    // 自定义倍速集合
     speedsList = List<double>.from(videoStorage
         .get(VideoBoxKey.customSpeedsList, defaultValue: <double>[]));
-    for (final PlaySpeed i in PlaySpeed.values) {
+    // 默认倍速
-      speedsList.add(i.value);
+    speedsList = List<double>.from(videoStorage
-    }
+        .get(VideoBoxKey.customSpeedsList, defaultValue: <double>[]));
+    //playSpeedSystem
+    final List<double> playSpeedSystem =
+        videoStorage.get(VideoBoxKey.playSpeedSystem, defaultValue: playSpeed);
+
+    // for (final PlaySpeed i in PlaySpeed.values) {
+    speedsList.addAll(playSpeedSystem);
+    // }
 
     // _playerEventSubs = onPlayerStatusChanged.listen((PlayerStatus status) {
     //   if (status == PlayerStatus.playing) {
@@ -535,8 +542,10 @@ class PlPlayerController {
           if (event) {
             playerStatus.status.value = PlayerStatus.playing;
           } else {
-            // playerStatus.status.value = PlayerStatus.paused;
+            playerStatus.status.value = PlayerStatus.paused;
           }
+          videoPlayerServiceHandler.onStatusChange(
+              playerStatus.status.value, isBuffering.value);
 
           /// 触发回调事件
           for (var element in _statusListeners) {
@@ -675,18 +684,6 @@ class PlPlayerController {
     _playbackSpeed.value = speed;
   }
 
-  /// 设置倍速
-  // Future<void> togglePlaybackSpeed() async {
-  //   List<double> allowedSpeeds =
-  //       PlaySpeed.values.map<double>((e) => e.value).toList();
-  //   int index = allowedSpeeds.indexOf(_playbackSpeed.value);
-  //   if (index < allowedSpeeds.length - 1) {
-  //     setPlaybackSpeed(allowedSpeeds[index + 1]);
-  //   } else {
-  //     setPlaybackSpeed(allowedSpeeds[0]);
-  //   }
-  // }
-
   /// 播放视频
   /// TODO  _duration.value丢失
   Future<void> play(

lib/plugin/pl_player/models/bottom_control_type.dart

@@ -0,0 +1,11 @@
+enum BottomControlType {
+  pre,
+  playOrPause,
+  next,
+  time,
+  space,
+  fit,
+  speed,
+  fullscreen,
+  custom,
+}

lib/plugin/pl_player/models/play_speed.dart

@@ -1,39 +1,15 @@
-enum PlaySpeed {
+List<double> generatePlaySpeedList() {
-  pointTwoFive,
+  List<double> playSpeed = [];
-  pointFive,
+  double startSpeed = 0.25;
-  pointSevenFive,
+  double endSpeed = 2.0;
+  double increment = 0.25;
 
-  one,
+  for (double speed = startSpeed; speed <= endSpeed; speed += increment) {
-  onePointTwoFive,
+    playSpeed.add(speed);
-  onePointFive,
+  }
-  onePointSevenFive,
 
-  two,
+  return playSpeed;
 }
 
-extension PlaySpeedExtension on PlaySpeed {
+// 导出 playSpeed 列表
-  static final List<String> _descList = [
+List<double> playSpeed = generatePlaySpeedList();
-    '0.25',
-    '0.5',
-    '0.75',
-    '正常',
-    '1.25',
-    '1.5',
-    '1.75',
-    '2.0',
-  ];
-  String get description => _descList[index];
-
-  static final List<double> _valueList = [
-    0.25,
-    0.5,
-    0.75,
-    1.0,
-    1.25,
-    1.5,
-    1.75,
-    2.0,
-  ];
-  double get value => _valueList[index];
-  double get defaultValue => _valueList[3];
-}

lib/plugin/pl_player/view.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:audio_video_progress_bar/audio_video_progress_bar.dart';
+import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_volume_controller/flutter_volume_controller.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@@ -8,7 +9,7 @@ import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:media_kit/media_kit.dart';
 import 'package:media_kit_video/media_kit_video.dart';
-import 'package:nil/nil.dart';
+import 'package:pilipala/models/common/gesture_mode.dart';
 import 'package:pilipala/plugin/pl_player/controller.dart';
 import 'package:pilipala/plugin/pl_player/models/duration.dart';
 import 'package:pilipala/plugin/pl_player/models/fullscreen_mode.dart';
@@ -17,12 +18,15 @@ import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:screen_brightness/screen_brightness.dart';
 
+import '../../utils/global_data.dart';
+import 'models/bottom_control_type.dart';
 import 'models/bottom_progress_behavior.dart';
 import 'widgets/app_bar_ani.dart';
 import 'widgets/backward_seek.dart';
 import 'widgets/bottom_control.dart';
 import 'widgets/common_btn.dart';
 import 'widgets/forward_seek.dart';
+import 'widgets/play_pause_btn.dart';
 
 class PLVideoPlayer extends StatefulWidget {
   const PLVideoPlayer({
@@ -30,6 +34,9 @@ class PLVideoPlayer extends StatefulWidget {
     this.headerControl,
     this.bottomControl,
     this.danmuWidget,
+    this.bottomList,
+    this.customWidget,
+    this.customWidgets,
     super.key,
   });
 
@@ -37,6 +44,11 @@ class PLVideoPlayer extends StatefulWidget {
   final PreferredSizeWidget? headerControl;
   final PreferredSizeWidget? bottomControl;
   final Widget? danmuWidget;
+  final List<BottomControlType>? bottomList;
+  // List<Widget> or Widget
+
+  final Widget? customWidget;
+  final List<Widget>? customWidgets;
 
   @override
   State<PLVideoPlayer> createState() => _PLVideoPlayerState();
@@ -46,26 +58,22 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
     with TickerProviderStateMixin {
   late AnimationController animationController;
   late VideoController videoController;
-  final PLVideoPlayerController _ctr = Get.put(PLVideoPlayerController());
 
-  // bool _mountSeekBackwardButton = false;
+  final RxBool _mountSeekBackwardButton = false.obs;
-  // bool _mountSeekForwardButton = false;
+  final RxBool _mountSeekForwardButton = false.obs;
-  // bool _hideSeekBackwardButton = false;
+  final RxBool _hideSeekBackwardButton = false.obs;
-  // bool _hideSeekForwardButton = false;
+  final RxBool _hideSeekForwardButton = false.obs;
 
-  // double _brightnessValue = 0.0;
+  final RxDouble _brightnessValue = 0.0.obs;
-  // bool _brightnessIndicator = false;
+  final RxBool _brightnessIndicator = false.obs;
   Timer? _brightnessTimer;
 
-  // double _volumeValue = 0.0;
+  final RxDouble _volumeValue = 0.0.obs;
-  // bool _volumeIndicator = false;
+  final RxBool _volumeIndicator = false.obs;
   Timer? _volumeTimer;
 
-  double _distance = 0.0;
+  final RxDouble _distance = 0.0.obs;
-  // 初始手指落下位置
+  final RxBool _volumeInterceptEventStream = false.obs;
-  // double _initTapPositoin = 0.0;
-
-  // bool _volumeInterceptEventStream = false;
 
   Box setting = GStrorage.setting;
   late FullScreenMode mode;
@@ -73,16 +81,18 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
   late bool enableQuickDouble;
   late bool enableBackgroundPlay;
   late double screenWidth;
+  final FullScreenGestureMode fullScreenGestureMode =
+      GlobalData().fullScreenGestureMode;
 
   // 用于记录上一次全屏切换手势触发时间，避免误触
   DateTime? lastFullScreenToggleTime;
 
   void onDoubleTapSeekBackward() {
-    _ctr.onDoubleTapSeekBackward();
+    _mountSeekBackwardButton.value = true;
   }
 
   void onDoubleTapSeekForward() {
-    _ctr.onDoubleTapSeekForward();
+    _mountSeekForwardButton.value = true;
   }
 
   // 双击播放、暂停
@@ -116,7 +126,11 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
     super.initState();
     screenWidth = Get.size.width;
     animationController = AnimationController(
-        vsync: this, duration: const Duration(milliseconds: 300));
+      vsync: this,
+      duration: GlobalData().enablePlayerControlAnimation
+          ? const Duration(milliseconds: 150)
+          : const Duration(milliseconds: 10),
+    );
     videoController = widget.controller.videoController!;
     widget.controller.headerControl = widget.headerControl;
     widget.controller.bottomControl = widget.bottomControl;
@@ -130,10 +144,10 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
     Future.microtask(() async {
       try {
         FlutterVolumeController.updateShowSystemUI(true);
-        _ctr.volumeValue.value = (await FlutterVolumeController.getVolume())!;
+        _volumeValue.value = (await FlutterVolumeController.getVolume())!;
         FlutterVolumeController.addListener((double value) {
-          if (mounted && !_ctr.volumeInterceptEventStream.value) {
+          if (mounted && !_volumeInterceptEventStream.value) {
-            _ctr.volumeValue.value = value;
+            _volumeValue.value = value;
           }
         });
       } catch (_) {}
@@ -141,10 +155,10 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
 
     Future.microtask(() async {
       try {
-        _ctr.brightnessValue.value = await ScreenBrightness().current;
+        _brightnessValue.value = await ScreenBrightness().current;
         ScreenBrightness().onCurrentBrightnessChanged.listen((double value) {
           if (mounted) {
-            _ctr.brightnessValue.value = value;
+            _brightnessValue.value = value;
           }
         });
       } catch (_) {}
@@ -156,14 +170,14 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
       FlutterVolumeController.updateShowSystemUI(false);
       await FlutterVolumeController.setVolume(value);
     } catch (_) {}
-    _ctr.volumeValue.value = value;
+    _volumeValue.value = value;
-    _ctr.volumeIndicator.value = true;
+    _volumeIndicator.value = true;
-    _ctr.volumeInterceptEventStream.value = true;
+    _volumeInterceptEventStream.value = true;
     _volumeTimer?.cancel();
     _volumeTimer = Timer(const Duration(milliseconds: 200), () {
       if (mounted) {
-        _ctr.volumeIndicator.value = false;
+        _volumeIndicator.value = false;
-        _ctr.volumeInterceptEventStream.value = false;
+        _volumeInterceptEventStream.value = false;
       }
     });
   }
@@ -172,11 +186,11 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
     try {
       await ScreenBrightness().setScreenBrightness(value);
     } catch (_) {}
-    _ctr.brightnessIndicator.value = true;
+    _brightnessIndicator.value = true;
     _brightnessTimer?.cancel();
     _brightnessTimer = Timer(const Duration(milliseconds: 200), () {
       if (mounted) {
-        _ctr.brightnessIndicator.value = false;
+        _brightnessIndicator.value = false;
       }
     });
     widget.controller.brightness.value = value;
@@ -189,6 +203,143 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
     super.dispose();
   }
 
+  // 动态构建底部控制条
+  List<Widget> buildBottomControl() {
+    const TextStyle textStyle = TextStyle(
+      color: Colors.white,
+      fontSize: 12,
+    );
+    final PlPlayerController _ = widget.controller;
+    Map<BottomControlType, Widget> videoProgressWidgets = {
+      /// 上一集
+      BottomControlType.pre: ComBtn(
+        icon: const Icon(
+          Icons.skip_previous_outlined,
+          size: 15,
+          color: Colors.white,
+        ),
+        fuc: () {},
+      ),
+
+      /// 播放暂停
+      BottomControlType.playOrPause: PlayOrPauseButton(
+        controller: _,
+      ),
+
+      /// 下一集
+      BottomControlType.next: ComBtn(
+        icon: const Icon(
+          Icons.last_page_outlined,
+          size: 15,
+          color: Colors.white,
+        ),
+        fuc: () {},
+      ),
+
+      /// 时间进度
+      BottomControlType.time: Row(
+        children: [
+          Obx(() {
+            return Text(
+              _.durationSeconds.value >= 3600
+                  ? printDurationWithHours(
+                      Duration(seconds: _.positionSeconds.value))
+                  : printDuration(Duration(seconds: _.positionSeconds.value)),
+              style: textStyle,
+            );
+          }),
+          const SizedBox(width: 2),
+          const Text('/', style: textStyle),
+          const SizedBox(width: 2),
+          Obx(
+            () => Text(
+              _.durationSeconds.value >= 3600
+                  ? printDurationWithHours(
+                      Duration(seconds: _.durationSeconds.value))
+                  : printDuration(Duration(seconds: _.durationSeconds.value)),
+              style: textStyle,
+            ),
+          ),
+        ],
+      ),
+
+      /// 空白占位
+      BottomControlType.space: const Spacer(),
+
+      /// 画面比例
+      BottomControlType.fit: SizedBox(
+        height: 30,
+        child: TextButton(
+          onPressed: () => _.toggleVideoFit(),
+          style: ButtonStyle(
+            padding: MaterialStateProperty.all(EdgeInsets.zero),
+          ),
+          child: Obx(
+            () => Text(
+              _.videoFitDEsc.value,
+              style: const TextStyle(color: Colors.white, fontSize: 13),
+            ),
+          ),
+        ),
+      ),
+
+      /// 播放速度
+      BottomControlType.speed: SizedBox(
+        width: 45,
+        height: 34,
+        child: TextButton(
+          style: ButtonStyle(
+            padding: MaterialStateProperty.all(EdgeInsets.zero),
+          ),
+          onPressed: () {},
+          child: Obx(
+            () => Text(
+              '${_.playbackSpeed.toString()}X',
+              style: textStyle,
+            ),
+          ),
+        ),
+      ),
+
+      /// 字幕
+      /// 全屏
+      BottomControlType.fullscreen: ComBtn(
+        icon: Obx(
+          () => Icon(
+            _.isFullScreen.value
+                ? FontAwesomeIcons.compress
+                : FontAwesomeIcons.expand,
+            size: 15,
+            color: Colors.white,
+          ),
+        ),
+        fuc: () => _.triggerFullScreen(),
+      ),
+    };
+    final List<Widget> list = [];
+    List<BottomControlType> userSpecifyItem = widget.bottomList ??
+        [
+          BottomControlType.playOrPause,
+          BottomControlType.time,
+          BottomControlType.space,
+          BottomControlType.fit,
+          BottomControlType.fullscreen,
+        ];
+    for (var i = 0; i < userSpecifyItem.length; i++) {
+      if (userSpecifyItem[i] == BottomControlType.custom) {
+        if (widget.customWidget != null && widget.customWidget is Widget) {
+          list.add(widget.customWidget!);
+        }
+        if (widget.customWidgets != null && widget.customWidgets!.isNotEmpty) {
+          list.addAll(widget.customWidgets!);
+        }
+      } else {
+        list.add(videoProgressWidgets[userSpecifyItem[i]]!);
+      }
+    }
+    return list;
+  }
+
   @override
   Widget build(BuildContext context) {
     final PlPlayerController _ = widget.controller;
@@ -211,6 +362,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
       children: <Widget>[
         Obx(
           () => Video(
+            key: ValueKey(_.videoFit.value),
             controller: videoController,
             controls: NoVideoControls,
             pauseUponEnteringBackgroundMode: !enableBackgroundPlay,
@@ -308,7 +460,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
           () => Align(
             child: AnimatedOpacity(
               curve: Curves.easeInOut,
-              opacity: _ctr.volumeIndicator.value ? 1.0 : 0.0,
+              opacity: _volumeIndicator.value ? 1.0 : 0.0,
               duration: const Duration(milliseconds: 150),
               child: Container(
                 alignment: Alignment.center,
@@ -327,9 +479,9 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                       width: 28.0,
                       alignment: Alignment.centerRight,
                       child: Icon(
-                        _ctr.volumeValue.value == 0.0
+                        _volumeValue.value == 0.0
                             ? Icons.volume_off
-                            : _ctr.volumeValue.value < 0.5
+                            : _volumeValue.value < 0.5
                                 ? Icons.volume_down
                                 : Icons.volume_up,
                         color: const Color(0xFFFFFFFF),
@@ -338,7 +490,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                     ),
                     Expanded(
                       child: Text(
-                        '${(_ctr.volumeValue.value * 100.0).round()}%',
+                        '${(_volumeValue.value * 100.0).round()}%',
                         textAlign: TextAlign.center,
                         style: const TextStyle(
                           fontSize: 13.0,
@@ -359,7 +511,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
           () => Align(
             child: AnimatedOpacity(
               curve: Curves.easeInOut,
-              opacity: _ctr.brightnessIndicator.value ? 1.0 : 0.0,
+              opacity: _brightnessIndicator.value ? 1.0 : 0.0,
               duration: const Duration(milliseconds: 150),
               child: Container(
                 alignment: Alignment.center,
@@ -378,9 +530,9 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                       width: 28.0,
                       alignment: Alignment.centerRight,
                       child: Icon(
-                        _ctr.brightnessValue.value < 1.0 / 3.0
+                        _brightnessValue.value < 1.0 / 3.0
                             ? Icons.brightness_low
-                            : _ctr.brightnessValue.value < 2.0 / 3.0
+                            : _brightnessValue.value < 2.0 / 3.0
                                 ? Icons.brightness_medium
                                 : Icons.brightness_high,
                         color: const Color(0xFFFFFFFF),
@@ -390,7 +542,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                     const SizedBox(width: 2.0),
                     Expanded(
                       child: Text(
-                        '${(_ctr.brightnessValue.value * 100.0).round()}%',
+                        '${(_brightnessValue.value * 100.0).round()}%',
                         textAlign: TextAlign.center,
                         style: const TextStyle(
                           fontSize: 13.0,
@@ -481,7 +633,6 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                   pos.clamp(Duration.zero, _.duration.value);
               _.onUpdatedSliderProgress(result);
               _.onChangedSliderStart();
-              // _initTapPositoin = tapPosition;
             },
             onHorizontalDragEnd: (DragEndDetails details) {
               if (_.videoType.value == 'live' || _.controlsLock.value) {
@@ -513,38 +664,43 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                         : screenWidth * 9 / 16) *
                     3;
                 final double brightness =
-                    _ctr.brightnessValue.value - delta / level;
+                    _brightnessValue.value - delta / level;
                 final double result = brightness.clamp(0.0, 1.0);
                 setBrightness(result);
               } else if (tapPosition < sectionWidth * 2) {
                 // 全屏
                 final double dy = details.delta.dy;
                 const double threshold = 7.0; // 滑动阈值
-                if (dy > _distance && dy > threshold) {
+                final bool flag =
-                  if (_.isFullScreen.value) {
+                    fullScreenGestureMode != FullScreenGestureMode.values.last;
+                if (dy > _distance.value && dy > threshold) {
+                  if (_.isFullScreen.value ^ flag) {
                     lastFullScreenToggleTime = DateTime.now();
                     // 下滑退出全屏
-                    await widget.controller.triggerFullScreen(status: false);
+                    await widget.controller.triggerFullScreen(status: flag);
                   }
-                  _distance = 0.0;
+                  _distance.value = 0.0;
-                } else if (dy < _distance && dy < -threshold) {
+                } else if (dy < _distance.value && dy < -threshold) {
-                  if (!_.isFullScreen.value) {
+                  if (!_.isFullScreen.value ^ flag) {
                     lastFullScreenToggleTime = DateTime.now();
                     // 上滑进入全屏
-                    await widget.controller.triggerFullScreen();
+                    await widget.controller.triggerFullScreen(status: !flag);
                   }
-                  _distance = 0.0;
+                  _distance.value = 0.0;
                 }
-                _distance = dy;
+                _distance.value = dy;
               } else {
                 // 右边区域 👈
-                final double level = (_.isFullScreen.value
+                EasyThrottle.throttle(
-                        ? Get.size.height
+                    'setVolume', const Duration(milliseconds: 20), () {
-                        : screenWidth * 9 / 16) *
+                  final double level = (_.isFullScreen.value
-                    3;
+                      ? Get.size.height
-                final double volume = _ctr.volumeValue.value - delta / level;
+                      : screenWidth * 9 / 16);
-                final double result = volume.clamp(0.0, 1.0);
+                  final double volume = _volumeValue.value -
-                setVolume(result);
+                      double.parse(delta.toStringAsFixed(1)) / level;
+                  final double result = volume.clamp(0.0, 1.0);
+                  setVolume(result);
+                });
               }
             },
             onVerticalDragEnd: (DragEndDetails details) {},
@@ -575,9 +731,10 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                     position: 'bottom',
                     child: widget.bottomControl ??
                         BottomControl(
-                            controller: widget.controller,
+                          controller: widget.controller,
-                            triggerFullScreen:
+                          triggerFullScreen: _.triggerFullScreen,
-                                widget.controller.triggerFullScreen),
+                          buildBottomControl: buildBottomControl(),
+                        ),
                   ),
                 ),
               ],
@@ -597,23 +754,23 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
             }
             if (defaultBtmProgressBehavior ==
                 BtmProgresBehavior.alwaysHide.code) {
-              return nil;
+              return const SizedBox();
             }
             if (defaultBtmProgressBehavior ==
                     BtmProgresBehavior.onlyShowFullScreen.code &&
                 !_.isFullScreen.value) {
-              return nil;
+              return const SizedBox();
             } else if (defaultBtmProgressBehavior ==
                     BtmProgresBehavior.onlyHideFullScreen.code &&
                 _.isFullScreen.value) {
-              return nil;
+              return const SizedBox();
             }
 
             if (_.videoType.value == 'live') {
               return const SizedBox();
             }
             if (value > max || max <= 0) {
-              return nil;
+              return const SizedBox();
             }
             return Positioned(
               bottom: -1.5,
@@ -662,7 +819,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
         // 锁
         Obx(
           () => Visibility(
-            visible: _.videoType.value != 'live',
+            visible: _.videoType.value != 'live' && _.isFullScreen.value,
             child: Align(
               alignment: Alignment.centerLeft,
               child: FractionalTranslation(
@@ -710,18 +867,17 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
         /// 点击 快进/快退
         Obx(
           () => Visibility(
-            visible: _ctr.mountSeekBackwardButton.value ||
+            visible:
-                _ctr.mountSeekForwardButton.value,
+                _mountSeekBackwardButton.value || _mountSeekForwardButton.value,
             child: Positioned.fill(
               child: Row(
                 children: [
                   Expanded(
-                    child: _ctr.mountSeekBackwardButton.value
+                    child: _mountSeekBackwardButton.value
                         ? TweenAnimationBuilder<double>(
                             tween: Tween<double>(
                               begin: 0.0,
-                              end:
+                              end: _hideSeekBackwardButton.value ? 0.0 : 1.0,
-                                  _ctr.hideSeekBackwardButton.value ? 0.0 : 1.0,
                             ),
                             duration: const Duration(milliseconds: 500),
                             builder: (BuildContext context, double value,
@@ -731,17 +887,15 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                               child: child,
                             ),
                             onEnd: () {
-                              if (_ctr.hideSeekBackwardButton.value) {
+                              if (_hideSeekBackwardButton.value) {
-                                _ctr.hideSeekBackwardButton.value = false;
+                                _hideSeekBackwardButton.value = false;
-                                _ctr.mountSeekBackwardButton.value = false;
+                                _mountSeekBackwardButton.value = false;
                               }
                             },
                             child: BackwardSeekIndicator(
-                              onChanged: (Duration value) {
+                              onChanged: (Duration value) => {},
-                                // _seekBarDeltaValueNotifier.value = -value;
-                              },
                               onSubmitted: (Duration value) {
-                                _ctr.hideSeekBackwardButton.value = true;
+                                _hideSeekBackwardButton.value = true;
                                 final Player player =
                                     widget.controller.videoPlayerController!;
                                 Duration result = player.state.position - value;
@@ -754,7 +908,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                               },
                             ),
                           )
-                        : nil,
+                        : const SizedBox(),
                   ),
                   Expanded(
                     child: SizedBox(
@@ -762,11 +916,11 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                     ),
                   ),
                   Expanded(
-                    child: _ctr.mountSeekForwardButton.value
+                    child: _mountSeekForwardButton.value
                         ? TweenAnimationBuilder<double>(
                             tween: Tween<double>(
                               begin: 0.0,
-                              end: _ctr.hideSeekForwardButton.value ? 0.0 : 1.0,
+                              end: _hideSeekForwardButton.value ? 0.0 : 1.0,
                             ),
                             duration: const Duration(milliseconds: 500),
                             builder: (BuildContext context, double value,
@@ -776,17 +930,15 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                               child: child,
                             ),
                             onEnd: () {
-                              if (_ctr.hideSeekForwardButton.value) {
+                              if (_hideSeekForwardButton.value) {
-                                _ctr.hideSeekForwardButton.value = false;
+                                _hideSeekForwardButton.value = false;
-                                _ctr.mountSeekForwardButton.value = false;
+                                _mountSeekForwardButton.value = false;
                               }
                             },
                             child: ForwardSeekIndicator(
-                              onChanged: (Duration value) {
+                              onChanged: (Duration value) => {},
-                                // _seekBarDeltaValueNotifier.value = value;
-                              },
                               onSubmitted: (Duration value) {
-                                _ctr.hideSeekForwardButton.value = true;
+                                _hideSeekForwardButton.value = true;
                                 final Player player =
                                     widget.controller.videoPlayerController!;
                                 Duration result = player.state.position + value;
@@ -799,7 +951,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                               },
                             ),
                           )
-                        : nil,
+                        : const SizedBox(),
                   ),
                 ],
               ),
@@ -810,31 +962,3 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
     );
   }
 }
-
-class PLVideoPlayerController extends GetxController {
-  RxBool mountSeekBackwardButton = false.obs;
-  RxBool mountSeekForwardButton = false.obs;
-  RxBool hideSeekBackwardButton = false.obs;
-  RxBool hideSeekForwardButton = false.obs;
-
-  RxDouble brightnessValue = 0.0.obs;
-  RxBool brightnessIndicator = false.obs;
-
-  RxDouble volumeValue = 0.0.obs;
-  RxBool volumeIndicator = false.obs;
-
-  RxDouble distance = 0.0.obs;
-  // 初始手指落下位置
-  RxDouble initTapPositoin = 0.0.obs;
-
-  RxBool volumeInterceptEventStream = false.obs;
-
-  // 双击快进 展示样式
-  void onDoubleTapSeekForward() {
-    mountSeekForwardButton.value = true;
-  }
-
-  void onDoubleTapSeekBackward() {
-    mountSeekBackwardButton.value = true;
-  }
-}

lib/plugin/pl_player/widgets/app_bar_ani.dart

@@ -19,11 +19,11 @@ class AppBarAni extends StatelessWidget implements PreferredSizeWidget {
 
   @override
   Widget build(BuildContext context) {
-    visible ? controller.reverse() : controller.forward();
+    visible ? controller.forward() : controller.reverse();
     return SlideTransition(
       position: Tween<Offset>(
-        begin: Offset.zero,
+        begin: Offset(0, position! == 'top' ? -1 : 1),
-        end: Offset(0, position! == 'top' ? -1 : 1),
+        end: Offset.zero,
       ).animate(CurvedAnimation(
         parent: controller,
         curve: Curves.linear,

lib/plugin/pl_player/widgets/bottom_control.dart

@@ -1,17 +1,20 @@
 import 'package:audio_video_progress_bar/audio_video_progress_bar.dart';
 import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
 import 'package:nil/nil.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
-import 'package:pilipala/plugin/pl_player/widgets/play_pause_btn.dart';
 import 'package:pilipala/utils/feed_back.dart';
 
 class BottomControl extends StatelessWidget implements PreferredSizeWidget {
   final PlPlayerController? controller;
   final Function? triggerFullScreen;
-  const BottomControl({this.controller, this.triggerFullScreen, Key? key})
+  final List<Widget>? buildBottomControl;
-      : super(key: key);
+  const BottomControl({
+    this.controller,
+    this.triggerFullScreen,
+    this.buildBottomControl,
+    Key? key,
+  }) : super(key: key);
 
   @override
   Size get preferredSize => const Size(double.infinity, kToolbarHeight);
@@ -20,11 +23,6 @@ class BottomControl extends StatelessWidget implements PreferredSizeWidget {
   Widget build(BuildContext context) {
     Color colorTheme = Theme.of(context).colorScheme.primary;
     final _ = controller!;
-    const textStyle = TextStyle(
-      color: Colors.white,
-      fontSize: 12,
-    );
-
     return Container(
       color: Colors.transparent,
       height: 90,
@@ -71,86 +69,89 @@ class BottomControl extends StatelessWidget implements PreferredSizeWidget {
             },
           ),
           Row(
-            children: [
+            children: [...buildBottomControl!],
-              PlayOrPauseButton(
-                controller: _,
-              ),
-              const SizedBox(width: 4),
-              // 播放时间
-              Obx(() {
-                return Text(
-                  _.durationSeconds.value >= 3600
-                      ? printDurationWithHours(
-                          Duration(seconds: _.positionSeconds.value))
-                      : printDuration(
-                          Duration(seconds: _.positionSeconds.value)),
-                  style: textStyle,
-                );
-              }),
-              const SizedBox(width: 2),
-              const Text('/', style: textStyle),
-              const SizedBox(width: 2),
-              Obx(
-                () => Text(
-                  _.durationSeconds.value >= 3600
-                      ? printDurationWithHours(
-                          Duration(seconds: _.durationSeconds.value))
-                      : printDuration(
-                          Duration(seconds: _.durationSeconds.value)),
-                  style: textStyle,
-                ),
-              ),
-              const Spacer(),
-              // 倍速
-              // Obx(
-              //   () => SizedBox(
-              //     width: 45,
-              //     height: 34,
-              //     child: TextButton(
-              //       style: ButtonStyle(
-              //         padding: MaterialStateProperty.all(EdgeInsets.zero),
-              //       ),
-              //       onPressed: () {
-              //         _.togglePlaybackSpeed();
-              //       },
-              //       child: Text(
-              //         '${_.playbackSpeed.toString()}X',
-              //         style: textStyle,
-              //       ),
-              //     ),
-              //   ),
-              // ),
-              SizedBox(
-                height: 30,
-                child: TextButton(
-                  onPressed: () => _.toggleVideoFit(),
-                  style: ButtonStyle(
-                    padding: MaterialStateProperty.all(EdgeInsets.zero),
-                  ),
-                  child: Obx(
-                    () => Text(
-                      _.videoFitDEsc.value,
-                      style: const TextStyle(color: Colors.white, fontSize: 13),
-                    ),
-                  ),
-                ),
-              ),
-              const SizedBox(width: 10),
-              // 全屏
-              Obx(
-                () => ComBtn(
-                  icon: Icon(
-                    _.isFullScreen.value
-                        ? FontAwesomeIcons.compress
-                        : FontAwesomeIcons.expand,
-                    size: 15,
-                    color: Colors.white,
-                  ),
-                  fuc: () => triggerFullScreen!(),
-                ),
-              ),
-            ],
           ),
+          // Row(
+          //   children: [
+          //     PlayOrPauseButton(
+          //       controller: _,
+          //     ),
+          //     const SizedBox(width: 4),
+          //     // 播放时间
+          //     Obx(() {
+          //       return Text(
+          //         _.durationSeconds.value >= 3600
+          //             ? printDurationWithHours(
+          //                 Duration(seconds: _.positionSeconds.value))
+          //             : printDuration(
+          //                 Duration(seconds: _.positionSeconds.value)),
+          //         style: textStyle,
+          //       );
+          //     }),
+          //     const SizedBox(width: 2),
+          //     const Text('/', style: textStyle),
+          //     const SizedBox(width: 2),
+          //     Obx(
+          //       () => Text(
+          //         _.durationSeconds.value >= 3600
+          //             ? printDurationWithHours(
+          //                 Duration(seconds: _.durationSeconds.value))
+          //             : printDuration(
+          //                 Duration(seconds: _.durationSeconds.value)),
+          //         style: textStyle,
+          //       ),
+          //     ),
+          //     const Spacer(),
+          //     // 倍速
+          //     // Obx(
+          //     //   () => SizedBox(
+          //     //     width: 45,
+          //     //     height: 34,
+          //     //     child: TextButton(
+          //     //       style: ButtonStyle(
+          //     //         padding: MaterialStateProperty.all(EdgeInsets.zero),
+          //     //       ),
+          //     //       onPressed: () {
+          //     //         _.togglePlaybackSpeed();
+          //     //       },
+          //     //       child: Text(
+          //     //         '${_.playbackSpeed.toString()}X',
+          //     //         style: textStyle,
+          //     //       ),
+          //     //     ),
+          //     //   ),
+          //     // ),
+          //     SizedBox(
+          //       height: 30,
+          //       child: TextButton(
+          //         onPressed: () => _.toggleVideoFit(),
+          //         style: ButtonStyle(
+          //           padding: MaterialStateProperty.all(EdgeInsets.zero),
+          //         ),
+          //         child: Obx(
+          //           () => Text(
+          //             _.videoFitDEsc.value,
+          //             style: const TextStyle(color: Colors.white, fontSize: 13),
+          //           ),
+          //         ),
+          //       ),
+          //     ),
+          //     const SizedBox(width: 10),
+          //     // 全屏
+          //     Obx(
+          //       () => ComBtn(
+          //         icon: Icon(
+          //           _.isFullScreen.value
+          //               ? FontAwesomeIcons.compress
+          //               : FontAwesomeIcons.expand,
+          //           size: 15,
+          //           color: Colors.white,
+          //         ),
+          //         fuc: () => triggerFullScreen!(),
+          //       ),
+          //     ),
+          //   ],
+          // ),
           const SizedBox(height: 12),
         ],
       ),

lib/router/app_pages.dart

@@ -39,6 +39,7 @@ 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/home_tabbar_set.dart';
+import '../pages/setting/pages/play_gesture_set.dart';
 import '../pages/setting/pages/play_speed_set.dart';
 import '../pages/setting/recommend_setting.dart';
 import '../pages/setting/play_setting.dart';
@@ -166,6 +167,9 @@ class Routes {
     CustomGetPage(name: '/subscription', page: () => const SubPage()),
     // 订阅详情
     CustomGetPage(name: '/subDetail', page: () => const SubDetailPage()),
+    // 播放器手势
+    CustomGetPage(
+        name: '/playerGestureSet', page: () => const PlayGesturePage()),
   ];
 }
 

lib/services/audio_handler.dart

@@ -26,6 +26,7 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
   static final List<MediaItem> _item = [];
   Box setting = GStrorage.setting;
   bool enableBackgroundPlay = false;
+  PlPlayerController player = PlPlayerController.getInstance();
 
   VideoPlayerServiceHandler() {
     revalidateSetting();
@@ -38,12 +39,12 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
 
   @override
   Future<void> play() async {
-    PlPlayerController.getInstance().play();
+    player.play();
   }
 
   @override
   Future<void> pause() async {
-    PlPlayerController.getInstance().pause();
+    player.pause();
   }
 
   @override
@@ -51,7 +52,7 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
     playbackState.add(playbackState.value.copyWith(
       updatePosition: position,
     ));
-    await PlPlayerController.getInstance().seekTo(position);
+    await player.seekTo(position);
   }
 
   Future<void> setMediaItem(MediaItem newMediaItem) async {
@@ -149,6 +150,8 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
     ));
     if (_item.isNotEmpty) {
       _item.removeLast();
+    }
+    if (_item.isNotEmpty) {
       setMediaItem(_item.last);
     }
     if (_item.isEmpty) {

lib/services/audio_session.dart

@@ -20,7 +20,7 @@ class AudioSessionHandler {
     session.interruptionEventStream.listen((event) {
       final player = PlPlayerController.getInstance();
       if (event.begin) {
-        if (player.playerStatus != PlayerStatus.playing) return;
+        if (!player.playerStatus.playing) return;
         switch (event.type) {
           case AudioInterruptionType.duck:
             player.setVolume(player.volume.value * 0.5);
@@ -52,7 +52,7 @@ class AudioSessionHandler {
     // 耳机拔出暂停
     session.becomingNoisyEventStream.listen((_) {
       final player = PlPlayerController.getInstance();
-      if (player.playerStatus == PlayerStatus.playing) {
+      if (player.playerStatus.playing) {
         player.pause();
       }
     });

lib/services/disable_battery_opt.dart

@@ -0,0 +1,40 @@
+import 'dart:io';
+
+import 'package:disable_battery_optimization/disable_battery_optimization.dart';
+import 'package:pilipala/utils/storage.dart';
+
+void DisableBatteryOpt() async {
+  if (!Platform.isAndroid) {
+    return;
+  }
+  // 本地缓存中读取 是否禁用了电池优化 默认未禁用
+  bool isDisableBatteryOptLocal =
+      GStrorage.localCache.get('isDisableBatteryOptLocal', defaultValue: false);
+  if (!isDisableBatteryOptLocal) {
+    final isBatteryOptimizationDisabled =
+        await DisableBatteryOptimization.isBatteryOptimizationDisabled;
+    if (isBatteryOptimizationDisabled == false) {
+      final hasDisabled = await DisableBatteryOptimization
+          .showDisableBatteryOptimizationSettings();
+      // 设置为已禁用
+      GStrorage.localCache.put('isDisableBatteryOptLocal', hasDisabled == true);
+    }
+  }
+
+  bool isManufacturerBatteryOptimizationDisabled = GStrorage.localCache
+      .get('isManufacturerBatteryOptimizationDisabled', defaultValue: false);
+  if (!isManufacturerBatteryOptimizationDisabled) {
+    final isManBatteryOptimizationDisabled = await DisableBatteryOptimization
+        .isManufacturerBatteryOptimizationDisabled;
+    if (isManBatteryOptimizationDisabled == false) {
+      final hasDisabled = await DisableBatteryOptimization
+          .showDisableManufacturerBatteryOptimizationSettings(
+        "当前设备可能有额外的电池优化",
+        "按照步骤操作以禁用电池优化，以保证应用在后台正常运行",
+      );
+      // 设置为已禁用
+      GStrorage.localCache.put(
+          'isManufacturerBatteryOptimizationDisabled', hasDisabled == true);
+    }
+  }
+}

lib/utils/app_scheme.dart

@@ -5,6 +5,7 @@ import 'package:get/get.dart';
 import '../http/search.dart';
 import '../models/common/search_type.dart';
 import 'id_utils.dart';
+import 'url_utils.dart';
 import 'utils.dart';
 
 class PiliSchame {
@@ -19,7 +20,7 @@ class PiliSchame {
     /// 完整链接进入 b23.无效
     appScheme.getLatestScheme().then((SchemeEntity? value) {
       if (value != null) {
-        _fullPathPush(value);
+        _routePush(value);
       }
     });
 
@@ -36,25 +37,17 @@ class PiliSchame {
     final String scheme = value.scheme;
     final String host = value.host;
     final String path = value.path;
-
     if (scheme == 'bilibili') {
-      // bilibili://root
       if (host == 'root') {
         Navigator.popUntil(
             Get.context!, (Route<dynamic> route) => route.isFirst);
-      }
+      } else if (host == 'space') {
-
-      // bilibili://space/{uid}
-      else if (host == 'space') {
         final String mid = path.split('/').last;
         Get.toNamed<dynamic>(
           '/member?mid=$mid',
           arguments: <String, dynamic>{'face': null},
         );
-      }
+      } else if (host == 'video') {
-
-      // bilibili://video/{aid}
-      else if (host == 'video') {
         String pathQuery = path.split('/').last;
         final numericRegex = RegExp(r'^[0-9]+$');
         if (numericRegex.hasMatch(pathQuery)) {
@@ -68,24 +61,16 @@ class PiliSchame {
         } else {
           SmartDialog.showToast('投稿匹配失败');
         }
-      }
+      } else if (host == 'live') {
-
-      // bilibili://live/{roomid}
-      else if (host == 'live') {
         final String roomId = path.split('/').last;
         Get.toNamed<dynamic>('/liveRoom?roomid=$roomId',
             arguments: <String, String?>{'liveItem': null, 'heroTag': roomId});
-      }
+      } else if (host == 'bangumi') {
-
-      // bilibili://bangumi/season/${ssid}
-      else if (host == 'bangumi') {
         if (path.startsWith('/season')) {
           final String seasonId = path.split('/').last;
-          _bangumiPush(int.parse(seasonId));
+          _bangumiPush(int.parse(seasonId), null);
         }
-      }
+      } else if (host == 'opus') {
-      // 专栏 bilibili://opus/detail/883089655985078289
-      else if (host == 'opus') {
         if (path.startsWith('/detail')) {
           var opusId = path.split('/').last;
           Get.toNamed(
@@ -99,8 +84,19 @@ class PiliSchame {
         }
       } else if (host == 'search') {
         Get.toNamed('/searchResult', parameters: {'keyword': ''});
+      } else if (host == 'article') {
+        final String id = path.split('/').last.split('?').first;
+        Get.toNamed('/htmlRender', parameters: {
+          'url': 'https://www.bilibili.com/read/cv$id',
+          'title': 'cv$id',
+          'id': 'cv$id',
+          'dynamicType': 'read'
+        });
       }
     }
+    if (scheme == 'https') {
+      _fullPathPush(value);
+    }
   }
 
   // 投稿跳转
@@ -131,10 +127,10 @@ class PiliSchame {
   }
 
   // 番剧跳转
-  static Future<void> _bangumiPush(int seasonId) async {
+  static Future<void> _bangumiPush(int? seasonId, int? epId) async {
     SmartDialog.showLoading<dynamic>(msg: '获取中...');
     try {
-      var result = await SearchHttp.bangumiInfo(seasonId: seasonId, epId: null);
+      var result = await SearchHttp.bangumiInfo(seasonId: seasonId, epId: epId);
       if (result['status']) {
         var bangumiDetail = result['data'];
         final int cid = bangumiDetail.episodes!.first.cid;
@@ -151,6 +147,8 @@ class PiliSchame {
             },
           ),
         );
+      } else {
+        SmartDialog.showToast(result['msg']);
       }
     } catch (e) {
       SmartDialog.showToast('番剧获取失败：$e');
@@ -163,29 +161,67 @@ class PiliSchame {
     // final String scheme = value.scheme!;
     final String host = value.host!;
     final String? path = value.path;
-    // Map<String, String> query = value.query!;
+    Map<String, String>? query = value.query;
-    if (host.startsWith('live.bilibili')) {
+    RegExp regExp = RegExp(r'^(www\.)?m?\.(bilibili\.com)$');
+    if (regExp.hasMatch(host)) {
+      print('bilibili.com');
+    } else if (host.contains('live')) {
       int roomId = int.parse(path!.split('/').last);
-      // print('直播');
+      Get.toNamed(
-      Get.toNamed('/liveRoom?roomid=$roomId',
+        '/liveRoom?roomid=$roomId',
-          arguments: {'liveItem': null, 'heroTag': roomId.toString()});
+        arguments: {'liveItem': null, 'heroTag': roomId.toString()},
-      return;
+      );
-    }
+    } else if (host.contains('space')) {
-    if (host.startsWith('space.bilibili')) {
+      var mid = path!.split('/').last;
-      print('个人空间');
+      Get.toNamed('/member?mid=$mid', arguments: {'face': ''});
       return;
+    } else if (host == 'b23.tv') {
+      final String fullPath = 'https://$host$path';
+      final String redirectUrl = await UrlUtils.parseRedirectUrl(fullPath);
+      final String pathSegment = Uri.parse(redirectUrl).path;
+      final String lastPathSegment = pathSegment.split('/').last;
+      final RegExp avRegex = RegExp(r'^[aA][vV]\d+', caseSensitive: false);
+      if (avRegex.hasMatch(lastPathSegment)) {
+        final Map<String, dynamic> map =
+            IdUtils.matchAvorBv(input: lastPathSegment);
+        if (map.containsKey('AV')) {
+          _videoPush(map['AV']! as int, null);
+        } else if (map.containsKey('BV')) {
+          _videoPush(null, map['BV'] as String);
+        } else {
+          SmartDialog.showToast('投稿匹配失败');
+        }
+      } else if (lastPathSegment.startsWith('ep')) {
+        _handleEpisodePath(lastPathSegment, redirectUrl);
+      } else if (lastPathSegment.startsWith('ss')) {
+        _handleSeasonPath(lastPathSegment, redirectUrl);
+      } else if (lastPathSegment.startsWith('BV')) {
+        UrlUtils.matchUrlPush(
+          lastPathSegment,
+          '',
+          redirectUrl,
+        );
+      } else {
+        Get.toNamed(
+          '/webview',
+          parameters: {'url': redirectUrl, 'type': 'url', 'pageTitle': ''},
+        );
+      }
     }
 
     if (path != null) {
-      final String area = path.split('/')[1];
+      final String area = path.split('/').last;
       switch (area) {
         case 'bangumi':
-          // print('番剧');
+          print('番剧');
-          final String seasonId = path.split('/').last;
+          if (area.startsWith('ep')) {
-          _bangumiPush(matchNum(seasonId).first);
+            _bangumiPush(null, matchNum(area).first);
+          } else if (area.startsWith('ss')) {
+            _bangumiPush(matchNum(area).first, null);
+          }
           break;
         case 'video':
-          // print('投稿');
+          print('投稿');
           final Map<String, dynamic> map = IdUtils.matchAvorBv(input: path);
           if (map.containsKey('AV')) {
             _videoPush(map['AV']! as int, null);
@@ -197,9 +233,17 @@ class PiliSchame {
           break;
         case 'read':
           print('专栏');
+          String id = 'cv${matchNum(query!['id']!).first}';
+          Get.toNamed('/htmlRender', parameters: {
+            'url': value.dataString!,
+            'title': '',
+            'id': id,
+            'dynamicType': 'read'
+          });
           break;
         case 'space':
           print('个人空间');
+          Get.toNamed('/member?mid=$area', arguments: {'face': ''});
           break;
       }
     }
@@ -211,4 +255,18 @@ class PiliSchame {
 
     return matches.map((Match match) => int.parse(match.group(0)!)).toList();
   }
+
+  static void _handleEpisodePath(String lastPathSegment, String redirectUrl) {
+    final String seasonId = _extractIdFromPath(lastPathSegment);
+    _bangumiPush(null, matchNum(seasonId).first);
+  }
+
+  static void _handleSeasonPath(String lastPathSegment, String redirectUrl) {
+    final String seasonId = _extractIdFromPath(lastPathSegment);
+    _bangumiPush(matchNum(seasonId).first, null);
+  }
+
+  static String _extractIdFromPath(String lastPathSegment) {
+    return lastPathSegment.split('/').last;
+  }
 }

lib/utils/cache_manage.dart

@@ -99,10 +99,8 @@ class CacheManage {
                 try {
                   // 清除缓存 图片缓存
                   await clearLibraryCache();
-                  Timer(const Duration(milliseconds: 500), () {
+                  SmartDialog.dismiss().then((res) {
-                    SmartDialog.dismiss().then((res) {
+                    SmartDialog.showToast('清除完成');
-                      SmartDialog.showToast('清除完成');
-                    });
                   });
                 } catch (err) {
                   SmartDialog.dismiss();

lib/utils/download.dart

@@ -1,40 +1,94 @@
 import 'dart:typed_data';
 
 import 'package:dio/dio.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:saver_gallery/saver_gallery.dart';
 
 class DownloadUtils {
   // 获取存储权限
-  static requestStoragePer() async {
+  static Future<bool> requestStoragePer() async {
-    Map<Permission, PermissionStatus> statuses = await [
+    await Permission.storage.request();
-      Permission.storage,
+    PermissionStatus status = await Permission.storage.status;
-      Permission.photos,
+    if (status == PermissionStatus.denied ||
-    ].request();
+        status == PermissionStatus.permanentlyDenied) {
-    statuses[Permission.storage].toString();
+      SmartDialog.show(
+        useSystem: true,
+        animationType: SmartAnimationType.centerFade_otherSlide,
+        builder: (BuildContext context) {
+          return AlertDialog(
+            title: const Text('提示'),
+            content: const Text('存储权限未授权'),
+            actions: [
+              TextButton(
+                onPressed: () async {
+                  openAppSettings();
+                },
+                child: const Text('去授权'),
+              )
+            ],
+          );
+        },
+      );
+      return false;
+    } else {
+      return true;
+    }
+  }
+
+  // 获取相册权限
+  static Future<bool> requestPhotoPer() async {
+    await Permission.photos.request();
+    PermissionStatus status = await Permission.photos.status;
+    if (status == PermissionStatus.denied ||
+        status == PermissionStatus.permanentlyDenied) {
+      SmartDialog.show(
+        useSystem: true,
+        animationType: SmartAnimationType.centerFade_otherSlide,
+        builder: (BuildContext context) {
+          return AlertDialog(
+            title: const Text('提示'),
+            content: const Text('相册权限未授权'),
+            actions: [
+              TextButton(
+                onPressed: () async {
+                  openAppSettings();
+                },
+                child: const Text('去授权'),
+              )
+            ],
+          );
+        },
+      );
+      return false;
+    } else {
+      return true;
+    }
   }
 
   static Future<bool> downloadImg(String imgUrl,
       {String imgType = 'cover'}) async {
     try {
-      await requestStoragePer();
+      if (!await requestPhotoPer()) {
+        return false;
+      }
       SmartDialog.showLoading(msg: '保存中');
       var response = await Dio()
           .get(imgUrl, options: Options(responseType: ResponseType.bytes));
+      final String imgSuffix = imgUrl.split('.').last;
       String picName =
-          "plpl_${imgType}_${DateTime.now().toString().split('-').join()}";
+          "plpl_${imgType}_${DateTime.now().toString().replaceAll(RegExp(r'[- :]'), '').split('.').first}";
       final SaveResult result = await SaverGallery.saveImage(
         Uint8List.fromList(response.data),
-        quality: 60,
+        name: '$picName.$imgSuffix',
-        name: picName,
         // 保存到 PiliPala文件夹
         androidRelativePath: "Pictures/PiliPala",
         androidExistNotSave: false,
       );
       SmartDialog.dismiss();
       if (result.isSuccess) {
-        await SmartDialog.showToast('「$picName」已保存 ');
+        await SmartDialog.showToast('「${'$picName.$imgSuffix'}」已保存 ');
       }
       return true;
     } catch (err) {

lib/utils/global_data.dart

@@ -1,5 +1,10 @@
+import '../models/common/index.dart';
+
 class GlobalData {
   int imgQuality = 10;
+  FullScreenGestureMode fullScreenGestureMode =
+      FullScreenGestureMode.values.last;
+  bool enablePlayerControlAnimation = true;
 
   // 私有构造函数
   GlobalData._();

lib/utils/id_utils.dart

@@ -68,8 +68,9 @@ class IdUtils {
     if (input == null || input.isEmpty) {
       return result;
     }
-    final RegExp bvRegex = RegExp(r'BV[0-9A-Za-z]{10}', caseSensitive: false);
+    final RegExp bvRegex =
-    final RegExp avRegex = RegExp(r'AV\d+', caseSensitive: false);
+        RegExp(r'[bB][vV][0-9A-Za-z]{10}', caseSensitive: false);
+    final RegExp avRegex = RegExp(r'[aA][vV]\d+', caseSensitive: false);
 
     final Iterable<Match> bvMatches = bvRegex.allMatches(input);
     final Iterable<Match> avMatches = avRegex.allMatches(input);

lib/utils/storage.dart

@@ -4,6 +4,7 @@ import 'package:path_provider/path_provider.dart';
 import 'package:pilipala/models/model_owner.dart';
 import 'package:pilipala/models/search/hot.dart';
 import 'package:pilipala/models/user/info.dart';
+import '../models/common/gesture_mode.dart';
 import 'global_data.dart';
 
 class GStrorage {
@@ -45,6 +46,11 @@ class GStrorage {
     video = await Hive.openBox('video');
     GlobalData().imgQuality =
         setting.get(SettingBoxKey.defaultPicQa, defaultValue: 10); // 设置全局变量
+    GlobalData().fullScreenGestureMode = FullScreenGestureMode.values[
+        setting.get(SettingBoxKey.fullScreenGestureMode,
+            defaultValue: FullScreenGestureMode.values.last.index) as int];
+    GlobalData().enablePlayerControlAnimation = setting
+        .get(SettingBoxKey.enablePlayerControlAnimation, defaultValue: true);
   }
 
   static void regAdapter() {
@@ -78,6 +84,7 @@ class SettingBoxKey {
       autoUpgradeEnable = 'autoUpgradeEnable',
       feedBackEnable = 'feedBackEnable',
       defaultVideoQa = 'defaultVideoQa',
+      defaultLiveQa = 'defaultLiveQa',
       defaultAudioQa = 'defaultAudioQa',
       autoPlayEnable = 'autoPlayEnable',
       fullScreenMode = 'fullScreenMode',
@@ -94,11 +101,13 @@ class SettingBoxKey {
       enableCDN = 'enableCDN',
       autoPiP = 'autoPiP',
       enableAutoLongPressSpeed = 'enableAutoLongPressSpeed',
+      enablePlayerControlAnimation = 'enablePlayerControlAnimation',
 
       // youtube 双击快进快退
       enableQuickDouble = 'enableQuickDouble',
       enableShowDanmaku = 'enableShowDanmaku',
       enableBackgroundPlay = 'enableBackgroundPlay',
+      fullScreenGestureMode = 'fullScreenGestureMode',
 
       /// 隐私
       blackMidsList = 'blackMidsList',
@@ -122,7 +131,9 @@ class SettingBoxKey {
       enableWordRe = 'enableWordRe',
       enableSearchWord = 'enableSearchWord',
       enableSystemProxy = 'enableSystemProxy',
-      enableAi = 'enableAi';
+      enableAi = 'enableAi',
+      defaultHomePage = 'defaultHomePage',
+      enableRelatedVideo = 'enableRelatedVideo';
 
   /// 外观
   static const String themeMode = 'themeMode',
@@ -161,6 +172,10 @@ class LocalCacheKey {
       // 代理host port
       systemProxyHost = 'systemProxyHost',
       systemProxyPort = 'systemProxyPort';
+
+  static const String isDisableBatteryOptLocal = 'isDisableBatteryOptLocal',
+      isManufacturerBatteryOptimizationDisabled =
+          'isManufacturerBatteryOptimizationDisabled';
 }
 
 class VideoBoxKey {
@@ -172,6 +187,8 @@ class VideoBoxKey {
       videoSpeed = 'videoSpeed',
       // 播放顺序
       playRepeat = 'playRepeat',
+      // 系统预设倍速
+      playSpeedSystem = 'playSpeedSystem',
       // 默认倍速
       playSpeedDefault = 'playSpeedDefault',
       // 默认长按倍速