feat: 热搜词跳转直播

lib/common/widgets/http_error.dart

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

lib/common/widgets/stat/danmu.dart

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

lib/common/widgets/video_card_h.dart

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

lib/common/widgets/video_card_v.dart

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

lib/http/api.dart

@@ -214,9 +214,6 @@ 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
@@ -233,10 +230,6 @@ 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,6 +1,5 @@
 import '../models/live/item.dart';
 import '../models/live/room_info.dart';
-import '../models/live/room_info_h5.dart';
 import 'api.dart';
 import 'init.dart';
 
@@ -47,22 +46,4 @@ 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

@@ -461,41 +461,4 @@ 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,7 +9,6 @@ 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';
@@ -47,13 +46,8 @@ class VideoHttp {
             setting.get(SettingBoxKey.blackMidsList, defaultValue: [-1]);
         for (var i in res.data['data']['item']) {
           //过滤掉live与ad，以及拉黑用户
-          if (i['goto'] == 'av' &&
-              (i['owner'] != null &&
-                  !blackMidsList.contains(i['owner']['mid']))) {
-            RecVideoItemModel videoItem = RecVideoItemModel.fromJson(i);
-            if (!RecommendFilter.filter(videoItem)) {
-              list.add(videoItem);
-            }
+          if (i['goto'] == 'av' && !blackMidsList.contains(i['owner']['mid'])) {
+            list.add(RecVideoItemModel.fromJson(i));
           }
         }
         return {'status': true, 'data': list};
@@ -65,9 +59,7 @@ class VideoHttp {
     }
   }
 
-  // 添加额外的loginState变量模拟未登录状态
-  static Future rcmdVideoListApp(
-      {bool loginStatus = true, required int freshIdx}) async {
+  static Future rcmdVideoListApp({int? ps, required int freshIdx}) async {
     try {
       var res = await Request().get(
         Api.recommendListApp,
@@ -80,11 +72,9 @@ class VideoHttp {
           'device_name': 'vivo',
           'pull': freshIdx == 0 ? 'true' : 'false',
           'appkey': Constants.appKey,
-          'access_key': loginStatus
-              ? (localCache.get(LocalCacheKey.accessKey,
-                      defaultValue: {})['value'] ??
-                  '')
-              : ''
+          'access_key': localCache
+                  .get(LocalCacheKey.accessKey, defaultValue: {})['value'] ??
+              ''
         },
       );
       if (res.data['code'] == 0) {
@@ -97,15 +87,12 @@ class VideoHttp {
               (!enableRcmdDynamic ? i['card_goto'] != 'picture' : true) &&
               (i['args'] != null &&
                   !blackMidsList.contains(i['args']['up_mid']))) {
-            RecVideoItemAppModel videoItem = RecVideoItemAppModel.fromJson(i);
-            if (!RecommendFilter.filter(videoItem)) {
-              list.add(videoItem);
-            }
+            list.add(RecVideoItemAppModel.fromJson(i));
           }
         }
         return {'status': true, 'data': list};
       } else {
-        return {'status': false, 'data': [], 'msg': res.data['message']};
+        return {'status': false, 'data': [], 'msg': ''};
       }
     } catch (err) {
       return {'status': false, 'data': [], 'msg': err.toString()};
@@ -130,7 +117,7 @@ class VideoHttp {
         }
         return {'status': true, 'data': list};
       } else {
-        return {'status': false, 'data': [], 'msg': res.data['message']};
+        return {'status': false, 'data': []};
       }
     } catch (err) {
       return {'status': false, 'data': [], 'msg': err};
@@ -216,10 +203,7 @@ class VideoHttp {
     if (res.data['code'] == 0) {
       List<HotVideoItemModel> list = [];
       for (var i in res.data['data']) {
-        HotVideoItemModel videoItem = HotVideoItemModel.fromJson(i);
-        if (!RecommendFilter.filter(videoItem, relatedVideos: true)) {
-          list.add(videoItem);
-        }
+        list.add(HotVideoItemModel.fromJson(i));
       }
       return {'status': true, 'data': list};
     } else {
@@ -322,7 +306,7 @@ class VideoHttp {
     if (res.data['code'] == 0) {
       return {'status': true, 'data': res.data['data']};
     } else {
-      return {'status': false, 'data': [], 'msg': res.data['message']};
+      return {'status': false, 'data': []};
     }
   }
 

lib/main.dart

@@ -21,7 +21,6 @@ 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';
 
@@ -35,7 +34,6 @@ void main() async {
     await setupServiceLocator();
     Request();
     await Request.setCookie();
-    RecommendFilter();
 
     // 异常捕获 logo记录
     final Catcher2Options debugConfig = Catcher2Options(
@@ -70,6 +68,7 @@ void main() async {
       statusBarColor: Colors.transparent,
     ));
     Data.init();
+    GStrorage.lazyInit();
     PiliSchame.init();
   });
 }

lib/models/common/rcmd_type.dart

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

lib/models/common/reply_sort_type.dart

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

lib/models/home/rcmd/result.dart

@@ -28,7 +28,7 @@ class RecVideoItemAppModel {
   int? cid;
   String? pic;
   RcmdStat? stat;
-  int? duration;
+  String? duration;
   String? title;
   int? isFollowed;
   RcmdOwner? owner;
@@ -54,27 +54,13 @@ class RecVideoItemAppModel {
     cid = json['player_args'] != null ? json['player_args']['cid'] : -1;
     pic = json['cover'];
     stat = RcmdStat.fromJson(json);
-    // 改用player_args中的duration作为原始数据（秒数）
-    duration = json['player_args'] != null
-        ? json['player_args']['duration']
-        : -1;
-    //duration = json['cover_right_text'];
+    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

@@ -1,130 +0,0 @@
-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/model_rec_video_item.dart

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

lib/models/search/hot.dart

@@ -1,14 +1,8 @@
-import 'package:hive/hive.dart';
-
-part 'hot.g.dart';
-
-@HiveType(typeId: 6)
 class HotSearchModel {
   HotSearchModel({
     this.list,
   });
 
-  @HiveField(0)
   List<HotSearchItem>? list;
 
   HotSearchModel.fromJson(Map<String, dynamic> json) {
@@ -18,7 +12,6 @@ class HotSearchModel {
   }
 }
 
-@HiveType(typeId: 7)
 class HotSearchItem {
   HotSearchItem({
     this.keyword,
@@ -27,20 +20,19 @@ class HotSearchItem {
     this.icon,
   });
 
-  @HiveField(0)
   String? keyword;
-  @HiveField(1)
   String? showName;
   // 4/5热 11话题 8普通 7直播
-  @HiveField(2)
   int? wordType;
-  @HiveField(3)
   String? icon;
+  List? liveId;
 
   HotSearchItem.fromJson(Map<String, dynamic> json) {
     keyword = json['keyword'];
     showName = json['show_name'];
     wordType = json['word_type'];
     icon = json['icon'];
+    liveId = json['live_id'];
+    liveId = json['live_id'];
   }
 }

lib/models/search/hot.g.dart

@@ -1,84 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'hot.dart';
-
-// **************************************************************************
-// TypeAdapterGenerator
-// **************************************************************************
-
-class HotSearchModelAdapter extends TypeAdapter<HotSearchModel> {
-  @override
-  final int typeId = 6;
-
-  @override
-  HotSearchModel read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return HotSearchModel(
-      list: (fields[0] as List?)?.cast<HotSearchItem>(),
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, HotSearchModel obj) {
-    writer
-      ..writeByte(1)
-      ..writeByte(0)
-      ..write(obj.list);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is HotSearchModelAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}
-
-class HotSearchItemAdapter extends TypeAdapter<HotSearchItem> {
-  @override
-  final int typeId = 7;
-
-  @override
-  HotSearchItem read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return HotSearchItem(
-      keyword: fields[0] as String?,
-      showName: fields[1] as String?,
-      wordType: fields[2] as int?,
-      icon: fields[3] as String?,
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, HotSearchItem obj) {
-    writer
-      ..writeByte(4)
-      ..writeByte(0)
-      ..write(obj.keyword)
-      ..writeByte(1)
-      ..write(obj.showName)
-      ..writeByte(2)
-      ..write(obj.wordType)
-      ..writeByte(3)
-      ..write(obj.icon);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is HotSearchItemAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}

lib/pages/about/index.dart

@@ -7,7 +7,6 @@ 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});
@@ -18,19 +17,6 @@ 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) {
@@ -152,17 +138,6 @@ 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),
-            ),
           ],
         ),
       ),

lib/pages/bangumi/view.dart

@@ -9,6 +9,7 @@ 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';
@@ -198,10 +199,7 @@ class _BangumiPageState extends State<BangumiPage>
                   } else {
                     return HttpError(
                       errMsg: data['msg'],
-                      fn: () {
-                        _futureBuilderFuture =
-                            _bangumidController.queryBangumiListFeed();
-                      },
+                      fn: () => {},
                     );
                   }
                 } else {
@@ -210,6 +208,7 @@ 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 && item.badge == '会员' && vipStatus != 1) {
+    if (item.badge != null && vipStatus != 1) {
       SmartDialog.showToast('需要大会员');
       return;
     }
@@ -255,24 +255,11 @@ class _BangumiPanelState extends State<BangumiPanel> {
                               ),
                               const SizedBox(width: 2),
                               if (widget.pages[i].badge != null) ...[
-                                if (widget.pages[i].badge == '会员') ...[
-                                  Image.asset(
-                                    'assets/images/big-vip.png',
-                                    height: 16,
-                                  ),
-                                ],
-                                if (widget.pages[i].badge != '会员') ...[
-                                  const Spacer(),
-                                  Text(
-                                    widget.pages[i].badge!,
-                                    style: TextStyle(
-                                      fontSize: 11,
-                                      color:
-                                          Theme.of(context).colorScheme.primary,
-                                    ),
-                                  ),
-                                ],
-                              ]
+                                Image.asset(
+                                  'assets/images/big-vip.png',
+                                  height: 16,
+                                ),
+                              ],
                             ],
                           ),
                           const SizedBox(height: 3),

lib/pages/dynamics/detail/controller.dart

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

lib/pages/fav_detail/view.dart

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

lib/pages/fav_detail/widget/fav_video_card.dart

@@ -9,20 +9,14 @@ 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,
-    this.searchType,
-  }) : super(key: key);
+  const FavVideoCardH({Key? key, required this.videoItem, this.callFn})
+      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -33,9 +27,7 @@ class FavVideoCardH extends StatelessWidget {
       onTap: () async {
         // int? seasonId;
         String? epId;
-        if (videoItem.ogv != null &&
-            (videoItem.ogv['type_name'] == '番剧' ||
-                videoItem.ogv['type_name'] == '国创')) {
+        if (videoItem.ogv != null && videoItem.ogv['type_name'] == '番剧') {
           videoItem.cid = await SearchHttp.ab2c(bvid: bvid);
           // seasonId = videoItem.ogv['season_id'];
           epId = videoItem.epId;
@@ -92,31 +84,28 @@ class FavVideoCardH extends StatelessWidget {
                                     height: maxHeight,
                                   ),
                                 ),
-                                PBadge(
-                                  text: Utils.timeFormat(videoItem.duration!),
-                                  right: 6.0,
-                                  bottom: 6.0,
-                                  type: 'gray',
-                                ),
-                                if (videoItem.ogv != null) ...[
-                                  PBadge(
-                                    text: videoItem.ogv['type_name'],
-                                    top: 6.0,
-                                    right: 6.0,
-                                    bottom: null,
-                                    left: null,
+                                Positioned(
+                                  right: 4,
+                                  bottom: 4,
+                                  child: Container(
+                                    padding: const EdgeInsets.symmetric(
+                                        vertical: 1, horizontal: 6),
+                                    decoration: BoxDecoration(
+                                        borderRadius: BorderRadius.circular(4),
+                                        color: Colors.black54.withOpacity(0.4)),
+                                    child: Text(
+                                      Utils.timeFormat(videoItem.duration!),
+                                      style: const TextStyle(
+                                          fontSize: 11, color: Colors.white),
+                                    ),
                                   ),
-                                ],
+                                )
                               ],
                             );
                           },
                         ),
                       ),
-                      VideoContent(
-                        videoItem: videoItem,
-                        callFn: callFn,
-                        searchType: searchType,
-                      )
+                      VideoContent(videoItem: videoItem, callFn: callFn)
                     ],
                   ),
                 );
@@ -132,123 +121,93 @@ class FavVideoCardH extends StatelessWidget {
 class VideoContent extends StatelessWidget {
   final dynamic videoItem;
   final Function? callFn;
-  final int? searchType;
-  const VideoContent({
-    super.key,
-    required this.videoItem,
-    this.callFn,
-    this.searchType,
-  });
+  const VideoContent({super.key, required this.videoItem, this.callFn});
 
   @override
   Widget build(BuildContext context) {
     return Expanded(
       child: Padding(
         padding: const EdgeInsets.fromLTRB(10, 2, 6, 0),
-        child: Stack(
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
+            Text(
+              videoItem.title,
+              textAlign: TextAlign.start,
+              style: const TextStyle(
+                fontWeight: FontWeight.w500,
+                letterSpacing: 0.3,
+              ),
+              maxLines: 2,
+              overflow: TextOverflow.ellipsis,
+            ),
+            const Spacer(),
+            Text(
+              Utils.dateFormat(videoItem.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: [
-                Text(
-                  videoItem.title,
-                  textAlign: TextAlign.start,
-                  style: const TextStyle(
-                    fontWeight: FontWeight.w500,
-                    letterSpacing: 0.3,
-                  ),
-                  maxLines: 2,
-                  overflow: TextOverflow.ellipsis,
+                StatView(
+                  theme: 'gray',
+                  view: videoItem.cntInfo['play'],
                 ),
-                if (videoItem.ogv != null) ...[
-                  Text(
-                    videoItem.intro,
-                    style: TextStyle(
-                      fontSize:
-                          Theme.of(context).textTheme.labelMedium!.fontSize,
-                      color: Theme.of(context).colorScheme.outline,
-                    ),
-                  ),
-                ],
+                const SizedBox(width: 8),
+                StatDanMu(theme: 'gray', danmu: videoItem.cntInfo['danmaku']),
                 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,
+                SizedBox(
+                  width: 26,
+                  height: 26,
+                  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,
                     ),
-                  ),
-                ],
-                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,11 +1,8 @@
 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;
@@ -75,21 +72,4 @@ 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']) {
-      if (result['data']['prompt']) {
-        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,7 +8,9 @@ import 'package:pilipala/pages/fav_detail/widget/fav_video_card.dart';
 import 'controller.dart';
 
 class FavSearchPage extends StatefulWidget {
-  const FavSearchPage({super.key});
+  final int? sourceType;
+  final int? mediaId;
+  const FavSearchPage({super.key, this.sourceType, this.mediaId});
 
   @override
   State<FavSearchPage> createState() => _FavSearchPageState();
@@ -17,12 +19,11 @@ 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(
       () {
@@ -99,11 +100,7 @@ class _FavSearchPageState extends State<FavSearchPage> {
                       } else {
                         return FavVideoCardH(
                           videoItem: _favSearchCtr.favList[index],
-                          searchType: searchType,
-                          callFn: () => searchType != 1
-                              ? _favSearchCtr
-                                  .onCancelFav(_favSearchCtr.favList[index].id!)
-                              : {},
+                          callFn: () => null,
                         );
                       }
                     },

lib/pages/follow/view.dart

@@ -37,29 +37,6 @@ 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
@@ -110,22 +87,3 @@ 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 != null && ctr!.isOwner.value
+      trailing: ctr!.isOwner.value
           ? SizedBox(
               height: 34,
               child: TextButton(

lib/pages/follow_search/controller.dart

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

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

lib/pages/follow_search/view.dart

@@ -1,121 +0,0 @@
-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/hot/view.dart

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

lib/pages/html/controller.dart

@@ -96,6 +96,9 @@ 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,7 +10,8 @@ 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;
@@ -38,6 +39,7 @@ class LiveController extends GetxController {
       }
       _currentPage += 1;
     }
+    isLoadingMore = false;
     return res;
   }
 

lib/pages/live/view.dart

@@ -11,6 +11,7 @@ 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';
@@ -44,8 +45,8 @@ class _LivePageState extends State<LivePage>
       () {
         if (scrollController.position.pixels >=
             scrollController.position.maxScrollExtent - 200) {
-          EasyThrottle.throttle('liveList', const Duration(milliseconds: 200),
-              () {
+          EasyThrottle.throttle('liveList', const Duration(seconds: 1), () {
+            _liveController.isLoadingMore = true;
             _liveController.onLoad();
           });
         }
@@ -107,20 +108,24 @@ class _LivePageState extends State<LivePage>
                     } else {
                       return HttpError(
                         errMsg: data['msg'],
-                        fn: () {
-                          setState(() {
-                            _futureBuilderFuture =
-                                _liveController.queryLiveList('init');
-                          });
-                        },
+                        fn: () => {},
                       );
                     }
                   } 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,32 +184,18 @@ class VideoStat extends StatelessWidget {
           tileMode: TileMode.mirror,
         ),
       ),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          Text(
-            liveItem!.areaName!,
-            style: const TextStyle(fontSize: 11, color: Colors.white),
-          ),
-          Text(
-            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']),
+          ],
+        ),
       ),
-
-      // 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,7 +3,6 @@ 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 = '';
@@ -15,7 +14,13 @@ 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() {
@@ -31,10 +36,11 @@ class LiveRoomController extends GetxController {
         cover = liveItem.cover;
       }
     }
+    queryLiveInfo();
   }
 
-  playerInit(source) async {
-    await plPlayerController.setDataSource(
+  playerInit(source) {
+    plPlayerController.setDataSource(
       DataSource(
         videoSource: source,
         audioSource: null,
@@ -60,8 +66,7 @@ class LiveRoomController extends GetxController {
       String videoUrl = (item.urlInfo?.first.host)! +
           item.baseUrl! +
           item.urlInfo!.first.extra!;
-      await playerInit(videoUrl);
-      return res;
+      playerInit(videoUrl);
     }
   }
 
@@ -75,12 +80,4 @@ 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,8 +19,6 @@ 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;
@@ -29,16 +27,18 @@ 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,123 +52,57 @@ 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,
-      backgroundColor: Colors.black,
-      body: Stack(
-        children: [
-          // 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),
-                                  ),
-                              ],
-                            ),
-                          ],
+      appBar: PreferredSize(
+        preferredSize: Size.fromHeight(
+          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),
                         ),
-                      );
-                    } else {
-                      return const SizedBox();
-                    }
-                  },
-                ),
-              ),
+                        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(
+            children: [
               PopScope(
                 canPop: plPlayerController?.isFullScreen.value != true,
                 onPopInvoked: (bool didPop) {
@@ -186,19 +120,55 @@ class _LiveRoomPageState extends State<LiveRoomPage> {
                           Orientation.landscape
                       ? Get.size.height
                       : Get.size.width * 9 / 16,
-                  child: videoPlayerPanel,
+                  child: plPlayerController!.videoPlayerController != null
+                      ? 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: videoPlayerPanel,
-        floating: floating,
+        childWhenEnabled: childWhenEnabled,
       );
     } else {
       return childWhenDisabled;

lib/pages/member/view.dart

@@ -105,7 +105,7 @@ class _MemberPageState extends State<MemberPage>
             actions: [
               IconButton(
                 onPressed: () => Get.toNamed(
-                    '/memberSearch?mid=$mid&uname=${_memberController.memberInfo.value.name!}'),
+                    '/memberSearch?mid=${Get.parameters['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 == 'init') {
+    if (type == 'onRefresh') {
       pn = 1;
     }
     var res = await MemberHttp.memberArchive(
@@ -34,12 +34,7 @@ class MemberArchiveController extends GetxController {
       order: currentOrder['type']!,
     );
     if (res['status']) {
-      if (type == 'init') {
-        archivesList.value = res['data'].list.vlist;
-      }
-      if (type == 'onLoad') {
-        archivesList.addAll(res['data'].list.vlist);
-      }
+      archivesList.addAll(res['data'].list.vlist);
       count = res['data'].page['count'];
       pn += 1;
     }
@@ -47,14 +42,13 @@ class MemberArchiveController extends GetxController {
   }
 
   toggleSort() async {
-    List<String> typeList = orderList.map((e) => e['type']!).toList();
-    int index = typeList.indexOf(currentOrder['type']!);
+    pn = 1;
+    int index = orderList.indexOf(currentOrder);
     if (index == orderList.length - 1) {
       currentOrder.value = orderList.first;
     } else {
       currentOrder.value = orderList[index + 1];
     }
-    getMemberArchive('init');
   }
 
   // 上拉加载

lib/pages/member_archive/view.dart

@@ -25,7 +25,8 @@ class _MemberArchivePageState extends State<MemberArchivePage> {
     final String heroTag = Utils.makeHeroTag(mid);
     _memberArchivesController =
         Get.put(MemberArchiveController(), tag: heroTag);
-    _futureBuilderFuture = _memberArchivesController.getMemberArchive('init');
+    _futureBuilderFuture =
+        _memberArchivesController.getMemberArchive('onRefresh');
     scrollController = _memberArchivesController.scrollController;
     scrollController.addListener(
       () {
@@ -47,16 +48,39 @@ class _MemberArchivePageState extends State<MemberArchivePage> {
         titleSpacing: 0,
         centerTitle: false,
         title: Text('他的投稿', style: Theme.of(context).textTheme.titleMedium),
-        actions: [
-          Obx(
-            () => TextButton.icon(
-              icon: const Icon(Icons.sort, size: 20),
-              onPressed: _memberArchivesController.toggleSort,
-              label: Text(_memberArchivesController.currentOrder['label']!),
-            ),
-          ),
-          const SizedBox(width: 6),
-        ],
+        // actions: [
+        //   Obx(
+        //     () => PopupMenuButton<String>(
+        //       padding: EdgeInsets.zero,
+        //       tooltip: '投稿排序',
+        //       icon: Icon(
+        //         Icons.more_vert_outlined,
+        //         color: Theme.of(context).colorScheme.outline,
+        //       ),
+        //       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,

lib/pages/mine/controller.dart

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

lib/pages/rcmd/controller.dart

@@ -9,15 +9,14 @@ import 'package:pilipala/utils/storage.dart';
 class RcmdController extends GetxController {
   final ScrollController scrollController = ScrollController();
   int _currentPage = 0;
-  // RxList<RecVideoItemAppModel> appVideoList = <RecVideoItemAppModel>[].obs;
-  // RxList<RecVideoItemModel> webVideoList = <RecVideoItemModel>[].obs;
+  RxList<RecVideoItemAppModel> appVideoList = <RecVideoItemAppModel>[].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() {
@@ -28,58 +27,81 @@ 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;
     }
-    late final Map<String, dynamic> res;
-    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,
-        );
-    }
+    var res = await VideoHttp.rcmdVideoListApp(
+      freshIdx: _currentPage,
+    );
     if (res['status']) {
       if (type == 'init') {
-        if (videoList.isNotEmpty) {
-          videoList.addAll(res['data']);
+        if (appVideoList.isNotEmpty) {
+          appVideoList.addAll(res['data']);
         } else {
-          videoList.value = res['data'];
+          appVideoList.value = res['data'];
         }
       } else if (type == 'onRefresh') {
         if (enableSaveLastData) {
-          videoList.insertAll(0, res['data']);
+          appVideoList.insertAll(0, res['data']);
         } else {
-          videoList.value = res['data'];
+          appVideoList.value = res['data'];
         }
       } else if (type == 'onLoad') {
-        videoList.addAll(res['data']);
+        appVideoList.addAll(res['data']);
       }
       _currentPage += 1;
-      // 若videoList数量太小，可能会影响翻页，此时再次请求
-      // 为避免请求到的数据太少时还在反复请求，要求本次返回数据大于1条才触发
-      if (res['data'].length > 1 && videoList.length < 10) {
-        queryRcmdFeed('onLoad');
+    }
+    isLoadingMore = false;
+    return res;
+  }
+
+  // 获取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;
@@ -96,7 +118,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,4 +1,5 @@
 import 'dart:async';
+import 'dart:io';
 
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
@@ -44,7 +45,7 @@ class _RcmdPageState extends State<RcmdPage>
         if (scrollController.position.pixels >=
             scrollController.position.maxScrollExtent - 200) {
           EasyThrottle.throttle(
-              'my-throttler', const Duration(milliseconds: 200), () {
+              'my-throttler', const Duration(milliseconds: 500), () {
             _rcmdController.isLoadingMore = true;
             _rcmdController.onLoad();
           });
@@ -96,24 +97,29 @@ class _RcmdPageState extends State<RcmdPage>
                   if (snapshot.connectionState == ConnectionState.done) {
                     Map data = snapshot.data as Map;
                     if (data['status']) {
-                      return Obx(
-                        () {
-                          if (_rcmdController.isLoadingMore &&
-                              _rcmdController.videoList.isEmpty) {
-                            return contentGrid(_rcmdController, []);
-                          } else {
-                            // 显示视频列表
-                            return contentGrid(
-                                _rcmdController, _rcmdController.videoList);
-                          }
-                        },
-                      );
+                      return Platform.isAndroid || Platform.isIOS
+                          ? Obx(
+                              () => contentGrid(
+                                  _rcmdController,
+                                  _rcmdController.defaultRcmdType == 'web'
+                                      ? _rcmdController.webVideoList
+                                      : _rcmdController.appVideoList),
+                            )
+                          : SliverLayoutBuilder(
+                              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');
                           });
@@ -121,11 +127,20 @@ class _RcmdPageState extends State<RcmdPage>
                       );
                     }
                   } else {
+                    // 缓存数据
+                    // if (_rcmdController.videoList.isNotEmpty) {
+                    //   return contentGrid(
+                    //       _rcmdController, _rcmdController.videoList);
+                    // }
+                    // // 骨架屏
+                    // else {
                     return contentGrid(_rcmdController, []);
+                    // }
                   }
                 },
               ),
             ),
+            LoadingMore(ctr: _rcmdController)
           ],
         ),
       ),
@@ -188,3 +203,33 @@ class _RcmdPageState extends State<RcmdPage>
     );
   }
 }
+
+class LoadingMore extends StatelessWidget {
+  final dynamic ctr;
+  const LoadingMore({super.key, this.ctr});
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverToBoxAdapter(
+      child: Container(
+        height: MediaQuery.of(context).padding.bottom + 80,
+        padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
+        child: GestureDetector(
+          onTap: () {
+            if (ctr != null) {
+              ctr!.isLoadingMore = true;
+              ctr!.onLoad();
+            }
+          },
+          child: Center(
+            child: Text(
+              '点击加载更多 👇',
+              style: TextStyle(
+                  color: Theme.of(context).colorScheme.outline, fontSize: 13),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/pages/search/controller.dart

@@ -29,7 +29,7 @@ class SSearchController extends GetxController {
     // 其他页面跳转过来
     if (Get.parameters.keys.isNotEmpty) {
       if (Get.parameters['keyword'] != null) {
-        onClickKeyword(Get.parameters['keyword']!);
+        onClickKeyword(Get.parameters['keyword']!, null);
       }
       if (Get.parameters['hintText'] != null) {
         hintText = Get.parameters['hintText']!;
@@ -88,7 +88,12 @@ class SSearchController extends GetxController {
   }
 
   // 点击热搜关键词
-  void onClickKeyword(String keyword) {
+  void onClickKeyword(String keyword, item) {
+    if (item != null && item.wordType == 7) {
+      Get.toNamed('/liveRoom?roomid=${item.liveId.first}',
+          arguments: {'liveItem': null, 'heroTag': '${item.liveId.first}'});
+      return;
+    }
     searchKeyWord.value = keyword;
     controller.value.text = keyword;
     // 移动光标

lib/pages/search/view.dart

@@ -115,8 +115,8 @@ class _SearchPageState extends State<SearchPage> with RouteAware {
                   customBorder: RoundedRectangleBorder(
                     borderRadius: BorderRadius.circular(4),
                   ),
-                  onTap: () => ssCtr
-                      .onClickKeyword(ssCtr.searchSuggestList[index].term!),
+                  onTap: () => ssCtr.onClickKeyword(
+                      ssCtr.searchSuggestList[index].term!, null),
                   child: Padding(
                     padding: const EdgeInsets.only(left: 20, top: 9, bottom: 9),
                     child: ssCtr.searchSuggestList[index].textRich,
@@ -178,34 +178,22 @@ class _SearchPageState extends State<SearchPage> with RouteAware {
                           width: width,
                           // ignore: invalid_use_of_protected_member
                           hotSearchList: _searchController.hotSearchList.value,
-                          onClick: (keyword) async {
+                          onClick: (keyword, item) async {
                             _searchController.searchFocusNode.unfocus();
                             await Future.delayed(
                                 const Duration(milliseconds: 150));
-                            _searchController.onClickKeyword(keyword);
+                            _searchController.onClickKeyword(keyword, item);
                           },
                         ),
                       );
                     } else {
-                      return CustomScrollView(
-                        slivers: [
-                          HttpError(
-                            errMsg: data['msg'],
-                            fn: () => setState(() {}),
-                          )
-                        ],
+                      return HttpError(
+                        errMsg: data['msg'],
+                        fn: () => setState(() {}),
                       );
                     }
                   } else {
-                    // 缓存数据
-                    if (_searchController.hotSearchList.isNotEmpty) {
-                      return HotKeyword(
-                        width: width,
-                        hotSearchList: _searchController.hotSearchList,
-                      );
-                    } else {
-                      return const SizedBox();
-                    }
+                    return const SizedBox();
                   }
                 },
               );

lib/pages/search/widgets/hot_keyword.dart

@@ -26,7 +26,7 @@ class HotKeyword extends StatelessWidget {
               borderRadius: BorderRadius.circular(3),
               clipBehavior: Clip.hardEdge,
               child: InkWell(
-                onTap: () => onClick!(i.keyword),
+                onTap: () => onClick!(i.keyword, i),
                 child: Padding(
                   padding: EdgeInsets.only(
                       left: 2,

lib/pages/search_panel/view.dart

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

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, showPubdate: true),
+                child: VideoCardH(videoItem: i),
               );
             },
           ),
@@ -70,7 +70,7 @@ class SearchVideoPanel extends StatelessWidget {
                               controller.selectedType.value = i['type'];
                               ctr!.order.value =
                                   i['type'].toString().split('.').last;
-                              SmartDialog.showLoading(msg: 'loading');
+                              SmartDialog.showLoading(msg: 'loooad');
                               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: 'loading');
+                      SmartDialog.showLoading(msg: 'loooad');
                       await ctr.onRefresh();
                       SmartDialog.dismiss();
                     },

lib/pages/setting/extra_setting.dart

@@ -1,7 +1,9 @@
 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';
@@ -18,23 +20,26 @@ 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);
@@ -44,6 +49,9 @@ 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);
   }
 
   // 设置代理
@@ -151,6 +159,12 @@ class _ExtraSettingState extends State<ExtraSetting> {
             setKey: SettingBoxKey.enableSearchWord,
             defaultVal: true,
           ),
+          const SetSwitchItem(
+            title: '推荐动态',
+            subTitle: '是否在推荐内容中展示动态',
+            setKey: SettingBoxKey.enableRcmdDynamic,
+            defaultVal: true,
+          ),
           const SetSwitchItem(
             title: '快速收藏',
             subTitle: '点按收藏至默认，长按选择文件夹',
@@ -163,6 +177,50 @@ 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

@@ -1,260 +0,0 @@
-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/view.dart

@@ -24,11 +24,6 @@ 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,7 +19,6 @@ 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
@@ -62,7 +61,7 @@ class VideoDetailController extends GetxController
   Box localCache = GStrorage.localCache;
   Box setting = GStrorage.setting;
 
-  RxInt oid = 0.obs;
+  int oid = 0;
   // 评论id 请求楼中楼评论使用
   int fRpid = 0;
 
@@ -136,14 +135,13 @@ 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 =
         scaffoldKey.currentState?.showBottomSheet((BuildContext context) {
       return VideoReplyReplyPanel(
-        oid: oid.value,
+        oid: oid,
         rpid: fRpid,
         closePanel: () => {
           fRpid = 0,

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

@@ -18,7 +18,6 @@ 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 {
@@ -299,6 +298,7 @@ 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' : '',
@@ -310,8 +310,6 @@ class VideoIntroController extends GetxController {
           await queryHasFavVideo();
           SmartDialog.showToast('✅ 操作成功');
         }
-      } else {
-        SmartDialog.showToast(result['msg']);
       }
       return;
     }
@@ -342,8 +340,6 @@ class VideoIntroController extends GetxController {
         await queryHasFavVideo();
         SmartDialog.showToast('✅ 操作成功');
       }
-    } else {
-      SmartDialog.showToast(result['msg']);
     }
   }
 
@@ -479,15 +475,10 @@ class VideoIntroController extends GetxController {
     // 重新获取视频资源
     final VideoDetailController videoDetailCtr =
         Get.find<VideoDetailController>(tag: heroTag);
-    final ReleatedController releatedCtr =
-        Get.find<ReleatedController>(tag: heroTag);
     videoDetailCtr.bvid = bvid;
-    videoDetailCtr.oid.value = aid;
     videoDetailCtr.cid.value = cid;
     videoDetailCtr.danmakuCid.value = cid;
     videoDetailCtr.queryVideoUrl();
-    releatedCtr.bvid = bvid;
-    releatedCtr.queryRelatedVideo();
     // 重新请求评论
     try {
       /// 未渲染回复组件时可能异常

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

@@ -1,22 +1,14 @@
 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'] ?? "";
   // 推荐视频列表
-  RxList relatedVideoList = <HotVideoItemModel>[].obs;
+  List relatedVideoList = [];
 
   OverlayEntry? popupDialog;
 
-  Future<dynamic> queryRelatedVideo() async {
-    return VideoHttp.relatedVideoList(bvid: bvid).then((value) {
-      if (value['status']) {
-        relatedVideoList.value = value['data'];
-      }
-      return value;
-    });
-  }
+  Future<dynamic> queryRelatedVideo() => VideoHttp.relatedVideoList(bvid: bvid);
 }

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

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

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

@@ -41,25 +41,17 @@ class VideoReplyController extends GetxController {
   @override
   void onInit() {
     super.onInit();
-    int deaultReplySortIndex =
+    final 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;
@@ -123,6 +115,9 @@ 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,13 +16,11 @@ 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,
@@ -50,17 +48,16 @@ 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(widget.oid, widget.rpid.toString(), replyLevel),
+          VideoReplyController(oid, widget.rpid.toString(), replyLevel),
           tag: widget.rpid.toString());
     } else {
-      _videoReplyController = Get.put(
-          VideoReplyController(widget.oid, '', replyLevel),
-          tag: heroTag);
+      _videoReplyController =
+          Get.put(VideoReplyController(oid, '', replyLevel), tag: heroTag);
     }
 
     fabAnimationCtr = AnimationController(
@@ -78,8 +75,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
       () {
         if (scrollController.position.pixels >=
             scrollController.position.maxScrollExtent - 300) {
-          EasyThrottle.throttle('replylist', const Duration(milliseconds: 200),
-              () {
+          EasyThrottle.throttle('replylist', const Duration(seconds: 2), () {
             _videoReplyController.onLoad();
           });
         }
@@ -114,7 +110,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
     final VideoDetailController videoDetailCtr =
         Get.find<VideoDetailController>(tag: heroTag);
     if (replyItem != null) {
-      videoDetailCtr.oid.value = replyItem.oid;
+      videoDetailCtr.oid = replyItem.oid;
       videoDetailCtr.fRpid = replyItem.rpid!;
       videoDetailCtr.firstFloor = replyItem;
       videoDetailCtr.showReplyReplyPanel();

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

@@ -1,7 +1,7 @@
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/common/widgets/badge.dart';
@@ -12,9 +12,10 @@ import 'package:pilipala/pages/preview/index.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/pages/video/detail/reply_new/index.dart';
 import 'package:pilipala/utils/feed_back.dart';
+import 'package:pilipala/utils/id_utils.dart';
 import 'package:pilipala/utils/storage.dart';
-import 'package:pilipala/utils/url_utils.dart';
 import 'package:pilipala/utils/utils.dart';
+
 import 'zan.dart';
 
 Box setting = GStrorage.setting;
@@ -47,17 +48,6 @@ 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(
@@ -133,6 +123,98 @@ 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,
@@ -209,26 +291,30 @@ class ReplyItem extends StatelessWidget {
         // title
         Container(
           margin: const EdgeInsets.only(top: 10, left: 45, right: 6, bottom: 4),
-          child: Text.rich(
-            style: const TextStyle(height: 1.75),
-            maxLines:
-                replyItem!.content!.isText! && replyLevel == '1' ? 3 : 999,
-            overflow: TextOverflow.ellipsis,
-            TextSpan(
-              children: [
-                if (replyItem!.isTop!)
-                  const WidgetSpan(
-                    alignment: PlaceholderAlignment.top,
-                    child: PBadge(
-                      text: 'TOP',
-                      size: 'small',
-                      stack: 'normal',
-                      type: 'line',
-                      fs: 9,
+          child: SelectableRegion(
+            focusNode: FocusNode(),
+            selectionControls: MaterialTextSelectionControls(),
+            child: Text.rich(
+              style: const TextStyle(height: 1.75),
+              maxLines:
+                  replyItem!.content!.isText! && replyLevel == '1' ? 3 : 999,
+              overflow: TextOverflow.ellipsis,
+              TextSpan(
+                children: [
+                  if (replyItem!.isTop!)
+                    const WidgetSpan(
+                      alignment: PlaceholderAlignment.top,
+                      child: PBadge(
+                        text: 'TOP',
+                        size: 'small',
+                        stack: 'normal',
+                        type: 'line',
+                        fs: 9,
+                      ),
                     ),
-                  ),
-                buildContent(context, replyItem!, replyReply, null),
-              ],
+                  buildContent(context, replyItem!, replyReply, null),
+                ],
+              ),
             ),
           ),
         ),
@@ -361,17 +447,6 @@ 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(
@@ -466,6 +541,7 @@ InlineSpan buildContent(
   // fReplyItem 父级回复内容，用作二楼回复（回复详情）展示
   final content = replyItem.content;
   final List<InlineSpan> spanChilds = <InlineSpan>[];
+  bool hasMatchMember = false;
 
   // 投票
   if (content.vote.isNotEmpty) {
@@ -495,8 +571,7 @@ InlineSpan buildContent(
     });
   }
   // content.message = content.message.replaceAll(RegExp(r"\{vote:.*?\}"), ' ');
-  content.message = content.message
-      .replaceAll('&amp;', '&')
+  content.message = content.message.replaceAll('&amp;', '&')
       .replaceAll('&lt;', '<')
       .replaceAll('&gt;', '>')
       .replaceAll('&quot;', '"')
@@ -511,21 +586,21 @@ InlineSpan buildContent(
         e.replaceAll('?', '\\?').replaceAll('+', '\\+').replaceAll('*', '\\*')),
   ];
 
-  String patternStr = specialTokens.map(RegExp.escape).join('|');
+  String patternStr =
+      specialTokens.map(RegExp.escape).join('|');
   if (patternStr.isNotEmpty) {
     patternStr += "|";
   }
-  patternStr += r'(\b(?:\d+[:：])?[0-5]?[0-9][:：][0-5]?[0-9]\b)';
+  patternStr += r'(\b\d{1,2}[:：]\d{2}\b)';
   final RegExp pattern = RegExp(patternStr);
   List<String> matchedStrs = [];
-  void addPlainTextSpan(str) {
+  void addPlainTextSpan(str){
     spanChilds.add(TextSpan(
         text: str,
         recognizer: TapGestureRecognizer()
-          ..onTap =
-              () => replyReply(replyItem.root == 0 ? replyItem : fReplyItem)));
+          ..onTap = () =>
+              replyReply(replyItem.root == 0 ? replyItem : fReplyItem)));
   }
-
   // 分割文本并处理每个部分
   content.message.splitMapJoin(
     pattern,
@@ -563,9 +638,7 @@ InlineSpan buildContent(
               },
           ),
         );
-      } else if (RegExp(r'^\b(?:\d+[:：])?[0-5]?[0-9][:：][0-5]?[0-9]\b$')
-          .hasMatch(matchStr)) {
-        matchStr = matchStr.replaceAll('：', ':');
+      } else if (RegExp(r'^\b[0-9]{1,2}[:：][0-9]{2}\b$').hasMatch(matchStr)) {
         spanChilds.add(
           TextSpan(
             text: ' $matchStr ',
@@ -576,6 +649,7 @@ InlineSpan buildContent(
               ..onTap = () {
                 // 跳转到指定位置
                 try {
+                  matchStr = matchStr.replaceAll('：', ':');
                   SmartDialog.showToast('跳转至：$matchStr');
                   Get.find<VideoDetailController>(tag: Get.arguments['heroTag'])
                       .plPlayerController
@@ -600,88 +674,57 @@ InlineSpan buildContent(
             addPlainTextSpan(matchStr);
             return "";
           }
-          spanChilds.addAll(
-            [
-              if (content.jumpUrl[matchStr]?['prefix_icon'] != null) ...[
-                WidgetSpan(
-                  child: Image.network(
-                    content.jumpUrl[matchStr]['prefix_icon'],
-                    height: 19,
-                    color: Theme.of(context).colorScheme.primary,
-                  ),
-                )
-              ],
-              TextSpan(
-                text: content.jumpUrl[matchStr]['title'],
-                style: TextStyle(
-                  color: Theme.of(context).colorScheme.primary,
-                ),
-                recognizer: TapGestureRecognizer()
-                  ..onTap = () async {
-                    final String title = content.jumpUrl[matchStr]['title'];
-                    if (appUrlSchema == '') {
-                      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 {
+          spanChilds.add(
+            TextSpan(
+              text: content.jumpUrl[matchStr]['title'],
+              style: TextStyle(
+                color: Theme.of(context).colorScheme.primary,
+              ),
+              recognizer: TapGestureRecognizer()
+                ..onTap = () {
+                  if (appUrlSchema == '') {
+                    final String str = Uri.parse(matchStr).pathSegments[0];
+                    final Map matchRes = IdUtils.matchAvorBv(input: str);
+                    final List matchKeys = matchRes.keys.toList();
+                    if (matchKeys.isNotEmpty) {
+                      if (matchKeys.first == 'BV') {
                         Get.toNamed(
-                          '/webview',
-                          parameters: {
-                            'url': redirectUrl,
-                            'type': 'url',
-                            'pageTitle': title
-                          },
+                          '/searchResult',
+                          parameters: {'keyword': matchRes['BV']},
                         );
                       }
                     } 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 {
-                        Get.toNamed(
-                          '/webview',
-                          parameters: {
-                            'url': matchStr,
-                            'type': 'url',
-                            'pageTitle': title
-                          },
-                        );
-                      }
+                      Get.toNamed(
+                        '/webview',
+                        parameters: {
+                          'url': matchStr,
+                          'type': 'url',
+                          'pageTitle': ''
+                        },
+                      );
                     }
-                  },
-              )
-            ],
+                  } else {
+                    if (appUrlSchema.startsWith('bilibili://search')) {
+                      Get.toNamed('/searchResult', parameters: {
+                        'keyword': content.jumpUrl[matchStr]['title']
+                      });
+                    }
+                  }
+                },
+            ),
           );
+          if (appUrlSchema.startsWith('bilibili://search')) {
+            spanChilds.add(
+              WidgetSpan(
+                child: Icon(
+                  FontAwesomeIcons.magnifyingGlass,
+                  size: 9,
+                  color: Theme.of(context).colorScheme.primary,
+                ),
+                alignment: PlaceholderAlignment.top,
+              ),
+            );
+          }
           // 只显示一次
           matchedStrs.add(matchStr);
         } else {
@@ -696,47 +739,6 @@ InlineSpan buildContent(
     },
   );
 
-  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: content.jumpUrl[patternStr]['title'],
-              style: TextStyle(
-                color: Theme.of(context).colorScheme.primary,
-              ),
-              recognizer: TapGestureRecognizer()
-                ..onTap = () {
-                  Get.toNamed(
-                    '/webview',
-                    parameters: {
-                      'url': patternStr,
-                      'type': 'url',
-                      'pageTitle': content.jumpUrl[patternStr]['title']
-                    },
-                  );
-                },
-            )
-          ],
-        );
-      }
-    }
-  }
   // 图片渲染
   if (content.pictures.isNotEmpty) {
     final List<String> picList = <String>[];
@@ -751,15 +753,11 @@ InlineSpan buildContent(
             builder: (BuildContext context, BoxConstraints box) {
               double maxHeight = box.maxWidth * 0.6; // 设置最大高度
               // double width = (box.maxWidth / 2).truncateToDouble();
-              double height = 100;
-              try {
-                height = ((box.maxWidth /
-                        2 *
-                        pictureItem['img_height'] /
-                        pictureItem['img_width']))
-                    .truncateToDouble();
-              } catch (_) {}
-
+              double height = ((box.maxWidth /
+                      2 *
+                      pictureItem['img_height'] /
+                      pictureItem['img_width']))
+                  .truncateToDouble();
               return GestureDetector(
                 onTap: () {
                   showDialog(
@@ -799,7 +797,8 @@ 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']);
@@ -817,11 +816,10 @@ InlineSpan buildContent(
                   );
                 },
                 child: NetworkImgLayer(
-                    src: content.pictures[i]['img_src'],
-                    width: box.maxWidth,
-                    height: box.maxWidth,
-                    origAspectRatio: content.pictures[i]['img_width'] /
-                        content.pictures[i]['img_height']),
+                  src: content.pictures[i]['img_src'],
+                  width: box.maxWidth,
+                  height: box.maxWidth,
+                ),
               );
             },
           ),
@@ -882,100 +880,3 @@ 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

@@ -570,11 +570,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                               );
                             },
                           ),
-                          Obx(
-                            () => VideoReplyPanel(
-                              bvid: videoDetailController.bvid,
-                              oid: videoDetailController.oid.value,
-                            ),
+                          VideoReplyPanel(
+                            bvid: videoDetailController.bvid,
                           )
                         ],
                       ),

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

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

lib/plugin/pl_player/view.dart

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

lib/router/app_pages.dart

@@ -3,7 +3,6 @@
 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';
@@ -40,7 +39,6 @@ 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';
@@ -104,9 +102,7 @@ class Routes {
     // 二级回复
     CustomGetPage(
         name: '/replyReply', page: () => const VideoReplyReplyPanel()),
-    // 推荐设置
-    CustomGetPage(
-        name: '/recommendSetting', page: () => const RecommendSetting()),
+
     // 播放设置
     CustomGetPage(name: '/playSetting', page: () => const PlaySetting()),
     // 外观设置
@@ -158,8 +154,6 @@ class Routes {
         name: '/memberSeasons', page: () => const MemberSeasonsPage()),
     // 日志
     CustomGetPage(name: '/logs', page: () => const LogsPage()),
-    // 搜索关注
-    CustomGetPage(name: '/followSearch', page: () => const FollowSearchPage()),
   ];
 }
 

lib/utils/cache_manage.dart

@@ -1,154 +0,0 @@
-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/recommend_filter.dart

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

@@ -4,7 +4,6 @@ import 'dart:io';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:pilipala/models/model_owner.dart';
-import 'package:pilipala/models/search/hot.dart';
 import 'package:pilipala/models/user/info.dart';
 
 class GStrorage {
@@ -42,16 +41,17 @@ class GStrorage {
         return deletedEntries > 10;
       },
     );
-    // 视频设置
-    video = await Hive.openBox('video');
   }
 
   static void regAdapter() {
     Hive.registerAdapter(OwnerAdapter());
     Hive.registerAdapter(UserInfoDataAdapter());
     Hive.registerAdapter(LevelInfoAdapter());
-    Hive.registerAdapter(HotSearchModelAdapter());
-    Hive.registerAdapter(HotSearchItemAdapter());
+  }
+
+  static Future<void> lazyInit() async {
+    // 视频设置
+    video = await Hive.openBox('video');
   }
 
   static Future<void> close() async {
@@ -102,24 +102,17 @@ 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';
 

lib/utils/url_utils.dart

@@ -1,61 +0,0 @@
-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,6 +9,7 @@ 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';
@@ -27,16 +28,10 @@ class Utils {
     return tempPath;
   }
 
-  static String numFormat(dynamic number) {
-    if (number == null) {
-      return '0';
-    }
-    if (number is String) {
-      return number;
-    }
+  static String numFormat(int number) {
     final String res = (number / 10000).toString();
     if (int.parse(res.split('.')[0]) >= 1) {
-      return '${(number / 10000).toStringAsFixed(1)}万';
+      return '${(number / 10000).toPrecision(1)}万';
     } else {
       return number.toString();
     }
@@ -63,26 +58,6 @@ 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'}) {
     // 当前时间

pubspec.yaml

@@ -188,7 +188,6 @@ 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