fix: 垂直布局视频卡片样式

.github/workflows/beta_ci.yml

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

change_log/1.0.20.0303.md

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

lib/common/widgets/network_img_layer.dart

@@ -2,7 +2,6 @@ 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';
 
@@ -33,10 +32,8 @@ class NetworkImgLayer extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final int defaultImgQuality = GlobalData().imgQuality;
     final String imageUrl =
-        '${src!.startsWith('//') ? 'https:${src!}' : src!}@${quality ?? defaultImgQuality}q.webp';
+        '${src!.startsWith('//') ? 'https:${src!}' : src!}@${quality ?? 100}q.webp';
-    print(imageUrl);
     int? memCacheWidth, memCacheHeight;
     double aspectRatio = (width / height).toDouble();
 
@@ -84,7 +81,7 @@ class NetworkImgLayer extends StatelessWidget {
                   fadeOutDuration ?? const Duration(milliseconds: 120),
               fadeInDuration:
                   fadeInDuration ?? const Duration(milliseconds: 120),
-              filterQuality: FilterQuality.low,
+              filterQuality: FilterQuality.high,
               errorWidget: (BuildContext context, String url, Object error) =>
                   placeholder(context),
               placeholder: (BuildContext context, String url) =>
@@ -107,9 +104,7 @@ class NetworkImgLayer extends StatelessWidget {
                 ? 0
                 : StyleString.imgRadius.x),
       ),
-      child: type == 'bg'
+      child: Center(
-          ? const SizedBox()
-          : Center(
         child: Image.asset(
           type == 'avatar'
               ? 'assets/images/noface.jpeg'

lib/common/widgets/video_card_v.dart

@@ -229,10 +229,7 @@ class VideoContent extends StatelessWidget {
             ),
             if (crossAxisCount > 1) ...[
               const SizedBox(height: 2),
-              VideoStat(
+              VideoStat(videoItem: videoItem, crossAxisCount: crossAxisCount),
-                videoItem: videoItem,
-                crossAxisCount: crossAxisCount,
-              ),
             ],
             if (crossAxisCount == 1) const SizedBox(height: 4),
             Row(
@@ -293,11 +290,14 @@ class VideoContent extends StatelessWidget {
                       color: Theme.of(context).colorScheme.outline,
                     ),
                   ),
-                  VideoStat(
+                  Expanded(
+                    flex: 1,
+                    child: VideoStat(
                       videoItem: videoItem,
                       crossAxisCount: crossAxisCount,
                     ),
-                  const Spacer(),
+                  ),
+                  // const Spacer(),
                 ],
                 if (videoItem.goto == 'av' && crossAxisCount != 1) ...[
                   VideoPopupMenu(

lib/http/api.dart

@@ -477,29 +477,4 @@ 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 userSubCancel = '/x/v3/fav/season/unfav';
-
-  /// 表情
-  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,9 +1,7 @@
 // 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';
@@ -13,7 +11,6 @@ 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';
 
@@ -27,7 +24,6 @@ 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 {
@@ -55,12 +51,13 @@ class Request {
     }
     setOptionsHeaders(userInfo, userInfo != null && userInfo.mid != null);
 
+    if (cookie.isEmpty) {
       try {
-      await buvidActivate();
+        await Request().get(HttpString.baseUrl);
       } catch (e) {
         log("setCookie, ${e.toString()}");
       }
-
+    }
     final String cookieString = cookie
         .map((Cookie cookie) => '${cookie.name}=${cookie.value}')
         .join('; ');
@@ -90,33 +87,6 @@ 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,8 +79,6 @@ 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,
@@ -90,11 +88,7 @@ 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,
@@ -107,13 +101,10 @@ class MemberHttp {
         'data': MemberArchiveDataModel.fromJson(res.data['data'])
       };
     } else {
-      Map errMap = {
-        -352: '风控校验失败，请检查登录状态',
-      };
       return {
         'status': false,
         'data': [],
-        'msg': errMap[res.data['code']] ?? res.data['message'],
+        'msg': res.data['message'],
       };
     }
   }
@@ -132,13 +123,10 @@ class MemberHttp {
         'data': DynamicsDataModel.fromJson(res.data['data']),
       };
     } else {
-      Map errMap = {
-        -352: '风控校验失败，请检查登录状态',
-      };
       return {
         'status': false,
         'data': [],
-        'msg': errMap[res.data['code']] ?? res.data['message'],
+        'msg': res.data['message'],
       };
     }
   }

lib/http/msg.dart

@@ -1,4 +1,3 @@
-import 'dart:math';
 import '../models/msg/account.dart';
 import '../models/msg/session.dart';
 import '../utils/wbi_sign.dart';
@@ -23,18 +22,10 @@ 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,
@@ -51,16 +42,12 @@ 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,
@@ -99,125 +86,4 @@ 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,5 +1,4 @@
 import '../models/video/reply/data.dart';
-import '../models/video/reply/emote.dart';
 import 'api.dart';
 import 'init.dart';
 
@@ -101,23 +100,4 @@ 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,8 +6,6 @@ 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';
 
@@ -307,63 +305,4 @@ 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']};
-    }
-  }
-
-  // 取消订阅
-  static Future userSubCancel({required int seasonId}) async {
-    var res = await Request().post(
-      Api.userSubCancel,
-      queryParameters: {
-        'season_id': seasonId,
-        'platform': 'web',
-        'csrf': await Request.getCsrf(),
-      },
-    );
-    if (res.data['code'] == 0) {
-      return {'status': true, 'msg': '取消订阅成功'};
-    } else {
-      return {'status': false, 'msg': res.data['message']};
-    }
-  }
 }

lib/models/common/gesture_mode.dart

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

lib/models/common/index.dart

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

lib/models/common/nav_bar_config.dart

@@ -1,43 +0,0 @@
-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,28 +2,18 @@ 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;
   }
 }
 
@@ -103,21 +93,3 @@ 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/member/archive.dart

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

lib/models/msg/session.dart

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

@@ -1,123 +0,0 @@
-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

@@ -1,111 +0,0 @@
-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,7 +34,6 @@ class PlayUrlModel {
   String? seekParam;
   String? seekType;
   Dash? dash;
-  List<Durl>? durl;
   List<FormatItem>? supportFormats;
   // String? highFormat;
   int? lastPlayTime;
@@ -53,8 +52,7 @@ class PlayUrlModel {
     videoCodecid = json['video_codecid'];
     seekParam = json['seek_param'];
     seekType = json['seek_type'];
-    dash = json['dash'] != null ? Dash.fromJson(json['dash']) : null;
+    dash = Dash.fromJson(json['dash']);
-    durl = json['durl']?.map<Durl>((e) => Durl.fromJson(e)).toList();
     supportFormats = json['support_formats'] != null
         ? json['support_formats']
             .map<FormatItem>((e) => FormatItem.fromJson(e))
@@ -252,30 +250,3 @@ 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,7 +9,6 @@ class ReplyContent {
     this.vote,
     this.richText,
     this.isText,
-    this.topicsMeta,
   });
 
   String? message;
@@ -21,7 +20,6 @@ class ReplyContent {
   Map? vote;
   Map? richText;
   bool? isText;
-  Map? topicsMeta;
 
   ReplyContent.fromJson(Map<String, dynamic> json) {
     message = json['message']
@@ -41,7 +39,6 @@ class ReplyContent {
     richText = json['rich_text'] ?? {};
     // 不包含@ 笔记 图片的时候，文字可折叠
     isText = atNameToMid!.isEmpty && vote!.isEmpty && pictures!.isEmpty;
-    topicsMeta = json['topics_meta'] ?? {};
   }
 }
 

lib/models/video/reply/emote.dart

@@ -1,120 +0,0 @@
-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,54 +53,29 @@ 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(
-              () => Badge(
+              () => ListTile(
-                isLabelVisible: _aboutController.isLoading.value
+                title: const Text('当前版本'),
-                    ? false
+                trailing: Text(_aboutController.currentVersion.value,
-                    : _aboutController.isUpdate.value,
+                    style: subTitleStyle),
-                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,
                 ),
               ),
             ),
@@ -112,9 +87,14 @@ 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('开源地址'),
+              title: const Text('Github'),
               trailing: Text(
                 'github.com/guozhigq/pilipala',
                 style: subTitleStyle,
@@ -148,44 +128,20 @@ 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: Text(
-                            '616150809',
-                            style: subTitleStyle,
-                          ),
-                        ),
-                        ListTile(
-                          onTap: () => _aboutController.tgChanel(),
-                          title: const Text('TG频道'),
-                          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.tgChanel(),
+              title: const Text('TG频道'),
+              trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline),
+            ),
             ListTile(
               onTap: () => _aboutController.aPay(),
               title: const Text('赞助'),
@@ -201,13 +157,12 @@ 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)
           ],
         ),
       ),
@@ -275,26 +230,11 @@ class AboutController extends GetxController {
     );
   }
 
-  githubRelease() {
-    launchUrl(
-      Uri.parse('https://github.com/guozhigq/pilipala/release'),
-      mode: LaunchMode.externalApplication,
-    );
-  }
-
   // 从网盘下载
   panDownload() {
-    Clipboard.setData(
+    launchUrl(
-      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,
-      ),
     );
   }
 
@@ -310,7 +250,7 @@ class AboutController extends GetxController {
   // qq频道
   qqChanel() {
     Clipboard.setData(
-      const ClipboardData(text: '616150809'),
+      const ClipboardData(text: '489981949'),
     );
     SmartDialog.showToast('已复制QQ群号');
   }
@@ -351,13 +291,6 @@ 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,12 +218,14 @@ 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/widgets/bangumi_panel.dart

@@ -65,45 +65,6 @@ 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,
@@ -145,21 +106,37 @@ class _BangumiPanelState extends State<BangumiPanel> {
                     child: Material(
                       child: ScrollablePositionedList.builder(
                         itemCount: widget.pages.length,
-                        itemBuilder: (BuildContext context, int index) {
+                        itemBuilder: (BuildContext context, int index) =>
-                          bool isLastItem = index == widget.pages.length - 1;
+                            ListTile(
-                          bool isCurrentIndex = currentIndex == index;
+                          onTap: () {
-                          return isLastItem
+                            setState(() {
-                              ? SizedBox(
+                              changeFucCall(widget.pages[index], index);
-                                  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 = <UpItem>[];
+      upData.value.upList = [];
-      upData.value.liveList = <LiveUserItem>[];
+      upData.value.liveUsers = LiveUsers();
     }
     var res = await DynamicsHttp.followUp();
     if (res['status']) {
@@ -258,23 +258,20 @@ 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();
   }
@@ -296,7 +293,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/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,9 +45,7 @@ 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,17 +19,6 @@ 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,14 +1,16 @@
 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
@@ -22,22 +24,38 @@ class _UpPanelState extends State<UpPanel> {
   List<UpItem> upList = [];
   List<LiveUserItem> liveList = [];
   static const itemPadding = EdgeInsets.symmetric(horizontal: 5, vertical: 0);
-  late MyInfo userInfo;
+  Box userInfoCache = GStrorage.userInfo;
+  var userInfo;
 
-  void listFormat() {
+  @override
-    userInfo = widget.upData.myInfo!;
+  void initState() {
-    upList = widget.upData.upList!;
+    super.initState();
-    liveList = widget.upData.liveList!;
+    upList = widget.upData!.upList!;
+    if (widget.upData!.liveUsers != null) {
+      liveList = widget.upData!.liveUsers!.items!;
+    }
+    upList.insert(
+      0,
+      UpItem(face: '', uname: '全部动态', mid: -1),
+    );
+    userInfo = userInfoCache.get('userInfoCache');
+    upList.insert(
+      1,
+      UpItem(
+        face: userInfo.face,
+        uname: '我',
+        mid: userInfo.mid,
+      ),
+    );
   }
 
   @override
   Widget build(BuildContext context) {
-    listFormat();
     return SliverPersistentHeader(
       floating: true,
       pinned: false,
       delegate: _SliverHeaderDelegate(
-          height: liveList.isNotEmpty || upList.isNotEmpty ? 126 : 0,
+          height: 126,
           child: Column(
             mainAxisAlignment: MainAxisAlignment.start,
             crossAxisAlignment: CrossAxisAlignment.start,
@@ -72,7 +90,7 @@ class _UpPanelState extends State<UpPanel> {
                 color: Theme.of(context).colorScheme.background,
                 child: Row(
                   children: [
-                    Flexible(
+                    Expanded(
                       child: ListView(
                         scrollDirection: Axis.horizontal,
                         controller: scrollController,

lib/pages/emote/controller.dart

@@ -1,20 +0,0 @@
-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

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

lib/pages/emote/view.dart

@@ -1,116 +0,0 @@
-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 UserHttp.userfavFolder(
+    var res = await 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 UserHttp.userFavFolderDetail(
+    var res = await await UserHttp.userFavFolderDetail(
       pn: currentPage,
       ps: 20,
       mediaId: mediaId!,
@@ -60,6 +60,7 @@ 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) {
@@ -70,6 +71,7 @@ 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();
-    mediaId = Get.parameters['mediaId']!;
     _futureBuilderFuture = _favDetailController.queryUserFavFolderDetail();
+    mediaId = Get.parameters['mediaId']!;
     titleStreamC = StreamController<bool>();
     _controller.addListener(
       () {

lib/pages/fav_search/controller.dart

@@ -80,6 +80,7 @@ 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,3 +92,4 @@ class FavSearchController extends GetxController {
       }
     }
   }
+}

lib/pages/history/view.dart

@@ -70,6 +70,10 @@ 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,7 +26,6 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
   late List defaultTabs;
   late List<String> tabbarSort;
   RxString defaultSearch = ''.obs;
-  late bool enableGradientBg;
 
   @override
   void onInit() {
@@ -41,8 +40,6 @@ 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,23 +48,17 @@ 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(
@@ -75,14 +69,8 @@ class _HomePageState extends State<HomePage>
                 decoration: BoxDecoration(
                   gradient: LinearGradient(
                       colors: [
-                          Theme.of(context)
+                        Theme.of(context).colorScheme.primary.withOpacity(0.9),
-                              .colorScheme
+                        Theme.of(context).colorScheme.primary.withOpacity(0.5),
-                              .primary
-                              .withOpacity(0.9),
-                          Theme.of(context)
-                              .colorScheme
-                              .primary
-                              .withOpacity(0.5),
                         Theme.of(context).colorScheme.surface
                       ],
                       begin: Alignment.topLeft,
@@ -92,7 +80,6 @@ class _HomePageState extends State<HomePage>
               ),
             ),
           ),
-          ],
           Column(
             children: [
               CustomAppBar(
@@ -103,37 +90,7 @@ 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),
               ],
@@ -415,16 +372,13 @@ class SearchBar extends StatelessWidget {
                 ),
                 const SizedBox(width: 10),
                 Obx(
-                  () => Expanded(
+                  () => Text(
-                    child: Text(
                     ctr!.defaultSearch.value,
                     maxLines: 1,
                     overflow: TextOverflow.ellipsis,
                     style: TextStyle(color: colorScheme.outline),
                   ),
                 ),
-                ),
-                const SizedBox(width: 15),
               ],
             ),
           ),

lib/pages/hot/controller.dart

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

lib/pages/live_room/controller.dart

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

lib/pages/live_room/view.dart

@@ -75,43 +75,39 @@ class _LiveRoomPageState extends State<LiveRoomPage> {
       backgroundColor: Colors.black,
       body: Stack(
         children: [
-          Positioned(
+          // Obx(
-            left: 0,
+          //   () => Positioned.fill(
-            right: 0,
+          //     child: Opacity(
-            bottom: 0,
+          //       opacity: 0.8,
+          //       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,7 +12,6 @@ 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>[
@@ -20,7 +19,44 @@ class MainController extends GetxController {
     const DynamicsPage(),
     const MediaPage(),
   ];
-  RxList navigationBars = defaultNavigationBars.obs;
+  RxList navigationBars = [
+    {
+      'icon': const Icon(
+        Icons.home_outlined,
+        size: 21,
+      ),
+      'selectIcon': const Icon(
+        Icons.home,
+        size: 21,
+      ),
+      'label': "首页",
+      'count': 0,
+    },
+    {
+      'icon': const Icon(
+        Icons.motion_photos_on_outlined,
+        size: 21,
+      ),
+      'selectIcon': const Icon(
+        Icons.motion_photos_on,
+        size: 21,
+      ),
+      'label': "动态",
+      'count': 0,
+    },
+    {
+      'icon': const Icon(
+        Icons.video_collection_outlined,
+        size: 20,
+      ),
+      'selectIcon': const Icon(
+        Icons.video_collection,
+        size: 21,
+      ),
+      'label': "媒体库",
+      'count': 0,
+    }
+  ].obs;
   final StreamController<bool> bottomBarStream =
       StreamController<bool>.broadcast();
   Box setting = GStrorage.setting;
@@ -39,10 +75,6 @@ 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,11 +28,6 @@ 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,7 +3,6 @@ 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 {
@@ -87,16 +86,10 @@ class _MemberArchivePageState extends State<MemberArchivePage> {
                           : const SliverToBoxAdapter(),
                     );
                   } else {
-                    return HttpError(
+                    return const SliverToBoxAdapter();
-                      errMsg: snapshot.data['msg'],
-                      fn: () {},
-                    );
                   }
                 } else {
-                  return HttpError(
+                  return const SliverToBoxAdapter();
-                    errMsg: snapshot.data['msg'],
-                    fn: () {},
-                  );
                 }
               } else {
                 return const SliverToBoxAdapter();

lib/pages/member_dynamics/view.dart

@@ -4,7 +4,6 @@ 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 {
@@ -81,16 +80,10 @@ class _MemberDynamicsPageState extends State<MemberDynamicsPage> {
                           : const SliverToBoxAdapter(),
                     );
                   } else {
-                    return HttpError(
+                    return const SliverToBoxAdapter();
-                      errMsg: snapshot.data['msg'],
-                      fn: () {},
-                    );
                   }
                 } else {
-                  return HttpError(
+                  return const SliverToBoxAdapter();
-                    errMsg: snapshot.data['msg'],
-                    fn: () {},
-                  );
                 }
               } else {
                 return const SliverToBoxAdapter();

lib/pages/preview/view.dart

@@ -135,14 +135,25 @@ class _ImagePreviewState extends State<ImagePreview>
       ),
       body: Stack(
         children: [
-          GestureDetector(
+          DismissiblePage(
+            backgroundColor: Colors.transparent,
+            onDismissed: () {
+              Navigator.of(context).pop();
+            },
+            // Note that scrollable widget inside DismissiblePage might limit the functionality
+            // If scroll direction matches DismissiblePage direction
+            direction: DismissiblePageDismissDirection.down,
+            disabled: _dismissDisabled,
+            isFullScreen: true,
+            child: GestureDetector(
               onLongPress: () => onOpenMenu(),
               child: ExtendedImageGesturePageView.builder(
                 controller: ExtendedPageController(
                   initialPage: _previewController.initialPage.value,
                   pageSpacing: 0,
                 ),
-              onPageChanged: (int index) => _previewController.onChange(index),
+                onPageChanged: (int index) =>
+                    _previewController.onChange(index),
                 canScrollPage: (GestureDetails? gestureDetails) =>
                     gestureDetails!.totalScale! <= 1.0,
                 itemCount: widget.imgList!.length,
@@ -234,14 +245,13 @@ 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(
@@ -254,34 +264,20 @@ class _ImagePreviewState extends State<ImagePreview>
                   tileMode: TileMode.mirror,
                 ),
               ),
-                child: Row(
+              child: Obx(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    widget.imgList!.length > 1
-                        ? Obx(
                 () => Text.rich(
                   textAlign: TextAlign.center,
                   TextSpan(
-                                  style: const TextStyle(
+                      style: const TextStyle(color: Colors.white, fontSize: 15),
-                                      color: Colors.white, fontSize: 16),
                       children: [
                         TextSpan(
-                                        text: _previewController.currentPage
+                            text: _previewController.currentPage.toString()),
-                                            .toString()),
                         const TextSpan(text: ' / '),
-                                    TextSpan(
+                        TextSpan(text: widget.imgList!.length.toString()),
-                                        text:
-                                            widget.imgList!.length.toString()),
                       ]),
                 ),
-                          )
-                        : const SizedBox(),
-                    IconButton(
-                      onPressed: () => Get.back(),
-                      icon: const Icon(Icons.close, color: Colors.white),
               ),
-                  ],
+            ),
-                )),
           ),
         ],
       ),

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

@@ -8,7 +8,6 @@ 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';
 
@@ -24,7 +23,6 @@ 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() {
@@ -42,8 +40,6 @@ 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 {
@@ -114,24 +110,4 @@ 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,13 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
-import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/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 {
@@ -140,20 +138,18 @@ class _ExtraSettingState extends State<ExtraSetting> {
       ),
       body: ListView(
         children: [
-          const SetSwitchItem(
+          SetSwitchItem(
             title: '大家都在搜',
             subTitle: '是否展示「大家都在搜」',
             setKey: SettingBoxKey.enableHotKey,
             defaultVal: true,
+            callFn: (val) => {SmartDialog.showToast('下次启动时生效')},
           ),
-          SetSwitchItem(
+          const 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,6 +40,10 @@ 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

@@ -1,88 +0,0 @@
-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,7 +7,6 @@ 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';
@@ -74,12 +73,6 @@ 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视频',
@@ -141,20 +134,18 @@ 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,11 +8,9 @@ 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';
 
@@ -30,6 +28,7 @@ class _StyleSettingState extends State<StyleSetting> {
 
   Box setting = GStrorage.setting;
   late int picQuality;
+  late double toastOpacity;
   late ThemeType _tempThemeValue;
   late dynamic defaultCustomRows;
 
@@ -37,6 +36,7 @@ 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,12 +102,6 @@ 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(
@@ -176,8 +170,6 @@ class _StyleSettingState extends State<StyleSetting> {
                                   SettingBoxKey.defaultPicQa, picQuality);
                               Get.back();
                               settingController.picQuality.value = picQuality;
-                              GlobalData().imgQuality = picQuality;
-                              SmartDialog.showToast('设置成功');
                             },
                             child: const Text('确定'),
                           )
@@ -266,14 +258,6 @@ 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

@@ -1,86 +0,0 @@
-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');
-  }
-
-  // 取消订阅
-  Future<dynamic> cancelSub({required int id}) async {
-    showDialog(
-      context: Get.context!,
-      builder: (context) {
-        return AlertDialog(
-          title: const Text('提示'),
-          content: const Text('确认要取消订阅吗?'),
-          actions: [
-            TextButton(
-                onPressed: () => Get.back(),
-                child: Text(
-                  '取消',
-                  style:
-                      TextStyle(color: Theme.of(context).colorScheme.outline),
-                )),
-            TextButton(
-              onPressed: () async {
-                Get.back();
-                var res = await UserHttp.userSubCancel(seasonId: id);
-                if (res['status']) {
-                  SmartDialog.showToast('取消订阅成功');
-                  subFolderData.value.list!
-                      .removeWhere((element) => element.id == id);
-                  subFolderData.update((val) {});
-                } else {
-                  SmartDialog.showToast(res['msg']);
-                }
-              },
-              child: const Text('确认'),
-            )
-          ],
-        );
-      },
-    );
-  }
-}

lib/pages/subscription/index.dart

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

lib/pages/subscription/view.dart

@@ -1,91 +0,0 @@
-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],
-                      fuc: () {
-                        _subController.cancelSub(
-                          id: _subController
-                              .subFolderData.value.list![index].id!,
-                        );
-                      },
-                    );
-                  },
-                ),
-              );
-            } else {
-              return CustomScrollView(
-                physics: const NeverScrollableScrollPhysics(),
-                slivers: [
-                  HttpError(
-                    errMsg: data?['msg'],
-                    fn: () => setState(() {}),
-                  ),
-                ],
-              );
-            }
-          } else {
-            // 骨架屏
-            return const Text('请求中');
-          }
-        },
-      ),
-    );
-  }
-}

lib/pages/subscription/widgets/item.dart

@@ -1,125 +0,0 @@
-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;
-  final Function fuc;
-  const SubItem({super.key, required this.subFolderItem, required this.fuc});
-
-  @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, fuc: fuc)
-                ],
-              ),
-            );
-          },
-        ),
-      ),
-    );
-  }
-}
-
-class VideoContent extends StatelessWidget {
-  final SubFolderItemData subFolderItem;
-  final Function fuc;
-  const VideoContent(
-      {super.key, required this.subFolderItem, required this.fuc});
-
-  @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,
-              ),
-            ),
-            const Spacer(),
-            SizedBox(
-              height: 34,
-              child: TextButton(
-                onPressed: () => fuc(),
-                style: TextButton.styleFrom(
-                  padding: const EdgeInsets.fromLTRB(15, 0, 15, 0),
-                  foregroundColor: Theme.of(context).colorScheme.outline,
-                  backgroundColor:
-                      Theme.of(context).colorScheme.onInverseSurface, // 设置按钮背景色
-                ),
-                child: const Text('取消订阅'),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

lib/pages/subscription_detail/controller.dart

@@ -1,60 +0,0 @@
-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

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

lib/pages/subscription_detail/view.dart

@@ -1,257 +0,0 @@
-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

@@ -1,168 +0,0 @@
-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,8 +90,6 @@ class VideoDetailController extends GetxController
   late String cacheDecode;
   late int cacheAudioQa;
 
-  PersistentBottomSheetController? replyReplyBottomSheetCtr;
-
   @override
   void onInit() {
     super.onInit();
@@ -128,7 +126,6 @@ class VideoDetailController extends GetxController
       controller: plPlayerController,
       videoDetailCtr: this,
       floating: floating,
-      bvid: bvid,
     );
     // CDN优化
     enableCDN = setting.get(SettingBoxKey.enableCDN, defaultValue: true);
@@ -143,7 +140,7 @@ class VideoDetailController extends GetxController
   }
 
   showReplyReplyPanel() {
-    replyReplyBottomSheetCtr =
+    PersistentBottomSheetController? ctr =
         scaffoldKey.currentState?.showBottomSheet((BuildContext context) {
       return VideoReplyReplyPanel(
         oid: oid.value,
@@ -156,7 +153,7 @@ class VideoDetailController extends GetxController
         source: 'videoDetail',
       );
     });
-    replyReplyBottomSheetCtr?.closed.then((value) {
+    ctr?.closed.then((value) {
       fRpid = 0;
     });
   }
@@ -232,11 +229,9 @@ class VideoDetailController extends GetxController
       seekTo: seekToTime ?? defaultST,
       duration: duration ?? Duration(milliseconds: data.timeLength ?? 0),
       // 宽>高 水平 否则 垂直
-      direction: firstVideo.width != null && firstVideo.height != null
+      direction: (firstVideo.width! - firstVideo.height!) > 0
-          ? ((firstVideo.width! - firstVideo.height!) > 0
           ? 'horizontal'
-              : 'vertical')
+          : 'vertical',
-          : null,
       bvid: bvid,
       cid: cid.value,
       enableHeart: enableHeart,
@@ -253,21 +248,6 @@ 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 {
         // 当前可播放的最高质量视频
@@ -375,11 +355,4 @@ class VideoDetailController extends GetxController
     }
     return result;
   }
-
-  // mob端全屏状态关闭二级回复
-  hiddenReplyReplyPanel() {
-    replyReplyBottomSheetCtr != null
-        ? replyReplyBottomSheetCtr!.close()
-        : print('replyReplyBottomSheetCtr is null');
-  }
 }

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

@@ -22,9 +22,8 @@ import '../related/index.dart';
 import 'widgets/group_panel.dart';
 
 class VideoIntroController extends GetxController {
-  VideoIntroController({required this.bvid});
   // 视频bvid
-  String bvid;
+  String bvid = Get.parameters['bvid']!;
 
   // 是否预渲染 骨架屏
   bool preRender = false;
@@ -306,9 +305,11 @@ 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,12 +334,14 @@ 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']);
     }
@@ -479,7 +482,7 @@ class VideoIntroController extends GetxController {
     final ReleatedController releatedCtr =
         Get.find<ReleatedController>(tag: heroTag);
     videoDetailCtr.bvid = bvid;
-    videoDetailCtr.oid.value = aid ?? IdUtils.bv2av(bvid);
+    videoDetailCtr.oid.value = aid;
     videoDetailCtr.cid.value = cid;
     videoDetailCtr.danmakuCid.value = cid;
     videoDetailCtr.queryVideoUrl();

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

@@ -24,10 +24,7 @@ import 'widgets/page.dart';
 import 'widgets/season.dart';
 
 class VideoIntroPanel extends StatefulWidget {
-  final String bvid;
+  const VideoIntroPanel({super.key});
-  final String? cid;
-
-  const VideoIntroPanel({super.key, required this.bvid, this.cid});
 
   @override
   State<VideoIntroPanel> createState() => _VideoIntroPanelState();
@@ -50,8 +47,7 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
 
     /// fix 全屏时参数丢失
     heroTag = Get.arguments['heroTag'];
-    videoIntroController =
+    videoIntroController = Get.put(VideoIntroController(), tag: heroTag);
-        Get.put(VideoIntroController(bvid: widget.bvid), tag: heroTag);
     _futureBuilderFuture = videoIntroController.queryVideoIntro();
     videoIntroController.videoDetail.listen((value) {
       videoDetail = value;
@@ -81,7 +77,6 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
                 loadingStatus: false,
                 videoDetail: videoIntroController.videoDetail.value,
                 heroTag: heroTag,
-                bvid: widget.bvid,
               ),
             );
           } else {
@@ -100,7 +95,6 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
             loadingStatus: true,
             videoDetail: videoDetail,
             heroTag: heroTag,
-            bvid: widget.bvid,
           );
         }
       },
@@ -112,15 +106,10 @@ class VideoInfo extends StatefulWidget {
   final bool loadingStatus;
   final VideoDetailData? videoDetail;
   final String? heroTag;
-  final String bvid;
 
-  const VideoInfo({
+  const VideoInfo(
-    Key? key,
+      {Key? key, this.loadingStatus = false, this.videoDetail, this.heroTag})
-    this.loadingStatus = false,
+      : super(key: key);
-    this.videoDetail,
-    this.heroTag,
-    required this.bvid,
-  }) : super(key: key);
 
   @override
   State<VideoInfo> createState() => _VideoInfoState();
@@ -160,8 +149,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
   void initState() {
     super.initState();
     heroTag = widget.heroTag!;
-    videoIntroController =
+    videoIntroController = Get.put(VideoIntroController(), tag: heroTag);
-        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,37 +56,6 @@ 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(
@@ -162,24 +131,38 @@ class _PagesPanelState extends State<PagesPanel> {
                                   child: Material(
                                     child: ListView.builder(
                                       controller: _scrollController,
-                                      itemCount: episodes.length + 1,
+                                      itemCount: episodes.length,
                                       itemBuilder:
                                           (BuildContext context, int index) {
-                                        bool isLastItem =
+                                        return ListTile(
-                                            index == episodes.length;
+                                          onTap: () {
-                                        bool isCurrentIndex =
+                                            changeFucCall(
-                                            currentIndex == index;
+                                                episodes[index], index);
-                                        return isLastItem
+                                            Get.back();
-                                            ? SizedBox(
+                                          },
-                                                height: MediaQuery.of(context)
+                                          dense: false,
-                                                        .padding
+                                          leading: index == currentIndex
-                                                        .bottom +
+                                              ? Image.asset(
-                                                    20,
+                                                  'assets/images/live.gif',
+                                                  color: Theme.of(context)
+                                                      .colorScheme
+                                                      .primary,
+                                                  height: 12,
                                                 )
-                                            : buildEpisodeListItem(
+                                              : null,
-                                                episodes[index],
+                                          title: Text(
-                                                index,
+                                            episodes[index].pagePart!,
-                                                isCurrentIndex,
+                                            style: TextStyle(
+                                              fontSize: 14,
+                                              color: index == currentIndex
+                                                  ? Theme.of(context)
+                                                      .colorScheme
+                                                      .primary
+                                                  : Theme.of(context)
+                                                      .colorScheme
+                                                      .onSurface,
+                                            ),
+                                          ),
                                         );
                                       },
                                     ),
@@ -209,7 +192,6 @@ 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),
@@ -224,7 +206,7 @@ class _PagesPanelState extends State<PagesPanel> {
                           vertical: 8, horizontal: 8),
                       child: Row(
                         children: <Widget>[
-                          if (isCurrentIndex) ...<Widget>[
+                          if (i == currentIndex) ...<Widget>[
                             Image.asset(
                               'assets/images/live.gif',
                               color: Theme.of(context).colorScheme.primary,
@@ -238,7 +220,7 @@ class _PagesPanelState extends State<PagesPanel> {
                             maxLines: 1,
                             style: TextStyle(
                                 fontSize: 13,
-                                color: isCurrentIndex
+                                color: i == currentIndex
                                     ? Theme.of(context).colorScheme.primary
                                     : Theme.of(context).colorScheme.onSurface),
                             overflow: TextOverflow.ellipsis,

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

@@ -80,34 +80,6 @@ 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) {
@@ -162,22 +134,32 @@ class _SeasonPanelState extends State<SeasonPanel> {
                           child: Material(
                             child: ScrollablePositionedList.builder(
                               itemCount: episodes.length,
-                              itemBuilder: (BuildContext context, int index) {
+                              itemBuilder: (BuildContext context, int index) =>
-                                bool isLastItem = index == episodes.length - 1;
+                                  ListTile(
-                                bool isCurrentIndex = currentIndex == index;
+                                onTap: () =>
-                                return isLastItem
+                                    changeFucCall(episodes[index], index),
-                                    ? 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,
                                       )
-                                    : buildEpisodeListItem(
+                                    : null,
-                                        episodes[index],
+                                title: Text(
-                                        index,
+                                  episodes[index].title!,
-                                        isCurrentIndex,
+                                  style: TextStyle(
-                                      );
+                                    fontSize: 14,
-                              },
+                                    color: index == currentIndex
+                                        ? Theme.of(context).colorScheme.primary
+                                        : Theme.of(context)
+                                            .colorScheme
+                                            .onSurface,
+                                  ),
+                                ),
+                              ),
                               itemScrollController: itemScrollController,
                             ),
                           ),

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

@@ -22,7 +22,7 @@ class VideoReplyController extends GetxController {
   String? replyLevel;
   // rpid 请求楼中楼回复
   String? rpid;
-  RxList<ReplyItemModel> replyList = <ReplyItemModel>[].obs;
+  RxList<ReplyItemModel> replyList = [ReplyItemModel()].obs;
   // 当前页
   int currentPage = 0;
   bool isLoadingMore = false;
@@ -62,7 +62,6 @@ 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 {
-        return await _videoReplyController.queryReplyList(type: 'init');
+        _videoReplyController.currentPage = 0;
+        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,7 +12,6 @@ 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';
@@ -462,9 +461,6 @@ class ReplyItemRow extends StatelessWidget {
 
 InlineSpan buildContent(
     BuildContext context, replyItem, replyReply, fReplyItem) {
-  final String routePath = Get.currentRoute;
-  bool isVideoPage = routePath.startsWith('/video');
-
   // replyItem 当前回复内容
   // replyReply 查看二楼回复（回复详情）回调
   // fReplyItem 父级回复内容，用作二楼回复（回复详情）展示
@@ -506,25 +502,20 @@ 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) {
@@ -578,19 +569,15 @@ InlineSpan buildContent(
         spanChilds.add(
           TextSpan(
             text: ' $matchStr ',
-            style: isVideoPage
+            style: TextStyle(
-                ? TextStyle(
               color: Theme.of(context).colorScheme.primary,
-                  )
+            ),
-                : null,
             recognizer: TapGestureRecognizer()
               ..onTap = () {
                 // 跳转到指定位置
-                if (isVideoPage) {
                 try {
                   SmartDialog.showToast('跳转至：$matchStr');
-                    Get.find<VideoDetailController>(
+                  Get.find<VideoDetailController>(tag: Get.arguments['heroTag'])
-                            tag: Get.arguments['heroTag'])
                       .plPlayerController
                       .seekTo(
                         Duration(seconds: Utils.duration(matchStr)),
@@ -598,11 +585,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;
@@ -633,13 +620,6 @@ 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;
@@ -661,7 +641,6 @@ InlineSpan buildContent(
                           },
                         );
                       }
-                      }
                     } else {
                       if (appUrlSchema.startsWith('bilibili://search')) {
                         Get.toNamed('/searchResult',
@@ -705,23 +684,6 @@ 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

@@ -1,40 +0,0 @@
-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,13 +4,9 @@ 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;
@@ -36,10 +32,6 @@ 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() {
@@ -50,8 +42,6 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
     WidgetsBinding.instance.addObserver(this);
     // 自动聚焦
     _autoFocus();
-    // 监听聚焦状态
-    _focuslistener();
   }
 
   _autoFocus() async {
@@ -61,16 +51,6 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
     }
   }
 
-  _focuslistener() {
-    replyContentFocusNode.addListener(() {
-      if (replyContentFocusNode.hasFocus) {
-        setState(() {
-          toolbarType = 'input';
-        });
-      }
-    });
-  }
-
   Future submitReplyAdd() async {
     feedBack();
     String message = _replyContentController.text;
@@ -93,50 +73,10 @@ 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();
   }
 
@@ -197,32 +137,27 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
             child: Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
-                ToolbarIconButton(
+                SizedBox(
+                  width: 36,
+                  height: 36,
+                  child: IconButton(
                     onPressed: () {
-                    if (toolbarType == 'emote') {
+                      FocusScope.of(context)
-                      setState(() {
+                          .requestFocus(replyContentFocusNode);
-                        toolbarType = 'input';
-                      });
-                    }
-                    FocusScope.of(context).requestFocus(replyContentFocusNode);
                     },
-                  icon: const Icon(Icons.keyboard, size: 22),
+                    icon: Icon(Icons.keyboard,
-                  toolbarType: toolbarType,
+                        size: 22,
-                  selected: toolbarType == 'input',
+                        color: Theme.of(context).colorScheme.onBackground),
+                    highlightColor:
+                        Theme.of(context).colorScheme.onInverseSurface,
+                    style: ButtonStyle(
+                      padding: MaterialStateProperty.all(EdgeInsets.zero),
+                      backgroundColor:
+                          MaterialStateProperty.resolveWith((states) {
+                        return Theme.of(context).highlightColor;
+                      }),
+                    ),
                   ),
-                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(
@@ -235,10 +170,7 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
             duration: const Duration(milliseconds: 300),
             child: SizedBox(
               width: double.infinity,
-              height: toolbarType == 'input' ? keyboardHeight : emoteHeight,
+              height: keyboardHeight,
-              child: EmotePanel(
-                onChoose: (package, emote) => onChooseEmote(package, emote),
-              ),
             ),
           ),
         ],
@@ -246,22 +178,3 @@ 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,7 +5,6 @@ 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';
@@ -24,6 +23,7 @@ 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,7 +58,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   late bool autoExitFullcreen;
   late bool autoPlayEnable;
   late bool autoPiP;
-  late Floating floating;
+  final Floating floating = Floating();
+  // 生命周期监听
+  late final AppLifecycleListener _lifecycleListener;
   bool isShowing = true;
 
   @override
@@ -66,9 +68,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     super.initState();
     heroTag = Get.arguments['heroTag'];
     videoDetailController = Get.put(VideoDetailController(), tag: heroTag);
-    videoIntroController = Get.put(
+    videoIntroController = Get.put(VideoIntroController(), tag: heroTag);
-        VideoIntroController(bvid: Get.parameters['bvid']!),
-        tag: heroTag);
     videoIntroController.videoDetail.listen((value) {
       videoPlayerServiceHandler.onVideoDetailChange(
           value, videoDetailController.cid.value);
@@ -91,11 +91,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
 
     videoSourceInit();
     appbarStreamListen();
-    fullScreenStatusListener();
+    lifecycleListener();
-    if (Platform.isAndroid) {
-      floating = videoDetailController.floating!;
-      autoEnterPip();
-    }
   }
 
   // 获取视频资源，初始化播放器
@@ -153,10 +149,6 @@ class _VideoDetailPageState extends State<VideoDetailPage>
         }
       } catch (_) {}
     }
-    if (Platform.isAndroid) {
-      floating.toggleAutoPip(
-          autoEnter: status == PlayerStatus.playing && autoPiP);
-    }
   }
 
   // 继续播放或重新播放
@@ -175,12 +167,25 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     videoDetailController.isShowCover.value = false;
   }
 
-  void fullScreenStatusListener() {
+  // 生命周期监听
-    plPlayerController?.isFullScreen.listen((bool isFullScreen) {
+  void lifecycleListener() {
-      if (isFullScreen) {
+    _lifecycleListener = AppLifecycleListener(
-        videoDetailController.hiddenReplyReplyPanel();
+      onResume: () => _handleTransition('resume'),
-      }
+      // 后台
-    });
+      onInactive: () => _handleTransition('inactive'),
+      // 在Android和iOS端不生效
+      onHide: () => _handleTransition('hide'),
+      onShow: () => _handleTransition('show'),
+      onPause: () => _handleTransition('pause'),
+      onRestart: () => _handleTransition('restart'),
+      onDetach: () => _handleTransition('detach'),
+      // 只作用于桌面端
+      onExitRequested: () {
+        ScaffoldMessenger.maybeOf(context)
+            ?.showSnackBar(const SnackBar(content: Text("拦截应用退出")));
+        return Future.value(AppExitResponse.cancel);
+      },
+    );
   }
 
   @override
@@ -194,10 +199,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       videoDetailController.floating!.dispose();
     }
     videoPlayerServiceHandler.onVideoDetailDispose();
-    if (Platform.isAndroid) {
-      floating.toggleAutoPip(autoEnter: false);
     floating.dispose();
-    }
+    _lifecycleListener.dispose();
     super.dispose();
   }
 
@@ -222,10 +225,7 @@ 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,10 +250,29 @@ 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;
-    if (autoPiP && routePath.startsWith('/video')) {
+    final bool isPortrait =
-      floating.toggleAutoPip(autoEnter: autoPiP);
+        MediaQuery.of(context).orientation == Orientation.portrait;
+
+    /// TODO 横屏全屏状态下误触pip
+    if (autoPiP && routePath.startsWith('/video') && isPortrait) {
+      floating.enable(
+          aspectRatio: Rational(
+        videoDetailController.data.dash!.video!.first.width!,
+        videoDetailController.data.dash!.video!.first.height!,
+      ));
     }
   }
 
@@ -373,7 +392,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                                           ),
                                               );
                                             } else {
-                                              return buildCustomAppBar();
+                                              return const SizedBox();
                                             }
                                           },
                                         ),
@@ -416,7 +435,33 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                                     top: 0,
                                                     left: 0,
                                                     right: 0,
-                                                    child: buildCustomAppBar(),
+                                                    child: AppBar(
+                                                      primary: false,
+                                                      foregroundColor:
+                                                          Colors.white,
+                                                      elevation: 0,
+                                                      scrolledUnderElevation: 0,
+                                                      backgroundColor:
+                                                          Colors.transparent,
+                                                      actions: [
+                                                        IconButton(
+                                                          tooltip: '稍后再看',
+                                                          onPressed: () async {
+                                                            var res = await UserHttp
+                                                                .toViewLater(
+                                                                    bvid: videoDetailController
+                                                                        .bvid);
+                                                            SmartDialog
+                                                                .showToast(
+                                                                    res['msg']);
+                                                          },
+                                                          icon: const Icon(Icons
+                                                              .history_outlined),
+                                                        ),
+                                                        const SizedBox(
+                                                            width: 14)
+                                                      ],
+                                                    ),
                                                   ),
                                                   Positioned(
                                                     right: 12,
@@ -493,8 +538,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                 slivers: <Widget>[
                                   if (videoDetailController.videoType ==
                                       SearchType.video) ...[
-                                    VideoIntroPanel(
+                                    const VideoIntroPanel(),
-                                        bvid: videoDetailController.bvid),
                                   ] else if (videoDetailController.videoType ==
                                       SearchType.media_bangumi) ...[
                                     Obx(() => BangumiIntroPanel(
@@ -521,7 +565,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                           .withOpacity(0.06),
                                     ),
                                   ),
-                                  const RelatedVideoPanel(),
+                                  RelatedVideoPanel(),
                                 ],
                               );
                             },
@@ -571,7 +615,6 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                     headerControl: HeaderControl(
                       controller: plPlayerController,
                       videoDetailCtr: videoDetailController,
-                      bvid: videoDetailController.bvid,
                     ),
                     danmuWidget: Obx(
                       () => PlDanmaku(
@@ -598,48 +641,4 @@ 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,21 +19,17 @@ 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();
@@ -52,32 +48,11 @@ 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(() {});
-    });
   }
 
   /// 设置面板
@@ -367,7 +342,8 @@ class _HeaderControlState extends State<HeaderControl> {
                         },
                         dense: true,
                         contentPadding: const EdgeInsets.only(),
-                        title: const Text("额外等待视频播放完毕", style: titleStyle),
+                        title:
+                            const Text("额外等待视频播放完毕", style: titleStyle),
                         trailing: Switch(
                           // thumb color (round icon)
                           activeColor: Theme.of(context).colorScheme.primary,
@@ -1071,8 +1047,6 @@ 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,
@@ -1107,31 +1081,6 @@ 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,
@@ -1147,7 +1096,6 @@ 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']));
+        Clipboard.setData(ClipboardData(text: result.msg.toString()));
       }
     } 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;
+                          Map data = snapshot.data as Map;
-                          if (data != null && data['status']) {
+                          if (data['status']) {
-                            RxList sessionList = _whisperController.sessionList;
+                            List sessionList = _whisperController.sessionList;
                             return Obx(
                               () => sessionList.isEmpty
                                   ? const SizedBox()
@@ -121,10 +121,7 @@ class _WhisperPageState extends State<WhisperPage> {
                                           const NeverScrollableScrollPhysics(),
                                       itemBuilder: (_, int i) {
                                         return ListTile(
-                                          onTap: () {
+                                          onTap: () => Get.toNamed(
-                                            sessionList[i].unreadCount = 0;
-                                            sessionList.refresh();
-                                            Get.toNamed(
                                             '/whisperDetail',
                                             parameters: {
                                               'talkerId': sessionList[i]
@@ -141,15 +138,16 @@ class _WhisperPageState extends State<WhisperPage> {
                                                   .mid
                                                   .toString(),
                                             },
-                                            );
+                                          ),
-                                          },
                                           leading: Badge(
-                                            isLabelVisible:
+                                            isLabelVisible: false,
-                                                sessionList[i].unreadCount > 0,
+                                            backgroundColor: Theme.of(context)
+                                                .colorScheme
+                                                .primary,
                                             label: Text(sessionList[i]
                                                 .unreadCount
                                                 .toString()),
-                                            alignment: Alignment.topRight,
+                                            alignment: Alignment.bottomRight,
                                             child: NetworkImgLayer(
                                               width: 45,
                                               height: 45,
@@ -162,13 +160,7 @@ 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]
@@ -180,8 +172,8 @@ class _WhisperPageState extends State<WhisperPage> {
                                                   sessionList[i]
                                                           .lastMsg
                                                           .content[
-                                                          'reply_content'])
+                                                      'reply_content'] ??
-                                                  : '不支持的消息类型',
+                                                  '',
                                               maxLines: 1,
                                               overflow: TextOverflow.ellipsis,
                                               style: Theme.of(context)
@@ -218,9 +210,7 @@ class _WhisperPageState extends State<WhisperPage> {
                             );
                           } else {
                             // 请求错误
-                            return Center(
+                            return const SizedBox();
-                              child: Text(data?['msg'] ?? '请求异常'),
-                            );
                           }
                         } else {
                           // 骨架屏

lib/pages/whisper_detail/controller.dart

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

lib/pages/whisper_detail/view.dart

@@ -1,12 +1,9 @@
-import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:hive/hive.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
-import 'package:pilipala/pages/emote/index.dart';
 import 'package:pilipala/pages/whisper_detail/controller.dart';
 import 'package:pilipala/utils/feed_back.dart';
-import '../../utils/storage.dart';
+
 import 'widget/chat_item.dart';
 
 class WhisperDetailPage extends StatefulWidget {
@@ -16,67 +13,15 @@ class WhisperDetailPage extends StatefulWidget {
   State<WhisperDetailPage> createState() => _WhisperDetailPageState();
 }
 
-class _WhisperDetailPageState extends State<WhisperDetailPage>
+class _WhisperDetailPageState extends State<WhisperDetailPage> {
-    with WidgetsBindingObserver {
   final WhisperDetailController _whisperDetailController =
       Get.put(WhisperDetailController());
   late Future _futureBuilderFuture;
-  late TextEditingController _replyContentController;
-  final FocusNode replyContentFocusNode = FocusNode();
-  final _debouncer = Debouncer(milliseconds: 200); // 设置延迟时间
-  late double emoteHeight = 0.0;
-  double keyboardHeight = 0.0; // 键盘高度
-  String toolbarType = 'input';
-  Box userInfoCache = GStrorage.userInfo;
 
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addObserver(this);
     _futureBuilderFuture = _whisperDetailController.querySessionMsg();
-    _replyContentController = _whisperDetailController.replyContentController;
-    _focuslistener();
-  }
-
-  _focuslistener() {
-    replyContentFocusNode.addListener(() {
-      if (replyContentFocusNode.hasFocus) {
-        setState(() {
-          toolbarType = 'input';
-        });
-      }
-    });
-  }
-
-  @override
-  void didChangeMetrics() {
-    super.didChangeMetrics();
-    final String routePath = Get.currentRoute;
-    if (mounted && routePath.startsWith('/whisper_detail')) {
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        // 键盘高度
-        final viewInsets = EdgeInsets.fromViewPadding(
-            View.of(context).viewInsets, View.of(context).devicePixelRatio);
-        _debouncer.run(() {
-          if (mounted) {
-            if (keyboardHeight == 0) {
-              setState(() {
-                emoteHeight = keyboardHeight =
-                    keyboardHeight == 0.0 ? viewInsets.bottom : keyboardHeight;
-              });
-            }
-          }
-        });
-      });
-    }
-  }
-
-  @override
-  void dispose() {
-    WidgetsBinding.instance.removeObserver(this);
-    replyContentFocusNode.removeListener(() {});
-    replyContentFocusNode.dispose();
-    super.dispose();
   }
 
   @override
@@ -144,14 +89,7 @@ class _WhisperDetailPageState extends State<WhisperDetailPage>
           ),
         ),
       ),
-      body: GestureDetector(
+      body: FutureBuilder(
-        onTap: () {
-          FocusScope.of(context).unfocus();
-          setState(() {
-            keyboardHeight = 0;
-          });
-        },
-        child: FutureBuilder(
         future: _futureBuilderFuture,
         builder: (BuildContext context, snapshot) {
           if (snapshot.connectionState == ConnectionState.done) {
@@ -196,11 +134,10 @@ class _WhisperDetailPageState extends State<WhisperDetailPage>
           }
         },
       ),
-      ),
       // resizeToAvoidBottomInset: true,
       bottomNavigationBar: Container(
         width: double.infinity,
-        height: MediaQuery.of(context).padding.bottom + 70 + keyboardHeight,
+        height: MediaQuery.of(context).padding.bottom + 70,
         padding: EdgeInsets.only(
           left: 8,
           right: 12,
@@ -215,9 +152,7 @@ class _WhisperDetailPageState extends State<WhisperDetailPage>
             ),
           ),
         ),
-        child: Column(
+        child: Row(
-          children: [
-            Row(
           mainAxisAlignment: MainAxisAlignment.center,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
@@ -229,14 +164,7 @@ class _WhisperDetailPageState extends State<WhisperDetailPage>
             //   ),
             // ),
             IconButton(
-                  onPressed: () {
+              onPressed: () {},
-                    // if (toolbarType == 'input') {
-                    //   setState(() {
-                    //     toolbarType = 'emote';
-                    //   });
-                    // }
-                    // FocusScope.of(context).unfocus();
-                  },
               icon: Icon(
                 Icons.emoji_emotions_outlined,
                 color: Theme.of(context).colorScheme.outline,
@@ -246,18 +174,13 @@ class _WhisperDetailPageState extends State<WhisperDetailPage>
               child: Container(
                 height: 45,
                 decoration: BoxDecoration(
-                      color: Theme.of(context)
+                  color:
-                          .colorScheme
+                      Theme.of(context).colorScheme.primary.withOpacity(0.08),
-                          .primary
-                          .withOpacity(0.08),
                   borderRadius: BorderRadius.circular(40.0),
                 ),
                 child: TextField(
                   readOnly: true,
                   style: Theme.of(context).textTheme.titleMedium,
-                      controller: _replyContentController,
-                      autofocus: false,
-                      focusNode: replyContentFocusNode,
                   decoration: const InputDecoration(
                     border: InputBorder.none, // 移除默认边框
                     hintText: '开发中 ...', // 提示文本
@@ -267,50 +190,10 @@ class _WhisperDetailPageState extends State<WhisperDetailPage>
                 ),
               ),
             ),
-                IconButton(
+            const SizedBox(width: 16),
-                  // onPressed: _whisperDetailController.sendMsg,
-                  onPressed: null,
-                  icon: Icon(
-                    Icons.send,
-                    color: Theme.of(context).colorScheme.outline,
-                  ),
-                ),
-                // const SizedBox(width: 16),
-              ],
-            ),
-            AnimatedSize(
-              curve: Curves.easeInOut,
-              duration: const Duration(milliseconds: 300),
-              child: SizedBox(
-                width: double.infinity,
-                height: toolbarType == 'input' ? keyboardHeight : emoteHeight,
-                child: EmotePanel(
-                  onChoose: (package, emote) => {},
-                ),
-              ),
-            ),
           ],
         ),
       ),
     );
   }
 }
-
-typedef DebounceCallback = void Function();
-
-class Debouncer {
-  DebounceCallback? callback;
-  final int? milliseconds;
-  Timer? _timer;
-
-  Debouncer({this.milliseconds});
-
-  run(DebounceCallback callback) {
-    if (_timer != null) {
-      _timer!.cancel();
-    }
-    _timer = Timer(Duration(milliseconds: milliseconds!), () {
-      callback();
-    });
-  }
-}

lib/pages/whisper_detail/widget/chat_item.dart

@@ -352,9 +352,7 @@ class ChatItem extends StatelessWidget {
               ));
         default:
           return Text(
-            content != null && content != ''
+            content['content'] ?? content.toString(),
-                ? (content['content'] ?? content.toString())
-                : '不支持的消息类型',
             style: TextStyle(
               letterSpacing: 0.6,
               height: 1.5,

lib/plugin/pl_player/view.dart

@@ -9,7 +9,6 @@ import 'package:hive/hive.dart';
 import 'package:media_kit/media_kit.dart';
 import 'package:media_kit_video/media_kit_video.dart';
 import 'package:nil/nil.dart';
-import 'package:pilipala/models/common/gesture_mode.dart';
 import 'package:pilipala/plugin/pl_player/controller.dart';
 import 'package:pilipala/plugin/pl_player/models/duration.dart';
 import 'package:pilipala/plugin/pl_player/models/fullscreen_mode.dart';
@@ -18,7 +17,6 @@ import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:screen_brightness/screen_brightness.dart';
 
-import '../../utils/global_data.dart';
 import 'models/bottom_progress_behavior.dart';
 import 'widgets/app_bar_ani.dart';
 import 'widgets/backward_seek.dart';
@@ -75,8 +73,6 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
   late bool enableQuickDouble;
   late bool enableBackgroundPlay;
   late double screenWidth;
-  final FullScreenGestureMode fullScreenGestureMode =
-      GlobalData().fullScreenGestureMode;
 
   // 用于记录上一次全屏切换手势触发时间，避免误触
   DateTime? lastFullScreenToggleTime;
@@ -120,11 +116,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
     super.initState();
     screenWidth = Get.size.width;
     animationController = AnimationController(
-      vsync: this,
+        vsync: this, duration: const Duration(milliseconds: 300));
-      duration: GlobalData().enablePlayerControlAnimation
-          ? const Duration(milliseconds: 150)
-          : const Duration(milliseconds: 10),
-    );
     videoController = widget.controller.videoController!;
     widget.controller.headerControl = widget.headerControl;
     widget.controller.bottomControl = widget.bottomControl;
@@ -528,20 +520,18 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                 // 全屏
                 final double dy = details.delta.dy;
                 const double threshold = 7.0; // 滑动阈值
-                final bool flag =
-                    fullScreenGestureMode != FullScreenGestureMode.values.last;
                 if (dy > _distance && dy > threshold) {
-                  if (_.isFullScreen.value ^ flag) {
+                  if (_.isFullScreen.value) {
                     lastFullScreenToggleTime = DateTime.now();
                     // 下滑退出全屏
-                    await widget.controller.triggerFullScreen(status: flag);
+                    await widget.controller.triggerFullScreen(status: false);
                   }
                   _distance = 0.0;
                 } else if (dy < _distance && dy < -threshold) {
-                  if (!_.isFullScreen.value ^ flag) {
+                  if (!_.isFullScreen.value) {
                     lastFullScreenToggleTime = DateTime.now();
                     // 上滑进入全屏
-                    await widget.controller.triggerFullScreen(status: !flag);
+                    await widget.controller.triggerFullScreen();
                   }
                   _distance = 0.0;
                 }

lib/plugin/pl_player/widgets/app_bar_ani.dart

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

lib/router/app_pages.dart

@@ -39,14 +39,11 @@ import '../pages/setting/pages/color_select.dart';
 import '../pages/setting/pages/display_mode.dart';
 import '../pages/setting/pages/font_size_select.dart';
 import '../pages/setting/pages/home_tabbar_set.dart';
-import '../pages/setting/pages/play_gesture_set.dart';
 import '../pages/setting/pages/play_speed_set.dart';
 import '../pages/setting/recommend_setting.dart';
 import '../pages/setting/play_setting.dart';
 import '../pages/setting/privacy_setting.dart';
 import '../pages/setting/style_setting.dart';
-import '../pages/subscription/index.dart';
-import '../pages/subscription_detail/index.dart';
 import '../pages/video/detail/index.dart';
 import '../pages/video/detail/reply_reply/index.dart';
 import '../pages/webview/index.dart';
@@ -163,13 +160,6 @@ class Routes {
     CustomGetPage(name: '/logs', page: () => const LogsPage()),
     // 搜索关注
     CustomGetPage(name: '/followSearch', page: () => const FollowSearchPage()),
-    // 订阅
-    CustomGetPage(name: '/subscription', page: () => const SubPage()),
-    // 订阅详情
-    CustomGetPage(name: '/subDetail', page: () => const SubDetailPage()),
-    // 播放器手势
-    CustomGetPage(
-        name: '/playerGestureSet', page: () => const PlayGesturePage()),
   ];
 }
 

lib/services/audio_handler.dart

@@ -149,8 +149,6 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
     ));
     if (_item.isNotEmpty) {
       _item.removeLast();
-    }
-    if (_item.isNotEmpty) {
       setMediaItem(_item.last);
     }
     if (_item.isEmpty) {

lib/utils/app_scheme.dart

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

lib/utils/global_data.dart

@@ -1,17 +0,0 @@
-import '../models/common/index.dart';
-
-class GlobalData {
-  int imgQuality = 10;
-  FullScreenGestureMode fullScreenGestureMode =
-      FullScreenGestureMode.values.last;
-  bool enablePlayerControlAnimation = true;
-
-  // 私有构造函数
-  GlobalData._();
-
-  // 单例实例
-  static final GlobalData _instance = GlobalData._();
-
-  // 获取全局实例
-  factory GlobalData() => _instance;
-}

lib/utils/id_utils.dart

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

lib/utils/storage.dart

@@ -1,11 +1,11 @@
+// import 'package:hive/hive.dart';
 import 'dart:io';
+
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:pilipala/models/model_owner.dart';
 import 'package:pilipala/models/search/hot.dart';
 import 'package:pilipala/models/user/info.dart';
-import '../models/common/gesture_mode.dart';
-import 'global_data.dart';
 
 class GStrorage {
   static late final Box<dynamic> userInfo;
@@ -44,13 +44,6 @@ class GStrorage {
     );
     // 视频设置
     video = await Hive.openBox('video');
-    GlobalData().imgQuality =
-        setting.get(SettingBoxKey.defaultPicQa, defaultValue: 10); // 设置全局变量
-    GlobalData().fullScreenGestureMode = FullScreenGestureMode.values[
-        setting.get(SettingBoxKey.fullScreenGestureMode,
-            defaultValue: FullScreenGestureMode.values.last.index) as int];
-    GlobalData().enablePlayerControlAnimation = setting
-        .get(SettingBoxKey.enablePlayerControlAnimation, defaultValue: true);
   }
 
   static void regAdapter() {
@@ -100,13 +93,11 @@ class SettingBoxKey {
       enableCDN = 'enableCDN',
       autoPiP = 'autoPiP',
       enableAutoLongPressSpeed = 'enableAutoLongPressSpeed',
-      enablePlayerControlAnimation = 'enablePlayerControlAnimation',
 
       // youtube 双击快进快退
       enableQuickDouble = 'enableQuickDouble',
       enableShowDanmaku = 'enableShowDanmaku',
       enableBackgroundPlay = 'enableBackgroundPlay',
-      fullScreenGestureMode = 'fullScreenGestureMode',
 
       /// 隐私
       blackMidsList = 'blackMidsList',
@@ -130,8 +121,7 @@ class SettingBoxKey {
       enableWordRe = 'enableWordRe',
       enableSearchWord = 'enableSearchWord',
       enableSystemProxy = 'enableSystemProxy',
-      enableAi = 'enableAi',
+      enableAi = 'enableAi';
-      defaultHomePage = 'defaultHomePage';
 
   /// 外观
   static const String themeMode = 'themeMode',
@@ -145,8 +135,7 @@ class SettingBoxKey {
       hideSearchBar = 'hideSearchBar', // 收起顶栏
       hideTabBar = 'hideTabBar', // 收起底栏
       tabbarSort = 'tabbarSort', // 首页tabbar
-      dynamicBadgeMode = 'dynamicBadgeMode',
+      dynamicBadgeMode = 'dynamicBadgeMode';
-      enableGradientBg = 'enableGradientBg';
 }
 
 class LocalCacheKey {

lib/utils/utils.dart

@@ -16,8 +16,6 @@ import '../http/index.dart';
 import '../models/github/latest.dart';
 
 class Utils {
-  static final Random random = Random();
-
   static Future<String> getCookiePath() async {
     final Directory tempDir = await getApplicationSupportDirectory();
     final String tempPath = "${tempDir.path}/.plpl/";
@@ -182,7 +180,7 @@ class Utils {
   }
 
   static String makeHeroTag(v) {
-    return v.toString() + random.nextInt(9999).toString();
+    return v.toString() + Random().nextInt(9999).toString();
   }
 
   static int duration(String duration) {
@@ -342,15 +340,4 @@ class Utils {
 
     return md5String;
   }
-
-  static List<int> generateRandomBytes(int minLength, int maxLength) {
-    return List<int>.generate(
-      random.nextInt(maxLength-minLength+1), (_) => random.nextInt(0x60) + 0x20
-    );
-  }
-
-  static String base64EncodeRandomString(int minLength, int maxLength) {
-    List<int> randomBytes = generateRandomBytes(minLength, maxLength);
-    return base64.encode(randomBytes);
-  }
 }

lib/utils/video_utils.dart

@@ -1,7 +1,5 @@
 import 'package:pilipala/models/video/play/url.dart';
 
-import '../models/live/room_info.dart';
-
 class VideoUtils {
   static String getCdnUrl(dynamic item) {
     var backupUrl = "";
@@ -14,20 +12,13 @@ class VideoUtils {
     } else if (item is AudioItem) {
       backupUrl = item.backupUrl ?? "";
       videoUrl = backupUrl.contains("http") ? backupUrl : (item.baseUrl ?? "");
-    } else if (item is CodecItem) {
-      backupUrl = (item.urlInfo?.first.host)! +
-          item.baseUrl! +
-          item.urlInfo!.first.extra!;
-      videoUrl = backupUrl.contains("http") ? backupUrl : (item.baseUrl ?? "");
     } else {
       return "";
     }
 
     /// issues #70
-    if (videoUrl.contains(".mcdn.bilivideo")) {
+    if (videoUrl.contains(".mcdn.bilivideo") ||
-      videoUrl =
+        videoUrl.contains("/upgcxcode/")) {
-          'https://proxy-tf-all-ws.bilivideo.com/?url=${Uri.encodeComponent(videoUrl)}';
-    } else if (videoUrl.contains("/upgcxcode/")) {
       //CDN列表
       var cdnList = {
         'ali': 'upos-sz-mirrorali.bilivideo.com',

pubspec.lock

@@ -502,7 +502,7 @@ packages:
     description:
       path: "."
       ref: main
-      resolved-ref: "8e89669eb9341f9980265306e24ef96fdbd3fd08"
+      resolved-ref: d2d8421c4d80f6113f832404109853684721e11a
       url: "https://github.com/guozhigq/floating.git"
     source: git
     version: "2.0.1"

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.20+1020
+version: 1.0.19+1019
 
 environment:
   sdk: ">=2.19.6 <3.0.0"