fix: 图片预览放大、取消下滑关闭图片预览

推送至main分支时编译为beta版本，发送到Telegram频道

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

lib/common/widgets/http_error.dart

@@ -22,20 +22,27 @@ class HttpError extends StatelessWidget {
               "assets/images/error.svg",
               height: 200,
             ),
-            const SizedBox(height: 20),
+            const SizedBox(height: 30),
             Text(
               errMsg ?? '请求异常',
               textAlign: TextAlign.center,
               style: Theme.of(context).textTheme.titleSmall,
             ),
-            const SizedBox(height: 30),
+            const SizedBox(height: 20),
-            OutlinedButton.icon(
+            FilledButton.tonal(
               onPressed: () {
                 fn!();
               },
-              icon: const Icon(Icons.arrow_forward_outlined, size: 20),
+              style: ButtonStyle(
-              label: Text(btnText ?? '点击重试'),
+                backgroundColor: MaterialStateProperty.resolveWith((states) {
-            )
+                  return Theme.of(context).colorScheme.primary.withAlpha(20);
+                }),
+              ),
+              child: Text(
+                btnText ?? '点击重试',
+                style: TextStyle(color: Theme.of(context).colorScheme.primary),
+              ),
+            ),
           ],
         ),
       ),

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) =>
@@ -104,7 +107,9 @@ class NetworkImgLayer extends StatelessWidget {
                 ? 0
                 : StyleString.imgRadius.x),
       ),
-      child: Center(
+      child: type == 'bg'
+          ? const SizedBox()
+          : Center(
               child: Image.asset(
                 type == 'avatar'
                     ? 'assets/images/noface.jpeg'

lib/common/widgets/stat/danmu.dart

@@ -3,7 +3,7 @@ import 'package:pilipala/utils/utils.dart';
 
 class StatDanMu extends StatelessWidget {
   final String? theme;
-  final int? danmu;
+  final dynamic danmu;
   final String? size;
 
   const StatDanMu({Key? key, this.theme, this.danmu, this.size})

lib/common/widgets/stat/view.dart

@@ -3,7 +3,7 @@ import 'package:pilipala/utils/utils.dart';
 
 class StatView extends StatelessWidget {
   final String? theme;
-  final int? view;
+  final dynamic view;
   final String? size;
 
   const StatView({Key? key, this.theme, this.view, this.size})

lib/common/widgets/video_card_v.dart

@@ -1,6 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
+import '../../models/model_rec_video_item.dart';
+import 'stat/danmu.dart';
+import 'stat/view.dart';
 import '../../http/dynamics.dart';
 import '../../http/search.dart';
 import '../../http/user.dart';
@@ -228,6 +231,7 @@ class VideoContent extends StatelessWidget {
               const SizedBox(height: 2),
               VideoStat(
                 videoItem: videoItem,
+                crossAxisCount: crossAxisCount,
               ),
             ],
             if (crossAxisCount == 1) const SizedBox(height: 4),
@@ -291,6 +295,7 @@ class VideoContent extends StatelessWidget {
                   ),
                   VideoStat(
                     videoItem: videoItem,
+                    crossAxisCount: crossAxisCount,
                   ),
                   const Spacer(),
                 ],
@@ -314,27 +319,41 @@ 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
   Widget build(BuildContext context) {
-    return RichText(
+    return Row(
+      children: [
+        StatView(
+          theme: 'gray',
+          view: videoItem.stat.view,
+        ),
+        const SizedBox(width: 8),
+        StatDanMu(
+          theme: 'gray',
+          danmu: videoItem.stat.danmu,
+        ),
+        if (videoItem is RecVideoItemModel) ...<Widget>[
+          crossAxisCount > 1 ? const Spacer() : const SizedBox(width: 8),
+          RichText(
             maxLines: 1,
             text: TextSpan(
                 style: TextStyle(
-          fontSize: MediaQuery.textScalerOf(context)
+                  fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
-              .scale(Theme.of(context).textTheme.labelSmall!.fontSize!),
                   color: Theme.of(context).colorScheme.outline,
                 ),
-        children: [
+                text: Utils.formatTimestampToRelativeTime(videoItem.pubdate)),
-          TextSpan(text: '${Utils.numFormat(videoItem.stat.view)}观看'),
-          TextSpan(text: ' • ${Utils.numFormat(videoItem.stat.danmu)}弹幕'),
-        ],
           ),
+          const SizedBox(width: 4),
+        ]
+      ],
     );
   }
 }

lib/http/api.dart

@@ -477,4 +477,26 @@ class Api {
 
   /// 获取未读动态数
   static const getUnreadDynamic = '/x/web-interface/dynamic/entrance';
+
+  /// 用户动态主页
+  static const dynamicSpmPrefix = 'https://space.bilibili.com/1/dynamic';
+
+  /// 激活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';
 }

lib/http/init.dart

@@ -1,7 +1,9 @@
 // ignore_for_file: avoid_print
 import 'dart:async';
+import 'dart:convert';
 import 'dart:developer';
 import 'dart:io';
+import 'dart:math' show Random;
 import 'package:cookie_jar/cookie_jar.dart';
 import 'package:dio/dio.dart';
 import 'package:dio/io.dart';
@@ -11,6 +13,7 @@ import 'package:hive/hive.dart';
 import 'package:pilipala/utils/id_utils.dart';
 import '../utils/storage.dart';
 import '../utils/utils.dart';
+import 'api.dart';
 import 'constants.dart';
 import 'interceptor.dart';
 
@@ -24,6 +27,7 @@ class Request {
   late bool enableSystemProxy;
   late String systemProxyHost;
   late String systemProxyPort;
+  static final RegExp spmPrefixExp = RegExp(r'<meta name="spm_prefix" content="([^"]+?)">');
 
   /// 设置cookie
   static setCookie() async {
@@ -51,13 +55,12 @@ class Request {
     }
     setOptionsHeaders(userInfo, userInfo != null && userInfo.mid != null);
 
-    if (cookie.isEmpty) {
     try {
-        await Request().get(HttpString.baseUrl);
+      await buvidActivate();
     } catch (e) {
       log("setCookie, ${e.toString()}");
     }
-    }
+
     final String cookieString = cookie
         .map((Cookie cookie) => '${cookie.name}=${cookie.value}')
         .join('; ');
@@ -87,6 +90,33 @@ class Request {
     dio.options.headers['referer'] = 'https://www.bilibili.com/';
   }
 
+  static Future buvidActivate() async {
+    var html = await Request().get(Api.dynamicSpmPrefix);
+    String spmPrefix = spmPrefixExp.firstMatch(html.data)!.group(1)!;
+    Random rand = Random();
+    String rand_png_end = base64.encode(
+      List<int>.generate(32, (_) => rand.nextInt(256)) +
+      List<int>.filled(4, 0) +
+      [73, 69, 78, 68] +
+      List<int>.generate(4, (_) => rand.nextInt(256))
+    );
+
+    String jsonData = json.encode({
+      '3064': 1,
+      '39c8': '${spmPrefix}.fp.risk',
+      '3c43': {
+        'adca': 'Linux',
+        'bfe9': rand_png_end.substring(rand_png_end.length - 50),
+      },
+    });
+
+    await Request().post(
+      Api.activateBuvidApi,
+      data: {'payload': jsonData},
+      options: Options(contentType: 'application/json')
+    );
+  }
+
   /*
    * config it and create
    */

lib/http/member.dart

@@ -79,6 +79,8 @@ class MemberHttp {
     String order = 'pubdate',
     bool orderAvoided = true,
   }) async {
+    String dmImgStr = Utils.base64EncodeRandomString(16, 64);
+    String dmCoverImgStr = Utils.base64EncodeRandomString(32, 128);
     Map params = await WbiSign().makSign({
       'mid': mid,
       'ps': ps,
@@ -88,7 +90,11 @@ class MemberHttp {
       'order': order,
       'platform': 'web',
       'web_location': 1550101,
-      'order_avoided': orderAvoided
+      'order_avoided': orderAvoided,
+      'dm_img_list': '[]',
+      'dm_img_str': dmImgStr.substring(0, dmImgStr.length - 2),
+      'dm_cover_img_str': dmCoverImgStr.substring(0, dmCoverImgStr.length - 2),
+      'dm_img_inter': '{"ds":[],"wh":[0,0,0],"of":[0,0,0]}',
     });
     var res = await Request().get(
       Api.memberArchive,
@@ -101,10 +107,13 @@ class MemberHttp {
         'data': MemberArchiveDataModel.fromJson(res.data['data'])
       };
     } else {
+      Map errMap = {
+        -352: '风控校验失败，请检查登录状态',
+      };
       return {
         'status': false,
         'data': [],
-        'msg': res.data['message'],
+        'msg': errMap[res.data['code']] ?? res.data['message'],
       };
     }
   }
@@ -123,10 +132,13 @@ class MemberHttp {
         'data': DynamicsDataModel.fromJson(res.data['data']),
       };
     } else {
+      Map errMap = {
+        -352: '风控校验失败，请检查登录状态',
+      };
       return {
         'status': false,
         'data': [],
-        'msg': res.data['message'],
+        'msg': errMap[res.data['code']] ?? res.data['message'],
       };
     }
   }

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,10 +23,18 @@ class MsgHttp {
     Map signParams = await WbiSign().makSign(params);
     var res = await Request().get(Api.sessionList, data: signParams);
     if (res.data['code'] == 0) {
+      try {
         return {
           'status': true,
           'data': SessionDataModel.fromJson(res.data['data']),
         };
+      } catch (err) {
+        return {
+          'status': false,
+          'date': [],
+          'msg': err.toString(),
+        };
+      }
     } else {
       return {
         'status': false,
@@ -42,12 +51,16 @@ class MsgHttp {
       'mobi_app': 'web',
     });
     if (res.data['code'] == 0) {
+      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

@@ -130,7 +130,7 @@ class VideoHttp {
         }
         return {'status': true, 'data': list};
       } else {
-        return {'status': false, 'data': []};
+        return {'status': false, 'data': [], 'msg': res.data['message']};
       }
     } catch (err) {
       return {'status': false, 'data': [], 'msg': err};

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,43 @@
+import 'package:flutter/material.dart';
+
+const defaultNavigationBars = [
+  {
+    'id': 0,
+    'icon': Icon(
+      Icons.home_outlined,
+      size: 21,
+    ),
+    'selectIcon': Icon(
+      Icons.home,
+      size: 21,
+    ),
+    'label': "首页",
+    'count': 0,
+  },
+  {
+    'id': 1,
+    'icon': Icon(
+      Icons.motion_photos_on_outlined,
+      size: 21,
+    ),
+    'selectIcon': Icon(
+      Icons.motion_photos_on,
+      size: 21,
+    ),
+    'label': "动态",
+    'count': 0,
+  },
+  {
+    'id': 2,
+    'icon': Icon(
+      Icons.video_collection_outlined,
+      size: 20,
+    ),
+    'selectIcon': Icon(
+      Icons.video_collection,
+      size: 21,
+    ),
+    'label': "媒体库",
+    'count': 0,
+  }
+];

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/home/rcmd/result.dart

@@ -1,3 +1,5 @@
+import 'package:pilipala/utils/id_utils.dart';
+
 class RecVideoItemAppModel {
   RecVideoItemAppModel({
     this.id,
@@ -50,14 +52,15 @@ class RecVideoItemAppModel {
         ? json['player_args']['aid']
         : int.parse(json['param'] ?? '-1');
     aid = json['player_args'] != null ? json['player_args']['aid'] : -1;
-    bvid = null;
+    bvid = json['player_args'] != null
+        ? IdUtils.av2bv(json['player_args']['aid'])
+        : '';
     cid = json['player_args'] != null ? json['player_args']['cid'] : -1;
     pic = json['cover'];
     stat = RcmdStat.fromJson(json);
     // 改用player_args中的duration作为原始数据（秒数）
-    duration = json['player_args'] != null
+    duration =
-        ? json['player_args']['duration']
+        json['player_args'] != null ? json['player_args']['duration'] : -1;
-        : -1;
     //duration = json['cover_right_text'];
     title = json['title'];
     owner = RcmdOwner.fromJson(json);

lib/models/member/archive.dart

@@ -142,7 +142,7 @@ class Stat {
 
   Stat.fromJson(Map<String, dynamic> json) {
     view = json["play"];
-    danmaku = json['comment'];
+    danmaku = json['video_review'];
   }
 }
 

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/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/play/url.dart

@@ -34,6 +34,7 @@ class PlayUrlModel {
   String? seekParam;
   String? seekType;
   Dash? dash;
+  List<Durl>? durl;
   List<FormatItem>? supportFormats;
   // String? highFormat;
   int? lastPlayTime;
@@ -52,7 +53,8 @@ class PlayUrlModel {
     videoCodecid = json['video_codecid'];
     seekParam = json['seek_param'];
     seekType = json['seek_type'];
-    dash = Dash.fromJson(json['dash']);
+    dash = json['dash'] != null ? Dash.fromJson(json['dash']) : null;
+    durl = json['durl']?.map<Durl>((e) => Durl.fromJson(e)).toList();
     supportFormats = json['support_formats'] != null
         ? json['support_formats']
             .map<FormatItem>((e) => FormatItem.fromJson(e))
@@ -250,3 +252,30 @@ class Flac {
     audio = json['audio'] != null ? AudioItem.fromJson(json['audio']) : null;
   }
 }
+
+class Durl {
+  Durl({
+    this.order,
+    this.length,
+    this.size,
+    this.ahead,
+    this.vhead,
+    this.url,
+  });
+
+  int? order;
+  int? length;
+  int? size;
+  String? ahead;
+  String? vhead;
+  String? url;
+
+  Durl.fromJson(Map<String, dynamic> json) {
+    order = json['order'];
+    length = json['length'];
+    size = json['size'];
+    ahead = json['ahead'];
+    vhead = json['vhead'];
+    url = json['url'];
+  }
+}

lib/models/video/reply/content.dart

@@ -9,6 +9,7 @@ class ReplyContent {
     this.vote,
     this.richText,
     this.isText,
+    this.topicsMeta,
   });
 
   String? message;
@@ -20,6 +21,7 @@ class ReplyContent {
   Map? vote;
   Map? richText;
   bool? isText;
+  Map? topicsMeta;
 
   ReplyContent.fromJson(Map<String, dynamic> json) {
     message = json['message']
@@ -39,6 +41,7 @@ class ReplyContent {
     richText = json['rich_text'] ?? {};
     // 不包含@ 笔记 图片的时候，文字可折叠
     isText = atNameToMid!.isEmpty && vote!.isEmpty && pictures!.isEmpty;
+    topicsMeta = json['topics_meta'] ?? {};
   }
 }
 

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

@@ -53,29 +53,54 @@ class _AboutPageState extends State<AboutPage> {
               style: Theme.of(context).textTheme.titleMedium,
             ),
             const SizedBox(height: 6),
-            Text(
-              '使用Flutter开发的哔哩哔哩第三方客户端',
-              style: TextStyle(color: Theme.of(context).colorScheme.outline),
-            ),
-            const SizedBox(height: 20),
             Obx(
-              () => ListTile(
+              () => Badge(
-                title: const Text('当前版本'),
+                isLabelVisible: _aboutController.isLoading.value
-                trailing: Text(_aboutController.currentVersion.value,
+                    ? false
-                    style: subTitleStyle),
+                    : _aboutController.isUpdate.value,
+                label: const Text('New'),
+                child: Padding(
+                  padding: const EdgeInsets.fromLTRB(0, 0, 0, 30),
+                  child: FilledButton.tonal(
+                    onPressed: () {
+                      showModalBottomSheet(
+                        context: context,
+                        builder: (context) {
+                          return Column(
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              ListTile(
+                                onTap: () => _aboutController.githubRelease(),
+                                title: const Text('Github下载'),
+                              ),
+                              ListTile(
+                                onTap: () => _aboutController.panDownload(),
+                                title: const Text('网盘下载'),
+                              ),
+                              ListTile(
+                                onTap: () => _aboutController.webSiteUrl(),
+                                title: const Text('官网下载'),
+                              ),
+                              ListTile(
+                                onTap: () => _aboutController.qimiao(),
+                                title: const Text('奇妙应用'),
+                              ),
+                              SizedBox(
+                                  height:
+                                      MediaQuery.of(context).padding.bottom +
+                                          20)
+                            ],
+                          );
+                        },
+                      );
+                    },
+                    child: Text(
+                      'V${_aboutController.currentVersion.value}',
+                      style: subTitleStyle.copyWith(
+                        color: Theme.of(context).primaryColor,
+                      ),
                     ),
                   ),
-            Obx(
-              () => ListTile(
-                onTap: () => _aboutController.onUpdate(),
-                title: const Text('最新版本'),
-                trailing: Text(
-                  _aboutController.isLoading.value
-                      ? '正在获取'
-                      : _aboutController.isUpdate.value
-                          ? '有新版本  ❤️${_aboutController.remoteVersion.value}'
-                          : '当前已是最新版',
-                  style: subTitleStyle,
                 ),
               ),
             ),
@@ -87,14 +112,9 @@ class _AboutPageState extends State<AboutPage> {
             //     size: 16,
             //   ),
             // ),
-            Divider(
-              thickness: 1,
-              height: 30,
-              color: Theme.of(context).colorScheme.outlineVariant,
-            ),
             ListTile(
               onTap: () => _aboutController.githubUrl(),
-              title: const Text('Github'),
+              title: const Text('开源地址'),
               trailing: Text(
                 'github.com/guozhigq/pilipala',
                 style: subTitleStyle,
@@ -128,19 +148,43 @@ class _AboutPageState extends State<AboutPage> {
                 color: outline,
               ),
             ),
+            ListTile(
+              onTap: () {
+                showModalBottomSheet(
+                  context: context,
+                  builder: (context) {
+                    return Column(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
                         ListTile(
                           onTap: () => _aboutController.qqChanel(),
                           title: const Text('QQ群'),
-              trailing: Icon(
+                          trailing: Text(
-                Icons.arrow_forward_ios,
+                            '616150809',
-                size: 16,
+                            style: subTitleStyle,
-                color: outline,
                           ),
                         ),
                         ListTile(
                           onTap: () => _aboutController.tgChanel(),
                           title: const Text('TG频道'),
-              trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline),
+                          trailing: Text(
+                            'https://t.me/+lm_oOVmF0RJiODk1',
+                            style: subTitleStyle,
+                          ),
+                        ),
+                        SizedBox(
+                            height: MediaQuery.of(context).padding.bottom + 20)
+                      ],
+                    );
+                  },
+                );
+              },
+              title: const Text('交流社区'),
+              trailing: Icon(
+                Icons.arrow_forward_ios,
+                size: 16,
+                color: outline,
+              ),
             ),
             ListTile(
               onTap: () => _aboutController.aPay(),
@@ -157,12 +201,13 @@ class _AboutPageState extends State<AboutPage> {
                 var cleanStatus = await CacheManage().clearCacheAll();
                 if (cleanStatus) {
                   getCacheSize();
+                  SmartDialog.showToast('清除成功');
                 }
               },
               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)
           ],
         ),
       ),
@@ -230,11 +275,26 @@ class AboutController extends GetxController {
     );
   }
 
+  githubRelease() {
+    launchUrl(
+      Uri.parse('https://github.com/guozhigq/pilipala/release'),
+      mode: LaunchMode.externalApplication,
+    );
+  }
+
   // 从网盘下载
   panDownload() {
-    launchUrl(
+    Clipboard.setData(
+      const ClipboardData(text: 'pili'),
+    );
+    SmartDialog.showToast(
+      '已复制提取码：pili',
+      displayTime: const Duration(milliseconds: 500),
+    ).then(
+      (value) => launchUrl(
         Uri.parse('https://www.123pan.com/s/9sVqVv-flu0A.html'),
         mode: LaunchMode.externalApplication,
+      ),
     );
   }
 
@@ -250,7 +310,7 @@ class AboutController extends GetxController {
   // qq频道
   qqChanel() {
     Clipboard.setData(
-      const ClipboardData(text: '489981949'),
+      const ClipboardData(text: '616150809'),
     );
     SmartDialog.showToast('已复制QQ群号');
   }
@@ -291,6 +351,13 @@ class AboutController extends GetxController {
     );
   }
 
+  qimiao() {
+    launchUrl(
+      Uri.parse('https://www.magicalapk.com/home'),
+      mode: LaunchMode.externalApplication,
+    );
+  }
+
   // 日志
   logs() {
     Get.toNamed('/logs');

lib/pages/bangumi/controller.dart

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

lib/pages/bangumi/introduction/controller.dart

@@ -218,14 +218,12 @@ class BangumiIntroController extends GetxController {
         addIds: addMediaIdsNew.join(','),
         delIds: delMediaIdsNew.join(','));
     if (result['status']) {
-      if (result['data']['prompt']) {
       addMediaIdsNew = [];
       delMediaIdsNew = [];
-        Get.back();
       // 重新获取收藏状态
       queryHasFavVideo();
       SmartDialog.showToast('✅ 操作成功');
-      }
+      Get.back();
     }
   }
 

lib/pages/bangumi/view.dart

@@ -9,7 +9,6 @@ import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/pages/home/index.dart';
 import 'package:pilipala/pages/main/index.dart';
-import 'package:pilipala/pages/rcmd/view.dart';
 
 import 'controller.dart';
 import 'widgets/bangumu_card_v.dart';
@@ -199,7 +198,10 @@ class _BangumiPageState extends State<BangumiPage>
                   } else {
                     return HttpError(
                       errMsg: data['msg'],
-                      fn: () => {},
+                      fn: () {
+                        _futureBuilderFuture =
+                            _bangumidController.queryBangumiListFeed();
+                      },
                     );
                   }
                 } else {
@@ -208,7 +210,6 @@ class _BangumiPageState extends State<BangumiPage>
               },
             ),
           ),
-          const LoadingMore()
         ],
       ),
     );

lib/pages/bangumi/widgets/bangumi_panel.dart

@@ -65,6 +65,45 @@ 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(
+        '第${index + 1}话  ${page.longTitle!}',
+        style: TextStyle(
+          fontSize: 14,
+          color: isCurrentIndex
+              ? primary
+              : Theme.of(context).colorScheme.onSurface,
+        ),
+      ),
+      trailing: page.badge != null
+          ? Image.asset(
+              'assets/images/big-vip.png',
+              height: 20,
+            )
+          : const SizedBox(),
+    );
+  }
+
   void showBangumiPanel() {
     showBottomSheet(
       context: context,
@@ -106,37 +145,21 @@ class _BangumiPanelState extends State<BangumiPanel> {
                     child: Material(
                       child: ScrollablePositionedList.builder(
                         itemCount: widget.pages.length,
-                        itemBuilder: (BuildContext context, int index) =>
+                        itemBuilder: (BuildContext context, int index) {
-                            ListTile(
+                          bool isLastItem = index == widget.pages.length - 1;
-                          onTap: () {
+                          bool isCurrentIndex = currentIndex == index;
-                            setState(() {
+                          return isLastItem
-                              changeFucCall(widget.pages[index], index);
+                              ? SizedBox(
-                            });
+                                  height:
+                                      MediaQuery.of(context).padding.bottom +
+                                          20,
+                                )
+                              : buildPageListItem(
+                                  widget.pages[index],
+                                  index,
+                                  isCurrentIndex,
+                                );
                         },
-                          dense: false,
-                          leading: index == currentIndex
-                              ? Image.asset(
-                                  'assets/images/live.gif',
-                                  color: Theme.of(context).colorScheme.primary,
-                                  height: 12,
-                                )
-                              : 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(),
-                        ),
                         itemScrollController: itemScrollController,
                       ),
                     ),

lib/pages/blacklist/index.dart

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

lib/pages/dynamics/controller.dart

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

lib/pages/dynamics/detail/controller.dart

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

lib/pages/dynamics/view.dart

@@ -192,22 +192,6 @@ class _DynamicsPageState extends State<DynamicsPage>
                   )
                 ],
               ),
-              // Obx(
-              //   () => Visibility(
-              //     visible: _dynamicsController.userLogin.value,
-              //     child: Positioned(
-              //       right: 4,
-              //       top: 0,
-              //       bottom: 0,
-              //       child: IconButton(
-              //         padding: EdgeInsets.zero,
-              //         onPressed: () =>
-              //             {feedBack(), _dynamicsController.resetSearch()},
-              //         icon: const Icon(Icons.history, size: 21),
-              //       ),
-              //     ),
-              //   ),
-              // ),
             ],
           ),
         ),
@@ -229,7 +213,8 @@ class _DynamicsPageState extends State<DynamicsPage>
                     return Obx(() => UpPanel(_dynamicsController.upData.value));
                   } else {
                     return const SliverToBoxAdapter(
-                        child: SizedBox(height: 80));
+                      child: SizedBox(height: 80),
+                    );
                   }
                 } else {
                   return const SliverToBoxAdapter(
@@ -240,15 +225,6 @@ class _DynamicsPageState extends State<DynamicsPage>
                 }
               },
             ),
-            SliverToBoxAdapter(
-              child: Container(
-                height: 6,
-                color: Theme.of(context)
-                    .colorScheme
-                    .onInverseSurface
-                    .withOpacity(0.5),
-              ),
-            ),
             FutureBuilder(
               future: _futureBuilderFuture,
               builder: (context, snapshot) {

lib/pages/dynamics/widgets/article_panel.dart

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

lib/pages/dynamics/widgets/content_panel.dart

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

lib/pages/dynamics/widgets/rich_node_panel.dart

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

lib/pages/dynamics/widgets/up_panel.dart

@@ -1,16 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:hive/hive.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/models/dynamics/up.dart';
 import 'package:pilipala/models/live/item.dart';
 import 'package:pilipala/pages/dynamics/controller.dart';
 import 'package:pilipala/utils/feed_back.dart';
-import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
 
 class UpPanel extends StatefulWidget {
-  final FollowUpModel? upData;
+  final FollowUpModel upData;
   const UpPanel(this.upData, {Key? key}) : super(key: key);
 
   @override
@@ -24,39 +22,22 @@ class _UpPanelState extends State<UpPanel> {
   List<UpItem> upList = [];
   List<LiveUserItem> liveList = [];
   static const itemPadding = EdgeInsets.symmetric(horizontal: 5, vertical: 0);
-  Box userInfoCache = GStrorage.userInfo;
+  late MyInfo userInfo;
-  var userInfo;
 
-  @override
+  void listFormat() {
-  void initState() {
+    userInfo = widget.upData.myInfo!;
-    super.initState();
+    upList = widget.upData.upList!;
-    upList = widget.upData!.upList!;
+    liveList = widget.upData.liveList!;
-    if (widget.upData!.liveUsers != null) {
-      liveList = widget.upData!.liveUsers!.items!;
-    }
-    upList.insert(
-      0,
-      UpItem(
-          face: 'https://files.catbox.moe/8uc48f.png', uname: '全部动态', mid: -1),
-    );
-    userInfo = userInfoCache.get('userInfoCache');
-    upList.insert(
-      1,
-      UpItem(
-        face: userInfo.face,
-        uname: '我',
-        mid: userInfo.mid,
-      ),
-    );
   }
 
   @override
   Widget build(BuildContext context) {
+    listFormat();
     return SliverPersistentHeader(
       floating: true,
       pinned: false,
       delegate: _SliverHeaderDelegate(
-          height: 124,
+          height: liveList.isNotEmpty || upList.isNotEmpty ? 126 : 0,
           child: Column(
             mainAxisAlignment: MainAxisAlignment.start,
             crossAxisAlignment: CrossAxisAlignment.start,
@@ -91,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,
@@ -121,6 +102,13 @@ class _UpPanelState extends State<UpPanel> {
                   ],
                 ),
               ),
+              Container(
+                height: 6,
+                color: Theme.of(context)
+                    .colorScheme
+                    .onInverseSurface
+                    .withOpacity(0.5),
+              ),
             ],
           )),
     );
@@ -171,6 +159,9 @@ class _UpPanelState extends State<UpPanel> {
       },
       onLongPress: () {
         feedBack();
+        if (data.mid == -1) {
+          return;
+        }
         String heroTag = Utils.makeHeroTag(data.mid);
         Get.toNamed('/member?mid=${data.mid}',
             arguments: {'face': data.face, 'heroTag': heroTag});
@@ -198,11 +189,18 @@ class _UpPanelState extends State<UpPanel> {
                 backgroundColor: data.type == 'live'
                     ? Theme.of(context).colorScheme.secondaryContainer
                     : Theme.of(context).colorScheme.primary,
-                child: NetworkImgLayer(
+                child: data.face != ''
-                  width: 49,
+                    ? NetworkImgLayer(
-                  height: 49,
+                        width: 50,
+                        height: 50,
                         src: data.face,
                         type: 'avatar',
+                      )
+                    : const CircleAvatar(
+                        radius: 25,
+                        backgroundImage: AssetImage(
+                          'assets/images/noface.jpeg',
+                        ),
                       ),
               ),
               Padding(
@@ -271,13 +269,11 @@ class UpPanelSkeleton extends StatelessWidget {
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
               Container(
-                width: 49,
+                width: 50,
-                height: 49,
+                height: 50,
                 decoration: BoxDecoration(
                   color: Theme.of(context).colorScheme.onInverseSurface,
-                  borderRadius: const BorderRadius.all(
+                  borderRadius: BorderRadius.circular(50),
-                    Radius.circular(24),
-                  ),
                 ),
               ),
               Container(

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

@@ -34,7 +34,7 @@ class FavDetailController extends GetxController {
       return;
     }
     isLoadingMore = true;
-    var res = await await UserHttp.userFavFolderDetail(
+    var res = await UserHttp.userFavFolderDetail(
       pn: currentPage,
       ps: 20,
       mediaId: mediaId!,
@@ -60,7 +60,6 @@ class FavDetailController extends GetxController {
     var result = await VideoHttp.favVideo(
         aid: id, addIds: '', delIds: mediaId.toString());
     if (result['status']) {
-      if (result['data']['prompt']) {
       List dataList = favList;
       for (var i in dataList) {
         if (i.id == id) {
@@ -71,7 +70,6 @@ class FavDetailController extends GetxController {
       SmartDialog.showToast('取消收藏');
     }
   }
-  }
 
   onLoad() {
     queryUserFavFolderDetail(type: 'onLoad');

lib/pages/fav_detail/view.dart

@@ -29,8 +29,8 @@ class _FavDetailPageState extends State<FavDetailPage> {
   @override
   void initState() {
     super.initState();
-    _futureBuilderFuture = _favDetailController.queryUserFavFolderDetail();
     mediaId = Get.parameters['mediaId']!;
+    _futureBuilderFuture = _favDetailController.queryUserFavFolderDetail();
     titleStreamC = StreamController<bool>();
     _controller.addListener(
       () {

lib/pages/fav_search/controller.dart

@@ -80,7 +80,6 @@ class FavSearchController extends GetxController {
     var result = await VideoHttp.favVideo(
         aid: id, addIds: '', delIds: mediaId.toString());
     if (result['status']) {
-      if (result['data']['prompt']) {
       List dataList = favList;
       for (var i in dataList) {
         if (i.id == id) {
@@ -91,5 +90,4 @@ class FavSearchController extends GetxController {
       SmartDialog.showToast('取消收藏');
     }
   }
-  }
 }

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

@@ -26,6 +26,7 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
   late List defaultTabs;
   late List<String> tabbarSort;
   RxString defaultSearch = ''.obs;
+  late bool enableGradientBg;
 
   @override
   void onInit() {
@@ -40,6 +41,8 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
     if (setting.get(SettingBoxKey.enableSearchWord, defaultValue: true)) {
       searchDefault();
     }
+    enableGradientBg =
+        setting.get(SettingBoxKey.enableGradientBg, defaultValue: true);
   }
 
   void onRefresh() {

lib/pages/home/view.dart

@@ -48,17 +48,23 @@ class _HomePageState extends State<HomePage>
     super.build(context);
     Brightness currentBrightness = MediaQuery.of(context).platformBrightness;
     // 设置状态栏图标的亮度
+    if (_homeController.enableGradientBg) {
       SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
         statusBarIconBrightness: currentBrightness == Brightness.light
             ? Brightness.dark
             : Brightness.light,
       ));
+    }
     return Scaffold(
       extendBody: true,
       extendBodyBehindAppBar: true,
+      appBar: _homeController.enableGradientBg
+          ? null
+          : AppBar(toolbarHeight: 0, elevation: 0),
       body: Stack(
         children: [
           // gradient background
+          if (_homeController.enableGradientBg) ...[
             Align(
               alignment: Alignment.topLeft,
               child: Opacity(
@@ -69,8 +75,14 @@ class _HomePageState extends State<HomePage>
                   decoration: BoxDecoration(
                     gradient: LinearGradient(
                         colors: [
-                        Theme.of(context).colorScheme.primary.withOpacity(0.9),
+                          Theme.of(context)
-                        Theme.of(context).colorScheme.primary.withOpacity(0.5),
+                              .colorScheme
+                              .primary
+                              .withOpacity(0.9),
+                          Theme.of(context)
+                              .colorScheme
+                              .primary
+                              .withOpacity(0.5),
                           Theme.of(context).colorScheme.surface
                         ],
                         begin: Alignment.topLeft,
@@ -80,6 +92,7 @@ class _HomePageState extends State<HomePage>
                 ),
               ),
             ),
+          ],
           Column(
             children: [
               CustomAppBar(
@@ -90,7 +103,37 @@ class _HomePageState extends State<HomePage>
                 callback: showUserBottomSheet,
               ),
               if (_homeController.tabs.length > 1) ...[
+                if (_homeController.enableGradientBg) ...[
                   const CustomTabs(),
+                ] else ...[
+                  const SizedBox(height: 4),
+                  SizedBox(
+                    width: double.infinity,
+                    height: 42,
+                    child: Align(
+                      alignment: Alignment.center,
+                      child: TabBar(
+                        controller: _homeController.tabController,
+                        tabs: [
+                          for (var i in _homeController.tabs)
+                            Tab(text: i['label'])
+                        ],
+                        isScrollable: true,
+                        dividerColor: Colors.transparent,
+                        enableFeedback: true,
+                        splashBorderRadius: BorderRadius.circular(10),
+                        tabAlignment: TabAlignment.center,
+                        onTap: (value) {
+                          feedBack();
+                          if (_homeController.initialIndex.value == value) {
+                            _homeController.tabsCtrList[value]().animateToTop();
+                          }
+                          _homeController.initialIndex.value = value;
+                        },
+                      ),
+                    ),
+                  ),
+                ],
               ] else ...[
                 const SizedBox(height: 6),
               ],
@@ -372,13 +415,16 @@ class SearchBar extends StatelessWidget {
                 ),
                 const SizedBox(width: 10),
                 Obx(
-                  () => Text(
+                  () => 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/hot/view.dart

@@ -89,8 +89,7 @@ class _HotPageState extends State<HotPage> with AutomaticKeepAliveClientMixin {
                   if (data['status']) {
                     return Obx(
                       () => SliverList(
-                        delegate:
+                        delegate: SliverChildBuilderDelegate((context, index) {
-                            SliverChildBuilderDelegate((context, index) {
                           return VideoCardH(
                             videoItem: _hotController.videoList[index],
                             showPubdate: true,
@@ -110,7 +109,12 @@ class _HotPageState extends State<HotPage> with AutomaticKeepAliveClientMixin {
                   } else {
                     return HttpError(
                       errMsg: data['msg'],
-                      fn: () => setState(() {}),
+                      fn: () {
+                        setState(() {
+                          _futureBuilderFuture =
+                              _hotController.queryHotFeed('init');
+                        });
+                      },
                     );
                   }
                 } else {

lib/pages/live/controller.dart

@@ -10,8 +10,7 @@ class LiveController extends GetxController {
   int count = 12;
   int _currentPage = 1;
   RxInt crossAxisCount = 2.obs;
-  RxList<LiveItemModel> liveList = [LiveItemModel()].obs;
+  RxList<LiveItemModel> liveList = <LiveItemModel>[].obs;
-  bool isLoadingMore = false;
   bool flag = false;
   OverlayEntry? popupDialog;
   Box setting = GStrorage.setting;
@@ -39,7 +38,6 @@ class LiveController extends GetxController {
       }
       _currentPage += 1;
     }
-    isLoadingMore = false;
     return res;
   }
 

lib/pages/live/view.dart

@@ -11,7 +11,6 @@ import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/overlay_pop.dart';
 import 'package:pilipala/pages/home/index.dart';
 import 'package:pilipala/pages/main/index.dart';
-import 'package:pilipala/pages/rcmd/index.dart';
 
 import 'controller.dart';
 import 'widgets/live_item.dart';
@@ -45,8 +44,8 @@ class _LivePageState extends State<LivePage>
       () {
         if (scrollController.position.pixels >=
             scrollController.position.maxScrollExtent - 200) {
-          EasyThrottle.throttle('liveList', const Duration(seconds: 1), () {
+          EasyThrottle.throttle('liveList', const Duration(milliseconds: 200),
-            _liveController.isLoadingMore = true;
+              () {
             _liveController.onLoad();
           });
         }
@@ -108,24 +107,20 @@ class _LivePageState extends State<LivePage>
                     } else {
                       return HttpError(
                         errMsg: data['msg'],
-                        fn: () => {},
+                        fn: () {
+                          setState(() {
+                            _futureBuilderFuture =
+                                _liveController.queryLiveList('init');
+                          });
+                        },
                       );
                     }
                   } else {
-                    // 缓存数据
-                    if (_liveController.liveList.length > 1) {
-                      return contentGrid(
-                          _liveController, _liveController.liveList);
-                    }
-                    // 骨架屏
-                    else {
                     return contentGrid(_liveController, []);
                   }
-                  }
                 },
               ),
             ),
-            LoadingMore(ctr: _liveController)
           ],
         ),
       ),

lib/pages/live_room/controller.dart

@@ -4,6 +4,8 @@ import 'package:pilipala/http/live.dart';
 import 'package:pilipala/models/live/room_info.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
 import '../../models/live/room_info_h5.dart';
+import '../../utils/storage.dart';
+import '../../utils/video_utils.dart';
 
 class LiveRoomController extends GetxController {
   String cover = '';
@@ -16,6 +18,7 @@ class LiveRoomController extends GetxController {
   PlPlayerController plPlayerController =
       PlPlayerController.getInstance(videoType: 'live');
   Rx<RoomInfoH5Model> roomInfoH5 = RoomInfoH5Model().obs;
+  late bool enableCDN;
 
   @override
   void onInit() {
@@ -31,6 +34,8 @@ class LiveRoomController extends GetxController {
         cover = liveItem.cover;
       }
     }
+    // CDN优化
+    enableCDN = setting.get(SettingBoxKey.enableCDN, defaultValue: true);
   }
 
   playerInit(source) async {
@@ -57,7 +62,9 @@ class LiveRoomController extends GetxController {
       List<CodecItem> codec =
           res['data'].playurlInfo.playurl.stream.first.format.first.codec;
       CodecItem item = codec.first;
-      String videoUrl = (item.urlInfo?.first.host)! +
+      String videoUrl = enableCDN
+          ? VideoUtils.getCdnUrl(item)
+          : (item.urlInfo?.first.host)! +
               item.baseUrl! +
               item.urlInfo!.first.extra!;
       await playerInit(videoUrl);

lib/pages/live_room/view.dart

@@ -75,39 +75,43 @@ class _LiveRoomPageState extends State<LiveRoomPage> {
       backgroundColor: Colors.black,
       body: Stack(
         children: [
-          // Obx(
+          Positioned(
-          //   () => Positioned.fill(
+            left: 0,
-          //     child: Opacity(
+            right: 0,
-          //       opacity: 0.8,
+            bottom: 0,
-          //       child: _liveRoomController
-          //                       .roomInfoH5.value.roomInfo?.appBackground !=
-          //                   '' &&
-          //               _liveRoomController
-          //                       .roomInfoH5.value.roomInfo?.appBackground !=
-          //                   null
-          //           ? NetworkImgLayer(
-          //               width: Get.width,
-          //               height: Get.height,
-          //               src: _liveRoomController
-          //                       .roomInfoH5.value.roomInfo?.appBackground ??
-          //                   '',
-          //             )
-          //           : Image.asset(
-          //               'assets/images/live/default_bg.webp',
-          //               width: Get.width,
-          //               height: Get.height,
-          //             ),
-          //     ),
-          //   ),
-          // ),
-          Positioned.fill(
             child: Opacity(
               opacity: 0.8,
               child: Image.asset(
                 'assets/images/live/default_bg.webp',
+                fit: BoxFit.cover,
+                // width: Get.width,
+                // height: Get.height,
+              ),
+            ),
+          ),
+          Obx(
+            () => Positioned(
+              left: 0,
+              right: 0,
+              bottom: 0,
+              child: _liveRoomController
+                              .roomInfoH5.value.roomInfo?.appBackground !=
+                          '' &&
+                      _liveRoomController
+                              .roomInfoH5.value.roomInfo?.appBackground !=
+                          null
+                  ? Opacity(
+                      opacity: 0.8,
+                      child: NetworkImgLayer(
                         width: Get.width,
                         height: Get.height,
+                        type: 'bg',
+                        src: _liveRoomController
+                                .roomInfoH5.value.roomInfo?.appBackground ??
+                            '',
                       ),
+                    )
+                  : const SizedBox(),
             ),
           ),
           Column(

lib/pages/main/controller.dart

@@ -12,6 +12,7 @@ import 'package:pilipala/pages/media/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>[
@@ -19,44 +20,7 @@ class MainController extends GetxController {
     const DynamicsPage(),
     const MediaPage(),
   ];
-  RxList navigationBars = [
+  RxList navigationBars = defaultNavigationBars.obs;
-    {
-      'icon': const Icon(
-        Icons.home_outlined,
-        size: 21,
-      ),
-      'selectIcon': const Icon(
-        Icons.home,
-        size: 21,
-      ),
-      'label': "首页",
-      'count': 0,
-    },
-    {
-      'icon': const Icon(
-        Icons.motion_photos_on_outlined,
-        size: 21,
-      ),
-      'selectIcon': const Icon(
-        Icons.motion_photos_on,
-        size: 21,
-      ),
-      'label': "动态",
-      'count': 0,
-    },
-    {
-      'icon': const Icon(
-        Icons.video_collection_outlined,
-        size: 20,
-      ),
-      'selectIcon': const Icon(
-        Icons.video_collection,
-        size: 21,
-      ),
-      'label': "媒体库",
-      'count': 0,
-    }
-  ].obs;
   final StreamController<bool> bottomBarStream =
       StreamController<bool>.broadcast();
   Box setting = GStrorage.setting;
@@ -75,6 +39,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/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/member_archive/view.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/video_card_h.dart';
 import 'package:pilipala/utils/utils.dart';
+import '../../common/widgets/http_error.dart';
 import 'controller.dart';
 
 class MemberArchivePage extends StatefulWidget {
@@ -86,10 +87,16 @@ class _MemberArchivePageState extends State<MemberArchivePage> {
                           : const SliverToBoxAdapter(),
                     );
                   } else {
-                    return const SliverToBoxAdapter();
+                    return HttpError(
+                      errMsg: snapshot.data['msg'],
+                      fn: () {},
+                    );
                   }
                 } else {
-                  return const SliverToBoxAdapter();
+                  return HttpError(
+                    errMsg: snapshot.data['msg'],
+                    fn: () {},
+                  );
                 }
               } else {
                 return const SliverToBoxAdapter();

lib/pages/member_dynamics/view.dart

@@ -4,6 +4,7 @@ import 'package:get/get.dart';
 import 'package:pilipala/pages/member_dynamics/index.dart';
 import 'package:pilipala/utils/utils.dart';
 
+import '../../common/widgets/http_error.dart';
 import '../dynamics/widgets/dynamic_panel.dart';
 
 class MemberDynamicsPage extends StatefulWidget {
@@ -80,10 +81,16 @@ class _MemberDynamicsPageState extends State<MemberDynamicsPage> {
                           : const SliverToBoxAdapter(),
                     );
                   } else {
-                    return const SliverToBoxAdapter();
+                    return HttpError(
+                      errMsg: snapshot.data['msg'],
+                      fn: () {},
+                    );
                   }
                 } else {
-                  return const SliverToBoxAdapter();
+                  return HttpError(
+                    errMsg: snapshot.data['msg'],
+                    fn: () {},
+                  );
                 }
               } else {
                 return const SliverToBoxAdapter();

lib/pages/preview/view.dart

@@ -102,15 +102,12 @@ class _ImagePreviewState extends State<ImagePreview>
     );
   }
 
-  // 设置状态栏图标透明
+  // 隐藏状态栏，避免遮挡图片内容
   setStatusBar() async {
-    if (Platform.isIOS) {
+    if (Platform.isIOS || Platform.isAndroid) {
       await StatusBarControl.setHidden(true,
           animation: StatusBarAnimation.SLIDE);
     }
-    if (Platform.isAndroid) {
-      await StatusBarControl.setColor(Colors.transparent);
-    }
   }
 
   @override
@@ -138,25 +135,14 @@ class _ImagePreviewState extends State<ImagePreview>
       ),
       body: Stack(
         children: [
-          DismissiblePage(
+          GestureDetector(
-            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) =>
+              onPageChanged: (int index) => _previewController.onChange(index),
-                    _previewController.onChange(index),
               canScrollPage: (GestureDetails? gestureDetails) =>
                   gestureDetails!.totalScale! <= 1.0,
               itemCount: widget.imgList!.length,
@@ -248,13 +234,14 @@ class _ImagePreviewState extends State<ImagePreview>
               },
             ),
           ),
-          ),
           Positioned(
             left: 0,
             right: 0,
             bottom: 0,
             child: Container(
                 padding: EdgeInsets.only(
+                    left: 20,
+                    right: 20,
                     bottom: MediaQuery.of(context).padding.bottom + 30),
                 decoration: const BoxDecoration(
                   gradient: LinearGradient(
@@ -267,20 +254,34 @@ class _ImagePreviewState extends State<ImagePreview>
                     tileMode: TileMode.mirror,
                   ),
                 ),
-              child: Obx(
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    widget.imgList!.length > 1
+                        ? Obx(
                             () => Text.rich(
                               textAlign: TextAlign.center,
                               TextSpan(
-                      style: const TextStyle(color: Colors.white, fontSize: 15),
+                                  style: const TextStyle(
+                                      color: Colors.white, fontSize: 16),
                                   children: [
                                     TextSpan(
-                            text: _previewController.currentPage.toString()),
+                                        text: _previewController.currentPage
+                                            .toString()),
                                     const TextSpan(text: ' / '),
-                        TextSpan(text: widget.imgList!.length.toString()),
+                                    TextSpan(
+                                        text:
+                                            widget.imgList!.length.toString()),
                                   ]),
                             ),
+                          )
+                        : const SizedBox(),
+                    IconButton(
+                      onPressed: () => Get.back(),
+                      icon: const Icon(Icons.close, color: Colors.white),
                     ),
-            ),
+                  ],
+                )),
           ),
         ],
       ),

lib/pages/rcmd/view.dart

@@ -44,7 +44,7 @@ class _RcmdPageState extends State<RcmdPage>
         if (scrollController.position.pixels >=
             scrollController.position.maxScrollExtent - 200) {
           EasyThrottle.throttle(
-              'my-throttler', const Duration(milliseconds: 500), () {
+              'my-throttler', const Duration(milliseconds: 200), () {
             _rcmdController.isLoadingMore = true;
             _rcmdController.onLoad();
           });
@@ -113,6 +113,7 @@ class _RcmdPageState extends State<RcmdPage>
                         errMsg: data['msg'],
                         fn: () {
                           setState(() {
+                            _rcmdController.isLoadingMore = true;
                             _futureBuilderFuture =
                                 _rcmdController.queryRcmdFeed('init');
                           });
@@ -125,7 +126,6 @@ class _RcmdPageState extends State<RcmdPage>
                 },
               ),
             ),
-            LoadingMore(ctr: _rcmdController),
           ],
         ),
       ),
@@ -188,33 +188,3 @@ class _RcmdPageState extends State<RcmdPage>
     );
   }
 }
-
-class LoadingMore extends StatelessWidget {
-  final dynamic ctr;
-  const LoadingMore({super.key, this.ctr});
-
-  @override
-  Widget build(BuildContext context) {
-    return SliverToBoxAdapter(
-      child: Container(
-        height: MediaQuery.of(context).padding.bottom + 80,
-        padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
-        child: GestureDetector(
-          onTap: () {
-            if (ctr != null) {
-              ctr!.isLoadingMore = true;
-              ctr!.onLoad();
-            }
-          },
-          child: Center(
-            child: Text(
-              '点击加载更多 👇',
-              style: TextStyle(
-                  color: Theme.of(context).colorScheme.outline, fontSize: 13),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

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 = '搜索';

lib/pages/search/view.dart

@@ -187,9 +187,13 @@ class _SearchPageState extends State<SearchPage> with RouteAware {
                         ),
                       );
                     } else {
-                      return HttpError(
+                      return CustomScrollView(
+                        slivers: [
+                          HttpError(
                             errMsg: data['msg'],
                             fn: () => setState(() {}),
+                          )
+                        ],
                       );
                     }
                   } else {

lib/pages/search_panel/view.dart

@@ -105,7 +105,11 @@ class _SearchPanelState extends State<SearchPanel>
                   slivers: [
                     HttpError(
                       errMsg: data['msg'],
-                      fn: () => setState(() {}),
+                      fn: () {
+                        setState(() {
+                          _searchPanelController.onSearch();
+                        });
+                      },
                     ),
                   ],
                 );
@@ -116,7 +120,11 @@ class _SearchPanelState extends State<SearchPanel>
                 slivers: [
                   HttpError(
                     errMsg: '没有相关数据',
-                    fn: () => setState(() {}),
+                    fn: () {
+                      setState(() {
+                        _searchPanelController.onSearch();
+                      });
+                    },
                   ),
                 ],
               );

lib/pages/search_panel/widgets/video_panel.dart

@@ -35,7 +35,7 @@ class SearchVideoPanel extends StatelessWidget {
                 padding: index == 0
                     ? const EdgeInsets.only(top: 2)
                     : EdgeInsets.zero,
-                child: VideoCardH(videoItem: i),
+                child: VideoCardH(videoItem: i, showPubdate: true),
               );
             },
           ),
@@ -70,7 +70,7 @@ class SearchVideoPanel extends StatelessWidget {
                               controller.selectedType.value = i['type'];
                               ctr!.order.value =
                                   i['type'].toString().split('.').last;
-                              SmartDialog.showLoading(msg: 'loooad');
+                              SmartDialog.showLoading(msg: 'loading');
                               await ctr!.onRefresh();
                               SmartDialog.dismiss();
                             },
@@ -202,7 +202,7 @@ class VideoPanelController extends GetxController {
                           Get.find<SearchPanelController>(
                               tag: 'video${searchPanelCtr.keyword!}');
                       ctr.duration.value = i['value'];
-                      SmartDialog.showLoading(msg: 'loooad');
+                      SmartDialog.showLoading(msg: 'loading');
                       await ctr.onRefresh();
                       SmartDialog.dismiss();
                     },

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: '快速收藏',

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/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 'widgets/switch_item.dart';
@@ -73,6 +74,12 @@ class _PlaySettingState extends State<PlaySetting> {
             title: Text('倍速设置', style: titleStyle),
             subtitle: Text('设置视频播放速度', style: subTitleStyle),
           ),
+          ListTile(
+            dense: false,
+            onTap: () => Get.toNamed('/playerGestureSet'),
+            title: Text('手势设置', style: titleStyle),
+            subtitle: Text('设置播放器手势', style: subTitleStyle),
+          ),
           const SetSwitchItem(
             title: '开启1080P',
             subTitle: '免登录查看1080P视频',
@@ -134,18 +141,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);
   }
@@ -102,6 +102,12 @@ class _StyleSettingState extends State<StyleSetting> {
             defaultVal: true,
             needReboot: true,
           ),
+          const SetSwitchItem(
+            title: '首页底栏背景渐变',
+            setKey: SettingBoxKey.enableGradientBg,
+            defaultVal: true,
+            needReboot: true,
+          ),
           ListTile(
             onTap: () async {
               int? result = await showDialog(
@@ -170,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('确定'),
                           )
@@ -258,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

@@ -90,6 +90,8 @@ class VideoDetailController extends GetxController
   late String cacheDecode;
   late int cacheAudioQa;
 
+  PersistentBottomSheetController? replyReplyBottomSheetCtr;
+
   @override
   void onInit() {
     super.onInit();
@@ -126,6 +128,7 @@ class VideoDetailController extends GetxController
       controller: plPlayerController,
       videoDetailCtr: this,
       floating: floating,
+      bvid: bvid,
     );
     // CDN优化
     enableCDN = setting.get(SettingBoxKey.enableCDN, defaultValue: true);
@@ -140,7 +143,7 @@ class VideoDetailController extends GetxController
   }
 
   showReplyReplyPanel() {
-    PersistentBottomSheetController? ctr =
+    replyReplyBottomSheetCtr =
         scaffoldKey.currentState?.showBottomSheet((BuildContext context) {
       return VideoReplyReplyPanel(
         oid: oid.value,
@@ -153,7 +156,7 @@ class VideoDetailController extends GetxController
         source: 'videoDetail',
       );
     });
-    ctr?.closed.then((value) {
+    replyReplyBottomSheetCtr?.closed.then((value) {
       fRpid = 0;
     });
   }
@@ -229,9 +232,11 @@ class VideoDetailController extends GetxController
       seekTo: seekToTime ?? defaultST,
       duration: duration ?? Duration(milliseconds: data.timeLength ?? 0),
       // 宽>高 水平 否则 垂直
-      direction: (firstVideo.width! - firstVideo.height!) > 0
+      direction: firstVideo.width != null && firstVideo.height != null
+          ? ((firstVideo.width! - firstVideo.height!) > 0
               ? 'horizontal'
-          : 'vertical',
+              : 'vertical')
+          : null,
       bvid: bvid,
       cid: cid.value,
       enableHeart: enableHeart,
@@ -248,6 +253,21 @@ class VideoDetailController extends GetxController
     var result = await VideoHttp.videoUrl(cid: cid.value, bvid: bvid);
     if (result['status']) {
       data = result['data'];
+      if (data.acceptDesc!.isNotEmpty && data.acceptDesc!.contains('试看')) {
+        SmartDialog.showToast(
+          '该视频为专属视频，仅提供试看',
+          displayTime: const Duration(seconds: 3),
+        );
+        videoUrl = data.durl!.first.url!;
+        audioUrl = '';
+        defaultST = Duration.zero;
+        firstVideo = VideoItem();
+        if (autoPlay.value) {
+          await playerInit();
+          isShowCover.value = false;
+        }
+        return result;
+      }
       final List<VideoItem> allVideosList = data.dash!.video!;
       try {
         // 当前可播放的最高质量视频
@@ -355,4 +375,11 @@ class VideoDetailController extends GetxController
     }
     return result;
   }
+
+  // mob端全屏状态关闭二级回复
+  hiddenReplyReplyPanel() {
+    replyReplyBottomSheetCtr != null
+        ? replyReplyBottomSheetCtr!.close()
+        : print('replyReplyBottomSheetCtr is null');
+  }
 }

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

@@ -18,11 +18,13 @@ import 'package:pilipala/utils/id_utils.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:share_plus/share_plus.dart';
 
+import '../related/index.dart';
 import 'widgets/group_panel.dart';
 
 class VideoIntroController extends GetxController {
+  VideoIntroController({required this.bvid});
   // 视频bvid
-  String bvid = Get.parameters['bvid']!;
+  String bvid;
 
   // 是否预渲染 骨架屏
   bool preRender = false;
@@ -304,11 +306,9 @@ class VideoIntroController extends GetxController {
         delIds: favStatus == 1 ? '$defaultFolderId' : '',
       );
       if (result['status']) {
-        if (result['data']['prompt']) {
         // 重新获取收藏状态
         await queryHasFavVideo();
         SmartDialog.showToast('✅ 操作成功');
-        }
       } else {
         SmartDialog.showToast(result['msg']);
       }
@@ -333,14 +333,12 @@ class VideoIntroController extends GetxController {
         delIds: delMediaIdsNew.join(','));
     SmartDialog.dismiss();
     if (result['status']) {
-      if (result['data']['prompt']) {
       addMediaIdsNew = [];
       delMediaIdsNew = [];
       Get.back();
       // 重新获取收藏状态
       await queryHasFavVideo();
       SmartDialog.showToast('✅ 操作成功');
-      }
     } else {
       SmartDialog.showToast(result['msg']);
     }
@@ -478,11 +476,15 @@ class VideoIntroController extends GetxController {
     // 重新获取视频资源
     final VideoDetailController videoDetailCtr =
         Get.find<VideoDetailController>(tag: heroTag);
+    final ReleatedController releatedCtr =
+        Get.find<ReleatedController>(tag: heroTag);
     videoDetailCtr.bvid = bvid;
-    videoDetailCtr.oid.value = aid;
+    videoDetailCtr.oid.value = aid ?? IdUtils.bv2av(bvid);
     videoDetailCtr.cid.value = cid;
     videoDetailCtr.danmakuCid.value = cid;
     videoDetailCtr.queryVideoUrl();
+    releatedCtr.bvid = bvid;
+    releatedCtr.queryRelatedVideo();
     // 重新请求评论
     try {
       /// 未渲染回复组件时可能异常

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

@@ -24,7 +24,10 @@ 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 +50,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;
@@ -77,6 +81,7 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
                 loadingStatus: false,
                 videoDetail: videoIntroController.videoDetail.value,
                 heroTag: heroTag,
+                bvid: widget.bvid,
               ),
             );
           } else {
@@ -95,6 +100,7 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
             loadingStatus: true,
             videoDetail: videoDetail,
             heroTag: heroTag,
+            bvid: widget.bvid,
           );
         }
       },
@@ -106,10 +112,15 @@ class VideoInfo extends StatefulWidget {
   final bool loadingStatus;
   final VideoDetailData? videoDetail;
   final String? heroTag;
+  final String bvid;
 
-  const VideoInfo(
+  const VideoInfo({
-      {Key? key, this.loadingStatus = false, this.videoDetail, this.heroTag})
+    Key? key,
-      : super(key: key);
+    this.loadingStatus = false,
+    this.videoDetail,
+    this.heroTag,
+    required this.bvid,
+  }) : super(key: key);
 
   @override
   State<VideoInfo> createState() => _VideoInfoState();
@@ -149,7 +160,8 @@ 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');

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

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

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

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

@@ -1,14 +1,22 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/http/video.dart';
+import '../../../../models/model_hot_video_item.dart';
 
 class ReleatedController extends GetxController {
   // 视频aid
   String bvid = Get.parameters['bvid'] ?? "";
   // 推荐视频列表
-  List relatedVideoList = [];
+  RxList relatedVideoList = <HotVideoItemModel>[].obs;
 
   OverlayEntry? popupDialog;
 
-  Future<dynamic> queryRelatedVideo() => VideoHttp.relatedVideoList(bvid: bvid);
+  Future<dynamic> queryRelatedVideo() async {
+    return VideoHttp.relatedVideoList(bvid: bvid).then((value) {
+      if (value['status']) {
+        relatedVideoList.value = value['data'];
+      }
+      return value;
+    });
+  }
 }

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

@@ -7,35 +7,58 @@ import 'package:pilipala/common/widgets/overlay_pop.dart';
 import 'package:pilipala/common/widgets/video_card_h.dart';
 import './controller.dart';
 
-class RelatedVideoPanel extends StatelessWidget {
+class RelatedVideoPanel extends StatefulWidget {
-  final ReleatedController _releatedController =
+  const RelatedVideoPanel({super.key});
+
+  @override
+  State<RelatedVideoPanel> createState() => _RelatedVideoPanelState();
+}
+
+class _RelatedVideoPanelState extends State<RelatedVideoPanel>
+    with AutomaticKeepAliveClientMixin {
+  late ReleatedController _releatedController;
+  late Future _futureBuilder;
+
+  @override
+  bool get wantKeepAlive => true;
+
+  @override
+  void initState() {
+    super.initState();
+    _releatedController =
         Get.put(ReleatedController(), tag: Get.arguments?['heroTag']);
-  RelatedVideoPanel({super.key});
+    _futureBuilder = _releatedController.queryRelatedVideo();
+  }
 
   @override
   Widget build(BuildContext context) {
+    super.build(context);
     return FutureBuilder(
-      future: _releatedController.queryRelatedVideo(),
+      future: _futureBuilder,
       builder: (BuildContext context, AsyncSnapshot snapshot) {
         if (snapshot.connectionState == ConnectionState.done) {
           if (snapshot.data == null) {
             return const SliverToBoxAdapter(child: SizedBox());
           }
-          if (snapshot.data!['status']) {
+          if (snapshot.data!['status'] && snapshot.data != null) {
+            RxList relatedVideoList = _releatedController.relatedVideoList;
             // 请求成功
-            return SliverList(
+            return Obx(
+              () => SliverList(
                 delegate: SliverChildBuilderDelegate((context, index) {
-              if (index == snapshot.data['data'].length) {
+                  if (index == relatedVideoList.length) {
-                return SizedBox(height: MediaQuery.of(context).padding.bottom);
+                    return SizedBox(
+                        height: MediaQuery.of(context).padding.bottom);
                   } else {
                     return Material(
                       child: VideoCardH(
-                    videoItem: snapshot.data['data'][index],
+                        videoItem: relatedVideoList[index],
                         showPubdate: true,
                         longPress: () {
                           try {
                             _releatedController.popupDialog =
-                            _createPopupDialog(snapshot.data['data'][index]);
+                                _createPopupDialog(_releatedController
+                                    .relatedVideoList[index]);
                             Overlay.of(context)
                                 .insert(_releatedController.popupDialog!);
                           } catch (err) {
@@ -48,7 +71,9 @@ class RelatedVideoPanel extends StatelessWidget {
                       ),
                     );
                   }
-            }, childCount: snapshot.data['data'].length + 1));
+                }, childCount: relatedVideoList.length + 1),
+              ),
+            );
           } else {
             // 请求错误
             return HttpError(errMsg: '出错了', fn: () {});

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

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

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

@@ -134,13 +134,13 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
     super.build(context);
     return RefreshIndicator(
       onRefresh: () async {
-        _videoReplyController.currentPage = 0;
+        return await _videoReplyController.queryReplyList(type: 'init');
-        return await _videoReplyController.queryReplyList();
       },
       child: Stack(
         children: [
           CustomScrollView(
             controller: scrollController,
+            physics: const AlwaysScrollableScrollPhysics(),
             key: const PageStorageKey<String>('评论'),
             slivers: <Widget>[
               SliverPersistentHeader(

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

@@ -12,6 +12,7 @@ import 'package:pilipala/pages/preview/index.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/pages/video/detail/reply_new/index.dart';
 import 'package:pilipala/utils/feed_back.dart';
+import 'package:pilipala/utils/id_utils.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/url_utils.dart';
 import 'package:pilipala/utils/utils.dart';
@@ -461,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 父级回复内容，用作二楼回复（回复详情）展示
@@ -502,20 +506,25 @@ 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) {
@@ -569,15 +578,19 @@ InlineSpan buildContent(
         spanChilds.add(
           TextSpan(
             text: ' $matchStr ',
-            style: TextStyle(
+            style: isVideoPage
+                ? TextStyle(
                     color: Theme.of(context).colorScheme.primary,
-            ),
+                  )
+                : null,
             recognizer: TapGestureRecognizer()
               ..onTap = () {
                 // 跳转到指定位置
+                if (isVideoPage) {
                   try {
                     SmartDialog.showToast('跳转至：$matchStr');
-                  Get.find<VideoDetailController>(tag: Get.arguments['heroTag'])
+                    Get.find<VideoDetailController>(
+                            tag: Get.arguments['heroTag'])
                         .plPlayerController
                         .seekTo(
                           Duration(seconds: Utils.duration(matchStr)),
@@ -585,11 +598,11 @@ InlineSpan buildContent(
                   } catch (e) {
                     SmartDialog.showToast('跳转失败: $e');
                   }
+                }
               },
           ),
         );
       } else {
-        // print("matchStr=$matchStr");
         String appUrlSchema = '';
         final bool enableWordRe = setting.get(SettingBoxKey.enableWordRe,
             defaultValue: false) as bool;
@@ -620,6 +633,13 @@ InlineSpan buildContent(
                   ..onTap = () async {
                     final String title = content.jumpUrl[matchStr]['title'];
                     if (appUrlSchema == '') {
+                      if (matchStr.startsWith('BV')) {
+                        UrlUtils.matchUrlPush(
+                          matchStr,
+                          title,
+                          '',
+                        );
+                      } else {
                         final String redirectUrl =
                             await UrlUtils.parseRedirectUrl(matchStr);
                         final String pathSegment = Uri.parse(redirectUrl).path;
@@ -641,6 +661,7 @@ InlineSpan buildContent(
                             },
                           );
                         }
+                      }
                     } else {
                       if (appUrlSchema.startsWith('bilibili://search')) {
                         Get.toNamed('/searchResult',
@@ -684,6 +705,23 @@ InlineSpan buildContent(
           );
           // 只显示一次
           matchedStrs.add(matchStr);
+        } else if (content
+                .topicsMeta[matchStr.substring(1, matchStr.length - 1)] !=
+            null) {
+          spanChilds.add(
+            TextSpan(
+              text: matchStr,
+              style: TextStyle(
+                color: Theme.of(context).colorScheme.primary,
+              ),
+              recognizer: TapGestureRecognizer()
+                ..onTap = () {
+                  final String topic =
+                      matchStr.substring(1, matchStr.length - 1);
+                  Get.toNamed('/searchResult', parameters: {'keyword': topic});
+                },
+            ),
+          );
         } else {
           addPlainTextSpan(matchStr);
         }

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(
+                ToolbarIconButton(
-                  width: 36,
-                  height: 36,
-                  child: IconButton(
                   onPressed: () {
-                      FocusScope.of(context)
+                    if (toolbarType == 'emote') {
-                          .requestFocus(replyContentFocusNode);
+                      setState(() {
+                        toolbarType = 'input';
+                      });
+                    }
+                    FocusScope.of(context).requestFocus(replyContentFocusNode);
                   },
-                    icon: Icon(Icons.keyboard,
+                  icon: const Icon(Icons.keyboard, size: 22),
-                        size: 22,
+                  toolbarType: toolbarType,
-                        color: Theme.of(context).colorScheme.onBackground),
+                  selected: toolbarType == 'input',
-                    highlightColor:
-                        Theme.of(context).colorScheme.onInverseSurface,
-                    style: ButtonStyle(
-                      padding: MaterialStateProperty.all(EdgeInsets.zero),
-                      backgroundColor:
-                          MaterialStateProperty.resolveWith((states) {
-                        return Theme.of(context).highlightColor;
-                      }),
-                    ),
                 ),
+                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;

lib/pages/video/detail/view.dart

@@ -5,6 +5,7 @@ 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';
@@ -23,7 +24,6 @@ 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';
 
@@ -58,9 +58,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   late bool autoExitFullcreen;
   late bool autoPlayEnable;
   late bool autoPiP;
-  final Floating floating = Floating();
+  late Floating floating;
-  // 生命周期监听
-  late final AppLifecycleListener _lifecycleListener;
   bool isShowing = true;
 
   @override
@@ -68,7 +66,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     super.initState();
     heroTag = Get.arguments['heroTag'];
     videoDetailController = Get.put(VideoDetailController(), tag: heroTag);
-    videoIntroController = Get.put(VideoIntroController(), tag: heroTag);
+    videoIntroController = Get.put(
+        VideoIntroController(bvid: Get.parameters['bvid']!),
+        tag: heroTag);
     videoIntroController.videoDetail.listen((value) {
       videoPlayerServiceHandler.onVideoDetailChange(
           value, videoDetailController.cid.value);
@@ -91,7 +91,11 @@ class _VideoDetailPageState extends State<VideoDetailPage>
 
     videoSourceInit();
     appbarStreamListen();
-    lifecycleListener();
+    fullScreenStatusListener();
+    if (Platform.isAndroid) {
+      floating = videoDetailController.floating!;
+      autoEnterPip();
+    }
   }
 
   // 获取视频资源，初始化播放器
@@ -149,6 +153,10 @@ class _VideoDetailPageState extends State<VideoDetailPage>
         }
       } catch (_) {}
     }
+    if (Platform.isAndroid) {
+      floating.toggleAutoPip(
+          autoEnter: status == PlayerStatus.playing && autoPiP);
+    }
   }
 
   // 继续播放或重新播放
@@ -167,25 +175,12 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     videoDetailController.isShowCover.value = false;
   }
 
-  // 生命周期监听
+  void fullScreenStatusListener() {
-  void lifecycleListener() {
+    plPlayerController?.isFullScreen.listen((bool isFullScreen) {
-    _lifecycleListener = AppLifecycleListener(
+      if (isFullScreen) {
-      onResume: () => _handleTransition('resume'),
+        videoDetailController.hiddenReplyReplyPanel();
-      // 后台
+      }
-      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);
-      },
-    );
   }
 
   @override
@@ -199,8 +194,10 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       videoDetailController.floating!.dispose();
     }
     videoPlayerServiceHandler.onVideoDetailDispose();
+    if (Platform.isAndroid) {
+      floating.toggleAutoPip(autoEnter: false);
       floating.dispose();
-    _lifecycleListener.dispose();
+    }
     super.dispose();
   }
 
@@ -225,7 +222,10 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   @override
   // 返回当前页面时
   void didPopNext() async {
+    if (plPlayerController != null &&
+        plPlayerController!.videoPlayerController != null) {
       setState(() => isShowing = true);
+    }
     videoDetailController.isFirstTime = false;
     final bool autoplay = autoPlayEnable;
     videoDetailController.playerInit(autoplay: autoplay);
@@ -250,29 +250,10 @@ class _VideoDetailPageState extends State<VideoDetailPage>
         .subscribe(this, ModalRoute.of(context)! as PageRoute);
   }
 
-  void _handleTransition(String name) {
-    switch (name) {
-      case 'inactive':
-        if (plPlayerController != null &&
-            playerStatus == PlayerStatus.playing) {
-          autoEnterPip();
-        }
-        break;
-    }
-  }
-
   void autoEnterPip() {
     final String routePath = Get.currentRoute;
-    final bool isPortrait =
+    if (autoPiP && routePath.startsWith('/video')) {
-        MediaQuery.of(context).orientation == Orientation.portrait;
+      floating.toggleAutoPip(autoEnter: autoPiP);
-
-    /// TODO 横屏全屏状态下误触pip
-    if (autoPiP && routePath.startsWith('/video') && isPortrait) {
-      floating.enable(
-          aspectRatio: Rational(
-        videoDetailController.data.dash!.video!.first.width!,
-        videoDetailController.data.dash!.video!.first.height!,
-      ));
     }
   }
 
@@ -392,7 +373,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                                           ),
                                               );
                                             } else {
-                                              return const SizedBox();
+                                              return buildCustomAppBar();
                                             }
                                           },
                                         ),
@@ -435,33 +416,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                                     top: 0,
                                                     left: 0,
                                                     right: 0,
-                                                    child: AppBar(
+                                                    child: buildCustomAppBar(),
-                                                      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,
@@ -538,7 +493,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                 slivers: <Widget>[
                                   if (videoDetailController.videoType ==
                                       SearchType.video) ...[
-                                    const VideoIntroPanel(),
+                                    VideoIntroPanel(
+                                        bvid: videoDetailController.bvid),
                                   ] else if (videoDetailController.videoType ==
                                       SearchType.media_bangumi) ...[
                                     Obx(() => BangumiIntroPanel(
@@ -565,7 +521,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                           .withOpacity(0.06),
                                     ),
                                   ),
-                                  RelatedVideoPanel(),
+                                  const RelatedVideoPanel(),
                                 ],
                               );
                             },
@@ -615,6 +571,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                     headerControl: HeaderControl(
                       controller: plPlayerController,
                       videoDetailCtr: videoDetailController,
+                      bvid: videoDetailController.bvid,
                     ),
                     danmuWidget: Obx(
                       () => PlDanmaku(
@@ -641,4 +598,48 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       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: videoDetailController.bvid);
+                SmartDialog.showToast(res['msg']);
+              },
+            ),
+          ],
+        ),
+      ),
+    );
+  }
 }

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

@@ -19,17 +19,21 @@ 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/video_detail_res.dart';
+import '../introduction/index.dart';
 
 class HeaderControl extends StatefulWidget implements PreferredSizeWidget {
   const HeaderControl({
     this.controller,
     this.videoDetailCtr,
     this.floating,
+    this.bvid,
     super.key,
   });
   final PlPlayerController? controller;
   final VideoDetailController? videoDetailCtr;
   final Floating? floating;
+  final String? bvid;
 
   @override
   State<HeaderControl> createState() => _HeaderControlState();
@@ -48,11 +52,32 @@ 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;
+      }
+      setState(() {});
+    });
   }
 
   /// 设置面板
@@ -342,8 +367,7 @@ class _HeaderControlState extends State<HeaderControl> {
                         },
                         dense: true,
                         contentPadding: const EdgeInsets.only(),
-                        title:
+                        title: const Text("额外等待视频播放完毕", style: titleStyle),
-                            const Text("额外等待视频播放完毕", style: titleStyle),
                         trailing: Switch(
                           // thumb color (round icon)
                           activeColor: Theme.of(context).colorScheme.primary,
@@ -1047,6 +1071,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,6 +1107,31 @@ class _HeaderControlState extends State<HeaderControl> {
             },
           ),
           SizedBox(width: buttonSpace),
+          if (showTitle && isLandscape) ...[
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                ConstrainedBox(
+                  constraints: 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,
@@ -1096,6 +1147,7 @@ class _HeaderControlState extends State<HeaderControl> {
                 }
               },
             ),
+          ],
           const Spacer(),
           // ComBtn(
           //   icon: const Icon(

lib/pages/webview/controller.dart

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

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