Merge branch 'main' into feature-liveRoomRender

.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>

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上查看
+问题反馈、功能建议请查看「关于」页面。

lib/common/widgets/network_img_layer.dart

@@ -2,6 +2,7 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/utils/extension.dart';
+import 'package:pilipala/utils/global_data.dart';
 import '../../utils/storage.dart';
 import '../constants.dart';
 
@@ -32,8 +33,10 @@ class NetworkImgLayer extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final int defaultImgQuality = GlobalData().imgQuality;
     final String imageUrl =
-        '${src!.startsWith('//') ? 'https:${src!}' : src!}@${quality ?? 100}q.webp';
+        '${src!.startsWith('//') ? 'https:${src!}' : src!}@${quality ?? defaultImgQuality}q.webp';
+    print(imageUrl);
     int? memCacheWidth, memCacheHeight;
     double aspectRatio = (width / height).toDouble();
 
@@ -81,7 +84,7 @@ class NetworkImgLayer extends StatelessWidget {
                   fadeOutDuration ?? const Duration(milliseconds: 120),
               fadeInDuration:
                   fadeInDuration ?? const Duration(milliseconds: 120),
-              filterQuality: FilterQuality.high,
+              filterQuality: FilterQuality.low,
               errorWidget: (BuildContext context, String url, Object error) =>
                   placeholder(context),
               placeholder: (BuildContext context, String url) =>

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(
-                                text: Utils.timeFormat(videoItem.duration!),
-                                right: 6.0,
-                                bottom: 6.0,
-                                type: 'gray',
-                              ),
+                              if (videoItem.duration != 0)
+                                PBadge(
+                                  text: Utils.timeFormat(videoItem.duration!),
+                                  right: 6.0,
+                                  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

@@ -483,4 +483,24 @@ class Api {
 
   /// 激活buvid3
   static const activateBuvidApi = '/x/internal/gaia-gateway/ExClimbWuzhi';
+
+  /// 我的订阅
+  static const userSubFolder = '/x/v3/fav/folder/collected/list';
+
+  /// 我的订阅详情
+  static const userSubFolderDetail = '/x/space/fav/season/list';
+
+  /// 表情
+  static const emojiList = '/x/emote/user/panel/web';
+
+  /// 已读标记
+  static const String ackSessionMsg =
+      '${HttpString.tUrl}/session_svr/v1/session_svr/update_ack';
+
+  /// 发送私信
+  static const String sendMsg = '${HttpString.tUrl}/web_im/v1/web_im/send_msg';
+
+  /// 排行榜
+  static const String getRankApi = "/x/web-interface/ranking/v2";
+
 }

lib/http/msg.dart

@@ -1,3 +1,4 @@
+import 'dart:math';
 import '../models/msg/account.dart';
 import '../models/msg/session.dart';
 import '../utils/wbi_sign.dart';
@@ -22,14 +23,22 @@ class MsgHttp {
     Map signParams = await WbiSign().makSign(params);
     var res = await Request().get(Api.sessionList, data: signParams);
     if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': SessionDataModel.fromJson(res.data['data']),
-      };
+      try {
+        return {
+          'status': true,
+          'data': SessionDataModel.fromJson(res.data['data']),
+        };
+      } catch (err) {
+        return {
+          'status': false,
+          'data': [],
+          'msg': err.toString(),
+        };
+      }
     } else {
       return {
         'status': false,
-        'date': [],
+        'data': [],
         'msg': res.data['message'],
       };
     }
@@ -42,12 +51,16 @@ class MsgHttp {
       'mobi_app': 'web',
     });
     if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': res.data['data']
-            .map<AccountListModel>((e) => AccountListModel.fromJson(e))
-            .toList(),
-      };
+      try {
+        return {
+          'status': true,
+          'data': res.data['data']
+              .map<AccountListModel>((e) => AccountListModel.fromJson(e))
+              .toList(),
+        };
+      } catch (err) {
+        print('err🔟: $err');
+      }
     } else {
       return {
         'status': false,
@@ -86,4 +99,125 @@ class MsgHttp {
       };
     }
   }
+
+  // 消息标记已读
+  static Future ackSessionMsg({
+    int? talkerId,
+    int? ackSeqno,
+  }) async {
+    String csrf = await Request.getCsrf();
+    Map params = await WbiSign().makSign({
+      'talker_id': talkerId,
+      'session_type': 1,
+      'ack_seqno': ackSeqno,
+      'build': 0,
+      'mobi_app': 'web',
+      'csrf_token': csrf,
+      'csrf': csrf
+    });
+    var res = await Request().get(Api.ackSessionMsg, data: params);
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': res.data['data'],
+      };
+    } else {
+      return {
+        'status': false,
+        'date': [],
+        'msg': "message: ${res.data['message']},"
+            " msg: ${res.data['msg']},"
+            " code: ${res.data['code']}",
+      };
+    }
+  }
+
+  // 发送私信
+  static Future sendMsg({
+    int? senderUid,
+    int? receiverId,
+    int? receiverType,
+    int? msgType,
+    dynamic content,
+  }) async {
+    String csrf = await Request.getCsrf();
+    Map<String, dynamic> params = await WbiSign().makSign({
+      'msg[sender_uid]': senderUid,
+      'msg[receiver_id]': receiverId,
+      'msg[receiver_type]': receiverType ?? 1,
+      'msg[msg_type]': msgType ?? 1,
+      'msg[msg_status]': 0,
+      'msg[dev_id]': getDevId(),
+      'msg[timestamp]': DateTime.now().millisecondsSinceEpoch ~/ 1000,
+      'msg[new_face_version]': 0,
+      'msg[content]': content,
+      'from_firework': 0,
+      'build': 0,
+      'mobi_app': 'web',
+      'csrf_token': csrf,
+      'csrf': csrf,
+    });
+    var res =
+        await Request().post(Api.sendMsg, queryParameters: <String, dynamic>{
+      ...params,
+      'csrf_token': csrf,
+      'csrf': csrf,
+    }, data: {
+      'w_sender_uid': params['msg[sender_uid]'],
+      'w_receiver_id': params['msg[receiver_id]'],
+      'w_dev_id': params['msg[dev_id]'],
+      'w_rid': params['w_rid'],
+      'wts': params['wts'],
+      'csrf_token': csrf,
+      'csrf': csrf,
+    });
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': res.data['data'],
+      };
+    } else {
+      return {
+        'status': false,
+        'date': [],
+        'msg': "message: ${res.data['message']},"
+            " msg: ${res.data['msg']},"
+            " code: ${res.data['code']}",
+      };
+    }
+  }
+
+  static String getDevId() {
+    final List<String> b = [
+      '0',
+      '1',
+      '2',
+      '3',
+      '4',
+      '5',
+      '6',
+      '7',
+      '8',
+      '9',
+      'A',
+      'B',
+      'C',
+      'D',
+      'E',
+      'F'
+    ];
+    final List<String> s = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".split('');
+    for (int i = 0; i < s.length; i++) {
+      if ('-' == s[i] || '4' == s[i]) {
+        continue;
+      }
+      final int randomInt = Random().nextInt(16);
+      if ('x' == s[i]) {
+        s[i] = b[randomInt];
+      } else {
+        s[i] = b[3 & randomInt | 8];
+      }
+    }
+    return s.join();
+  }
 }

lib/http/reply.dart

@@ -1,4 +1,5 @@
 import '../models/video/reply/data.dart';
+import '../models/video/reply/emote.dart';
 import 'api.dart';
 import 'init.dart';
 
@@ -100,4 +101,23 @@ class ReplyHttp {
       };
     }
   }
+
+  static Future getEmoteList({String? business}) async {
+    var res = await Request().get(Api.emojiList, data: {
+      'business': business ?? 'reply',
+      'web_location': '333.1245',
+    });
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': EmoteModelData.fromJson(res.data['data']),
+      };
+    } else {
+      return {
+        'status': false,
+        'date': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
 }

lib/http/user.dart

@@ -6,6 +6,8 @@ import '../models/user/fav_folder.dart';
 import '../models/user/history.dart';
 import '../models/user/info.dart';
 import '../models/user/stat.dart';
+import '../models/user/sub_detail.dart';
+import '../models/user/sub_folder.dart';
 import 'api.dart';
 import 'init.dart';
 
@@ -305,4 +307,46 @@ class UserHttp {
       return {'status': false, 'msg': res.data['message']};
     }
   }
+
+  // 我的订阅
+  static Future userSubFolder({
+    required int mid,
+    required int pn,
+    required int ps,
+  }) async {
+    var res = await Request().get(Api.userSubFolder, data: {
+      'up_mid': mid,
+      'ps': ps,
+      'pn': pn,
+      'platform': 'web',
+    });
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': SubFolderModelData.fromJson(res.data['data'])
+      };
+    } else {
+      return {'status': false, 'msg': res.data['message']};
+    }
+  }
+
+  static Future userSubFolderDetail({
+    required int seasonId,
+    required int pn,
+    required int ps,
+  }) async {
+    var res = await Request().get(Api.userSubFolderDetail, data: {
+      'season_id': seasonId,
+      'ps': ps,
+      'pn': pn,
+    });
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': SubDetailModelData.fromJson(res.data['data'])
+      };
+    } else {
+      return {'status': false, '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/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/msg/session.dart

@@ -8,7 +8,7 @@ class SessionDataModel {
     this.hasMore,
   });
 
-  List? sessionList;
+  List<SessionList>? sessionList;
   int? hasMore;
 
   SessionDataModel.fromJson(Map<String, dynamic> json) {
@@ -121,35 +121,37 @@ class LastMsg {
     this.msgKey,
     this.msgStatus,
     this.notifyCode,
-    this.newFaceVersion,
+    // this.newFaceVersion,
   });
 
   int? senderIid;
   int? receiverType;
   int? receiverId;
   int? msgType;
-  Map? content;
+  dynamic content;
   int? msgSeqno;
   int? timestamp;
   String? atUids;
   int? msgKey;
   int? msgStatus;
   String? notifyCode;
-  int? newFaceVersion;
+  // int? newFaceVersion;
 
   LastMsg.fromJson(Map<String, dynamic> json) {
     senderIid = json['sender_uid'];
     receiverType = json['receiver_type'];
     receiverId = json['receiver_id'];
     msgType = json['msg_type'];
-    content = jsonDecode(json['content']);
+    content = json['content'] != null && json['content'] != ''
+        ? jsonDecode(json['content'])
+        : '';
     msgSeqno = json['msg_seqno'];
     timestamp = json['timestamp'];
     atUids = json['at_uids'];
     msgKey = json['msg_key'];
     msgStatus = json['msg_status'];
     notifyCode = json['notify_code'];
-    newFaceVersion = json['new_face_version'];
+    // newFaceVersion = json['new_face_version'];
   }
 }
 
@@ -214,7 +216,9 @@ class MessageItem {
     receiverId = json['receiver_id'];
     // 1 文本 2 图片 18 系统提示 10 系统通知  5 撤回的消息
     msgType = json['msg_type'];
-    content = jsonDecode(json['content']);
+    content = json['content'] != null && json['content'] != ''
+        ? jsonDecode(json['content'])
+        : '';
     msgSeqno = json['msg_seqno'];
     timestamp = json['timestamp'];
     atUids = json['at_uids'];

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/models/user/sub_detail.dart

@@ -0,0 +1,123 @@
+class SubDetailModelData {
+  DetailInfo? info;
+  List<SubDetailMediaItem>? medias;
+
+  SubDetailModelData({this.info, this.medias});
+
+  SubDetailModelData.fromJson(Map<String, dynamic> json) {
+    info = DetailInfo.fromJson(json['info']);
+    if (json['medias'] != null) {
+      medias = <SubDetailMediaItem>[];
+      json['medias'].forEach((v) {
+        medias!.add(SubDetailMediaItem.fromJson(v));
+      });
+    }
+  }
+}
+
+class SubDetailMediaItem {
+  int? id;
+  String? title;
+  String? cover;
+  String? pic;
+  int? duration;
+  int? pubtime;
+  String? bvid;
+  Map? upper;
+  Map? cntInfo;
+  int? enableVt;
+  String? vtDisplay;
+
+  SubDetailMediaItem({
+    this.id,
+    this.title,
+    this.cover,
+    this.pic,
+    this.duration,
+    this.pubtime,
+    this.bvid,
+    this.upper,
+    this.cntInfo,
+    this.enableVt,
+    this.vtDisplay,
+  });
+
+  SubDetailMediaItem.fromJson(Map<String, dynamic> json) {
+    id = json['id'];
+    title = json['title'];
+    cover = json['cover'];
+    pic = json['cover'];
+    duration = json['duration'];
+    pubtime = json['pubtime'];
+    bvid = json['bvid'];
+    upper = json['upper'];
+    cntInfo = json['cnt_info'];
+    enableVt = json['enable_vt'];
+    vtDisplay = json['vt_display'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final data = <String, dynamic>{};
+    data['id'] = id;
+    data['title'] = title;
+    data['cover'] = cover;
+    data['duration'] = duration;
+    data['pubtime'] = pubtime;
+    data['bvid'] = bvid;
+    data['upper'] = upper;
+    data['cnt_info'] = cntInfo;
+    data['enable_vt'] = enableVt;
+    data['vt_display'] = vtDisplay;
+    return data;
+  }
+}
+
+class DetailInfo {
+  int? id;
+  int? seasonType;
+  String? title;
+  String? cover;
+  Map? upper;
+  Map? cntInfo;
+  int? mediaCount;
+  String? intro;
+  int? enableVt;
+
+  DetailInfo({
+    this.id,
+    this.seasonType,
+    this.title,
+    this.cover,
+    this.upper,
+    this.cntInfo,
+    this.mediaCount,
+    this.intro,
+    this.enableVt,
+  });
+
+  DetailInfo.fromJson(Map<String, dynamic> json) {
+    id = json['id'];
+    seasonType = json['season_type'];
+    title = json['title'];
+    cover = json['cover'];
+    upper = json['upper'];
+    cntInfo = json['cnt_info'];
+    mediaCount = json['media_count'];
+    intro = json['intro'];
+    enableVt = json['enable_vt'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final data = <String, dynamic>{};
+    data['id'] = id;
+    data['season_type'] = seasonType;
+    data['title'] = title;
+    data['cover'] = cover;
+    data['upper'] = upper;
+    data['cnt_info'] = cntInfo;
+    data['media_count'] = mediaCount;
+    data['intro'] = intro;
+    data['enable_vt'] = enableVt;
+    return data;
+  }
+}

lib/models/user/sub_folder.dart

@@ -0,0 +1,111 @@
+class SubFolderModelData {
+  final int? count;
+  final List<SubFolderItemData>? list;
+
+  SubFolderModelData({
+    this.count,
+    this.list,
+  });
+
+  factory SubFolderModelData.fromJson(Map<String, dynamic> json) {
+    return SubFolderModelData(
+      count: json['count'],
+      list: json['list'] != null
+          ? (json['list'] as List)
+              .map<SubFolderItemData>((i) => SubFolderItemData.fromJson(i))
+              .toList()
+          : null,
+    );
+  }
+}
+
+class SubFolderItemData {
+  final int? id;
+  final int? fid;
+  final int? mid;
+  final int? attr;
+  final String? title;
+  final String? cover;
+  final Upper? upper;
+  final int? coverType;
+  final String? intro;
+  final int? ctime;
+  final int? mtime;
+  final int? state;
+  final int? favState;
+  final int? mediaCount;
+  final int? viewCount;
+  final int? vt;
+  final int? playSwitch;
+  final int? type;
+  final String? link;
+  final String? bvid;
+
+  SubFolderItemData({
+    this.id,
+    this.fid,
+    this.mid,
+    this.attr,
+    this.title,
+    this.cover,
+    this.upper,
+    this.coverType,
+    this.intro,
+    this.ctime,
+    this.mtime,
+    this.state,
+    this.favState,
+    this.mediaCount,
+    this.viewCount,
+    this.vt,
+    this.playSwitch,
+    this.type,
+    this.link,
+    this.bvid,
+  });
+
+  factory SubFolderItemData.fromJson(Map<String, dynamic> json) {
+    return SubFolderItemData(
+      id: json['id'],
+      fid: json['fid'],
+      mid: json['mid'],
+      attr: json['attr'],
+      title: json['title'],
+      cover: json['cover'],
+      upper: json['upper'] != null ? Upper.fromJson(json['upper']) : null,
+      coverType: json['cover_type'],
+      intro: json['intro'],
+      ctime: json['ctime'],
+      mtime: json['mtime'],
+      state: json['state'],
+      favState: json['fav_state'],
+      mediaCount: json['media_count'],
+      viewCount: json['view_count'],
+      vt: json['vt'],
+      playSwitch: json['play_switch'],
+      type: json['type'],
+      link: json['link'],
+      bvid: json['bvid'],
+    );
+  }
+}
+
+class Upper {
+  final int? mid;
+  final String? name;
+  final String? face;
+
+  Upper({
+    this.mid,
+    this.name,
+    this.face,
+  });
+
+  factory Upper.fromJson(Map<String, dynamic> json) {
+    return Upper(
+      mid: json['mid'],
+      name: json['name'],
+      face: json['face'],
+    );
+  }
+}

lib/models/video/reply/emote.dart

@@ -0,0 +1,120 @@
+class EmoteModelData {
+  final List<PackageItem>? packages;
+
+  EmoteModelData({
+    required this.packages,
+  });
+
+  factory EmoteModelData.fromJson(Map<String, dynamic> jsonRes) {
+    final List<PackageItem>? packages =
+        jsonRes['packages'] is List ? <PackageItem>[] : null;
+    if (packages != null) {
+      for (final dynamic item in jsonRes['packages']!) {
+        if (item != null) {
+          try {
+            packages.add(PackageItem.fromJson(item));
+          } catch (_) {}
+        }
+      }
+    }
+    return EmoteModelData(
+      packages: packages,
+    );
+  }
+}
+
+class PackageItem {
+  final int? id;
+  final String? text;
+  final String? url;
+  final int? mtime;
+  final int? type;
+  final int? attr;
+  final Meta? meta;
+  final List<Emote>? emote;
+
+  PackageItem({
+    required this.id,
+    required this.text,
+    required this.url,
+    required this.mtime,
+    required this.type,
+    required this.attr,
+    required this.meta,
+    required this.emote,
+  });
+
+  factory PackageItem.fromJson(Map<String, dynamic> jsonRes) {
+    final List<Emote>? emote = jsonRes['emote'] is List ? <Emote>[] : null;
+    if (emote != null) {
+      for (final dynamic item in jsonRes['emote']!) {
+        if (item != null) {
+          try {
+            emote.add(Emote.fromJson(item));
+          } catch (_) {}
+        }
+      }
+    }
+    return PackageItem(
+      id: jsonRes['id'],
+      text: jsonRes['text'],
+      url: jsonRes['url'],
+      mtime: jsonRes['mtime'],
+      type: jsonRes['type'],
+      attr: jsonRes['attr'],
+      meta: Meta.fromJson(jsonRes['meta']),
+      emote: emote,
+    );
+  }
+}
+
+class Meta {
+  final int? size;
+  final List<String>? suggest;
+
+  Meta({
+    required this.size,
+    required this.suggest,
+  });
+
+  factory Meta.fromJson(Map<String, dynamic> jsonRes) => Meta(
+        size: jsonRes['size'],
+        suggest: jsonRes['suggest'] is List ? <String>[] : null,
+      );
+}
+
+class Emote {
+  final int? id;
+  final int? packageId;
+  final String? text;
+  final String? url;
+  final int? mtime;
+  final int? type;
+  final int? attr;
+  final Meta? meta;
+  final dynamic activity;
+
+  Emote({
+    required this.id,
+    required this.packageId,
+    required this.text,
+    required this.url,
+    required this.mtime,
+    required this.type,
+    required this.attr,
+    required this.meta,
+    required this.activity,
+  });
+
+  factory Emote.fromJson(Map<String, dynamic> jsonRes) => Emote(
+        id: jsonRes['id'],
+        packageId: jsonRes['package_id'],
+        text: jsonRes['text'],
+        url: jsonRes['url'],
+        mtime: jsonRes['mtime'],
+        type: jsonRes['type'],
+        attr: jsonRes['attr'],
+        meta: Meta.fromJson(jsonRes['meta']),
+        activity: jsonRes['activity'],
+      );
+}

lib/pages/about/index.dart

@@ -205,7 +205,6 @@ class _AboutPageState extends State<AboutPage> {
               },
               title: const Text('清除缓存'),
               subtitle: Text('图片及网络缓存 $cacheSize', style: subTitleStyle),
-              trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline),
             ),
             SizedBox(height: MediaQuery.of(context).padding.bottom + 20)
           ],
@@ -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> bangumiFollowList = [BangumiListItemModel()].obs;
+  RxList<BangumiListItemModel> bangumiList = <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 {
-                    var res = await VideoHttp.coinVideo(
-                        bvid: bvid, multiply: _tempThemeValue);
-                    if (res['status']) {
-                      SmartDialog.showToast('投币成功 👏');
-                      hasCoin.value = true;
-                      bangumiDetail.value.stat!['coins'] =
-                          bangumiDetail.value.stat!['coins'] + _tempThemeValue;
-                    } else {
-                      SmartDialog.showToast(res['msg']);
-                    }
-                    Get.back();
-                  },
-                  child: const Text('确定'))
+                onPressed: () async {
+                  var res = await VideoHttp.coinVideo(
+                      bvid: bvid, multiply: _tempThemeValue);
+                  if (res['status']) {
+                    SmartDialog.showToast('投币成功 👏');
+                    hasCoin.value = true;
+                    bangumiDetail.value.stat!['coins'] =
+                        bangumiDetail.value.stat!['coins'] + _tempThemeValue;
+                  } else {
+                    SmartDialog.showToast(res['msg']);
+                  }
+                  Get.back();
+                },
+                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 BangumiInfo(
-              loadingStatus: false,
-              bangumiDetail: bangumiDetail,
-              cid: cid,
+            return Obx(
+              () => BangumiInfo(
+                bangumiDetail: bangumiIntroController.bangumiDetail.value,
+                cid: cid,
+              ),
             );
           } else {
             // 请求错误
-            // return HttpError(
-            //   errMsg: snapshot.data['msg'],
-            //   fn: () => Get.back(),
-            // );
-            return const SizedBox();
+            return HttpError(
+              errMsg: snapshot.data['msg'],
+              fn: () => Get.back(),
+            );
           }
         } else {
-          return BangumiInfo(
-            loadingStatus: true,
-            bangumiDetail: bangumiDetail,
-            cid: cid,
+          return const SliverToBoxAdapter(
+            child: SizedBox(
+              height: 100,
+              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
-            ? Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
+          child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Stack(
                 children: [
-                  Row(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Stack(
-                        children: [
-                          NetworkImgLayer(
-                            width: 105,
-                            height: 160,
-                            src: !widget.loadingStatus
-                                ? widget.bangumiDetail!.cover!
-                                : bangumiItem!.cover!,
-                          ),
-                          if (bangumiItem != null &&
-                              bangumiItem!.rating != null)
-                            PBadge(
-                              text:
-                                  '评分 ${!widget.loadingStatus ? widget.bangumiDetail!.rating!['score']! : bangumiItem!.rating!['score']!}',
-                              top: null,
-                              right: 6,
-                              bottom: 6,
-                              left: null,
+                  NetworkImgLayer(
+                    width: 105,
+                    height: 160,
+                    src: widget.bangumiDetail!.cover!,
+                  ),
+                  PBadge(
+                    text: '评分 ${widget.bangumiDetail!.rating!['score']!}',
+                    top: null,
+                    right: 6,
+                    bottom: 6,
+                    left: null,
+                  ),
+                ],
+              ),
+              const SizedBox(width: 10),
+              Expanded(
+                child: InkWell(
+                  onTap: () => showIntroDetail(),
+                  child: SizedBox(
+                    height: 158,
+                    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: 10),
-                      Expanded(
-                        child: InkWell(
-                          onTap: () => showIntroDetail(),
-                          child: SizedBox(
-                            height: 158,
-                            child: Column(
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              mainAxisSize: MainAxisSize.min,
-                              children: [
-                                Row(
-                                  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,
-                                        ),
-                                      ),
-                                    ),
-                                  ],
+                            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);
+                                  }),
                                 ),
-                                Row(
-                                  children: [
-                                    StatView(
-                                      theme: 'gray',
-                                      view: !widget.loadingStatus
-                                          ? widget.bangumiDetail!.stat!['views']
-                                          : bangumiItem!.stat!['views'],
-                                      size: 'medium',
-                                    ),
-                                    const SizedBox(width: 6),
-                                    StatDanMu(
-                                      theme: 'gray',
-                                      danmu: !widget.loadingStatus
-                                          ? widget
-                                              .bangumiDetail!.stat!['danmakus']
-                                          : bangumiItem!.stat!['danmakus'],
-                                      size: 'medium',
-                                    ),
-                                  ],
+                                onPressed: () =>
+                                    bangumiIntroController.bangumiAdd(),
+                                icon: Icon(
+                                  Icons.favorite_border_rounded,
+                                  color: t.colorScheme.primary,
+                                  size: 22,
                                 ),
-                                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),
-                      selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp),
-                      onTap:
-                          handleState(bangumiIntroController.actionLikeVideo),
-                      selectStatus: bangumiIntroController.hasLike.value,
-                      loadingStatus: false,
-                      text: !widget.loadingStatus
-                          ? widget.bangumiDetail!.stat!['likes']!.toString()
-                          : bangumiItem!.stat!['likes']!.toString()),
+                    icon: const Icon(FontAwesomeIcons.thumbsUp),
+                    selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp),
+                    onTap: handleState(bangumiIntroController.actionLikeVideo),
+                    selectStatus: bangumiIntroController.hasLike.value,
+                    text: widget.bangumiDetail!.stat!['likes']!.toString(),
+                  ),
                 ),
                 Obx(
                   () => ActionItem(
-                      icon: const Icon(FontAwesomeIcons.b),
-                      selectIcon: const Icon(FontAwesomeIcons.b),
-                      onTap:
-                          handleState(bangumiIntroController.actionCoinVideo),
-                      selectStatus: bangumiIntroController.hasCoin.value,
-                      loadingStatus: false,
-                      text: !widget.loadingStatus
-                          ? widget.bangumiDetail!.stat!['coins']!.toString()
-                          : bangumiItem!.stat!['coins']!.toString()),
+                    icon: const Icon(FontAwesomeIcons.b),
+                    selectIcon: const Icon(FontAwesomeIcons.b),
+                    onTap: handleState(bangumiIntroController.actionCoinVideo),
+                    selectStatus: bangumiIntroController.hasCoin.value,
+                    text: widget.bangumiDetail!.stat!['coins']!.toString(),
+                  ),
                 ),
                 Obx(
                   () => ActionItem(
-                      icon: const Icon(FontAwesomeIcons.star),
-                      selectIcon: const Icon(FontAwesomeIcons.solidStar),
-                      onTap: () => showFavBottomSheet(),
-                      selectStatus: bangumiIntroController.hasFav.value,
-                      loadingStatus: false,
-                      text: !widget.loadingStatus
-                          ? widget.bangumiDetail!.stat!['favorite']!.toString()
-                          : bangumiItem!.stat!['favorite']!.toString()),
+                    icon: const Icon(FontAwesomeIcons.star),
+                    selectIcon: const Icon(FontAwesomeIcons.solidStar),
+                    onTap: () => showFavBottomSheet(),
+                    selectStatus: bangumiIntroController.hasFav.value,
+                    text: widget.bangumiDetail!.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.loadingStatus
-                      ? widget.bangumiDetail!.stat!['reply']!.toString()
-                      : bangumiItem!.stat!['reply']!.toString(),
+                  text: widget.bangumiDetail!.stat!['reply']!.toString(),
                 ),
                 ActionItem(
-                    icon: const Icon(FontAwesomeIcons.shareFromSquare),
-                    onTap: () => bangumiIntroController.actionShareVideo(),
-                    selectStatus: false,
-                    loadingStatus: false,
-                    text: !widget.loadingStatus
-                        ? widget.bangumiDetail!.stat!['share']!.toString()
-                        : bangumiItem!.stat!['share']!.toString()),
+                  icon: const Icon(FontAwesomeIcons.shareFromSquare),
+                  onTap: () => bangumiIntroController.actionShareVideo(),
+                  selectStatus: false,
+                  text: widget.bangumiDetail!.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,
@@ -106,37 +149,21 @@ class _BangumiPanelState extends State<BangumiPanel> {
                     child: Material(
                       child: ScrollablePositionedList.builder(
                         itemCount: widget.pages.length,
-                        itemBuilder: (BuildContext context, int index) =>
-                            ListTile(
-                          onTap: () {
-                            setState(() {
-                              changeFucCall(widget.pages[index], index);
-                            });
-                          },
-                          dense: false,
-                          leading: index == currentIndex
-                              ? Image.asset(
-                                  'assets/images/live.gif',
-                                  color: Theme.of(context).colorScheme.primary,
-                                  height: 12,
+                        itemBuilder: (BuildContext context, int index) {
+                          bool isLastItem = index == widget.pages.length - 1;
+                          bool isCurrentIndex = currentIndex == index;
+                          return isLastItem
+                              ? SizedBox(
+                                  height:
+                                      MediaQuery.of(context).padding.bottom +
+                                          20,
                                 )
-                              : null,
-                          title: Text(
-                            '第${index + 1}话  ${widget.pages[index].longTitle!}',
-                            style: TextStyle(
-                              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(),
-                        ),
+                              : buildPageListItem(
+                                  widget.pages[index],
+                                  index,
+                                  isCurrentIndex,
+                                );
+                        },
                         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 == '会员') ...[
-                                  Image.asset(
-                                    'assets/images/big-vip.png',
-                                    height: 16,
+                                const Spacer(),
+                                Text(
+                                  widget.pages[i].badge!,
+                                  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.liveUsers = LiveUsers();
+      upData.value.upList = <UpItem>[];
+      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(
-          item.modules.moduleDynamic.major.opus.title,
-          style: Theme.of(context)
-              .textTheme
-              .titleMedium!
-              .copyWith(fontWeight: FontWeight.bold),
-        ),
-        const SizedBox(height: 2),
-        if (item.modules.moduleDynamic.major.opus.summary.text !=
-            'undefined') ...[
-          Text(
-            item.modules.moduleDynamic.major.opus.summary.richTextNodes.first
-                .text,
-            maxLines: 4,
-            style: const TextStyle(height: 1.55),
-            overflow: TextOverflow.ellipsis,
-          ),
-          const SizedBox(height: 2),
-        ],
+        // Text(
+        //   item.modules.moduleDynamic.major.opus.title,
+        //   style: Theme.of(context)
+        //       .textTheme
+        //       .titleMedium!
+        //       .copyWith(fontWeight: FontWeight.bold),
+        // ),
+        // const SizedBox(height: 2),
+        // if (item.modules.moduleDynamic.major.opus.summary.text !=
+        //     'undefined') ...[
+        //   Text(
+        //     item.modules.moduleDynamic.major.opus.summary.richTextNodes.first
+        //         .text,
+        //     maxLines: 4,
+        //     style: const TextStyle(height: 1.55),
+        //     overflow: TextOverflow.ellipsis,
+        //   ),
+        //   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;
-  var userInfo;
+  late MyInfo userInfo;
 
-  @override
-  void initState() {
-    super.initState();
-    upList = widget.upData!.upList!;
-    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,
-      ),
-    );
+  void listFormat() {
+    userInfo = widget.upData.myInfo!;
+    upList = widget.upData.upList!;
+    liveList = widget.upData.liveList!;
   }
 
   @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/emote/controller.dart

@@ -0,0 +1,20 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+
+import '../../http/reply.dart';
+import '../../models/video/reply/emote.dart';
+
+class EmotePanelController extends GetxController
+    with GetTickerProviderStateMixin {
+  late List<PackageItem> emotePackage;
+  late TabController tabController;
+
+  Future getEmote() async {
+    var res = await ReplyHttp.getEmoteList(business: 'reply');
+    if (res['status']) {
+      emotePackage = res['data'].packages;
+      tabController = TabController(length: emotePackage.length, vsync: this);
+    }
+    return res;
+  }
+}

lib/pages/emote/index.dart

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

lib/pages/emote/view.dart

@@ -0,0 +1,116 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import '../../models/video/reply/emote.dart';
+import 'controller.dart';
+
+class EmotePanel extends StatefulWidget {
+  final Function onChoose;
+  const EmotePanel({super.key, required this.onChoose});
+
+  @override
+  State<EmotePanel> createState() => _EmotePanelState();
+}
+
+class _EmotePanelState extends State<EmotePanel>
+    with AutomaticKeepAliveClientMixin {
+  final EmotePanelController _emotePanelController =
+      Get.put(EmotePanelController());
+  late Future _futureBuilderFuture;
+
+  @override
+  bool get wantKeepAlive => true;
+
+  @override
+  void initState() {
+    _futureBuilderFuture = _emotePanelController.getEmote();
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    super.build(context);
+    return FutureBuilder(
+        future: _futureBuilderFuture,
+        builder: (context, snapshot) {
+          if (snapshot.connectionState == ConnectionState.done) {
+            Map data = snapshot.data as Map;
+            if (data['status']) {
+              List<PackageItem> emotePackage =
+                  _emotePanelController.emotePackage;
+
+              return Column(
+                children: [
+                  Expanded(
+                      child: TabBarView(
+                    controller: _emotePanelController.tabController,
+                    children: emotePackage.map(
+                      (e) {
+                        int size = e.emote!.first.meta!.size!;
+                        int type = e.type!;
+                        return Padding(
+                          padding: const EdgeInsets.fromLTRB(12, 6, 12, 0),
+                          child: GridView.builder(
+                            gridDelegate:
+                                SliverGridDelegateWithMaxCrossAxisExtent(
+                              maxCrossAxisExtent: size == 1 ? 40 : 60,
+                              crossAxisSpacing: 8,
+                              mainAxisSpacing: 8,
+                            ),
+                            itemCount: e.emote!.length,
+                            itemBuilder: (context, index) {
+                              return Material(
+                                color: Colors.transparent,
+                                clipBehavior: Clip.hardEdge,
+                                shape: RoundedRectangleBorder(
+                                  borderRadius: BorderRadius.circular(4),
+                                ),
+                                child: InkWell(
+                                  onTap: () {
+                                    widget.onChoose(e, e.emote![index]);
+                                  },
+                                  child: Padding(
+                                    padding: const EdgeInsets.all(3),
+                                    child: type == 4
+                                        ? Text(
+                                            e.emote![index].text!,
+                                            overflow: TextOverflow.clip,
+                                            maxLines: 1,
+                                          )
+                                        : Image.network(
+                                            e.emote![index].url!,
+                                            width: size * 38,
+                                            height: size * 38,
+                                          ),
+                                  ),
+                                ),
+                              );
+                            },
+                          ),
+                        );
+                      },
+                    ).toList(),
+                  )),
+                  Divider(
+                    height: 1,
+                    color: Theme.of(context).dividerColor.withOpacity(0.1),
+                  ),
+                  TabBar(
+                    controller: _emotePanelController.tabController,
+                    dividerColor: Colors.transparent,
+                    isScrollable: true,
+                    tabs: _emotePanelController.emotePackage
+                        .map((e) => Tab(text: e.text))
+                        .toList(),
+                  ),
+                  SizedBox(height: MediaQuery.of(context).padding.bottom + 20),
+                ],
+              );
+            } else {
+              return Center(child: Text(data['msg']));
+            }
+          } else {
+            return const Center(child: Text('加载中...'));
+          }
+        });
+  }
+}

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/controller.dart

@@ -24,7 +24,7 @@ class FavController extends GetxController {
     if (!hasMore.value) {
       return;
     }
-    var res = await await UserHttp.userfavFolder(
+    var res = await UserHttp.userfavFolder(
       pn: currentPage,
       ps: pageSize,
       mid: userInfo!.mid!,

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,12 +29,12 @@ 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;
     }
     isLoadingMore = true;
-    var res = await await UserHttp.userFavFolderDetail(
+    var res = await UserHttp.userFavFolderDetail(
       pn: currentPage,
       ps: 20,
       mediaId: mediaId!,
@@ -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

@@ -31,7 +31,6 @@ class _FavDetailPageState extends State<FavDetailPage> {
     super.initState();
     mediaId = Get.parameters['mediaId']!;
     _futureBuilderFuture = _favDetailController.queryUserFavFolderDetail();
-    mediaId = Get.parameters['mediaId']!;
     titleStreamC = StreamController<bool>();
     _controller.addListener(
       () {
@@ -85,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,
                           )
                         ],
@@ -176,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/view.dart

@@ -70,10 +70,6 @@ class _HistoryPageState extends State<HistoryPage> {
         child1: AppBar(
           titleSpacing: 0,
           centerTitle: false,
-          leading: IconButton(
-            onPressed: () => Get.back(),
-            icon: const Icon(Icons.arrow_back_outlined),
-          ),
           title: Text(
             '观看记录',
             style: Theme.of(context).textTheme.titleMedium,

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 (tabController.indexIsChanging) {
-        if (initialIndex.value != tabController.index) {
-          initialIndex.value = tabController.index;
+    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;
+          }
         }
-      } 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

@@ -58,6 +58,9 @@ class _HomePageState extends State<HomePage>
     return Scaffold(
       extendBody: true,
       extendBodyBehindAppBar: true,
+      appBar: _homeController.enableGradientBg
+          ? null
+          : AppBar(toolbarHeight: 0, elevation: 0),
       body: Stack(
         children: [
           // gradient background
@@ -412,13 +415,16 @@ class SearchBar extends StatelessWidget {
                 ),
                 const SizedBox(width: 10),
                 Obx(
-                  () => Text(
-                    ctr!.defaultSearch.value,
-                    maxLines: 1,
-                    overflow: TextOverflow.ellipsis,
-                    style: TextStyle(color: colorScheme.outline),
+                  () => Expanded(
+                    child: Text(
+                      ctr!.defaultSearch.value,
+                      maxLines: 1,
+                      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/widgets/bottom_control.dart

@@ -30,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);

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 = [
-    {
-      '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;
+  RxList navigationBars = defaultNavigationBars.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/controller.dart

@@ -28,6 +28,11 @@ class MediaController extends GetxController {
       'title': '我的收藏',
       'onTap': () => Get.toNamed('/fav'),
     },
+    {
+      'icon': Icons.subscriptions_outlined,
+      'title': '我的订阅',
+      'onTap': () => Get.toNamed('/subscription'),
+    },
     {
       'icon': Icons.watch_later_outlined,
       'title': '稍后再看',

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(
-            backgroundColor: Colors.transparent,
-            onDismissed: () {
-              Navigator.of(context).pop();
-            },
-            // Note that scrollable widget inside DismissiblePage might limit the functionality
-            // 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,
-                      );
-                    },
-                  );
-                },
+          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,
+                    );
+                  },
+                );
+              },
             ),
           ),
           Positioned(
@@ -251,33 +239,49 @@ class _ImagePreviewState extends State<ImagePreview>
             right: 0,
             bottom: 0,
             child: Container(
-              padding: EdgeInsets.only(
-                  bottom: MediaQuery.of(context).padding.bottom + 30),
-              decoration: const BoxDecoration(
-                gradient: LinearGradient(
-                  begin: Alignment.topCenter,
-                  end: Alignment.bottomCenter,
-                  colors: <Color>[
-                    Colors.transparent,
-                    Colors.black87,
+                padding: EdgeInsets.only(
+                    left: 20,
+                    right: 20,
+                    bottom: MediaQuery.of(context).padding.bottom + 30),
+                decoration: const BoxDecoration(
+                  gradient: LinearGradient(
+                    begin: Alignment.topCenter,
+                    end: Alignment.bottomCenter,
+                    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

@@ -1,11 +1,13 @@
 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:pilipala/models/common/dynamics_type.dart';
 import 'package:pilipala/models/common/reply_sort_type.dart';
 import 'package:pilipala/pages/setting/widgets/select_dialog.dart';
 import 'package:pilipala/utils/storage.dart';
 
+import '../home/index.dart';
 import 'widgets/switch_item.dart';
 
 class ExtraSetting extends StatefulWidget {
@@ -138,18 +140,20 @@ class _ExtraSettingState extends State<ExtraSetting> {
       ),
       body: ListView(
         children: [
-          SetSwitchItem(
+          const SetSwitchItem(
             title: '大家都在搜',
             subTitle: '是否展示「大家都在搜」',
             setKey: SettingBoxKey.enableHotKey,
             defaultVal: true,
-            callFn: (val) => {SmartDialog.showToast('下次启动时生效')},
           ),
-          const SetSwitchItem(
+          SetSwitchItem(
             title: '搜索默认词',
             subTitle: '是否展示搜索框默认词',
             setKey: SettingBoxKey.enableSearchWord,
             defaultVal: true,
+            callFn: (val) {
+              Get.find<HomeController>().defaultSearch.value = '';
+            },
           ),
           const SetSwitchItem(
             title: '快速收藏',
@@ -169,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 = PlaySpeed.values[index].value;
-    } else {
-      chooseSpeed = customSpeedsList[index];
-    }
+    chooseSpeed =
+        type == 'system' ? playSpeedSystem[index] : 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) {
-        playSpeedDefault = 1.0;
-        videoStorage.put(VideoBoxKey.playSpeedDefault, playSpeedDefault);
+      late List speedsList =
+          type == 'system' ? playSpeedSystem : customSpeedsList;
+      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);
-      await videoStorage.put(VideoBoxKey.customSpeedsList, customSpeedsList);
+      speedsList.removeAt(index);
+      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(
-              padding: const EdgeInsets.only(
-                left: 14,
-                right: 14,
-                bottom: 10,
-                top: 20,
+            if (playSpeedSystem.isNotEmpty) ...[
+              Padding(
+                padding: const EdgeInsets.only(
+                  left: 14,
+                  right: 14,
+                  bottom: 10,
+                  top: 20,
+                ),
+                child: Text(
+                  '系统预设倍速',
+                  style: Theme.of(context).textTheme.titleMedium,
+                ),
               ),
-              child: Text(
-                '系统预设倍速',
-                style: Theme.of(context).textTheme.titleMedium,
-              ),
-            ),
-            Padding(
-              padding: const EdgeInsets.only(
-                left: 18,
-                right: 18,
-                bottom: 30,
-              ),
-              child: Wrap(
-                alignment: WrapAlignment.start,
-                spacing: 8,
-                runSpacing: 2,
-                children: [
-                  for (var i in PlaySpeed.values) ...[
-                    FilledButton.tonal(
-                      onPressed: () => showBottomSheet('system', i.index),
-                      child: Text(i.description),
-                    ),
-                  ]
-                ],
-              ),
-            ),
+              Padding(
+                padding: const EdgeInsets.only(
+                  left: 18,
+                  right: 18,
+                  bottom: 30,
+                ),
+                child: Wrap(
+                  alignment: WrapAlignment.start,
+                  spacing: 8,
+                  runSpacing: 2,
+                  children: [
+                    for (int i = 0; i < playSpeedSystem.length; i++) ...[
+                      FilledButton.tonal(
+                        onPressed: () => showBottomSheet('system', i),
+                        child: Text(playSpeedSystem[i].toString()),
+                      ),
+                    ]
+                  ],
+                ),
+              )
+            ],
             Padding(
                 padding: const EdgeInsets.only(
                   left: 14,

lib/pages/setting/play_setting.dart

@@ -7,6 +7,7 @@ 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';
@@ -77,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视频',
@@ -138,18 +145,20 @@ 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),

lib/pages/setting/style_setting.dart

@@ -8,9 +8,11 @@ import 'package:pilipala/models/common/theme_type.dart';
 import 'package:pilipala/pages/setting/pages/color_select.dart';
 import 'package:pilipala/pages/setting/widgets/select_dialog.dart';
 import 'package:pilipala/pages/setting/widgets/slide_dialog.dart';
+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';
 
@@ -28,7 +30,6 @@ class _StyleSettingState extends State<StyleSetting> {
 
   Box setting = GStrorage.setting;
   late int picQuality;
-  late double toastOpacity;
   late ThemeType _tempThemeValue;
   late dynamic defaultCustomRows;
 
@@ -36,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);
   }
@@ -176,6 +176,8 @@ class _StyleSettingState extends State<StyleSetting> {
                                   SettingBoxKey.defaultPicQa, picQuality);
                               Get.back();
                               settingController.picQuality.value = picQuality;
+                              GlobalData().imgQuality = picQuality;
+                              SmartDialog.showToast('设置成功');
                             },
                             child: const Text('确定'),
                           )
@@ -264,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/subscription/controller.dart

@@ -0,0 +1,49 @@
+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:pilipala/http/user.dart';
+import 'package:pilipala/models/user/info.dart';
+import 'package:pilipala/utils/storage.dart';
+
+import '../../models/user/sub_folder.dart';
+
+class SubController extends GetxController {
+  final ScrollController scrollController = ScrollController();
+  Rx<SubFolderModelData> subFolderData = SubFolderModelData().obs;
+  Box userInfoCache = GStrorage.userInfo;
+  UserInfoData? userInfo;
+  int currentPage = 1;
+  int pageSize = 20;
+  RxBool hasMore = true.obs;
+
+  Future<dynamic> querySubFolder({type = 'init'}) async {
+    userInfo = userInfoCache.get('userInfoCache');
+    if (userInfo == null) {
+      return {'status': false, 'msg': '账号未登录'};
+    }
+    var res = await UserHttp.userSubFolder(
+      pn: currentPage,
+      ps: pageSize,
+      mid: userInfo!.mid!,
+    );
+    if (res['status']) {
+      if (type == 'init') {
+        subFolderData.value = res['data'];
+      } else {
+        if (res['data'].list.isNotEmpty) {
+          subFolderData.value.list!.addAll(res['data'].list);
+          subFolderData.update((val) {});
+        }
+      }
+      currentPage++;
+    } else {
+      SmartDialog.showToast(res['msg']);
+    }
+    return res;
+  }
+
+  Future onLoad() async {
+    querySubFolder(type: 'onload');
+  }
+}

lib/pages/subscription/index.dart

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

lib/pages/subscription/view.dart

@@ -0,0 +1,84 @@
+import 'package:easy_debounce/easy_throttle.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/widgets/http_error.dart';
+import 'controller.dart';
+import 'widgets/item.dart';
+
+class SubPage extends StatefulWidget {
+  const SubPage({super.key});
+
+  @override
+  State<SubPage> createState() => _SubPageState();
+}
+
+class _SubPageState extends State<SubPage> {
+  final SubController _subController = Get.put(SubController());
+  late Future _futureBuilderFuture;
+  late ScrollController scrollController;
+
+  @override
+  void initState() {
+    super.initState();
+    _futureBuilderFuture = _subController.querySubFolder();
+    scrollController = _subController.scrollController;
+    scrollController.addListener(
+      () {
+        if (scrollController.position.pixels >=
+            scrollController.position.maxScrollExtent - 300) {
+          EasyThrottle.throttle('history', const Duration(seconds: 1), () {
+            _subController.onLoad();
+          });
+        }
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        centerTitle: false,
+        titleSpacing: 0,
+        title: Text(
+          '我的订阅',
+          style: Theme.of(context).textTheme.titleMedium,
+        ),
+      ),
+      body: FutureBuilder(
+        future: _futureBuilderFuture,
+        builder: (context, snapshot) {
+          if (snapshot.connectionState == ConnectionState.done) {
+            Map? data = snapshot.data;
+            if (data != null && data['status']) {
+              return Obx(
+                () => ListView.builder(
+                  controller: scrollController,
+                  itemCount: _subController.subFolderData.value.list!.length,
+                  itemBuilder: (context, index) {
+                    return SubItem(
+                        subFolderItem:
+                            _subController.subFolderData.value.list![index]);
+                  },
+                ),
+              );
+            } else {
+              return CustomScrollView(
+                physics: const NeverScrollableScrollPhysics(),
+                slivers: [
+                  HttpError(
+                    errMsg: data?['msg'],
+                    fn: () => setState(() {}),
+                  ),
+                ],
+              );
+            }
+          } else {
+            // 骨架屏
+            return const Text('请求中');
+          }
+        },
+      ),
+    );
+  }
+}

lib/pages/subscription/widgets/item.dart

@@ -0,0 +1,108 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/constants.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/utils/utils.dart';
+
+import '../../../models/user/sub_folder.dart';
+
+class SubItem extends StatelessWidget {
+  final SubFolderItemData subFolderItem;
+  const SubItem({super.key, required this.subFolderItem});
+
+  @override
+  Widget build(BuildContext context) {
+    String heroTag = Utils.makeHeroTag(subFolderItem.id);
+    return InkWell(
+      onTap: () => Get.toNamed(
+        '/subDetail',
+        arguments: subFolderItem,
+        parameters: {
+          'heroTag': heroTag,
+          'seasonId': subFolderItem.id.toString(),
+        },
+      ),
+      child: Padding(
+        padding: const EdgeInsets.fromLTRB(12, 7, 12, 7),
+        child: LayoutBuilder(
+          builder: (context, boxConstraints) {
+            double width =
+                (boxConstraints.maxWidth - StyleString.cardSpace * 6) / 2;
+            return SizedBox(
+              height: width / StyleString.aspectRatio,
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.start,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  AspectRatio(
+                    aspectRatio: StyleString.aspectRatio,
+                    child: LayoutBuilder(
+                      builder: (context, boxConstraints) {
+                        double maxWidth = boxConstraints.maxWidth;
+                        double maxHeight = boxConstraints.maxHeight;
+                        return Hero(
+                          tag: heroTag,
+                          child: NetworkImgLayer(
+                            src: subFolderItem.cover,
+                            width: maxWidth,
+                            height: maxHeight,
+                          ),
+                        );
+                      },
+                    ),
+                  ),
+                  VideoContent(subFolderItem: subFolderItem)
+                ],
+              ),
+            );
+          },
+        ),
+      ),
+    );
+  }
+}
+
+class VideoContent extends StatelessWidget {
+  final SubFolderItemData subFolderItem;
+  const VideoContent({super.key, required this.subFolderItem});
+
+  @override
+  Widget build(BuildContext context) {
+    return Expanded(
+      child: Padding(
+        padding: const EdgeInsets.fromLTRB(10, 2, 6, 0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              subFolderItem.title!,
+              textAlign: TextAlign.start,
+              style: const TextStyle(
+                fontWeight: FontWeight.w500,
+                letterSpacing: 0.3,
+              ),
+            ),
+            const SizedBox(height: 2),
+            Text(
+              '合集 UP主：${subFolderItem.upper!.name!}',
+              textAlign: TextAlign.start,
+              style: TextStyle(
+                fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
+                color: Theme.of(context).colorScheme.outline,
+              ),
+            ),
+            const SizedBox(height: 2),
+            Text(
+              '${subFolderItem.mediaCount}个视频',
+              textAlign: TextAlign.start,
+              style: TextStyle(
+                fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
+                color: Theme.of(context).colorScheme.outline,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/pages/subscription_detail/controller.dart

@@ -0,0 +1,60 @@
+import 'package:get/get.dart';
+import 'package:pilipala/http/user.dart';
+
+import '../../models/user/sub_detail.dart';
+import '../../models/user/sub_folder.dart';
+
+class SubDetailController extends GetxController {
+  late SubFolderItemData item;
+
+  late int seasonId;
+  late String heroTag;
+  int currentPage = 1;
+  bool isLoadingMore = false;
+  Rx<DetailInfo> subInfo = DetailInfo().obs;
+  RxList<SubDetailMediaItem> subList = <SubDetailMediaItem>[].obs;
+  RxString loadingText = '加载中...'.obs;
+  int mediaCount = 0;
+
+  @override
+  void onInit() {
+    item = Get.arguments;
+    if (Get.parameters.keys.isNotEmpty) {
+      seasonId = int.parse(Get.parameters['seasonId']!);
+      heroTag = Get.parameters['heroTag']!;
+    }
+    super.onInit();
+  }
+
+  Future<dynamic> queryUserSubFolderDetail({type = 'init'}) async {
+    if (type == 'onLoad' && subList.length >= mediaCount) {
+      loadingText.value = '没有更多了';
+      return;
+    }
+    isLoadingMore = true;
+    var res = await UserHttp.userSubFolderDetail(
+      seasonId: seasonId,
+      ps: 20,
+      pn: currentPage,
+    );
+    if (res['status']) {
+      subInfo.value = res['data'].info;
+      if (currentPage == 1 && type == 'init') {
+        subList.value = res['data'].medias;
+        mediaCount = res['data'].info.mediaCount;
+      } else if (type == 'onLoad') {
+        subList.addAll(res['data'].medias);
+      }
+      if (subList.length >= mediaCount) {
+        loadingText.value = '没有更多了';
+      }
+    }
+    currentPage += 1;
+    isLoadingMore = false;
+    return res;
+  }
+
+  onLoad() {
+    queryUserSubFolderDetail(type: 'onLoad');
+  }
+}

lib/pages/subscription_detail/index.dart

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

lib/pages/subscription_detail/view.dart

@@ -0,0 +1,257 @@
+import 'dart:async';
+
+import 'package:easy_debounce/easy_throttle.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/skeleton/video_card_h.dart';
+import 'package:pilipala/common/widgets/http_error.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/common/widgets/no_data.dart';
+
+import '../../models/user/sub_folder.dart';
+import '../../utils/utils.dart';
+import 'controller.dart';
+import 'widget/sub_video_card.dart';
+
+class SubDetailPage extends StatefulWidget {
+  const SubDetailPage({super.key});
+
+  @override
+  State<SubDetailPage> createState() => _SubDetailPageState();
+}
+
+class _SubDetailPageState extends State<SubDetailPage> {
+  late final ScrollController _controller = ScrollController();
+  final SubDetailController _subDetailController =
+      Get.put(SubDetailController());
+  late StreamController<bool> titleStreamC; // a
+  late Future _futureBuilderFuture;
+  late String seasonId;
+
+  @override
+  void initState() {
+    super.initState();
+    seasonId = Get.parameters['seasonId']!;
+    _futureBuilderFuture = _subDetailController.queryUserSubFolderDetail();
+    titleStreamC = StreamController<bool>();
+    _controller.addListener(
+      () {
+        if (_controller.offset > 160) {
+          titleStreamC.add(true);
+        } else if (_controller.offset <= 160) {
+          titleStreamC.add(false);
+        }
+
+        if (_controller.position.pixels >=
+            _controller.position.maxScrollExtent - 200) {
+          EasyThrottle.throttle('subDetail', const Duration(seconds: 1), () {
+            _subDetailController.onLoad();
+          });
+        }
+      },
+    );
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: CustomScrollView(
+        controller: _controller,
+        slivers: [
+          SliverAppBar(
+            expandedHeight: 260 - MediaQuery.of(context).padding.top,
+            pinned: true,
+            titleSpacing: 0,
+            title: StreamBuilder(
+              stream: titleStreamC.stream,
+              initialData: false,
+              builder: (context, AsyncSnapshot snapshot) {
+                return AnimatedOpacity(
+                  opacity: snapshot.data ? 1 : 0,
+                  curve: Curves.easeOut,
+                  duration: const Duration(milliseconds: 500),
+                  child: Row(
+                    children: [
+                      Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Text(
+                            _subDetailController.item.title!,
+                            style: Theme.of(context).textTheme.titleMedium,
+                          ),
+                          Text(
+                            '共${_subDetailController.item.mediaCount!}条视频',
+                            style: Theme.of(context).textTheme.labelMedium,
+                          )
+                        ],
+                      )
+                    ],
+                  ),
+                );
+              },
+            ),
+            flexibleSpace: FlexibleSpaceBar(
+              background: Container(
+                decoration: BoxDecoration(
+                  border: Border(
+                    bottom: BorderSide(
+                      color: Theme.of(context).dividerColor.withOpacity(0.2),
+                    ),
+                  ),
+                ),
+                padding: EdgeInsets.only(
+                    top: kTextTabBarHeight +
+                        MediaQuery.of(context).padding.top +
+                        30,
+                    left: 20,
+                    right: 20),
+                child: SizedBox(
+                  height: 200,
+                  child: Row(
+                    // mainAxisAlignment: MainAxisAlignment.center,
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Hero(
+                        tag: _subDetailController.heroTag,
+                        child: NetworkImgLayer(
+                          width: 180,
+                          height: 110,
+                          src: _subDetailController.item.cover,
+                        ),
+                      ),
+                      const SizedBox(width: 14),
+                      Expanded(
+                        child: Column(
+                          mainAxisAlignment: MainAxisAlignment.start,
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            const SizedBox(height: 4),
+                            Text(
+                              _subDetailController.item.title!,
+                              style: TextStyle(
+                                  fontSize: Theme.of(context)
+                                      .textTheme
+                                      .titleMedium!
+                                      .fontSize,
+                                  fontWeight: FontWeight.bold),
+                            ),
+                            const SizedBox(height: 4),
+                            GestureDetector(
+                              onTap: () {
+                                SubFolderItemData item =
+                                    _subDetailController.item;
+                                Get.toNamed(
+                                  '/member?mid=${item.upper!.mid}',
+                                  arguments: {
+                                    'face': item.upper!.face,
+                                  },
+                                );
+                              },
+                              child: Text(
+                                _subDetailController.item.upper!.name!,
+                                style: TextStyle(
+                                    color:
+                                        Theme.of(context).colorScheme.primary),
+                              ),
+                            ),
+                            const SizedBox(height: 4),
+                            Text(
+                              '${Utils.numFormat(_subDetailController.item.viewCount)}次播放',
+                              style: TextStyle(
+                                  fontSize: Theme.of(context)
+                                      .textTheme
+                                      .labelSmall!
+                                      .fontSize,
+                                  color: Theme.of(context).colorScheme.outline),
+                            ),
+                          ],
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ),
+          SliverToBoxAdapter(
+            child: Padding(
+              padding: const EdgeInsets.only(top: 15, bottom: 8, left: 14),
+              child: Obx(
+                () => Text(
+                  '共${_subDetailController.subList.length}条视频',
+                  style: TextStyle(
+                      fontSize:
+                          Theme.of(context).textTheme.labelMedium!.fontSize,
+                      color: Theme.of(context).colorScheme.outline,
+                      letterSpacing: 1),
+                ),
+              ),
+            ),
+          ),
+          FutureBuilder(
+            future: _futureBuilderFuture,
+            builder: (context, snapshot) {
+              if (snapshot.connectionState == ConnectionState.done) {
+                Map data = snapshot.data;
+                if (data['status']) {
+                  if (_subDetailController.item.mediaCount == 0) {
+                    return const NoData();
+                  } else {
+                    List subList = _subDetailController.subList;
+                    return Obx(
+                      () => subList.isEmpty
+                          ? const SliverToBoxAdapter(child: SizedBox())
+                          : SliverList(
+                              delegate:
+                                  SliverChildBuilderDelegate((context, index) {
+                                return SubVideoCardH(
+                                  videoItem: subList[index],
+                                );
+                              }, childCount: subList.length),
+                            ),
+                    );
+                  }
+                } else {
+                  return HttpError(
+                    errMsg: data['msg'],
+                    fn: () => setState(() {}),
+                  );
+                }
+              } else {
+                // 骨架屏
+                return SliverList(
+                  delegate: SliverChildBuilderDelegate((context, index) {
+                    return const VideoCardHSkeleton();
+                  }, childCount: 10),
+                );
+              }
+            },
+          ),
+          SliverToBoxAdapter(
+            child: Container(
+              height: MediaQuery.of(context).padding.bottom + 60,
+              padding: EdgeInsets.only(
+                  bottom: MediaQuery.of(context).padding.bottom),
+              child: Center(
+                child: Obx(
+                  () => Text(
+                    _subDetailController.loadingText.value,
+                    style: TextStyle(
+                        color: Theme.of(context).colorScheme.outline,
+                        fontSize: 13),
+                  ),
+                ),
+              ),
+            ),
+          )
+        ],
+      ),
+    );
+  }
+}

lib/pages/subscription_detail/widget/sub_video_card.dart

@@ -0,0 +1,168 @@
+import 'package:get/get.dart';
+import 'package:flutter/material.dart';
+import 'package:pilipala/common/constants.dart';
+import 'package:pilipala/common/widgets/stat/danmu.dart';
+import 'package:pilipala/common/widgets/stat/view.dart';
+import 'package:pilipala/http/search.dart';
+import 'package:pilipala/models/common/search_type.dart';
+import 'package:pilipala/utils/utils.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
+import '../../../common/widgets/badge.dart';
+import '../../../models/user/sub_detail.dart';
+
+// 收藏视频卡片 - 水平布局
+class SubVideoCardH extends StatelessWidget {
+  final SubDetailMediaItem videoItem;
+  final int? searchType;
+
+  const SubVideoCardH({
+    Key? key,
+    required this.videoItem,
+    this.searchType,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    int id = videoItem.id!;
+    String bvid = videoItem.bvid!;
+    String heroTag = Utils.makeHeroTag(id);
+    return InkWell(
+      onTap: () async {
+        int cid = await SearchHttp.ab2c(bvid: bvid);
+        Map<String, String> parameters = {
+          'bvid': bvid,
+          'cid': cid.toString(),
+        };
+
+        Get.toNamed('/video', parameters: parameters, arguments: {
+          'videoItem': videoItem,
+          'heroTag': heroTag,
+          'videoType': SearchType.video,
+        });
+      },
+      child: Column(
+        children: [
+          Padding(
+            padding: const EdgeInsets.fromLTRB(
+                StyleString.safeSpace, 5, StyleString.safeSpace, 5),
+            child: LayoutBuilder(
+              builder: (context, boxConstraints) {
+                double width =
+                    (boxConstraints.maxWidth - StyleString.cardSpace * 6) / 2;
+                return SizedBox(
+                  height: width / StyleString.aspectRatio,
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.start,
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      AspectRatio(
+                        aspectRatio: StyleString.aspectRatio,
+                        child: LayoutBuilder(
+                          builder: (context, boxConstraints) {
+                            double maxWidth = boxConstraints.maxWidth;
+                            double maxHeight = boxConstraints.maxHeight;
+                            return Stack(
+                              children: [
+                                Hero(
+                                  tag: heroTag,
+                                  child: NetworkImgLayer(
+                                    src: videoItem.cover,
+                                    width: maxWidth,
+                                    height: maxHeight,
+                                  ),
+                                ),
+                                PBadge(
+                                  text: Utils.timeFormat(videoItem.duration!),
+                                  right: 6.0,
+                                  bottom: 6.0,
+                                  type: 'gray',
+                                ),
+                                // if (videoItem.ogv != null) ...[
+                                //   PBadge(
+                                //     text: videoItem.ogv['type_name'],
+                                //     top: 6.0,
+                                //     right: 6.0,
+                                //     bottom: null,
+                                //     left: null,
+                                //   ),
+                                // ],
+                              ],
+                            );
+                          },
+                        ),
+                      ),
+                      VideoContent(
+                        videoItem: videoItem,
+                        searchType: searchType,
+                      )
+                    ],
+                  ),
+                );
+              },
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class VideoContent extends StatelessWidget {
+  final dynamic videoItem;
+  final int? searchType;
+  const VideoContent({
+    super.key,
+    required this.videoItem,
+    this.searchType,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Expanded(
+      child: Padding(
+        padding: const EdgeInsets.fromLTRB(10, 2, 6, 0),
+        child: Stack(
+          children: [
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  videoItem.title,
+                  textAlign: TextAlign.start,
+                  style: const TextStyle(
+                    fontWeight: FontWeight.w500,
+                    letterSpacing: 0.3,
+                  ),
+                  maxLines: 2,
+                  overflow: TextOverflow.ellipsis,
+                ),
+                const Spacer(),
+                Text(
+                  Utils.dateFormat(videoItem.pubtime),
+                  style: TextStyle(
+                      fontSize: 11,
+                      color: Theme.of(context).colorScheme.outline),
+                ),
+                Padding(
+                  padding: const EdgeInsets.only(top: 2),
+                  child: Row(
+                    children: [
+                      StatView(
+                        theme: 'gray',
+                        view: videoItem.cntInfo['play'],
+                      ),
+                      const SizedBox(width: 8),
+                      StatDanMu(
+                          theme: 'gray', danmu: videoItem.cntInfo['danmaku']),
+                      const Spacer(),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

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']!;
-
-  // 是否预渲染 骨架屏
-  bool preRender = false;
-
-  // 视频详情 上个页面传入
-  Map? videoItem = {};
-
+  String bvid;
   // 请求状态
   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 =

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(
-            loadingStatus: true,
-            videoDetail: videoDetail,
-            heroTag: heroTag,
+          return const SliverToBoxAdapter(
+            child: SizedBox(
+              height: 100,
+              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(
-      {Key? key, this.loadingStatus = false, this.videoDetail, this.heroTag})
-      : super(key: key);
+  const VideoInfo({
+    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 = loadingStatus ? videoItem['owner'] : widget.videoDetail!.owner;
-    follower = loadingStatus
-        ? '-'
-        : Utils.numFormat(videoIntroController.userStat['follower']);
+    owner = widget.videoDetail!.owner;
+    follower = 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
-        ? widget.videoDetail!.owner!.mid
-        : videoItem['owner'].mid;
+    mid = widget.videoDetail!.owner!.mid!;
     memberHeroTag = Utils.makeHeroTag(mid);
-    String face = !loadingStatus
-        ? widget.videoDetail!.owner!.face
-        : videoItem['owner'].face;
+    String face = widget.videoDetail!.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
-            ? Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  GestureDetector(
-                    behavior: HitTestBehavior.translucent,
-                    onTap: () => showIntroDetail(),
-                    child: Text(
-                      !loadingStatus
-                          ? widget.videoDetail!.title
-                          : videoItem['title'],
-                      style: const TextStyle(
-                        fontSize: 18,
-                        fontWeight: FontWeight.bold,
-                      ),
-                      maxLines: 2,
-                      overflow: TextOverflow.ellipsis,
-                    ),
-                  ),
-                  Stack(
+          child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          GestureDetector(
+            behavior: HitTestBehavior.translucent,
+            onTap: () => showIntroDetail(),
+            child: Text(
+              widget.videoDetail!.title!,
+              style: const TextStyle(
+                fontSize: 18,
+                fontWeight: FontWeight.bold,
+              ),
+              maxLines: 2,
+              overflow: TextOverflow.ellipsis,
+            ),
+          ),
+          Stack(
+            children: [
+              GestureDetector(
+                behavior: HitTestBehavior.translucent,
+                onTap: () => showIntroDetail(),
+                child: Padding(
+                  padding: const EdgeInsets.only(top: 7, bottom: 6),
+                  child: Row(
                     children: [
-                      GestureDetector(
-                        behavior: HitTestBehavior.translucent,
-                        onTap: () => showIntroDetail(),
-                        child: Padding(
-                          padding: const EdgeInsets.only(top: 7, bottom: 6),
-                          child: Row(
-                            children: [
-                              StatView(
-                                theme: 'gray',
-                                view: !loadingStatus
-                                    ? widget.videoDetail!.stat!.view
-                                    : videoItem['stat'].view,
-                                size: 'medium',
-                              ),
-                              const SizedBox(width: 10),
-                              StatDanMu(
-                                theme: 'gray',
-                                danmu: !loadingStatus
-                                    ? widget.videoDetail!.stat!.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,
-                                    ),
-                                  ),
-                                ),
-                            ],
-                          ),
+                      StatView(
+                        theme: 'gray',
+                        view: widget.videoDetail!.stat!.view,
+                        size: 'medium',
+                      ),
+                      const SizedBox(width: 10),
+                      StatDanMu(
+                        theme: 'gray',
+                        danmu: widget.videoDetail!.stat!.danmaku,
+                        size: 'medium',
+                      ),
+                      const SizedBox(width: 10),
+                      Text(
+                        Utils.dateFormat(widget.videoDetail!.pubdate,
+                            formatType: 'detail'),
+                        style: TextStyle(
+                          fontSize: 12,
+                          color: t.colorScheme.outline,
                         ),
                       ),
-                      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),
-                          ),
-                        )
-                    ],
-                  ),
-                  // 点赞收藏转发 布局样式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,
+                      const SizedBox(width: 10),
+                      if (videoIntroController.isShowOnlineTotal)
+                        Obx(
+                          () => Text(
+                            '${videoIntroController.total.value}人在看',
                             style: TextStyle(
-                              fontSize: t.textTheme.labelSmall!.fontSize,
-                              color: outline,
+                              fontSize: 12,
+                              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: !loadingStatus
-                      ? widget.videoDetail!.stat!.like!.toString()
-                      : '-'),
+                  text: 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),
-                  selectIcon: const Icon(FontAwesomeIcons.b),
-                  onTap: handleState(videoIntroController.actionCoinVideo),
-                  selectStatus: videoIntroController.hasCoin.value,
-                  loadingStatus: loadingStatus,
-                  text: !loadingStatus
-                      ? widget.videoDetail!.stat!.coin!.toString()
-                      : '-'),
+                icon: const Icon(FontAwesomeIcons.b),
+                selectIcon: const Icon(FontAwesomeIcons.b),
+                onTap: handleState(videoIntroController.actionCoinVideo),
+                selectStatus: videoIntroController.hasCoin.value,
+                text: widget.videoDetail!.stat!.coin!.toString(),
+              ),
             ),
             Obx(
               () => ActionItem(
-                  icon: const Icon(FontAwesomeIcons.star),
-                  selectIcon: const Icon(FontAwesomeIcons.solidStar),
-                  onTap: () => showFavBottomSheet(),
-                  onLongPress: () => showFavBottomSheet(type: 'longPress'),
-                  selectStatus: videoIntroController.hasFav.value,
-                  loadingStatus: loadingStatus,
-                  text: !loadingStatus
-                      ? widget.videoDetail!.stat!.favorite!.toString()
-                      : '-'),
+                icon: const Icon(FontAwesomeIcons.star),
+                selectIcon: const Icon(FontAwesomeIcons.solidStar),
+                onTap: () => showFavBottomSheet(),
+                onLongPress: () => showFavBottomSheet(type: 'longPress'),
+                selectStatus: videoIntroController.hasFav.value,
+                text: widget.videoDetail!.stat!.favorite!.toString(),
+              ),
             ),
             ActionItem(
-                icon: const Icon(FontAwesomeIcons.comment),
-                onTap: () => videoDetailCtr.tabCtr.animateTo(1),
-                selectStatus: false,
-                loadingStatus: loadingStatus,
-                text: !loadingStatus
-                    ? widget.videoDetail!.stat!.reply!.toString()
-                    : '评论'),
+              icon: const Icon(FontAwesomeIcons.comment),
+              onTap: () => videoDetailCtr.tabCtr.animateTo(1),
+              selectStatus: false,
+              text: widget.videoDetail!.stat!.reply!.toString(),
+            ),
             ActionItem(
-                icon: const Icon(FontAwesomeIcons.shareFromSquare),
-                onTap: () => videoIntroController.actionShareVideo(),
-                selectStatus: false,
-                loadingStatus: loadingStatus,
-                text: '分享'),
+              icon: const Icon(FontAwesomeIcons.shareFromSquare),
+              onTap: () => videoIntroController.actionShareVideo(),
+              selectStatus: false,
+              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(
-            opacity: loadingStatus! ? 0 : 1,
-            duration: const Duration(milliseconds: 200),
-            child: AnimatedSwitcher(
-              duration: const Duration(milliseconds: 300),
-              transitionBuilder: (Widget child, Animation<double> animation) {
-                return ScaleTransition(scale: animation, child: child);
-              },
-              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),
-              ),
+          Text(
+            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(
-                                          onTap: () {
-                                            changeFucCall(
-                                                episodes[index], index);
-                                            Get.back();
-                                          },
-                                          dense: false,
-                                          leading: index == currentIndex
-                                              ? Image.asset(
-                                                  'assets/images/live.gif',
-                                                  color: Theme.of(context)
-                                                      .colorScheme
-                                                      .primary,
-                                                  height: 12,
-                                                )
-                                              : null,
-                                          title: Text(
-                                            episodes[index].pagePart!,
-                                            style: TextStyle(
-                                              fontSize: 14,
-                                              color: index == currentIndex
-                                                  ? Theme.of(context)
-                                                      .colorScheme
-                                                      .primary
-                                                  : Theme.of(context)
-                                                      .colorScheme
-                                                      .onSurface,
-                                            ),
-                                          ),
-                                        );
+                                        bool isLastItem =
+                                            index == episodes.length;
+                                        bool isCurrentIndex =
+                                            currentIndex == index;
+                                        return isLastItem
+                                            ? SizedBox(
+                                                height: MediaQuery.of(context)
+                                                        .padding
+                                                        .bottom +
+                                                    20,
+                                              )
+                                            : buildEpisodeListItem(
+                                                episodes[index],
+                                                index,
+                                                isCurrentIndex,
+                                              );
                                       },
                                     ),
                                   ),
@@ -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) {
@@ -134,32 +162,22 @@ class _SeasonPanelState extends State<SeasonPanel> {
                           child: Material(
                             child: ScrollablePositionedList.builder(
                               itemCount: episodes.length,
-                              itemBuilder: (BuildContext context, int index) =>
-                                  ListTile(
-                                onTap: () =>
-                                    changeFucCall(episodes[index], index),
-                                dense: false,
-                                leading: index == currentIndex
-                                    ? Image.asset(
-                                        'assets/images/live.gif',
-                                        color: Theme.of(context)
-                                            .colorScheme
-                                            .primary,
-                                        height: 12,
+                              itemBuilder: (BuildContext context, int index) {
+                                bool isLastItem = index == episodes.length - 1;
+                                bool isCurrentIndex = currentIndex == index;
+                                return isLastItem
+                                    ? SizedBox(
+                                        height: MediaQuery.of(context)
+                                                .padding
+                                                .bottom +
+                                            20,
                                       )
-                                    : null,
-                                title: Text(
-                                  episodes[index].title!,
-                                  style: TextStyle(
-                                    fontSize: 14,
-                                    color: index == currentIndex
-                                        ? Theme.of(context).colorScheme.primary
-                                        : Theme.of(context)
-                                            .colorScheme
-                                            .onSurface,
-                                  ),
-                                ),
-                              ),
+                                    : buildEpisodeListItem(
+                                        episodes[index],
+                                        index,
+                                        isCurrentIndex,
+                                      );
+                              },
                               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();
+        return await _videoReplyController.queryReplyList(type: 'init');
       },
       child: Stack(
         children: [
           CustomScrollView(
             controller: scrollController,
+            physics: const AlwaysScrollableScrollPhysics(),
             key: const PageStorageKey<String>('评论'),
             slivers: <Widget>[
               SliverPersistentHeader(

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']),
                       }
                   });
@@ -462,6 +462,9 @@ class ReplyItemRow extends StatelessWidget {
 
 InlineSpan buildContent(
     BuildContext context, replyItem, replyReply, fReplyItem) {
+  final String routePath = Get.currentRoute;
+  bool isVideoPage = routePath.startsWith('/video');
+
   // replyItem 当前回复内容
   // replyReply 查看二楼回复（回复详情）回调
   // fReplyItem 父级回复内容，用作二楼回复（回复详情）展示
@@ -503,29 +506,33 @@ InlineSpan buildContent(
       .replaceAll('"', '"')
       .replaceAll(''', "'")
       .replaceAll(' ', ' ');
-  // 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 =
-              () => replyReply(replyItem.root == 0 ? replyItem : fReplyItem)));
+          ..onTap = () =>
+              replyReply?.call(replyItem.root == 0 ? replyItem : fReplyItem)));
   }
 
   // 分割文本并处理每个部分
@@ -571,27 +578,31 @@ InlineSpan buildContent(
         spanChilds.add(
           TextSpan(
             text: ' $matchStr ',
-            style: TextStyle(
-              color: Theme.of(context).colorScheme.primary,
-            ),
+            style: isVideoPage
+                ? TextStyle(
+                    color: Theme.of(context).colorScheme.primary,
+                  )
+                : null,
             recognizer: TapGestureRecognizer()
               ..onTap = () {
                 // 跳转到指定位置
-                try {
-                  SmartDialog.showToast('跳转至：$matchStr');
-                  Get.find<VideoDetailController>(tag: Get.arguments['heroTag'])
-                      .plPlayerController
-                      .seekTo(
-                        Duration(seconds: Utils.duration(matchStr)),
-                      );
-                } catch (e) {
-                  SmartDialog.showToast('跳转失败: $e');
+                if (isVideoPage) {
+                  try {
+                    SmartDialog.showToast('跳转至：$matchStr');
+                    Get.find<VideoDetailController>(
+                            tag: Get.arguments['heroTag'])
+                        .plPlayerController
+                        .seekTo(
+                          Duration(seconds: Utils.duration(matchStr)),
+                        );
+                  } catch (e) {
+                    SmartDialog.showToast('跳转失败: $e');
+                  }
                 }
               },
           ),
         );
       } else {
-        print("matchStr=$matchStr");
         String appUrlSchema = '';
         final bool enableWordRe = setting.get(SettingBoxKey.enableWordRe,
             defaultValue: false) as bool;
@@ -631,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/toolbar_icon_button.dart

@@ -0,0 +1,40 @@
+import 'package:flutter/material.dart';
+
+class ToolbarIconButton extends StatelessWidget {
+  final VoidCallback onPressed;
+  final Icon icon;
+  final String toolbarType;
+  final bool selected;
+
+  const ToolbarIconButton({
+    super.key,
+    required this.onPressed,
+    required this.icon,
+    required this.toolbarType,
+    required this.selected,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      width: 36,
+      height: 36,
+      child: IconButton(
+        onPressed: onPressed,
+        icon: icon,
+        highlightColor: Theme.of(context).colorScheme.secondaryContainer,
+        color: selected
+            ? Theme.of(context).colorScheme.onSecondaryContainer
+            : Theme.of(context).colorScheme.outline,
+        style: ButtonStyle(
+          padding: MaterialStateProperty.all(EdgeInsets.zero),
+          backgroundColor: MaterialStateProperty.resolveWith((states) {
+            return selected
+                ? Theme.of(context).colorScheme.secondaryContainer
+                : null;
+          }),
+        ),
+      ),
+    );
+  }
+}

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

@@ -4,9 +4,13 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/http/video.dart';
 import 'package:pilipala/models/common/reply_type.dart';
+import 'package:pilipala/models/video/reply/emote.dart';
 import 'package:pilipala/models/video/reply/item.dart';
+import 'package:pilipala/pages/emote/index.dart';
 import 'package:pilipala/utils/feed_back.dart';
 
+import 'toolbar_icon_button.dart';
+
 class VideoReplyNewDialog extends StatefulWidget {
   final int? oid;
   final int? root;
@@ -32,6 +36,10 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
   final TextEditingController _replyContentController = TextEditingController();
   final FocusNode replyContentFocusNode = FocusNode();
   final GlobalKey _formKey = GlobalKey<FormState>();
+  late double emoteHeight = 0.0;
+  double keyboardHeight = 0.0; // 键盘高度
+  final _debouncer = Debouncer(milliseconds: 200); // 设置延迟时间
+  String toolbarType = 'input';
 
   @override
   void initState() {
@@ -42,6 +50,8 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
     WidgetsBinding.instance.addObserver(this);
     // 自动聚焦
     _autoFocus();
+    // 监听聚焦状态
+    _focuslistener();
   }
 
   _autoFocus() async {
@@ -51,6 +61,16 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
     }
   }
 
+  _focuslistener() {
+    replyContentFocusNode.addListener(() {
+      if (replyContentFocusNode.hasFocus) {
+        setState(() {
+          toolbarType = 'input';
+        });
+      }
+    });
+  }
+
   Future submitReplyAdd() async {
     feedBack();
     String message = _replyContentController.text;
@@ -73,10 +93,50 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
     }
   }
 
+  void onChooseEmote(PackageItem package, Emote emote) {
+    final int cursorPosition = _replyContentController.selection.baseOffset;
+    final String currentText = _replyContentController.text;
+    final String newText = currentText.substring(0, cursorPosition) +
+        emote.text! +
+        currentText.substring(cursorPosition);
+    _replyContentController.value = TextEditingValue(
+      text: newText,
+      selection:
+          TextSelection.collapsed(offset: cursorPosition + emote.text!.length),
+    );
+  }
+
+  @override
+  void didChangeMetrics() {
+    super.didChangeMetrics();
+    final String routePath = Get.currentRoute;
+    if (mounted &&
+        (routePath.startsWith('/video') ||
+            routePath.startsWith('/dynamicDetail'))) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        // 键盘高度
+        final viewInsets = EdgeInsets.fromViewPadding(
+            View.of(context).viewInsets, View.of(context).devicePixelRatio);
+        _debouncer.run(() {
+          if (mounted) {
+            if (keyboardHeight == 0 && emoteHeight == 0) {
+              setState(() {
+                emoteHeight = keyboardHeight =
+                    keyboardHeight == 0.0 ? viewInsets.bottom : keyboardHeight;
+              });
+            }
+          }
+        });
+      });
+    }
+  }
+
   @override
   void dispose() {
     WidgetsBinding.instance.removeObserver(this);
     _replyContentController.dispose();
+    replyContentFocusNode.removeListener(() {});
+    replyContentFocusNode.dispose();
     super.dispose();
   }
 
@@ -137,27 +197,32 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
             child: Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
-                SizedBox(
-                  width: 36,
-                  height: 36,
-                  child: IconButton(
-                    onPressed: () {
-                      FocusScope.of(context)
-                          .requestFocus(replyContentFocusNode);
-                    },
-                    icon: Icon(Icons.keyboard,
-                        size: 22,
-                        color: Theme.of(context).colorScheme.onBackground),
-                    highlightColor:
-                        Theme.of(context).colorScheme.onInverseSurface,
-                    style: ButtonStyle(
-                      padding: MaterialStateProperty.all(EdgeInsets.zero),
-                      backgroundColor:
-                          MaterialStateProperty.resolveWith((states) {
-                        return Theme.of(context).highlightColor;
-                      }),
-                    ),
-                  ),
+                ToolbarIconButton(
+                  onPressed: () {
+                    if (toolbarType == 'emote') {
+                      setState(() {
+                        toolbarType = 'input';
+                      });
+                    }
+                    FocusScope.of(context).requestFocus(replyContentFocusNode);
+                  },
+                  icon: const Icon(Icons.keyboard, size: 22),
+                  toolbarType: toolbarType,
+                  selected: toolbarType == 'input',
+                ),
+                const SizedBox(width: 20),
+                ToolbarIconButton(
+                  onPressed: () {
+                    if (toolbarType == 'input') {
+                      setState(() {
+                        toolbarType = 'emote';
+                      });
+                    }
+                    FocusScope.of(context).unfocus();
+                  },
+                  icon: const Icon(Icons.emoji_emotions, size: 22),
+                  toolbarType: toolbarType,
+                  selected: toolbarType == 'emote',
                 ),
                 const Spacer(),
                 TextButton(
@@ -170,7 +235,10 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
             duration: const Duration(milliseconds: 300),
             child: SizedBox(
               width: double.infinity,
-              height: keyboardHeight,
+              height: toolbarType == 'input' ? keyboardHeight : emoteHeight,
+              child: EmotePanel(
+                onChoose: (package, emote) => onChooseEmote(package, emote),
+              ),
             ),
           ),
         ],
@@ -178,3 +246,22 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
     );
   }
 }
+
+typedef DebounceCallback = void Function();
+
+class Debouncer {
+  DebounceCallback? callback;
+  final int? milliseconds;
+  Timer? _timer;
+
+  Debouncer({this.milliseconds});
+
+  run(DebounceCallback callback) {
+    if (_timer != null) {
+      _timer!.cancel();
+    }
+    _timer = Timer(Duration(milliseconds: milliseconds!), () {
+      callback();
+    });
+  }
+}

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,10 @@ 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: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 +23,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 +37,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 +57,25 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   late bool autoExitFullcreen;
   late bool autoPlayEnable;
   late bool autoPiP;
-  final Floating floating = Floating();
-  // 生命周期监听
-  late final AppLifecycleListener _lifecycleListener;
+  late Floating floating;
   bool isShowing = true;
 
   @override
   void initState() {
     super.initState();
     heroTag = Get.arguments['heroTag'];
-    videoDetailController = Get.put(VideoDetailController(), tag: heroTag);
-    videoIntroController = Get.put(VideoIntroController(), tag: heroTag);
+    vdCtr = Get.put(VideoDetailController(), tag: heroTag);
+    videoIntroController = Get.put(
+        VideoIntroController(bvid: Get.parameters['bvid']!),
+        tag: heroTag);
     videoIntroController.videoDetail.listen((value) {
-      videoPlayerServiceHandler.onVideoDetailChange(
-          value, videoDetailController.cid.value);
+      videoPlayerServiceHandler.onVideoDetailChange(value, vdCtr.cid.value);
     });
     bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag);
     bangumiIntroController.bangumiDetail.listen((value) {
-      videoPlayerServiceHandler.onVideoDetailChange(
-          value, videoDetailController.cid.value);
+      videoPlayerServiceHandler.onVideoDetailChange(value, vdCtr.cid.value);
     });
-    videoDetailController.cid.listen((p0) {
+    vdCtr.cid.listen((p0) {
       videoPlayerServiceHandler.onVideoDetailChange(
           bangumiIntroController.bangumiDetail.value, p0);
     });
@@ -91,15 +88,18 @@ class _VideoDetailPageState extends State<VideoDetailPage>
 
     videoSourceInit();
     appbarStreamListen();
-    lifecycleListener();
     fullScreenStatusListener();
+    if (Platform.isAndroid) {
+      floating = vdCtr.floating!;
+      autoEnterPip();
+    }
   }
 
   // 获取视频资源，初始化播放器
   Future<void> videoSourceInit() async {
-    _futureBuilderFuture = videoDetailController.queryVideoUrl();
-    if (videoDetailController.autoPlay.value) {
-      plPlayerController = videoDetailController.plPlayerController;
+    _futureBuilderFuture = vdCtr.queryVideoUrl();
+    if (vdCtr.autoPlay.value) {
+      plPlayerController = vdCtr.plPlayerController;
       plPlayerController!.addStatusLister(playerListener);
     }
   }
@@ -128,10 +128,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 +143,16 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       }
       // 播放完展示控制栏
       try {
-        PiPStatus currentStatus =
-            await videoDetailController.floating!.pipStatus;
+        PiPStatus currentStatus = await vdCtr.floating!.pipStatus;
         if (currentStatus == PiPStatus.disabled) {
           plPlayerController!.onLockControl(false);
         }
       } catch (_) {}
     }
+    if (Platform.isAndroid) {
+      floating.toggleAutoPip(
+          autoEnter: status == PlayerStatus.playing && autoPiP);
+    }
   }
 
   // 继续播放或重新播放
@@ -161,38 +164,17 @@ class _VideoDetailPageState extends State<VideoDetailPage>
 
   /// 未开启自动播放时触发播放
   Future<void> handlePlay() async {
-    await videoDetailController.playerInit();
-    plPlayerController = videoDetailController.plPlayerController;
+    await vdCtr.playerInit();
+    plPlayerController = vdCtr.plPlayerController;
     plPlayerController!.addStatusLister(playerListener);
-    videoDetailController.autoPlay.value = true;
-    videoDetailController.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);
-      },
-    );
+    vdCtr.autoPlay.value = true;
+    vdCtr.isShowCover.value = false;
   }
 
   void fullScreenStatusListener() {
     plPlayerController?.isFullScreen.listen((bool isFullScreen) {
       if (isFullScreen) {
-        videoDetailController.hiddenReplyReplyPanel();
+        vdCtr.hiddenReplyReplyPanel();
       }
     });
   }
@@ -204,12 +186,15 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       plPlayerController!.removeStatusLister(playerListener);
       plPlayerController!.dispose();
     }
-    if (videoDetailController.floating != null) {
-      videoDetailController.floating!.dispose();
+    if (vdCtr.floating != null) {
+      vdCtr.floating!.dispose();
     }
     videoPlayerServiceHandler.onVideoDetailDispose();
-    floating.dispose();
-    _lifecycleListener.dispose();
+    if (Platform.isAndroid) {
+      floating.toggleAutoPip(autoEnter: false);
+      floating.dispose();
+    }
+    appbarStream.close();
     super.dispose();
   }
 
@@ -219,10 +204,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 +223,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 =
-        !videoDetailController.isShowCover.value;
+    vdCtr.autoPlay.value = !vdCtr.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 +246,175 @@ 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 =
-        MediaQuery.of(context).orientation == Orientation.portrait;
-
-    /// TODO 横屏全屏状态下误触pip
-    if (autoPiP && routePath.startsWith('/video') && isPortrait) {
-      floating.enable(
-          aspectRatio: Rational(
-        videoDetailController.data.dash!.video!.first.width!,
-        videoDetailController.data.dash!.video!.first.height!,
-      ));
+    if (autoPiP && routePath.startsWith('/video')) {
+      floating.toggleAutoPip(autoEnter: autoPiP);
     }
   }
 
   @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: Row(
+        children: [
+          const SizedBox(width: 20),
+          Expanded(
+            child: TabBar(
+              controller: vdCtr.tabCtr,
+              dividerColor: Colors.transparent,
+              tabs: vdCtr.tabs.map((String name) => Tab(text: name)).toList(),
+            ),
+          ),
+          SizedBox(
+            width: 220,
+            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)),
+                    ),
+                  ),
+                  const SizedBox(width: 4),
+                  SizedBox(
+                    width: 34,
+                    height: 32,
+                    child: TextButton(
+                      style: ButtonStyle(
+                        padding: MaterialStateProperty.all(EdgeInsets.zero),
+                      ),
+                      onPressed: () {
+                        plPlayerController?.isOpenDanmu.value =
+                            !(plPlayerController?.isOpenDanmu.value ?? false);
+                      },
+                      child: Obx(() => Text(
+                            '弹',
+                            style: TextStyle(
+                              fontSize: 12,
+                              color: (plPlayerController?.isOpenDanmu.value ??
+                                      false)
+                                  ? Theme.of(context).colorScheme.primary
+                                  : Theme.of(context).colorScheme.outline,
+                            ),
+                          )),
+                    ),
+                  ),
+                  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 +426,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 +452,19 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                       return SliverAppBar(
                         automaticallyImplyLeading: false,
                         // 假装使用一个非空变量，避免Obx检测不到而罢工
-                        pinned: videoDetailController.autoPlay.value ^
-                            false ^
-                            videoDetailController.autoPlay.value,
+                        pinned: vdCtr.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)
-                            : videoHeight,
+                                    : MediaQuery.of(context).padding.top))
+                            : videoHeight.value,
                         backgroundColor: Colors.black,
                         flexibleSpace: FlexibleSpaceBar(
                           background: PopScope(
@@ -364,134 +484,27 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                               child: LayoutBuilder(
                                 builder: (BuildContext context,
                                     BoxConstraints boxConstraints) {
-                                  final double maxWidth =
-                                      boxConstraints.maxWidth;
-                                  final double maxHeight =
-                                      boxConstraints.maxHeight;
+                                  // final double maxWidth =
+                                  //     boxConstraints.maxWidth;
+                                  // final double maxHeight =
+                                  //     boxConstraints.maxHeight;
                                   return Stack(
                                     children: <Widget>[
-                                      if (isShowing)
-                                        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 (isShowing) videoPlayerPanel,
 
                                       /// 关闭自动播放时 手动播放
-                                      if (!videoDetailController
-                                          .autoPlay.value) ...<Widget>[
-                                        Obx(
-                                          () => Visibility(
-                                            visible: videoDetailController
-                                                .isShowCover.value,
-                                            child: Positioned(
-                                              top: 0,
-                                              left: 0,
-                                              right: 0,
-                                              child: GestureDetector(
-                                                onTap: () {
-                                                  handlePlay();
-                                                },
-                                                child: NetworkImgLayer(
-                                                  type: 'emote',
-                                                  src: videoDetailController
-                                                      .videoItem['pic'],
-                                                  width: maxWidth,
-                                                  height: maxHeight,
-                                                ),
-                                              ),
-                                            ),
+                                      Obx(
+                                        () => Visibility(
+                                          visible: !vdCtr.autoPlay.value &&
+                                              vdCtr.isShowCover.value,
+                                          child: Positioned(
+                                            top: 0,
+                                            left: 0,
+                                            right: 0,
+                                            child: handlePlayPanel(),
                                           ),
                                         ),
-                                        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 +515,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 +532,23 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                 color: Theme.of(context).colorScheme.background,
                 child: Column(
                   children: [
-                    Opacity(
-                      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(),
-                          ),
-                        ),
-                      ),
-                    ),
+                    tabbarBuild,
                     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 ==
-                                      SearchType.video) ...[
-                                    const VideoIntroPanel(),
-                                  ] else if (videoDetailController.videoType ==
+                                  if (vdCtr.videoType == SearchType.video) ...[
+                                    VideoIntroPanel(bvid: vdCtr.bvid),
+                                  ] else if (vdCtr.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 +558,17 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                           .withOpacity(0.06),
                                     ),
                                   ),
-                                  RelatedVideoPanel(),
+                                  if (vdCtr.videoType == SearchType.video &&
+                                      vdCtr.enableRelatedVideo)
+                                    const RelatedVideoPanel(),
                                 ],
                               );
                             },
                           ),
                           Obx(
                             () => VideoReplyPanel(
-                              bvid: videoDetailController.bvid,
-                              oid: videoDetailController.oid.value,
+                              bvid: vdCtr.bvid,
+                              oid: vdCtr.oid.value,
                             ),
                           )
                         ],
@@ -599,58 +582,73 @@ class _VideoDetailPageState extends State<VideoDetailPage>
 
           /// 重新进入会刷新
           // 播放完成/暂停播放
-          // StreamBuilder(
-          //   stream: appbarStream.stream,
-          //   initialData: 0,
-          //   builder: ((context, snapshot) {
-          //     return ScrollAppBar(
-          //       snapshot.data!.toDouble(),
-          //       () => continuePlay(),
-          //       playerStatus,
-          //       null,
-          //     );
-          //   }),
-          // )
+          StreamBuilder(
+            stream: appbarStream.stream,
+            initialData: 0,
+            builder: ((context, snapshot) {
+              return ScrollAppBar(
+                snapshot.data!.toDouble(),
+                () => continuePlay(),
+                playerStatus,
+                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,19 +16,25 @@ 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';
 
 class HeaderControl extends StatefulWidget implements PreferredSizeWidget {
   const HeaderControl({
     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();
@@ -40,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);
@@ -48,11 +52,36 @@ class _HeaderControlState extends State<HeaderControl> {
   final Box<dynamic> videoStorage = GStrorage.video;
   late List<double> speedsList;
   double buttonSpace = 8;
+  bool showTitle = false;
+  late String heroTag;
+  late VideoIntroController videoIntroController;
+  late VideoDetailData videoDetail;
+
   @override
   void initState() {
     super.initState();
     videoInfo = widget.videoDetailCtr!.data;
     speedsList = widget.controller!.speedsList;
+    fullScreenStatusListener();
+    heroTag = Get.arguments['heroTag'];
+    videoIntroController =
+        Get.put(VideoIntroController(bvid: widget.bvid!), tag: heroTag);
+  }
+
+  void fullScreenStatusListener() {
+    widget.videoDetailCtr!.plPlayerController.isFullScreen
+        .listen((bool isFullScreen) {
+      if (isFullScreen) {
+        showTitle = true;
+      } else {
+        showTitle = false;
+      }
+
+      /// TODO setState() called after dispose()
+      if (mounted) {
+        setState(() {});
+      }
+    });
   }
 
   /// 设置面板
@@ -189,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 = [
@@ -342,8 +289,7 @@ class _HeaderControlState extends State<HeaderControl> {
                         },
                         dense: true,
                         contentPadding: const EdgeInsets.only(),
-                        title:
-                            const Text("额外等待视频播放完毕", style: titleStyle),
+                        title: const Text("额外等待视频播放完毕", style: titleStyle),
                         trailing: Switch(
                           // thumb color (round icon)
                           activeColor: Theme.of(context).colorScheme.primary,
@@ -891,7 +837,7 @@ class _HeaderControlState extends State<HeaderControl> {
                             final DanmakuOption currentOption =
                                 danmakuController.option;
                             final DanmakuOption updatedOption =
-                            currentOption.copyWith(strokeWidth: val);
+                                currentOption.copyWith(strokeWidth: val);
                             danmakuController.updateOption(updatedOption);
                           } catch (_) {}
                         },
@@ -1047,6 +993,8 @@ class _HeaderControlState extends State<HeaderControl> {
       color: Colors.white,
       fontSize: 12,
     );
+    final bool isLandscape =
+        MediaQuery.of(context).orientation == Orientation.landscape;
     return AppBar(
       backgroundColor: Colors.transparent,
       foregroundColor: Colors.white,
@@ -1081,21 +1029,49 @@ class _HeaderControlState extends State<HeaderControl> {
             },
           ),
           SizedBox(width: buttonSpace),
-          ComBtn(
-            icon: const Icon(
-              FontAwesomeIcons.house,
-              size: 15,
-              color: Colors.white,
+          if (showTitle &&
+              isLandscape &&
+              widget.videoType == SearchType.video) ...[
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                ConstrainedBox(
+                  constraints: const BoxConstraints(maxWidth: 200),
+                  child: Text(
+                    videoIntroController.videoDetail.value.title ?? '',
+                    style: const TextStyle(
+                      color: Colors.white,
+                      fontSize: 16,
+                    ),
+                  ),
+                ),
+                if (videoIntroController.isShowOnlineTotal)
+                  Text(
+                    '${videoIntroController.total.value}人正在看',
+                    style: const TextStyle(
+                      color: Colors.white,
+                      fontSize: 12,
+                    ),
+                  )
+              ],
+            )
+          ] else ...[
+            ComBtn(
+              icon: const Icon(
+                FontAwesomeIcons.house,
+                size: 15,
+                color: Colors.white,
+              ),
+              fuc: () async {
+                // 销毁播放器实例
+                await widget.controller!.dispose(type: 'all');
+                if (mounted) {
+                  Navigator.popUntil(
+                      context, (Route<dynamic> route) => route.isFirst);
+                }
+              },
             ),
-            fuc: () async {
-              // 销毁播放器实例
-              await widget.controller!.dispose(type: 'all');
-              if (mounted) {
-                Navigator.popUntil(
-                    context, (Route<dynamic> route) => route.isFirst);
-              }
-            },
-          ),
+          ],
           const Spacer(),
           // ComBtn(
           //   icon: const Icon(
@@ -1105,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);
-        Clipboard.setData(ClipboardData(text: result.msg.toString()));
+        SmartDialog.showToast(result['msg']);
+        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

@@ -108,9 +108,9 @@ class _WhisperPageState extends State<WhisperPage> {
                       future: _futureBuilderFuture,
                       builder: (context, snapshot) {
                         if (snapshot.connectionState == ConnectionState.done) {
-                          Map data = snapshot.data as Map;
-                          if (data['status']) {
-                            List sessionList = _whisperController.sessionList;
+                          Map? data = snapshot.data;
+                          if (data != null && data['status']) {
+                            RxList sessionList = _whisperController.sessionList;
                             return Obx(
                               () => sessionList.isEmpty
                                   ? const SizedBox()
@@ -121,33 +121,35 @@ class _WhisperPageState extends State<WhisperPage> {
                                           const NeverScrollableScrollPhysics(),
                                       itemBuilder: (_, int i) {
                                         return ListTile(
-                                          onTap: () => Get.toNamed(
-                                            '/whisperDetail',
-                                            parameters: {
-                                              'talkerId': sessionList[i]
-                                                  .talkerId
-                                                  .toString(),
-                                              'name': sessionList[i]
-                                                  .accountInfo
-                                                  .name,
-                                              'face': sessionList[i]
-                                                  .accountInfo
-                                                  .face,
-                                              'mid': sessionList[i]
-                                                  .accountInfo
-                                                  .mid
-                                                  .toString(),
-                                            },
-                                          ),
+                                          onTap: () {
+                                            sessionList[i].unreadCount = 0;
+                                            sessionList.refresh();
+                                            Get.toNamed(
+                                              '/whisperDetail',
+                                              parameters: {
+                                                'talkerId': sessionList[i]
+                                                    .talkerId
+                                                    .toString(),
+                                                'name': sessionList[i]
+                                                    .accountInfo
+                                                    .name,
+                                                'face': sessionList[i]
+                                                    .accountInfo
+                                                    .face,
+                                                'mid': sessionList[i]
+                                                    .accountInfo
+                                                    .mid
+                                                    .toString(),
+                                              },
+                                            );
+                                          },
                                           leading: Badge(
-                                            isLabelVisible: false,
-                                            backgroundColor: Theme.of(context)
-                                                .colorScheme
-                                                .primary,
+                                            isLabelVisible:
+                                                sessionList[i].unreadCount > 0,
                                             label: Text(sessionList[i]
                                                 .unreadCount
                                                 .toString()),
-                                            alignment: Alignment.bottomRight,
+                                            alignment: Alignment.topRight,
                                             child: NetworkImgLayer(
                                               width: 45,
                                               height: 45,
@@ -160,20 +162,27 @@ class _WhisperPageState extends State<WhisperPage> {
                                           title: Text(
                                               sessionList[i].accountInfo.name),
                                           subtitle: Text(
-                                              sessionList[i]
-                                                      .lastMsg
-                                                      .content['text'] ??
-                                                  sessionList[i]
-                                                      .lastMsg
-                                                      .content['content'] ??
-                                                  sessionList[i]
-                                                      .lastMsg
-                                                      .content['title'] ??
-                                                  sessionList[i]
+                                              sessionList[i].lastMsg.content !=
+                                                          null &&
+                                                      sessionList[i]
+                                                              .lastMsg
+                                                              .content !=
+                                                          ''
+                                                  ? (sessionList[i]
                                                           .lastMsg
-                                                          .content[
-                                                      'reply_content'] ??
-                                                  '',
+                                                          .content['text'] ??
+                                                      sessionList[i]
+                                                          .lastMsg
+                                                          .content['content'] ??
+                                                      sessionList[i]
+                                                          .lastMsg
+                                                          .content['title'] ??
+                                                      sessionList[i]
+                                                              .lastMsg
+                                                              .content[
+                                                          'reply_content'] ??
+                                                      '不支持的消息类型')
+                                                  : '不支持的消息类型',
                                               maxLines: 1,
                                               overflow: TextOverflow.ellipsis,
                                               style: Theme.of(context)
@@ -210,7 +219,9 @@ class _WhisperPageState extends State<WhisperPage> {
                             );
                           } else {
                             // 请求错误
-                            return const SizedBox();
+                            return Center(
+                              child: Text(data?['msg'] ?? '请求异常'),
+                            );
                           }
                         } else {
                           // 骨架屏

lib/pages/whisper_detail/controller.dart

@@ -1,7 +1,11 @@
+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:pilipala/http/msg.dart';
 import 'package:pilipala/models/msg/session.dart';
+import '../../utils/feed_back.dart';
+import '../../utils/storage.dart';
 
 class WhisperDetailController extends GetxController {
   late int talkerId;
@@ -11,6 +15,8 @@ class WhisperDetailController extends GetxController {
   RxList<MessageItem> messageList = <MessageItem>[].obs;
   //表情转换图片规则
   List<dynamic>? eInfos;
+  final TextEditingController replyContentController = TextEditingController();
+  Box userInfoCache = GStrorage.userInfo;
 
   @override
   void onInit() {
@@ -25,10 +31,51 @@ class WhisperDetailController extends GetxController {
     var res = await MsgHttp.sessionMsg(talkerId: talkerId);
     if (res['status']) {
       messageList.value = res['data'].messages;
-      if (messageList.isNotEmpty && res['data'].eInfos != null) {
-        eInfos = res['data'].eInfos;
+      if (messageList.isNotEmpty) {
+        ackSessionMsg();
+        if (res['data'].eInfos != null) {
+          eInfos = res['data'].eInfos;
+        }
       }
+    } else {
+      SmartDialog.showToast(res['msg']);
     }
     return res;
   }
+
+  // 消息标记已读
+  Future ackSessionMsg() async {
+    if (messageList.isEmpty) {
+      return;
+    }
+    await MsgHttp.ackSessionMsg(
+      talkerId: talkerId,
+      ackSeqno: messageList.last.msgSeqno,
+    );
+  }
+
+  Future sendMsg() async {
+    feedBack();
+    String message = replyContentController.text;
+    final userInfo = userInfoCache.get('userInfoCache');
+    if (userInfo == null) {
+      SmartDialog.showToast('请先登录');
+      return;
+    }
+    if (message == '') {
+      SmartDialog.showToast('请输入内容');
+      return;
+    }
+    var result = await MsgHttp.sendMsg(
+      senderUid: userInfo.mid,
+      receiverId: int.parse(mid),
+      content: {'content': message},
+      msgType: 1,
+    );
+    if (result['status']) {
+      SmartDialog.showToast('发送成功');
+    } else {
+      SmartDialog.showToast(result['msg']);
+    }
+  }
 }

lib/pages/whisper_detail/view.dart

@@ -1,9 +1,12 @@
+import 'dart:async';
 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/pages/emote/index.dart';
 import 'package:pilipala/pages/whisper_detail/controller.dart';
 import 'package:pilipala/utils/feed_back.dart';
-
+import '../../utils/storage.dart';
 import 'widget/chat_item.dart';
 
 class WhisperDetailPage extends StatefulWidget {
@@ -13,15 +16,67 @@ class WhisperDetailPage extends StatefulWidget {
   State<WhisperDetailPage> createState() => _WhisperDetailPageState();
 }
 
-class _WhisperDetailPageState extends State<WhisperDetailPage> {
+class _WhisperDetailPageState extends State<WhisperDetailPage>
+    with WidgetsBindingObserver {
   final WhisperDetailController _whisperDetailController =
       Get.put(WhisperDetailController());
   late Future _futureBuilderFuture;
+  late TextEditingController _replyContentController;
+  final FocusNode replyContentFocusNode = FocusNode();
+  final _debouncer = Debouncer(milliseconds: 200); // 设置延迟时间
+  late double emoteHeight = 0.0;
+  double keyboardHeight = 0.0; // 键盘高度
+  String toolbarType = 'input';
+  Box userInfoCache = GStrorage.userInfo;
 
   @override
   void initState() {
     super.initState();
+    WidgetsBinding.instance.addObserver(this);
     _futureBuilderFuture = _whisperDetailController.querySessionMsg();
+    _replyContentController = _whisperDetailController.replyContentController;
+    _focuslistener();
+  }
+
+  _focuslistener() {
+    replyContentFocusNode.addListener(() {
+      if (replyContentFocusNode.hasFocus) {
+        setState(() {
+          toolbarType = 'input';
+        });
+      }
+    });
+  }
+
+  @override
+  void didChangeMetrics() {
+    super.didChangeMetrics();
+    final String routePath = Get.currentRoute;
+    if (mounted && routePath.startsWith('/whisper_detail')) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        // 键盘高度
+        final viewInsets = EdgeInsets.fromViewPadding(
+            View.of(context).viewInsets, View.of(context).devicePixelRatio);
+        _debouncer.run(() {
+          if (mounted) {
+            if (keyboardHeight == 0) {
+              setState(() {
+                emoteHeight = keyboardHeight =
+                    keyboardHeight == 0.0 ? viewInsets.bottom : keyboardHeight;
+              });
+            }
+          }
+        });
+      });
+    }
+  }
+
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    replyContentFocusNode.removeListener(() {});
+    replyContentFocusNode.dispose();
+    super.dispose();
   }
 
   @override
@@ -89,55 +144,63 @@ class _WhisperDetailPageState extends State<WhisperDetailPage> {
           ),
         ),
       ),
-      body: FutureBuilder(
-        future: _futureBuilderFuture,
-        builder: (BuildContext context, snapshot) {
-          if (snapshot.connectionState == ConnectionState.done) {
-            if (snapshot.data == null) {
-              return const SizedBox();
-            }
-            final Map data = snapshot.data as Map;
-            if (data['status']) {
-              List messageList = _whisperDetailController.messageList;
-              return Obx(
-                () => messageList.isEmpty
-                    ? const SizedBox()
-                    : ListView.builder(
-                        itemCount: messageList.length,
-                        shrinkWrap: true,
-                        reverse: true,
-                        itemBuilder: (_, int i) {
-                          if (i == 0) {
-                            return Column(
-                              children: [
-                                ChatItem(
-                                    item: messageList[i],
-                                    e_infos: _whisperDetailController.eInfos),
-                                const SizedBox(height: 12),
-                              ],
-                            );
-                          } else {
-                            return ChatItem(
-                                item: messageList[i],
-                                e_infos: _whisperDetailController.eInfos);
-                          }
-                        },
-                      ),
-              );
-            } else {
-              // 请求错误
-              return const SizedBox();
-            }
-          } else {
-            // 骨架屏
-            return const SizedBox();
-          }
+      body: GestureDetector(
+        onTap: () {
+          FocusScope.of(context).unfocus();
+          setState(() {
+            keyboardHeight = 0;
+          });
         },
+        child: FutureBuilder(
+          future: _futureBuilderFuture,
+          builder: (BuildContext context, snapshot) {
+            if (snapshot.connectionState == ConnectionState.done) {
+              if (snapshot.data == null) {
+                return const SizedBox();
+              }
+              final Map data = snapshot.data as Map;
+              if (data['status']) {
+                List messageList = _whisperDetailController.messageList;
+                return Obx(
+                  () => messageList.isEmpty
+                      ? const SizedBox()
+                      : ListView.builder(
+                          itemCount: messageList.length,
+                          shrinkWrap: true,
+                          reverse: true,
+                          itemBuilder: (_, int i) {
+                            if (i == 0) {
+                              return Column(
+                                children: [
+                                  ChatItem(
+                                      item: messageList[i],
+                                      e_infos: _whisperDetailController.eInfos),
+                                  const SizedBox(height: 12),
+                                ],
+                              );
+                            } else {
+                              return ChatItem(
+                                  item: messageList[i],
+                                  e_infos: _whisperDetailController.eInfos);
+                            }
+                          },
+                        ),
+                );
+              } else {
+                // 请求错误
+                return const SizedBox();
+              }
+            } else {
+              // 骨架屏
+              return const SizedBox();
+            }
+          },
+        ),
       ),
       // resizeToAvoidBottomInset: true,
       bottomNavigationBar: Container(
         width: double.infinity,
-        height: MediaQuery.of(context).padding.bottom + 70,
+        height: MediaQuery.of(context).padding.bottom + 70 + keyboardHeight,
         padding: EdgeInsets.only(
           left: 8,
           right: 12,
@@ -152,48 +215,102 @@ class _WhisperDetailPageState extends State<WhisperDetailPage> {
             ),
           ),
         ),
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.center,
-          crossAxisAlignment: CrossAxisAlignment.start,
+        child: Column(
           children: [
-            // IconButton(
-            //   onPressed: () {},
-            //   icon: Icon(
-            //     Icons.add_circle_outline,
-            //     color: Theme.of(context).colorScheme.outline,
-            //   ),
-            // ),
-            IconButton(
-              onPressed: () {},
-              icon: Icon(
-                Icons.emoji_emotions_outlined,
-                color: Theme.of(context).colorScheme.outline,
-              ),
-            ),
-            Expanded(
-              child: Container(
-                height: 45,
-                decoration: BoxDecoration(
-                  color:
-                      Theme.of(context).colorScheme.primary.withOpacity(0.08),
-                  borderRadius: BorderRadius.circular(40.0),
-                ),
-                child: TextField(
-                  readOnly: true,
-                  style: Theme.of(context).textTheme.titleMedium,
-                  decoration: const InputDecoration(
-                    border: InputBorder.none, // 移除默认边框
-                    hintText: '开发中 ...', // 提示文本
-                    contentPadding: EdgeInsets.symmetric(
-                        horizontal: 16.0, vertical: 12.0), // 内边距
+            Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                // IconButton(
+                //   onPressed: () {},
+                //   icon: Icon(
+                //     Icons.add_circle_outline,
+                //     color: Theme.of(context).colorScheme.outline,
+                //   ),
+                // ),
+                IconButton(
+                  onPressed: () {
+                    // if (toolbarType == 'input') {
+                    //   setState(() {
+                    //     toolbarType = 'emote';
+                    //   });
+                    // }
+                    // FocusScope.of(context).unfocus();
+                  },
+                  icon: Icon(
+                    Icons.emoji_emotions_outlined,
+                    color: Theme.of(context).colorScheme.outline,
                   ),
                 ),
+                Expanded(
+                  child: Container(
+                    height: 45,
+                    decoration: BoxDecoration(
+                      color: Theme.of(context)
+                          .colorScheme
+                          .primary
+                          .withOpacity(0.08),
+                      borderRadius: BorderRadius.circular(40.0),
+                    ),
+                    child: TextField(
+                      readOnly: true,
+                      style: Theme.of(context).textTheme.titleMedium,
+                      controller: _replyContentController,
+                      autofocus: false,
+                      focusNode: replyContentFocusNode,
+                      decoration: const InputDecoration(
+                        border: InputBorder.none, // 移除默认边框
+                        hintText: '开发中 ...', // 提示文本
+                        contentPadding: EdgeInsets.symmetric(
+                            horizontal: 16.0, vertical: 12.0), // 内边距
+                      ),
+                    ),
+                  ),
+                ),
+                IconButton(
+                  // onPressed: _whisperDetailController.sendMsg,
+                  onPressed: null,
+                  icon: Icon(
+                    Icons.send,
+                    color: Theme.of(context).colorScheme.outline,
+                  ),
+                ),
+                // const SizedBox(width: 16),
+              ],
+            ),
+            AnimatedSize(
+              curve: Curves.easeInOut,
+              duration: const Duration(milliseconds: 300),
+              child: SizedBox(
+                width: double.infinity,
+                height: toolbarType == 'input' ? keyboardHeight : emoteHeight,
+                child: EmotePanel(
+                  onChoose: (package, emote) => {},
+                ),
               ),
             ),
-            const SizedBox(width: 16),
           ],
         ),
       ),
     );
   }
 }
+
+typedef DebounceCallback = void Function();
+
+class Debouncer {
+  DebounceCallback? callback;
+  final int? milliseconds;
+  Timer? _timer;
+
+  Debouncer({this.milliseconds});
+
+  run(DebounceCallback callback) {
+    if (_timer != null) {
+      _timer!.cancel();
+    }
+    _timer = Timer(Duration(milliseconds: milliseconds!), () {
+      callback();
+    });
+  }
+}

lib/pages/whisper_detail/widget/chat_item.dart

@@ -204,7 +204,7 @@ class ChatItem extends StatelessWidget {
                   final int cid = await SearchHttp.ab2c(bvid: bvid);
                   final String heroTag = Utils.makeHeroTag(bvid);
                   SmartDialog.dismiss<dynamic>().then(
-                        (e) => Get.toNamed<dynamic>('/video?bvid=$bvid&cid=$cid',
+                    (e) => Get.toNamed<dynamic>('/video?bvid=$bvid&cid=$cid',
                         arguments: <String, String?>{
                           'pic': content['thumb'],
                           'heroTag': heroTag,
@@ -352,7 +352,9 @@ class ChatItem extends StatelessWidget {
               ));
         default:
           return Text(
-            content['content'] ?? content.toString(),
+            content != null && content != ''
+                ? (content['content'] ?? content.toString())
+                : '不支持的消息类型',
             style: TextStyle(
               letterSpacing: 0.6,
               height: 1.5,

lib/plugin/pl_player/controller.dart

@@ -277,8 +277,7 @@ class PlPlayerController {
     danmakuDurationVal =
         localCache.get(LocalCacheKey.danmakuDuration, defaultValue: 4.0);
     // 描边粗细
-    strokeWidth =
-        localCache.get(LocalCacheKey.strokeWidth, defaultValue: 1.5);
+    strokeWidth = 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,10 @@
+enum BottomControlType {
+  pre,
+  playOrPause,
+  next,
+  time,
+  space,
+  fit,
+  speed,
+  fullscreen,
+}