feat: 热搜词跳转直播

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

@@ -158,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(
@@ -171,7 +171,7 @@ class VideoCardV extends StatelessWidget {
                             right: 7,
                             size: 'small',
                             type: 'gray',
-                            text: Utils.timeFormat(videoItem.duration),
+                            text: videoItem.duration,
                           )
                         ],
                     ],
@@ -331,8 +331,10 @@ class VideoStat extends StatelessWidget {
           color: Theme.of(context).colorScheme.outline,
         ),
         children: [
-          TextSpan(text: '${Utils.numFormat(videoItem.stat.view)}观看'),
-          TextSpan(text: ' • ${Utils.numFormat(videoItem.stat.danmu)}弹幕'),
+          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

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()};
@@ -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 {

lib/main.dart

@@ -21,11 +21,9 @@ 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';
 
-
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   MediaKit.ensureInitialized();
@@ -36,7 +34,6 @@ void main() async {
     await setupServiceLocator();
     Request();
     await Request.setCookie();
-    RecommendFilter();
 
     // 异常捕获 logo记录
     final Catcher2Options debugConfig = Catcher2Options(
@@ -63,7 +60,6 @@ void main() async {
       },
     );
 
-
     // 小白条、导航栏沉浸
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
     SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(

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

@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/video_card_h.dart';
 import 'package:pilipala/utils/utils.dart';
-import '../../common/constants.dart';
 import 'controller.dart';
 
 class MemberArchivePage extends StatefulWidget {
@@ -49,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';
@@ -96,18 +97,24 @@ 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'],
@@ -120,12 +127,20 @@ class _RcmdPageState extends State<RcmdPage>
                       );
                     }
                   } else {
+                    // 缓存数据
+                    // if (_rcmdController.videoList.isNotEmpty) {
+                    //   return contentGrid(
+                    //       _rcmdController, _rcmdController.videoList);
+                    // }
+                    // // 骨架屏
+                    // else {
                     return contentGrid(_rcmdController, []);
+                    // }
                   }
                 },
               ),
             ),
-            LoadingMore(ctr: _rcmdController),
+            LoadingMore(ctr: _rcmdController)
           ],
         ),
       ),

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,11 +178,11 @@ 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);
                           },
                         ),
                       );
@@ -193,15 +193,7 @@ class _SearchPageState extends State<SearchPage> with RouteAware {
                       );
                     }
                   } 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/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/reply/controller.dart

@@ -41,12 +41,8 @@ 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;
@@ -119,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/widgets/reply_item.dart

@@ -571,8 +571,7 @@ InlineSpan buildContent(
     });
   }
   // content.message = content.message.replaceAll(RegExp(r"\{vote:.*?\}"), ' ');
-  content.message = content.message
-      .replaceAll('&', '&')
+  content.message = content.message.replaceAll('&', '&')
       .replaceAll('&lt;', '<')
       .replaceAll('&gt;', '>')
       .replaceAll('&quot;', '"')
@@ -587,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{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,
@@ -675,56 +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 = () {
-                    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(
-                            '/searchResult',
-                            parameters: {'keyword': matchRes['BV']},
-                          );
-                        }
-                      } 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': matchStr,
-                            'type': 'url',
-                            'pageTitle': ''
-                          },
+                          '/searchResult',
+                          parameters: {'keyword': matchRes['BV']},
                         );
                       }
                     } else {
-                      if (appUrlSchema.startsWith('bilibili://search')) {
-                        Get.toNamed('/searchResult', parameters: {
-                          'keyword': content.jumpUrl[matchStr]['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 {
@@ -797,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']);
@@ -815,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,
+                ),
               );
             },
           ),

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/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 {
@@ -48,8 +47,6 @@ class GStrorage {
     Hive.registerAdapter(OwnerAdapter());
     Hive.registerAdapter(UserInfoDataAdapter());
     Hive.registerAdapter(LevelInfoAdapter());
-    Hive.registerAdapter(HotSearchModelAdapter());
-    Hive.registerAdapter(HotSearchItemAdapter());
   }
 
   static Future<void> lazyInit() async {
@@ -105,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/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();
     }