mod: 修改关于页面

fix: 修复焦点恢复时错误播放的问题

lib/common/widgets/http_error.dart

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

lib/common/widgets/stat/danmu.dart

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

lib/common/widgets/stat/view.dart

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

lib/common/widgets/video_card_h.dart

@@ -324,8 +324,9 @@ class VideoContent extends StatelessWidget {
                                           reSrc: 11,
                                         );
                                         SmartDialog.dismiss();
-                                        SmartDialog.showToast(
+                                        SmartDialog.showToast(res['code'] == 0
-                                            res['msg'] ?? '成功');
+                                            ? '成功'
+                                            : res['msg']);
                                       },
                                       child: const Text('确认'),
                                     )

lib/common/widgets/video_card_v.dart

@@ -1,6 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
+import '../../models/model_rec_video_item.dart';
+import 'stat/danmu.dart';
+import 'stat/view.dart';
 import '../../http/dynamics.dart';
 import '../../http/search.dart';
 import '../../http/user.dart';
@@ -158,12 +161,12 @@ class VideoCardV extends StatelessWidget {
                           height: maxHeight,
                         ),
                       ),
-                      if (videoItem.duration != null)
+                      if (videoItem.duration > 0)
                         if (crossAxisCount == 1) ...[
                           PBadge(
                             bottom: 10,
                             right: 10,
-                            text: videoItem.duration,
+                            text: Utils.timeFormat(videoItem.duration),
                           )
                         ] else ...[
                           PBadge(
@@ -171,7 +174,7 @@ class VideoCardV extends StatelessWidget {
                             right: 7,
                             size: 'small',
                             type: 'gray',
-                            text: videoItem.duration,
+                            text: Utils.timeFormat(videoItem.duration),
                           )
                         ],
                     ],
@@ -322,21 +325,31 @@ class VideoStat extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return RichText(
+    return Row(
-      maxLines: 1,
+      children: [
-      text: TextSpan(
+        StatView(
-        style: TextStyle(
+          theme: 'gray',
-          fontSize: MediaQuery.textScalerOf(context)
+          view: videoItem.stat.view,
-              .scale(Theme.of(context).textTheme.labelSmall!.fontSize!),
-          color: Theme.of(context).colorScheme.outline,
         ),
-        children: [
+        const SizedBox(width: 8),
-          if (videoItem.stat.view != '-')
+        StatDanMu(
-            TextSpan(text: '${videoItem.stat.view}观看'),
+          theme: 'gray',
-          if (videoItem.stat.danmu != '-')
+          danmu: videoItem.stat.danmu,
-            TextSpan(text: ' • ${videoItem.stat.danmu}弹幕'),
+        ),
-        ],
+        if (videoItem is RecVideoItemModel) ...<Widget>[
-      ),
+          const Spacer(),
+          RichText(
+            maxLines: 1,
+            text: TextSpan(
+                style: TextStyle(
+                  fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
+                  color: Theme.of(context).colorScheme.outline,
+                ),
+                text: Utils.formatTimestampToRelativeTime(videoItem.pubdate)),
+          ),
+          const SizedBox(width: 4),
+        ]
+      ],
     );
   }
 }

lib/http/api.dart

@@ -214,6 +214,9 @@ class Api {
   // https://api.bilibili.com/x/relation/tags
   static const String followingsClass = '/x/relation/tags';
 
+  // 搜索follow
+  static const followSearch = '/x/relation/followings/search';
+
   // 粉丝
   // vmid 用户id pn 页码 ps 每页个数，最大50 order: desc
   // order_type 排序规则 最近访问传空，最常访问传 attention
@@ -230,6 +233,10 @@ class Api {
   static const String liveRoomInfo =
       '${HttpString.liveBaseUrl}/xlive/web-room/v2/index/getRoomPlayInfo';
 
+  // 直播间详情 H5
+  static const String liveRoomInfoH5 =
+      '${HttpString.liveBaseUrl}/xlive/web-room/v1/index/getH5InfoByRoom';
+
   // 用户信息 需要Wbi签名
   // https://api.bilibili.com/x/space/wbi/acc/info?mid=503427686&token=&platform=web&web_location=1550101&w_rid=d709892496ce93e3d94d6d37c95bde91&wts=1689301482
   static const String memberInfo = '/x/space/wbi/acc/info';

lib/http/live.dart

@@ -1,5 +1,6 @@
 import '../models/live/item.dart';
 import '../models/live/room_info.dart';
+import '../models/live/room_info_h5.dart';
 import 'api.dart';
 import 'init.dart';
 
@@ -46,4 +47,22 @@ class LiveHttp {
       };
     }
   }
+
+  static Future liveRoomInfoH5({roomId, qn}) async {
+    var res = await Request().get(Api.liveRoomInfoH5, data: {
+      'room_id': roomId,
+    });
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': RoomInfoH5Model.fromJson(res.data['data'])
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
 }

lib/http/member.dart

@@ -101,10 +101,13 @@ class MemberHttp {
         'data': MemberArchiveDataModel.fromJson(res.data['data'])
       };
     } else {
+      Map errMap = {
+        -352: '风控校验失败，请检查登录状态',
+      };
       return {
         'status': false,
         'data': [],
-        'msg': res.data['message'],
+        'msg': errMap[res.data['code']] ?? res.data['message'],
       };
     }
   }
@@ -123,10 +126,13 @@ class MemberHttp {
         'data': DynamicsDataModel.fromJson(res.data['data']),
       };
     } else {
+      Map errMap = {
+        -352: '风控校验失败，请检查登录状态',
+      };
       return {
         'status': false,
         'data': [],
-        'msg': res.data['message'],
+        'msg': errMap[res.data['code']] ?? res.data['message'],
       };
     }
   }
@@ -461,4 +467,41 @@ class MemberHttp {
       };
     }
   }
+
+  // 搜索follow
+  static Future getfollowSearch({
+    required int mid,
+    required int ps,
+    required int pn,
+    required String name,
+  }) async {
+    Map<String, dynamic> data = {
+      'vmid': mid,
+      'pn': pn,
+      'ps': ps,
+      'order': 'desc',
+      'order_type': 'attention',
+      'gaia_source': 'main_web',
+      'name': name,
+      'web_location': 333.999,
+    };
+    Map params = await WbiSign().makSign(data);
+    var res = await Request().get(Api.followSearch, data: {
+      ...data,
+      'w_rid': params['w_rid'],
+      'wts': params['wts'],
+    });
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': FollowDataModel.fromJson(res.data['data'])
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
 }

lib/http/video.dart

@@ -9,6 +9,7 @@ import '../models/user/fav_folder.dart';
 import '../models/video/ai.dart';
 import '../models/video/play/url.dart';
 import '../models/video_detail_res.dart';
+import '../utils/recommend_filter.dart';
 import '../utils/storage.dart';
 import '../utils/wbi_sign.dart';
 import 'api.dart';
@@ -46,8 +47,13 @@ class VideoHttp {
             setting.get(SettingBoxKey.blackMidsList, defaultValue: [-1]);
         for (var i in res.data['data']['item']) {
           //过滤掉live与ad，以及拉黑用户
-          if (i['goto'] == 'av' && !blackMidsList.contains(i['owner']['mid'])) {
+          if (i['goto'] == 'av' &&
-            list.add(RecVideoItemModel.fromJson(i));
+              (i['owner'] != null &&
+                  !blackMidsList.contains(i['owner']['mid']))) {
+            RecVideoItemModel videoItem = RecVideoItemModel.fromJson(i);
+            if (!RecommendFilter.filter(videoItem)) {
+              list.add(videoItem);
+            }
           }
         }
         return {'status': true, 'data': list};
@@ -59,7 +65,9 @@ class VideoHttp {
     }
   }
 
-  static Future rcmdVideoListApp({int? ps, required int freshIdx}) async {
+  // 添加额外的loginState变量模拟未登录状态
+  static Future rcmdVideoListApp(
+      {bool loginStatus = true, required int freshIdx}) async {
     try {
       var res = await Request().get(
         Api.recommendListApp,
@@ -72,9 +80,11 @@ class VideoHttp {
           'device_name': 'vivo',
           'pull': freshIdx == 0 ? 'true' : 'false',
           'appkey': Constants.appKey,
-          'access_key': localCache
+          'access_key': loginStatus
-                  .get(LocalCacheKey.accessKey, defaultValue: {})['value'] ??
+              ? (localCache.get(LocalCacheKey.accessKey,
-              ''
+                      defaultValue: {})['value'] ??
+                  '')
+              : ''
         },
       );
       if (res.data['code'] == 0) {
@@ -87,12 +97,15 @@ class VideoHttp {
               (!enableRcmdDynamic ? i['card_goto'] != 'picture' : true) &&
               (i['args'] != null &&
                   !blackMidsList.contains(i['args']['up_mid']))) {
-            list.add(RecVideoItemAppModel.fromJson(i));
+            RecVideoItemAppModel videoItem = RecVideoItemAppModel.fromJson(i);
+            if (!RecommendFilter.filter(videoItem)) {
+              list.add(videoItem);
+            }
           }
         }
         return {'status': true, 'data': list};
       } else {
-        return {'status': false, 'data': [], 'msg': ''};
+        return {'status': false, 'data': [], 'msg': res.data['message']};
       }
     } catch (err) {
       return {'status': false, 'data': [], 'msg': err.toString()};
@@ -117,7 +130,7 @@ class VideoHttp {
         }
         return {'status': true, 'data': list};
       } else {
-        return {'status': false, 'data': []};
+        return {'status': false, 'data': [], 'msg': res.data['message']};
       }
     } catch (err) {
       return {'status': false, 'data': [], 'msg': err};
@@ -203,7 +216,10 @@ class VideoHttp {
     if (res.data['code'] == 0) {
       List<HotVideoItemModel> list = [];
       for (var i in res.data['data']) {
-        list.add(HotVideoItemModel.fromJson(i));
+        HotVideoItemModel videoItem = HotVideoItemModel.fromJson(i);
+        if (!RecommendFilter.filter(videoItem, relatedVideos: true)) {
+          list.add(videoItem);
+        }
       }
       return {'status': true, 'data': list};
     } else {
@@ -224,10 +240,11 @@ class VideoHttp {
   // 获取投币状态
   static Future hasCoinVideo({required String bvid}) async {
     var res = await Request().get(Api.hasCoinVideo, data: {'bvid': bvid});
+    print('res: $res');
     if (res.data['code'] == 0) {
       return {'status': true, 'data': res.data['data']};
     } else {
-      return {'status': true, 'data': []};
+      return {'status': false, 'data': []};
     }
   }
 
@@ -305,7 +322,7 @@ class VideoHttp {
     if (res.data['code'] == 0) {
       return {'status': true, 'data': res.data['data']};
     } else {
-      return {'status': false, 'data': []};
+      return {'status': false, 'data': [], 'msg': res.data['message']};
     }
   }
 
@@ -361,7 +378,7 @@ class VideoHttp {
     if (res.data['code'] == 0) {
       return {'status': true, 'data': res.data['data']};
     } else {
-      return {'status': true, 'data': []};
+      return {'status': false, 'data': []};
     }
   }
 
@@ -377,7 +394,7 @@ class VideoHttp {
     if (res.data['code'] == 0) {
       return {'status': true, 'data': res.data['data']};
     } else {
-      return {'status': true, 'data': []};
+      return {'status': false, 'data': []};
     }
   }
 
@@ -433,6 +450,8 @@ class VideoHttp {
     });
     if (res.data['code'] == 0) {
       return {'status': true, 'data': res.data['data']};
+    } else {
+      return {'status': false, 'data': null, 'msg': res.data['message']};
     }
   }
 
@@ -453,10 +472,7 @@ class VideoHttp {
         'data': AiConclusionModel.fromJson(res.data['data']),
       };
     } else {
-      return {
+      return {'status': false, 'data': []};
-        'status': false,
-        'data': []
-      };
     }
   }
 }

lib/main.dart

@@ -21,6 +21,7 @@ import 'package:pilipala/utils/app_scheme.dart';
 import 'package:pilipala/utils/data.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:media_kit/media_kit.dart'; // Provides [Player], [Media], [Playlist] etc.
+import 'package:pilipala/utils/recommend_filter.dart';
 import 'package:catcher_2/catcher_2.dart';
 import './services/loggeer.dart';
 
@@ -34,6 +35,7 @@ void main() async {
     await setupServiceLocator();
     Request();
     await Request.setCookie();
+    RecommendFilter();
 
     // 异常捕获 logo记录
     final Catcher2Options debugConfig = Catcher2Options(
@@ -68,7 +70,6 @@ void main() async {
       statusBarColor: Colors.transparent,
     ));
     Data.init();
-    GStrorage.lazyInit();
     PiliSchame.init();
   });
 }

lib/models/common/dynamic_badge_mode.dart

@@ -0,0 +1,9 @@
+enum DynamicBadgeMode { hidden, point, number }
+
+extension DynamicBadgeModeDesc on DynamicBadgeMode {
+  String get description => ['隐藏', '红点', '数字'][index];
+}
+
+extension DynamicBadgeModeCode on DynamicBadgeMode {
+  int get code => [0, 1, 2][index];
+}

lib/models/common/rcmd_type.dart

@@ -1,7 +1,7 @@
 // 首页推荐类型
-enum RcmdType { web, app }
+enum RcmdType { web, app, notLogin }
 
 extension RcmdTypeExtension on RcmdType {
-  String get values => ['web', 'app'][index];
+  String get values => ['web', 'app', 'notLogin'][index];
-  String get labels => ['web端', 'app端'][index];
+  String get labels => ['web端', 'app端', '游客模式'][index];
 }

lib/models/common/reply_sort_type.dart

@@ -1,6 +1,6 @@
-enum ReplySortType { time, like, reply }
+enum ReplySortType { time, like }
 
 extension ReplySortTypeExtension on ReplySortType {
-  String get titles => ['最新评论', '最热评论', '回复最多'][index];
+  String get titles => ['最新评论', '最热评论'][index];
-  String get labels => ['最新', '最热', '最多回复'][index];
+  String get labels => ['最新', '最热'][index];
 }

lib/models/github/latest.dart

@@ -17,8 +17,9 @@ class LatestDataModel {
     url = json['url'];
     tagName = json['tag_name'];
     createdAt = json['created_at'];
-    assets =
+    assets = json['assets'] != null
-        json['assets'].map<AssetItem>((e) => AssetItem.fromJson(e)).toList();
+        ? json['assets'].map<AssetItem>((e) => AssetItem.fromJson(e)).toList()
+        : [];
     body = json['body'];
   }
 }

lib/models/home/rcmd/result.dart

@@ -1,3 +1,5 @@
+import 'package:pilipala/utils/id_utils.dart';
+
 class RecVideoItemAppModel {
   RecVideoItemAppModel({
     this.id,
@@ -28,7 +30,7 @@ class RecVideoItemAppModel {
   int? cid;
   String? pic;
   RcmdStat? stat;
-  String? duration;
+  int? duration;
   String? title;
   int? isFollowed;
   RcmdOwner? owner;
@@ -50,17 +52,32 @@ class RecVideoItemAppModel {
         ? json['player_args']['aid']
         : int.parse(json['param'] ?? '-1');
     aid = json['player_args'] != null ? json['player_args']['aid'] : -1;
-    bvid = null;
+    bvid = json['player_args'] != null
+        ? IdUtils.av2bv(json['player_args']['aid'])
+        : '';
     cid = json['player_args'] != null ? json['player_args']['cid'] : -1;
     pic = json['cover'];
     stat = RcmdStat.fromJson(json);
-    duration = json['cover_right_text'];
+    // 改用player_args中的duration作为原始数据（秒数）
+    duration =
+        json['player_args'] != null ? json['player_args']['duration'] : -1;
+    //duration = json['cover_right_text'];
     title = json['title'];
-    isFollowed = 0;
     owner = RcmdOwner.fromJson(json);
     rcmdReason = json['rcmd_reason_style'] != null
         ? RcmdReason.fromJson(json['rcmd_reason_style'])
         : null;
+    // 由于app端api并不会直接返回与owner的关注状态
+    // 所以借用推荐原因是否为“已关注”、“新关注”等判别关注状态，从而与web端接口等效
+    isFollowed = rcmdReason != null &&
+            rcmdReason!.content != null &&
+            rcmdReason!.content!.contains('关注')
+        ? 1
+        : 0;
+    // 如果是，就无需再显示推荐原因，交由view统一处理即可
+    if (isFollowed == 1) {
+      rcmdReason = null;
+    }
     goto = json['goto'];
     param = int.parse(json['param']);
     uri = json['uri'];

lib/models/live/room_info_h5.dart

@@ -0,0 +1,130 @@
+class RoomInfoH5Model {
+  RoomInfoH5Model({
+    this.roomInfo,
+    this.anchorInfo,
+    this.isRoomFeed,
+    this.watchedShow,
+    this.likeInfoV3,
+    this.blockInfo,
+  });
+
+  RoomInfo? roomInfo;
+  AnchorInfo? anchorInfo;
+  int? isRoomFeed;
+  Map? watchedShow;
+  LikeInfoV3? likeInfoV3;
+  Map? blockInfo;
+
+  RoomInfoH5Model.fromJson(Map<String, dynamic> json) {
+    roomInfo = RoomInfo.fromJson(json['room_info']);
+    anchorInfo = AnchorInfo.fromJson(json['anchor_info']);
+    isRoomFeed = json['is_room_feed'];
+    watchedShow = json['watched_show'];
+    likeInfoV3 = LikeInfoV3.fromJson(json['like_info_v3']);
+    blockInfo = json['block_info'];
+  }
+}
+
+class RoomInfo {
+  RoomInfo({
+    this.uid,
+    this.roomId,
+    this.title,
+    this.cover,
+    this.description,
+    this.liveStatus,
+    this.liveStartTime,
+    this.areaId,
+    this.areaName,
+    this.parentAreaId,
+    this.parentAreaName,
+    this.online,
+    this.background,
+    this.appBackground,
+    this.liveId,
+  });
+
+  int? uid;
+  int? roomId;
+  String? title;
+  String? cover;
+  String? description;
+  int? liveStatus;
+  int? liveStartTime;
+  int? areaId;
+  String? areaName;
+  int? parentAreaId;
+  String? parentAreaName;
+  int? online;
+  String? background;
+  String? appBackground;
+  String? liveId;
+
+  RoomInfo.fromJson(Map<String, dynamic> json) {
+    uid = json['uid'];
+    roomId = json['room_id'];
+    title = json['title'];
+    cover = json['cover'];
+    description = json['description'];
+    liveStatus = json['liveS_satus'];
+    liveStartTime = json['live_start_time'];
+    areaId = json['area_id'];
+    areaName = json['area_name'];
+    parentAreaId = json['parent_area_id'];
+    parentAreaName = json['parent_area_name'];
+    online = json['online'];
+    background = json['background'];
+    appBackground = json['app_background'];
+    liveId = json['live_id'];
+  }
+}
+
+class AnchorInfo {
+  AnchorInfo({
+    this.baseInfo,
+    this.relationInfo,
+  });
+
+  BaseInfo? baseInfo;
+  RelationInfo? relationInfo;
+
+  AnchorInfo.fromJson(Map<String, dynamic> json) {
+    baseInfo = BaseInfo.fromJson(json['base_info']);
+    relationInfo = RelationInfo.fromJson(json['relation_info']);
+  }
+}
+
+class BaseInfo {
+  BaseInfo({
+    this.uname,
+    this.face,
+  });
+
+  String? uname;
+  String? face;
+
+  BaseInfo.fromJson(Map<String, dynamic> json) {
+    uname = json['uname'];
+    face = json['face'];
+  }
+}
+
+class RelationInfo {
+  RelationInfo({this.attention});
+
+  int? attention;
+
+  RelationInfo.fromJson(Map<String, dynamic> json) {
+    attention = json['attention'];
+  }
+}
+
+class LikeInfoV3 {
+  LikeInfoV3({this.totalLikes});
+
+  int? totalLikes;
+
+  LikeInfoV3.fromJson(Map<String, dynamic> json) {
+    totalLikes = json['total_likes'];
+  }
+}

lib/models/member/archive.dart

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

lib/models/model_rec_video_item.dart

@@ -1,5 +1,3 @@
-import 'package:pilipala/utils/utils.dart';
-
 import './model_owner.dart';
 import 'package:hive/hive.dart';
 
@@ -38,7 +36,7 @@ class RecVideoItemModel {
   @HiveField(6)
   String? title = '';
   @HiveField(7)
-  String? duration = '';
+  int? duration = -1;
   @HiveField(8)
   int? pubdate = -1;
   @HiveField(9)
@@ -58,7 +56,7 @@ class RecVideoItemModel {
     uri = json["uri"];
     pic = json["pic"];
     title = json["title"];
-    duration = Utils.tampToSeektime(json["duration"]);
+    duration = json["duration"];
     pubdate = json["pubdate"];
     owner = Owner.fromJson(json["owner"]);
     stat = Stat.fromJson(json["stat"]);
@@ -77,14 +75,15 @@ class Stat {
     this.danmu,
   });
   @HiveField(0)
-  String? view;
+  int? view;
   @HiveField(1)
   int? like;
   @HiveField(2)
   int? danmu;
 
   Stat.fromJson(Map<String, dynamic> json) {
-    view = Utils.numFormat(json["view"]);
+    // 无需在model中转换以保留原始数据，在view层处理即可
+    view = json["view"];
     like = json["like"];
     danmu = json['danmaku'];
   }

lib/models/model_rec_video_item.g.dart

@@ -24,7 +24,7 @@ class RecVideoItemModelAdapter extends TypeAdapter<RecVideoItemModel> {
       uri: fields[4] as String?,
       pic: fields[5] as String?,
       title: fields[6] as String?,
-      duration: fields[7] as String?,
+      duration: fields[7] as int?,
       pubdate: fields[8] as int?,
       owner: fields[9] as Owner?,
       stat: fields[10] as Stat?,
@@ -87,7 +87,7 @@ class StatAdapter extends TypeAdapter<Stat> {
       for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
     };
     return Stat(
-      view: fields[0] as String?,
+      view: fields[0] as int?,
       like: fields[1] as int?,
       danmu: fields[2] as int?,
     );

lib/models/video/play/url.dart

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

lib/pages/about/index.dart

@@ -7,6 +7,7 @@ import 'package:pilipala/http/index.dart';
 import 'package:pilipala/models/github/latest.dart';
 import 'package:pilipala/utils/utils.dart';
 import 'package:url_launcher/url_launcher.dart';
+import '../../utils/cache_manage.dart';
 
 class AboutPage extends StatefulWidget {
   const AboutPage({super.key});
@@ -17,6 +18,19 @@ class AboutPage extends StatefulWidget {
 
 class _AboutPageState extends State<AboutPage> {
   final AboutController _aboutController = Get.put(AboutController());
+  String cacheSize = '';
+
+  @override
+  void initState() {
+    super.initState();
+    // 读取缓存占用
+    getCacheSize();
+  }
+
+  Future<void> getCacheSize() async {
+    final res = await CacheManage().loadApplicationCache();
+    setState(() => cacheSize = res);
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -39,29 +53,54 @@ class _AboutPageState extends State<AboutPage> {
               style: Theme.of(context).textTheme.titleMedium,
             ),
             const SizedBox(height: 6),
-            Text(
-              '使用Flutter开发的哔哩哔哩第三方客户端',
-              style: TextStyle(color: Theme.of(context).colorScheme.outline),
-            ),
-            const SizedBox(height: 20),
             Obx(
-              () => ListTile(
+              () => Badge(
-                title: const Text('当前版本'),
+                isLabelVisible: _aboutController.isLoading.value
-                trailing: Text(_aboutController.currentVersion.value,
+                    ? false
-                    style: subTitleStyle),
+                    : _aboutController.isUpdate.value,
-              ),
+                label: const Text('New'),
-            ),
+                child: Padding(
-            Obx(
+                  padding: const EdgeInsets.fromLTRB(0, 0, 0, 30),
-              () => ListTile(
+                  child: FilledButton.tonal(
-                onTap: () => _aboutController.onUpdate(),
+                    onPressed: () {
-                title: const Text('最新版本'),
+                      showModalBottomSheet(
-                trailing: Text(
+                        context: context,
-                  _aboutController.isLoading.value
+                        builder: (context) {
-                      ? '正在获取'
+                          return Column(
-                      : _aboutController.isUpdate.value
+                            mainAxisSize: MainAxisSize.min,
-                          ? '有新版本  ❤️${_aboutController.remoteVersion.value}'
+                            children: [
-                          : '当前已是最新版',
+                              ListTile(
-                  style: subTitleStyle,
+                                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,
+                      ),
+                    ),
+                  ),
                 ),
               ),
             ),
@@ -73,14 +112,9 @@ class _AboutPageState extends State<AboutPage> {
             //     size: 16,
             //   ),
             // ),
-            Divider(
-              thickness: 1,
-              height: 30,
-              color: Theme.of(context).colorScheme.outlineVariant,
-            ),
             ListTile(
               onTap: () => _aboutController.githubUrl(),
-              title: const Text('Github'),
+              title: const Text('开源地址'),
               trailing: Text(
                 'github.com/guozhigq/pilipala',
                 style: subTitleStyle,
@@ -115,19 +149,43 @@ class _AboutPageState extends State<AboutPage> {
               ),
             ),
             ListTile(
-              onTap: () => _aboutController.qqChanel(),
+              onTap: () {
-              title: const Text('QQ群'),
+                showModalBottomSheet(
+                  context: context,
+                  builder: (context) {
+                    return Column(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        ListTile(
+                          onTap: () => _aboutController.qqChanel(),
+                          title: const Text('QQ群'),
+                          trailing: Text(
+                            '616150809',
+                            style: subTitleStyle,
+                          ),
+                        ),
+                        ListTile(
+                          onTap: () => _aboutController.tgChanel(),
+                          title: const Text('TG频道'),
+                          trailing: Text(
+                            'https://t.me/+lm_oOVmF0RJiODk1',
+                            style: subTitleStyle,
+                          ),
+                        ),
+                        SizedBox(
+                            height: MediaQuery.of(context).padding.bottom + 20)
+                      ],
+                    );
+                  },
+                );
+              },
+              title: const Text('交流社区'),
               trailing: Icon(
                 Icons.arrow_forward_ios,
                 size: 16,
                 color: outline,
               ),
             ),
-            ListTile(
-              onTap: () => _aboutController.tgChanel(),
-              title: const Text('TG频道'),
-              trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline),
-            ),
             ListTile(
               onTap: () => _aboutController.aPay(),
               title: const Text('赞助'),
@@ -138,6 +196,18 @@ class _AboutPageState extends State<AboutPage> {
               title: const Text('错误日志'),
               trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline),
             ),
+            ListTile(
+              onTap: () async {
+                var cleanStatus = await CacheManage().clearCacheAll();
+                if (cleanStatus) {
+                  getCacheSize();
+                }
+              },
+              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)
           ],
         ),
       ),
@@ -205,11 +275,26 @@ class AboutController extends GetxController {
     );
   }
 
+  githubRelease() {
+    launchUrl(
+      Uri.parse('https://github.com/guozhigq/pilipala/release'),
+      mode: LaunchMode.externalApplication,
+    );
+  }
+
   // 从网盘下载
   panDownload() {
-    launchUrl(
+    Clipboard.setData(
-      Uri.parse('https://www.123pan.com/s/9sVqVv-flu0A.html'),
+      const ClipboardData(text: 'pili'),
-      mode: LaunchMode.externalApplication,
+    );
+    SmartDialog.showToast(
+      '已复制提取码：pili',
+      displayTime: const Duration(milliseconds: 500),
+    ).then(
+      (value) => launchUrl(
+        Uri.parse('https://www.123pan.com/s/9sVqVv-flu0A.html'),
+        mode: LaunchMode.externalApplication,
+      ),
     );
   }
 
@@ -225,7 +310,7 @@ class AboutController extends GetxController {
   // qq频道
   qqChanel() {
     Clipboard.setData(
-      const ClipboardData(text: '489981949'),
+      const ClipboardData(text: '616150809'),
     );
     SmartDialog.showToast('已复制QQ群号');
   }
@@ -266,6 +351,13 @@ class AboutController extends GetxController {
     );
   }
 
+  qimiao() {
+    launchUrl(
+      Uri.parse('https://www.magicalapk.com/home'),
+      mode: LaunchMode.externalApplication,
+    );
+  }
+
   // 日志
   logs() {
     Get.toNamed('/logs');

lib/pages/bangumi/introduction/controller.dart

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

lib/pages/bangumi/view.dart

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

lib/pages/bangumi/widgets/bangumi_panel.dart

@@ -151,7 +151,7 @@ class _BangumiPanelState extends State<BangumiPanel> {
   }
 
   void changeFucCall(item, i) async {
-    if (item.badge != null && vipStatus != 1) {
+    if (item.badge != null && item.badge == '会员' && vipStatus != 1) {
       SmartDialog.showToast('需要大会员');
       return;
     }
@@ -255,11 +255,24 @@ class _BangumiPanelState extends State<BangumiPanel> {
                               ),
                               const SizedBox(width: 2),
                               if (widget.pages[i].badge != null) ...[
-                                Image.asset(
+                                if (widget.pages[i].badge == '会员') ...[
-                                  'assets/images/big-vip.png',
+                                  Image.asset(
-                                  height: 16,
+                                    'assets/images/big-vip.png',
-                                ),
+                                    height: 16,
-                              ],
+                                  ),
+                                ],
+                                if (widget.pages[i].badge != '会员') ...[
+                                  const Spacer(),
+                                  Text(
+                                    widget.pages[i].badge!,
+                                    style: TextStyle(
+                                      fontSize: 11,
+                                      color:
+                                          Theme.of(context).colorScheme.primary,
+                                    ),
+                                  ),
+                                ],
+                              ]
                             ],
                           ),
                           const SizedBox(height: 3),

lib/pages/dynamics/detail/controller.dart

@@ -37,6 +37,10 @@ class DynamicDetailController extends GetxController {
     }
     int deaultReplySortIndex =
         setting.get(SettingBoxKey.replySortType, defaultValue: 0);
+    if (deaultReplySortIndex == 2) {
+      setting.put(SettingBoxKey.replySortType, 0);
+      deaultReplySortIndex = 0;
+    }
     _sortType = ReplySortType.values[deaultReplySortIndex];
     sortTypeTitle.value = _sortType.titles;
     sortTypeLabel.value = _sortType.labels;
@@ -92,9 +96,6 @@ class DynamicDetailController extends GetxController {
         _sortType = ReplySortType.like;
         break;
       case ReplySortType.like:
-        _sortType = ReplySortType.reply;
-        break;
-      case ReplySortType.reply:
         _sortType = ReplySortType.time;
         break;
       default:

lib/pages/dynamics/view.dart

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

lib/pages/dynamics/widgets/up_panel.dart

@@ -36,8 +36,7 @@ class _UpPanelState extends State<UpPanel> {
     }
     upList.insert(
       0,
-      UpItem(
+      UpItem(face: '', uname: '全部动态', mid: -1),
-          face: 'https://files.catbox.moe/8uc48f.png', uname: '全部动态', mid: -1),
     );
     userInfo = userInfoCache.get('userInfoCache');
     upList.insert(
@@ -56,7 +55,7 @@ class _UpPanelState extends State<UpPanel> {
       floating: true,
       pinned: false,
       delegate: _SliverHeaderDelegate(
-          height: 124,
+          height: 126,
           child: Column(
             mainAxisAlignment: MainAxisAlignment.start,
             crossAxisAlignment: CrossAxisAlignment.start,
@@ -121,6 +120,13 @@ class _UpPanelState extends State<UpPanel> {
                   ],
                 ),
               ),
+              Container(
+                height: 6,
+                color: Theme.of(context)
+                    .colorScheme
+                    .onInverseSurface
+                    .withOpacity(0.5),
+              ),
             ],
           )),
     );
@@ -171,6 +177,9 @@ class _UpPanelState extends State<UpPanel> {
       },
       onLongPress: () {
         feedBack();
+        if (data.mid == -1) {
+          return;
+        }
         String heroTag = Utils.makeHeroTag(data.mid);
         Get.toNamed('/member?mid=${data.mid}',
             arguments: {'face': data.face, 'heroTag': heroTag});
@@ -198,12 +207,19 @@ class _UpPanelState extends State<UpPanel> {
                 backgroundColor: data.type == 'live'
                     ? Theme.of(context).colorScheme.secondaryContainer
                     : Theme.of(context).colorScheme.primary,
-                child: NetworkImgLayer(
+                child: data.face != ''
-                  width: 49,
+                    ? NetworkImgLayer(
-                  height: 49,
+                        width: 50,
-                  src: data.face,
+                        height: 50,
-                  type: 'avatar',
+                        src: data.face,
-                ),
+                        type: 'avatar',
+                      )
+                    : const CircleAvatar(
+                        radius: 25,
+                        backgroundImage: AssetImage(
+                          'assets/images/noface.jpeg',
+                        ),
+                      ),
               ),
               Padding(
                 padding: const EdgeInsets.only(top: 4),
@@ -271,13 +287,11 @@ class UpPanelSkeleton extends StatelessWidget {
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
               Container(
-                width: 49,
+                width: 50,
-                height: 49,
+                height: 50,
                 decoration: BoxDecoration(
                   color: Theme.of(context).colorScheme.onInverseSurface,
-                  borderRadius: const BorderRadius.all(
+                  borderRadius: BorderRadius.circular(50),
-                    Radius.circular(24),
-                  ),
                 ),
               ),
               Container(

lib/pages/fav_detail/controller.dart

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

lib/pages/fav_detail/view.dart

@@ -24,11 +24,14 @@ class _FavDetailPageState extends State<FavDetailPage> {
       Get.put(FavDetailController());
   late StreamController<bool> titleStreamC; // a
   Future? _futureBuilderFuture;
+  late String mediaId;
 
   @override
   void initState() {
     super.initState();
+    mediaId = Get.parameters['mediaId']!;
     _futureBuilderFuture = _favDetailController.queryUserFavFolderDetail();
+    mediaId = Get.parameters['mediaId']!;
     titleStreamC = StreamController<bool>();
     _controller.addListener(
       () {
@@ -94,8 +97,8 @@ class _FavDetailPageState extends State<FavDetailPage> {
             ),
             actions: [
               IconButton(
-                onPressed: () => Get.toNamed(
+                onPressed: () =>
-                    '/favSearch?searchType=0&mediaId=${Get.parameters['mediaId']!}'),
+                    Get.toNamed('/favSearch?searchType=0&mediaId=$mediaId'),
                 icon: const Icon(Icons.search_outlined),
               ),
               //   IconButton(

lib/pages/fav_detail/widget/fav_video_card.dart

@@ -9,14 +9,20 @@ import 'package:pilipala/models/common/search_type.dart';
 import 'package:pilipala/utils/id_utils.dart';
 import 'package:pilipala/utils/utils.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
+import '../../../common/widgets/badge.dart';
 
 // 收藏视频卡片 - 水平布局
 class FavVideoCardH extends StatelessWidget {
   final dynamic videoItem;
   final Function? callFn;
+  final int? searchType;
 
-  const FavVideoCardH({Key? key, required this.videoItem, this.callFn})
+  const FavVideoCardH({
-      : super(key: key);
+    Key? key,
+    required this.videoItem,
+    this.callFn,
+    this.searchType,
+  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -27,7 +33,9 @@ class FavVideoCardH extends StatelessWidget {
       onTap: () async {
         // int? seasonId;
         String? epId;
-        if (videoItem.ogv != null && videoItem.ogv['type_name'] == '番剧') {
+        if (videoItem.ogv != null &&
+            (videoItem.ogv['type_name'] == '番剧' ||
+                videoItem.ogv['type_name'] == '国创')) {
           videoItem.cid = await SearchHttp.ab2c(bvid: bvid);
           // seasonId = videoItem.ogv['season_id'];
           epId = videoItem.epId;
@@ -84,28 +92,31 @@ class FavVideoCardH extends StatelessWidget {
                                     height: maxHeight,
                                   ),
                                 ),
-                                Positioned(
+                                PBadge(
-                                  right: 4,
+                                  text: Utils.timeFormat(videoItem.duration!),
-                                  bottom: 4,
+                                  right: 6.0,
-                                  child: Container(
+                                  bottom: 6.0,
-                                    padding: const EdgeInsets.symmetric(
+                                  type: 'gray',
-                                        vertical: 1, horizontal: 6),
+                                ),
-                                    decoration: BoxDecoration(
+                                if (videoItem.ogv != null) ...[
-                                        borderRadius: BorderRadius.circular(4),
+                                  PBadge(
-                                        color: Colors.black54.withOpacity(0.4)),
+                                    text: videoItem.ogv['type_name'],
-                                    child: Text(
+                                    top: 6.0,
-                                      Utils.timeFormat(videoItem.duration!),
+                                    right: 6.0,
-                                      style: const TextStyle(
+                                    bottom: null,
-                                          fontSize: 11, color: Colors.white),
+                                    left: null,
-                                    ),
                                   ),
-                                )
+                                ],
                               ],
                             );
                           },
                         ),
                       ),
-                      VideoContent(videoItem: videoItem, callFn: callFn)
+                      VideoContent(
+                        videoItem: videoItem,
+                        callFn: callFn,
+                        searchType: searchType,
+                      )
                     ],
                   ),
                 );
@@ -121,93 +132,123 @@ class FavVideoCardH extends StatelessWidget {
 class VideoContent extends StatelessWidget {
   final dynamic videoItem;
   final Function? callFn;
-  const VideoContent({super.key, required this.videoItem, this.callFn});
+  final int? searchType;
+  const VideoContent({
+    super.key,
+    required this.videoItem,
+    this.callFn,
+    this.searchType,
+  });
 
   @override
   Widget build(BuildContext context) {
     return Expanded(
       child: Padding(
         padding: const EdgeInsets.fromLTRB(10, 2, 6, 0),
-        child: Column(
+        child: Stack(
-          crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Text(
+            Column(
-              videoItem.title,
+              crossAxisAlignment: CrossAxisAlignment.start,
-              textAlign: TextAlign.start,
-              style: const TextStyle(
-                fontWeight: FontWeight.w500,
-                letterSpacing: 0.3,
-              ),
-              maxLines: 2,
-              overflow: TextOverflow.ellipsis,
-            ),
-            const Spacer(),
-            Text(
-              Utils.dateFormat(videoItem.ctime!),
-              style: TextStyle(
-                  fontSize: 11, color: Theme.of(context).colorScheme.outline),
-            ),
-            Text(
-              videoItem.owner.name,
-              style: TextStyle(
-                fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
-                color: Theme.of(context).colorScheme.outline,
-              ),
-            ),
-            Row(
               children: [
-                StatView(
+                Text(
-                  theme: 'gray',
+                  videoItem.title,
-                  view: videoItem.cntInfo['play'],
+                  textAlign: TextAlign.start,
+                  style: const TextStyle(
+                    fontWeight: FontWeight.w500,
+                    letterSpacing: 0.3,
+                  ),
+                  maxLines: 2,
+                  overflow: TextOverflow.ellipsis,
                 ),
-                const SizedBox(width: 8),
+                if (videoItem.ogv != null) ...[
-                StatDanMu(theme: 'gray', danmu: videoItem.cntInfo['danmaku']),
+                  Text(
-                const Spacer(),
+                    videoItem.intro,
-                SizedBox(
+                    style: TextStyle(
-                  width: 26,
+                      fontSize:
-                  height: 26,
+                          Theme.of(context).textTheme.labelMedium!.fontSize,
-                  child: IconButton(
-                    style: ButtonStyle(
-                      padding: MaterialStateProperty.all(EdgeInsets.zero),
-                    ),
-                    onPressed: () {
-                      showDialog(
-                        context: Get.context!,
-                        builder: (context) {
-                          return AlertDialog(
-                            title: const Text('提示'),
-                            content: const Text('要取消收藏吗?'),
-                            actions: [
-                              TextButton(
-                                  onPressed: () => Get.back(),
-                                  child: Text(
-                                    '取消',
-                                    style: TextStyle(
-                                        color: Theme.of(context)
-                                            .colorScheme
-                                            .outline),
-                                  )),
-                              TextButton(
-                                onPressed: () async {
-                                  await callFn!();
-                                  Get.back();
-                                },
-                                child: const Text('确定取消'),
-                              )
-                            ],
-                          );
-                        },
-                      );
-                    },
-                    icon: Icon(
-                      Icons.clear_outlined,
                       color: Theme.of(context).colorScheme.outline,
-                      size: 18,
                     ),
                   ),
+                ],
+                const Spacer(),
+                Text(
+                  Utils.dateFormat(videoItem.favTime),
+                  style: TextStyle(
+                      fontSize: 11,
+                      color: Theme.of(context).colorScheme.outline),
+                ),
+                if (videoItem.owner.name != '') ...[
+                  Text(
+                    videoItem.owner.name,
+                    style: TextStyle(
+                      fontSize:
+                          Theme.of(context).textTheme.labelMedium!.fontSize,
+                      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(),
+                    ],
+                  ),
                 ),
               ],
             ),
+            searchType != 1
+                ? Positioned(
+                    right: 0,
+                    bottom: -4,
+                    child: IconButton(
+                      style: ButtonStyle(
+                        padding: MaterialStateProperty.all(EdgeInsets.zero),
+                      ),
+                      onPressed: () {
+                        showDialog(
+                          context: Get.context!,
+                          builder: (context) {
+                            return AlertDialog(
+                              title: const Text('提示'),
+                              content: const Text('要取消收藏吗?'),
+                              actions: [
+                                TextButton(
+                                    onPressed: () => Get.back(),
+                                    child: Text(
+                                      '取消',
+                                      style: TextStyle(
+                                          color: Theme.of(context)
+                                              .colorScheme
+                                              .outline),
+                                    )),
+                                TextButton(
+                                  onPressed: () async {
+                                    await callFn!();
+                                    Get.back();
+                                  },
+                                  child: const Text('确定取消'),
+                                )
+                              ],
+                            );
+                          },
+                        );
+                      },
+                      icon: Icon(
+                        Icons.clear_outlined,
+                        color: Theme.of(context).colorScheme.outline,
+                        size: 18,
+                      ),
+                    ),
+                  )
+                : const SizedBox(),
           ],
         ),
       ),

lib/pages/fav_search/controller.dart

@@ -1,8 +1,11 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/http/user.dart';
 import 'package:pilipala/models/user/fav_detail.dart';
 
+import '../../http/video.dart';
+
 class FavSearchController extends GetxController {
   final ScrollController scrollController = ScrollController();
   Rx<TextEditingController> controller = TextEditingController().obs;
@@ -72,4 +75,19 @@ class FavSearchController extends GetxController {
     if (!hasMore) return;
     searchFav(type: 'onLoad');
   }
+
+  onCancelFav(int id) async {
+    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;
+        }
+      }
+      SmartDialog.showToast('取消收藏');
+    }
+  }
 }

lib/pages/fav_search/view.dart

@@ -8,9 +8,7 @@ import 'package:pilipala/pages/fav_detail/widget/fav_video_card.dart';
 import 'controller.dart';
 
 class FavSearchPage extends StatefulWidget {
-  final int? sourceType;
+  const FavSearchPage({super.key});
-  final int? mediaId;
-  const FavSearchPage({super.key, this.sourceType, this.mediaId});
 
   @override
   State<FavSearchPage> createState() => _FavSearchPageState();
@@ -19,11 +17,12 @@ class FavSearchPage extends StatefulWidget {
 class _FavSearchPageState extends State<FavSearchPage> {
   final FavSearchController _favSearchCtr = Get.put(FavSearchController());
   late ScrollController scrollController;
+  late int searchType;
 
   @override
   void initState() {
     super.initState();
-
+    searchType = int.parse(Get.parameters['searchType']!);
     scrollController = _favSearchCtr.scrollController;
     scrollController.addListener(
       () {
@@ -100,7 +99,11 @@ class _FavSearchPageState extends State<FavSearchPage> {
                       } else {
                         return FavVideoCardH(
                           videoItem: _favSearchCtr.favList[index],
-                          callFn: () => null,
+                          searchType: searchType,
+                          callFn: () => searchType != 1
+                              ? _favSearchCtr
+                                  .onCancelFav(_favSearchCtr.favList[index].id!)
+                              : {},
                         );
                       }
                     },

lib/pages/follow/view.dart

@@ -37,6 +37,29 @@ class _FollowPageState extends State<FollowPage> {
               : '${_followController.name}的关注',
           style: Theme.of(context).textTheme.titleMedium,
         ),
+        actions: [
+          IconButton(
+            onPressed: () => Get.toNamed('/followSearch?mid=$mid'),
+            icon: const Icon(Icons.search_outlined),
+          ),
+          PopupMenuButton(
+            icon: const Icon(Icons.more_vert),
+            itemBuilder: (BuildContext context) => <PopupMenuEntry>[
+              PopupMenuItem(
+                onTap: () => Get.toNamed('/blackListPage'),
+                child: const Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    Icon(Icons.block, size: 19),
+                    SizedBox(width: 10),
+                    Text('黑名单管理'),
+                  ],
+                ),
+              )
+            ],
+          ),
+          const SizedBox(width: 6),
+        ],
       ),
       body: Obx(
         () => !_followController.isOwner.value
@@ -87,3 +110,22 @@ class _FollowPageState extends State<FollowPage> {
     );
   }
 }
+
+class _FakeAPI {
+  static const List<String> _kOptions = <String>[
+    'aardvark',
+    'bobcat',
+    'chameleon',
+  ];
+  // Searches the options, but injects a fake "network" delay.
+  static Future<Iterable<String>> search(String query) async {
+    await Future<void>.delayed(
+        const Duration(seconds: 1)); // Fake 1 second delay.
+    if (query == '') {
+      return const Iterable<String>.empty();
+    }
+    return _kOptions.where((String option) {
+      return option.contains(query.toLowerCase());
+    });
+  }
+}

lib/pages/follow/widgets/follow_item.dart

@@ -42,7 +42,7 @@ class FollowItem extends StatelessWidget {
         overflow: TextOverflow.ellipsis,
       ),
       dense: true,
-      trailing: ctr!.isOwner.value
+      trailing: ctr != null && ctr!.isOwner.value
           ? SizedBox(
               height: 34,
               child: TextButton(

lib/pages/follow_search/controller.dart

@@ -0,0 +1,73 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/http/member.dart';
+
+import '../../models/follow/result.dart';
+
+class FollowSearchController extends GetxController {
+  Rx<TextEditingController> controller = TextEditingController().obs;
+  final FocusNode searchFocusNode = FocusNode();
+  RxString searchKeyWord = ''.obs;
+  String hintText = '搜索';
+  RxString loadingStatus = 'init'.obs;
+  late int mid = 1;
+  RxString uname = ''.obs;
+  int ps = 20;
+  int pn = 1;
+  RxList<FollowItemModel> followList = <FollowItemModel>[].obs;
+  RxInt total = 0.obs;
+
+  @override
+  void onInit() {
+    super.onInit();
+    mid = int.parse(Get.parameters['mid']!);
+  }
+
+  // 清空搜索
+  void onClear() {
+    if (searchKeyWord.value.isNotEmpty && controller.value.text != '') {
+      controller.value.clear();
+      searchKeyWord.value = '';
+    } else {
+      Get.back();
+    }
+  }
+
+  void onChange(value) {
+    searchKeyWord.value = value;
+  }
+
+  //  提交搜索内容
+  void submit() {
+    loadingStatus.value = 'loading';
+    searchFollow();
+  }
+
+  Future searchFollow({type = 'init'}) async {
+    if (controller.value.text == '') {
+      return {'status': true, 'data': <FollowItemModel>[].obs};
+    }
+    if (type == 'init') {
+      ps = 1;
+    }
+    var res = await MemberHttp.getfollowSearch(
+      mid: mid,
+      ps: ps,
+      pn: pn,
+      name: controller.value.text,
+    );
+    if (res['status']) {
+      if (type == 'init') {
+        followList.value = res['data'].list;
+      } else {
+        followList.addAll(res['data'].list);
+      }
+      total.value = res['data'].total;
+    }
+    return res;
+  }
+
+  void onLoad() {
+    searchFollow(type: 'onLoad');
+  }
+}

lib/pages/follow_search/index.dart

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

lib/pages/follow_search/view.dart

@@ -0,0 +1,121 @@
+import 'package:easy_debounce/easy_throttle.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/widgets/http_error.dart';
+import 'package:pilipala/pages/follow_search/index.dart';
+
+import '../follow/widgets/follow_item.dart';
+
+class FollowSearchPage extends StatefulWidget {
+  const FollowSearchPage({super.key});
+
+  @override
+  State<FollowSearchPage> createState() => _FollowSearchPageState();
+}
+
+class _FollowSearchPageState extends State<FollowSearchPage> {
+  final FollowSearchController _followSearchController =
+      Get.put(FollowSearchController());
+  late Future? _futureBuilder;
+  final ScrollController scrollController = ScrollController();
+
+  @override
+  void initState() {
+    super.initState();
+    _futureBuilder = _followSearchController.searchFollow();
+    scrollController.addListener(
+      () {
+        if (scrollController.position.pixels >=
+            scrollController.position.maxScrollExtent - 200) {
+          EasyThrottle.throttle(
+              'my-throttler', const Duration(milliseconds: 500), () {
+            _followSearchController.onLoad();
+          });
+        }
+      },
+    );
+  }
+
+  void reRequest() {
+    setState(() {
+      _futureBuilder = _followSearchController.searchFollow();
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        titleSpacing: 0,
+        actions: [
+          IconButton(
+            onPressed: reRequest,
+            icon: const Icon(CupertinoIcons.search, size: 22),
+          ),
+          const SizedBox(width: 6),
+        ],
+        title: TextField(
+          autofocus: true,
+          focusNode: _followSearchController.searchFocusNode,
+          controller: _followSearchController.controller.value,
+          textInputAction: TextInputAction.search,
+          onChanged: (value) => _followSearchController.onChange(value),
+          decoration: InputDecoration(
+            hintText: _followSearchController.hintText,
+            border: InputBorder.none,
+            suffixIcon: IconButton(
+              icon: Icon(
+                Icons.clear,
+                size: 22,
+                color: Theme.of(context).colorScheme.outline,
+              ),
+              onPressed: () => _followSearchController.onClear(),
+            ),
+          ),
+          onSubmitted: (String value) => reRequest(),
+        ),
+      ),
+      body: FutureBuilder(
+          future: _futureBuilder,
+          builder: (BuildContext context, AsyncSnapshot snapshot) {
+            if (snapshot.connectionState == ConnectionState.done) {
+              var data = snapshot.data;
+              if (data == null) {
+                return CustomScrollView(
+                  slivers: [
+                    HttpError(errMsg: snapshot.data['msg'], fn: reRequest)
+                  ],
+                );
+              }
+              if (data['status']) {
+                RxList followList = _followSearchController.followList;
+                return Obx(
+                  () => followList.isNotEmpty
+                      ? ListView.builder(
+                          controller: scrollController,
+                          itemCount: followList.length,
+                          itemBuilder: ((context, index) {
+                            return FollowItem(
+                              item: followList[index],
+                            );
+                          }),
+                        )
+                      : CustomScrollView(
+                          slivers: [HttpError(errMsg: '未搜索到结果', fn: reRequest)],
+                        ),
+                );
+              } else {
+                return CustomScrollView(
+                  slivers: [
+                    HttpError(errMsg: snapshot.data['msg'], fn: reRequest)
+                  ],
+                );
+              }
+            } else {
+              return const SizedBox();
+            }
+          }),
+    );
+  }
+}

lib/pages/home/controller.dart

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

lib/pages/home/view.dart

@@ -48,38 +48,48 @@ class _HomePageState extends State<HomePage>
     super.build(context);
     Brightness currentBrightness = MediaQuery.of(context).platformBrightness;
     // 设置状态栏图标的亮度
-    SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
+    if (_homeController.enableGradientBg) {
-      statusBarIconBrightness: currentBrightness == Brightness.light
+      SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
-          ? Brightness.dark
+        statusBarIconBrightness: currentBrightness == Brightness.light
-          : Brightness.light,
+            ? Brightness.dark
-    ));
+            : Brightness.light,
+      ));
+    }
     return Scaffold(
       extendBody: true,
       extendBodyBehindAppBar: true,
       body: Stack(
         children: [
           // gradient background
-          Align(
+          if (_homeController.enableGradientBg) ...[
-            alignment: Alignment.topLeft,
+            Align(
-            child: Opacity(
+              alignment: Alignment.topLeft,
-              opacity: 0.6,
+              child: Opacity(
-              child: Container(
+                opacity: 0.6,
-                width: MediaQuery.of(context).size.width,
+                child: Container(
-                height: MediaQuery.of(context).size.height,
+                  width: MediaQuery.of(context).size.width,
-                decoration: BoxDecoration(
+                  height: MediaQuery.of(context).size.height,
-                  gradient: LinearGradient(
+                  decoration: BoxDecoration(
-                      colors: [
+                    gradient: LinearGradient(
-                        Theme.of(context).colorScheme.primary.withOpacity(0.9),
+                        colors: [
-                        Theme.of(context).colorScheme.primary.withOpacity(0.5),
+                          Theme.of(context)
-                        Theme.of(context).colorScheme.surface
+                              .colorScheme
-                      ],
+                              .primary
-                      begin: Alignment.topLeft,
+                              .withOpacity(0.9),
-                      end: Alignment.bottomRight,
+                          Theme.of(context)
-                      stops: const [0, 0.0034, 0.34]),
+                              .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(
@@ -90,7 +100,37 @@ class _HomePageState extends State<HomePage>
                 callback: showUserBottomSheet,
               ),
               if (_homeController.tabs.length > 1) ...[
-                const CustomTabs(),
+                if (_homeController.enableGradientBg) ...[
+                  const CustomTabs(),
+                ] else ...[
+                  const SizedBox(height: 4),
+                  SizedBox(
+                    width: double.infinity,
+                    height: 42,
+                    child: Align(
+                      alignment: Alignment.center,
+                      child: TabBar(
+                        controller: _homeController.tabController,
+                        tabs: [
+                          for (var i in _homeController.tabs)
+                            Tab(text: i['label'])
+                        ],
+                        isScrollable: true,
+                        dividerColor: Colors.transparent,
+                        enableFeedback: true,
+                        splashBorderRadius: BorderRadius.circular(10),
+                        tabAlignment: TabAlignment.center,
+                        onTap: (value) {
+                          feedBack();
+                          if (_homeController.initialIndex.value == value) {
+                            _homeController.tabsCtrList[value]().animateToTop();
+                          }
+                          _homeController.initialIndex.value = value;
+                        },
+                      ),
+                    ),
+                  ),
+                ],
               ] else ...[
                 const SizedBox(height: 6),
               ],

lib/pages/hot/view.dart

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

lib/pages/html/controller.dart

@@ -96,9 +96,6 @@ class HtmlRenderController extends GetxController {
         _sortType = ReplySortType.like;
         break;
       case ReplySortType.like:
-        _sortType = ReplySortType.reply;
-        break;
-      case ReplySortType.reply:
         _sortType = ReplySortType.time;
         break;
       default:

lib/pages/live/controller.dart

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

lib/pages/live/view.dart

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

lib/pages/live/widgets/live_item.dart

@@ -184,18 +184,32 @@ class VideoStat extends StatelessWidget {
           tileMode: TileMode.mirror,
         ),
       ),
-      child: RichText(
+      child: Row(
-        maxLines: 1,
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        textAlign: TextAlign.justify,
+        children: [
-        softWrap: false,
+          Text(
-        text: TextSpan(
+            liveItem!.areaName!,
-          style: const TextStyle(fontSize: 11, color: Colors.white),
+            style: const TextStyle(fontSize: 11, color: Colors.white),
-          children: [
+          ),
-            TextSpan(text: liveItem!.areaName!),
+          Text(
-            TextSpan(text: liveItem!.watchedShow!['text_small']),
+            liveItem!.watchedShow!['text_small'],
-          ],
+            style: const TextStyle(fontSize: 11, color: Colors.white),
-        ),
+          ),
+        ],
       ),
+
+      // child: RichText(
+      //   maxLines: 1,
+      //   textAlign: TextAlign.justify,
+      //   softWrap: false,
+      //   text: TextSpan(
+      //     style: const TextStyle(fontSize: 11, color: Colors.white),
+      //     children: [
+      //       TextSpan(text: liveItem!.areaName!),
+      //       TextSpan(text: liveItem!.watchedShow!['text_small']),
+      //     ],
+      //   ),
+      // ),
     );
   }
 }

lib/pages/live_room/controller.dart

@@ -3,6 +3,7 @@ import 'package:pilipala/http/constants.dart';
 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';
 
 class LiveRoomController extends GetxController {
   String cover = '';
@@ -14,13 +15,7 @@ class LiveRoomController extends GetxController {
   RxBool volumeOff = false.obs;
   PlPlayerController plPlayerController =
       PlPlayerController.getInstance(videoType: 'live');
-
+  Rx<RoomInfoH5Model> roomInfoH5 = RoomInfoH5Model().obs;
-  // MeeduPlayerController meeduPlayerController = MeeduPlayerController(
-  //   colorTheme: Theme.of(Get.context!).colorScheme.primary,
-  //   pipEnabled: true,
-  //   controlsStyle: ControlsStyle.live,
-  //   enabledButtons: const EnabledButtons(pip: true),
-  // );
 
   @override
   void onInit() {
@@ -36,11 +31,10 @@ class LiveRoomController extends GetxController {
         cover = liveItem.cover;
       }
     }
-    queryLiveInfo();
   }
 
-  playerInit(source) {
+  playerInit(source) async {
-    plPlayerController.setDataSource(
+    await plPlayerController.setDataSource(
       DataSource(
         videoSource: source,
         audioSource: null,
@@ -66,7 +60,8 @@ class LiveRoomController extends GetxController {
       String videoUrl = (item.urlInfo?.first.host)! +
           item.baseUrl! +
           item.urlInfo!.first.extra!;
-      playerInit(videoUrl);
+      await playerInit(videoUrl);
+      return res;
     }
   }
 
@@ -80,4 +75,12 @@ class LiveRoomController extends GetxController {
       volumeOff.value = true;
     }
   }
+
+  Future queryLiveInfoH5() async {
+    var res = await LiveHttp.liveRoomInfoH5(roomId: roomId);
+    if (res['status']) {
+      roomInfoH5.value = res['data'];
+    }
+    return res;
+  }
 }

lib/pages/live_room/view.dart

@@ -19,6 +19,8 @@ class LiveRoomPage extends StatefulWidget {
 class _LiveRoomPageState extends State<LiveRoomPage> {
   final LiveRoomController _liveRoomController = Get.put(LiveRoomController());
   PlPlayerController? plPlayerController;
+  late Future? _futureBuilder;
+  late Future? _futureBuilderFuture;
 
   bool isShowCover = true;
   bool isPlay = true;
@@ -27,18 +29,16 @@ class _LiveRoomPageState extends State<LiveRoomPage> {
   @override
   void initState() {
     super.initState();
-    plPlayerController = _liveRoomController.plPlayerController;
-    plPlayerController!.onPlayerStatusChanged.listen(
-      (PlayerStatus status) {
-        if (status == PlayerStatus.playing) {
-          isShowCover = false;
-          setState(() {});
-        }
-      },
-    );
     if (Platform.isAndroid) {
       floating = Floating();
     }
+    videoSourceInit();
+    _futureBuilderFuture = _liveRoomController.queryLiveInfo();
+  }
+
+  Future<void> videoSourceInit() async {
+    _futureBuilder = _liveRoomController.queryLiveInfoH5();
+    plPlayerController = _liveRoomController.plPlayerController;
   }
 
   @override
@@ -52,57 +52,123 @@ class _LiveRoomPageState extends State<LiveRoomPage> {
 
   @override
   Widget build(BuildContext context) {
+    Widget videoPlayerPanel = FutureBuilder(
+      future: _futureBuilderFuture,
+      builder: (BuildContext context, AsyncSnapshot snapshot) {
+        if (snapshot.hasData && snapshot.data['status']) {
+          return PLVideoPlayer(
+            controller: plPlayerController!,
+            bottomControl: BottomControl(
+              controller: plPlayerController,
+              liveRoomCtr: _liveRoomController,
+              floating: floating,
+            ),
+          );
+        } else {
+          return const SizedBox();
+        }
+      },
+    );
+
     Widget childWhenDisabled = Scaffold(
       primary: true,
-      appBar: PreferredSize(
+      backgroundColor: Colors.black,
-        preferredSize: Size.fromHeight(
+      body: Stack(
-          MediaQuery.of(context).orientation == Orientation.portrait ? 56 : 0,
-        ),
-        child: AppBar(
-          centerTitle: false,
-          titleSpacing: 0,
-          title: _liveRoomController.liveItem != null
-              ? Row(
-                  children: [
-                    NetworkImgLayer(
-                      width: 34,
-                      height: 34,
-                      type: 'avatar',
-                      src: _liveRoomController.liveItem.face,
-                    ),
-                    const SizedBox(width: 10),
-                    Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Text(
-                          _liveRoomController.liveItem.uname,
-                          style: const TextStyle(fontSize: 14),
-                        ),
-                        const SizedBox(height: 1),
-                        if (_liveRoomController.liveItem.watchedShow != null)
-                          Text(
-                              _liveRoomController
-                                      .liveItem.watchedShow['text_large'] ??
-                                  '',
-                              style: const TextStyle(fontSize: 12)),
-                      ],
-                    ),
-                  ],
-                )
-              : const SizedBox(),
-          // actions: [
-          //   SizedBox(
-          //     height: 34,
-          //     child: ElevatedButton(onPressed: () {}, child: const Text('关注')),
-          //   ),
-          //   const SizedBox(width: 12),
-          // ],
-        ),
-      ),
-      body: Column(
         children: [
-          Stack(
+          // 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',
+                width: Get.width,
+                height: Get.height,
+              ),
+            ),
+          ),
+          Column(
             children: [
+              AppBar(
+                centerTitle: false,
+                titleSpacing: 0,
+                backgroundColor: Colors.transparent,
+                foregroundColor: Colors.white,
+                toolbarHeight:
+                    MediaQuery.of(context).orientation == Orientation.portrait
+                        ? 56
+                        : 0,
+                title: FutureBuilder(
+                  future: _futureBuilder,
+                  builder: (context, snapshot) {
+                    if (snapshot.data == null) {
+                      return const SizedBox();
+                    }
+                    Map data = snapshot.data as Map;
+                    if (data['status']) {
+                      return Obx(
+                        () => Row(
+                          children: [
+                            NetworkImgLayer(
+                              width: 34,
+                              height: 34,
+                              type: 'avatar',
+                              src: _liveRoomController
+                                  .roomInfoH5.value.anchorInfo!.baseInfo!.face,
+                            ),
+                            const SizedBox(width: 10),
+                            Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Text(
+                                  _liveRoomController.roomInfoH5.value
+                                      .anchorInfo!.baseInfo!.uname!,
+                                  style: const TextStyle(fontSize: 14),
+                                ),
+                                const SizedBox(height: 1),
+                                if (_liveRoomController
+                                        .roomInfoH5.value.watchedShow !=
+                                    null)
+                                  Text(
+                                    _liveRoomController.roomInfoH5.value
+                                            .watchedShow!['text_large'] ??
+                                        '',
+                                    style: const TextStyle(fontSize: 12),
+                                  ),
+                              ],
+                            ),
+                          ],
+                        ),
+                      );
+                    } else {
+                      return const SizedBox();
+                    }
+                  },
+                ),
+              ),
               PopScope(
                 canPop: plPlayerController?.isFullScreen.value != true,
                 onPopInvoked: (bool didPop) {
@@ -120,55 +186,19 @@ class _LiveRoomPageState extends State<LiveRoomPage> {
                           Orientation.landscape
                       ? Get.size.height
                       : Get.size.width * 9 / 16,
-                  child: plPlayerController!.videoPlayerController != null
+                  child: videoPlayerPanel,
-                      ? PLVideoPlayer(
-                          controller: plPlayerController!,
-                          bottomControl: BottomControl(
-                            controller: plPlayerController,
-                            liveRoomCtr: _liveRoomController,
-                            floating: floating,
-                          ),
-                        )
-                      : const SizedBox(),
                 ),
               ),
-              // if (_liveRoomController.liveItem != null &&
-              //     _liveRoomController.liveItem.cover != null)
-              //   Visibility(
-              //     visible: isShowCover,
-              //     child: Positioned(
-              //       top: 0,
-              //       left: 0,
-              //       right: 0,
-              //       child: NetworkImgLayer(
-              //         type: 'emote',
-              //         src: _liveRoomController.liveItem.cover,
-              //         width: Get.size.width,
-              //         height: videoHeight,
-              //       ),
-              //     ),
-              //   ),
             ],
           ),
         ],
       ),
     );
-    Widget childWhenEnabled = AspectRatio(
-      aspectRatio: 16 / 9,
-      child: plPlayerController!.videoPlayerController != null
-          ? PLVideoPlayer(
-              controller: plPlayerController!,
-              bottomControl: BottomControl(
-                controller: plPlayerController,
-                liveRoomCtr: _liveRoomController,
-              ),
-            )
-          : const SizedBox(),
-    );
     if (Platform.isAndroid) {
       return PiPSwitcher(
         childWhenDisabled: childWhenDisabled,
-        childWhenEnabled: childWhenEnabled,
+        childWhenEnabled: videoPlayerPanel,
+        floating: floating,
       );
     } else {
       return childWhenDisabled;

lib/pages/main/controller.dart

@@ -11,6 +11,7 @@ import 'package:pilipala/pages/home/view.dart';
 import 'package:pilipala/pages/media/index.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
+import '../../models/common/dynamic_badge_mode.dart';
 
 class MainController extends GetxController {
   List<Widget> pages = <Widget>[
@@ -65,6 +66,7 @@ class MainController extends GetxController {
   int selectedIndex = 0;
   Box userInfoCache = GStrorage.userInfo;
   RxBool userLogin = false.obs;
+  late Rx<DynamicBadgeMode> dynamicBadgeType = DynamicBadgeMode.number.obs;
 
   @override
   void onInit() {
@@ -75,7 +77,12 @@ class MainController extends GetxController {
     hideTabBar = setting.get(SettingBoxKey.hideTabBar, defaultValue: true);
     var userInfo = userInfoCache.get('userInfoCache');
     userLogin.value = userInfo != null;
-    getUnreadDynamic();
+    dynamicBadgeType.value = DynamicBadgeMode.values[setting.get(
+        SettingBoxKey.dynamicBadgeMode,
+        defaultValue: DynamicBadgeMode.number.code)];
+    if (dynamicBadgeType.value != DynamicBadgeMode.hidden) {
+      getUnreadDynamic();
+    }
   }
 
   void onBackPressed(BuildContext context) {

lib/pages/main/view.dart

@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
+import 'package:pilipala/models/common/dynamic_badge_mode.dart';
 import 'package:pilipala/pages/dynamics/index.dart';
 import 'package:pilipala/pages/home/index.dart';
 import 'package:pilipala/pages/media/index.dart';
@@ -127,11 +128,21 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
                         destinations: <Widget>[
                           ..._mainController.navigationBars.map((e) {
                             return NavigationDestination(
-                              icon: Badge(
+                              icon: Obx(
-                                label: Text(e['count'].toString()),
+                                () => Badge(
-                                padding: const EdgeInsets.fromLTRB(6, 0, 6, 0),
+                                  label:
-                                isLabelVisible: e['count'] > 0,
+                                      _mainController.dynamicBadgeType.value ==
-                                child: e['icon'],
+                                              DynamicBadgeMode.number
+                                          ? Text(e['count'].toString())
+                                          : null,
+                                  padding:
+                                      const EdgeInsets.fromLTRB(6, 0, 6, 0),
+                                  isLabelVisible:
+                                      _mainController.dynamicBadgeType.value !=
+                                              DynamicBadgeMode.hidden &&
+                                          e['count'] > 0,
+                                  child: e['icon'],
+                                ),
                               ),
                               selectedIcon: e['selectIcon'],
                               label: e['label'],
@@ -148,11 +159,21 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
                         items: [
                           ..._mainController.navigationBars.map((e) {
                             return BottomNavigationBarItem(
-                              icon: Badge(
+                              icon: Obx(
-                                label: Text(e['count'].toString()),
+                                () => Badge(
-                                padding: const EdgeInsets.fromLTRB(6, 0, 6, 0),
+                                  label:
-                                isLabelVisible: e['count'] > 0,
+                                      _mainController.dynamicBadgeType.value ==
-                                child: e['icon'],
+                                              DynamicBadgeMode.number
+                                          ? Text(e['count'].toString())
+                                          : null,
+                                  padding:
+                                      const EdgeInsets.fromLTRB(6, 0, 6, 0),
+                                  isLabelVisible:
+                                      _mainController.dynamicBadgeType.value !=
+                                              DynamicBadgeMode.hidden &&
+                                          e['count'] > 0,
+                                  child: e['icon'],
+                                ),
                               ),
                               activeIcon: e['selectIcon'],
                               label: e['label'],

lib/pages/member/view.dart

@@ -105,7 +105,7 @@ class _MemberPageState extends State<MemberPage>
             actions: [
               IconButton(
                 onPressed: () => Get.toNamed(
-                    '/memberSearch?mid=${Get.parameters['mid']}&uname=${_memberController.memberInfo.value.name!}'),
+                    '/memberSearch?mid=$mid&uname=${_memberController.memberInfo.value.name!}'),
                 icon: const Icon(Icons.search_outlined),
               ),
               PopupMenuButton(

lib/pages/member_archive/controller.dart

@@ -25,7 +25,7 @@ class MemberArchiveController extends GetxController {
 
   // 获取用户投稿
   Future getMemberArchive(type) async {
-    if (type == 'onRefresh') {
+    if (type == 'init') {
       pn = 1;
     }
     var res = await MemberHttp.memberArchive(
@@ -34,7 +34,12 @@ class MemberArchiveController extends GetxController {
       order: currentOrder['type']!,
     );
     if (res['status']) {
-      archivesList.addAll(res['data'].list.vlist);
+      if (type == 'init') {
+        archivesList.value = res['data'].list.vlist;
+      }
+      if (type == 'onLoad') {
+        archivesList.addAll(res['data'].list.vlist);
+      }
       count = res['data'].page['count'];
       pn += 1;
     }
@@ -42,13 +47,14 @@ class MemberArchiveController extends GetxController {
   }
 
   toggleSort() async {
-    pn = 1;
+    List<String> typeList = orderList.map((e) => e['type']!).toList();
-    int index = orderList.indexOf(currentOrder);
+    int index = typeList.indexOf(currentOrder['type']!);
     if (index == orderList.length - 1) {
       currentOrder.value = orderList.first;
     } else {
       currentOrder.value = orderList[index + 1];
     }
+    getMemberArchive('init');
   }
 
   // 上拉加载

lib/pages/member_archive/view.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/video_card_h.dart';
 import 'package:pilipala/utils/utils.dart';
+import '../../common/widgets/http_error.dart';
 import 'controller.dart';
 
 class MemberArchivePage extends StatefulWidget {
@@ -25,8 +26,7 @@ class _MemberArchivePageState extends State<MemberArchivePage> {
     final String heroTag = Utils.makeHeroTag(mid);
     _memberArchivesController =
         Get.put(MemberArchiveController(), tag: heroTag);
-    _futureBuilderFuture =
+    _futureBuilderFuture = _memberArchivesController.getMemberArchive('init');
-        _memberArchivesController.getMemberArchive('onRefresh');
     scrollController = _memberArchivesController.scrollController;
     scrollController.addListener(
       () {
@@ -48,39 +48,16 @@ class _MemberArchivePageState extends State<MemberArchivePage> {
         titleSpacing: 0,
         centerTitle: false,
         title: Text('他的投稿', style: Theme.of(context).textTheme.titleMedium),
-        // actions: [
+        actions: [
-        //   Obx(
+          Obx(
-        //     () => PopupMenuButton<String>(
+            () => TextButton.icon(
-        //       padding: EdgeInsets.zero,
+              icon: const Icon(Icons.sort, size: 20),
-        //       tooltip: '投稿排序',
+              onPressed: _memberArchivesController.toggleSort,
-        //       icon: Icon(
+              label: Text(_memberArchivesController.currentOrder['label']!),
-        //         Icons.more_vert_outlined,
+            ),
-        //         color: Theme.of(context).colorScheme.outline,
+          ),
-        //       ),
+          const SizedBox(width: 6),
-        //       position: PopupMenuPosition.under,
+        ],
-        //       onSelected: (String type) {},
-        //       itemBuilder: (BuildContext context) => <PopupMenuEntry<String>>[
-        //         for (var i in _memberArchivesController.orderList) ...[
-        //           PopupMenuItem<String>(
-        //             onTap: () {},
-        //             value: _memberArchivesController.currentOrder['label'],
-        //             child: Row(
-        //               mainAxisSize: MainAxisSize.min,
-        //               children: [
-        //                 Text(i['label']!),
-        //                 if (_memberArchivesController.currentOrder['label'] ==
-        //                     i['label']) ...[
-        //                   const SizedBox(width: 10),
-        //                   const Icon(Icons.done, size: 20),
-        //                 ],
-        //               ],
-        //             ),
-        //           ),
-        //         ]
-        //       ],
-        //     ),
-        //   ),
-        // ],
       ),
       body: CustomScrollView(
         controller: _memberArchivesController.scrollController,
@@ -110,10 +87,16 @@ class _MemberArchivePageState extends State<MemberArchivePage> {
                           : const SliverToBoxAdapter(),
                     );
                   } else {
-                    return const SliverToBoxAdapter();
+                    return HttpError(
+                      errMsg: snapshot.data['msg'],
+                      fn: () {},
+                    );
                   }
                 } else {
-                  return const SliverToBoxAdapter();
+                  return HttpError(
+                    errMsg: snapshot.data['msg'],
+                    fn: () {},
+                  );
                 }
               } else {
                 return const SliverToBoxAdapter();

lib/pages/member_dynamics/view.dart

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

lib/pages/mine/controller.dart

@@ -119,7 +119,7 @@ class MineController extends GetxController {
       SmartDialog.showToast('账号未登录');
       return;
     }
-    Get.toNamed('/follow?mid=${userInfo.value.mid}');
+    Get.toNamed('/follow?mid=${userInfo.value.mid}', preventDuplicates: false);
   }
 
   pushFans() {
@@ -127,7 +127,7 @@ class MineController extends GetxController {
       SmartDialog.showToast('账号未登录');
       return;
     }
-    Get.toNamed('/fan?mid=${userInfo.value.mid}');
+    Get.toNamed('/fan?mid=${userInfo.value.mid}', preventDuplicates: false);
   }
 
   pushDynamic() {
@@ -135,6 +135,7 @@ class MineController extends GetxController {
       SmartDialog.showToast('账号未登录');
       return;
     }
-    Get.toNamed('/memberDynamics?mid=${userInfo.value.mid}');
+    Get.toNamed('/memberDynamics?mid=${userInfo.value.mid}',
+        preventDuplicates: false);
   }
 }

lib/pages/mine/view.dart

@@ -64,7 +64,7 @@ class _MinePageState extends State<MinePage> {
             ),
           ),
           IconButton(
-            onPressed: () => Get.toNamed('/setting'),
+            onPressed: () => Get.toNamed('/setting', preventDuplicates: false),
             icon: const Icon(
               CupertinoIcons.slider_horizontal_3,
             ),

lib/pages/preview/view.dart

@@ -102,15 +102,12 @@ class _ImagePreviewState extends State<ImagePreview>
     );
   }
 
-  // 设置状态栏图标透明
+  // 隐藏状态栏，避免遮挡图片内容
   setStatusBar() async {
-    if (Platform.isIOS) {
+    if (Platform.isIOS || Platform.isAndroid) {
       await StatusBarControl.setHidden(true,
           animation: StatusBarAnimation.SLIDE);
     }
-    if (Platform.isAndroid) {
-      await StatusBarControl.setColor(Colors.transparent);
-    }
   }
 
   @override

lib/pages/rcmd/controller.dart

@@ -9,14 +9,15 @@ import 'package:pilipala/utils/storage.dart';
 class RcmdController extends GetxController {
   final ScrollController scrollController = ScrollController();
   int _currentPage = 0;
-  RxList<RecVideoItemAppModel> appVideoList = <RecVideoItemAppModel>[].obs;
+  // RxList<RecVideoItemAppModel> appVideoList = <RecVideoItemAppModel>[].obs;
-  RxList<RecVideoItemModel> webVideoList = <RecVideoItemModel>[].obs;
+  // RxList<RecVideoItemModel> webVideoList = <RecVideoItemModel>[].obs;
   bool isLoadingMore = true;
   OverlayEntry? popupDialog;
   Box setting = GStrorage.setting;
   RxInt crossAxisCount = 2.obs;
   late bool enableSaveLastData;
   late String defaultRcmdType = 'web';
+  late RxList<dynamic> videoList;
 
   @override
   void onInit() {
@@ -27,81 +28,58 @@ class RcmdController extends GetxController {
         setting.get(SettingBoxKey.enableSaveLastData, defaultValue: false);
     defaultRcmdType =
         setting.get(SettingBoxKey.defaultRcmdType, defaultValue: 'web');
+    if (defaultRcmdType == 'web') {
+      videoList = <RecVideoItemModel>[].obs;
+    } else {
+      videoList = <RecVideoItemAppModel>[].obs;
+    }
   }
 
   // 获取推荐
   Future queryRcmdFeed(type) async {
-    print(defaultRcmdType);
-    if (defaultRcmdType == 'app') {
-      return await queryRcmdFeedApp(type);
-    }
-    if (defaultRcmdType == 'web') {
-      return await queryRcmdFeedWeb(type);
-    }
-  }
-
-  // 获取app端推荐
-  Future queryRcmdFeedApp(type) async {
     if (isLoadingMore == false) {
       return;
     }
     if (type == 'onRefresh') {
       _currentPage = 0;
     }
-    var res = await VideoHttp.rcmdVideoListApp(
+    late final Map<String, dynamic> res;
-      freshIdx: _currentPage,
+    switch (defaultRcmdType) {
-    );
+      case 'app':
+      case 'notLogin':
+        res = await VideoHttp.rcmdVideoListApp(
+          loginStatus: defaultRcmdType != 'notLogin',
+          freshIdx: _currentPage,
+        );
+        break;
+      default: //'web'
+        res = await VideoHttp.rcmdVideoList(
+          freshIdx: _currentPage,
+          ps: 20,
+        );
+    }
     if (res['status']) {
       if (type == 'init') {
-        if (appVideoList.isNotEmpty) {
+        if (videoList.isNotEmpty) {
-          appVideoList.addAll(res['data']);
+          videoList.addAll(res['data']);
         } else {
-          appVideoList.value = res['data'];
+          videoList.value = res['data'];
         }
       } else if (type == 'onRefresh') {
         if (enableSaveLastData) {
-          appVideoList.insertAll(0, res['data']);
+          videoList.insertAll(0, res['data']);
         } else {
-          appVideoList.value = res['data'];
+          videoList.value = res['data'];
         }
       } else if (type == 'onLoad') {
-        appVideoList.addAll(res['data']);
+        videoList.addAll(res['data']);
       }
       _currentPage += 1;
-    }
+      // 若videoList数量太小，可能会影响翻页，此时再次请求
-    isLoadingMore = false;
+      // 为避免请求到的数据太少时还在反复请求，要求本次返回数据大于1条才触发
-    return res;
+      if (res['data'].length > 1 && videoList.length < 10) {
-  }
+        queryRcmdFeed('onLoad');
-
-  // 获取web端推荐
-  Future queryRcmdFeedWeb(type) async {
-    if (isLoadingMore == false) {
-      return;
-    }
-    if (type == 'onRefresh') {
-      _currentPage = 0;
-    }
-    var res = await VideoHttp.rcmdVideoList(
-      ps: 20,
-      freshIdx: _currentPage,
-    );
-    if (res['status']) {
-      if (type == 'init') {
-        if (webVideoList.isNotEmpty) {
-          webVideoList.addAll(res['data']);
-        } else {
-          webVideoList.value = res['data'];
-        }
-      } else if (type == 'onRefresh') {
-        if (enableSaveLastData) {
-          webVideoList.insertAll(0, res['data']);
-        } else {
-          webVideoList.value = res['data'];
-        }
-      } else if (type == 'onLoad') {
-        webVideoList.addAll(res['data']);
       }
-      _currentPage += 1;
     }
     isLoadingMore = false;
     return res;
@@ -118,7 +96,7 @@ class RcmdController extends GetxController {
     queryRcmdFeed('onLoad');
   }
 
-  // 返回顶部并刷新
+  // 返回顶部
   void animateToTop() async {
     if (scrollController.offset >=
         MediaQuery.of(Get.context!).size.height * 5) {

lib/pages/rcmd/view.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:io';
 
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
@@ -45,7 +44,7 @@ class _RcmdPageState extends State<RcmdPage>
         if (scrollController.position.pixels >=
             scrollController.position.maxScrollExtent - 200) {
           EasyThrottle.throttle(
-              'my-throttler', const Duration(milliseconds: 500), () {
+              'my-throttler', const Duration(milliseconds: 200), () {
             _rcmdController.isLoadingMore = true;
             _rcmdController.onLoad();
           });
@@ -97,29 +96,24 @@ class _RcmdPageState extends State<RcmdPage>
                   if (snapshot.connectionState == ConnectionState.done) {
                     Map data = snapshot.data as Map;
                     if (data['status']) {
-                      return Platform.isAndroid || Platform.isIOS
+                      return Obx(
-                          ? Obx(
+                        () {
-                              () => contentGrid(
+                          if (_rcmdController.isLoadingMore &&
-                                  _rcmdController,
+                              _rcmdController.videoList.isEmpty) {
-                                  _rcmdController.defaultRcmdType == 'web'
+                            return contentGrid(_rcmdController, []);
-                                      ? _rcmdController.webVideoList
+                          } else {
-                                      : _rcmdController.appVideoList),
+                            // 显示视频列表
-                            )
+                            return contentGrid(
-                          : SliverLayoutBuilder(
+                                _rcmdController, _rcmdController.videoList);
-                              builder: (context, boxConstraints) {
+                          }
-                              return Obx(
+                        },
-                                () => contentGrid(
+                      );
-                                    _rcmdController,
-                                    _rcmdController.defaultRcmdType == 'web'
-                                        ? _rcmdController.webVideoList
-                                        : _rcmdController.appVideoList),
-                              );
-                            });
                     } else {
                       return HttpError(
                         errMsg: data['msg'],
                         fn: () {
                           setState(() {
+                            _rcmdController.isLoadingMore = true;
                             _futureBuilderFuture =
                                 _rcmdController.queryRcmdFeed('init');
                           });
@@ -127,20 +121,11 @@ class _RcmdPageState extends State<RcmdPage>
                       );
                     }
                   } else {
-                    // 缓存数据
-                    // if (_rcmdController.videoList.isNotEmpty) {
-                    //   return contentGrid(
-                    //       _rcmdController, _rcmdController.videoList);
-                    // }
-                    // // 骨架屏
-                    // else {
                     return contentGrid(_rcmdController, []);
-                    // }
                   }
                 },
               ),
             ),
-            LoadingMore(ctr: _rcmdController)
           ],
         ),
       ),
@@ -203,33 +188,3 @@ class _RcmdPageState extends State<RcmdPage>
     );
   }
 }
-
-class LoadingMore extends StatelessWidget {
-  final dynamic ctr;
-  const LoadingMore({super.key, this.ctr});
-
-  @override
-  Widget build(BuildContext context) {
-    return SliverToBoxAdapter(
-      child: Container(
-        height: MediaQuery.of(context).padding.bottom + 80,
-        padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
-        child: GestureDetector(
-          onTap: () {
-            if (ctr != null) {
-              ctr!.isLoadingMore = true;
-              ctr!.onLoad();
-            }
-          },
-          child: Center(
-            child: Text(
-              '点击加载更多 👇',
-              style: TextStyle(
-                  color: Theme.of(context).colorScheme.outline, fontSize: 13),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/pages/search/view.dart

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

lib/pages/search_panel/view.dart

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

lib/pages/search_panel/widgets/video_panel.dart

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

lib/pages/setting/controller.dart

@@ -7,6 +7,9 @@ import 'package:pilipala/models/common/theme_type.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/login.dart';
 import 'package:pilipala/utils/storage.dart';
+import '../../models/common/dynamic_badge_mode.dart';
+import '../main/index.dart';
+import 'widgets/select_dialog.dart';
 
 class SettingController extends GetxController {
   Box userInfoCache = GStrorage.userInfo;
@@ -19,6 +22,7 @@ class SettingController extends GetxController {
   RxInt picQuality = 10.obs;
   Rx<ThemeType> themeType = ThemeType.system.obs;
   var userInfo;
+  Rx<DynamicBadgeMode> dynamicBadgeType = DynamicBadgeMode.number.obs;
 
   @override
   void onInit() {
@@ -33,6 +37,9 @@ class SettingController extends GetxController {
         setting.get(SettingBoxKey.defaultPicQa, defaultValue: 10);
     themeType.value = ThemeType.values[setting.get(SettingBoxKey.themeMode,
         defaultValue: ThemeType.system.code)];
+    dynamicBadgeType.value = DynamicBadgeMode.values[setting.get(
+        SettingBoxKey.dynamicBadgeMode,
+        defaultValue: DynamicBadgeMode.number.code)];
   }
 
   loginOut() async {
@@ -76,4 +83,31 @@ class SettingController extends GetxController {
     feedBackEnable.value = !feedBackEnable.value;
     setting.put(SettingBoxKey.feedBackEnable, feedBackEnable.value);
   }
+
+  // 设置动态未读标记
+  setDynamicBadgeMode(BuildContext context) async {
+    DynamicBadgeMode? result = await showDialog(
+      context: context,
+      builder: (context) {
+        return SelectDialog<DynamicBadgeMode>(
+          title: '动态未读标记',
+          value: dynamicBadgeType.value,
+          values: DynamicBadgeMode.values.map((e) {
+            return {'title': e.description, 'value': e};
+          }).toList(),
+        );
+      },
+    );
+    if (result != null) {
+      dynamicBadgeType.value = result;
+      setting.put(SettingBoxKey.dynamicBadgeMode, result.code);
+      MainController mainController = Get.put(MainController());
+      mainController.dynamicBadgeType.value =
+          DynamicBadgeMode.values[result.code];
+      if (mainController.dynamicBadgeType.value != DynamicBadgeMode.hidden) {
+        mainController.getUnreadDynamic();
+      }
+      SmartDialog.showToast('设置成功');
+    }
+  }
 }

lib/pages/setting/extra_setting.dart

@@ -1,9 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:hive/hive.dart';
-import 'package:pilipala/http/member.dart';
 import 'package:pilipala/models/common/dynamics_type.dart';
-import 'package:pilipala/models/common/rcmd_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';
@@ -20,26 +18,23 @@ class ExtraSetting extends StatefulWidget {
 class _ExtraSettingState extends State<ExtraSetting> {
   Box setting = GStrorage.setting;
   static Box localCache = GStrorage.localCache;
-  late dynamic defaultRcmdType;
   late dynamic defaultReplySort;
   late dynamic defaultDynamicType;
   late dynamic enableSystemProxy;
   late String defaultSystemProxyHost;
   late String defaultSystemProxyPort;
-  Box userInfoCache = GStrorage.userInfo;
-  var userInfo;
   bool userLogin = false;
-  var accessKeyInfo;
 
   @override
   void initState() {
     super.initState();
-    // 首页默认推荐类型
-    defaultRcmdType =
-        setting.get(SettingBoxKey.defaultRcmdType, defaultValue: 'web');
     // 默认优先显示最新评论
     defaultReplySort =
         setting.get(SettingBoxKey.replySortType, defaultValue: 0);
+    if (defaultReplySort == 2) {
+      setting.put(SettingBoxKey.replySortType, 0);
+      defaultReplySort = 0;
+    }
     // 优先展示全部动态 all
     defaultDynamicType =
         setting.get(SettingBoxKey.defaultDynamicType, defaultValue: 0);
@@ -49,9 +44,6 @@ class _ExtraSettingState extends State<ExtraSetting> {
         localCache.get(LocalCacheKey.systemProxyHost, defaultValue: '');
     defaultSystemProxyPort =
         localCache.get(LocalCacheKey.systemProxyPort, defaultValue: '');
-    userInfo = userInfoCache.get('userInfoCache');
-    userLogin = userInfo != null;
-    accessKeyInfo = localCache.get(LocalCacheKey.accessKey, defaultValue: null);
   }
 
   // 设置代理
@@ -159,12 +151,6 @@ class _ExtraSettingState extends State<ExtraSetting> {
             setKey: SettingBoxKey.enableSearchWord,
             defaultVal: true,
           ),
-          const SetSwitchItem(
-            title: '推荐动态',
-            subTitle: '是否在推荐内容中展示动态',
-            setKey: SettingBoxKey.enableRcmdDynamic,
-            defaultVal: true,
-          ),
           const SetSwitchItem(
             title: '快速收藏',
             subTitle: '点按收藏至默认，长按选择文件夹',
@@ -177,50 +163,6 @@ class _ExtraSettingState extends State<ExtraSetting> {
             setKey: SettingBoxKey.enableWordRe,
             defaultVal: false,
           ),
-          const SetSwitchItem(
-            title: '首页推荐刷新',
-            subTitle: '下拉刷新时保留上次内容',
-            setKey: SettingBoxKey.enableSaveLastData,
-            defaultVal: false,
-          ),
-          ListTile(
-            dense: false,
-            title: Text('首页推荐类型', style: titleStyle),
-            subtitle: Text(
-              '当前使用「$defaultRcmdType端」推荐',
-              style: subTitleStyle,
-            ),
-            onTap: () async {
-              String? result = await showDialog(
-                context: context,
-                builder: (context) {
-                  return SelectDialog<String>(
-                    title: '推荐类型',
-                    value: defaultRcmdType,
-                    values: RcmdType.values.map((e) {
-                      return {'title': e.labels, 'value': e.values};
-                    }).toList(),
-                  );
-                },
-              );
-              if (result != null) {
-                if (result == 'app') {
-                  // app端推荐需要access_key
-                  if (accessKeyInfo == null) {
-                    if (!userLogin) {
-                      SmartDialog.showToast('请先登录');
-                      return;
-                    }
-                    await MemberHttp.cookieToKey();
-                  }
-                }
-                defaultRcmdType = result;
-                setting.put(SettingBoxKey.defaultRcmdType, result);
-                SmartDialog.showToast('下次启动时生效');
-                setState(() {});
-              }
-            },
-          ),
           const SetSwitchItem(
             title: '启用ai总结',
             subTitle: '视频详情页开启ai总结',

lib/pages/setting/recommend_setting.dart

@@ -0,0 +1,260 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:hive/hive.dart';
+import 'package:pilipala/http/member.dart';
+import 'package:pilipala/models/common/rcmd_type.dart';
+import 'package:pilipala/pages/setting/widgets/select_dialog.dart';
+import 'package:pilipala/utils/recommend_filter.dart';
+import 'package:pilipala/utils/storage.dart';
+
+import 'widgets/switch_item.dart';
+
+class RecommendSetting extends StatefulWidget {
+  const RecommendSetting({super.key});
+
+  @override
+  State<RecommendSetting> createState() => _RecommendSettingState();
+}
+
+class _RecommendSettingState extends State<RecommendSetting> {
+  Box setting = GStrorage.setting;
+  static Box localCache = GStrorage.localCache;
+  late dynamic defaultRcmdType;
+  Box userInfoCache = GStrorage.userInfo;
+  late dynamic userInfo;
+  bool userLogin = false;
+  late dynamic accessKeyInfo;
+  // late int filterUnfollowedRatio;
+  late int minDurationForRcmd;
+  late int minLikeRatioForRecommend;
+
+  @override
+  void initState() {
+    super.initState();
+    // 首页默认推荐类型
+    defaultRcmdType =
+        setting.get(SettingBoxKey.defaultRcmdType, defaultValue: 'web');
+    userInfo = userInfoCache.get('userInfoCache');
+    userLogin = userInfo != null;
+    accessKeyInfo = localCache.get(LocalCacheKey.accessKey, defaultValue: null);
+    // filterUnfollowedRatio = setting
+    //     .get(SettingBoxKey.filterUnfollowedRatio, defaultValue: 0);
+    minDurationForRcmd =
+        setting.get(SettingBoxKey.minDurationForRcmd, defaultValue: 0);
+    minLikeRatioForRecommend =
+        setting.get(SettingBoxKey.minLikeRatioForRecommend, defaultValue: 0);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    TextStyle titleStyle = Theme.of(context).textTheme.titleMedium!;
+    TextStyle subTitleStyle = Theme.of(context)
+        .textTheme
+        .labelMedium!
+        .copyWith(color: Theme.of(context).colorScheme.outline);
+    return Scaffold(
+      appBar: AppBar(
+        centerTitle: false,
+        titleSpacing: 0,
+        title: Text(
+          '推荐设置',
+          style: Theme.of(context).textTheme.titleMedium,
+        ),
+      ),
+      body: ListView(
+        children: [
+          ListTile(
+            dense: false,
+            title: Text('首页推荐类型', style: titleStyle),
+            subtitle: Text(
+              '当前使用「$defaultRcmdType端」推荐¹',
+              style: subTitleStyle,
+            ),
+            onTap: () async {
+              String? result = await showDialog(
+                context: context,
+                builder: (context) {
+                  return SelectDialog<String>(
+                    title: '推荐类型',
+                    value: defaultRcmdType,
+                    values: RcmdType.values.map((e) {
+                      return {'title': e.labels, 'value': e.values};
+                    }).toList(),
+                  );
+                },
+              );
+              if (result != null) {
+                if (result == 'app') {
+                  // app端推荐需要access_key
+                  if (accessKeyInfo == null) {
+                    if (!userLogin) {
+                      SmartDialog.showToast('请先登录');
+                      return;
+                    }
+                    // 显示一个确认框，告知用户可能会导致账号被风控
+                    SmartDialog.show(
+                        animationType: SmartAnimationType.centerFade_otherSlide,
+                        builder: (context) {
+                          return AlertDialog(
+                            title: const Text('提示'),
+                            content: const Text(
+                                '使用app端推荐需获取access_key，有小概率触发风控导致账号退出（在官方版本app重新登录即可解除），是否继续？'),
+                            actions: [
+                              TextButton(
+                                onPressed: () {
+                                  result = null;
+                                  SmartDialog.dismiss();
+                                },
+                                child: const Text('取消'),
+                              ),
+                              TextButton(
+                                onPressed: () async {
+                                  SmartDialog.dismiss();
+                                  await MemberHttp.cookieToKey();
+                                },
+                                child: const Text('确定'),
+                              ),
+                            ],
+                          );
+                        });
+                  }
+                }
+                if (result != null) {
+                  defaultRcmdType = result;
+                  setting.put(SettingBoxKey.defaultRcmdType, result);
+                  SmartDialog.showToast('下次启动时生效');
+                  setState(() {});
+                }
+              }
+            },
+          ),
+          const SetSwitchItem(
+            title: '推荐动态',
+            subTitle: '是否在推荐内容中展示动态(仅app端)',
+            setKey: SettingBoxKey.enableRcmdDynamic,
+            defaultVal: true,
+          ),
+          const SetSwitchItem(
+            title: '首页推荐刷新',
+            subTitle: '下拉刷新时保留上次内容',
+            setKey: SettingBoxKey.enableSaveLastData,
+            defaultVal: false,
+          ),
+          // 分割线
+          const Divider(height: 1),
+          ListTile(
+            dense: false,
+            title: Text('点赞率过滤', style: titleStyle),
+            subtitle: Text(
+              '过滤掉点赞数/播放量「小于$minLikeRatioForRecommend%」的推荐视频(仅web端)',
+              style: subTitleStyle,
+            ),
+            onTap: () async {
+              int? result = await showDialog(
+                context: context,
+                builder: (context) {
+                  return SelectDialog<int>(
+                      title: '选择点赞率（0即不过滤）',
+                      value: minLikeRatioForRecommend,
+                      values: [0, 1, 2, 3, 4].map((e) {
+                        return {'title': '$e %', 'value': e};
+                      }).toList());
+                },
+              );
+              if (result != null) {
+                minLikeRatioForRecommend = result;
+                setting.put(SettingBoxKey.minLikeRatioForRecommend, result);
+                RecommendFilter.update();
+                setState(() {});
+              }
+            },
+          ),
+          ListTile(
+            dense: false,
+            title: Text('视频时长过滤', style: titleStyle),
+            subtitle: Text(
+              '过滤掉时长「小于$minDurationForRcmd秒」的推荐视频',
+              style: subTitleStyle,
+            ),
+            onTap: () async {
+              int? result = await showDialog(
+                context: context,
+                builder: (context) {
+                  return SelectDialog<int>(
+                      title: '选择时长（0即不过滤）',
+                      value: minDurationForRcmd,
+                      values: [0, 30, 60, 90, 120].map((e) {
+                        return {'title': '$e 秒', 'value': e};
+                      }).toList());
+                },
+              );
+              if (result != null) {
+                minDurationForRcmd = result;
+                setting.put(SettingBoxKey.minDurationForRcmd, result);
+                RecommendFilter.update();
+                setState(() {});
+              }
+            },
+          ),
+          SetSwitchItem(
+            title: '已关注Up豁免推荐过滤',
+            subTitle: '推荐中已关注用户发布的内容不会被过滤',
+            setKey: SettingBoxKey.exemptFilterForFollowed,
+            defaultVal: true,
+            callFn: (_) => {RecommendFilter.update},
+          ),
+          // ListTile(
+          //   dense: false,
+          //   title: Text('按比例过滤未关注Up', style: titleStyle),
+          //   subtitle: Text(
+          //     '滤除推荐中占比「$filterUnfollowedRatio%」的未关注用户发布的内容',
+          //     style: subTitleStyle,
+          //   ),
+          //   onTap: () async {
+          //     int? result = await showDialog(
+          //       context: context,
+          //       builder: (context) {
+          //         return SelectDialog<int>(
+          //             title: '选择滤除比例（0即不过滤）',
+          //             value: filterUnfollowedRatio,
+          //             values: [0, 16, 32, 48, 64].map((e) {
+          //               return {'title': '$e %', 'value': e};
+          //             }).toList());
+          //       },
+          //     );
+          //     if (result != null) {
+          //       filterUnfollowedRatio = result;
+          //       setting.put(
+          //           SettingBoxKey.filterUnfollowedRatio, result);
+          //       RecommendFilter.update();
+          //       setState(() {});
+          //     }
+          //   },
+          // ),
+          SetSwitchItem(
+            title: '过滤器也应用于相关视频',
+            subTitle: '视频详情页的相关视频也进行过滤²',
+            setKey: SettingBoxKey.applyFilterToRelatedVideos,
+            defaultVal: true,
+            callFn: (_) => {RecommendFilter.update},
+          ),
+          ListTile(
+            dense: true,
+            subtitle: Text(
+              '¹ 若默认web端推荐不太符合预期，可尝试切换至app端。\n'
+              '¹ 选择“模拟未登录(notLogin)”，将以空的key请求推荐接口，但播放页仍会携带用户信息，保证账号能正常记录进度、点赞投币等。\n\n'
+              '² 由于接口未提供关注信息，无法豁免相关视频中的已关注Up。\n\n'
+              '* 其它（如热门视频、手动搜索、链接跳转等）均不受过滤器影响。\n'
+              '* 设定较严苛的条件可导致推荐项数锐减或多次请求，请酌情选择。\n'
+              '* 后续可能会增加更多过滤条件，敬请期待。',
+              style: Theme.of(context)
+                  .textTheme
+                  .labelSmall!
+                  .copyWith(color: Theme.of(context).colorScheme.outline.withOpacity(0.7)),
+            ),
+          )
+        ],
+      ),
+    );
+  }
+}

lib/pages/setting/style_setting.dart

@@ -10,6 +10,7 @@ import 'package:pilipala/pages/setting/widgets/select_dialog.dart';
 import 'package:pilipala/pages/setting/widgets/slide_dialog.dart';
 import 'package:pilipala/utils/storage.dart';
 
+import '../../models/common/dynamic_badge_mode.dart';
 import 'controller.dart';
 import 'widgets/switch_item.dart';
 
@@ -101,6 +102,12 @@ class _StyleSettingState extends State<StyleSetting> {
             defaultVal: true,
             needReboot: true,
           ),
+          const SetSwitchItem(
+            title: '首页底栏背景渐变',
+            setKey: SettingBoxKey.enableGradientBg,
+            defaultVal: true,
+            needReboot: true,
+          ),
           ListTile(
             onTap: () async {
               int? result = await showDialog(
@@ -241,6 +248,14 @@ class _StyleSettingState extends State<StyleSetting> {
                 '当前模式：${settingController.themeType.value.description}',
                 style: subTitleStyle)),
           ),
+          ListTile(
+            dense: false,
+            onTap: () => settingController.setDynamicBadgeMode(context),
+            title: Text('动态未读标记', style: titleStyle),
+            subtitle: Obx(() => Text(
+                '当前标记样式：${settingController.dynamicBadgeType.value.description}',
+                style: subTitleStyle)),
+          ),
           ListTile(
             dense: false,
             onTap: () => Get.toNamed('/colorSetting'),

lib/pages/setting/view.dart

@@ -24,6 +24,11 @@ class SettingPage extends StatelessWidget {
             dense: false,
             title: const Text('隐私设置'),
           ),
+          ListTile(
+            onTap: () => Get.toNamed('/recommendSetting'),
+            dense: false,
+            title: const Text('推荐设置'),
+          ),
           ListTile(
             onTap: () => Get.toNamed('/playSetting'),
             dense: false,

lib/pages/video/detail/controller.dart

@@ -19,6 +19,7 @@ import 'package:pilipala/utils/utils.dart';
 import 'package:pilipala/utils/video_utils.dart';
 import 'package:screen_brightness/screen_brightness.dart';
 
+import '../../../utils/id_utils.dart';
 import 'widgets/header_control.dart';
 
 class VideoDetailController extends GetxController
@@ -61,7 +62,7 @@ class VideoDetailController extends GetxController
   Box localCache = GStrorage.localCache;
   Box setting = GStrorage.setting;
 
-  int oid = 0;
+  RxInt oid = 0.obs;
   // 评论id 请求楼中楼评论使用
   int fRpid = 0;
 
@@ -89,6 +90,8 @@ class VideoDetailController extends GetxController
   late String cacheDecode;
   late int cacheAudioQa;
 
+  PersistentBottomSheetController? replyReplyBottomSheetCtr;
+
   @override
   void onInit() {
     super.onInit();
@@ -135,13 +138,14 @@ class VideoDetailController extends GetxController
         defaultValue: VideoDecodeFormats.values.last.code);
     cacheAudioQa = setting.get(SettingBoxKey.defaultAudioQa,
         defaultValue: AudioQuality.hiRes.code);
+    oid.value = IdUtils.bv2av(Get.parameters['bvid']!);
   }
 
   showReplyReplyPanel() {
-    PersistentBottomSheetController? ctr =
+    replyReplyBottomSheetCtr =
         scaffoldKey.currentState?.showBottomSheet((BuildContext context) {
       return VideoReplyReplyPanel(
-        oid: oid,
+        oid: oid.value,
         rpid: fRpid,
         closePanel: () => {
           fRpid = 0,
@@ -151,7 +155,7 @@ class VideoDetailController extends GetxController
         source: 'videoDetail',
       );
     });
-    ctr?.closed.then((value) {
+    replyReplyBottomSheetCtr?.closed.then((value) {
       fRpid = 0;
     });
   }
@@ -227,9 +231,11 @@ class VideoDetailController extends GetxController
       seekTo: seekToTime ?? defaultST,
       duration: duration ?? Duration(milliseconds: data.timeLength ?? 0),
       // 宽>高 水平 否则 垂直
-      direction: (firstVideo.width! - firstVideo.height!) > 0
+      direction: firstVideo.width != null && firstVideo.height != null
-          ? 'horizontal'
+          ? ((firstVideo.width! - firstVideo.height!) > 0
-          : 'vertical',
+              ? 'horizontal'
+              : 'vertical')
+          : null,
       bvid: bvid,
       cid: cid.value,
       enableHeart: enableHeart,
@@ -246,6 +252,21 @@ class VideoDetailController extends GetxController
     var result = await VideoHttp.videoUrl(cid: cid.value, bvid: bvid);
     if (result['status']) {
       data = result['data'];
+      if (data.acceptDesc!.isNotEmpty && data.acceptDesc!.contains('试看')) {
+        SmartDialog.showToast(
+          '该视频为专属视频，仅提供试看',
+          displayTime: const Duration(seconds: 3),
+        );
+        videoUrl = data.durl!.first.url!;
+        audioUrl = '';
+        defaultST = Duration.zero;
+        firstVideo = VideoItem();
+        if (autoPlay.value) {
+          await playerInit();
+          isShowCover.value = false;
+        }
+        return result;
+      }
       final List<VideoItem> allVideosList = data.dash!.video!;
       try {
         // 当前可播放的最高质量视频
@@ -353,4 +374,11 @@ class VideoDetailController extends GetxController
     }
     return result;
   }
+
+  // mob端全屏状态关闭二级回复
+  hiddenReplyReplyPanel() {
+    replyReplyBottomSheetCtr != null
+        ? replyReplyBottomSheetCtr!.close()
+        : print('replyReplyBottomSheetCtr is null');
+  }
 }

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

@@ -18,6 +18,7 @@ import 'package:pilipala/utils/id_utils.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:share_plus/share_plus.dart';
 
+import '../related/index.dart';
 import 'widgets/group_panel.dart';
 
 class VideoIntroController extends GetxController {
@@ -148,7 +149,9 @@ class VideoIntroController extends GetxController {
   // 获取投币状态
   Future queryHasCoinVideo() async {
     var result = await VideoHttp.hasCoinVideo(bvid: bvid);
-    hasCoin.value = result["data"]['multiply'] == 0 ? false : true;
+    if (result['status']) {
+      hasCoin.value = result["data"]['multiply'] == 0 ? false : true;
+    }
   }
 
   // 获取收藏状态
@@ -208,6 +211,10 @@ class VideoIntroController extends GetxController {
 
   // （取消）点赞
   Future actionLikeVideo() async {
+    if (userInfo == null) {
+      SmartDialog.showToast('账号未登录');
+      return;
+    }
     var result = await VideoHttp.likeVideo(bvid: bvid, type: !hasLike.value);
     if (result['status']) {
       // hasLike.value = result["data"] == 1 ? true : false;
@@ -292,18 +299,17 @@ class VideoIntroController extends GetxController {
       await queryVideoInFolder();
       int defaultFolderId = favFolderData.value.list!.first.id!;
       int favStatus = favFolderData.value.list!.first.favState!;
-      print('favStatus: $favStatus');
       var result = await VideoHttp.favVideo(
         aid: IdUtils.bv2av(bvid),
         addIds: favStatus == 0 ? '$defaultFolderId' : '',
         delIds: favStatus == 1 ? '$defaultFolderId' : '',
       );
       if (result['status']) {
-        if (result['data']['prompt']) {
+        // 重新获取收藏状态
-          // 重新获取收藏状态
+        await queryHasFavVideo();
-          await queryHasFavVideo();
+        SmartDialog.showToast('✅ 操作成功');
-          SmartDialog.showToast('✅ 操作成功');
+      } else {
-        }
+        SmartDialog.showToast(result['msg']);
       }
       return;
     }
@@ -326,14 +332,14 @@ class VideoIntroController extends GetxController {
         delIds: delMediaIdsNew.join(','));
     SmartDialog.dismiss();
     if (result['status']) {
-      if (result['data']['prompt']) {
+      addMediaIdsNew = [];
-        addMediaIdsNew = [];
+      delMediaIdsNew = [];
-        delMediaIdsNew = [];
+      Get.back();
-        Get.back();
+      // 重新获取收藏状态
-        // 重新获取收藏状态
+      await queryHasFavVideo();
-        await queryHasFavVideo();
+      SmartDialog.showToast('✅ 操作成功');
-        SmartDialog.showToast('✅ 操作成功');
+    } else {
-      }
+      SmartDialog.showToast(result['msg']);
     }
   }
 
@@ -469,10 +475,15 @@ class VideoIntroController extends GetxController {
     // 重新获取视频资源
     final VideoDetailController videoDetailCtr =
         Get.find<VideoDetailController>(tag: heroTag);
+    final ReleatedController releatedCtr =
+        Get.find<ReleatedController>(tag: heroTag);
     videoDetailCtr.bvid = bvid;
+    videoDetailCtr.oid.value = aid ?? IdUtils.bv2av(bvid);
     videoDetailCtr.cid.value = cid;
     videoDetailCtr.danmakuCid.value = cid;
     videoDetailCtr.queryVideoUrl();
+    releatedCtr.bvid = bvid;
+    releatedCtr.queryRelatedVideo();
     // 重新请求评论
     try {
       /// 未渲染回复组件时可能异常

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

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

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

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

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

@@ -41,17 +41,25 @@ class VideoReplyController extends GetxController {
   @override
   void onInit() {
     super.onInit();
-    final int deaultReplySortIndex =
+    int deaultReplySortIndex =
         setting.get(SettingBoxKey.replySortType, defaultValue: 0) as int;
+    if (deaultReplySortIndex == 2) {
+      setting.put(SettingBoxKey.replySortType, 0);
+      deaultReplySortIndex = 0;
+    }
     _sortType = ReplySortType.values[deaultReplySortIndex];
     sortTypeTitle.value = _sortType.titles;
     sortTypeLabel.value = _sortType.labels;
   }
 
   Future queryReplyList({type = 'init'}) async {
+    if (isLoadingMore) {
+      return;
+    }
     isLoadingMore = true;
     if (type == 'init') {
       currentPage = 0;
+      noMore.value = '';
     }
     if (noMore.value == '没有更多了') {
       return;
@@ -115,9 +123,6 @@ class VideoReplyController extends GetxController {
           _sortType = ReplySortType.like;
           break;
         case ReplySortType.like:
-          _sortType = ReplySortType.reply;
-          break;
-        case ReplySortType.reply:
           _sortType = ReplySortType.time;
           break;
         default:

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

@@ -16,11 +16,13 @@ import 'widgets/reply_item.dart';
 
 class VideoReplyPanel extends StatefulWidget {
   final String? bvid;
+  final int? oid;
   final int rpid;
   final String? replyLevel;
 
   const VideoReplyPanel({
     this.bvid,
+    this.oid,
     this.rpid = 0,
     this.replyLevel,
     super.key,
@@ -48,16 +50,17 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
   @override
   void initState() {
     super.initState();
-    int oid = widget.bvid != null ? IdUtils.bv2av(widget.bvid!) : 0;
+    // int oid = widget.bvid != null ? IdUtils.bv2av(widget.bvid!) : 0;
     heroTag = Get.arguments['heroTag'];
     replyLevel = widget.replyLevel ?? '1';
     if (replyLevel == '2') {
       _videoReplyController = Get.put(
-          VideoReplyController(oid, widget.rpid.toString(), replyLevel),
+          VideoReplyController(widget.oid, widget.rpid.toString(), replyLevel),
           tag: widget.rpid.toString());
     } else {
-      _videoReplyController =
+      _videoReplyController = Get.put(
-          Get.put(VideoReplyController(oid, '', replyLevel), tag: heroTag);
+          VideoReplyController(widget.oid, '', replyLevel),
+          tag: heroTag);
     }
 
     fabAnimationCtr = AnimationController(
@@ -75,7 +78,8 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
       () {
         if (scrollController.position.pixels >=
             scrollController.position.maxScrollExtent - 300) {
-          EasyThrottle.throttle('replylist', const Duration(seconds: 2), () {
+          EasyThrottle.throttle('replylist', const Duration(milliseconds: 200),
+              () {
             _videoReplyController.onLoad();
           });
         }
@@ -110,7 +114,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
     final VideoDetailController videoDetailCtr =
         Get.find<VideoDetailController>(tag: heroTag);
     if (replyItem != null) {
-      videoDetailCtr.oid = replyItem.oid;
+      videoDetailCtr.oid.value = replyItem.oid;
       videoDetailCtr.fRpid = replyItem.rpid!;
       videoDetailCtr.firstFloor = replyItem;
       videoDetailCtr.showReplyReplyPanel();

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

@@ -1,6 +1,7 @@
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/common/widgets/badge.dart';
@@ -13,8 +14,8 @@ 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';
-
 import 'zan.dart';
 
 Box setting = GStrorage.setting;
@@ -47,6 +48,17 @@ class ReplyItem extends StatelessWidget {
             replyReply!(replyItem);
           }
         },
+        onLongPress: () {
+          feedBack();
+          showModalBottomSheet(
+            context: context,
+            useRootNavigator: true,
+            isScrollControlled: true,
+            builder: (context) {
+              return MorePanel(item: replyItem);
+            },
+          );
+        },
         child: Column(
           children: [
             Padding(
@@ -122,98 +134,6 @@ class ReplyItem extends StatelessWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: <Widget>[
-        // 头像、昵称
-        // SizedBox(
-        //   width: double.infinity,
-        //   child: Stack(
-        //     children: [
-        //       GestureDetector(
-        //         behavior: HitTestBehavior.opaque,
-        //         onTap: () {
-        //           feedBack();
-        //           Get.toNamed('/member?mid=${replyItem!.mid}', arguments: {
-        //             'face': replyItem!.member!.avatar!,
-        //             'heroTag': heroTag
-        //           });
-        //         },
-        //         child: Row(
-        //           crossAxisAlignment: CrossAxisAlignment.center,
-        //           mainAxisSize: MainAxisSize.min,
-        //           children: <Widget>[
-        //             lfAvtar(context, heroTag),
-        //             const SizedBox(width: 12),
-        //             Text(
-        //               replyItem!.member!.uname!,
-        //               style: TextStyle(
-        //                 color: replyItem!.member!.vip!['vipStatus'] > 0
-        //                     ? const Color.fromARGB(255, 251, 100, 163)
-        //                     : Theme.of(context).colorScheme.outline,
-        //                 fontSize: 13,
-        //               ),
-        //             ),
-        //             const SizedBox(width: 6),
-        //             Image.asset(
-        //               'assets/images/lv/lv${replyItem!.member!.level}.png',
-        //               height: 11,
-        //             ),
-        //             const SizedBox(width: 6),
-        //             if (replyItem!.isUp!)
-        //               const PBadge(
-        //                 text: 'UP',
-        //                 size: 'small',
-        //                 stack: 'normal',
-        //                 fs: 9,
-        //               ),
-        //           ],
-        //         ),
-        //       ),
-        //       Positioned(
-        //         top: 0,
-        //         left: 0,
-        //         right: 0,
-        //         child: Container(
-        //           width: double.infinity,
-        //           height: 45,
-        //           decoration: BoxDecoration(
-        //             image: replyItem!.member!.userSailing!.cardbg != null
-        //                 ? DecorationImage(
-        //                     alignment: Alignment.centerRight,
-        //                     fit: BoxFit.fitHeight,
-        //                     image: NetworkImage(
-        //                       replyItem!.member!.userSailing!.cardbg!['image'],
-        //                     ),
-        //                   )
-        //                 : null,
-        //           ),
-        //         ),
-        //       ),
-        //       if (replyItem!.member!.userSailing!.cardbg != null &&
-        //           replyItem!.member!.userSailing!.cardbg!['fan']['number'] > 0)
-        //         Positioned(
-        //           top: 10,
-        //           left: Get.size.width / 7 * 5.8,
-        //           child: DefaultTextStyle(
-        //             style: TextStyle(
-        //               fontFamily: 'fansCard',
-        //               fontSize: 9,
-        //               color: Theme.of(context).colorScheme.primary,
-        //             ),
-        //             child: Column(
-        //               crossAxisAlignment: CrossAxisAlignment.start,
-        //               mainAxisAlignment: MainAxisAlignment.center,
-        //               children: [
-        //                 const Text('NO.'),
-        //                 Text(
-        //                   replyItem!.member!.userSailing!.cardbg!['fan']
-        //                       ['num_desc'],
-        //                 ),
-        //               ],
-        //             ),
-        //           ),
-        //         ),
-        //     ],
-        //   ),
-        // ),
         /// fix Stack内GestureDetector  onTap无效
         GestureDetector(
           behavior: HitTestBehavior.opaque,
@@ -290,30 +210,26 @@ class ReplyItem extends StatelessWidget {
         // title
         Container(
           margin: const EdgeInsets.only(top: 10, left: 45, right: 6, bottom: 4),
-          child: SelectableRegion(
+          child: Text.rich(
-            focusNode: FocusNode(),
+            style: const TextStyle(height: 1.75),
-            selectionControls: MaterialTextSelectionControls(),
+            maxLines:
-            child: Text.rich(
+                replyItem!.content!.isText! && replyLevel == '1' ? 3 : 999,
-              style: const TextStyle(height: 1.75),
+            overflow: TextOverflow.ellipsis,
-              maxLines:
+            TextSpan(
-                  replyItem!.content!.isText! && replyLevel == '1' ? 3 : 999,
+              children: [
-              overflow: TextOverflow.ellipsis,
+                if (replyItem!.isTop!)
-              TextSpan(
+                  const WidgetSpan(
-                children: [
+                    alignment: PlaceholderAlignment.top,
-                  if (replyItem!.isTop!)
+                    child: PBadge(
-                    const WidgetSpan(
+                      text: 'TOP',
-                      alignment: PlaceholderAlignment.top,
+                      size: 'small',
-                      child: PBadge(
+                      stack: 'normal',
-                        text: 'TOP',
+                      type: 'line',
-                        size: 'small',
+                      fs: 9,
-                        stack: 'normal',
-                        type: 'line',
-                        fs: 9,
-                      ),
                     ),
-                  buildContent(context, replyItem!, replyReply, null),
+                  ),
-                ],
+                buildContent(context, replyItem!, replyReply, null),
-              ),
+              ],
             ),
           ),
         ),
@@ -446,6 +362,17 @@ class ReplyItemRow extends StatelessWidget {
                 InkWell(
                   // 一楼点击评论展开评论详情
                   onTap: () => replyReply!(replyItem),
+                  onLongPress: () {
+                    feedBack();
+                    showModalBottomSheet(
+                      context: context,
+                      useRootNavigator: true,
+                      isScrollControlled: true,
+                      builder: (context) {
+                        return MorePanel(item: replies![i]);
+                      },
+                    );
+                  },
                   child: Container(
                     width: double.infinity,
                     padding: EdgeInsets.fromLTRB(
@@ -539,20 +466,7 @@ InlineSpan buildContent(
   // replyReply 查看二楼回复（回复详情）回调
   // fReplyItem 父级回复内容，用作二楼回复（回复详情）展示
   final content = replyItem.content;
-  if (content.emote.isEmpty &&
-      content.atNameToMid.isEmpty &&
-      content.jumpUrl.isEmpty &&
-      content.vote.isEmpty &&
-      content.pictures.isEmpty) {
-    return TextSpan(
-      text: content.message,
-      recognizer: TapGestureRecognizer()
-        ..onTap =
-            () => replyReply(replyItem.root == 0 ? replyItem : fReplyItem),
-    );
-  }
   final List<InlineSpan> spanChilds = <InlineSpan>[];
-  bool hasMatchMember = false;
 
   // 投票
   if (content.vote.isNotEmpty) {
@@ -582,280 +496,279 @@ InlineSpan buildContent(
     });
   }
   // content.message = content.message.replaceAll(RegExp(r"\{vote:.*?\}"), ' ');
-  if (content.message.contains('&amp;')) {
+  content.message = content.message
-    content.message = content.message.replaceAll('&amp;', '&');
+      .replaceAll('&amp;', '&')
-  }
+      .replaceAll('&lt;', '<')
-  // 匹配表情
+      .replaceAll('&gt;', '>')
-  content.message.splitMapJoin(
+      .replaceAll('&quot;', '"')
-    RegExp(r"\[.*?\]"),
+      .replaceAll('&apos;', "'")
-    onMatch: (Match match) {
+      .replaceAll('&nbsp;', ' ');
-      final String matchStr = match[0]!;
+  // print("content.jumpUrl.keys:" + content.jumpUrl.keys.toString());
-      if (content.emote.isNotEmpty &&
+  // 构建正则表达式
-          matchStr.indexOf('[') == matchStr.lastIndexOf('[') &&
+  final List<String> specialTokens = [
-          matchStr.indexOf(']') == matchStr.lastIndexOf(']')) {
+    ...content.emote.keys,
-        final int size = content.emote[matchStr]['meta']['size'];
+    ...content.atNameToMid.keys.map((e) => '@$e'),
-        if (content.emote.keys.contains(matchStr)) {
+    ...content.jumpUrl.keys.map((e) =>
-          spanChilds.add(
+        e.replaceAll('?', '\\?').replaceAll('+', '\\+').replaceAll('*', '\\*')),
-            WidgetSpan(
+  ];
-              child: NetworkImgLayer(
-                src: content.emote[matchStr]['url'],
-                type: 'emote',
-                width: size * 20,
-                height: size * 20,
-              ),
-            ),
-          );
-        } else {
-          spanChilds.add(TextSpan(
-              text: matchStr,
-              recognizer: TapGestureRecognizer()
-                ..onTap = () =>
-                    replyReply(replyItem.root == 0 ? replyItem : fReplyItem)));
-          return matchStr;
-        }
-      } else {
-        spanChilds.add(TextSpan(
-            text: matchStr,
-            recognizer: TapGestureRecognizer()
-              ..onTap = () =>
-                  replyReply(replyItem.root == 0 ? replyItem : fReplyItem)));
-        return matchStr;
-      }
-      return '';
-    },
-    onNonMatch: (String str) {
-      // 匹配@用户
-      String matchMember = str;
-      if (content.atNameToMid.isNotEmpty) {
-        final List atNameToMidKeys = content.atNameToMid.keys.toList();
-        RegExp reg = RegExp(atNameToMidKeys.map((key) => key).join('|'));
-        // if (!content.message.contains(':')) {
-        //   reg = RegExp(r"@.*( |:)");
-        // }
 
-        // 只@用户没有内容
+  String patternStr = specialTokens.map(RegExp.escape).join('|');
-        if (!content.message.contains(':') ||
+  if (patternStr.isNotEmpty) {
-            (content.atNameToMid.length == 1 &&
+    patternStr += "|";
-                content.message == '@${content.members.first.uname}')) {
+  }
-          reg = RegExp(r"@.*( |:|$)");
+  patternStr += r'(\b(?:\d+[:：])?[0-5]?[0-9][:：][0-5]?[0-9]\b)';
-        }
+  final RegExp pattern = RegExp(patternStr);
-        matchMember = str.splitMapJoin(
+  List<String> matchedStrs = [];
-          reg,
+  void addPlainTextSpan(str) {
-          onMatch: (Match match) {
+    spanChilds.add(TextSpan(
-            if (match[0] != null) {
+        text: str,
-              hasMatchMember = true;
+        recognizer: TapGestureRecognizer()
-              content.atNameToMid.forEach((key, value) {
+          ..onTap =
-                if (str.contains('回复')) {
+              () => replyReply(replyItem.root == 0 ? replyItem : fReplyItem)));
-                  spanChilds.add(
+  }
-                    TextSpan(
+
-                      text: '回复 ',
+  // 分割文本并处理每个部分
-                      style: TextStyle(
+  content.message.splitMapJoin(
-                        fontSize:
+    pattern,
-                            Theme.of(context).textTheme.titleSmall!.fontSize,
+    onMatch: (Match match) {
-                      ),
+      String matchStr = match[0]!;
-                    ),
+      if (content.emote.containsKey(matchStr)) {
-                  );
+        // 处理表情
-                }
+        final int size = content.emote[matchStr]['meta']['size'];
-                spanChilds.add(
+        spanChilds.add(WidgetSpan(
-                  TextSpan(
+          child: NetworkImgLayer(
-                    text: '@$key',
+            src: content.emote[matchStr]['url'],
-                    style: TextStyle(
+            type: 'emote',
-                      fontSize:
+            width: size * 20,
-                          Theme.of(context).textTheme.titleSmall!.fontSize,
+            height: size * 20,
-                      color: Theme.of(context).colorScheme.primary,
+          ),
-                    ),
+        ));
-                    recognizer: TapGestureRecognizer()
+      } else if (matchStr.startsWith("@") &&
-                      ..onTap = () {
+          content.atNameToMid.containsKey(matchStr.substring(1))) {
-                        final String heroTag = Utils.makeHeroTag(value);
+        // 处理@用户
-                        Get.toNamed(
+        final String userName = matchStr.substring(1);
-                          '/member?mid=$value',
+        final int userId = content.atNameToMid[userName];
-                          arguments: {'face': '', 'heroTag': heroTag},
+        spanChilds.add(
-                        );
+          TextSpan(
-                      },
+            text: matchStr,
-                  ),
+            style: TextStyle(
+              color: Theme.of(context).colorScheme.primary,
+            ),
+            recognizer: TapGestureRecognizer()
+              ..onTap = () {
+                final String heroTag = Utils.makeHeroTag(userId);
+                Get.toNamed(
+                  '/member?mid=$userId',
+                  arguments: {'face': '', 'heroTag': heroTag},
                 );
-              });
+              },
-            }
+          ),
-            return '';
+        );
-          },
+      } else if (RegExp(r'^\b(?:\d+[:：])?[0-5]?[0-9][:：][0-5]?[0-9]\b$')
-          onNonMatch: (String str) {
+          .hasMatch(matchStr)) {
-            if (!str.contains('@')) {
+        matchStr = matchStr.replaceAll('：', ':');
-              spanChilds.add(TextSpan(text: str));
+        spanChilds.add(
-            }
+          TextSpan(
-            print(str);
+            text: ' $matchStr ',
-            return str;
+            style: TextStyle(
-          },
+              color: Theme.of(context).colorScheme.primary,
+            ),
+            recognizer: TapGestureRecognizer()
+              ..onTap = () {
+                // 跳转到指定位置
+                try {
+                  SmartDialog.showToast('跳转至：$matchStr');
+                  Get.find<VideoDetailController>(tag: Get.arguments['heroTag'])
+                      .plPlayerController
+                      .seekTo(
+                        Duration(seconds: Utils.duration(matchStr)),
+                      );
+                } catch (e) {
+                  SmartDialog.showToast('跳转失败: $e');
+                }
+              },
+          ),
         );
       } else {
-        matchMember = str;
+        // print("matchStr=$matchStr");
-      }
+        String appUrlSchema = '';
-
+        final bool enableWordRe = setting.get(SettingBoxKey.enableWordRe,
-      // 匹配 jumpUrl
+            defaultValue: false) as bool;
-      String matchUrl = matchMember;
+        if (content.jumpUrl[matchStr] != null &&
-      if (content.jumpUrl.isNotEmpty) {
+            !matchedStrs.contains(matchStr)) {
-        final List urlKeys = content.jumpUrl.keys.toList().reversed.toList();
+          appUrlSchema = content.jumpUrl[matchStr]['app_url_schema'];
-        for (int index = 0; index < urlKeys.length; index++) {
+          if (appUrlSchema.startsWith('bilibili://search') && !enableWordRe) {
-          var i = urlKeys[index];
+            addPlainTextSpan(matchStr);
-          if (i.contains('?')) {
+            return "";
-            urlKeys[index] = i.replaceAll('?', '\\?');
           }
-          if (i.contains('+')) {
+          spanChilds.addAll(
-            urlKeys[index] = i.replaceAll('+', '\\+');
+            [
-          }
+              if (content.jumpUrl[matchStr]?['prefix_icon'] != null) ...[
-          if (i.contains('*')) {
+                WidgetSpan(
-            urlKeys[index] = i.replaceAll('*', '\\*');
+                  child: Image.network(
-          }
+                    content.jumpUrl[matchStr]['prefix_icon'],
-        }
+                    height: 19,
-        if (hasMatchMember) {
+                    color: Theme.of(context).colorScheme.primary,
-          matchMember = matchMember.split('回复 @ :').length > 1
-              ? matchMember.split('回复 @ :')[1]
-              : matchMember;
-        }
-        matchUrl = matchMember.splitMapJoin(
-          /// RegExp.escape() 转义特殊字符
-          RegExp(urlKeys.map((key) => key).join("|")),
-          // RegExp('What does the fox say\\?'),
-          onMatch: (Match match) {
-            final String matchStr = match[0]!;
-            String appUrlSchema = '';
-            if (content.jumpUrl[matchStr] != null) {
-              appUrlSchema = content.jumpUrl[matchStr]['app_url_schema'];
-            }
-            // 默认不显示关键词
-            final bool enableWordRe = setting.get(SettingBoxKey.enableWordRe,
-                defaultValue: false) as bool;
-            if (content.jumpUrl[matchStr] != null) {
-              spanChilds.add(
-                TextSpan(
-                  text: content.jumpUrl[matchStr]['title'],
-                  style: TextStyle(
-                    color: enableWordRe
-                        ? Theme.of(context).colorScheme.primary
-                        : null,
                   ),
-                  recognizer: TapGestureRecognizer()
+                )
-                    ..onTap = () {
+              ],
-                      if (appUrlSchema == '') {
+              TextSpan(
-                        final String str = Uri.parse(matchStr).pathSegments[0];
+                text: content.jumpUrl[matchStr]['title'],
-                        final Map matchRes = IdUtils.matchAvorBv(input: str);
+                style: TextStyle(
-                        final List matchKeys = matchRes.keys.toList();
+                  color: Theme.of(context).colorScheme.primary,
-                        if (matchKeys.isNotEmpty) {
+                ),
-                          if (matchKeys.first == 'BV') {
+                recognizer: TapGestureRecognizer()
-                            Get.toNamed(
+                  ..onTap = () async {
-                              '/searchResult',
+                    final String title = content.jumpUrl[matchStr]['title'];
-                              parameters: {'keyword': matchRes['BV']},
+                    if (appUrlSchema == '') {
-                            );
+                      if (matchStr.startsWith('BV')) {
-                          }
+                        UrlUtils.matchUrlPush(
+                          matchStr,
+                          title,
+                          '',
+                        );
+                      } else {
+                        final String redirectUrl =
+                            await UrlUtils.parseRedirectUrl(matchStr);
+                        final String pathSegment = Uri.parse(redirectUrl).path;
+                        final String lastPathSegment =
+                            pathSegment.split('/').last;
+                        if (lastPathSegment.startsWith('BV')) {
+                          UrlUtils.matchUrlPush(
+                            lastPathSegment,
+                            title,
+                            redirectUrl,
+                          );
                         } else {
                           Get.toNamed(
                             '/webview',
                             parameters: {
-                              'url': matchStr,
+                              'url': redirectUrl,
                               'type': 'url',
-                              'pageTitle': ''
+                              'pageTitle': title
+                            },
+                          );
+                        }
+                      }
+                    } else {
+                      if (appUrlSchema.startsWith('bilibili://search')) {
+                        Get.toNamed('/searchResult',
+                            parameters: {'keyword': title});
+                      } else if (matchStr.startsWith('https://b23.tv')) {
+                        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
                             },
                           );
                         }
                       } else {
-                        if (appUrlSchema.startsWith('bilibili://search') &&
+                        Get.toNamed(
-                            enableWordRe) {
+                          '/webview',
-                          Get.toNamed('/searchResult', parameters: {
+                          parameters: {
-                            'keyword': content.jumpUrl[matchStr]['title']
+                            'url': matchStr,
-                          });
+                            'type': 'url',
-                        }
+                            'pageTitle': title
+                          },
+                        );
                       }
-                    },
+                    }
-                ),
+                  },
-              );
+              )
-            }
+            ],
-
+          );
-            if (appUrlSchema.startsWith('bilibili://search') && enableWordRe) {
+          // 只显示一次
-              spanChilds.add(
+          matchedStrs.add(matchStr);
-                WidgetSpan(
+        } else {
-                  child: Icon(
+          addPlainTextSpan(matchStr);
-                    FontAwesomeIcons.magnifyingGlass,
+        }
-                    size: 9,
-                    color: Theme.of(context).colorScheme.primary,
-                  ),
-                  alignment: PlaceholderAlignment.top,
-                ),
-              );
-            }
-            return '';
-          },
-          onNonMatch: (String str) {
-            spanChilds.add(TextSpan(
-                text: str,
-                recognizer: TapGestureRecognizer()
-                  ..onTap = () => replyReply(
-                      replyItem.root == 0 ? replyItem : fReplyItem)));
-            return str;
-          },
-        );
       }
-      str = matchUrl.splitMapJoin(
+      return '';
-        RegExp(r'\b\d{2}:\d{2}\b'),
+    },
-        onMatch: (Match match) {
+    onNonMatch: (String nonMatchStr) {
-          String matchStr = match[0]!;
+      addPlainTextSpan(nonMatchStr);
-          spanChilds.add(
+      return nonMatchStr;
+    },
+  );
+
+  if (content.jumpUrl.keys.isNotEmpty) {
+    List<String> unmatchedItems = content.jumpUrl.keys
+        .toList()
+        .where((item) => !content.message.contains(item))
+        .toList();
+    if (unmatchedItems.isNotEmpty) {
+      for (int i = 0; i < unmatchedItems.length; i++) {
+        String patternStr = unmatchedItems[i];
+        spanChilds.addAll(
+          [
+            if (content.jumpUrl[patternStr]?['prefix_icon'] != null) ...[
+              WidgetSpan(
+                child: Image.network(
+                  content.jumpUrl[patternStr]['prefix_icon'],
+                  height: 19,
+                  color: Theme.of(context).colorScheme.primary,
+                ),
+              )
+            ],
             TextSpan(
-              text: ' $matchStr ',
+              text: content.jumpUrl[patternStr]['title'],
               style: TextStyle(
                 color: Theme.of(context).colorScheme.primary,
               ),
               recognizer: TapGestureRecognizer()
                 ..onTap = () {
-                  // 跳转到指定位置
+                  Get.toNamed(
-                  try {
+                    '/webview',
-                    Get.find<VideoDetailController>(
+                    parameters: {
-                            tag: Get.arguments['heroTag'])
+                      'url': patternStr,
-                        .plPlayerController
+                      'type': 'url',
-                        .seekTo(
+                      'pageTitle': content.jumpUrl[patternStr]['title']
-                          Duration(seconds: Utils.duration(matchStr)),
+                    },
-                        );
+                  );
-                  } catch (_) {}
                 },
-            ),
+            )
-          );
+          ],
-          return '';
+        );
-        },
-        onNonMatch: (str) {
-          return str;
-        },
-      );
-
-      if (content.atNameToMid.isEmpty && content.jumpUrl.isEmpty) {
-        if (str != '') {
-          spanChilds.add(TextSpan(
-              text: str,
-              recognizer: TapGestureRecognizer()
-                ..onTap = () =>
-                    replyReply(replyItem.root == 0 ? replyItem : fReplyItem)));
-        }
       }
-      return str;
+    }
-    },
+  }
-  );
-
   // 图片渲染
   if (content.pictures.isNotEmpty) {
     final List<String> picList = <String>[];
     final int len = content.pictures.length;
+    spanChilds.add(const TextSpan(text: '\n'));
     if (len == 1) {
       Map pictureItem = content.pictures.first;
       picList.add(pictureItem['img_src']);
-      spanChilds.add(const TextSpan(text: '\n'));
       spanChilds.add(
         WidgetSpan(
           child: LayoutBuilder(
             builder: (BuildContext context, BoxConstraints box) {
               double maxHeight = box.maxWidth * 0.6; // 设置最大高度
               // double width = (box.maxWidth / 2).truncateToDouble();
-              double height = ((box.maxWidth /
+              double height = 100;
-                      2 *
+              try {
-                      pictureItem['img_height'] /
+                height = ((box.maxWidth /
-                      pictureItem['img_width']))
+                        2 *
-                  .truncateToDouble();
+                        pictureItem['img_height'] /
+                        pictureItem['img_width']))
+                    .truncateToDouble();
+              } catch (_) {}
+
               return GestureDetector(
                 onTap: () {
                   showDialog(
@@ -895,8 +808,7 @@ InlineSpan buildContent(
           ),
         ),
       );
-    }
+    } else if (len > 1) {
-    if (len > 1) {
       List<Widget> list = [];
       for (var i = 0; i < len; i++) {
         picList.add(content.pictures[i]['img_src']);
@@ -914,10 +826,11 @@ InlineSpan buildContent(
                   );
                 },
                 child: NetworkImgLayer(
-                  src: content.pictures[i]['img_src'],
+                    src: content.pictures[i]['img_src'],
-                  width: box.maxWidth,
+                    width: box.maxWidth,
-                  height: box.maxWidth,
+                    height: box.maxWidth,
-                ),
+                    origAspectRatio: content.pictures[i]['img_width'] /
+                        content.pictures[i]['img_height']),
               );
             },
           ),
@@ -978,3 +891,100 @@ InlineSpan buildContent(
   // spanChilds.add(TextSpan(text: matchMember));
   return TextSpan(children: spanChilds);
 }
+
+class MorePanel extends StatelessWidget {
+  final dynamic item;
+  const MorePanel({super.key, required this.item});
+
+  Future<dynamic> menuActionHandler(String type) async {
+    String message = item.content.message ?? item.content;
+    switch (type) {
+      case 'copyAll':
+        await Clipboard.setData(ClipboardData(text: message));
+        SmartDialog.showToast('已复制');
+        Get.back();
+        break;
+      case 'copyFreedom':
+        Get.back();
+        showDialog(
+          context: Get.context!,
+          builder: (context) {
+            return AlertDialog(
+              title: const Text('自由复制'),
+              content: SelectableText(message),
+            );
+          },
+        );
+        break;
+      // case 'block':
+      //   SmartDialog.showToast('加入黑名单');
+      //   break;
+      // case 'report':
+      //   SmartDialog.showToast('举报');
+      //   break;
+      // case 'delete':
+      //   SmartDialog.showToast('删除');
+      //   break;
+      default:
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    Color errorColor = Theme.of(context).colorScheme.error;
+    return Container(
+      padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          InkWell(
+            onTap: () => Get.back(),
+            child: Container(
+              height: 35,
+              padding: const EdgeInsets.only(bottom: 2),
+              child: Center(
+                child: Container(
+                  width: 32,
+                  height: 3,
+                  decoration: BoxDecoration(
+                      color: Theme.of(context).colorScheme.outline,
+                      borderRadius: const BorderRadius.all(Radius.circular(3))),
+                ),
+              ),
+            ),
+          ),
+          ListTile(
+            onTap: () async => await menuActionHandler('copyAll'),
+            minLeadingWidth: 0,
+            leading: const Icon(Icons.copy_all_outlined, size: 19),
+            title: Text('复制全部', style: Theme.of(context).textTheme.titleSmall),
+          ),
+          ListTile(
+            onTap: () async => await menuActionHandler('copyFreedom'),
+            minLeadingWidth: 0,
+            leading: const Icon(Icons.copy_outlined, size: 19),
+            title: Text('自由复制', style: Theme.of(context).textTheme.titleSmall),
+          ),
+          // ListTile(
+          //   onTap: () async => await menuActionHandler('block'),
+          //   minLeadingWidth: 0,
+          //   leading: Icon(Icons.block_outlined, color: errorColor),
+          //   title: Text('加入黑名单', style: TextStyle(color: errorColor)),
+          // ),
+          // ListTile(
+          //   onTap: () async => await menuActionHandler('report'),
+          //   minLeadingWidth: 0,
+          //   leading: Icon(Icons.report_outlined, color: errorColor),
+          //   title: Text('举报', style: TextStyle(color: errorColor)),
+          // ),
+          // ListTile(
+          //   onTap: () async => await menuActionHandler('del'),
+          //   minLeadingWidth: 0,
+          //   leading: Icon(Icons.delete_outline, color: errorColor),
+          //   title: Text('删除', style: TextStyle(color: errorColor)),
+          // ),
+        ],
+      ),
+    );
+  }
+}

lib/pages/video/detail/view.dart

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

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

@@ -438,7 +438,7 @@ class _HeaderControlState extends State<HeaderControl> {
           }),
           actions: <Widget>[
             TextButton(
-              onPressed: () => SmartDialog.dismiss(),
+              onPressed: () => Get.back(),
               child: Text(
                 '取消',
                 style: TextStyle(color: Theme.of(context).colorScheme.outline),

lib/pages/whisper_detail/widget/chat_item.dart

@@ -27,6 +27,7 @@ enum MsgType {
   article_card(value: 12, label: "专栏卡片"),
   pic_card(value: 13, label: "图片卡片"),
   common_share(value: 14, label: "异形卡片"),
+  auto_reply_push(value: 16, label: "自动回复推送"),
   notify_text(value: 18, label: "文本提示");
 
   final int value;
@@ -59,8 +60,10 @@ class ChatItem extends StatelessWidget {
     // bool isArticle = item.msgType == 12; // 专栏
     bool isRevoke = item.msgType == MsgType.revoke.value; // 撤回消息
     bool isShareV2 = item.msgType == MsgType.share_v2.value;
-    bool isSystem =
+    bool isSystem = item.msgType == MsgType.notify_text.value ||
-        item.msgType == 18 || item.msgType == 10 || item.msgType == 13;
+        item.msgType == MsgType.notify_msg.value ||
+        item.msgType == MsgType.pic_card.value ||
+        item.msgType == MsgType.auto_reply_push.value;
     dynamic content = item.content ?? '';
     Color textColor(BuildContext context) {
       return isOwner
@@ -190,6 +193,163 @@ class ChatItem extends StatelessWidget {
               ),
             ],
           );
+        case MsgType.archive_card:
+          return Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              GestureDetector(
+                onTap: () async {
+                  SmartDialog.showLoading();
+                  var bvid = content["bvid"];
+                  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',
+                        arguments: <String, String?>{
+                          'pic': content['thumb'],
+                          'heroTag': heroTag,
+                        }),
+                  );
+                },
+                child: NetworkImgLayer(
+                  width: 220,
+                  height: 220 * 9 / 16,
+                  src: content['cover'],
+                ),
+              ),
+              const SizedBox(height: 6),
+              Text(
+                content['title'],
+                style: TextStyle(
+                  letterSpacing: 0.6,
+                  height: 1.5,
+                  color: textColor(context),
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+              const SizedBox(height: 1),
+              Text(
+                Utils.timeFormat(content['times']),
+                style: TextStyle(
+                  letterSpacing: 0.6,
+                  height: 1.5,
+                  color: textColor(context).withOpacity(0.6),
+                  fontSize: 12,
+                ),
+              ),
+            ],
+          );
+        case MsgType.auto_reply_push:
+          return Container(
+              constraints: const BoxConstraints(
+                maxWidth: 300.0, // 设置最大宽度为200.0
+              ),
+              decoration: BoxDecoration(
+                color: Theme.of(context)
+                    .colorScheme
+                    .secondaryContainer
+                    .withOpacity(0.4),
+                borderRadius: const BorderRadius.only(
+                  topLeft: Radius.circular(16),
+                  topRight: Radius.circular(16),
+                  bottomLeft: Radius.circular(6),
+                  bottomRight: Radius.circular(16),
+                ),
+              ),
+              margin: const EdgeInsets.all(12),
+              padding: const EdgeInsets.all(12),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    content['main_title'],
+                    style: TextStyle(
+                      letterSpacing: 0.6,
+                      height: 1.5,
+                      color: textColor(context),
+                      fontWeight: FontWeight.bold,
+                    ),
+                  ),
+                  for (var i in content['sub_cards']) ...<Widget>[
+                    const SizedBox(height: 6),
+                    GestureDetector(
+                        onTap: () async {
+                          RegExp bvRegex = RegExp(r'BV[0-9A-Za-z]{10}',
+                              caseSensitive: false);
+                          Iterable<Match> matches =
+                              bvRegex.allMatches(i['jump_url']);
+                          if (matches.isNotEmpty) {
+                            Match match = matches.first;
+                            String bvid = match.group(0)!;
+                            try {
+                              SmartDialog.showLoading();
+                              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',
+                                    arguments: <String, String?>{
+                                      'pic': i['cover_url'],
+                                      'heroTag': heroTag,
+                                    }),
+                              );
+                            } catch (err) {
+                              SmartDialog.dismiss();
+                              SmartDialog.showToast(err.toString());
+                            }
+                          } else {
+                            SmartDialog.showToast('未匹配到 BV 号');
+                            Get.toNamed('/webview',
+                                arguments: {'url': i['jump_url']});
+                          }
+                        },
+                        child: Row(
+                          children: [
+                            NetworkImgLayer(
+                              width: 130,
+                              height: 130 * 9 / 16,
+                              src: i['cover_url'],
+                            ),
+                            const SizedBox(width: 6),
+                            Expanded(
+                                child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Text(
+                                  i['field1'],
+                                  maxLines: 2,
+                                  style: TextStyle(
+                                    letterSpacing: 0.6,
+                                    height: 1.5,
+                                    color: textColor(context),
+                                    fontWeight: FontWeight.bold,
+                                  ),
+                                ),
+                                Text(
+                                  i['field2'],
+                                  style: TextStyle(
+                                    letterSpacing: 0.6,
+                                    height: 1.5,
+                                    color: textColor(context).withOpacity(0.6),
+                                    fontSize: 12,
+                                  ),
+                                ),
+                                Text(
+                                  Utils.timeFormat(int.parse(i['field3'])),
+                                  style: TextStyle(
+                                    letterSpacing: 0.6,
+                                    height: 1.5,
+                                    color: textColor(context).withOpacity(0.6),
+                                    fontSize: 12,
+                                  ),
+                                ),
+                              ],
+                            )),
+                          ],
+                        )),
+                  ],
+                ],
+              ));
         default:
           return Text(
             content['content'] ?? content.toString(),

lib/plugin/pl_player/view.dart

@@ -586,6 +586,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
         ),
 
         /// 进度条 live模式下禁用
+
         Obx(
           () {
             final int value = _.sliderPositionSeconds.value;
@@ -609,7 +610,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
             }
 
             if (_.videoType.value == 'live') {
-              return nil;
+              return const SizedBox();
             }
             if (value > max || max <= 0) {
               return nil;

lib/router/app_pages.dart

@@ -3,6 +3,7 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
+import 'package:pilipala/pages/follow_search/view.dart';
 import 'package:pilipala/pages/setting/pages/logs.dart';
 
 import '../pages/about/index.dart';
@@ -39,6 +40,7 @@ import '../pages/setting/pages/display_mode.dart';
 import '../pages/setting/pages/font_size_select.dart';
 import '../pages/setting/pages/home_tabbar_set.dart';
 import '../pages/setting/pages/play_speed_set.dart';
+import '../pages/setting/recommend_setting.dart';
 import '../pages/setting/play_setting.dart';
 import '../pages/setting/privacy_setting.dart';
 import '../pages/setting/style_setting.dart';
@@ -102,7 +104,9 @@ class Routes {
     // 二级回复
     CustomGetPage(
         name: '/replyReply', page: () => const VideoReplyReplyPanel()),
-
+    // 推荐设置
+    CustomGetPage(
+        name: '/recommendSetting', page: () => const RecommendSetting()),
     // 播放设置
     CustomGetPage(name: '/playSetting', page: () => const PlaySetting()),
     // 外观设置
@@ -154,6 +158,8 @@ class Routes {
         name: '/memberSeasons', page: () => const MemberSeasonsPage()),
     // 日志
     CustomGetPage(name: '/logs', page: () => const LogsPage()),
+    // 搜索关注
+    CustomGetPage(name: '/followSearch', page: () => const FollowSearchPage()),
   ];
 }
 

lib/services/audio_handler.dart

@@ -147,8 +147,8 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
       processingState: AudioProcessingState.idle,
       playing: false,
     ));
-    _item.removeLast();
     if (_item.isNotEmpty) {
+      _item.removeLast();
       setMediaItem(_item.last);
     }
     if (_item.isEmpty) {

lib/services/audio_session.dart

@@ -20,11 +20,15 @@ class AudioSessionHandler {
     session.interruptionEventStream.listen((event) {
       final player = PlPlayerController.getInstance();
       if (event.begin) {
+        if (player.playerStatus != PlayerStatus.playing) return;
         switch (event.type) {
           case AudioInterruptionType.duck:
             player.setVolume(player.volume.value * 0.5);
             break;
           case AudioInterruptionType.pause:
+            player.pause(isInterrupt: true);
+            _playInterrupted = true;
+            break;
           case AudioInterruptionType.unknown:
             player.pause(isInterrupt: true);
             _playInterrupted = true;
@@ -36,7 +40,7 @@ class AudioSessionHandler {
             player.setVolume(player.volume.value * 2);
             break;
           case AudioInterruptionType.pause:
-            if (_playInterrupted) PlPlayerController.getInstance().play();
+            if (_playInterrupted) player.play();
             break;
           case AudioInterruptionType.unknown:
             break;
@@ -47,7 +51,10 @@ class AudioSessionHandler {
 
     // 耳机拔出暂停
     session.becomingNoisyEventStream.listen((_) {
-      PlPlayerController.getInstance().pause();
+      final player = PlPlayerController.getInstance();
+      if (player.playerStatus == PlayerStatus.playing) {
+        player.pause();
+      }
     });
   }
 }

lib/utils/cache_manage.dart

@@ -0,0 +1,154 @@
+import 'dart:async';
+import 'dart:io';
+import 'package:flutter/material.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+
+class CacheManage {
+  CacheManage._internal();
+
+  static final CacheManage cacheManage = CacheManage._internal();
+
+  factory CacheManage() => cacheManage;
+
+  // 获取缓存目录
+  Future<String> loadApplicationCache() async {
+    /// clear all of image in memory
+    // clearMemoryImageCache();
+    /// get ImageCache
+    // var res = getMemoryImageCache();
+
+    // 缓存大小
+    double cacheSize = 0;
+    // cached_network_image directory
+    Directory tempDirectory = await getTemporaryDirectory();
+    // get_storage directory
+    Directory docDirectory = await getApplicationDocumentsDirectory();
+
+    // 获取缓存大小
+    if (tempDirectory.existsSync()) {
+      double value = await getTotalSizeOfFilesInDir(tempDirectory);
+      cacheSize += value;
+    }
+
+    /// 获取缓存大小 dioCache
+    if (docDirectory.existsSync()) {
+      double value = 0;
+      String dioCacheFileName =
+          '${docDirectory.path}${Platform.pathSeparator}DioCache.db';
+      var dioCacheFile = File(dioCacheFileName);
+      if (dioCacheFile.existsSync()) {
+        value = await getTotalSizeOfFilesInDir(dioCacheFile);
+      }
+      cacheSize += value;
+    }
+
+    return formatSize(cacheSize);
+  }
+
+  // 循环计算文件的大小（递归）
+  Future<double> getTotalSizeOfFilesInDir(final FileSystemEntity file) async {
+    if (file is File) {
+      int length = await file.length();
+      return double.parse(length.toString());
+    }
+    if (file is Directory) {
+      final List<FileSystemEntity> children = file.listSync();
+      double total = 0;
+      for (final FileSystemEntity child in children) {
+        total += await getTotalSizeOfFilesInDir(child);
+      }
+      return total;
+    }
+    return 0;
+  }
+
+  // 缓存大小格式转换
+  String formatSize(double value) {
+    List<String> unitArr = ['B', 'K', 'M', 'G'];
+    int index = 0;
+    while (value > 1024) {
+      index++;
+      value = value / 1024;
+    }
+    String size = value.toStringAsFixed(2);
+    return size + unitArr[index];
+  }
+
+  // 清除缓存
+  Future<bool> clearCacheAll() async {
+    bool cleanStatus = await SmartDialog.show(
+      useSystem: true,
+      animationType: SmartAnimationType.centerFade_otherSlide,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: const Text('提示'),
+          content: const Text('该操作将清除图片及网络请求缓存数据，确认清除？'),
+          actions: [
+            TextButton(
+              onPressed: (() => {SmartDialog.dismiss()}),
+              child: Text(
+                '取消',
+                style: TextStyle(color: Theme.of(context).colorScheme.outline),
+              ),
+            ),
+            TextButton(
+              onPressed: () async {
+                SmartDialog.dismiss();
+                SmartDialog.showLoading(msg: '正在清除...');
+                try {
+                  // 清除缓存 图片缓存
+                  await clearLibraryCache();
+                  Timer(const Duration(milliseconds: 500), () {
+                    SmartDialog.dismiss().then((res) {
+                      SmartDialog.showToast('清除完成');
+                    });
+                  });
+                } catch (err) {
+                  SmartDialog.dismiss();
+                  SmartDialog.showToast(err.toString());
+                }
+              },
+              child: const Text('确认'),
+            )
+          ],
+        );
+      },
+    ).then((res) {
+      return true;
+    });
+    return cleanStatus;
+  }
+
+  /// 清除 Documents 目录下的 DioCache.db
+  Future clearApplicationCache() async {
+    Directory directory = await getApplicationDocumentsDirectory();
+    if (directory.existsSync()) {
+      String dioCacheFileName =
+          '${directory.path}${Platform.pathSeparator}DioCache.db';
+      var dioCacheFile = File(dioCacheFileName);
+      if (dioCacheFile.existsSync()) {
+        dioCacheFile.delete();
+      }
+    }
+  }
+
+  // 清除 Library/Caches 目录及文件缓存
+  Future clearLibraryCache() async {
+    var appDocDir = await getTemporaryDirectory();
+    if (appDocDir.existsSync()) {
+      await appDocDir.delete(recursive: true);
+    }
+  }
+
+  /// 递归方式删除目录及文件
+  Future deleteDirectory(FileSystemEntity file) async {
+    if (file is Directory) {
+      final List<FileSystemEntity> children = file.listSync();
+      for (final FileSystemEntity child in children) {
+        await deleteDirectory(child);
+      }
+    }
+    await file.delete();
+  }
+}

lib/utils/id_utils.dart

@@ -13,7 +13,20 @@ class IdUtils {
 
   /// av转bv
   static String av2bv(int aid) {
-    List<String> bytes = List.filled(12, '0', growable: false);
+    List<String> bytes = [
+      'B',
+      'V',
+      '1',
+      '0',
+      '0',
+      '0',
+      '0',
+      '0',
+      '0',
+      '0',
+      '0',
+      '0'
+    ];
     int bvIndex = bytes.length - 1;
     BigInt tmp = (MAX_AID | BigInt.from(aid)) ^ XOR_CODE;
     while (tmp > BigInt.zero) {
@@ -21,13 +34,13 @@ class IdUtils {
       tmp = tmp ~/ BASE;
       bvIndex -= 1;
     }
-    final tmpValue = bytes[3];
+    String tmpSwap = bytes[3];
     bytes[3] = bytes[9];
-    bytes[9] = tmpValue;
+    bytes[9] = tmpSwap;
 
-    final tmpValue2 = bytes[4];
+    tmpSwap = bytes[4];
     bytes[4] = bytes[7];
-    bytes[7] = tmpValue2;
+    bytes[7] = tmpSwap;
 
     return bytes.join();
   }

lib/utils/recommend_filter.dart

@@ -0,0 +1,52 @@
+import 'dart:math';
+
+import 'storage.dart';
+
+class RecommendFilter {
+  // static late int filterUnfollowedRatio;
+  static late int minDurationForRcmd;
+  static late int minLikeRatioForRecommend;
+  static late bool exemptFilterForFollowed;
+  static late bool applyFilterToRelatedVideos;
+  RecommendFilter() {
+    update();
+  }
+
+  static void update() {
+    var setting = GStrorage.setting;
+    // filterUnfollowedRatio =
+    //     setting.get(SettingBoxKey.filterUnfollowedRatio, defaultValue: 0);
+    minDurationForRcmd =
+        setting.get(SettingBoxKey.minDurationForRcmd, defaultValue: 0);
+    minLikeRatioForRecommend =
+        setting.get(SettingBoxKey.minLikeRatioForRecommend, defaultValue: 0);
+    exemptFilterForFollowed =
+        setting.get(SettingBoxKey.exemptFilterForFollowed, defaultValue: true);
+    applyFilterToRelatedVideos = setting
+        .get(SettingBoxKey.applyFilterToRelatedVideos, defaultValue: true);
+  }
+
+  static bool filter(dynamic videoItem, {bool relatedVideos = false}) {
+    if (relatedVideos && !applyFilterToRelatedVideos) {
+      return false;
+    }
+    //由于相关视频中没有已关注标签，只能视为非关注视频
+    if (!relatedVideos &&
+        videoItem.isFollowed == 1 &&
+        exemptFilterForFollowed) {
+      return false;
+    }
+    if (videoItem.duration > 0 && videoItem.duration < minDurationForRcmd) {
+      return true;
+    }
+    if (videoItem.stat.view is int &&
+        videoItem.stat.view > -1 &&
+        videoItem.stat.like is int &&
+        videoItem.stat.like > -1 &&
+        videoItem.stat.like * 100 <
+            minLikeRatioForRecommend * videoItem.stat.view) {
+      return true;
+    }
+    return false;
+  }
+}

lib/utils/storage.dart

@@ -42,6 +42,8 @@ class GStrorage {
         return deletedEntries > 10;
       },
     );
+    // 视频设置
+    video = await Hive.openBox('video');
   }
 
   static void regAdapter() {
@@ -52,11 +54,6 @@ class GStrorage {
     Hive.registerAdapter(HotSearchItemAdapter());
   }
 
-  static Future<void> lazyInit() async {
-    // 视频设置
-    video = await Hive.openBox('video');
-  }
-
   static Future<void> close() async {
     // user.compact();
     // user.close();
@@ -105,17 +102,24 @@ class SettingBoxKey {
       /// 隐私
       blackMidsList = 'blackMidsList',
 
+      /// 推荐
+      enableRcmdDynamic = 'enableRcmdDynamic',
+      defaultRcmdType = 'defaultRcmdType',
+      enableSaveLastData = 'enableSaveLastData',
+      minDurationForRcmd = 'minDurationForRcmd',
+      minLikeRatioForRecommend = 'minLikeRatioForRecommend',
+      exemptFilterForFollowed = 'exemptFilterForFollowed',
+      //filterUnfollowedRatio = 'filterUnfollowedRatio',
+      applyFilterToRelatedVideos = 'applyFilterToRelatedVideos',
+
       /// 其他
       autoUpdate = 'autoUpdate',
-      defaultRcmdType = 'defaultRcmdType',
       replySortType = 'replySortType',
       defaultDynamicType = 'defaultDynamicType',
       enableHotKey = 'enableHotKey',
       enableQuickFav = 'enableQuickFav',
       enableWordRe = 'enableWordRe',
       enableSearchWord = 'enableSearchWord',
-      enableRcmdDynamic = 'enableRcmdDynamic',
-      enableSaveLastData = 'enableSaveLastData',
       enableSystemProxy = 'enableSystemProxy',
       enableAi = 'enableAi';
 
@@ -130,7 +134,9 @@ class SettingBoxKey {
       enableMYBar = 'enableMYBar',
       hideSearchBar = 'hideSearchBar', // 收起顶栏
       hideTabBar = 'hideTabBar', // 收起底栏
-      tabbarSort = 'tabbarSort'; // 首页tabbar
+      tabbarSort = 'tabbarSort', // 首页tabbar
+      dynamicBadgeMode = 'dynamicBadgeMode',
+      enableGradientBg = 'enableGradientBg';
 }
 
 class LocalCacheKey {

lib/utils/url_utils.dart

@@ -0,0 +1,61 @@
+import 'package:dio/dio.dart';
+import 'package:get/get.dart';
+
+import '../http/search.dart';
+import 'id_utils.dart';
+import 'utils.dart';
+
+class UrlUtils {
+  // 302重定向路由截取
+  static Future<String> parseRedirectUrl(String url) async {
+    late String redirectUrl;
+    final dio = Dio();
+    dio.options.followRedirects = false;
+    dio.options.validateStatus = (status) {
+      return status == 200 || status == 301 || status == 302;
+    };
+    final response = await dio.get(url);
+    if (response.statusCode == 302) {
+      redirectUrl = response.headers['location']?.first as String;
+      if (redirectUrl.endsWith('/')) {
+        redirectUrl = redirectUrl.substring(0, redirectUrl.length - 1);
+      }
+    } else {
+      if (url.endsWith('/')) {
+        url = url.substring(0, url.length - 1);
+      }
+      return url;
+    }
+    return redirectUrl;
+  }
+
+  // 匹配url路由跳转
+  static matchUrlPush(
+    String pathSegment,
+    String title,
+    String redirectUrl,
+  ) async {
+    final Map matchRes = IdUtils.matchAvorBv(input: pathSegment);
+    if (matchRes.containsKey('BV')) {
+      final String bv = matchRes['BV'];
+      final int cid = await SearchHttp.ab2c(bvid: bv);
+      final String heroTag = Utils.makeHeroTag(bv);
+      await Get.toNamed(
+        '/video?bvid=$bv&cid=$cid',
+        arguments: <String, String?>{
+          'pic': '',
+          'heroTag': heroTag,
+        },
+      );
+    } else {
+      await Get.toNamed(
+        '/webview',
+        parameters: {
+          'url': redirectUrl,
+          'type': 'url',
+          'pageTitle': title,
+        },
+      );
+    }
+  }
+}

lib/utils/utils.dart

@@ -9,7 +9,6 @@ import 'package:crypto/crypto.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
-import 'package:get/get_utils/get_utils.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -28,10 +27,16 @@ class Utils {
     return tempPath;
   }
 
-  static String numFormat(int number) {
+  static String numFormat(dynamic number) {
+    if (number == null) {
+      return '0';
+    }
+    if (number is String) {
+      return number;
+    }
     final String res = (number / 10000).toString();
     if (int.parse(res.split('.')[0]) >= 1) {
-      return '${(number / 10000).toPrecision(1)}万';
+      return '${(number / 10000).toStringAsFixed(1)}万';
     } else {
       return number.toString();
     }
@@ -58,6 +63,26 @@ class Utils {
     }
   }
 
+  // 完全相对时间显示
+  static String formatTimestampToRelativeTime(timeStamp) {
+    var difference = DateTime.now()
+        .difference(DateTime.fromMillisecondsSinceEpoch(timeStamp * 1000));
+
+    if (difference.inDays > 365) {
+      return '${difference.inDays ~/ 365}年前';
+    } else if (difference.inDays > 30) {
+      return '${difference.inDays ~/ 30}个月前';
+    } else if (difference.inDays > 0) {
+      return '${difference.inDays}天前';
+    } else if (difference.inHours > 0) {
+      return '${difference.inHours}小时前';
+    } else if (difference.inMinutes > 0) {
+      return '${difference.inMinutes}分钟前';
+    } else {
+      return '刚刚';
+    }
+  }
+
   // 时间显示，刚刚，x分钟前
   static String dateFormat(timeStamp, {formatType = 'list'}) {
     // 当前时间
@@ -276,16 +301,18 @@ class Utils {
       // [arm64-v8a]
       String abi = androidInfo.supportedAbis.first;
       late String downloadUrl;
-      for (var i in data.assets) {
+      if (data.assets.isNotEmpty) {
-        if (i.downloadUrl.contains(abi)) {
+        for (var i in data.assets) {
-          downloadUrl = i.downloadUrl;
+          if (i.downloadUrl.contains(abi)) {
+            downloadUrl = i.downloadUrl;
+          }
         }
+        // 应用外下载
+        launchUrl(
+          Uri.parse(downloadUrl),
+          mode: LaunchMode.externalApplication,
+        );
       }
-      // 应用外下载
-      launchUrl(
-        Uri.parse(downloadUrl),
-        mode: LaunchMode.externalApplication,
-      );
     }
   }
 

pubspec.lock

@@ -500,10 +500,11 @@ packages:
   floating:
     dependency: "direct main"
     description:
-      name: floating
+      path: "."
-      sha256: d9d563089e34fbd714ffdcdd2df447ec41b40c9226dacae6b4f78847aef8b991
+      ref: main
-      url: "https://pub.flutter-io.cn"
+      resolved-ref: d2d8421c4d80f6113f832404109853684721e11a
-    source: hosted
+      url: "https://github.com/guozhigq/floating.git"
+    source: git
     version: "2.0.1"
   flutter:
     dependency: "direct main"

pubspec.yaml

@@ -124,7 +124,10 @@ dependencies:
   # 代理
   system_proxy: ^0.1.0
   # pip
-  floating: ^2.0.1
+  floating:
+    git:
+      url: https://github.com/guozhigq/floating.git
+      ref: main
   # html解析
   html: ^0.15.4
   # html渲染
@@ -185,6 +188,7 @@ flutter:
     - assets/images/
     - assets/images/lv/
     - assets/images/logo/
+    - assets/images/live/
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware