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

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';
-    print(imageUrl);
+        '${src!.startsWith('//') ? 'https:${src!}' : src!}@${quality ?? 100}q.webp';
     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,19 +104,17 @@ class NetworkImgLayer extends StatelessWidget {
                 ? 0
                 : StyleString.imgRadius.x),
       ),
-      child: type == 'bg'
-          ? const SizedBox()
-          : Center(
-              child: Image.asset(
-                type == 'avatar'
-                    ? 'assets/images/noface.jpeg'
-                    : 'assets/images/loading.png',
-                width: width,
-                height: height,
-                cacheWidth: width.cacheSize(context),
-                cacheHeight: height.cacheSize(context),
-              ),
-            ),
+      child: Center(
+        child: Image.asset(
+          type == 'avatar'
+              ? 'assets/images/noface.jpeg'
+              : 'assets/images/loading.png',
+          width: width,
+          height: height,
+          cacheWidth: width.cacheSize(context),
+          cacheHeight: height.cacheSize(context),
+        ),
+      ),
     );
   }
 }

lib/common/widgets/video_card_v.dart

@@ -229,9 +229,7 @@ class VideoContent extends StatelessWidget {
             ),
             if (crossAxisCount > 1) ...[
               const SizedBox(height: 2),
-              VideoStat(
-                videoItem: videoItem,
-              ),
+              VideoStat(videoItem: videoItem, crossAxisCount: crossAxisCount),
             ],
             if (crossAxisCount == 1) const SizedBox(height: 4),
             Row(
@@ -292,10 +290,14 @@ class VideoContent extends StatelessWidget {
                       color: Theme.of(context).colorScheme.outline,
                     ),
                   ),
-                  VideoStat(
-                    videoItem: videoItem,
+                  Expanded(
+                    flex: 1,
+                    child: VideoStat(
+                      videoItem: videoItem,
+                      crossAxisCount: crossAxisCount,
+                    ),
                   ),
-                  const Spacer(),
+                  // const Spacer(),
                 ],
                 if (videoItem.goto == 'av' && crossAxisCount != 1) ...[
                   VideoPopupMenu(
@@ -317,10 +319,12 @@ class VideoContent extends StatelessWidget {
 
 class VideoStat extends StatelessWidget {
   final dynamic videoItem;
+  final int crossAxisCount;
 
   const VideoStat({
     Key? key,
     required this.videoItem,
+    required this.crossAxisCount,
   }) : super(key: key);
 
   @override
@@ -337,7 +341,7 @@ class VideoStat extends StatelessWidget {
           danmu: videoItem.stat.danmu,
         ),
         if (videoItem is RecVideoItemModel) ...<Widget>[
-          const Spacer(),
+          crossAxisCount > 1 ? const Spacer() : const SizedBox(width: 8),
           RichText(
             maxLines: 1,
             text: TextSpan(

lib/http/api.dart

@@ -477,26 +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 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);
 
-    try {
-      await buvidActivate();
-    } catch (e) {
-      log("setCookie, ${e.toString()}");
+    if (cookie.isEmpty) {
+      try {
+        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,
-      '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]}',
+      'order_avoided': orderAvoided
     });
     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(),
-        };
-      }
+      return {
+        'status': true,
+        'data': SessionDataModel.fromJson(res.data['data']),
+      };
     } 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');
-      }
+      return {
+        'status': true,
+        'data': res.data['data']
+            .map<AccountListModel>((e) => AccountListModel.fromJson(e))
+            .toList(),
+      };
     } 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,46 +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']};
-    }
-  }
 }

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'] != ''
-        ? jsonDecode(json['content'])
-        : '';
+    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'] != ''
-        ? jsonDecode(json['content'])
-        : '';
+    content = jsonDecode(json['content']);
     msgSeqno = json['msg_seqno'];
     timestamp = json['timestamp'];
     atUids = json['at_uids'];

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;
-    durl = json['durl']?.map<Durl>((e) => Durl.fromJson(e)).toList();
+    dash = Dash.fromJson(json['dash']);
     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(
-                isLabelVisible: _aboutController.isLoading.value
-                    ? false
-                    : _aboutController.isUpdate.value,
-                label: const Text('New'),
-                child: Padding(
-                  padding: const EdgeInsets.fromLTRB(0, 0, 0, 30),
-                  child: FilledButton.tonal(
-                    onPressed: () {
-                      showModalBottomSheet(
-                        context: context,
-                        builder: (context) {
-                          return Column(
-                            mainAxisSize: MainAxisSize.min,
-                            children: [
-                              ListTile(
-                                onTap: () => _aboutController.githubRelease(),
-                                title: const Text('Github下载'),
-                              ),
-                              ListTile(
-                                onTap: () => _aboutController.panDownload(),
-                                title: const Text('网盘下载'),
-                              ),
-                              ListTile(
-                                onTap: () => _aboutController.webSiteUrl(),
-                                title: const Text('官网下载'),
-                              ),
-                              ListTile(
-                                onTap: () => _aboutController.qimiao(),
-                                title: const Text('奇妙应用'),
-                              ),
-                              SizedBox(
-                                  height:
-                                      MediaQuery.of(context).padding.bottom +
-                                          20)
-                            ],
-                          );
-                        },
-                      );
-                    },
-                    child: Text(
-                      'V${_aboutController.currentVersion.value}',
-                      style: subTitleStyle.copyWith(
-                        color: Theme.of(context).primaryColor,
-                      ),
-                    ),
-                  ),
+              () => ListTile(
+                title: const Text('当前版本'),
+                trailing: Text(_aboutController.currentVersion.value,
+                    style: subTitleStyle),
+              ),
+            ),
+            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,
@@ -149,43 +129,19 @@ class _AboutPageState extends State<AboutPage> {
               ),
             ),
             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('交流社区'),
+              onTap: () => _aboutController.qqChanel(),
+              title: const Text('QQ群'),
               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(
-      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,
-      ),
+    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/introduction/controller.dart

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

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/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/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,14 +60,16 @@ class FavDetailController extends GetxController {
     var result = await VideoHttp.favVideo(
         aid: id, addIds: '', delIds: mediaId.toString());
     if (result['status']) {
-      List dataList = favList;
-      for (var i in dataList) {
-        if (i.id == id) {
-          dataList.remove(i);
-          break;
+      if (result['data']['prompt']) {
+        List dataList = favList;
+        for (var i in dataList) {
+          if (i.id == id) {
+            dataList.remove(i);
+            break;
+          }
         }
+        SmartDialog.showToast('取消收藏');
       }
-      SmartDialog.showToast('取消收藏');
     }
   }
 

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,14 +80,16 @@ class FavSearchController extends GetxController {
     var result = await VideoHttp.favVideo(
         aid: id, addIds: '', delIds: mediaId.toString());
     if (result['status']) {
-      List dataList = favList;
-      for (var i in dataList) {
-        if (i.id == id) {
-          dataList.remove(i);
-          break;
+      if (result['data']['prompt']) {
+        List dataList = favList;
+        for (var i in dataList) {
+          if (i.id == id) {
+            dataList.remove(i);
+            break;
+          }
         }
+        SmartDialog.showToast('取消收藏');
       }
-      SmartDialog.showToast('取消收藏');
     }
   }
 }

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,51 +48,38 @@ 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,
-      ));
-    }
+    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(
-                opacity: 0.6,
-                child: Container(
-                  width: MediaQuery.of(context).size.width,
-                  height: MediaQuery.of(context).size.height,
-                  decoration: BoxDecoration(
-                    gradient: LinearGradient(
-                        colors: [
-                          Theme.of(context)
-                              .colorScheme
-                              .primary
-                              .withOpacity(0.9),
-                          Theme.of(context)
-                              .colorScheme
-                              .primary
-                              .withOpacity(0.5),
-                          Theme.of(context).colorScheme.surface
-                        ],
-                        begin: Alignment.topLeft,
-                        end: Alignment.bottomRight,
-                        stops: const [0, 0.0034, 0.34]),
-                  ),
+          Align(
+            alignment: Alignment.topLeft,
+            child: Opacity(
+              opacity: 0.6,
+              child: Container(
+                width: MediaQuery.of(context).size.width,
+                height: MediaQuery.of(context).size.height,
+                decoration: BoxDecoration(
+                  gradient: LinearGradient(
+                      colors: [
+                        Theme.of(context).colorScheme.primary.withOpacity(0.9),
+                        Theme.of(context).colorScheme.primary.withOpacity(0.5),
+                        Theme.of(context).colorScheme.surface
+                      ],
+                      begin: Alignment.topLeft,
+                      end: Alignment.bottomRight,
+                      stops: const [0, 0.0034, 0.34]),
                 ),
               ),
             ),
-          ],
+          ),
           Column(
             children: [
               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;
-                        },
-                      ),
-                    ),
-                  ),
-                ],
+                const CustomTabs(),
               ] else ...[
                 const SizedBox(height: 6),
               ],

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,11 +57,9 @@ class LiveRoomController extends GetxController {
       List<CodecItem> codec =
           res['data'].playurlInfo.playurl.stream.first.format.first.codec;
       CodecItem item = codec.first;
-      String videoUrl = enableCDN
-          ? VideoUtils.getCdnUrl(item)
-          : (item.urlInfo?.first.host)! +
-              item.baseUrl! +
-              item.urlInfo!.first.extra!;
+      String videoUrl = (item.urlInfo?.first.host)! +
+          item.baseUrl! +
+          item.urlInfo!.first.extra!;
       await playerInit(videoUrl);
       return res;
     }

lib/pages/live_room/view.dart

@@ -75,45 +75,41 @@ class _LiveRoomPageState extends State<LiveRoomPage> {
       backgroundColor: Colors.black,
       body: Stack(
         children: [
-          Positioned(
-            left: 0,
-            right: 0,
-            bottom: 0,
+          // Obx(
+          //   () => Positioned.fill(
+          //     child: Opacity(
+          //       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,
+                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(
             children: [
               AppBar(

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_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(
-                      errMsg: snapshot.data['msg'],
-                      fn: () {},
-                    );
+                    return const SliverToBoxAdapter();
                   }
                 } else {
-                  return HttpError(
-                    errMsg: snapshot.data['msg'],
-                    fn: () {},
-                  );
+                  return const SliverToBoxAdapter();
                 }
               } 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(
-                      errMsg: snapshot.data['msg'],
-                      fn: () {},
-                    );
+                    return const SliverToBoxAdapter();
                   }
                 } else {
-                  return HttpError(
-                    errMsg: snapshot.data['msg'],
-                    fn: () {},
-                  );
+                  return const SliverToBoxAdapter();
                 }
               } else {
                 return const SliverToBoxAdapter();

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

@@ -8,7 +8,6 @@ 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';
@@ -103,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(
@@ -177,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('确定'),
                           )

lib/pages/subscription/controller.dart

@@ -1,49 +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');
-  }
-}

lib/pages/subscription/index.dart

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

lib/pages/subscription/view.dart

@@ -1,84 +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]);
-                  },
-                ),
-              );
-            } else {
-              return CustomScrollView(
-                physics: const NeverScrollableScrollPhysics(),
-                slivers: [
-                  HttpError(
-                    errMsg: data?['msg'],
-                    fn: () => setState(() {}),
-                  ),
-                ],
-              );
-            }
-          } else {
-            // 骨架屏
-            return const Text('请求中');
-          }
-        },
-      ),
-    );
-  }
-}

lib/pages/subscription/widgets/item.dart

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

lib/pages/subscription_detail/controller.dart

@@ -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();
@@ -142,7 +140,7 @@ class VideoDetailController extends GetxController
   }
 
   showReplyReplyPanel() {
-    replyReplyBottomSheetCtr =
+    PersistentBottomSheetController? ctr =
         scaffoldKey.currentState?.showBottomSheet((BuildContext context) {
       return VideoReplyReplyPanel(
         oid: oid.value,
@@ -155,7 +153,7 @@ class VideoDetailController extends GetxController
         source: 'videoDetail',
       );
     });
-    replyReplyBottomSheetCtr?.closed.then((value) {
+    ctr?.closed.then((value) {
       fRpid = 0;
     });
   }
@@ -231,11 +229,9 @@ class VideoDetailController extends GetxController
       seekTo: seekToTime ?? defaultST,
       duration: duration ?? Duration(milliseconds: data.timeLength ?? 0),
       // 宽>高 水平 否则 垂直
-      direction: firstVideo.width != null && firstVideo.height != null
-          ? ((firstVideo.width! - firstVideo.height!) > 0
-              ? 'horizontal'
-              : 'vertical')
-          : null,
+      direction: (firstVideo.width! - firstVideo.height!) > 0
+          ? 'horizontal'
+          : 'vertical',
       bvid: bvid,
       cid: cid.value,
       enableHeart: enableHeart,
@@ -252,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 {
         // 当前可播放的最高质量视频
@@ -374,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

@@ -305,9 +305,11 @@ class VideoIntroController extends GetxController {
         delIds: favStatus == 1 ? '$defaultFolderId' : '',
       );
       if (result['status']) {
-        // 重新获取收藏状态
-        await queryHasFavVideo();
-        SmartDialog.showToast('✅ 操作成功');
+        if (result['data']['prompt']) {
+          // 重新获取收藏状态
+          await queryHasFavVideo();
+          SmartDialog.showToast('✅ 操作成功');
+        }
       } else {
         SmartDialog.showToast(result['msg']);
       }
@@ -332,12 +334,14 @@ class VideoIntroController extends GetxController {
         delIds: delMediaIdsNew.join(','));
     SmartDialog.dismiss();
     if (result['status']) {
-      addMediaIdsNew = [];
-      delMediaIdsNew = [];
-      Get.back();
-      // 重新获取收藏状态
-      await queryHasFavVideo();
-      SmartDialog.showToast('✅ 操作成功');
+      if (result['data']['prompt']) {
+        addMediaIdsNew = [];
+        delMediaIdsNew = [];
+        Get.back();
+        // 重新获取收藏状态
+        await queryHasFavVideo();
+        SmartDialog.showToast('✅ 操作成功');
+      }
     } else {
       SmartDialog.showToast(result['msg']);
     }
@@ -478,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/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/detail');
-
   // replyItem 当前回复内容
   // replyReply 查看二楼回复（回复详情）回调
   // fReplyItem 父级回复内容，用作二楼回复（回复详情）展示
@@ -510,7 +506,6 @@ InlineSpan buildContent(
   // 构建正则表达式
   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('*', '\\*')),
@@ -574,32 +569,27 @@ InlineSpan buildContent(
         spanChilds.add(
           TextSpan(
             text: ' $matchStr ',
-            style: isVideoPage
-                ? TextStyle(
-                    color: Theme.of(context).colorScheme.primary,
-                  )
-                : null,
+            style: TextStyle(
+              color: Theme.of(context).colorScheme.primary,
+            ),
             recognizer: TapGestureRecognizer()
               ..onTap = () {
                 // 跳转到指定位置
-                if (isVideoPage) {
-                  try {
-                    SmartDialog.showToast('跳转至：$matchStr');
-                    Get.find<VideoDetailController>(
-                            tag: Get.arguments['heroTag'])
-                        .plPlayerController
-                        .seekTo(
-                          Duration(seconds: Utils.duration(matchStr)),
-                        );
-                  } catch (e) {
-                    SmartDialog.showToast('跳转失败: $e');
-                  }
+                try {
+                  SmartDialog.showToast('跳转至：$matchStr');
+                  Get.find<VideoDetailController>(tag: Get.arguments['heroTag'])
+                      .plPlayerController
+                      .seekTo(
+                        Duration(seconds: Utils.duration(matchStr)),
+                      );
+                } catch (e) {
+                  SmartDialog.showToast('跳转失败: $e');
                 }
               },
           ),
         );
       } else {
-        print("matchStr=$matchStr");
+        // print("matchStr=$matchStr");
         String appUrlSchema = '';
         final bool enableWordRe = setting.get(SettingBoxKey.enableWordRe,
             defaultValue: false) as bool;
@@ -630,34 +620,26 @@ InlineSpan buildContent(
                   ..onTap = () async {
                     final String title = content.jumpUrl[matchStr]['title'];
                     if (appUrlSchema == '') {
-                      if (matchStr.startsWith('BV')) {
+                      final String redirectUrl =
+                          await UrlUtils.parseRedirectUrl(matchStr);
+                      final String pathSegment = Uri.parse(redirectUrl).path;
+                      final String lastPathSegment =
+                          pathSegment.split('/').last;
+                      if (lastPathSegment.startsWith('BV')) {
                         UrlUtils.matchUrlPush(
-                          matchStr,
+                          lastPathSegment,
                           title,
-                          '',
+                          redirectUrl,
                         );
                       } else {
-                        final String redirectUrl =
-                            await UrlUtils.parseRedirectUrl(matchStr);
-                        final String pathSegment = Uri.parse(redirectUrl).path;
-                        final String lastPathSegment =
-                            pathSegment.split('/').last;
-                        if (lastPathSegment.startsWith('BV')) {
-                          UrlUtils.matchUrlPush(
-                            lastPathSegment,
-                            title,
-                            redirectUrl,
-                          );
-                        } else {
-                          Get.toNamed(
-                            '/webview',
-                            parameters: {
-                              'url': redirectUrl,
-                              'type': 'url',
-                              'pageTitle': title
-                            },
-                          );
-                        }
+                        Get.toNamed(
+                          '/webview',
+                          parameters: {
+                            'url': redirectUrl,
+                            'type': 'url',
+                            'pageTitle': title
+                          },
+                        );
                       }
                     } else {
                       if (appUrlSchema.startsWith('bilibili://search')) {
@@ -702,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,49 +73,18 @@ 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();
-    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(() {});
     super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
+    double keyboardHeight = EdgeInsets.fromViewPadding(
+            View.of(context).viewInsets, View.of(context).devicePixelRatio)
+        .bottom;
     return Container(
       clipBehavior: Clip.hardEdge,
       decoration: BoxDecoration(
@@ -188,32 +137,27 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
             child: Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
-                ToolbarIconButton(
-                  onPressed: () {
-                    if (toolbarType == 'emote') {
-                      setState(() {
-                        toolbarType = 'input';
-                      });
-                    }
-                    FocusScope.of(context).requestFocus(replyContentFocusNode);
-                  },
-                  icon: const Icon(Icons.keyboard, size: 22),
-                  toolbarType: toolbarType,
-                  selected: toolbarType == 'input',
-                ),
-                const SizedBox(width: 20),
-                ToolbarIconButton(
-                  onPressed: () {
-                    if (toolbarType == 'input') {
-                      setState(() {
-                        toolbarType = 'emote';
-                      });
-                    }
-                    FocusScope.of(context).unfocus();
-                  },
-                  icon: const Icon(Icons.emoji_emotions, size: 22),
-                  toolbarType: toolbarType,
-                  selected: toolbarType == 'emote',
+                SizedBox(
+                  width: 36,
+                  height: 36,
+                  child: IconButton(
+                    onPressed: () {
+                      FocusScope.of(context)
+                          .requestFocus(replyContentFocusNode);
+                    },
+                    icon: Icon(Icons.keyboard,
+                        size: 22,
+                        color: Theme.of(context).colorScheme.onBackground),
+                    highlightColor:
+                        Theme.of(context).colorScheme.onInverseSurface,
+                    style: ButtonStyle(
+                      padding: MaterialStateProperty.all(EdgeInsets.zero),
+                      backgroundColor:
+                          MaterialStateProperty.resolveWith((states) {
+                        return Theme.of(context).highlightColor;
+                      }),
+                    ),
+                  ),
                 ),
                 const Spacer(),
                 TextButton(
@@ -226,10 +170,7 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
             duration: const Duration(milliseconds: 300),
             child: SizedBox(
               width: double.infinity,
-              height: toolbarType == 'input' ? keyboardHeight : emoteHeight,
-              child: EmotePanel(
-                onChoose: (package, emote) => onChooseEmote(package, emote),
-              ),
+              height: keyboardHeight,
             ),
           ),
         ],
@@ -237,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/view.dart

@@ -92,7 +92,6 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     videoSourceInit();
     appbarStreamListen();
     lifecycleListener();
-    fullScreenStatusListener();
   }
 
   // 获取视频资源，初始化播放器
@@ -189,14 +188,6 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     );
   }
 
-  void fullScreenStatusListener() {
-    plPlayerController?.isFullScreen.listen((bool isFullScreen) {
-      if (isFullScreen) {
-        videoDetailController.hiddenReplyReplyPanel();
-      }
-    });
-  }
-
   @override
   void dispose() {
     shutdownTimerService.handleWaitingFinished();
@@ -234,10 +225,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   @override
   // 返回当前页面时
   void didPopNext() async {
-    if (plPlayerController != null &&
-        plPlayerController!.videoPlayerController != null) {
-      setState(() => isShowing = true);
-    }
+    setState(() => isShowing = true);
     videoDetailController.isFirstTime = false;
     final bool autoplay = autoPlayEnable;
     videoDetailController.playerInit(autoplay: autoplay);

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

@@ -19,8 +19,6 @@ 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({
@@ -50,31 +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(), tag: heroTag);
-  }
-
-  void fullScreenStatusListener() {
-    widget.videoDetailCtr!.plPlayerController.isFullScreen
-        .listen((bool isFullScreen) {
-      if (isFullScreen) {
-        showTitle = true;
-      } else {
-        showTitle = false;
-      }
-      setState(() {});
-    });
   }
 
   /// 设置面板
@@ -364,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,
@@ -912,7 +891,7 @@ class _HeaderControlState extends State<HeaderControl> {
                             final DanmakuOption currentOption =
                                 danmakuController.option;
                             final DanmakuOption updatedOption =
-                                currentOption.copyWith(strokeWidth: val);
+                            currentOption.copyWith(strokeWidth: val);
                             danmakuController.updateOption(updatedOption);
                           } catch (_) {}
                         },
@@ -1068,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,
@@ -1104,47 +1081,21 @@ 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,
-                size: 15,
-                color: Colors.white,
-              ),
-              fuc: () async {
-                // 销毁播放器实例
-                await widget.controller!.dispose(type: 'all');
-                if (mounted) {
-                  Navigator.popUntil(
-                      context, (Route<dynamic> route) => route.isFirst);
-                }
-              },
+          ComBtn(
+            icon: const Icon(
+              FontAwesomeIcons.house,
+              size: 15,
+              color: Colors.white,
             ),
-          ],
+            fuc: () async {
+              // 销毁播放器实例
+              await widget.controller!.dispose(type: 'all');
+              if (mounted) {
+                Navigator.popUntil(
+                    context, (Route<dynamic> route) => route.isFirst);
+              }
+            },
+          ),
           const Spacer(),
           // ComBtn(
           //   icon: const Icon(

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;
-                          if (data != null && data['status']) {
-                            RxList sessionList = _whisperController.sessionList;
+                          Map data = snapshot.data as Map;
+                          if (data['status']) {
+                            List sessionList = _whisperController.sessionList;
                             return Obx(
                               () => sessionList.isEmpty
                                   ? const SizedBox()
@@ -121,35 +121,33 @@ class _WhisperPageState extends State<WhisperPage> {
                                           const NeverScrollableScrollPhysics(),
                                       itemBuilder: (_, int i) {
                                         return ListTile(
-                                          onTap: () {
-                                            sessionList[i].unreadCount = 0;
-                                            sessionList.refresh();
-                                            Get.toNamed(
-                                              '/whisperDetail',
-                                              parameters: {
-                                                'talkerId': sessionList[i]
-                                                    .talkerId
-                                                    .toString(),
-                                                'name': sessionList[i]
-                                                    .accountInfo
-                                                    .name,
-                                                'face': sessionList[i]
-                                                    .accountInfo
-                                                    .face,
-                                                'mid': sessionList[i]
-                                                    .accountInfo
-                                                    .mid
-                                                    .toString(),
-                                              },
-                                            );
-                                          },
+                                          onTap: () => Get.toNamed(
+                                            '/whisperDetail',
+                                            parameters: {
+                                              'talkerId': sessionList[i]
+                                                  .talkerId
+                                                  .toString(),
+                                              'name': sessionList[i]
+                                                  .accountInfo
+                                                  .name,
+                                              'face': sessionList[i]
+                                                  .accountInfo
+                                                  .face,
+                                              'mid': sessionList[i]
+                                                  .accountInfo
+                                                  .mid
+                                                  .toString(),
+                                            },
+                                          ),
                                           leading: Badge(
-                                            isLabelVisible:
-                                                sessionList[i].unreadCount > 0,
+                                            isLabelVisible: false,
+                                            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,26 +160,20 @@ class _WhisperPageState extends State<WhisperPage> {
                                           title: Text(
                                               sessionList[i].accountInfo.name),
                                           subtitle: Text(
-                                              sessionList[i].lastMsg.content !=
-                                                          null &&
-                                                      sessionList[i]
-                                                              .lastMsg
-                                                              .content !=
-                                                          ''
-                                                  ? (sessionList[i]
+                                              sessionList[i]
+                                                      .lastMsg
+                                                      .content['text'] ??
+                                                  sessionList[i]
+                                                      .lastMsg
+                                                      .content['content'] ??
+                                                  sessionList[i]
+                                                      .lastMsg
+                                                      .content['title'] ??
+                                                  sessionList[i]
                                                           .lastMsg
-                                                          .content['text'] ??
-                                                      sessionList[i]
-                                                          .lastMsg
-                                                          .content['content'] ??
-                                                      sessionList[i]
-                                                          .lastMsg
-                                                          .content['title'] ??
-                                                      sessionList[i]
-                                                              .lastMsg
-                                                              .content[
-                                                          'reply_content'])
-                                                  : '不支持的消息类型',
+                                                          .content[
+                                                      'reply_content'] ??
+                                                  '',
                                               maxLines: 1,
                                               overflow: TextOverflow.ellipsis,
                                               style: Theme.of(context)
@@ -218,9 +210,7 @@ class _WhisperPageState extends State<WhisperPage> {
                             );
                           } else {
                             // 请求错误
-                            return Center(
-                              child: Text(data?['msg'] ?? '请求异常'),
-                            );
+                            return const SizedBox();
                           }
                         } 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) {
-        ackSessionMsg();
-        if (res['data'].eInfos != null) {
-          eInfos = res['data'].eInfos;
-        }
+      if (messageList.isNotEmpty && 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,63 +13,15 @@ class WhisperDetailPage extends StatefulWidget {
   State<WhisperDetailPage> createState() => _WhisperDetailPageState();
 }
 
-class _WhisperDetailPageState extends State<WhisperDetailPage>
-    with WidgetsBindingObserver {
+class _WhisperDetailPageState extends State<WhisperDetailPage> {
   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();
-    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(() {});
-    super.dispose();
   }
 
   @override
@@ -140,63 +89,55 @@ class _WhisperDetailPageState extends State<WhisperDetailPage>
           ),
         ),
       ),
-      body: GestureDetector(
-        onTap: () {
-          FocusScope.of(context).unfocus();
-          setState(() {
-            keyboardHeight = 0;
-          });
-        },
-        child: FutureBuilder(
-          future: _futureBuilderFuture,
-          builder: (BuildContext context, snapshot) {
-            if (snapshot.connectionState == ConnectionState.done) {
-              if (snapshot.data == null) {
-                return const SizedBox();
-              }
-              final Map data = snapshot.data as Map;
-              if (data['status']) {
-                List messageList = _whisperDetailController.messageList;
-                return Obx(
-                  () => messageList.isEmpty
-                      ? const SizedBox()
-                      : ListView.builder(
-                          itemCount: messageList.length,
-                          shrinkWrap: true,
-                          reverse: true,
-                          itemBuilder: (_, int i) {
-                            if (i == 0) {
-                              return Column(
-                                children: [
-                                  ChatItem(
-                                      item: messageList[i],
-                                      e_infos: _whisperDetailController.eInfos),
-                                  const SizedBox(height: 12),
-                                ],
-                              );
-                            } else {
-                              return ChatItem(
-                                  item: messageList[i],
-                                  e_infos: _whisperDetailController.eInfos);
-                            }
-                          },
-                        ),
-                );
-              } else {
-                // 请求错误
-                return const SizedBox();
-              }
-            } else {
-              // 骨架屏
+      body: FutureBuilder(
+        future: _futureBuilderFuture,
+        builder: (BuildContext context, snapshot) {
+          if (snapshot.connectionState == ConnectionState.done) {
+            if (snapshot.data == null) {
               return const SizedBox();
             }
-          },
-        ),
+            final Map data = snapshot.data as Map;
+            if (data['status']) {
+              List messageList = _whisperDetailController.messageList;
+              return Obx(
+                () => messageList.isEmpty
+                    ? const SizedBox()
+                    : ListView.builder(
+                        itemCount: messageList.length,
+                        shrinkWrap: true,
+                        reverse: true,
+                        itemBuilder: (_, int i) {
+                          if (i == 0) {
+                            return Column(
+                              children: [
+                                ChatItem(
+                                    item: messageList[i],
+                                    e_infos: _whisperDetailController.eInfos),
+                                const SizedBox(height: 12),
+                              ],
+                            );
+                          } else {
+                            return ChatItem(
+                                item: messageList[i],
+                                e_infos: _whisperDetailController.eInfos);
+                          }
+                        },
+                      ),
+              );
+            } else {
+              // 请求错误
+              return const SizedBox();
+            }
+          } else {
+            // 骨架屏
+            return const SizedBox();
+          }
+        },
       ),
       // 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,
@@ -211,102 +152,48 @@ class _WhisperDetailPageState extends State<WhisperDetailPage>
             ),
           ),
         ),
-        child: Column(
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Row(
-              mainAxisAlignment: MainAxisAlignment.center,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                // IconButton(
-                //   onPressed: () {},
-                //   icon: Icon(
-                //     Icons.add_circle_outline,
-                //     color: Theme.of(context).colorScheme.outline,
-                //   ),
-                // ),
-                IconButton(
-                  onPressed: () {
-                    // if (toolbarType == 'input') {
-                    //   setState(() {
-                    //     toolbarType = 'emote';
-                    //   });
-                    // }
-                    // FocusScope.of(context).unfocus();
-                  },
-                  icon: Icon(
-                    Icons.emoji_emotions_outlined,
-                    color: Theme.of(context).colorScheme.outline,
-                  ),
-                ),
-                Expanded(
-                  child: Container(
-                    height: 45,
-                    decoration: BoxDecoration(
-                      color: Theme.of(context)
-                          .colorScheme
-                          .primary
-                          .withOpacity(0.08),
-                      borderRadius: BorderRadius.circular(40.0),
-                    ),
-                    child: TextField(
-                      readOnly: true,
-                      style: Theme.of(context).textTheme.titleMedium,
-                      controller: _replyContentController,
-                      autofocus: false,
-                      focusNode: replyContentFocusNode,
-                      decoration: const InputDecoration(
-                        border: InputBorder.none, // 移除默认边框
-                        hintText: '开发中 ...', // 提示文本
-                        contentPadding: EdgeInsets.symmetric(
-                            horizontal: 16.0, vertical: 12.0), // 内边距
-                      ),
-                    ),
-                  ),
-                ),
-                IconButton(
-                  // onPressed: _whisperDetailController.sendMsg,
-                  onPressed: null,
-                  icon: Icon(
-                    Icons.send,
-                    color: Theme.of(context).colorScheme.outline,
-                  ),
-                ),
-                // const SizedBox(width: 16),
-              ],
+            // IconButton(
+            //   onPressed: () {},
+            //   icon: Icon(
+            //     Icons.add_circle_outline,
+            //     color: Theme.of(context).colorScheme.outline,
+            //   ),
+            // ),
+            IconButton(
+              onPressed: () {},
+              icon: Icon(
+                Icons.emoji_emotions_outlined,
+                color: Theme.of(context).colorScheme.outline,
+              ),
             ),
-            AnimatedSize(
-              curve: Curves.easeInOut,
-              duration: const Duration(milliseconds: 300),
-              child: SizedBox(
-                width: double.infinity,
-                height: toolbarType == 'input' ? keyboardHeight : emoteHeight,
-                child: EmotePanel(
-                  onChoose: (package, emote) => {},
+            Expanded(
+              child: Container(
+                height: 45,
+                decoration: BoxDecoration(
+                  color:
+                      Theme.of(context).colorScheme.primary.withOpacity(0.08),
+                  borderRadius: BorderRadius.circular(40.0),
+                ),
+                child: TextField(
+                  readOnly: true,
+                  style: Theme.of(context).textTheme.titleMedium,
+                  decoration: const InputDecoration(
+                    border: InputBorder.none, // 移除默认边框
+                    hintText: '开发中 ...', // 提示文本
+                    contentPadding: EdgeInsets.symmetric(
+                        horizontal: 16.0, vertical: 12.0), // 内边距
+                  ),
                 ),
               ),
             ),
+            const SizedBox(width: 16),
           ],
         ),
       ),
     );
   }
 }
-
-typedef DebounceCallback = void Function();
-
-class Debouncer {
-  DebounceCallback? callback;
-  final int? milliseconds;
-  Timer? _timer;
-
-  Debouncer({this.milliseconds});
-
-  run(DebounceCallback callback) {
-    if (_timer != null) {
-      _timer!.cancel();
-    }
-    _timer = Timer(Duration(milliseconds: milliseconds!), () {
-      callback();
-    });
-  }
-}

lib/pages/whisper_detail/widget/chat_item.dart

@@ -204,7 +204,7 @@ class ChatItem extends StatelessWidget {
                   final int cid = await SearchHttp.ab2c(bvid: bvid);
                   final String heroTag = Utils.makeHeroTag(bvid);
                   SmartDialog.dismiss<dynamic>().then(
-                    (e) => Get.toNamed<dynamic>('/video?bvid=$bvid&cid=$cid',
+                        (e) => Get.toNamed<dynamic>('/video?bvid=$bvid&cid=$cid',
                         arguments: <String, String?>{
                           'pic': content['thumb'],
                           'heroTag': heroTag,
@@ -352,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/router/app_pages.dart

@@ -44,8 +44,6 @@ 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';
@@ -162,10 +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()),
   ];
 }
 

lib/utils/global_data.dart

@@ -1,12 +0,0 @@
-class GlobalData {
-  int imgQuality = 10;
-
-  // 私有构造函数
-  GlobalData._();
-
-  // 单例实例
-  static final GlobalData _instance = GlobalData._();
-
-  // 获取全局实例
-  factory GlobalData() => _instance;
-}

lib/utils/storage.dart

@@ -1,10 +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 'global_data.dart';
 
 class GStrorage {
   static late final Box<dynamic> userInfo;
@@ -43,8 +44,6 @@ class GStrorage {
     );
     // 视频设置
     video = await Hive.openBox('video');
-    GlobalData().imgQuality =
-        setting.get(SettingBoxKey.defaultPicQa, defaultValue: 10); // 设置全局变量
   }
 
   static void regAdapter() {
@@ -136,8 +135,7 @@ class SettingBoxKey {
       hideSearchBar = 'hideSearchBar', // 收起顶栏
       hideTabBar = 'hideTabBar', // 收起底栏
       tabbarSort = 'tabbarSort', // 首页tabbar
-      dynamicBadgeMode = 'dynamicBadgeMode',
-      enableGradientBg = 'enableGradientBg';
+      dynamicBadgeMode = 'dynamicBadgeMode';
 }
 
 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")) {
-      videoUrl =
-          'https://proxy-tf-all-ws.bilivideo.com/?url=${Uri.encodeComponent(videoUrl)}';
-    } else if (videoUrl.contains("/upgcxcode/")) {
+    if (videoUrl.contains(".mcdn.bilivideo") ||
+        videoUrl.contains("/upgcxcode/")) {
       //CDN列表
       var cdnList = {
         'ali': 'upos-sz-mirrorali.bilivideo.com',