fix: 修改版本号

change_log/1.0.10.1016.md

@@ -0,0 +1,4 @@
+## 1.0.10
+
+### 修复
++ 长按倍速抬起后未恢复默认倍速

change_log/1.0.8.0917.md

@@ -0,0 +1,24 @@
+## 1.0.8
+
+直播弹幕、循环播放等功能开发中
+
+### 新功能
++ 用户拉黑功能
++ gif图片保存
++ 删除已看历史记录
+ 
+### 修复
++ 弹幕数量较少
++ 弹幕屏蔽设置自动记忆
++ 动态页面渲染
++ 用户主页数据错乱
++ 大家都在搜空白
++ 默认自动全屏，顶部操作栏丢失
+  
+  
+### 优化
++ 全屏状态栏区域显示优化
++ 图片保存至PiliPala文件夹
+
+更多更新日志可在Github上查看
+问题反馈、功能建议请查看「关于」页面。

change_log/1.0.9.1015.md

@@ -0,0 +1,28 @@
+## 1.0.9
+
+
+### 新功能
++ 自定义倍速、默认倍速
++ 历史记录搜索
++ 收藏夹搜索
++ 历史记录多选删除
++ 视频循环播放
++ 免登录看1080P
++ 评论区视频链接跳转
++ up主分组
++ up主投稿搜索
+ 
+### 修复
++ 搜索视频标题乱码
++ 屏幕帧率
++ 动态页面渲染
+
+  
+  
+### 优化
++ 快进手势
++ 视频简介链接匹配
++ 视频全屏时安全区域
+
+更多更新日志可在Github上查看
+问题反馈、功能建议请查看「关于」页面。

ios/Podfile.lock

@@ -14,8 +14,6 @@ PODS:
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
-  - image_gallery_saver (2.0.2):
-    - Flutter
   - media_kit_libs_ios_video (1.0.4):
     - Flutter
   - media_kit_native_event_loop (1.0.0):
@@ -30,6 +28,8 @@ PODS:
   - permission_handler_apple (9.1.1):
     - Flutter
   - ReachabilitySwift (5.0.0)
+  - saver_gallery (0.0.1):
+    - Flutter
   - screen_brightness_ios (0.1.0):
     - Flutter
   - share_plus (0.0.1):
@@ -59,13 +59,13 @@ DEPENDENCIES:
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - Flutter (from `Flutter`)
   - flutter_volume_controller (from `.symlinks/plugins/flutter_volume_controller/ios`)
-  - image_gallery_saver (from `.symlinks/plugins/image_gallery_saver/ios`)
   - media_kit_libs_ios_video (from `.symlinks/plugins/media_kit_libs_ios_video/ios`)
   - media_kit_native_event_loop (from `.symlinks/plugins/media_kit_native_event_loop/ios`)
   - media_kit_video (from `.symlinks/plugins/media_kit_video/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
+  - saver_gallery (from `.symlinks/plugins/saver_gallery/ios`)
   - screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - sqflite (from `.symlinks/plugins/sqflite/ios`)
@@ -95,8 +95,6 @@ EXTERNAL SOURCES:
     :path: Flutter
   flutter_volume_controller:
     :path: ".symlinks/plugins/flutter_volume_controller/ios"
-  image_gallery_saver:
-    :path: ".symlinks/plugins/image_gallery_saver/ios"
   media_kit_libs_ios_video:
     :path: ".symlinks/plugins/media_kit_libs_ios_video/ios"
   media_kit_native_event_loop:
@@ -109,6 +107,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
   permission_handler_apple:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
+  saver_gallery:
+    :path: ".symlinks/plugins/saver_gallery/ios"
   screen_brightness_ios:
     :path: ".symlinks/plugins/screen_brightness_ios/ios"
   share_plus:
@@ -138,7 +138,6 @@ SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_volume_controller: e4d5832f08008180f76e30faf671ffd5a425e529
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb
   media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
   media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a
   media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
@@ -146,6 +145,7 @@ SPEC CHECKSUMS:
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
   permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
+  saver_gallery: 2b4e584106fde2407ab51560f3851564963e6b78
   screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
   share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028
   sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a

lib/common/widgets/html_render.dart

@@ -1,7 +1,7 @@
-import 'package:cached_network_image/cached_network_image.dart';
 import 'package:get/get.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
 
 // ignore: must_be_immutable
 class HtmlRender extends StatelessWidget {
@@ -20,35 +20,47 @@ class HtmlRender extends StatelessWidget {
   Widget build(BuildContext context) {
     return Html(
       data: htmlContent,
-      // tagsList: Html.tags..addAll(["form", "label", "input"]),
       onLinkTap: (url, buildContext, attributes) => {},
       extensions: [
         TagExtension(
           tagsToExtend: {"img"},
           builder: (extensionContext) {
-            String? imgUrl = extensionContext.attributes['src'];
+            try {
-            if (imgUrl!.startsWith('//')) {
+              Map attributes = extensionContext.attributes;
-              imgUrl = 'https:$imgUrl';
+              List key = attributes.keys.toList();
+              String? imgUrl = key.contains('src')
+                  ? attributes['src']
+                  : attributes['data-src'];
+              if (imgUrl!.startsWith('//')) {
+                imgUrl = 'https:$imgUrl';
+              }
+              if (imgUrl.startsWith('http://')) {
+                imgUrl = imgUrl.replaceAll('http://', 'https://');
+              }
+              imgUrl = imgUrl.contains('@') ? imgUrl.split('@').first : imgUrl;
+              bool isEmote = imgUrl.contains('/emote/');
+              bool isMall = imgUrl.contains('/mall/');
+              if (isMall) {
+                return const SizedBox();
+              }
+              // bool inTable =
+              //     extensionContext.element!.previousElementSibling == null ||
+              //         extensionContext.element!.nextElementSibling == null;
+              // imgUrl = Utils().imageUrl(imgUrl!);
+              // return Image.network(
+              //   imgUrl,
+              //   width: isEmote ? 22 : null,
+              //   height: isEmote ? 22 : null,
+              // );
+              return NetworkImgLayer(
+                width: isEmote ? 22 : Get.size.width - 24,
+                height: isEmote ? 22 : 200,
+                src: imgUrl,
+              );
+            } catch (err) {
+              print(err);
+              return const SizedBox();
             }
-            if (imgUrl.startsWith('http://')) {
-              imgUrl = imgUrl.replaceAll('http://', 'https://');
-            }
-
-            print(imgUrl);
-            bool isEmote = imgUrl.contains('/emote/');
-            bool isMall = imgUrl.contains('/mall/');
-            if (isMall) {
-              return SizedBox();
-            }
-            // bool inTable =
-            //     extensionContext.element!.previousElementSibling == null ||
-            //         extensionContext.element!.nextElementSibling == null;
-            // imgUrl = Utils().imageUrl(imgUrl!);
-            return Image.network(
-              imgUrl,
-              width: isEmote ? 22 : null,
-              height: isEmote ? 22 : null,
-            );
           },
         ),
       ],
@@ -63,11 +75,13 @@ class HtmlRender extends StatelessWidget {
           textDecoration: TextDecoration.none,
         ),
         "p": Style(
-          margin: Margins.only(bottom: 0),
+          margin: Margins.only(bottom: 10),
         ),
         "span": Style(
           fontSize: FontSize.medium,
+          height: Height(1.65),
         ),
+        "div": Style(height: Height.auto()),
         "li > p": Style(
           display: Display.inline,
         ),
@@ -75,61 +89,7 @@ class HtmlRender extends StatelessWidget {
           padding: HtmlPaddings.only(bottom: 4),
           textAlign: TextAlign.justify,
         ),
-        "image": Style(margin: Margins.only(top: 4, bottom: 4)),
+        "img": Style(margin: Margins.only(top: 4, bottom: 4)),
-        "p > img": Style(margin: Margins.only(top: 4, bottom: 4)),
-        "code": Style(
-            backgroundColor: Theme.of(context).colorScheme.onInverseSurface),
-        "code > span": Style(textAlign: TextAlign.start),
-        "hr": Style(
-          margin: Margins.zero,
-          padding: HtmlPaddings.zero,
-          border: Border(
-            top: BorderSide(
-              width: 1.0,
-              color:
-                  Theme.of(context).colorScheme.onBackground.withOpacity(0.3),
-            ),
-          ),
-        ),
-        'table': Style(
-          border: Border(
-            right: BorderSide(
-              width: 0.5,
-              color:
-                  Theme.of(context).colorScheme.onBackground.withOpacity(0.3),
-            ),
-            bottom: BorderSide(
-              width: 0.5,
-              color:
-                  Theme.of(context).colorScheme.onBackground.withOpacity(0.3),
-            ),
-          ),
-        ),
-        'tr': Style(
-          border: Border(
-            top: BorderSide(
-              width: 1.0,
-              color:
-                  Theme.of(context).colorScheme.onBackground.withOpacity(0.3),
-            ),
-            left: BorderSide(
-              width: 1.0,
-              color:
-                  Theme.of(context).colorScheme.onBackground.withOpacity(0.3),
-            ),
-          ),
-        ),
-        'thead': Style(
-          backgroundColor: Theme.of(context).colorScheme.background,
-        ),
-        'th': Style(
-          padding: HtmlPaddings.only(left: 3, right: 3),
-        ),
-        'td': Style(
-          padding: HtmlPaddings.all(4.0),
-          alignment: Alignment.center,
-          textAlign: TextAlign.center,
-        ),
       },
     );
   }

lib/common/widgets/video_card_v.dart

@@ -5,6 +5,7 @@ import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/badge.dart';
 import 'package:pilipala/common/widgets/stat/danmu.dart';
 import 'package:pilipala/common/widgets/stat/view.dart';
+import 'package:pilipala/http/dynamics.dart';
 import 'package:pilipala/http/search.dart';
 import 'package:pilipala/http/user.dart';
 import 'package:pilipala/models/common/search_type.dart';
@@ -27,6 +28,11 @@ class VideoCardV extends StatelessWidget {
     this.longPressEnd,
   }) : super(key: key);
 
+  bool isStringNumeric(String str) {
+    RegExp numericRegex = RegExp(r'^\d+$');
+    return numericRegex.hasMatch(str);
+  }
+
   void onPushDetail(heroTag) async {
     String goto = videoItem.goto;
     switch (goto) {
@@ -62,6 +68,39 @@ class VideoCardV extends StatelessWidget {
           'heroTag': heroTag,
         });
         break;
+      // 动态
+      case 'picture':
+        String dynamicType = 'picture';
+        String uri = videoItem.uri;
+        if (videoItem.uri.contains('bilibili://article/')) {
+          dynamicType = 'article';
+          RegExp regex = RegExp(r'\d+');
+          Match match = regex.firstMatch(videoItem.uri)!;
+          String matchedNumber = match.group(0)!;
+          videoItem.param = 'cv' + matchedNumber;
+        }
+        if (uri.startsWith('http')) {
+          String path = Uri.parse(uri).path;
+          if (isStringNumeric(path.split('/')[1])) {
+            // 请求接口
+            var res = await DynamicsHttp.dynamicDetail(id: path.split('/')[1]);
+            if (res['status']) {
+              Get.toNamed('/dynamicDetail', arguments: {
+                'item': res['data'],
+                'floor': 1,
+                'action': 'detail'
+              });
+            }
+            return;
+          }
+        }
+        Get.toNamed('/htmlRender', parameters: {
+          'url': uri,
+          'title': videoItem.title,
+          'id': videoItem.param.toString(),
+          'dynamicType': dynamicType
+        });
+        break;
       default:
         SmartDialog.showToast(videoItem.goto);
         Get.toNamed(
@@ -278,23 +317,18 @@ class VideoStat extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Row(
+    return RichText(
-      children: [
+      maxLines: 1,
-        Text(
+      text: TextSpan(
-          '${videoItem.stat.view}观看',
+        style: TextStyle(
-          style: TextStyle(
+          fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
-            fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
+          color: Theme.of(context).colorScheme.outline,
-            color: Theme.of(context).colorScheme.outline,
-          ),
         ),
-        Text(
+        children: [
-          ' • ${videoItem.stat.danmu}弹幕',
+          TextSpan(text: '${videoItem.stat.view}观看'),
-          style: TextStyle(
+          TextSpan(text: ' • ${videoItem.stat.danmu}弹幕'),
-            fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
+        ],
-            color: Theme.of(context).colorScheme.outline,
+      ),
-          ),
-        ),
-      ],
     );
   }
 }

lib/http/api.dart

@@ -97,6 +97,9 @@ class Api {
   // 操作用户关系
   static const String relationMod = '/x/relation/modify';
 
+  // 相互关系查询
+  static const String relationSearch = '/x/space/wbi/acc/relation';
+
   // 评论列表
   // https://api.bilibili.com/x/v2/reply/main?csrf=6e22efc1a47225ea25f901f922b5cfdd&mode=3&oid=254175381&pagination_str=%7B%22offset%22:%22%22%7D&plat=1&seek_rpid=0&type=11
   static const String replyList = '/x/v2/reply';
@@ -126,12 +129,14 @@ class Api {
   static const String userFavFolder = '/x/v3/fav/folder/created/list';
 
   /// 收藏夹 详情
-  /// media_id int 收藏夹id
+  /// media_id  当前收藏夹id 搜索全部时为默认收藏夹id
   /// pn int 当前页
   /// ps int pageSize
   /// keyword String 搜索词
   /// order String 排序方式 view 最多播放 mtime 最近收藏 pubtime 最近投稿
   /// tid int 分区id
+  /// platform web
+  /// type 0 当前收藏夹 1 全部收藏夹
   // https://api.bilibili.com/x/v3/fav/resource/list?media_id=76614671&pn=1&ps=20&keyword=&order=mtime&type=0&tid=0
   static const String userFavFolderDetail = '/x/v3/fav/resource/list';
 
@@ -164,6 +169,12 @@ class Api {
   // 清空历史记录
   static const String clearHistory = '/x/v2/history/clear';
 
+  // 删除某条历史记录
+  static const String delHistory = '/x/v2/history/delete';
+
+  // 搜索历史记录
+  static const String searchHistory = '/x/web-goblin/history/search';
+
   // 热搜
   static const String hotSearchList =
       'https://s.search.bilibili.com/main/hotword';
@@ -239,6 +250,9 @@ class Api {
   // wts=1689767832
   static const String memberArchive = '/x/space/wbi/arc/search';
 
+  // 用户动态搜索
+  static const String memberDynamicSearch = '/x/space/dynamic/search';
+
   // 用户动态
   static const String memberDynamic = '/x/polymer/web-dynamic/v1/feed/space';
 
@@ -285,6 +299,9 @@ class Api {
   // 黑名单
   static const String blackLst = '/x/relation/blacks';
 
+  // 移除黑名单
+  static const String removeBlack = '/x/relation/modify';
+
   // github 获取最新版
   static const String latestApp =
       'https://api.github.com/repos/guozhigq/pilipala/releases/latest';
@@ -294,4 +311,20 @@ class Api {
   static const String onlineTotal = '/x/player/online/total';
 
   static const String webDanmaku = '/x/v2/dm/web/seg.so';
+
+  // up主分组
+  static const String followUpTag = '/x/relation/tags';
+
+  // 设置Up主分组
+  // 0 添加至默认分组  否则使用,分割tagid
+  static const String addUsers = '/x/relation/tags/addUsers';
+
+  // 获取指定分组下的up
+  static const String followUpGroup = '/x/relation/tag';
+
+  // 获取某个动态详情
+  // timezone_offset=-480
+  // id=849312409672744983
+  // features=itemOpusStyle
+  static const String dynamicDetail = '/x/polymer/web-dynamic/v1/detail';
 }

lib/http/black.dart

@@ -23,4 +23,31 @@ class BlackHttp {
       };
     }
   }
+
+  // 移除黑名单
+  static Future removeBlack({required int fid}) async {
+    var res = await Request().post(
+      Api.removeBlack,
+      queryParameters: {
+        'act': 6,
+        'csrf': await Request.getCsrf(),
+        'fid': fid,
+        'jsonp': 'jsonp',
+        're_src': 116,
+      },
+    );
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': [],
+        'msg': '操作成功',
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
 }

lib/http/constants.dart

@@ -2,4 +2,37 @@ class HttpString {
   static const String baseUrl = 'https://www.bilibili.com';
   static const String baseApiUrl = 'https://api.bilibili.com';
   static const String tUrl = 'https://api.vc.bilibili.com';
+  static const List<int> validateStatusCodes = [
+    302,
+    304,
+    307,
+    400,
+    401,
+    403,
+    404,
+    405,
+    409,
+    412,
+    500,
+    503,
+    504,
+    509,
+    616,
+    617,
+    625,
+    626,
+    628,
+    629,
+    632,
+    643,
+    650,
+    652,
+    658,
+    662,
+    688,
+    689,
+    701,
+    799,
+    8888
+  ];
 }

lib/http/danmaku.dart

@@ -17,17 +17,11 @@ class DanmakaHttp {
       'oid': cid,
       'segment_index': segmentIndex,
     };
-
+    var response = await Request().get(
-    // 计算函数
+      Api.webDanmaku,
-    Future<DmSegMobileReply> computeTask(Map<String, int> params) async {
+      data: params,
-      var response = await Request().get(
+      extra: {'resType': ResponseType.bytes},
-        Api.webDanmaku,
+    );
-        data: params,
+    return DmSegMobileReply.fromBuffer(response.data);
-        extra: {'resType': ResponseType.bytes},
-      );
-      return DmSegMobileReply.fromBuffer(response.data);
-    }
-
-    return await compute(computeTask, params);
   }
 }

lib/http/dynamics.dart

@@ -28,6 +28,7 @@ class DynamicsHttp {
           'data': DynamicsDataModel.fromJson(res.data['data']),
         };
       } catch (err) {
+        print(err);
         return {
           'status': false,
           'data': [],
@@ -85,4 +86,35 @@ class DynamicsHttp {
       };
     }
   }
+
+  //
+  static Future dynamicDetail({
+    String? id,
+  }) async {
+    var res = await Request().get(Api.dynamicDetail, data: {
+      'timezone_offset': -480,
+      'id': id,
+      'features': 'itemOpusStyle',
+    });
+    if (res.data['code'] == 0) {
+      try {
+        return {
+          'status': true,
+          'data': DynamicItemModel.fromJson(res.data['data']['item']),
+        };
+      } catch (err) {
+        return {
+          'status': false,
+          'data': [],
+          'msg': err.toString(),
+        };
+      }
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
 }

lib/http/html.dart

@@ -3,38 +3,101 @@ import 'package:html/parser.dart';
 import 'package:pilipala/http/index.dart';
 
 class HtmlHttp {
-  static Future reqHtml(id) async {
+  // article
-    var response = await Request().get("https://www.bilibili.com/opus/$id");
+  static Future reqHtml(id, dynamicType) async {
+    var response = await Request().get(
+      "https://www.bilibili.com/opus/$id",
+      extra: {'ua': 'pc'},
+    );
+
+    if (response.data.contains('Redirecting to')) {
+      RegExp regex = RegExp(r'//([\w\.]+)/(\w+)/(\w+)');
+      Match match = regex.firstMatch(response.data)!;
+      String matchedString = match.group(0)!;
+      response = await Request().get(
+        'https:$matchedString' + '/',
+        extra: {'ua': 'pc'},
+      );
+    }
+    try {
+      Document rootTree = parse(response.data);
+      // log(response.data.body.toString());
+      Element body = rootTree.body!;
+      Element appDom = body.querySelector('#app')!;
+      Element authorHeader = appDom.querySelector('.fixed-author-header')!;
+      // 头像
+      String avatar = authorHeader.querySelector('img')!.attributes['src']!;
+      avatar = 'https:${avatar.split('@')[0]}';
+      String uname = authorHeader
+          .querySelector('.fixed-author-header__author__name')!
+          .text;
+
+      // 动态详情
+      Element opusDetail = appDom.querySelector('.opus-detail')!;
+      // 发布时间
+      String updateTime =
+          opusDetail.querySelector('.opus-module-author__pub__text')!.text;
+      //
+      String opusContent =
+          opusDetail.querySelector('.opus-module-content')!.innerHtml;
+      String test = opusDetail
+          .querySelector('.horizontal-scroll-album__pic__img')!
+          .innerHtml;
+      String commentId = opusDetail
+          .querySelector('.bili-comment-container')!
+          .className
+          .split(' ')[1]
+          .split('-')[2];
+      // List imgList = opusDetail.querySelectorAll('bili-album__preview__picture__img');
+      return {
+        'status': true,
+        'avatar': avatar,
+        'uname': uname,
+        'updateTime': updateTime,
+        'content': test + opusContent,
+        'commentId': int.parse(commentId)
+      };
+    } catch (err) {
+      print('err: $err');
+    }
+  }
+
+  // read
+  static Future reqReadHtml(id, dynamicType) async {
+    var response = await Request().get(
+      "https://www.bilibili.com/$dynamicType/$id/",
+      extra: {'ua': 'pc'},
+    );
     Document rootTree = parse(response.data);
     Element body = rootTree.body!;
     Element appDom = body.querySelector('#app')!;
-    Element authorHeader = appDom.querySelector('.fixed-author-header')!;
+    Element authorHeader = appDom.querySelector('.up-left')!;
     // 头像
-    String avatar = authorHeader.querySelector('img')!.attributes['src']!;
+    // String avatar =
-    avatar = 'https:${avatar.split('@')[0]}';
+    //     authorHeader.querySelector('.bili-avatar-img')!.attributes['data-src']!;
-    String uname =
+    // print(avatar);
-        authorHeader.querySelector('.fixed-author-header__author__name')!.text;
+    // avatar = 'https:${avatar.split('@')[0]}';
+    String uname = authorHeader.querySelector('.up-name')!.text.trim();
     // 动态详情
-    Element opusDetail = appDom.querySelector('.opus-detail')!;
+    Element opusDetail = appDom.querySelector('.article-content')!;
     // 发布时间
-    String updateTime =
+    // String updateTime =
-        opusDetail.querySelector('.opus-module-author__pub__text')!.text;
+    //     opusDetail.querySelector('.opus-module-author__pub__text')!.text;
+    // print(updateTime);
+
     //
     String opusContent =
-        opusDetail.querySelector('.opus-module-content')!.innerHtml;
+        opusDetail.querySelector('#read-article-holder')!.innerHtml;
-    String commentId = opusDetail
+    RegExp digitRegExp = RegExp(r'\d+');
-        .querySelector('.bili-comment-container')!
+    Iterable<Match> matches = digitRegExp.allMatches(id);
-        .className
+    String number = matches.first.group(0)!;
-        .split(' ')[1]
-        .split('-')[2];
-    // List imgList = opusDetail.querySelectorAll('bili-album__preview__picture__img');
     return {
       'status': true,
-      'avatar': avatar,
+      'avatar': '',
       'uname': uname,
-      'updateTime': updateTime,
+      'updateTime': '',
       'content': opusContent,
-      'commentId': commentId
+      'commentId': int.parse(number)
     };
   }
 }

lib/http/init.dart

@@ -4,6 +4,7 @@ import 'dart:io';
 import 'dart:async';
 import 'package:dio/dio.dart';
 import 'package:cookie_jar/cookie_jar.dart';
+import 'package:dio_http2_adapter/dio_http2_adapter.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
@@ -59,9 +60,6 @@ class Request {
   static Future<String> getCsrf() async {
     var cookies = await cookieManager.cookieJar
         .loadForRequest(Uri.parse(HttpString.baseApiUrl));
-    // for (var i in cookies) {
-    //   print(i);
-    // }
     String token = '';
     if (cookies.where((e) => e.name == 'bili_jct').isNotEmpty) {
       token = cookies.firstWhere((e) => e.name == 'bili_jct').value;
@@ -91,16 +89,18 @@ class Request {
       //响应流上前后两次接受到数据的间隔，单位为毫秒。
       receiveTimeout: const Duration(milliseconds: 12000),
       //Http请求头.
-      headers: {
+      headers: {},
-        'keep-alive': true,
-        'user-agent': headerUa('pc'),
-        'Accept-Encoding': 'gzip'
-      },
-      contentType: Headers.jsonContentType,
-      persistentConnection: true,
     );
 
-    dio = Dio(options);
+    dio = Dio(options)
+
+      /// fix 第三方登录 302重定向 跟iOS代理问题冲突
+      ..httpClientAdapter = Http2Adapter(
+        ConnectionManager(
+          idleTimeout: const Duration(milliseconds: 10000),
+          onClientCreate: (_, config) => config.onBadCertificate = (_) => true,
+        ),
+      );
 
     //添加拦截器
     dio.interceptors.add(ApiInterceptor());
@@ -114,30 +114,26 @@ class Request {
 
     dio.transformer = BackgroundTransformer();
     dio.options.validateStatus = (status) {
-      return status! >= 200 && status < 300 || status == 304 || status == 302;
+      return status! >= 200 && status < 300 ||
+          HttpString.validateStatusCodes.contains(status);
     };
   }
 
   /*
    * get请求
    */
-  get(url, {data, cacheOptions, options, cancelToken, extra}) async {
+  get(url, {data, options, cancelToken, extra}) async {
     Response response;
-    Options options;
+    Options options = Options();
-    String ua = 'pc';
     ResponseType resType = ResponseType.json;
     if (extra != null) {
-      ua = extra!['ua'] ?? 'pc';
       resType = extra!['resType'] ?? ResponseType.json;
+      if (extra['ua'] != null) {
+        options.headers = {'user-agent': headerUa(type: extra['ua'])};
+      }
     }
-    if (cacheOptions != null) {
+    options.responseType = resType;
-      cacheOptions.headers = {'user-agent': headerUa(ua)};
+
-      options = cacheOptions;
-    } else {
-      options = Options();
-      options.headers = {'user-agent': headerUa(ua)};
-      options.responseType = resType;
-    }
     try {
       response = await dio.get(
         url,
@@ -204,15 +200,19 @@ class Request {
     token.cancel("cancelled");
   }
 
-  String headerUa(ua) {
+  String headerUa({type = 'mob'}) {
     String headerUa = '';
-    if (ua == 'mob') {
+    if (type == 'mob') {
-      headerUa = Platform.isIOS
+      if (Platform.isIOS) {
-          ? 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Version/10.0 Mobile/14E304 Safari/602.1'
+        headerUa =
-          : 'Mozilla/5.0 (Linux; Android 11; Pixel 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.91 Mobile Safari/537.36';
+            'Mozilla/5.0 (iPhone; CPU iPhone OS 14_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1 Mobile/15E148 Safari/604.1';
+      } else {
+        headerUa =
+            'Mozilla/5.0 (Linux; Android 10; SM-G975F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.101 Mobile Safari/537.36';
+      }
     } else {
       headerUa =
-          'Mozilla/5.0 (Macintosh; Intel Mac OS X 13_3_1) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.4 Safari/605.1.15';
+          'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.2 Safari/605.1.15';
     }
     return headerUa;
   }

lib/http/interceptor.dart

@@ -46,7 +46,10 @@ class ApiInterceptor extends Interceptor {
   void onError(DioException err, ErrorInterceptorHandler handler) async {
     // 处理网络请求错误
     // handler.next(err);
-    SmartDialog.showToast(await dioError(err));
+    SmartDialog.showToast(
+      await dioError(err),
+      displayType: SmartToastType.onlyRefresh,
+    );
     super.onError(err, handler);
   }
 

lib/http/member.dart

@@ -1,7 +1,9 @@
 import 'package:pilipala/http/index.dart';
 import 'package:pilipala/models/dynamics/result.dart';
+import 'package:pilipala/models/follow/result.dart';
 import 'package:pilipala/models/member/archive.dart';
 import 'package:pilipala/models/member/info.dart';
+import 'package:pilipala/models/member/tags.dart';
 import 'package:pilipala/utils/wbi_sign.dart';
 
 class MemberHttp {
@@ -18,6 +20,7 @@ class MemberHttp {
     var res = await Request().get(
       Api.memberInfo,
       data: params,
+      extra: {'ua': 'pc'},
     );
     if (res.data['code'] == 0) {
       return {
@@ -65,7 +68,7 @@ class MemberHttp {
     int ps = 30,
     int tid = 0,
     int? pn,
-    String keyword = '',
+    String? keyword,
     String order = 'pubdate',
     bool orderAvoided = true,
   }) async {
@@ -74,7 +77,7 @@ class MemberHttp {
       'ps': ps,
       'tid': tid,
       'pn': pn,
-      'keyword': keyword,
+      'keyword': keyword ?? '',
       'order': order,
       'platform': 'web',
       'web_location': 1550101,
@@ -83,6 +86,7 @@ class MemberHttp {
     var res = await Request().get(
       Api.memberArchive,
       data: params,
+      extra: {'ua': 'pc'},
     );
     if (res.data['code'] == 0) {
       return {
@@ -119,4 +123,96 @@ class MemberHttp {
       };
     }
   }
+
+  // 搜索用户动态
+  static Future memberDynamicSearch({int? pn, int? ps, int? mid}) async {
+    var res = await Request().get(Api.memberDynamic, data: {
+      'keyword': '海拔',
+      'mid': mid,
+      'pn': pn,
+      'ps': ps,
+      'platform': 'web'
+    });
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': DynamicsDataModel.fromJson(res.data['data']),
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 查询分组
+  static Future followUpTags() async {
+    var res = await Request().get(Api.followUpTag);
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': res.data['data']
+            .map<MemberTagItemModel>((e) => MemberTagItemModel.fromJson(e))
+            .toList()
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 设置分组
+  static Future addUsers(int? fids, String? tagids) async {
+    var res = await Request().post(Api.addUsers, queryParameters: {
+      'fids': fids,
+      'tagids': tagids ?? '0',
+      'csrf': await Request.getCsrf(),
+    }, data: {
+      'cross_domain': true
+    });
+    if (res.data['code'] == 0) {
+      return {'status': true, 'data': [], 'msg': '操作成功'};
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 获取某分组下的up
+  static Future followUpGroup(
+    int? mid,
+    int? tagid,
+    int? pn,
+    int? ps,
+  ) async {
+    var res = await Request().get(Api.followUpGroup, data: {
+      'mid': mid,
+      'tagid': tagid,
+      'pn': pn,
+      'ps': ps,
+    });
+    if (res.data['code'] == 0) {
+      // FollowItemModel
+      return {
+        'status': true,
+        'data': res.data['data']
+            .map<FollowItemModel>((e) => FollowItemModel.fromJson(e))
+            .toList()
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
 }

lib/http/reply.dart

@@ -26,7 +26,7 @@ class ReplyHttp {
       Map errMap = {
         -400: '请求错误',
         -404: '无此项',
-        12002: '当前页面评论功能已关闭"',
+        12002: '当前页面评论功能已关闭',
         12009: '评论主体的type不合法',
         12061: 'UP主已关闭评论区',
       };

lib/http/search.dart

@@ -1,25 +1,38 @@
+import 'dart:convert';
+
+import 'package:hive/hive.dart';
 import 'package:pilipala/http/index.dart';
 import 'package:pilipala/models/bangumi/info.dart';
 import 'package:pilipala/models/common/search_type.dart';
 import 'package:pilipala/models/search/hot.dart';
 import 'package:pilipala/models/search/result.dart';
 import 'package:pilipala/models/search/suggest.dart';
+import 'package:pilipala/utils/storage.dart';
 
 class SearchHttp {
+  static Box setting = GStrorage.setting;
   static Future hotSearchList() async {
     var res = await Request().get(Api.hotSearchList);
-    if (res.data['code'] == 0) {
+    if (res.data is String) {
+      Map<String, dynamic> resultMap = json.decode(res.data);
+      if (resultMap['code'] == 0) {
+        return {
+          'status': true,
+          'data': HotSearchModel.fromJson(resultMap),
+        };
+      }
+    } else if (res.data is Map<String, dynamic> && res.data['code'] == 0) {
       return {
         'status': true,
         'data': HotSearchModel.fromJson(res.data),
       };
-    } else {
-      return {
-        'status': false,
-        'data': [],
-        'msg': '请求错误 🙅',
-      };
     }
+
+    return {
+      'status': false,
+      'data': [],
+      'msg': '请求错误 🙅',
+    };
   }
 
   // 获取搜索建议
@@ -27,10 +40,14 @@ class SearchHttp {
     var res = await Request().get(Api.serachSuggest,
         data: {'term': term, 'main_ver': 'v1', 'highlight': term});
     if (res.data['code'] == 0) {
-      res.data['result']['term'] = term;
+      if (res.data['result'] is Map) {
+        res.data['result']['term'] = term;
+      }
       return {
         'status': true,
-        'data': SearchSuggestModel.fromJson(res.data['result']),
+        'data': res.data['result'] is Map
+            ? SearchSuggestModel.fromJson(res.data['result'])
+            : [],
       };
     } else {
       return {
@@ -61,29 +78,44 @@ class SearchHttp {
     var res = await Request().get(Api.searchByType, data: reqData);
     if (res.data['code'] == 0 && res.data['data']['numPages'] > 0) {
       Object data;
-      switch (searchType) {
+      try {
-        case SearchType.video:
+        switch (searchType) {
-          data = SearchVideoModel.fromJson(res.data['data']);
+          case SearchType.video:
-          break;
+            List<int> blackMidsList =
-        case SearchType.live_room:
+                setting.get(SettingBoxKey.blackMidsList, defaultValue: [-1]);
-          data = SearchLiveModel.fromJson(res.data['data']);
+            for (var i in res.data['data']['result']) {
-          break;
+              // 屏蔽推广和拉黑用户
-        case SearchType.bili_user:
+              i['available'] = !blackMidsList.contains(i['mid']);
-          data = SearchUserModel.fromJson(res.data['data']);
+            }
-          break;
+            data = SearchVideoModel.fromJson(res.data['data']);
-        case SearchType.media_bangumi:
+            break;
-          data = SearchMBangumiModel.fromJson(res.data['data']);
+          case SearchType.live_room:
-          break;
+            data = SearchLiveModel.fromJson(res.data['data']);
+            break;
+          case SearchType.bili_user:
+            data = SearchUserModel.fromJson(res.data['data']);
+            break;
+          case SearchType.media_bangumi:
+            data = SearchMBangumiModel.fromJson(res.data['data']);
+            break;
+          case SearchType.article:
+            data = SearchArticleModel.fromJson(res.data['data']);
+            break;
+        }
+        return {
+          'status': true,
+          'data': data,
+        };
+      } catch (err) {
+        print(err);
       }
-      return {
-        'status': true,
-        'data': data,
-      };
     } else {
       return {
         'status': false,
         'data': [],
-        'msg': res.data['data']['numPages'] == 0 ? '没有相关数据' : '请求错误 🙅',
+        'msg': res.data['data'] != null && res.data['data']['numPages'] == 0
+            ? '没有相关数据'
+            : res.data['message'],
       };
     }
   }

lib/http/user.dart

@@ -8,6 +8,7 @@ import 'package:pilipala/models/user/fav_folder.dart';
 import 'package:pilipala/models/user/history.dart';
 import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/models/user/stat.dart';
+import 'package:pilipala/utils/wbi_sign.dart';
 
 class UserHttp {
   static Future<dynamic> userStat({required int mid}) async {
@@ -70,14 +71,15 @@ class UserHttp {
       required int pn,
       required int ps,
       String keyword = '',
-      String order = 'mtime'}) async {
+      String order = 'mtime',
+      int type = 0}) async {
     var res = await Request().get(Api.userFavFolderDetail, data: {
       'media_id': mediaId,
       'pn': pn,
       'ps': ps,
       'keyword': keyword,
       'order': order,
-      'type': 0,
+      'type': type,
       'tid': 0,
       'platform': 'web'
     });
@@ -231,4 +233,64 @@ class UserHttp {
       return {'status': false, 'msg': res.data['message']};
     }
   }
+
+  // 删除历史记录
+  static Future delHistory(kid) async {
+    var res = await Request().post(
+      Api.delHistory,
+      queryParameters: {
+        'kid': kid,
+        'jsonp': 'jsonp',
+        'csrf': await Request.getCsrf(),
+      },
+    );
+    if (res.data['code'] == 0) {
+      return {'status': true, 'msg': '已删除'};
+    } else {
+      return {'status': false, 'msg': res.data['message']};
+    }
+  }
+
+  // 相互关系查询
+  static Future relationSearch(int mid) async {
+    Map params = await WbiSign().makSign({
+      'mid': mid,
+      'token': '',
+      'platform': 'web',
+      'web_location': 1550101,
+    });
+    var res = await Request().get(
+      Api.relationSearch,
+      data: {
+        'mid': mid,
+        'w_rid': params['w_rid'],
+        'wts': params['wts'],
+      },
+    );
+    if (res.data['code'] == 0) {
+      // relation 主动状态
+      // 被动状态
+      return {'status': true, 'data': res.data['data']};
+    } else {
+      return {'status': false, 'msg': res.data['message']};
+    }
+  }
+
+  // 搜索历史记录
+  static Future searchHistory(
+      {required int pn, required String keyword}) async {
+    var res = await Request().get(
+      Api.searchHistory,
+      data: {
+        'pn': pn,
+        'keyword': keyword,
+        'business': 'all',
+      },
+    );
+    if (res.data['code'] == 0) {
+      return {'status': true, 'data': HistoryData.fromJson(res.data['data'])};
+    } else {
+      return {'status': false, 'msg': res.data['message']};
+    }
+  }
 }

lib/http/video.dart

@@ -22,6 +22,7 @@ class VideoHttp {
   static Box setting = GStrorage.setting;
   static bool enableRcmdDynamic =
       setting.get(SettingBoxKey.enableRcmdDynamic, defaultValue: true);
+  static Box userInfoCache = GStrorage.userInfo;
 
   // 首页推荐视频
   static Future rcmdVideoList({required int ps, required int freshIdx}) async {
@@ -133,6 +134,11 @@ class VideoHttp {
       // 'platform': '',
       // 'high_quality': ''
     };
+    // 免登录查看1080p
+    if (userInfoCache.get('userInfoCache') == null &&
+        setting.get(SettingBoxKey.p1080, defaultValue: true)) {
+      data['try_look'] = 1;
+    }
     try {
       var res = await Request().get(Api.videoUrl, data: data);
       if (res.data['code'] == 0) {

lib/main.dart

@@ -1,4 +1,7 @@
+import 'dart:io';
+
 import 'package:flutter/services.dart';
+import 'package:flutter_displaymode/flutter_displaymode.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
@@ -61,6 +64,23 @@ class MyApp extends StatelessWidget {
     double textScale =
         setting.get(SettingBoxKey.defaultTextScale, defaultValue: 1.0);
 
+    // 强制设置高帧率
+    if (Platform.isAndroid) {
+      try {
+        late List modes;
+        FlutterDisplayMode.supported.then((value) {
+          modes = value;
+          var storageDisplay = setting.get(SettingBoxKey.displayMode);
+          DisplayMode f = DisplayMode.auto;
+          if (storageDisplay != null) {
+            f = modes.firstWhere((e) => e.toString() == storageDisplay);
+          }
+          DisplayMode preferred = modes.toList().firstWhere((el) => el == f);
+          FlutterDisplayMode.setPreferredMode(preferred);
+        });
+      } catch (_) {}
+    }
+
     return DynamicColorBuilder(
       builder: ((ColorScheme? lightDynamic, ColorScheme? darkDynamic) {
         ColorScheme? lightColorScheme;

lib/models/common/search_type.dart

@@ -12,20 +12,20 @@ enum SearchType {
   live_room,
   // 主播：live_user
   // live_user,
-  // 专栏：article
-  // article,
   // 话题：topic
   // topic,
   // 用户：bili_user
   bili_user,
+  // 专栏：article
+  article,
   // 相簿：photo
   // photo
 }
 
 extension SearchTypeExtension on SearchType {
   String get type =>
-      ['video', 'media_bangumi', 'live_room', 'bili_user'][index];
+      ['video', 'media_bangumi', 'live_room', 'bili_user', 'article'][index];
-  String get label => ['视频', '番剧', '直播间', '用户'][index];
+  String get label => ['视频', '番剧', '直播间', '用户', '专栏'][index];
 }
 
 // 搜索类型为视频、专栏及相簿时

lib/models/dynamics/result.dart

@@ -244,7 +244,9 @@ class Vote {
     choiceCnt = json['choice_cnt'];
     share = json['share'];
     defaultShare = json['default_share'];
-    endTime = json['end_time'];
+    endTime = json['end_time'] is int
+        ? json['end_time']
+        : int.parse(json['end_time']);
     joinNum = json['join_num'];
     status = json['status'];
     type = json['type'];

lib/models/follow/result.dart

@@ -8,7 +8,7 @@ class FollowDataModel {
   List<FollowItemModel>? list;
 
   FollowDataModel.fromJson(Map<String, dynamic> json) {
-    total = json['total'];
+    total = json['total'] ?? 0;
     list = json['list']
         .map<FollowItemModel>((e) => FollowItemModel.fromJson(e))
         .toList();
@@ -19,7 +19,7 @@ class FollowItemModel {
   FollowItemModel({
     this.mid,
     this.attribute,
-    this.mtime,
+    // this.mtime,
     this.tag,
     this.special,
     this.uname,
@@ -30,7 +30,7 @@ class FollowItemModel {
 
   int? mid;
   int? attribute;
-  int? mtime;
+  // int? mtime;
   List? tag;
   int? special;
   String? uname;
@@ -41,7 +41,7 @@ class FollowItemModel {
   FollowItemModel.fromJson(Map<String, dynamic> json) {
     mid = json['mid'];
     attribute = json['attribute'];
-    mtime = json['mtime'];
+    // mtime = json['mtime'];
     tag = json['tag'];
     special = json['special'];
     uname = json['uname'];

lib/models/member/tags.dart

@@ -0,0 +1,23 @@
+class MemberTagItemModel {
+  MemberTagItemModel({
+    this.count,
+    this.name,
+    this.tagid,
+    this.tip,
+    this.checked,
+  });
+
+  int? count;
+  String? name;
+  int? tagid;
+  String? tip;
+  bool? checked;
+
+  MemberTagItemModel.fromJson(Map<String, dynamic> json) {
+    count = json['count'];
+    name = json['name'];
+    tagid = json['tagid'];
+    tip = json['tip'];
+    checked = false;
+  }
+}

lib/models/search/result.dart

@@ -6,6 +6,7 @@ class SearchVideoModel {
   List<SearchVideoItemModel>? list;
   SearchVideoModel.fromJson(Map<String, dynamic> json) {
     list = json['result']
+        .where((e) => e['available'] == true)
         .map<SearchVideoItemModel>((e) => SearchVideoItemModel.fromJson(e))
         .toList();
   }
@@ -17,7 +18,7 @@ class SearchVideoItemModel {
     this.id,
     this.cid,
     // this.author,
-    // this.mid,
+    this.mid,
     // this.typeid,
     // this.typename,
     this.arcurl,
@@ -47,7 +48,7 @@ class SearchVideoItemModel {
   int? id;
   int? cid;
   // String? author;
-  // String? mid;
+  int? mid;
   // String? typeid;
   // String? typename;
   String? arcurl;
@@ -80,6 +81,7 @@ class SearchVideoItemModel {
     arcurl = json['arcurl'];
     aid = json['aid'];
     bvid = json['bvid'];
+    mid = json['mid'];
     // title = json['title'].replaceAll(RegExp(r'<.*?>'), '');
     title = Em.regTitle(json['title']);
     description = json['description'];
@@ -376,3 +378,75 @@ class SearchMBangumiItemModel {
     indexShow = json['index_show'];
   }
 }
+
+class SearchArticleModel {
+  SearchArticleModel({this.list});
+
+  List<SearchArticleItemModel>? list;
+
+  SearchArticleModel.fromJson(Map<String, dynamic> json) {
+    list = json['result'] != null
+        ? json['result']
+            .map<SearchArticleItemModel>(
+                (e) => SearchArticleItemModel.fromJson(e))
+            .toList()
+        : [];
+  }
+}
+
+class SearchArticleItemModel {
+  SearchArticleItemModel({
+    this.pubTime,
+    this.like,
+    this.title,
+    this.subTitle,
+    this.rankOffset,
+    this.mid,
+    this.imageUrls,
+    this.id,
+    this.categoryId,
+    this.view,
+    this.reply,
+    this.desc,
+    this.rankScore,
+    this.type,
+    this.templateId,
+    this.categoryName,
+  });
+
+  int? pubTime;
+  int? like;
+  List? title;
+  String? subTitle;
+  int? rankOffset;
+  int? mid;
+  List? imageUrls;
+  int? id;
+  int? categoryId;
+  int? view;
+  int? reply;
+  String? desc;
+  int? rankScore;
+  String? type;
+  int? templateId;
+  String? categoryName;
+
+  SearchArticleItemModel.fromJson(Map<String, dynamic> json) {
+    pubTime = json['pub_time'];
+    like = json['like'];
+    title = Em.regTitle(json['title']);
+    subTitle = json['title'].replaceAll(RegExp(r'<[^>]*>'), '');
+    rankOffset = json['rank_offset'];
+    mid = json['mid'];
+    imageUrls = json['image_urls'];
+    id = json['id'];
+    categoryId = json['category_id'];
+    view = json['view'];
+    reply = json['reply'];
+    desc = json['desc'];
+    rankScore = json['rank_score'];
+    type = json['type'];
+    templateId = json['templateId'];
+    categoryName = json['category_name'];
+  }
+}

lib/models/user/history.dart

@@ -3,17 +3,23 @@ class HistoryData {
     this.cursor,
     this.tab,
     this.list,
+    this.page,
   });
 
   Cursor? cursor;
   List<HisTabItem>? tab;
   List<HisListItem>? list;
+  Map? page;
 
   HistoryData.fromJson(Map<String, dynamic> json) {
-    cursor = Cursor.fromJson(json['cursor']);
+    cursor = json['cursor'] != null ? Cursor.fromJson(json['cursor']) : null;
-    tab = json['tab'].map<HisTabItem>((e) => HisTabItem.fromJson(e)).toList();
+    tab = json['tab'] != null
-    list =
+        ? json['tab'].map<HisTabItem>((e) => HisTabItem.fromJson(e)).toList()
-        json['list'].map<HisListItem>((e) => HisListItem.fromJson(e)).toList();
+        : [];
+    list = json['list'] != null
+        ? json['list'].map<HisListItem>((e) => HisListItem.fromJson(e)).toList()
+        : [];
+    page = json['page'];
   }
 }
 
@@ -79,6 +85,7 @@ class HisListItem {
     this.kid,
     this.tagName,
     this.liveStatus,
+    this.checked,
   });
 
   String? title;
@@ -105,6 +112,7 @@ class HisListItem {
   int? kid;
   String? tagName;
   int? liveStatus;
+  bool? checked;
 
   HisListItem.fromJson(Map<String, dynamic> json) {
     title = json['title'];
@@ -131,6 +139,7 @@ class HisListItem {
     kid = json['kid'];
     tagName = json['tag_name'];
     liveStatus = json['live_status'];
+    checked = false;
   }
 }
 

lib/pages/about/index.dart

@@ -184,7 +184,7 @@ class AboutController extends GetxController {
 
   // 获取远程版本
   Future getRemoteApp() async {
-    var result = await Request().get(Api.latestApp);
+    var result = await Request().get(Api.latestApp, extra: {'ua': 'pc'});
     data = LatestDataModel.fromJson(result.data);
     remoteAppInfo = data;
     remoteVersion.value = data.tagName!;

lib/pages/bangumi/introduction/controller.dart

@@ -9,6 +9,7 @@ import 'package:pilipala/models/bangumi/info.dart';
 import 'package:pilipala/models/user/fav_folder.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/pages/video/detail/reply/index.dart';
+import 'package:pilipala/plugin/pl_player/models/play_repeat.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/id_utils.dart';
 import 'package:pilipala/utils/storage.dart';
@@ -21,7 +22,7 @@ class BangumiIntroController extends GetxController {
       ? int.parse(Get.parameters['seasonId']!)
       : null;
   var epId = Get.parameters['epId'] != null
-      ? int.parse(Get.parameters['epId']!)
+      ? int.tryParse(Get.parameters['epId']!)
       : null;
 
   // 是否预渲染 骨架屏
@@ -257,7 +258,7 @@ class BangumiIntroController extends GetxController {
     VideoDetailController videoDetailCtr =
         Get.find<VideoDetailController>(tag: Get.arguments['heroTag']);
     videoDetailCtr.bvid = bvid;
-    videoDetailCtr.cid = cid;
+    videoDetailCtr.cid.value = cid;
     videoDetailCtr.danmakuCid.value = cid;
     videoDetailCtr.queryVideoUrl();
     // 重新请求评论
@@ -292,4 +293,31 @@ class BangumiIntroController extends GetxController {
     }
     return result;
   }
+
+  /// 列表循环或者顺序播放时，自动播放下一个
+  void nextPlay() {
+    late List episodes;
+    if (bangumiDetail.value.episodes != null) {
+      episodes = bangumiDetail.value.episodes!;
+    }
+    VideoDetailController videoDetailCtr =
+        Get.find<VideoDetailController>(tag: Get.arguments['heroTag']);
+    int currentIndex =
+        episodes.indexWhere((e) => e.cid == videoDetailCtr.cid.value);
+    int nextIndex = currentIndex + 1;
+    PlayRepeat platRepeat = videoDetailCtr.plPlayerController.playRepeat;
+    // 列表循环
+    if (platRepeat == PlayRepeat.listCycle) {
+      if (nextIndex == episodes.length - 1) {
+        nextIndex = 0;
+      }
+    }
+    if (nextIndex <= episodes.length - 1 &&
+        platRepeat == PlayRepeat.listOrder) {}
+
+    int cid = episodes[nextIndex].cid!;
+    String bvid = episodes[nextIndex].bvid!;
+    int aid = episodes[nextIndex].aid!;
+    changeSeasonOrbangu(bvid, cid, aid);
+  }
 }

lib/pages/bangumi/introduction/view.dart

@@ -34,10 +34,12 @@ class BangumiIntroPanel extends StatefulWidget {
 
 class _BangumiIntroPanelState extends State<BangumiIntroPanel>
     with AutomaticKeepAliveClientMixin {
-  final BangumiIntroController bangumiIntroController =
+  late BangumiIntroController bangumiIntroController;
-      Get.put(BangumiIntroController(), tag: Get.arguments['heroTag']);
+  late VideoDetailController videoDetailCtr;
   BangumiInfoModel? bangumiDetail;
   late Future _futureBuilderFuture;
+  late int cid;
+  late String heroTag;
 
 // 添加页面缓存
   @override
@@ -46,10 +48,19 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
   @override
   void initState() {
     super.initState();
+    heroTag = Get.arguments['heroTag'];
+    cid = widget.cid!;
+    bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag);
+    videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
     bangumiIntroController.bangumiDetail.listen((value) {
       bangumiDetail = value;
     });
     _futureBuilderFuture = bangumiIntroController.queryBangumiIntro();
+    videoDetailCtr.cid.listen((p0) {
+      print('🐶🐶$p0');
+      cid = p0;
+      setState(() {});
+    });
   }
 
   @override
@@ -61,22 +72,25 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
         if (snapshot.connectionState == ConnectionState.done) {
           if (snapshot.data['status']) {
             // 请求成功
+
             return BangumiInfo(
               loadingStatus: false,
               bangumiDetail: bangumiDetail,
+              cid: cid,
             );
           } else {
             // 请求错误
-            return HttpError(
+            // return HttpError(
-              errMsg: snapshot.data['msg'],
+            //   errMsg: snapshot.data['msg'],
-              fn: () => Get.back(),
+            //   fn: () => Get.back(),
-            );
+            // );
+            return SizedBox();
           }
         } else {
           return BangumiInfo(
             loadingStatus: true,
             bangumiDetail: bangumiDetail,
-            cid: widget.cid,
+            cid: cid,
           );
         }
       },
@@ -117,6 +131,12 @@ class _BangumiInfoState extends State<BangumiInfo> {
     bangumiItem = bangumiIntroController.bangumiItem;
     sheetHeight = localCache.get('sheetHeight');
     cid = widget.cid!;
+    print('cid:  $cid');
+    videoDetailCtr.cid.listen((p0) {
+      cid = p0;
+      print('cid:  $cid');
+      setState(() {});
+    });
   }
 
   // 收藏
@@ -260,9 +280,15 @@ class _BangumiInfoState extends State<BangumiInfo> {
                                   children: [
                                     Text(
                                       !widget.loadingStatus
-                                          ? widget.bangumiDetail!.areas!
+                                          ? (widget.bangumiDetail!.areas!
-                                              .first['name']
+                                                  .isNotEmpty
-                                          : bangumiItem!.areas!.first['name'],
+                                              ? widget.bangumiDetail!.areas!
+                                                  .first['name']
+                                              : '')
+                                          : (bangumiItem!.areas!.isNotEmpty
+                                              ? bangumiItem!
+                                                  .areas!.first['name']
+                                              : ''),
                                       style: TextStyle(
                                         fontSize: 12,
                                         color: t.colorScheme.outline,

lib/pages/bangumi/widgets/bangumi_panel.dart

@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/models/bangumi/info.dart';
+import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/utils/storage.dart';
 
 class BangumiPanel extends StatefulWidget {
@@ -30,16 +32,28 @@ class _BangumiPanelState extends State<BangumiPanel> {
   dynamic userInfo;
   // 默认未开通
   int vipStatus = 0;
+  late int cid;
+  String heroTag = Get.arguments['heroTag'];
+  late final VideoDetailController videoDetailCtr;
 
   @override
   void initState() {
     super.initState();
-    currentIndex = widget.pages.indexWhere((e) => e.cid == widget.cid!);
+    cid = widget.cid!;
+    currentIndex = widget.pages.indexWhere((e) => e.cid == cid);
     scrollToIndex();
     userInfo = userInfoCache.get('userInfoCache');
     if (userInfo != null) {
       vipStatus = userInfo.vipStatus;
     }
+    videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
+
+    videoDetailCtr.cid.listen((p0) {
+      cid = p0;
+      setState(() {});
+      currentIndex = widget.pages.indexWhere((e) => e.cid == cid);
+      scrollToIndex();
+    });
   }
 
   @override

lib/pages/blacklist/index.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
@@ -60,7 +61,7 @@ class _BlackListPageState extends State<BlackListPage> {
         centerTitle: false,
         title: Obx(
           () => Text(
-            '黑名单管理 （${_blackListController.blackList.length} / 5000）',
+            '黑名单管理 - ${_blackListController.total.value}',
             style: Theme.of(context).textTheme.titleMedium,
           ),
         ),
@@ -104,10 +105,11 @@ class _BlackListPageState extends State<BlackListPage> {
                                 overflow: TextOverflow.ellipsis,
                               ),
                               dense: true,
-                              // trailing: TextButton(
+                              trailing: TextButton(
-                              //   onPressed: () {},
+                                onPressed: () => _blackListController
-                              //   child: const Text('移除'),
+                                    .removeBlack(list[index].mid),
-                              // ),
+                                child: const Text('移除'),
+                              ),
                             );
                           },
                         ),
@@ -136,6 +138,7 @@ class _BlackListPageState extends State<BlackListPage> {
 class BlackListController extends GetxController {
   int currentPage = 1;
   int pageSize = 50;
+  RxInt total = 0.obs;
   RxList<BlackListItem> blackList = [BlackListItem()].obs;
 
   Future queryBlacklist({type = 'init'}) async {
@@ -146,6 +149,7 @@ class BlackListController extends GetxController {
     if (result['status']) {
       if (type == 'init') {
         blackList.value = result['data'].list;
+        total.value = result['data'].total;
       } else {
         blackList.addAll(result['data'].list);
       }
@@ -154,4 +158,13 @@ class BlackListController extends GetxController {
     }
     return result;
   }
+
+  Future removeBlack(mid) async {
+    var result = await BlackHttp.removeBlack(fid: mid);
+    if (result['status']) {
+      blackList.removeWhere((e) => e.mid == mid);
+      total.value = total.value - 1;
+      SmartDialog.showToast(result['msg']);
+    }
+  }
 }

lib/pages/danmaku/controller.dart

@@ -10,22 +10,32 @@ class PlDanmakuController {
   // 按 6min 分段
   int segCount = 0;
   List<DmSegMobileReply> dmSegList = [];
-  int currentSegIndex = 0;
+  int currentSegIndex = 1;
   int currentDmIndex = 0;
 
   void calcSegment() {
+    dmSegList.clear();
+    // 视频分段数
     segCount = (videoDuration.inSeconds / (60 * 6)).ceil();
+    dmSegList = List<DmSegMobileReply>.generate(
+        segCount < 1 ? 1 : segCount, (index) => DmSegMobileReply());
+    // 当前分段
+    try {
+      currentSegIndex =
+          (playerController.position.value.inSeconds / (60 * 6)).ceil();
+      currentSegIndex = currentSegIndex < 1 ? 1 : currentSegIndex;
+    } catch (_) {}
   }
 
   Future<List<DmSegMobileReply>> queryDanmaku() async {
-    dmSegList.clear();
+    // dmSegList.clear();
-    for (int segIndex = 1; segIndex <= segCount; segIndex++) {
+    DmSegMobileReply result =
-      DmSegMobileReply result =
+        await DanmakaHttp.queryDanmaku(cid: cid, segmentIndex: currentSegIndex);
-          await DanmakaHttp.queryDanmaku(cid: cid, segmentIndex: segIndex);
+    if (result.elems.isNotEmpty) {
-      if (result.elems.isNotEmpty) {
+      result.elems.sort((a, b) => (a.progress).compareTo(b.progress));
-        result.elems.sort((a, b) => (a.progress).compareTo(b.progress));
+      // dmSegList.add(result);
-        dmSegList.add(result);
+      currentSegIndex = currentSegIndex < 1 ? 1 : currentSegIndex;
-      }
+      dmSegList[currentSegIndex - 1] = result;
     }
     if (dmSegList.isNotEmpty) {
       findClosestPositionIndex(playerController.position.value.inMilliseconds);

lib/pages/danmaku/view.dart

@@ -1,3 +1,4 @@
+import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
@@ -85,12 +86,20 @@ class _PlDanmakuState extends State<PlDanmaku> {
       _controller!.onResume();
       danmuPlayStatus = true;
     }
+    if (!playerController.isOpenDanmu.value) {
+      return;
+    }
     PlDanmakuController ctr = _plDanmakuController;
     int currentPosition = position.inMilliseconds;
     blockTypes = playerController.blockTypes;
-
+    // 根据position判断是否有已缓存弹幕。没有则请求对应段
-    if (!playerController.isOpenDanmu.value) {
+    int segIndex = (currentPosition / (6 * 60 * 1000)).ceil();
-      return;
+    segIndex = segIndex < 1 ? 1 : segIndex;
+    if (ctr.dmSegList[segIndex - 1].elems.isEmpty) {
+      ctr.currentSegIndex = segIndex;
+      EasyThrottle.throttle('follow', const Duration(seconds: 1), () {
+        ctr.queryDanmaku();
+      });
     }
     // 超出分段数返回
     if (ctr.currentSegIndex >= ctr.dmSegList.length) {
@@ -140,23 +149,30 @@ class _PlDanmakuState extends State<PlDanmaku> {
 
   @override
   Widget build(BuildContext context) {
-    return Obx(
+    return LayoutBuilder(builder: (context, box) {
-      () => AnimatedOpacity(
+      double initDuration = box.maxWidth / 12;
-        opacity: playerController.isOpenDanmu.value ? 1 : 0,
+      return Obx(
-        duration: const Duration(milliseconds: 100),
+        () => AnimatedOpacity(
-        child: DanmakuView(
+          opacity: playerController.isOpenDanmu.value ? 1 : 0,
-          createdController: (DanmakuController e) async {
+          duration: const Duration(milliseconds: 100),
-            widget.playerController.danmakuController = _controller = e;
+          child: DanmakuView(
-          },
+            createdController: (DanmakuController e) async {
-          option: DanmakuOption(
+              widget.playerController.danmakuController = _controller = e;
-            fontSize: 15 * fontSizeVal,
+            },
-            area: showArea,
+            option: DanmakuOption(
-            opacity: opacityVal,
+              fontSize: 15 * fontSizeVal,
-            duration: danmakuSpeedVal * widget.playerController.playbackSpeed,
+              area: showArea,
+              opacity: opacityVal,
+              hideTop: blockTypes.contains(5),
+              hideScroll: blockTypes.contains(2),
+              hideBottom: blockTypes.contains(4),
+              duration: initDuration /
+                  (danmakuSpeedVal * widget.playerController.playbackSpeed),
+            ),
+            statusChanged: (isPlaying) {},
           ),
-          statusChanged: (isPlaying) {},
         ),
-      ),
+      );
-    );
+    });
   }
 }

lib/pages/dynamics/controller.dart

@@ -149,10 +149,30 @@ class DynamicsController extends GetxController {
       case 'DYNAMIC_TYPE_ARTICLE':
         String title = item.modules.moduleDynamic.major.opus.title;
         String url = item.modules.moduleDynamic.major.opus.jumpUrl;
-        Get.toNamed(
+        if (url.contains('opus') || url.contains('read')) {
-          '/webview',
+          RegExp digitRegExp = RegExp(r'\d+');
-          parameters: {'url': 'https:$url', 'type': 'note', 'pageTitle': title},
+          Iterable<Match> matches = digitRegExp.allMatches(url);
-        );
+          String number = matches.first.group(0)!;
+          if (url.contains('read')) {
+            number = 'cv$number';
+          }
+          Get.toNamed('/htmlRender', parameters: {
+            'url': url.startsWith('//') ? url.split('//').last : url,
+            'title': title,
+            'id': number,
+            'dynamicType': url.split('//').last.split('/')[1]
+          });
+        } else {
+          Get.toNamed(
+            '/webview',
+            parameters: {
+              'url': 'https:$url',
+              'type': 'note',
+              'pageTitle': title
+            },
+          );
+        }
+
         break;
       case 'DYNAMIC_TYPE_PGC':
         print('番剧');

lib/pages/dynamics/deatil/controller.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/http/reply.dart';
@@ -17,6 +18,7 @@ class DynamicDetailController extends GetxController {
   RxString noMore = ''.obs;
   RxList<ReplyItemModel> replyList = [ReplyItemModel()].obs;
   RxInt acount = 0.obs;
+  final ScrollController scrollController = ScrollController();
 
   ReplySortType _sortType = ReplySortType.time;
   RxString sortTypeTitle = ReplySortType.time.titles.obs;

lib/pages/dynamics/deatil/view.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/skeleton/video_reply.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
@@ -9,7 +10,10 @@ import 'package:pilipala/models/common/reply_type.dart';
 import 'package:pilipala/pages/dynamics/deatil/index.dart';
 import 'package:pilipala/pages/dynamics/widgets/author_panel.dart';
 import 'package:pilipala/pages/video/detail/reply/widgets/reply_item.dart';
+import 'package:pilipala/pages/video/detail/replyNew/index.dart';
 import 'package:pilipala/pages/video/detail/replyReply/index.dart';
+import 'package:pilipala/utils/feed_back.dart';
+import 'package:pilipala/utils/id_utils.dart';
 
 import '../widgets/dynamic_panel.dart';
 
@@ -21,15 +25,18 @@ class DynamicDetailPage extends StatefulWidget {
   State<DynamicDetailPage> createState() => _DynamicDetailPageState();
 }
 
-class _DynamicDetailPageState extends State<DynamicDetailPage> {
+class _DynamicDetailPageState extends State<DynamicDetailPage>
-  late DynamicDetailController? _dynamicDetailController;
+    with TickerProviderStateMixin {
+  late DynamicDetailController _dynamicDetailController;
+  late AnimationController fabAnimationCtr;
   Future? _futureBuilderFuture;
   late StreamController<bool> titleStreamC; // appBar title
-  final ScrollController scrollController = ScrollController();
+  late ScrollController scrollController;
   bool _visibleTitle = false;
   String? action;
   // 回复类型
   late int type;
+  bool _isFabVisible = true;
 
   @override
   void initState() {
@@ -50,37 +57,30 @@ class _DynamicDetailPageState extends State<DynamicDetailPage> {
         }
       } catch (_) {}
     }
-    int commentType = Get.arguments['item'].basic!['comment_type'] ?? 11;
+    int commentType = 11;
+    try {
+      commentType = Get.arguments['item'].basic!['comment_type'];
+    } catch (_) {}
     type = (commentType == 0) ? 11 : commentType;
 
     action =
         Get.arguments.containsKey('action') ? Get.arguments['action'] : null;
     _dynamicDetailController =
         Get.put(DynamicDetailController(oid, type), tag: oid.toString());
-    _futureBuilderFuture = _dynamicDetailController!.queryReplyList();
+    _futureBuilderFuture = _dynamicDetailController.queryReplyList();
     titleStreamC = StreamController<bool>();
-    scrollController.addListener(_listen);
     if (action == 'comment') {
       _visibleTitle = true;
       titleStreamC.add(true);
     }
-  }
 
-  void _listen() async {
+    fabAnimationCtr = AnimationController(
-    if (scrollController.position.pixels >=
+      vsync: this,
-        scrollController.position.maxScrollExtent - 300) {
+      duration: const Duration(milliseconds: 300),
-      EasyThrottle.throttle('replylist', const Duration(seconds: 2), () {
+    );
-        _dynamicDetailController!.queryReplyList(reqType: 'onLoad');
+    fabAnimationCtr.forward();
-      });
+    // 滚动事件监听
-    }
+    scrollListener();
-
-    if (scrollController.offset > 55 && !_visibleTitle) {
-      _visibleTitle = true;
-      titleStreamC.add(true);
-    } else if (scrollController.offset <= 55 && _visibleTitle) {
-      _visibleTitle = false;
-      titleStreamC.add(false);
-    }
   }
 
   void replyReply(replyItem) {
@@ -107,9 +107,58 @@ class _DynamicDetailPageState extends State<DynamicDetailPage> {
     );
   }
 
+  void scrollListener() {
+    scrollController = _dynamicDetailController.scrollController;
+    scrollController.addListener(
+      () {
+        // 分页加载
+        if (scrollController.position.pixels >=
+            scrollController.position.maxScrollExtent - 300) {
+          EasyThrottle.throttle('replylist', const Duration(seconds: 2), () {
+            _dynamicDetailController.queryReplyList(reqType: 'onLoad');
+          });
+        }
+
+        // 标题
+        if (scrollController.offset > 55 && !_visibleTitle) {
+          _visibleTitle = true;
+          titleStreamC.add(true);
+        } else if (scrollController.offset <= 55 && _visibleTitle) {
+          _visibleTitle = false;
+          titleStreamC.add(false);
+        }
+
+        // fab按钮
+        final ScrollDirection direction =
+            scrollController.position.userScrollDirection;
+        if (direction == ScrollDirection.forward) {
+          _showFab();
+        } else if (direction == ScrollDirection.reverse) {
+          _hideFab();
+        }
+      },
+    );
+  }
+
+  void _showFab() {
+    if (!_isFabVisible) {
+      _isFabVisible = true;
+      fabAnimationCtr.forward();
+    }
+  }
+
+  void _hideFab() {
+    if (_isFabVisible) {
+      _isFabVisible = false;
+      fabAnimationCtr.reverse();
+    }
+  }
+
   @override
   void dispose() {
     scrollController.removeListener(() {});
+    fabAnimationCtr.dispose();
+    scrollController.dispose();
     super.dispose();
   }
 
@@ -128,7 +177,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage> {
             return AnimatedOpacity(
               opacity: snapshot.data ? 1 : 0,
               duration: const Duration(milliseconds: 300),
-              child: author(_dynamicDetailController!.item, context),
+              child: AuthorPanel(item: _dynamicDetailController.item),
             );
           },
         ),
@@ -136,155 +185,206 @@ class _DynamicDetailPageState extends State<DynamicDetailPage> {
       ),
       body: RefreshIndicator(
         onRefresh: () async {
-          await _dynamicDetailController!.queryReplyList();
+          await _dynamicDetailController.queryReplyList();
         },
-        child: CustomScrollView(
+        child: Stack(
-          controller: scrollController,
+          children: [
-          slivers: [
+            CustomScrollView(
-            if (action != 'comment')
+              controller: scrollController,
-              SliverToBoxAdapter(
+              slivers: [
-                child: DynamicPanel(
+                if (action != 'comment')
-                  item: _dynamicDetailController!.item,
+                  SliverToBoxAdapter(
-                  source: 'detail',
+                    child: DynamicPanel(
-                ),
+                      item: _dynamicDetailController.item,
-              ),
+                      source: 'detail',
-            SliverPersistentHeader(
-              delegate: _MySliverPersistentHeaderDelegate(
-                child: Container(
-                  decoration: BoxDecoration(
-                    color: Theme.of(context).colorScheme.surface,
-                    border: Border(
-                      top: BorderSide(
-                        width: 0.6,
-                        color: Theme.of(context).dividerColor.withOpacity(0.05),
-                      ),
                     ),
                   ),
-                  height: 45,
+                SliverPersistentHeader(
-                  padding: const EdgeInsets.only(left: 12, right: 6),
+                  delegate: _MySliverPersistentHeaderDelegate(
-                  child: Row(
+                    child: Container(
-                    children: [
+                      decoration: BoxDecoration(
-                      Obx(
+                        color: Theme.of(context).colorScheme.surface,
-                        () => AnimatedSwitcher(
+                        border: Border(
-                          duration: const Duration(milliseconds: 400),
+                          top: BorderSide(
-                          transitionBuilder:
+                            width: 0.6,
-                              (Widget child, Animation<double> animation) {
+                            color: Theme.of(context)
-                            return ScaleTransition(
+                                .dividerColor
-                                scale: animation, child: child);
+                                .withOpacity(0.05),
-                          },
-                          child: Text(
-                            '${_dynamicDetailController!.acount.value}',
-                            key: ValueKey<int>(
-                                _dynamicDetailController!.acount.value),
                           ),
                         ),
                       ),
-                      const Text('条回复'),
+                      height: 45,
-                      const Spacer(),
+                      padding: const EdgeInsets.only(left: 12, right: 6),
-                      SizedBox(
+                      child: Row(
-                        height: 35,
+                        children: [
-                        child: TextButton.icon(
+                          Obx(
-                          onPressed: () =>
+                            () => AnimatedSwitcher(
-                              _dynamicDetailController!.queryBySort(),
+                              duration: const Duration(milliseconds: 400),
-                          icon: const Icon(Icons.sort, size: 16),
+                              transitionBuilder:
-                          label: Obx(() => Text(
+                                  (Widget child, Animation<double> animation) {
-                                _dynamicDetailController!.sortTypeLabel.value,
+                                return ScaleTransition(
-                                style: const TextStyle(fontSize: 13),
+                                    scale: animation, child: child);
-                              )),
+                              },
-                        ),
+                              child: Text(
-                      )
+                                '${_dynamicDetailController.acount.value}',
-                    ],
+                                key: ValueKey<int>(
-                  ),
+                                    _dynamicDetailController.acount.value),
-                ),
-              ),
-              pinned: true,
-            ),
-            FutureBuilder(
-              future: _futureBuilderFuture,
-              builder: (context, snapshot) {
-                if (snapshot.connectionState == ConnectionState.done) {
-                  Map data = snapshot.data as Map;
-                  if (snapshot.data['status']) {
-                    // 请求成功
-                    return Obx(
-                      () => _dynamicDetailController!.replyList.isEmpty &&
-                              _dynamicDetailController!.isLoadingMore
-                          ? SliverList(
-                              delegate:
-                                  SliverChildBuilderDelegate((context, index) {
-                                return const VideoReplySkeleton();
-                              }, childCount: 8),
-                            )
-                          : SliverList(
-                              delegate: SliverChildBuilderDelegate(
-                                (context, index) {
-                                  if (index ==
-                                      _dynamicDetailController!
-                                          .replyList.length) {
-                                    return Container(
-                                      padding: EdgeInsets.only(
-                                          bottom: MediaQuery.of(context)
-                                              .padding
-                                              .bottom),
-                                      height: MediaQuery.of(context)
-                                              .padding
-                                              .bottom +
-                                          100,
-                                      child: Center(
-                                        child: Obx(
-                                          () => Text(
-                                            _dynamicDetailController!
-                                                .noMore.value,
-                                            style: TextStyle(
-                                              fontSize: 12,
-                                              color: Theme.of(context)
-                                                  .colorScheme
-                                                  .outline,
-                                            ),
-                                          ),
-                                        ),
-                                      ),
-                                    );
-                                  } else {
-                                    return ReplyItem(
-                                      replyItem: _dynamicDetailController!
-                                          .replyList[index],
-                                      showReplyRow: true,
-                                      replyLevel: '1',
-                                      replyReply: (replyItem) =>
-                                          replyReply(replyItem),
-                                      replyType: ReplyType.values[type],
-                                      addReply: (replyItem) {
-                                        _dynamicDetailController!
-                                            .replyList[index].replies!
-                                            .add(replyItem);
-                                      },
-                                    );
-                                  }
-                                },
-                                childCount:
-                                    _dynamicDetailController!.replyList.length +
-                                        1,
                               ),
                             ),
+                          ),
+                          const Text('条回复'),
+                          const Spacer(),
+                          SizedBox(
+                            height: 35,
+                            child: TextButton.icon(
+                              onPressed: () =>
+                                  _dynamicDetailController.queryBySort(),
+                              icon: const Icon(Icons.sort, size: 16),
+                              label: Obx(() => Text(
+                                    _dynamicDetailController
+                                        .sortTypeLabel.value,
+                                    style: const TextStyle(fontSize: 13),
+                                  )),
+                            ),
+                          )
+                        ],
+                      ),
+                    ),
+                  ),
+                  pinned: true,
+                ),
+                FutureBuilder(
+                  future: _futureBuilderFuture,
+                  builder: (context, snapshot) {
+                    if (snapshot.connectionState == ConnectionState.done) {
+                      Map data = snapshot.data as Map;
+                      if (snapshot.data['status']) {
+                        // 请求成功
+                        return Obx(
+                          () => _dynamicDetailController.replyList.isEmpty &&
+                                  _dynamicDetailController.isLoadingMore
+                              ? SliverList(
+                                  delegate: SliverChildBuilderDelegate(
+                                      (context, index) {
+                                    return const VideoReplySkeleton();
+                                  }, childCount: 8),
+                                )
+                              : SliverList(
+                                  delegate: SliverChildBuilderDelegate(
+                                    (context, index) {
+                                      if (index ==
+                                          _dynamicDetailController
+                                              .replyList.length) {
+                                        return Container(
+                                          padding: EdgeInsets.only(
+                                              bottom: MediaQuery.of(context)
+                                                  .padding
+                                                  .bottom),
+                                          height: MediaQuery.of(context)
+                                                  .padding
+                                                  .bottom +
+                                              100,
+                                          child: Center(
+                                            child: Obx(
+                                              () => Text(
+                                                _dynamicDetailController
+                                                    .noMore.value,
+                                                style: TextStyle(
+                                                  fontSize: 12,
+                                                  color: Theme.of(context)
+                                                      .colorScheme
+                                                      .outline,
+                                                ),
+                                              ),
+                                            ),
+                                          ),
+                                        );
+                                      } else {
+                                        return ReplyItem(
+                                          replyItem: _dynamicDetailController
+                                              .replyList[index],
+                                          showReplyRow: true,
+                                          replyLevel: '1',
+                                          replyReply: (replyItem) =>
+                                              replyReply(replyItem),
+                                          replyType: ReplyType.values[type],
+                                          addReply: (replyItem) {
+                                            _dynamicDetailController
+                                                .replyList[index].replies!
+                                                .add(replyItem);
+                                          },
+                                        );
+                                      }
+                                    },
+                                    childCount: _dynamicDetailController
+                                            .replyList.length +
+                                        1,
+                                  ),
+                                ),
+                        );
+                      } else {
+                        // 请求错误
+                        return HttpError(
+                          errMsg: data['msg'],
+                          fn: () => setState(() {}),
+                        );
+                      }
+                    } else {
+                      // 骨架屏
+                      return SliverList(
+                        delegate: SliverChildBuilderDelegate((context, index) {
+                          return const VideoReplySkeleton();
+                        }, childCount: 8),
+                      );
+                    }
+                  },
+                )
+              ],
+            ),
+            Positioned(
+              bottom: MediaQuery.of(context).padding.bottom + 14,
+              right: 14,
+              child: SlideTransition(
+                position: Tween<Offset>(
+                  begin: const Offset(0, 2),
+                  end: const Offset(0, 0),
+                ).animate(CurvedAnimation(
+                  parent: fabAnimationCtr,
+                  curve: Curves.easeInOut,
+                )),
+                child: FloatingActionButton(
+                  heroTag: null,
+                  onPressed: () {
+                    feedBack();
+                    showModalBottomSheet(
+                      context: context,
+                      isScrollControlled: true,
+                      builder: (BuildContext context) {
+                        return VideoReplyNewDialog(
+                          oid: _dynamicDetailController.oid ??
+                              IdUtils.bv2av(Get.parameters['bvid']!),
+                          root: 0,
+                          parent: 0,
+                          replyType: ReplyType.values[type],
+                        );
+                      },
+                    ).then(
+                      (value) => {
+                        // 完成评论，数据添加
+                        if (value != null && value['data'] != null)
+                          {
+                            _dynamicDetailController.replyList
+                                .add(value['data']),
+                            _dynamicDetailController.acount.value++
+                          }
+                      },
                     );
-                  } else {
+                  },
-                    // 请求错误
+                  tooltip: '评论动态',
-                    return HttpError(
+                  child: const Icon(Icons.reply),
-                      errMsg: data['msg'],
+                ),
-                      fn: () => setState(() {}),
+              ),
-                    );
+            ),
-                  }
-                } else {
-                  // 骨架屏
-                  return SliverList(
-                    delegate: SliverChildBuilderDelegate((context, index) {
-                      return const VideoReplySkeleton();
-                    }, childCount: 8),
-                  );
-                }
-              },
-            )
           ],
         ),
       ),

lib/pages/dynamics/widgets/additional_panel.dart

@@ -1,5 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/http/search.dart';
 
 /// TODO 点击跳转
 Widget addWidget(item, context, type, {floor = 1}) {
@@ -19,8 +22,27 @@ Widget addWidget(item, context, type, {floor = 1}) {
       : Theme.of(context).colorScheme.background;
   switch (type) {
     case 'ADDITIONAL_TYPE_UGC':
+      // 转发的投稿
       return InkWell(
-        onTap: () {},
+        onTap: () async {
+          String text = dynamicProperty[type].jumpUrl;
+          RegExp bvRegex = RegExp(r'BV[0-9A-Za-z]{10}', caseSensitive: false);
+          Iterable<Match> matches = bvRegex.allMatches(text);
+          if (matches.isNotEmpty) {
+            Match match = matches.first;
+            String bvid = match.group(0)!;
+            String cover = dynamicProperty[type].cover;
+            try {
+              int cid = await SearchHttp.ab2c(bvid: bvid);
+              Get.toNamed('/video?bvid=$bvid&cid=$cid',
+                  arguments: {'pic': cover, 'heroTag': bvid});
+            } catch (err) {
+              SmartDialog.showToast(err.toString());
+            }
+          } else {
+            print("No match found.");
+          }
+        },
         child: Container(
           padding:
               const EdgeInsets.only(left: 12, top: 8, right: 12, bottom: 8),
@@ -61,101 +83,111 @@ Widget addWidget(item, context, type, {floor = 1}) {
       );
     case 'ADDITIONAL_TYPE_RESERVE':
       return dynamicProperty[type].state != -1
-          ? Padding(
+          ? dynamicProperty[type].title != null
-              padding: const EdgeInsets.only(top: 8),
+              ? Padding(
-              child: InkWell(
+                  padding: const EdgeInsets.only(top: 8),
-                onTap: () {},
+                  child: InkWell(
-                child: Container(
+                    onTap: () {},
-                  width: double.infinity,
+                    child: Container(
-                  padding: const EdgeInsets.only(
+                      width: double.infinity,
-                      left: 12, top: 10, right: 12, bottom: 10),
+                      padding: const EdgeInsets.only(
-                  color: bgColor,
+                          left: 12, top: 10, right: 12, bottom: 10),
-                  child: Column(
+                      color: bgColor,
-                    crossAxisAlignment: CrossAxisAlignment.start,
+                      child: Column(
-                    children: [
+                        crossAxisAlignment: CrossAxisAlignment.start,
-                      Text(
+                        children: [
-                        dynamicProperty[type].title,
+                          Text(
-                        maxLines: 1,
+                            dynamicProperty[type].title,
-                        overflow: TextOverflow.ellipsis,
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
+                          ),
+                          const SizedBox(height: 1),
+                          Text.rich(
+                            TextSpan(
+                              style: TextStyle(
+                                  color: Theme.of(context).colorScheme.outline,
+                                  fontSize: Theme.of(context)
+                                      .textTheme
+                                      .labelMedium!
+                                      .fontSize),
+                              children: [
+                                if (dynamicProperty[type].desc1 != null)
+                                  TextSpan(
+                                      text:
+                                          dynamicProperty[type].desc1['text']),
+                                const TextSpan(text: '  '),
+                                if (dynamicProperty[type].desc2 != null)
+                                  TextSpan(
+                                      text:
+                                          dynamicProperty[type].desc2['text']),
+                              ],
+                            ),
+                          )
+                        ],
                       ),
-                      const SizedBox(height: 1),
+                      // TextButton(onPressed: () {}, child: Text('123'))
-                      Text.rich(
-                        TextSpan(
-                          style: TextStyle(
-                              color: Theme.of(context).colorScheme.outline,
-                              fontSize: Theme.of(context)
-                                  .textTheme
-                                  .labelMedium!
-                                  .fontSize),
-                          children: [
-                            TextSpan(text: dynamicProperty[type].desc1['text']),
-                            const TextSpan(text: '  '),
-                            TextSpan(text: dynamicProperty[type].desc2['text']),
-                          ],
-                        ),
-                      )
-                    ],
-                  ),
-                  // TextButton(onPressed: () {}, child: Text('123'))
-                ),
-              ),
-            )
-          : const SizedBox();
-    case 'ADDITIONAL_TYPE_GOODS':
-      return Padding(
-          padding: const EdgeInsets.only(top: 6),
-          child: InkWell(
-            onTap: () {},
-            child: Container(
-              padding:
-                  const EdgeInsets.only(left: 12, top: 8, right: 12, bottom: 8),
-              decoration: BoxDecoration(
-                color: bgColor,
-                borderRadius: const BorderRadius.all(Radius.circular(6)),
-              ),
-              child: Row(
-                children: [
-                  NetworkImgLayer(
-                    width: 75,
-                    height: 75,
-                    src: dynamicProperty[type].items.first.cover,
-                  ),
-                  const SizedBox(width: 10),
-                  Expanded(
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      mainAxisAlignment: MainAxisAlignment.start,
-                      children: [
-                        Text(
-                          dynamicProperty[type].items.first.name,
-                          maxLines: 1,
-                          overflow: TextOverflow.ellipsis,
-                        ),
-                        Text(
-                          dynamicProperty[type].items.first.brief,
-                          maxLines: 1,
-                          style: TextStyle(
-                            color: Theme.of(context).colorScheme.outline,
-                            fontSize: Theme.of(context)
-                                .textTheme
-                                .labelMedium!
-                                .fontSize,
-                          ),
-                        ),
-                        const SizedBox(height: 2),
-                        Text(
-                          dynamicProperty[type].items.first.price,
-                          style: TextStyle(
-                            color: Theme.of(context).colorScheme.primary,
-                          ),
-                        ),
-                      ],
                     ),
                   ),
-                ],
+                )
-              ),
+              : const SizedBox()
-            ),
+          : const SizedBox();
-          ));
+    case 'ADDITIONAL_TYPE_GOODS':
+      // 商品
+      return const SizedBox();
+    // return Padding(
+    //     padding: const EdgeInsets.only(top: 6),
+    //     child: InkWell(
+    //       onTap: () {},
+    //       child: Container(
+    //         padding:
+    //             const EdgeInsets.only(left: 12, top: 8, right: 12, bottom: 8),
+    //         decoration: BoxDecoration(
+    //           color: bgColor,
+    //           borderRadius: const BorderRadius.all(Radius.circular(6)),
+    //         ),
+    //         child: Row(
+    //           children: [
+    //             NetworkImgLayer(
+    //               width: 75,
+    //               height: 75,
+    //               src: dynamicProperty[type].items.first.cover,
+    //             ),
+    //             const SizedBox(width: 10),
+    //             Expanded(
+    //               child: Column(
+    //                 crossAxisAlignment: CrossAxisAlignment.start,
+    //                 mainAxisAlignment: MainAxisAlignment.start,
+    //                 children: [
+    //                   Text(
+    //                     dynamicProperty[type].items.first.name,
+    //                     maxLines: 1,
+    //                     overflow: TextOverflow.ellipsis,
+    //                   ),
+    //                   Text(
+    //                     dynamicProperty[type].items.first.brief,
+    //                     maxLines: 1,
+    //                     style: TextStyle(
+    //                       color: Theme.of(context).colorScheme.outline,
+    //                       fontSize: Theme.of(context)
+    //                           .textTheme
+    //                           .labelMedium!
+    //                           .fontSize,
+    //                     ),
+    //                   ),
+    //                   const SizedBox(height: 2),
+    //                   Text(
+    //                     dynamicProperty[type].items.first.price,
+    //                     style: TextStyle(
+    //                       color: Theme.of(context).colorScheme.primary,
+    //                     ),
+    //                   ),
+    //                 ],
+    //               ),
+    //             ),
+    //           ],
+    //         ),
+    //       ),
+    //     ),);
     case 'ADDITIONAL_TYPE_MATCH':
       return const SizedBox();
     case 'ADDITIONAL_TYPE_COMMON':

lib/pages/dynamics/widgets/author_panel.dart

@@ -1,65 +1,159 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/http/user.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/utils.dart';
 
-Widget author(item, context) {
+class AuthorPanel extends StatelessWidget {
-  String heroTag = Utils.makeHeroTag(item.modules.moduleAuthor.mid);
+  final dynamic item;
-  return Row(
+  const AuthorPanel({super.key, required this.item});
-    children: [
+
-      GestureDetector(
+  @override
-        onTap: () {
+  Widget build(BuildContext context) {
-          feedBack();
+    String heroTag = Utils.makeHeroTag(item.modules.moduleAuthor.mid);
-          Get.toNamed(
+    return Row(
-            '/member?mid=${item.modules.moduleAuthor.mid}',
+      children: [
-            arguments: {
+        GestureDetector(
-              'face': item.modules.moduleAuthor.face,
+          onTap: () {
-              'heroTag': heroTag
+            feedBack();
-            },
+            Get.toNamed(
-          );
+              '/member?mid=${item.modules.moduleAuthor.mid}',
-        },
+              arguments: {
-        child: Hero(
+                'face': item.modules.moduleAuthor.face,
-          tag: heroTag,
+                'heroTag': heroTag
-          child: NetworkImgLayer(
+              },
-            width: 40,
+            );
-            height: 40,
+          },
-            type: 'avatar',
+          child: Hero(
-            src: item.modules.moduleAuthor.face,
+            tag: heroTag,
+            child: NetworkImgLayer(
+              width: 40,
+              height: 40,
+              type: 'avatar',
+              src: item.modules.moduleAuthor.face,
+            ),
           ),
         ),
-      ),
+        const SizedBox(width: 10),
-      const SizedBox(width: 10),
+        Column(
-      Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
-        crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
-        children: [
+            Text(
-          Text(
+              item.modules.moduleAuthor.name,
-            item.modules.moduleAuthor.name,
+              style: TextStyle(
-            style: TextStyle(
+                color: item.modules.moduleAuthor!.vip != null &&
-              color: item.modules.moduleAuthor!.vip != null &&
+                        item.modules.moduleAuthor!.vip['status'] > 0
-                      item.modules.moduleAuthor!.vip['status'] > 0
+                    ? const Color.fromARGB(255, 251, 100, 163)
-                  ? const Color.fromARGB(255, 251, 100, 163)
+                    : Theme.of(context).colorScheme.onBackground,
-                  : Theme.of(context).colorScheme.onBackground,
+                fontSize: Theme.of(context).textTheme.titleSmall!.fontSize,
-              fontSize: Theme.of(context).textTheme.titleSmall!.fontSize,
+              ),
+            ),
+            DefaultTextStyle.merge(
+              style: TextStyle(
+                color: Theme.of(context).colorScheme.outline,
+                fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
+              ),
+              child: Row(
+                children: [
+                  Text(item.modules.moduleAuthor.pubTime),
+                  if (item.modules.moduleAuthor.pubTime != '' &&
+                      item.modules.moduleAuthor.pubAction != '')
+                    const Text(' '),
+                  Text(item.modules.moduleAuthor.pubAction),
+                ],
+              ),
+            )
+          ],
+        ),
+        const Spacer(),
+        if (item.type == 'DYNAMIC_TYPE_AV')
+          SizedBox(
+            width: 32,
+            height: 32,
+            child: IconButton(
+              style: ButtonStyle(
+                padding: MaterialStateProperty.all(EdgeInsets.zero),
+              ),
+              onPressed: () {
+                showModalBottomSheet(
+                  context: context,
+                  useRootNavigator: true,
+                  isScrollControlled: true,
+                  builder: (context) {
+                    return MorePanel(item: item);
+                  },
+                );
+              },
+              icon: const Icon(Icons.more_vert_outlined, size: 18),
             ),
           ),
-          DefaultTextStyle.merge(
+      ],
-            style: TextStyle(
+    );
-              color: Theme.of(context).colorScheme.outline,
+  }
-              fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
+}
+
+class MorePanel extends StatelessWidget {
+  final dynamic item;
+  const MorePanel({super.key, required this.item});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
+      // clipBehavior: Clip.hardEdge,
+      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))),
+                ),
+              ),
             ),
-            child: Row(
+          ),
-              children: [
+          ListTile(
-                Text(item.modules.moduleAuthor.pubTime),
+            onTap: () async {
-                if (item.modules.moduleAuthor.pubTime != '' &&
+              try {
-                    item.modules.moduleAuthor.pubAction != '')
+                String bvid = item.modules.moduleDynamic.major.archive.bvid;
-                  const Text(' '),
+                var res = await UserHttp.toViewLater(bvid: bvid);
-                Text(item.modules.moduleAuthor.pubAction),
+                SmartDialog.showToast(res['msg']);
-              ],
+                Get.back();
+              } catch (err) {
+                SmartDialog.showToast('出错了：${err.toString()}');
+              }
+            },
+            minLeadingWidth: 0,
+            // dense: true,
+            leading: const Icon(Icons.watch_later_outlined, size: 19),
+            title: Text(
+              '稍后再看',
+              style: Theme.of(context).textTheme.titleSmall,
             ),
-          )
+          ),
+          const Divider(thickness: 0.1, height: 1),
+          ListTile(
+            onTap: () => Get.back(),
+            minLeadingWidth: 0,
+            dense: true,
+            title: Text(
+              '取消',
+              style: TextStyle(color: Theme.of(context).colorScheme.outline),
+              textAlign: TextAlign.center,
+            ),
+          ),
         ],
       ),
-    ],
+    );
-  );
+  }
 }

lib/pages/dynamics/widgets/content_panel.dart

@@ -1,42 +1,183 @@
 // 内容
 import 'package:flutter/material.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/models/dynamics/result.dart';
+import 'package:pilipala/pages/preview/index.dart';
 
 import 'rich_node_panel.dart';
 
-Widget content(item, context, source) {
+// ignore: must_be_immutable
-  TextStyle authorStyle =
+class Content extends StatefulWidget {
-      TextStyle(color: Theme.of(context).colorScheme.primary);
+  dynamic item;
-  return Container(
+  String? source;
-    width: double.infinity,
+  Content({
-    padding: const EdgeInsets.fromLTRB(12, 0, 12, 6),
+    super.key,
-    child: Column(
+    this.item,
-      crossAxisAlignment: CrossAxisAlignment.start,
+    this.source,
-      children: [
+  });
-        if (item.modules.moduleDynamic.topic != null) ...[
+
-          GestureDetector(
+  @override
-            child: Text(
+  State<Content> createState() => _ContentState();
-              '#${item.modules.moduleDynamic.topic.name}',
+}
-              style: authorStyle,
+
-            ),
+class _ContentState extends State<Content> {
-          ),
+  late bool hasPics;
-        ],
+  List<OpusPicsModel> pics = [];
-        IgnorePointer(
+
-          // 禁用SelectableRegion的触摸交互功能
+  @override
-          ignoring: source == 'detail' ? false : true,
+  void initState() {
-          child: SelectableRegion(
+    super.initState();
-            magnifierConfiguration: const TextMagnifierConfiguration(),
+    hasPics = widget.item.modules.moduleDynamic.major != null &&
-            focusNode: FocusNode(),
+        widget.item.modules.moduleDynamic.major.opus != null &&
-            selectionControls: MaterialTextSelectionControls(),
+        widget.item.modules.moduleDynamic.major.opus.pics.isNotEmpty;
-            child: Text.rich(
+    if (hasPics) {
-              /// fix 默认20px高度
+      pics = widget.item.modules.moduleDynamic.major.opus.pics;
-              style: const TextStyle(height: 0),
+    }
-              richNode(item, context),
+  }
-              maxLines: source == 'detail' ? 999 : 3,
+
-              overflow: TextOverflow.ellipsis,
+  InlineSpan picsNodes() {
-            ),
+    List<InlineSpan> spanChilds = [];
+    int len = pics.length;
+    List<String> picList = [];
+
+    if (len == 1) {
+      OpusPicsModel pictureItem = pics.first;
+      picList.add(pictureItem.url!);
+      spanChilds.add(const TextSpan(text: '\n'));
+      spanChilds.add(
+        WidgetSpan(
+          child: LayoutBuilder(
+            builder: (context, BoxConstraints box) {
+              return GestureDetector(
+                onTap: () {
+                  showDialog(
+                    useSafeArea: false,
+                    context: context,
+                    builder: (context) {
+                      return ImagePreview(initialPage: 0, imgList: picList);
+                    },
+                  );
+                },
+                child: Padding(
+                  padding: const EdgeInsets.only(top: 4),
+                  child: NetworkImgLayer(
+                    src: pictureItem.url,
+                    width: box.maxWidth / 2,
+                    height: box.maxWidth *
+                        0.5 *
+                        (pictureItem.height != null && pictureItem.width != null
+                            ? pictureItem.height! / pictureItem.width!
+                            : 1),
+                  ),
+                ),
+              );
+            },
           ),
         ),
-      ],
+      );
-    ),
+    }
-  );
+    if (len > 1) {
+      List<Widget> list = [];
+      for (var i = 0; i < len; i++) {
+        picList.add(pics[i].url!);
+        list.add(
+          LayoutBuilder(
+            builder: (context, BoxConstraints box) {
+              return GestureDetector(
+                onTap: () {
+                  showDialog(
+                    useSafeArea: false,
+                    context: context,
+                    builder: (context) {
+                      return ImagePreview(initialPage: i, imgList: picList);
+                    },
+                  );
+                },
+                child: NetworkImgLayer(
+                  src: pics[i].url,
+                  width: box.maxWidth,
+                  height: box.maxWidth,
+                ),
+              );
+            },
+          ),
+        );
+      }
+      spanChilds.add(
+        WidgetSpan(
+          child: LayoutBuilder(
+            builder: (context, BoxConstraints box) {
+              double maxWidth = box.maxWidth;
+              double crossCount = len < 3 ? 2 : 3;
+              double height = maxWidth /
+                      crossCount *
+                      (len % crossCount == 0
+                          ? len ~/ crossCount
+                          : len ~/ crossCount + 1) +
+                  6;
+              return Container(
+                padding: const EdgeInsets.only(top: 6),
+                height: height,
+                child: GridView.count(
+                  padding: EdgeInsets.zero,
+                  physics: const NeverScrollableScrollPhysics(),
+                  crossAxisCount: crossCount.toInt(),
+                  mainAxisSpacing: 4.0,
+                  crossAxisSpacing: 4.0,
+                  childAspectRatio: 1,
+                  children: list,
+                ),
+              );
+            },
+          ),
+        ),
+      );
+    }
+    return TextSpan(
+      children: spanChilds,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    TextStyle authorStyle =
+        TextStyle(color: Theme.of(context).colorScheme.primary);
+
+    return Container(
+      width: double.infinity,
+      padding: const EdgeInsets.fromLTRB(12, 0, 12, 6),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          if (widget.item.modules.moduleDynamic.topic != null) ...[
+            GestureDetector(
+              child: Text(
+                '#${widget.item.modules.moduleDynamic.topic.name}',
+                style: authorStyle,
+              ),
+            ),
+          ],
+          IgnorePointer(
+            // 禁用SelectableRegion的触摸交互功能
+            ignoring: widget.source == 'detail' ? false : true,
+            child: SelectableRegion(
+              magnifierConfiguration: const TextMagnifierConfiguration(),
+              focusNode: FocusNode(),
+              selectionControls: MaterialTextSelectionControls(),
+              child: Text.rich(
+                /// fix 默认20px高度
+                style: const TextStyle(height: 0),
+                richNode(widget.item, context),
+                maxLines: widget.source == 'detail' ? 999 : 3,
+                overflow: TextOverflow.ellipsis,
+              ),
+            ),
+          ),
+          if (hasPics) ...[
+            Text.rich(picsNodes()),
+          ]
+        ],
+      ),
+    );
+  }
 }

lib/pages/dynamics/widgets/dynamic_panel.dart

@@ -39,11 +39,11 @@ class DynamicPanel extends StatelessWidget {
             children: [
               Padding(
                 padding: const EdgeInsets.fromLTRB(12, 12, 12, 8),
-                child: author(item, context),
+                child: AuthorPanel(item: item),
               ),
               if (item!.modules!.moduleDynamic!.desc != null ||
                   item!.modules!.moduleDynamic!.major != null)
-                content(item, context, source),
+                Content(item: item, source: source),
               forWard(item, context, _dynamicsController, source),
               const SizedBox(height: 2),
               if (source == null) ActionPanel(item: item),

lib/pages/dynamics/widgets/rich_node_panel.dart

@@ -27,8 +27,9 @@ InlineSpan richNode(item, context) {
     } else {
       for (var i in richTextNodes) {
         /// fix 渲染专栏时内容会重复
-        if (item.modules.moduleDynamic.major.opus.title == null &&
+        // if (item.modules.moduleDynamic.major.opus.title == null &&
-            i.type == 'RICH_TEXT_NODE_TYPE_TEXT') {
+        //     i.type == 'RICH_TEXT_NODE_TYPE_TEXT') {
+        if (i.type == 'RICH_TEXT_NODE_TYPE_TEXT') {
           spanChilds.add(
               TextSpan(text: i.origText, style: const TextStyle(height: 1.65)));
         }
@@ -109,16 +110,18 @@ InlineSpan richNode(item, context) {
               alignment: PlaceholderAlignment.middle,
               child: GestureDetector(
                 onTap: () {
-                  String dynamicId = item.basic['comment_id_str'];
+                  try {
-                  Get.toNamed(
+                    String dynamicId = item.basic['comment_id_str'];
-                    '/webview',
+                    Get.toNamed(
-                    parameters: {
+                      '/webview',
-                      'url':
+                      parameters: {
-                          'https://t.bilibili.com/vote/h5/index/#/result?vote_id=${i.rid}&dynamic_id=$dynamicId&isWeb=1',
+                        'url':
-                      'type': 'vote',
+                            'https://t.bilibili.com/vote/h5/index/#/result?vote_id=${i.rid}&dynamic_id=$dynamicId&isWeb=1',
-                      'pageTitle': '投票'
+                        'type': 'vote',
-                    },
+                        'pageTitle': '投票'
-                  );
+                      },
+                    );
+                  } catch (_) {}
                 },
                 child: Text(
                   '投票：${i.text}',
@@ -193,116 +196,118 @@ InlineSpan richNode(item, context) {
           );
         }
       }
-      if (contentType == 'major' &&
+      // if (contentType == 'major' &&
-          item.modules.moduleDynamic.major.opus.pics.isNotEmpty) {
+      //     item.modules.moduleDynamic.major.opus.pics.isNotEmpty) {
-        // 图片可能跟其他widget重复渲染
+      //   // 图片可能跟其他widget重复渲染
-        List<OpusPicsModel> pics = item.modules.moduleDynamic.major.opus.pics;
+      //   List<OpusPicsModel> pics = item.modules.moduleDynamic.major.opus.pics;
-        int len = pics.length;
+      //   int len = pics.length;
-        List<String> picList = [];
+      //   List<String> picList = [];
 
-        if (len == 1) {
+      //   if (len == 1) {
-          OpusPicsModel pictureItem = pics.first;
+      //     OpusPicsModel pictureItem = pics.first;
-          picList.add(pictureItem.url!);
+      //     picList.add(pictureItem.url!);
-          spanChilds.add(const TextSpan(text: '\n'));
+      //     spanChilds.add(const TextSpan(text: '\n'));
-          spanChilds.add(
+      //     spanChilds.add(
-            WidgetSpan(
+      //       WidgetSpan(
-              child: LayoutBuilder(
+      //         child: LayoutBuilder(
-                builder: (context, BoxConstraints box) {
+      //           builder: (context, BoxConstraints box) {
-                  return GestureDetector(
+      //             return GestureDetector(
-                    onTap: () {
+      //               onTap: () {
-                      showDialog(
+      //                 showDialog(
-                        useSafeArea: false,
+      //                   useSafeArea: false,
-                        context: context,
+      //                   context: context,
-                        builder: (context) {
+      //                   builder: (context) {
-                          return ImagePreview(initialPage: 0, imgList: picList);
+      //                     return ImagePreview(initialPage: 0, imgList: picList);
-                        },
+      //                   },
-                      );
+      //                 );
-                    },
+      //               },
-                    child: Padding(
+      //               child: Padding(
-                      padding: const EdgeInsets.only(top: 4),
+      //                 padding: const EdgeInsets.only(top: 4),
-                      child: NetworkImgLayer(
+      //                 child: NetworkImgLayer(
-                        src: pictureItem.url,
+      //                   src: pictureItem.url,
-                        width: box.maxWidth / 2,
+      //                   width: box.maxWidth / 2,
-                        height: box.maxWidth *
+      //                   height: box.maxWidth *
-                            0.5 *
+      //                       0.5 *
-                            pictureItem.height! /
+      //                       (pictureItem.height != null &&
-                            pictureItem.width!,
+      //                               pictureItem.width != null
-                      ),
+      //                           ? pictureItem.height! / pictureItem.width!
-                    ),
+      //                           : 1),
-                  );
+      //                 ),
-                },
+      //               ),
-              ),
+      //             );
-            ),
+      //           },
-          );
+      //         ),
-        }
+      //       ),
-        if (len > 1) {
+      //     );
-          List<Widget> list = [];
+      //   }
-          for (var i = 0; i < len; i++) {
+      // if (len > 1) {
-            picList.add(pics[i].url!);
+      //   List<Widget> list = [];
-            list.add(
+      //   for (var i = 0; i < len; i++) {
-              LayoutBuilder(
+      //     picList.add(pics[i].url!);
-                builder: (context, BoxConstraints box) {
+      //     list.add(
-                  return GestureDetector(
+      //       LayoutBuilder(
-                    onTap: () {
+      //         builder: (context, BoxConstraints box) {
-                      showDialog(
+      //           return GestureDetector(
-                        useSafeArea: false,
+      //             onTap: () {
-                        context: context,
+      //               showDialog(
-                        builder: (context) {
+      //                 useSafeArea: false,
-                          return ImagePreview(initialPage: i, imgList: picList);
+      //                 context: context,
-                        },
+      //                 builder: (context) {
-                      );
+      //                   return ImagePreview(initialPage: i, imgList: picList);
-                    },
+      //                 },
-                    child: NetworkImgLayer(
+      //               );
-                      src: pics[i].url,
+      //             },
-                      width: box.maxWidth,
+      //             child: NetworkImgLayer(
-                      height: box.maxWidth,
+      //               src: pics[i].url,
-                    ),
+      //               width: box.maxWidth,
-                  );
+      //               height: box.maxWidth,
-                },
+      //             ),
-              ),
+      //           );
-            );
+      //         },
-          }
+      //       ),
-          spanChilds.add(
+      //     );
-            WidgetSpan(
+      //   }
-              child: LayoutBuilder(
+      //   spanChilds.add(
-                builder: (context, BoxConstraints box) {
+      //     WidgetSpan(
-                  double maxWidth = box.maxWidth;
+      //       child: LayoutBuilder(
-                  double crossCount = len < 3 ? 2 : 3;
+      //         builder: (context, BoxConstraints box) {
-                  double height = maxWidth /
+      //           double maxWidth = box.maxWidth;
-                          crossCount *
+      //           double crossCount = len < 3 ? 2 : 3;
-                          (len % crossCount == 0
+      //           double height = maxWidth /
-                              ? len ~/ crossCount
+      //                   crossCount *
-                              : len ~/ crossCount + 1) +
+      //                   (len % crossCount == 0
-                      6;
+      //                       ? len ~/ crossCount
-                  return Container(
+      //                       : len ~/ crossCount + 1) +
-                    padding: const EdgeInsets.only(top: 6),
+      //               6;
-                    height: height,
+      //           return Container(
-                    child: GridView.count(
+      //             padding: const EdgeInsets.only(top: 6),
-                      padding: EdgeInsets.zero,
+      //             height: height,
-                      physics: const NeverScrollableScrollPhysics(),
+      //             child: GridView.count(
-                      crossAxisCount: crossCount.toInt(),
+      //               padding: EdgeInsets.zero,
-                      mainAxisSpacing: 4.0,
+      //               physics: const NeverScrollableScrollPhysics(),
-                      crossAxisSpacing: 4.0,
+      //               crossAxisCount: crossCount.toInt(),
-                      childAspectRatio: 1,
+      //               mainAxisSpacing: 4.0,
-                      children: list,
+      //               crossAxisSpacing: 4.0,
-                    ),
+      //               childAspectRatio: 1,
-                  );
+      //               children: list,
-                },
+      //             ),
-              ),
+      //           );
-            ),
+      //         },
-          );
+      //       ),
-        }
+      //     ),
-        // spanChilds.add(
+      //   );
-        //   WidgetSpan(
+      // }
-        //     child: NetworkImgLayer(
+      // spanChilds.add(
-        //       src: pics.first.url,
+      //   WidgetSpan(
-        //       type: 'emote',
+      //     child: NetworkImgLayer(
-        //       width: 100,
+      //       src: pics.first.url,
-        //       height: 200,
+      //       type: 'emote',
-        //     ),
+      //       width: 100,
-        //   ),
+      //       height: 200,
-        // );
+      //     ),
-      }
+      //   ),
+      // );
+      // }
       return TextSpan(
         children: spanChilds,
       );

lib/pages/dynamics/widgets/up_panel.dart

@@ -91,7 +91,10 @@ class _UpPanelState extends State<UpPanel> {
                 ),
                 Material(
                   child: InkWell(
-                    onTap: () => {feedBack(), Get.toNamed('/follow')},
+                    onTap: () => {
+                      feedBack(),
+                      Get.toNamed('/follow?mid=${userInfo.mid}')
+                    },
                     child: Container(
                       height: 100,
                       padding: const EdgeInsets.only(left: 10, right: 10),

lib/pages/fan/view.dart

@@ -16,13 +16,16 @@ class FansPage extends StatefulWidget {
 }
 
 class _FansPageState extends State<FansPage> {
-  final FansController _fansController = Get.put(FansController());
+  late String mid;
+  late FansController _fansController;
   final ScrollController scrollController = ScrollController();
   Future? _futureBuilderFuture;
 
   @override
   void initState() {
     super.initState();
+    mid = Get.parameters['mid']!;
+    _fansController = Get.put(FansController(), tag: mid);
     _futureBuilderFuture = _fansController.queryFans('init');
     scrollController.addListener(
       () async {

lib/pages/fav/view.dart

@@ -44,6 +44,14 @@ class _FavPageState extends State<FavPage> {
           '我的收藏',
           style: Theme.of(context).textTheme.titleMedium,
         ),
+        actions: [
+          IconButton(
+            onPressed: () => Get.toNamed(
+                '/favSearch?searchType=1&mediaId=${_favController.favFolderData.value.list!.first.id}'),
+            icon: const Icon(Icons.search_outlined),
+          ),
+          const SizedBox(width: 6),
+        ],
       ),
       body: FutureBuilder(
         future: _futureBuilderFuture,

lib/pages/favDetail/view.dart

@@ -92,13 +92,18 @@ class _FavDetailPageState extends State<FavDetailPage> {
                 );
               },
             ),
-            // actions: [
+            actions: [
-            //   IconButton(
+              IconButton(
-            //     onPressed: () {},
+                onPressed: () => Get.toNamed(
-            //     icon: const Icon(Icons.more_vert),
+                    '/favSearch?searchType=0&mediaId=${Get.parameters['mediaId']!}'),
-            //   ),
+                icon: const Icon(Icons.search_outlined),
-            //   const SizedBox(width: 4)
+              ),
-            // ],
+              //   IconButton(
+              //     onPressed: () {},
+              //     icon: const Icon(Icons.more_vert),
+              //   ),
+              const SizedBox(width: 6),
+            ],
             flexibleSpace: FlexibleSpaceBar(
               background: Container(
                 decoration: BoxDecoration(

lib/pages/fav_search/controller.dart

@@ -0,0 +1,75 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/http/user.dart';
+import 'package:pilipala/models/user/fav_detail.dart';
+
+class FavSearchController extends GetxController {
+  final ScrollController scrollController = ScrollController();
+  Rx<TextEditingController> controller = TextEditingController().obs;
+  final FocusNode searchFocusNode = FocusNode();
+  RxString searchKeyWord = ''.obs; // 搜索词
+  String hintText = '请输入已收藏视频名称'; // 默认
+  RxBool loadingStatus = false.obs; // 加载状态
+  RxString loadingText = '加载中...'.obs; // 加载提示
+  bool hasMore = false;
+  late int searchType;
+  late int mediaId;
+
+  int currentPage = 1; // 当前页
+  int count = 0; // 总数
+  RxList<FavDetailItemData> favList = <FavDetailItemData>[].obs;
+
+  @override
+  void onInit() {
+    super.onInit();
+    searchType = int.parse(Get.parameters['searchType']!);
+    mediaId = int.parse(Get.parameters['mediaId']!);
+  }
+
+  // 清空搜索
+  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 = true;
+    currentPage = 1;
+    searchFav();
+  }
+
+  // 搜索收藏夹视频
+  Future searchFav({type = 'init'}) async {
+    var res = await await UserHttp.userFavFolderDetail(
+      pn: currentPage,
+      ps: 20,
+      mediaId: mediaId,
+      keyword: searchKeyWord.value,
+      type: searchType,
+    );
+    if (res['status']) {
+      if (currentPage == 1 && type == 'init') {
+        favList.value = res['data'].medias;
+      } else if (type == 'onLoad') {
+        favList.addAll(res['data'].medias);
+      }
+      hasMore = res['data'].hasMore;
+    }
+    currentPage += 1;
+    loadingStatus.value = false;
+  }
+
+  onLoad() {
+    if (!hasMore) return;
+    searchFav(type: 'onLoad');
+  }
+}

lib/pages/fav_search/index.dart

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

lib/pages/fav_search/view.dart

@@ -0,0 +1,116 @@
+import 'package:easy_debounce/easy_throttle.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/skeleton/video_card_h.dart';
+import 'package:pilipala/common/widgets/no_data.dart';
+import 'package:pilipala/pages/favDetail/widget/fav_video_card.dart';
+
+import 'controller.dart';
+
+class FavSearchPage extends StatefulWidget {
+  final int? sourceType;
+  final int? mediaId;
+  const FavSearchPage({super.key, this.sourceType, this.mediaId});
+
+  @override
+  State<FavSearchPage> createState() => _FavSearchPageState();
+}
+
+class _FavSearchPageState extends State<FavSearchPage> {
+  final FavSearchController _favSearchCtr = Get.put(FavSearchController());
+  late ScrollController scrollController;
+
+  @override
+  void initState() {
+    super.initState();
+
+    scrollController = _favSearchCtr.scrollController;
+    scrollController.addListener(
+      () {
+        if (scrollController.position.pixels >=
+            scrollController.position.maxScrollExtent - 300) {
+          EasyThrottle.throttle('fav', const Duration(seconds: 1), () {
+            _favSearchCtr.onLoad();
+          });
+        }
+      },
+    );
+  }
+
+  @override
+  void dispose() {
+    scrollController.removeListener(() {});
+    scrollController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        titleSpacing: 0,
+        actions: [
+          IconButton(
+              onPressed: () => _favSearchCtr.submit(),
+              icon: const Icon(Icons.search_outlined, size: 22)),
+          const SizedBox(width: 10)
+        ],
+        title: Obx(
+          () => TextField(
+            autofocus: true,
+            focusNode: _favSearchCtr.searchFocusNode,
+            controller: _favSearchCtr.controller.value,
+            textInputAction: TextInputAction.search,
+            onChanged: (value) => _favSearchCtr.onChange(value),
+            decoration: InputDecoration(
+              hintText: _favSearchCtr.hintText,
+              border: InputBorder.none,
+              suffixIcon: IconButton(
+                icon: Icon(
+                  Icons.clear,
+                  size: 22,
+                  color: Theme.of(context).colorScheme.outline,
+                ),
+                onPressed: () => _favSearchCtr.onClear(),
+              ),
+            ),
+            onSubmitted: (String value) => _favSearchCtr.submit(),
+          ),
+        ),
+      ),
+      body: Obx(
+        () => _favSearchCtr.loadingStatus.value && _favSearchCtr.favList.isEmpty
+            ? ListView.builder(
+                itemCount: 10,
+                itemBuilder: (context, index) {
+                  return const VideoCardHSkeleton();
+                },
+              )
+            : _favSearchCtr.favList.isNotEmpty
+                ? ListView.builder(
+                    controller: scrollController,
+                    itemCount: _favSearchCtr.favList.length + 1,
+                    itemBuilder: (context, index) {
+                      if (index == _favSearchCtr.favList.length) {
+                        return Container(
+                          height: MediaQuery.of(context).padding.bottom + 60,
+                          padding: EdgeInsets.only(
+                              bottom: MediaQuery.of(context).padding.bottom),
+                        );
+                      } else {
+                        return FavVideoCardH(
+                          videoItem: _favSearchCtr.favList[index],
+                          callFn: () => null,
+                        );
+                      }
+                    },
+                  )
+                : const CustomScrollView(
+                    slivers: <Widget>[
+                      NoData(),
+                    ],
+                  ),
+      ),
+    );
+  }
+}

lib/pages/follow/controller.dart

@@ -1,20 +1,28 @@
+import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/http/follow.dart';
+import 'package:pilipala/http/member.dart';
 import 'package:pilipala/models/follow/result.dart';
+import 'package:pilipala/models/member/tags.dart';
 import 'package:pilipala/utils/storage.dart';
 
-class FollowController extends GetxController {
+/// 查看自己的关注时，可以查看分类
+/// 查看其他人的关注时，只可以看全部
+class FollowController extends GetxController with GetTickerProviderStateMixin {
   Box userInfoCache = GStrorage.userInfo;
   int pn = 1;
   int ps = 20;
   int total = 0;
-  RxList<FollowItemModel> followList = [FollowItemModel()].obs;
+  RxList<FollowItemModel> followList = <FollowItemModel>[].obs;
   late int mid;
   late String name;
   var userInfo;
   RxString loadingText = '加载中...'.obs;
+  RxBool isOwner = false.obs;
+  late List<MemberTagItemModel> followTags;
+  late TabController tabController;
 
   @override
   void onInit() {
@@ -23,6 +31,7 @@ class FollowController extends GetxController {
     mid = Get.parameters['mid'] != null
         ? int.parse(Get.parameters['mid']!)
         : userInfo.mid;
+    isOwner.value = mid == userInfo.mid;
     name = Get.parameters['name'] ?? userInfo.uname;
   }
 
@@ -56,4 +65,20 @@ class FollowController extends GetxController {
     }
     return res;
   }
+
+  // 当查看当前用户的关注时，请求关注分组
+  Future followUpTags() async {
+    if (userInfo != null && mid == userInfo.mid) {
+      var res = await MemberHttp.followUpTags();
+      if (res['status']) {
+        followTags = res['data'];
+        tabController = TabController(
+          initialIndex: 0,
+          length: res['data'].length,
+          vsync: this,
+        );
+      }
+      return res;
+    }
+  }
 }

lib/pages/follow/view.dart

@@ -1,12 +1,8 @@
-import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:pilipala/common/widgets/http_error.dart';
-import 'package:pilipala/common/widgets/no_data.dart';
-import 'package:pilipala/models/follow/result.dart';
-
 import 'controller.dart';
-import 'widgets/follow_item.dart';
+import 'widgets/follow_list.dart';
+import 'widgets/owner_follow_list.dart';
 
 class FollowPage extends StatefulWidget {
   const FollowPage({super.key});
@@ -16,30 +12,15 @@ class FollowPage extends StatefulWidget {
 }
 
 class _FollowPageState extends State<FollowPage> {
-  final FollowController _followController = Get.put(FollowController());
+  late String mid;
+  late FollowController _followController;
   final ScrollController scrollController = ScrollController();
-  Future? _futureBuilderFuture;
 
   @override
   void initState() {
     super.initState();
-    _futureBuilderFuture = _followController.queryFollowings('init');
+    mid = Get.parameters['mid']!;
-    scrollController.addListener(
+    _followController = Get.put(FollowController(), tag: mid);
-      () async {
-        if (scrollController.position.pixels >=
-            scrollController.position.maxScrollExtent - 200) {
-          EasyThrottle.throttle('follow', const Duration(seconds: 1), () {
-            _followController.queryFollowings('onLoad');
-          });
-        }
-      },
-    );
-  }
-
-  @override
-  void dispose() {
-    scrollController.removeListener(() {});
-    super.dispose();
   }
 
   @override
@@ -51,73 +32,57 @@ class _FollowPageState extends State<FollowPage> {
         titleSpacing: 0,
         centerTitle: false,
         title: Text(
-          '${_followController.name}的关注',
+          _followController.isOwner.value
+              ? '我的关注'
+              : '${_followController.name}的关注',
           style: Theme.of(context).textTheme.titleMedium,
         ),
       ),
-      body: RefreshIndicator(
+      body: Obx(
-          onRefresh: () async =>
+        () => !_followController.isOwner.value
-              await _followController.queryFollowings('init'),
+            ? FollowList(ctr: _followController)
-          child: FutureBuilder(
+            : FutureBuilder(
-            future: _futureBuilderFuture,
+                future: _followController.followUpTags(),
-            builder: (context, snapshot) {
+                builder: (context, snapshot) {
-              if (snapshot.connectionState == ConnectionState.done) {
+                  if (snapshot.connectionState == ConnectionState.done) {
-                var data = snapshot.data;
+                    var data = snapshot.data;
-                if (data['status']) {
+                    if (data['status']) {
-                  List<FollowItemModel> list = _followController.followList;
+                      return Column(
-                  return Obx(
+                        children: [
-                    () => list.isNotEmpty
+                          TabBar(
-                        ? ListView.builder(
+                              controller: _followController.tabController,
-                            controller: scrollController,
+                              isScrollable: true,
-                            itemCount: list.length + 1,
+                              tabs: [
-                            itemBuilder: (BuildContext context, int index) {
+                                for (var i in data['data']) ...[
-                              if (index == list.length) {
+                                  Tab(text: i.name),
-                                return Container(
+                                ]
-                                  height:
+                              ]),
-                                      MediaQuery.of(context).padding.bottom +
+                          Expanded(
-                                          60,
+                            child: TabBarView(
-                                  padding: EdgeInsets.only(
+                              controller: _followController.tabController,
-                                      bottom: MediaQuery.of(context)
+                              children: [
-                                          .padding
+                                for (var i = 0;
-                                          .bottom),
+                                    i < _followController.tabController.length;
-                                  child: Center(
+                                    i++) ...[
-                                    child: Obx(
+                                  OwnerFollowList(
-                                      () => Text(
+                                    ctr: _followController,
-                                        _followController.loadingText.value,
+                                    tagItem: _followController.followTags[i],
-                                        style: TextStyle(
+                                  )
-                                            color: Theme.of(context)
+                                ]
-                                                .colorScheme
+                              ],
-                                                .outline,
+                            ),
-                                            fontSize: 13),
-                                      ),
-                                    ),
-                                  ),
-                                );
-                              } else {
-                                return followItem(item: list[index]);
-                              }
-                            },
-                          )
-                        : const CustomScrollView(
-                            slivers: [NoData()],
                           ),
-                  );
+                        ],
-                } else {
+                      );
-                  return CustomScrollView(
+                    } else {
-                    slivers: [
+                      return const SizedBox();
-                      HttpError(
+                    }
-                        errMsg: data['msg'],
+                  } else {
-                        fn: () => _followController.queryFollowings('init'),
+                    return const SizedBox();
-                      )
+                  }
-                    ],
+                },
-                  );
+              ),
-                }
+      ),
-              } else {
-                // 骨架屏
-                return const SizedBox();
-              }
-            },
-          )),
     );
   }
 }

lib/pages/follow/widgets/follow_item.dart

@@ -1,38 +1,45 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/models/follow/result.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/utils.dart';
 
-Widget followItem({item}) {
+class FollowItem extends StatelessWidget {
-  String heroTag = Utils.makeHeroTag(item!.mid);
+  final FollowItemModel item;
-  return ListTile(
+  const FollowItem({super.key, required this.item});
-    onTap: () {
+
-      feedBack();
+  @override
-      Get.toNamed('/member?mid=${item.mid}',
+  Widget build(BuildContext context) {
-          arguments: {'face': item.face, 'heroTag': heroTag});
+    String heroTag = Utils.makeHeroTag(item!.mid);
-    },
+    return ListTile(
-    leading: Hero(
+      onTap: () {
-      tag: heroTag,
+        feedBack();
-      child: NetworkImgLayer(
+        Get.toNamed('/member?mid=${item.mid}',
-        width: 45,
+            arguments: {'face': item.face, 'heroTag': heroTag});
-        height: 45,
+      },
-        type: 'avatar',
+      leading: Hero(
-        src: item.face,
+        tag: heroTag,
+        child: NetworkImgLayer(
+          width: 45,
+          height: 45,
+          type: 'avatar',
+          src: item.face,
+        ),
       ),
-    ),
+      title: Text(
-    title: Text(
+        item.uname!,
-      item.uname,
+        maxLines: 1,
-      maxLines: 1,
+        overflow: TextOverflow.ellipsis,
-      overflow: TextOverflow.ellipsis,
+        style: const TextStyle(fontSize: 14),
-      style: const TextStyle(fontSize: 14),
+      ),
-    ),
+      subtitle: Text(
-    subtitle: Text(
+        item.sign!,
-      item.sign,
+        maxLines: 1,
-      maxLines: 1,
+        overflow: TextOverflow.ellipsis,
-      overflow: TextOverflow.ellipsis,
+      ),
-    ),
+      dense: true,
-    dense: true,
+      trailing: const SizedBox(width: 6),
-    trailing: const SizedBox(width: 6),
+    );
-  );
+  }
 }

lib/pages/follow/widgets/follow_list.dart

@@ -0,0 +1,111 @@
+import 'package:easy_debounce/easy_throttle.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/widgets/http_error.dart';
+import 'package:pilipala/common/widgets/no_data.dart';
+import 'package:pilipala/models/follow/result.dart';
+import 'package:pilipala/pages/follow/index.dart';
+
+import 'follow_item.dart';
+
+class FollowList extends StatefulWidget {
+  final FollowController ctr;
+  const FollowList({
+    super.key,
+    required this.ctr,
+  });
+
+  @override
+  State<FollowList> createState() => _FollowListState();
+}
+
+class _FollowListState extends State<FollowList> {
+  late Future _futureBuilderFuture;
+  final ScrollController scrollController = ScrollController();
+
+  @override
+  void initState() {
+    super.initState();
+    _futureBuilderFuture = widget.ctr.queryFollowings('init');
+    scrollController.addListener(
+      () async {
+        if (scrollController.position.pixels >=
+            scrollController.position.maxScrollExtent - 200) {
+          EasyThrottle.throttle('follow', const Duration(seconds: 1), () {
+            widget.ctr.queryFollowings('onLoad');
+          });
+        }
+      },
+    );
+  }
+
+  @override
+  void dispose() {
+    scrollController.removeListener(() {});
+    scrollController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return RefreshIndicator(
+      onRefresh: () async => await widget.ctr.queryFollowings('init'),
+      child: FutureBuilder(
+        future: _futureBuilderFuture,
+        builder: (context, snapshot) {
+          if (snapshot.connectionState == ConnectionState.done) {
+            var data = snapshot.data;
+            if (data['status']) {
+              List<FollowItemModel> list = widget.ctr.followList;
+              return Obx(
+                () => list.isNotEmpty
+                    ? ListView.builder(
+                        controller: scrollController,
+                        itemCount: list.length + 1,
+                        itemBuilder: (BuildContext context, int index) {
+                          if (index == list.length) {
+                            return Container(
+                              height:
+                                  MediaQuery.of(context).padding.bottom + 60,
+                              padding: EdgeInsets.only(
+                                  bottom:
+                                      MediaQuery.of(context).padding.bottom),
+                              child: Center(
+                                child: Obx(
+                                  () => Text(
+                                    widget.ctr.loadingText.value,
+                                    style: TextStyle(
+                                        color: Theme.of(context)
+                                            .colorScheme
+                                            .outline,
+                                        fontSize: 13),
+                                  ),
+                                ),
+                              ),
+                            );
+                          } else {
+                            return FollowItem(item: list[index]);
+                          }
+                        },
+                      )
+                    : const CustomScrollView(slivers: [NoData()]),
+              );
+            } else {
+              return CustomScrollView(
+                slivers: [
+                  HttpError(
+                    errMsg: data['msg'],
+                    fn: () => widget.ctr.queryFollowings('init'),
+                  )
+                ],
+              );
+            }
+          } else {
+            // 骨架屏
+            return const SizedBox();
+          }
+        },
+      ),
+    );
+  }
+}

lib/pages/follow/widgets/owner_follow_list.dart

@@ -0,0 +1,128 @@
+import 'package:easy_debounce/easy_throttle.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/widgets/http_error.dart';
+import 'package:pilipala/common/widgets/no_data.dart';
+import 'package:pilipala/http/member.dart';
+import 'package:pilipala/models/follow/result.dart';
+import 'package:pilipala/models/member/tags.dart';
+import 'package:pilipala/pages/follow/index.dart';
+import 'follow_item.dart';
+
+class OwnerFollowList extends StatefulWidget {
+  final FollowController ctr;
+  final MemberTagItemModel? tagItem;
+  const OwnerFollowList({super.key, required this.ctr, this.tagItem});
+
+  @override
+  State<OwnerFollowList> createState() => _OwnerFollowListState();
+}
+
+class _OwnerFollowListState extends State<OwnerFollowList>
+    with AutomaticKeepAliveClientMixin {
+  late int mid;
+  late Future _futureBuilderFuture;
+  final ScrollController scrollController = ScrollController();
+  int pn = 1;
+  int ps = 20;
+  late MemberTagItemModel tagItem;
+  RxList<FollowItemModel> followList = <FollowItemModel>[].obs;
+
+  @override
+  bool get wantKeepAlive => true;
+
+  @override
+  void initState() {
+    super.initState();
+    mid = widget.ctr.mid;
+    tagItem = widget.tagItem!;
+    _futureBuilderFuture = followUpGroup('init');
+    scrollController.addListener(
+      () async {
+        if (scrollController.position.pixels >=
+            scrollController.position.maxScrollExtent - 200) {
+          EasyThrottle.throttle('follow', const Duration(seconds: 1), () {
+            followUpGroup('onLoad');
+          });
+        }
+      },
+    );
+  }
+
+  // 获取分组下up
+  Future followUpGroup(type) async {
+    if (type == 'init') {
+      pn = 1;
+    }
+    var res = await MemberHttp.followUpGroup(mid, tagItem.tagid, pn, ps);
+    if (res['status']) {
+      if (res['data'].isNotEmpty) {
+        if (type == 'init') {
+          followList.value = res['data'];
+        } else {
+          followList.addAll(res['data']);
+        }
+        pn += 1;
+      }
+    }
+    return res;
+  }
+
+  @override
+  void dispose() {
+    scrollController.removeListener(() {});
+    scrollController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    super.build(context);
+    return RefreshIndicator(
+      onRefresh: () async => await followUpGroup('init'),
+      child: FutureBuilder(
+        future: _futureBuilderFuture,
+        builder: (context, snapshot) {
+          if (snapshot.connectionState == ConnectionState.done) {
+            var data = snapshot.data;
+            if (data['status']) {
+              return Obx(
+                () => followList.isNotEmpty
+                    ? ListView.builder(
+                        controller: scrollController,
+                        itemCount: followList.length + 1,
+                        itemBuilder: (BuildContext context, int index) {
+                          if (index == followList.length) {
+                            return Container(
+                              height:
+                                  MediaQuery.of(context).padding.bottom + 60,
+                              padding: EdgeInsets.only(
+                                  bottom:
+                                      MediaQuery.of(context).padding.bottom),
+                            );
+                          } else {
+                            return FollowItem(item: followList[index]);
+                          }
+                        },
+                      )
+                    : const CustomScrollView(slivers: [NoData()]),
+              );
+            } else {
+              return CustomScrollView(
+                slivers: [
+                  HttpError(
+                    errMsg: data['msg'],
+                    fn: () => widget.ctr.queryFollowings('init'),
+                  )
+                ],
+              );
+            }
+          } else {
+            // 骨架屏
+            return const SizedBox();
+          }
+        },
+      ),
+    );
+  }
+}

lib/pages/history/controller.dart

@@ -8,11 +8,13 @@ import 'package:pilipala/utils/storage.dart';
 
 class HistoryController extends GetxController {
   final ScrollController scrollController = ScrollController();
-  RxList<HisListItem> historyList = [HisListItem()].obs;
+  RxList<HisListItem> historyList = <HisListItem>[].obs;
   RxBool isLoadingMore = false.obs;
   RxBool pauseStatus = false.obs;
   Box localCache = GStrorage.localCache;
   RxBool isLoading = false.obs;
+  RxBool enableMultiple = false.obs;
+  RxInt checkedCount = 0.obs;
 
   @override
   void onInit() {
@@ -121,4 +123,80 @@ class HistoryController extends GetxController {
       },
     );
   }
+
+  // 删除某条历史记录
+  Future delHistory(kid, business) async {
+    String resKid = 'archive_$kid';
+    if (business == 'live') {
+      resKid = 'live_$kid';
+    } else if (business.contains('article')) {
+      resKid = 'article_$kid';
+    }
+
+    var res = await UserHttp.delHistory(resKid);
+    if (res['status']) {
+      historyList.removeWhere((e) => e.kid == kid);
+      SmartDialog.showToast(res['msg']);
+    }
+  }
+
+  // 删除已看历史记录
+  Future onDelHistory() async {
+    /// TODO 优化
+    List<HisListItem> result =
+        historyList.where((e) => e.progress == -1).toList();
+    for (HisListItem i in result) {
+      String resKid = 'archive_${i.kid}';
+      await UserHttp.delHistory(resKid);
+      historyList.removeWhere((e) => e.kid == i.kid);
+    }
+    SmartDialog.showToast('操作完成');
+  }
+
+  // 删除选中的记录
+  Future onDelCheckedHistory() async {
+    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 {
+                /// TODO 优化
+                await SmartDialog.dismiss();
+                SmartDialog.showLoading(msg: '请求中');
+                List<HisListItem> result =
+                    historyList.where((e) => e.checked!).toList();
+                for (HisListItem i in result) {
+                  String str = 'archive';
+                  try {
+                    str = i.history!.business!;
+                  } catch (_) {}
+                  String resKid = '${str}_${i.kid}';
+                  await UserHttp.delHistory(resKid);
+                  historyList.removeWhere((e) => e.kid == i.kid);
+                }
+                checkedCount.value = 0;
+                SmartDialog.dismiss();
+                enableMultiple.value = false;
+              },
+              child: const Text('确认'),
+            )
+          ],
+        );
+      },
+    );
+  }
 }

lib/pages/history/view.dart

@@ -37,6 +37,23 @@ class _HistoryPageState extends State<HistoryPage> {
         }
       },
     );
+    _historyController.enableMultiple.listen((p0) {
+      setState(() {});
+    });
+  }
+
+  // 选中
+  onChoose(index) {
+    _historyController.historyList[index].checked =
+        !_historyController.historyList[index].checked!;
+    _historyController.checkedCount.value =
+        _historyController.historyList.where((item) => item.checked!).length;
+    _historyController.historyList.refresh();
+  }
+
+  // 更新多选状态
+  onUpdateMultiple() {
+    setState(() {});
   }
 
   @override
@@ -48,44 +65,112 @@ class _HistoryPageState extends State<HistoryPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
+      appBar: AppBarWidget(
-        titleSpacing: 0,
+        visible: _historyController.enableMultiple.value,
-        centerTitle: false,
+        child1: AppBar(
-        title: Text(
+          titleSpacing: 0,
-          '观看记录',
+          centerTitle: false,
-          style: Theme.of(context).textTheme.titleMedium,
+          leading: IconButton(
-        ),
+            onPressed: () => Get.back(),
-        actions: [
+            icon: const Icon(Icons.arrow_back_outlined),
-          PopupMenuButton<String>(
-            onSelected: (String type) {
-              // 处理菜单项选择的逻辑
-              switch (type) {
-                case 'pause':
-                  _historyController.onPauseHistory();
-                  break;
-                case 'clear':
-                  _historyController.onClearHistory();
-                  break;
-                default:
-              }
-            },
-            itemBuilder: (BuildContext context) => <PopupMenuEntry<String>>[
-              PopupMenuItem<String>(
-                value: 'pause',
-                child: Obx(
-                  () => Text(!_historyController.pauseStatus.value
-                      ? '暂停观看记录'
-                      : '恢复观看记录'),
-                ),
-              ),
-              const PopupMenuItem<String>(
-                value: 'clear',
-                child: Text('清空观看记录'),
-              ),
-            ],
           ),
-          const SizedBox(width: 6),
+          title: Text(
-        ],
+            '观看记录',
+            style: Theme.of(context).textTheme.titleMedium,
+          ),
+          actions: [
+            IconButton(
+              onPressed: () => Get.toNamed('/historySearch'),
+              icon: const Icon(Icons.search_outlined),
+            ),
+            PopupMenuButton<String>(
+              onSelected: (String type) {
+                // 处理菜单项选择的逻辑
+                switch (type) {
+                  case 'pause':
+                    _historyController.onPauseHistory();
+                    break;
+                  case 'clear':
+                    _historyController.onClearHistory();
+                    break;
+                  case 'del':
+                    _historyController.onDelHistory();
+                    break;
+                  case 'multiple':
+                    _historyController.enableMultiple.value = true;
+                    setState(() {});
+                    break;
+                  default:
+                }
+              },
+              itemBuilder: (BuildContext context) => <PopupMenuEntry<String>>[
+                PopupMenuItem<String>(
+                  value: 'pause',
+                  child: Obx(
+                    () => Text(!_historyController.pauseStatus.value
+                        ? '暂停观看记录'
+                        : '恢复观看记录'),
+                  ),
+                ),
+                const PopupMenuItem<String>(
+                  value: 'clear',
+                  child: Text('清空观看记录'),
+                ),
+                const PopupMenuItem<String>(
+                  value: 'del',
+                  child: Text('删除已看记录'),
+                ),
+                const PopupMenuItem<String>(
+                  value: 'multiple',
+                  child: Text('多选删除'),
+                ),
+              ],
+            ),
+            const SizedBox(width: 6),
+          ],
+        ),
+        child2: AppBar(
+          titleSpacing: 0,
+          centerTitle: false,
+          leading: IconButton(
+            onPressed: () {
+              _historyController.enableMultiple.value = false;
+              for (var item in _historyController.historyList) {
+                item.checked = false;
+              }
+              _historyController.checkedCount.value = 0;
+              setState(() {});
+            },
+            icon: const Icon(Icons.close_outlined),
+          ),
+          title: Obx(
+            () => Text(
+              '已选择${_historyController.checkedCount.value}项',
+              style: Theme.of(context).textTheme.titleMedium,
+            ),
+          ),
+          actions: [
+            TextButton(
+              onPressed: () {
+                for (var item in _historyController.historyList) {
+                  item.checked = true;
+                }
+                _historyController.checkedCount.value =
+                    _historyController.historyList.length;
+                _historyController.historyList.refresh();
+              },
+              child: const Text('全选'),
+            ),
+            TextButton(
+              onPressed: () => _historyController.onDelCheckedHistory(),
+              child: Text(
+                '删除',
+                style: TextStyle(color: Theme.of(context).colorScheme.error),
+              ),
+            ),
+            const SizedBox(width: 6),
+          ],
+        ),
       ),
       body: RefreshIndicator(
         onRefresh: () async {
@@ -112,6 +197,9 @@ class _HistoryPageState extends State<HistoryPage> {
                                 return HistoryItem(
                                   videoItem:
                                       _historyController.historyList[index],
+                                  ctr: _historyController,
+                                  onChoose: () => onChoose(index),
+                                  onUpdateMultiple: () => onUpdateMultiple(),
                                 );
                               },
                                   childCount:
@@ -147,6 +235,36 @@ class _HistoryPageState extends State<HistoryPage> {
           ],
         ),
       ),
+      // bottomNavigationBar: BottomAppBar(),
+    );
+  }
+}
+
+class AppBarWidget extends StatelessWidget implements PreferredSizeWidget {
+  const AppBarWidget({
+    required this.child1,
+    required this.child2,
+    required this.visible,
+    Key? key,
+  }) : super(key: key);
+
+  final PreferredSizeWidget child1;
+  final PreferredSizeWidget child2;
+  final bool visible;
+  @override
+  Size get preferredSize => child1.preferredSize;
+
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedSwitcher(
+      duration: const Duration(milliseconds: 500),
+      transitionBuilder: (Widget child, Animation<double> animation) {
+        return ScaleTransition(
+          scale: animation,
+          child: child,
+        );
+      },
+      child: !visible ? child1 : child2,
     );
   }
 }

lib/pages/history/widgets/item.dart

@@ -11,12 +11,24 @@ import 'package:pilipala/models/bangumi/info.dart';
 import 'package:pilipala/models/common/business_type.dart';
 import 'package:pilipala/models/common/search_type.dart';
 import 'package:pilipala/models/live/item.dart';
+import 'package:pilipala/pages/history/index.dart';
+import 'package:pilipala/pages/history_search/index.dart';
+import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/id_utils.dart';
 import 'package:pilipala/utils/utils.dart';
 
 class HistoryItem extends StatelessWidget {
   final dynamic videoItem;
-  const HistoryItem({super.key, required this.videoItem});
+  final dynamic ctr;
+  final Function? onChoose;
+  final Function? onUpdateMultiple;
+  const HistoryItem({
+    super.key,
+    required this.videoItem,
+    this.ctr,
+    this.onChoose,
+    this.onUpdateMultiple,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -25,6 +37,11 @@ class HistoryItem extends StatelessWidget {
     String heroTag = Utils.makeHeroTag(aid);
     return InkWell(
       onTap: () async {
+        if (ctr!.enableMultiple.value) {
+          feedBack();
+          onChoose!();
+          return;
+        }
         if (videoItem.history.business.contains('article')) {
           int cid = videoItem.history.cid ??
               // videoItem.history.oid ??
@@ -115,6 +132,17 @@ class HistoryItem extends StatelessWidget {
               arguments: {'heroTag': heroTag, 'pic': videoItem.cover});
         }
       },
+      onLongPress: () {
+        if (ctr is HistorySearchController) {
+          return;
+        }
+        if (!ctr!.enableMultiple.value) {
+          feedBack();
+          ctr!.enableMultiple.value = true;
+          onChoose!();
+          onUpdateMultiple!();
+        }
+      },
       child: Column(
         children: [
           Padding(
@@ -130,53 +158,110 @@ class HistoryItem extends StatelessWidget {
                     mainAxisAlignment: MainAxisAlignment.start,
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      AspectRatio(
+                      Stack(
-                        aspectRatio: StyleString.aspectRatio,
+                        children: [
-                        child: LayoutBuilder(
+                          AspectRatio(
-                          builder: (context, boxConstraints) {
+                            aspectRatio: StyleString.aspectRatio,
-                            double maxWidth = boxConstraints.maxWidth;
+                            child: LayoutBuilder(
-                            double maxHeight = boxConstraints.maxHeight;
+                              builder: (context, boxConstraints) {
-                            return Stack(
+                                double maxWidth = boxConstraints.maxWidth;
-                              children: [
+                                double maxHeight = boxConstraints.maxHeight;
-                                Hero(
+                                return Stack(
-                                  tag: heroTag,
+                                  children: [
-                                  child: NetworkImgLayer(
+                                    Hero(
-                                    src: (videoItem.cover != ''
+                                      tag: heroTag,
-                                        ? videoItem.cover
+                                      child: NetworkImgLayer(
-                                        : videoItem.covers.first),
+                                        src: (videoItem.cover != ''
-                                    width: maxWidth,
+                                            ? videoItem.cover
-                                    height: maxHeight,
+                                            : videoItem.covers.first),
+                                        width: maxWidth,
+                                        height: maxHeight,
+                                      ),
+                                    ),
+                                    if (!BusinessType
+                                        .hiddenDurationType.hiddenDurationType
+                                        .contains(videoItem.history.business))
+                                      PBadge(
+                                        text: videoItem.progress == -1
+                                            ? '已看完'
+                                            : '${Utils.timeFormat(videoItem.progress!)}/${Utils.timeFormat(videoItem.duration!)}',
+                                        right: 6.0,
+                                        bottom: 6.0,
+                                        type: 'gray',
+                                      ),
+                                    // 右上角
+                                    if (BusinessType.showBadge.showBadge
+                                            .contains(
+                                                videoItem.history.business) ||
+                                        videoItem.history.business ==
+                                            BusinessType.live.type)
+                                      PBadge(
+                                        text: videoItem.badge,
+                                        top: 6.0,
+                                        right: 6.0,
+                                        bottom: null,
+                                        left: null,
+                                      ),
+                                  ],
+                                );
+                              },
+                            ),
+                          ),
+                          Obx(
+                            () => Positioned.fill(
+                              child: AnimatedOpacity(
+                                opacity: ctr!.enableMultiple.value ? 1 : 0,
+                                duration: const Duration(milliseconds: 200),
+                                child: Container(
+                                  decoration: BoxDecoration(
+                                    borderRadius: BorderRadius.circular(12),
+                                    color: Colors.black.withOpacity(
+                                        ctr!.enableMultiple.value &&
+                                                videoItem.checked
+                                            ? 0.6
+                                            : 0),
+                                  ),
+                                  child: Center(
+                                    child: SizedBox(
+                                      width: 34,
+                                      height: 34,
+                                      child: AnimatedScale(
+                                        scale: videoItem.checked ? 1 : 0,
+                                        duration:
+                                            const Duration(milliseconds: 250),
+                                        curve: Curves.easeInOut,
+                                        child: IconButton(
+                                          style: ButtonStyle(
+                                            padding: MaterialStateProperty.all(
+                                                EdgeInsets.zero),
+                                            backgroundColor:
+                                                MaterialStateProperty
+                                                    .resolveWith(
+                                              (states) {
+                                                return Colors.white
+                                                    .withOpacity(0.8);
+                                              },
+                                            ),
+                                          ),
+                                          onPressed: () {
+                                            feedBack();
+                                            onChoose!();
+                                          },
+                                          icon: Icon(Icons.done_all_outlined,
+                                              color: Theme.of(context)
+                                                  .colorScheme
+                                                  .primary),
+                                        ),
+                                      ),
+                                    ),
                                   ),
                                 ),
-                                if (!BusinessType
+                              ),
-                                    .hiddenDurationType.hiddenDurationType
+                            ),
-                                    .contains(videoItem.history.business))
+                          ),
-                                  PBadge(
+                        ],
-                                    text: videoItem.progress == -1
-                                        ? '已看完'
-                                        : '${Utils.timeFormat(videoItem.progress!)}/${Utils.timeFormat(videoItem.duration!)}',
-                                    right: 6.0,
-                                    bottom: 6.0,
-                                    type: 'gray',
-                                  ),
-                                // 右上角
-                                if (BusinessType.showBadge.showBadge
-                                        .contains(videoItem.history.business) ||
-                                    videoItem.history.business ==
-                                        BusinessType.live.type)
-                                  PBadge(
-                                    text: videoItem.badge,
-                                    top: 6.0,
-                                    right: 6.0,
-                                    bottom: null,
-                                    left: null,
-                                  ),
-                              ],
-                            );
-                          },
-                        ),
                       ),
-                      VideoContent(videoItem: videoItem)
+                      VideoContent(videoItem: videoItem, ctr: ctr)
                     ],
                   ),
                 );
@@ -191,7 +276,8 @@ class HistoryItem extends StatelessWidget {
 
 class VideoContent extends StatelessWidget {
   final dynamic videoItem;
-  const VideoContent({super.key, required this.videoItem});
+  final dynamic ctr;
+  const VideoContent({super.key, required this.videoItem, this.ctr});
 
   @override
   Widget build(BuildContext context) {
@@ -211,7 +297,8 @@ class VideoContent extends StatelessWidget {
               maxLines: videoItem.videos > 1 ? 1 : 2,
               overflow: TextOverflow.ellipsis,
             ),
-            if (videoItem.showTitle != null)
+            if (videoItem.showTitle != null) ...[
+              const SizedBox(height: 2),
               Text(
                 videoItem.showTitle,
                 textAlign: TextAlign.start,
@@ -219,21 +306,24 @@ class VideoContent extends StatelessWidget {
                     fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
                     fontWeight: FontWeight.w400,
                     color: Theme.of(context).colorScheme.outline),
-                maxLines: 2,
+                maxLines: 1,
                 overflow: TextOverflow.ellipsis,
               ),
+            ],
             const Spacer(),
-            Row(
+            if (videoItem.authorName != '')
-              children: [
+              Row(
-                Text(
+                children: [
-                  videoItem.authorName,
+                  Text(
-                  style: TextStyle(
+                    videoItem.authorName,
-                    fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
+                    style: TextStyle(
-                    color: Theme.of(context).colorScheme.outline,
+                      fontSize:
+                          Theme.of(context).textTheme.labelMedium!.fontSize,
+                      color: Theme.of(context).colorScheme.outline,
+                    ),
                   ),
-                ),
+                ],
-              ],
+              ),
-            ),
             Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
@@ -244,26 +334,26 @@ class VideoContent extends StatelessWidget {
                           Theme.of(context).textTheme.labelMedium!.fontSize,
                       color: Theme.of(context).colorScheme.outline),
                 ),
-                if (videoItem.badge != '番剧' &&
+                SizedBox(
-                    !videoItem.tagName.contains('动画') &&
+                  width: 24,
-                    videoItem.history.business != 'live' &&
+                  height: 24,
-                    !videoItem.history.business.contains('article'))
+                  child: PopupMenuButton<String>(
-                  SizedBox(
+                    padding: EdgeInsets.zero,
-                    width: 24,
+                    tooltip: '功能菜单',
-                    height: 24,
+                    icon: Icon(
-                    child: PopupMenuButton<String>(
+                      Icons.more_vert_outlined,
-                      padding: EdgeInsets.zero,
+                      color: Theme.of(context).colorScheme.outline,
-                      tooltip: '稍后再看',
+                      size: 14,
-                      icon: Icon(
+                    ),
-                        Icons.more_vert_outlined,
+                    position: PopupMenuPosition.under,
-                        color: Theme.of(context).colorScheme.outline,
+                    // constraints: const BoxConstraints(maxHeight: 35),
-                        size: 14,
+                    onSelected: (String type) {},
-                      ),
+                    itemBuilder: (BuildContext context) =>
-                      position: PopupMenuPosition.under,
+                        <PopupMenuEntry<String>>[
-                      // constraints: const BoxConstraints(maxHeight: 35),
+                      if (videoItem.badge != '番剧' &&
-                      onSelected: (String type) {},
+                          !videoItem.tagName.contains('动画') &&
-                      itemBuilder: (BuildContext context) =>
+                          videoItem.history.business != 'live' &&
-                          <PopupMenuEntry<String>>[
+                          !videoItem.history.business.contains('article'))
                         PopupMenuItem<String>(
                           onTap: () async {
                             var res = await UserHttp.toViewLater(
@@ -280,9 +370,22 @@ class VideoContent extends StatelessWidget {
                             ],
                           ),
                         ),
-                      ],
+                      PopupMenuItem<String>(
-                    ),
+                        onTap: () => ctr!.delHistory(
+                            videoItem.kid, videoItem.history.business),
+                        value: 'pause',
+                        height: 35,
+                        child: const Row(
+                          children: [
+                            Icon(Icons.close_outlined, size: 16),
+                            SizedBox(width: 6),
+                            Text('删除记录', style: TextStyle(fontSize: 13))
+                          ],
+                        ),
+                      ),
+                    ],
                   ),
+                ),
               ],
             ),
           ],

lib/pages/history_search/controller.dart

@@ -0,0 +1,91 @@
+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/history.dart';
+
+class HistorySearchController extends GetxController {
+  final ScrollController scrollController = ScrollController();
+  Rx<TextEditingController> controller = TextEditingController().obs;
+  final FocusNode searchFocusNode = FocusNode();
+  RxString searchKeyWord = ''.obs;
+  String hintText = '搜索';
+  RxString loadingStatus = 'init'.obs;
+  RxString loadingText = '加载中...'.obs;
+  bool hasRequest = false;
+  late int mid;
+  RxString uname = ''.obs;
+  int pn = 1;
+  int count = 0;
+  RxList<HisListItem> historyList = <HisListItem>[].obs;
+  RxBool enableMultiple = false.obs;
+
+  // 清空搜索
+  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';
+    if (hasRequest) {
+      pn = 1;
+      searchHistories();
+    }
+  }
+
+  // 搜索视频
+  Future searchHistories({type = 'init'}) async {
+    if (type == 'onLoad' && loadingText.value == '没有更多了') {
+      return;
+    }
+    var res = await UserHttp.searchHistory(
+      pn: pn,
+      keyword: controller.value.text,
+    );
+    if (res['status']) {
+      if (type == 'init' && pn == 1) {
+        historyList.value = res['data'].list;
+      } else {
+        historyList.addAll(res['data'].list);
+      }
+      count = res['data'].page['total'];
+      if (historyList.length == count) {
+        loadingText.value = '没有更多了';
+      }
+      pn += 1;
+      hasRequest = true;
+    }
+    loadingStatus.value = 'finish';
+    return res;
+  }
+
+  onLoad() {
+    searchHistories(type: 'onLoad');
+  }
+
+  Future delHistory(kid, business) async {
+    String resKid = 'archive_$kid';
+    if (business == 'live') {
+      resKid = 'live_$kid';
+    } else if (business.contains('article')) {
+      resKid = 'article_$kid';
+    }
+
+    var res = await UserHttp.delHistory(resKid);
+    if (res['status']) {
+      historyList.removeWhere((e) => e.kid == kid);
+      SmartDialog.showToast(res['msg']);
+    }
+    loadingStatus.value = 'finish';
+  }
+}

lib/pages/history_search/index.dart

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

lib/pages/history_search/view.dart

@@ -0,0 +1,174 @@
+import 'package:easy_debounce/easy_throttle.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/skeleton/video_card_h.dart';
+import 'package:pilipala/common/widgets/http_error.dart';
+import 'package:pilipala/common/widgets/no_data.dart';
+import 'package:pilipala/pages/history/widgets/item.dart';
+
+import 'controller.dart';
+
+class HistorySearchPage extends StatefulWidget {
+  const HistorySearchPage({super.key});
+
+  @override
+  State<HistorySearchPage> createState() => _HistorySearchPageState();
+}
+
+class _HistorySearchPageState extends State<HistorySearchPage> {
+  final HistorySearchController _historySearchCtr =
+      Get.put(HistorySearchController());
+  late ScrollController scrollController;
+
+  @override
+  void initState() {
+    super.initState();
+    scrollController = _historySearchCtr.scrollController;
+    scrollController.addListener(
+      () {
+        if (scrollController.position.pixels >=
+            scrollController.position.maxScrollExtent - 300) {
+          EasyThrottle.throttle('history', const Duration(seconds: 1), () {
+            _historySearchCtr.onLoad();
+          });
+        }
+      },
+    );
+  }
+
+  @override
+  void dispose() {
+    scrollController.removeListener(() {});
+    scrollController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        titleSpacing: 0,
+        actions: [
+          IconButton(
+              onPressed: () => _historySearchCtr.submit(),
+              icon: const Icon(Icons.search_outlined, size: 22)),
+          const SizedBox(width: 10)
+        ],
+        title: Obx(
+          () => TextField(
+            autofocus: true,
+            focusNode: _historySearchCtr.searchFocusNode,
+            controller: _historySearchCtr.controller.value,
+            textInputAction: TextInputAction.search,
+            onChanged: (value) => _historySearchCtr.onChange(value),
+            decoration: InputDecoration(
+              hintText: _historySearchCtr.hintText,
+              border: InputBorder.none,
+              suffixIcon: IconButton(
+                icon: Icon(
+                  Icons.clear,
+                  size: 22,
+                  color: Theme.of(context).colorScheme.outline,
+                ),
+                onPressed: () => _historySearchCtr.onClear(),
+              ),
+            ),
+            onSubmitted: (String value) => _historySearchCtr.submit(),
+          ),
+        ),
+      ),
+      body: Obx(
+        () => Column(
+          children: _historySearchCtr.loadingStatus.value == 'init'
+              ? [const SizedBox()]
+              : [
+                  Expanded(
+                    child: FutureBuilder(
+                      future: _historySearchCtr.searchHistories(),
+                      builder: (context, snapshot) {
+                        if (snapshot.connectionState == ConnectionState.done) {
+                          Map data = snapshot.data as Map;
+                          if (data['status']) {
+                            return Obx(
+                              () => _historySearchCtr.historyList.isNotEmpty
+                                  ? ListView.builder(
+                                      controller: scrollController,
+                                      itemCount:
+                                          _historySearchCtr.historyList.length +
+                                              1,
+                                      itemBuilder: (context, index) {
+                                        if (index ==
+                                            _historySearchCtr
+                                                .historyList.length) {
+                                          return Container(
+                                            height: MediaQuery.of(context)
+                                                    .padding
+                                                    .bottom +
+                                                60,
+                                            padding: EdgeInsets.only(
+                                                bottom: MediaQuery.of(context)
+                                                    .padding
+                                                    .bottom),
+                                            child: Center(
+                                              child: Obx(
+                                                () => Text(
+                                                  _historySearchCtr
+                                                      .loadingText.value,
+                                                  style: TextStyle(
+                                                      color: Theme.of(context)
+                                                          .colorScheme
+                                                          .outline,
+                                                      fontSize: 13),
+                                                ),
+                                              ),
+                                            ),
+                                          );
+                                        } else {
+                                          return HistoryItem(
+                                            videoItem: _historySearchCtr
+                                                .historyList[index],
+                                            ctr: _historySearchCtr,
+                                            onChoose: null,
+                                            onUpdateMultiple: () => null,
+                                          );
+                                          ;
+                                        }
+                                      },
+                                    )
+                                  : _historySearchCtr.loadingStatus.value ==
+                                          'loading'
+                                      ? const SizedBox(child: Text('加载中...'))
+                                      : const CustomScrollView(
+                                          slivers: <Widget>[
+                                            NoData(),
+                                          ],
+                                        ),
+                            );
+                          } else {
+                            return CustomScrollView(
+                              slivers: <Widget>[
+                                HttpError(
+                                  errMsg: data['msg'],
+                                  fn: () => setState(() {}),
+                                )
+                              ],
+                            );
+                          }
+                        } else {
+                          // 骨架屏
+                          return ListView.builder(
+                            itemCount: 10,
+                            itemBuilder: (context, index) {
+                              return const VideoCardHSkeleton();
+                            },
+                          );
+                        }
+                      },
+                    ),
+                  ),
+                ],
+        ),
+      ),
+    );
+  }
+}

lib/pages/html/controller.dart

@@ -1,19 +1,112 @@
+import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+import 'package:hive/hive.dart';
 import 'package:pilipala/http/html.dart';
+import 'package:pilipala/http/reply.dart';
+import 'package:pilipala/models/common/reply_sort_type.dart';
+import 'package:pilipala/models/video/reply/item.dart';
+import 'package:pilipala/utils/feed_back.dart';
+import 'package:pilipala/utils/storage.dart';
 
 class HtmlRenderController extends GetxController {
   late String id;
+  late String dynamicType;
+  late int type;
+  RxInt oid = (-1).obs;
   late Map response;
+  int? floor;
+  int currentPage = 0;
+  bool isLoadingMore = false;
+  RxString noMore = ''.obs;
+  RxList<ReplyItemModel> replyList = <ReplyItemModel>[].obs;
+  RxInt acount = 0.obs;
+  final ScrollController scrollController = ScrollController();
+
+  ReplySortType _sortType = ReplySortType.time;
+  RxString sortTypeTitle = ReplySortType.time.titles.obs;
+  RxString sortTypeLabel = ReplySortType.time.labels.obs;
+  Box setting = GStrorage.setting;
 
   @override
   void onInit() {
     super.onInit();
     id = Get.parameters['id']!;
+    dynamicType = Get.parameters['dynamicType']!;
+    type = dynamicType == 'picture' ? 11 : 12;
   }
 
-  Future reqHtml() async {
+  // 请求动态内容
-    var res = await HtmlHttp.reqHtml(id);
+  Future reqHtml(id) async {
+    late dynamic res;
+    if (dynamicType == 'opus' || dynamicType == 'picture') {
+      res = await HtmlHttp.reqHtml(id, dynamicType);
+    } else {
+      res = await HtmlHttp.reqReadHtml(id, dynamicType);
+    }
     response = res;
+    oid.value = res['commentId'];
     return res;
   }
+
+  // 请求评论
+  Future queryReplyList({reqType = 'init'}) async {
+    var res = await ReplyHttp.replyList(
+      oid: oid.value,
+      pageNum: currentPage + 1,
+      type: type,
+      sort: _sortType.index,
+    );
+    if (res['status']) {
+      List<ReplyItemModel> replies = res['data'].replies;
+      acount.value = res['data'].page.acount;
+      if (replies.isNotEmpty) {
+        currentPage++;
+        noMore.value = '加载中...';
+        if (replies.length < 20) {
+          noMore.value = '没有更多了';
+        }
+      } else {
+        noMore.value = currentPage == 0 ? '还没有评论' : '没有更多了';
+      }
+      if (reqType == 'init') {
+        // 添加置顶回复
+        if (res['data'].upper.top != null) {
+          bool flag = res['data']
+              .topReplies
+              .any((reply) => reply.rpid == res['data'].upper.top.rpid);
+          if (!flag) {
+            replies.insert(0, res['data'].upper.top);
+          }
+        }
+        replies.insertAll(0, res['data'].topReplies);
+        replyList.value = replies;
+      } else {
+        replyList.addAll(replies);
+      }
+    }
+    isLoadingMore = false;
+    return res;
+  }
+
+  // 排序搜索评论
+  queryBySort() {
+    feedBack();
+    switch (_sortType) {
+      case ReplySortType.time:
+        _sortType = ReplySortType.like;
+        break;
+      case ReplySortType.like:
+        _sortType = ReplySortType.reply;
+        break;
+      case ReplySortType.reply:
+        _sortType = ReplySortType.time;
+        break;
+      default:
+    }
+    sortTypeTitle.value = _sortType.titles;
+    sortTypeLabel.value = _sortType.labels;
+    currentPage = 0;
+    replyList.clear();
+    queryReplyList(reqType: 'init');
+  }
 }

lib/pages/html/view.dart

@@ -1,7 +1,19 @@
+import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
+import 'package:pilipala/common/skeleton/video_reply.dart';
 import 'package:pilipala/common/widgets/html_render.dart';
+import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/models/common/reply_type.dart';
+import 'package:pilipala/pages/mine/index.dart';
+import 'package:pilipala/pages/video/detail/reply/widgets/reply_item.dart';
+import 'package:pilipala/pages/video/detail/replyNew/index.dart';
+import 'package:pilipala/pages/video/detail/replyReply/index.dart';
+import 'package:pilipala/utils/feed_back.dart';
 
 import 'controller.dart';
 
@@ -12,16 +24,104 @@ class HtmlRenderPage extends StatefulWidget {
   State<HtmlRenderPage> createState() => _HtmlRenderPageState();
 }
 
-class _HtmlRenderPageState extends State<HtmlRenderPage> {
+class _HtmlRenderPageState extends State<HtmlRenderPage>
-  HtmlRenderController htmlRenderCtr = Get.put(HtmlRenderController());
+    with TickerProviderStateMixin {
+  final HtmlRenderController _htmlRenderCtr = Get.put(HtmlRenderController());
   late String title;
   late String id;
+  late String url;
+  late String dynamicType;
+  late int type;
+  bool _isFabVisible = true;
+  late Future _futureBuilderFuture;
+  late ScrollController scrollController;
+  late AnimationController fabAnimationCtr;
 
   @override
   void initState() {
     super.initState();
     title = Get.parameters['title']!;
     id = Get.parameters['id']!;
+    url = Get.parameters['url']!;
+    dynamicType = Get.parameters['dynamicType']!;
+    type = dynamicType == 'picture' ? 11 : 12;
+    _futureBuilderFuture = _htmlRenderCtr.reqHtml(id);
+    fabAnimationCtr = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 300),
+    );
+    scrollListener();
+  }
+
+  void scrollListener() {
+    scrollController = _htmlRenderCtr.scrollController;
+    scrollController.addListener(
+      () {
+        // 分页加载
+        if (scrollController.position.pixels >=
+            scrollController.position.maxScrollExtent - 300) {
+          EasyThrottle.throttle('replylist', const Duration(seconds: 2), () {
+            _htmlRenderCtr.queryReplyList(reqType: 'onLoad');
+          });
+        }
+
+        // 标题
+        // if (scrollController.offset > 55 && !_visibleTitle) {
+        //   _visibleTitle = true;
+        //   titleStreamC.add(true);
+        // } else if (scrollController.offset <= 55 && _visibleTitle) {
+        //   _visibleTitle = false;
+        //   titleStreamC.add(false);
+        // }
+
+        // fab按钮
+        final ScrollDirection direction =
+            scrollController.position.userScrollDirection;
+        if (direction == ScrollDirection.forward) {
+          _showFab();
+        } else if (direction == ScrollDirection.reverse) {
+          _hideFab();
+        }
+      },
+    );
+  }
+
+  void _showFab() {
+    if (!_isFabVisible) {
+      _isFabVisible = true;
+      fabAnimationCtr.forward();
+    }
+  }
+
+  void _hideFab() {
+    if (_isFabVisible) {
+      _isFabVisible = false;
+      fabAnimationCtr.reverse();
+    }
+  }
+
+  void replyReply(replyItem) {
+    int oid = replyItem.oid;
+    int rpid = replyItem.rpid!;
+    Get.to(
+      () => Scaffold(
+        appBar: AppBar(
+          titleSpacing: 0,
+          centerTitle: false,
+          title: Text(
+            '评论详情',
+            style: Theme.of(context).textTheme.titleMedium,
+          ),
+        ),
+        body: VideoReplyReplyPanel(
+          oid: oid,
+          rpid: rpid,
+          source: 'dynamic',
+          replyType: ReplyType.values[type],
+          firstFloor: replyItem,
+        ),
+      ),
+    );
   }
 
   @override
@@ -29,88 +129,328 @@ class _HtmlRenderPageState extends State<HtmlRenderPage> {
     return Scaffold(
       appBar: AppBar(
         centerTitle: false,
-        title: Text(title),
+        titleSpacing: 0,
+        title: Text(
+          title,
+          style: Theme.of(context).textTheme.titleMedium,
+        ),
+        actions: [
+          const SizedBox(width: 4),
+          IconButton(
+            onPressed: () {
+              Get.toNamed('/webview', parameters: {
+                'url': url.startsWith('http') ? url : 'https:$url',
+                'type': 'url',
+                'pageTitle': title,
+              });
+            },
+            icon: const Icon(Icons.open_in_browser_outlined, size: 19),
+          ),
+          PopupMenuButton(
+            icon: const Icon(Icons.more_vert),
+            itemBuilder: (BuildContext context) => <PopupMenuEntry>[
+              PopupMenuItem(
+                onTap: () => {
+                  Clipboard.setData(ClipboardData(text: url)),
+                  SmartDialog.showToast('已复制'),
+                },
+                child: const Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    Icon(Icons.copy_rounded, size: 19),
+                    SizedBox(width: 10),
+                    Text('复制链接'),
+                  ],
+                ),
+              ),
+              PopupMenuItem(
+                onTap: () => {},
+                child: const Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    Icon(Icons.share_outlined, size: 19),
+                    SizedBox(width: 10),
+                    Text('分享'),
+                  ],
+                ),
+              ),
+            ],
+          ),
+          const SizedBox(width: 6)
+        ],
       ),
-      body: SingleChildScrollView(
+      body: Stack(
-        child: Column(
+        children: [
-          children: [
+          SingleChildScrollView(
-            FutureBuilder(
+            controller: scrollController,
-              future: htmlRenderCtr.reqHtml(),
+            child: Column(
-              builder: (context, snapshot) {
+              children: [
-                if (snapshot.connectionState == ConnectionState.done) {
+                FutureBuilder(
-                  var data = snapshot.data;
+                  future: _futureBuilderFuture,
-                  if (data['status']) {
+                  builder: (context, snapshot) {
-                    return Column(
+                    if (snapshot.connectionState == ConnectionState.done) {
-                      children: [
+                      var data = snapshot.data;
-                        Padding(
+                      fabAnimationCtr.forward();
-                          padding: const EdgeInsets.fromLTRB(12, 12, 12, 8),
+                      if (data['status']) {
-                          child: Row(
+                        return Column(
-                            children: [
+                          children: [
-                              NetworkImgLayer(
+                            Padding(
-                                width: 40,
+                              padding: const EdgeInsets.fromLTRB(12, 12, 12, 8),
-                                height: 40,
+                              child: Row(
-                                type: 'avatar',
-                                src: htmlRenderCtr.response['avatar']!,
-                              ),
-                              const SizedBox(width: 10),
-                              Column(
-                                crossAxisAlignment: CrossAxisAlignment.start,
                                 children: [
-                                  Text(htmlRenderCtr.response['uname'],
+                                  NetworkImgLayer(
-                                      style: TextStyle(
+                                    width: 40,
-                                        fontSize: Theme.of(context)
+                                    height: 40,
-                                            .textTheme
+                                    type: 'avatar',
-                                            .titleSmall!
+                                    src: _htmlRenderCtr.response['avatar']!,
-                                            .fontSize,
-                                      )),
-                                  Text(
-                                    htmlRenderCtr.response['updateTime'],
-                                    style: TextStyle(
-                                      color:
-                                          Theme.of(context).colorScheme.outline,
-                                      fontSize: Theme.of(context)
-                                          .textTheme
-                                          .labelSmall!
-                                          .fontSize,
-                                    ),
                                   ),
+                                  const SizedBox(width: 10),
+                                  Column(
+                                    crossAxisAlignment:
+                                        CrossAxisAlignment.start,
+                                    children: [
+                                      Text(_htmlRenderCtr.response['uname'],
+                                          style: TextStyle(
+                                            fontSize: Theme.of(context)
+                                                .textTheme
+                                                .titleSmall!
+                                                .fontSize,
+                                          )),
+                                      Text(
+                                        _htmlRenderCtr.response['updateTime'],
+                                        style: TextStyle(
+                                          color: Theme.of(context)
+                                              .colorScheme
+                                              .outline,
+                                          fontSize: Theme.of(context)
+                                              .textTheme
+                                              .labelSmall!
+                                              .fontSize,
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                  const Spacer(),
                                 ],
                               ),
-                              const Spacer(),
+                            ),
-                            ],
+                            Padding(
-                          ),
+                              padding: const EdgeInsets.fromLTRB(12, 8, 12, 8),
-                        ),
+                              child: HtmlRender(
-                        Padding(
+                                htmlContent: _htmlRenderCtr.response['content'],
-                          padding: const EdgeInsets.fromLTRB(12, 12, 12, 8),
+                              ),
-                          child: HtmlRender(
+                            ),
-                            htmlContent: htmlRenderCtr.response['content'],
+                            Container(
-                          ),
+                              decoration: BoxDecoration(
-                        ),
+                                border: Border(
-                        Container(
+                                  bottom: BorderSide(
+                                    width: 8,
+                                    color: Theme.of(context)
+                                        .dividerColor
+                                        .withOpacity(0.05),
+                                  ),
+                                ),
+                              ),
+                            ),
+                          ],
+                        );
+                      } else {
+                        return const Text('error');
+                      }
+                    } else {
+                      // 骨架屏
+                      return const SizedBox();
+                    }
+                  },
+                ),
+                Obx(
+                  () => _htmlRenderCtr.oid.value != -1
+                      ? Container(
                           decoration: BoxDecoration(
+                            color: Theme.of(context).colorScheme.surface,
                             border: Border(
-                              bottom: BorderSide(
+                              top: BorderSide(
-                                width: 8,
+                                width: 0.6,
                                 color: Theme.of(context)
                                     .dividerColor
                                     .withOpacity(0.05),
                               ),
                             ),
                           ),
-                        ),
+                          height: 45,
-                      ],
+                          padding: const EdgeInsets.only(left: 12, right: 6),
-                    );
+                          child: Row(
-                  } else {
+                            children: [
-                    return Text('error');
+                              const Text('回复'),
-                  }
+                              const Spacer(),
-                } else {
+                              SizedBox(
-                  // 骨架屏
+                                height: 35,
-                  return const SizedBox();
+                                child: TextButton.icon(
-                }
+                                  onPressed: () => _htmlRenderCtr.queryBySort(),
-              },
+                                  icon: const Icon(Icons.sort, size: 16),
+                                  label: Obx(
+                                    () => Text(
+                                      _htmlRenderCtr.sortTypeLabel.value,
+                                      style: const TextStyle(fontSize: 13),
+                                    ),
+                                  ),
+                                ),
+                              )
+                            ],
+                          ),
+                        )
+                      : const SizedBox(),
+                ),
+                Obx(
+                  () => _htmlRenderCtr.oid.value != -1
+                      ? FutureBuilder(
+                          future: _htmlRenderCtr.queryReplyList(),
+                          builder: (context, snapshot) {
+                            if (snapshot.connectionState ==
+                                ConnectionState.done) {
+                              Map data = snapshot.data as Map;
+                              if (snapshot.data['status']) {
+                                // 请求成功
+                                return Obx(
+                                  () => _htmlRenderCtr.replyList.isEmpty &&
+                                          _htmlRenderCtr.isLoadingMore
+                                      ? ListView.builder(
+                                          itemCount: 5,
+                                          shrinkWrap: true,
+                                          physics:
+                                              const NeverScrollableScrollPhysics(),
+                                          itemBuilder: (context, index) {
+                                            return const VideoReplySkeleton();
+                                          },
+                                        )
+                                      : ListView.builder(
+                                          shrinkWrap: true,
+                                          physics:
+                                              const NeverScrollableScrollPhysics(),
+                                          itemCount:
+                                              _htmlRenderCtr.replyList.length +
+                                                  1,
+                                          itemBuilder: (context, index) {
+                                            if (index ==
+                                                _htmlRenderCtr
+                                                    .replyList.length) {
+                                              return Container(
+                                                padding: EdgeInsets.only(
+                                                    bottom:
+                                                        MediaQuery.of(context)
+                                                            .padding
+                                                            .bottom),
+                                                height: MediaQuery.of(context)
+                                                        .padding
+                                                        .bottom +
+                                                    100,
+                                                child: Center(
+                                                  child: Obx(
+                                                    () => Text(
+                                                      _htmlRenderCtr
+                                                          .noMore.value,
+                                                      style: TextStyle(
+                                                        fontSize: 12,
+                                                        color: Theme.of(context)
+                                                            .colorScheme
+                                                            .outline,
+                                                      ),
+                                                    ),
+                                                  ),
+                                                ),
+                                              );
+                                            } else {
+                                              return ReplyItem(
+                                                replyItem: _htmlRenderCtr
+                                                    .replyList[index],
+                                                showReplyRow: true,
+                                                replyLevel: '1',
+                                                replyReply: (replyItem) =>
+                                                    replyReply(replyItem),
+                                                replyType:
+                                                    ReplyType.values[type],
+                                                addReply: (replyItem) {
+                                                  _htmlRenderCtr
+                                                      .replyList[index].replies!
+                                                      .add(replyItem);
+                                                },
+                                              );
+                                            }
+                                          },
+                                        ),
+                                );
+                              } else {
+                                // 请求错误
+                                return CustomScrollView(
+                                  slivers: [
+                                    HttpError(
+                                      errMsg: data['msg'],
+                                      fn: () => setState(() {}),
+                                    )
+                                  ],
+                                );
+                              }
+                            } else {
+                              // 骨架屏
+                              return ListView.builder(
+                                shrinkWrap: true,
+                                physics: const NeverScrollableScrollPhysics(),
+                                itemCount: 5,
+                                itemBuilder: (context, index) {
+                                  return const VideoReplySkeleton();
+                                },
+                              );
+                            }
+                          },
+                        )
+                      : const SizedBox(),
+                )
+              ],
             ),
-          ],
+          ),
-        ),
+          Positioned(
+            bottom: MediaQuery.of(context).padding.bottom + 14,
+            right: 14,
+            child: SlideTransition(
+              position: Tween<Offset>(
+                begin: const Offset(0, 2),
+                end: const Offset(0, 0),
+              ).animate(CurvedAnimation(
+                parent: fabAnimationCtr,
+                curve: Curves.easeInOut,
+              )),
+              child: FloatingActionButton(
+                heroTag: null,
+                onPressed: () {
+                  feedBack();
+                  showModalBottomSheet(
+                    context: context,
+                    isScrollControlled: true,
+                    builder: (BuildContext context) {
+                      return VideoReplyNewDialog(
+                        oid: _htmlRenderCtr.oid.value,
+                        root: 0,
+                        parent: 0,
+                        replyType: ReplyType.values[type],
+                      );
+                    },
+                  ).then(
+                    (value) => {
+                      // 完成评论，数据添加
+                      if (value != null && value['data'] != null)
+                        {
+                          _htmlRenderCtr.replyList.add(value['data']),
+                          _htmlRenderCtr.acount.value++
+                        }
+                    },
+                  );
+                },
+                tooltip: '评论动态',
+                child: const Icon(Icons.reply),
+              ),
+            ),
+          ),
+        ],
       ),
     );
   }

lib/pages/live/controller.dart

@@ -20,14 +20,14 @@ class LiveController extends GetxController {
   void onInit() {
     super.onInit();
     crossAxisCount.value =
-        setting.get(SettingBoxKey.enableSingleRow, defaultValue: false) ? 1 : 2;
+        setting.get(SettingBoxKey.customRows, defaultValue: 2);
   }
 
   // 获取推荐
   Future queryLiveList(type) async {
-    if (type == 'init') {
+    // if (type == 'init') {
-      _currentPage = 1;
+    //   _currentPage = 1;
-    }
+    // }
     var res = await LiveHttp.liveList(
       pn: _currentPage,
     );

lib/pages/live/view.dart

@@ -21,11 +21,15 @@ class LivePage extends StatefulWidget {
   State<LivePage> createState() => _LivePageState();
 }
 
-class _LivePageState extends State<LivePage> {
+class _LivePageState extends State<LivePage>
+    with AutomaticKeepAliveClientMixin {
   final LiveController _liveController = Get.put(LiveController());
   late Future _futureBuilderFuture;
   late ScrollController scrollController;
 
+  @override
+  bool get wantKeepAlive => true;
+
   @override
   void initState() {
     super.initState();
@@ -37,7 +41,7 @@ class _LivePageState extends State<LivePage> {
       () {
         if (scrollController.position.pixels >=
             scrollController.position.maxScrollExtent - 200) {
-          EasyThrottle.throttle('my-throttler', const Duration(seconds: 1), () {
+          EasyThrottle.throttle('liveList', const Duration(seconds: 1), () {
             _liveController.isLoadingMore = true;
             _liveController.onLoad();
           });
@@ -144,9 +148,9 @@ class _LivePageState extends State<LivePage> {
     return SliverGrid(
       gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
         // 行间距
-        mainAxisSpacing: StyleString.cardSpace + 4,
+        mainAxisSpacing: StyleString.safeSpace,
         // 列间距
-        crossAxisSpacing: StyleString.cardSpace + 4,
+        crossAxisSpacing: StyleString.safeSpace,
         // 列数
         crossAxisCount: crossAxisCount,
         mainAxisExtent:

lib/pages/live/widgets/live_item.dart

@@ -24,7 +24,7 @@ class LiveCardV extends StatelessWidget {
   Widget build(BuildContext context) {
     String heroTag = Utils.makeHeroTag(liveItem.roomId);
     return Card(
-      elevation: crossAxisCount == 1 ? 0 : 1,
+      elevation: 0,
       clipBehavior: Clip.hardEdge,
       margin: EdgeInsets.zero,
       child: GestureDetector(
@@ -102,7 +102,7 @@ class LiveContent extends StatelessWidget {
       child: Padding(
         padding: crossAxisCount == 1
             ? const EdgeInsets.fromLTRB(9, 9, 9, 4)
-            : const EdgeInsets.fromLTRB(9, 8, 9, 8),
+            : const EdgeInsets.fromLTRB(5, 8, 5, 4),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -120,15 +120,18 @@ class LiveContent extends StatelessWidget {
             if (crossAxisCount == 1) const SizedBox(height: 4),
             Row(
               children: [
-                Text(
+                Expanded(
-                  liveItem.uname,
+                  child: Text(
-                  textAlign: TextAlign.start,
+                    liveItem.uname,
-                  style: TextStyle(
+                    textAlign: TextAlign.start,
-                    fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
+                    style: TextStyle(
-                    color: Theme.of(context).colorScheme.outline,
+                      fontSize:
+                          Theme.of(context).textTheme.labelMedium!.fontSize,
+                      color: Theme.of(context).colorScheme.outline,
+                    ),
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
                   ),
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
                 ),
                 if (crossAxisCount == 1) ...[
                   Text(
@@ -169,7 +172,7 @@ class VideoStat extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       height: 50,
-      padding: const EdgeInsets.only(top: 22, left: 10, right: 10),
+      padding: const EdgeInsets.only(top: 26, left: 10, right: 10),
       decoration: const BoxDecoration(
         gradient: LinearGradient(
           begin: Alignment.topCenter,
@@ -181,18 +184,17 @@ class VideoStat extends StatelessWidget {
           tileMode: TileMode.mirror,
         ),
       ),
-      child: Row(
+      child: RichText(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        maxLines: 1,
-        children: [
+        textAlign: TextAlign.justify,
-          Text(
+        softWrap: false,
-            liveItem!.areaName!,
+        text: TextSpan(
-            style: const TextStyle(fontSize: 11, color: Colors.white),
+          style: const TextStyle(fontSize: 11, color: Colors.white),
-          ),
+          children: [
-          Text(
+            TextSpan(text: liveItem!.areaName!),
-            liveItem!.watchedShow!['text_small'],
+            TextSpan(text: liveItem!.watchedShow!['text_small']),
-            style: const TextStyle(fontSize: 11, color: Colors.white),
+          ],
-          ),
+        ),
-        ],
       ),
     );
   }

lib/pages/media/view.dart

@@ -39,45 +39,47 @@ class _MediaPageState extends State<MediaPage>
     Color primary = Theme.of(context).colorScheme.primary;
     return Scaffold(
       appBar: AppBar(toolbarHeight: 30),
-      body: Column(
+      body: SingleChildScrollView(
-        children: [
+        child: Column(
-          ListTile(
+          children: [
-            leading: null,
-            title: Padding(
-              padding: const EdgeInsets.only(left: 20),
-              child: Text(
-                '媒体库',
-                style: TextStyle(
-                  fontSize: Theme.of(context).textTheme.titleLarge!.fontSize,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-            ),
-          ),
-          for (var i in mediaController.list) ...[
             ListTile(
-              onTap: () => i['onTap'](),
+              leading: null,
-              dense: true,
+              title: Padding(
-              leading: Padding(
+                padding: const EdgeInsets.only(left: 20),
-                padding: const EdgeInsets.only(left: 15),
+                child: Text(
-                child: Icon(
+                  '媒体库',
-                  i['icon'],
+                  style: TextStyle(
-                  color: primary,
+                    fontSize: Theme.of(context).textTheme.titleLarge!.fontSize,
+                    fontWeight: FontWeight.bold,
+                  ),
                 ),
               ),
-              contentPadding:
-                  const EdgeInsets.only(left: 15, top: 2, bottom: 2),
-              minLeadingWidth: 0,
-              title: Text(
-                i['title'],
-                style: const TextStyle(fontSize: 15),
-              ),
             ),
+            for (var i in mediaController.list) ...[
+              ListTile(
+                onTap: () => i['onTap'](),
+                dense: true,
+                leading: Padding(
+                  padding: const EdgeInsets.only(left: 15),
+                  child: Icon(
+                    i['icon'],
+                    color: primary,
+                  ),
+                ),
+                contentPadding:
+                    const EdgeInsets.only(left: 15, top: 2, bottom: 2),
+                minLeadingWidth: 0,
+                title: Text(
+                  i['title'],
+                  style: const TextStyle(fontSize: 15),
+                ),
+              ),
+            ],
+            Obx(() => mediaController.userLogin.value
+                ? favFolder(mediaController, context)
+                : const SizedBox())
           ],
-          Obx(() => mediaController.userLogin.value
+        ),
-              ? favFolder(mediaController, context)
-              : const SizedBox())
-        ],
       ),
     );
   }
@@ -136,7 +138,7 @@ class _MediaPageState extends State<MediaPage>
         // const SizedBox(height: 10),
         SizedBox(
           width: double.infinity,
-          height: 170 * MediaQuery.of(context).textScaleFactor,
+          height: 200 * MediaQuery.of(context).textScaleFactor,
           child: FutureBuilder(
               future: _futureBuilderFuture,
               builder: (context, snapshot) {

lib/pages/member/archive/controller.dart

@@ -2,23 +2,43 @@ import 'package:get/get.dart';
 import 'package:pilipala/http/member.dart';
 
 class ArchiveController extends GetxController {
+  ArchiveController(this.mid);
   int? mid;
   int pn = 1;
   int count = 0;
+  RxMap<String, String> currentOrder = <String, String>{}.obs;
+  List<Map<String, String>> orderList = [
+    {'type': 'pubdate', 'label': '最新发布'},
+    {'type': 'click', 'label': '最多播放'},
+    {'type': 'stow', 'label': '最多收藏'},
+  ];
 
   @override
   void onInit() {
     super.onInit();
-    mid = int.parse(Get.parameters['mid']!);
+    mid ??= int.parse(Get.parameters['mid']!);
+    print('🐶🐶： $mid');
+    currentOrder.value = orderList.first;
   }
 
   // 获取用户投稿
   Future getMemberArchive() async {
-    var res = await MemberHttp.memberArchive(mid: mid, pn: pn);
+    var res = await MemberHttp.memberArchive(
+        mid: mid, pn: pn, order: currentOrder['type']!);
     if (res['status']) {
       count = res['data'].page['count'];
       pn += 1;
     }
     return res;
   }
+
+  toggleSort() async {
+    pn = 1;
+    int index = orderList.indexOf(currentOrder.value);
+    if (index == orderList.length - 1) {
+      currentOrder.value = orderList.first;
+    } else {
+      currentOrder.value = orderList[index + 1];
+    }
+  }
 }

lib/pages/member/archive/view.dart

@@ -5,10 +5,12 @@ import 'package:loading_more_list/loading_more_list.dart';
 import 'package:pilipala/common/widgets/video_card_h.dart';
 import 'package:pilipala/models/member/archive.dart';
 import 'package:pilipala/pages/member/archive/index.dart';
+import 'package:pilipala/utils/utils.dart';
 import 'package:pull_to_refresh_notification/pull_to_refresh_notification.dart';
 
 class ArchivePanel extends StatefulWidget {
-  const ArchivePanel({super.key});
+  final int? mid;
+  const ArchivePanel({super.key, this.mid});
 
   @override
   State<ArchivePanel> createState() => _ArchivePanelState();
@@ -17,11 +19,21 @@ class ArchivePanel extends StatefulWidget {
 class _ArchivePanelState extends State<ArchivePanel>
     with AutomaticKeepAliveClientMixin {
   DateTime lastRefreshTime = DateTime.now();
-  late final LoadMoreListSource source = LoadMoreListSource();
+  late final LoadMoreListSource source;
+  late final ArchiveController _archiveController;
 
   @override
   bool get wantKeepAlive => true;
 
+  @override
+  void initState() {
+    super.initState();
+    print('🐶🐶： ${widget.mid}');
+    _archiveController = Get.put(ArchiveController(widget.mid),
+        tag: Utils.makeHeroTag(widget.mid));
+    source = LoadMoreListSource(_archiveController);
+  }
+
   @override
   Widget build(BuildContext context) {
     super.build(context);
@@ -40,14 +52,63 @@ class _ArchivePanelState extends State<ArchivePanel>
             //     return PullToRefreshHeader(info, lastRefreshTime);
             //   },
             // ),
-            const SizedBox(height: 4),
+            Padding(
+              padding:
+                  const EdgeInsets.only(left: 14, top: 8, bottom: 8, right: 8),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  const Text('排序方式'),
+                  SizedBox(
+                    height: 35,
+                    width: 85,
+                    child: TextButton(
+                      style: ButtonStyle(
+                        padding: MaterialStateProperty.all(EdgeInsets.zero),
+                      ),
+                      onPressed: () {
+                        // _archiveController.order = 'click';
+                        // _archiveController.pn = 1;
+                        _archiveController.toggleSort();
+                        source.refresh(true);
+                        // LoadMoreListSource().loadData();
+                      },
+                      child: Obx(
+                        () => AnimatedSwitcher(
+                          duration: const Duration(milliseconds: 400),
+                          transitionBuilder:
+                              (Widget child, Animation<double> animation) {
+                            return ScaleTransition(
+                                scale: animation, child: child);
+                          },
+                          child: Text(
+                            _archiveController.currentOrder['label']!,
+                            key: ValueKey<String>(
+                                _archiveController.currentOrder['label']!),
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ),
             Expanded(
               child: LoadingMoreList<VListItemModel>(
                 ListConfig<VListItemModel>(
                   sourceList: source,
                   itemBuilder:
                       (BuildContext c, VListItemModel item, int index) {
-                    return VideoCardH(videoItem: item);
+                    if (index == 0) {
+                      return Column(
+                        children: [
+                          const SizedBox(height: 6),
+                          VideoCardH(videoItem: item)
+                        ],
+                      );
+                    } else {
+                      return VideoCardH(videoItem: item);
+                    }
                   },
                   indicatorBuilder: _buildIndicator,
                 ),
@@ -142,14 +203,18 @@ class _ArchivePanelState extends State<ArchivePanel>
 }
 
 class LoadMoreListSource extends LoadingMoreBase<VListItemModel> {
-  final ArchiveController _archiveController =
+  late ArchiveController ctr;
-      Get.put(ArchiveController(), tag: Get.arguments['heroTag']);
+  LoadMoreListSource(this.ctr);
+  bool forceRefresh = false;
 
   @override
   Future<bool> loadData([bool isloadMoreAction = false]) async {
     bool isSuccess = false;
-    var res = await _archiveController.getMemberArchive();
+    var res = await ctr.getMemberArchive();
     if (res['status']) {
+      if (ctr.pn == 2) {
+        clear();
+      }
       addAll(res['data'].list.vlist);
     }
     if (length < res['data'].page['count']) {
@@ -159,4 +224,17 @@ class LoadMoreListSource extends LoadingMoreBase<VListItemModel> {
     }
     return isSuccess;
   }
+
+  @override
+  Future<bool> refresh([bool clearBeforeRequest = false]) async {
+    // _hasMore = true;
+    // pageindex = 1;
+    // //force to refresh list when you don't want clear list before request
+    // //for the case, if your list already has 20 items.
+    forceRefresh = !clearBeforeRequest;
+    var result = await super.refresh(clearBeforeRequest);
+
+    forceRefresh = false;
+    return result;
+  }
 }

lib/pages/member/controller.dart

@@ -3,22 +3,26 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/http/member.dart';
+import 'package:pilipala/http/user.dart';
 import 'package:pilipala/http/video.dart';
 import 'package:pilipala/models/member/archive.dart';
 import 'package:pilipala/models/member/info.dart';
 import 'package:pilipala/utils/storage.dart';
+import 'package:share_plus/share_plus.dart';
 
 class MemberController extends GetxController {
   late int mid;
   Rx<MemberInfoModel> memberInfo = MemberInfoModel().obs;
   Map? userStat;
-  String? face;
+  RxString face = ''.obs;
   String? heroTag;
   Box userInfoCache = GStrorage.userInfo;
   late int ownerMid;
   // 投稿列表
   RxList<VListItemModel>? archiveList = [VListItemModel()].obs;
   var userInfo;
+  RxInt attribute = (-1).obs;
+  RxString attributeText = '关注'.obs;
 
   @override
   void onInit() {
@@ -26,8 +30,9 @@ class MemberController extends GetxController {
     mid = int.parse(Get.parameters['mid']!);
     userInfo = userInfoCache.get('userInfoCache');
     ownerMid = userInfo != null ? userInfo.mid : -1;
-    face = Get.arguments['face'] ?? '';
+    face.value = Get.arguments['face'] ?? '';
     heroTag = Get.arguments['heroTag'] ?? '';
+    relationSearch();
   }
 
   // 获取用户信息
@@ -36,6 +41,7 @@ class MemberController extends GetxController {
     var res = await MemberHttp.memberInfo(mid: mid);
     if (res['status']) {
       memberInfo.value = res['data'];
+      face.value = res['data'].face;
     }
     return res;
   }
@@ -63,7 +69,10 @@ class MemberController extends GetxController {
       SmartDialog.showToast('账号未登录');
       return;
     }
-
+    if (attribute.value == 128) {
+      blockUser();
+      return;
+    }
     SmartDialog.show(
       useSystem: true,
       animationType: SmartAnimationType.centerFade_otherSlide,
@@ -73,8 +82,12 @@ class MemberController extends GetxController {
           content: Text(memberInfo.value.isFollowed! ? '取消关注UP主?' : '关注UP主?'),
           actions: [
             TextButton(
-                onPressed: () => SmartDialog.dismiss(),
+              onPressed: () => SmartDialog.dismiss(),
-                child: const Text('点错了')),
+              child: Text(
+                '点错了',
+                style: TextStyle(color: Theme.of(context).colorScheme.outline),
+              ),
+            ),
             TextButton(
               onPressed: () async {
                 await VideoHttp.relationMod(
@@ -83,8 +96,7 @@ class MemberController extends GetxController {
                   reSrc: 11,
                 );
                 memberInfo.value.isFollowed = !memberInfo.value.isFollowed!;
-                SmartDialog.dismiss();
+                relationSearch();
-                SmartDialog.showLoading();
                 SmartDialog.dismiss();
                 memberInfo.update((val) {});
               },
@@ -95,4 +107,70 @@ class MemberController extends GetxController {
       },
     );
   }
+
+  // 关系查询
+  Future relationSearch() async {
+    if (userInfo == null) return;
+    if (mid == ownerMid) return;
+    var res = await UserHttp.relationSearch(mid);
+    if (res['status']) {
+      attribute.value = res['data']['relation']['attribute'];
+      attributeText.value = attribute.value == 0
+          ? '关注'
+          : attribute.value == 2
+              ? '已关注'
+              : attribute.value == 6
+                  ? '已互粉'
+                  : '已拉黑';
+    }
+  }
+
+  // 拉黑用户
+  Future blockUser() async {
+    if (userInfo == null) {
+      SmartDialog.showToast('账号未登录');
+      return;
+    }
+    SmartDialog.show(
+      useSystem: true,
+      animationType: SmartAnimationType.centerFade_otherSlide,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: const Text('提示'),
+          content: Text(attribute.value != 128 ? '确定拉黑UP主?' : '从黑名单移除UP主'),
+          actions: [
+            TextButton(
+              onPressed: () => SmartDialog.dismiss(),
+              child: Text(
+                '点错了',
+                style: TextStyle(color: Theme.of(context).colorScheme.outline),
+              ),
+            ),
+            TextButton(
+              onPressed: () async {
+                var res = await VideoHttp.relationMod(
+                  mid: mid,
+                  act: attribute.value != 128 ? 5 : 6,
+                  reSrc: 11,
+                );
+                SmartDialog.dismiss();
+                if (res['status']) {
+                  attribute.value = attribute.value != 128 ? 128 : 0;
+                  attributeText.value = attribute.value == 128 ? '已拉黑' : '关注';
+                  memberInfo.value.isFollowed = false;
+                  relationSearch();
+                  memberInfo.update((val) {});
+                }
+              },
+              child: const Text('确认'),
+            )
+          ],
+        );
+      },
+    );
+  }
+
+  void shareUser() {
+    Share.share('${memberInfo.value.name} - https://space.bilibili.com/$mid');
+  }
 }

lib/pages/member/dynamic/controller.dart

@@ -2,6 +2,7 @@ import 'package:get/get.dart';
 import 'package:pilipala/http/member.dart';
 
 class MemberDynamicPanelController extends GetxController {
+  MemberDynamicPanelController(this.mid);
   int? mid;
   String offset = '';
   int count = 0;
@@ -9,7 +10,7 @@ class MemberDynamicPanelController extends GetxController {
   @override
   void onInit() {
     super.onInit();
-    mid = int.parse(Get.parameters['mid']!);
+    mid ??= int.parse(Get.parameters['mid']!);
   }
 
   Future getMemberDynamic() async {

lib/pages/member/dynamic/view.dart

@@ -4,11 +4,13 @@ import 'package:get/get.dart';
 import 'package:loading_more_list/loading_more_list.dart';
 import 'package:pilipala/models/dynamics/result.dart';
 import 'package:pilipala/pages/dynamics/widgets/dynamic_panel.dart';
+import 'package:pilipala/utils/utils.dart';
 
 import 'controller.dart';
 
 class MemberDynamicPanel extends StatefulWidget {
-  const MemberDynamicPanel({super.key});
+  final int? mid;
+  const MemberDynamicPanel({super.key, this.mid});
 
   @override
   State<MemberDynamicPanel> createState() => _MemberDynamicPanelState();
@@ -17,11 +19,20 @@ class MemberDynamicPanel extends StatefulWidget {
 class _MemberDynamicPanelState extends State<MemberDynamicPanel>
     with AutomaticKeepAliveClientMixin {
   DateTime lastRefreshTime = DateTime.now();
-  late final LoadMoreListSource source = LoadMoreListSource();
+  late final LoadMoreListSource source;
+  late final MemberDynamicPanelController _dynamicController;
 
   @override
   bool get wantKeepAlive => true;
 
+  @override
+  void initState() {
+    super.initState();
+    _dynamicController = Get.put(MemberDynamicPanelController(widget.mid),
+        tag: Utils.makeHeroTag(widget.mid));
+    source = LoadMoreListSource(_dynamicController);
+  }
+
   @override
   Widget build(BuildContext context) {
     super.build(context);
@@ -118,13 +129,13 @@ class _MemberDynamicPanelState extends State<MemberDynamicPanel>
 }
 
 class LoadMoreListSource extends LoadingMoreBase<DynamicItemModel> {
-  final _dynamicController =
+  late MemberDynamicPanelController ctr;
-      Get.put(MemberDynamicPanelController(), tag: Get.arguments['heroTag']);
+  LoadMoreListSource(this.ctr);
 
   @override
   Future<bool> loadData([bool isloadMoreAction = false]) async {
     bool isSuccess = false;
-    var res = await _dynamicController.getMemberDynamic();
+    var res = await ctr.getMemberDynamic();
     if (res['status']) {
       addAll(res['data'].items);
     }

lib/pages/member/view.dart

@@ -8,6 +8,7 @@ import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/pages/member/archive/view.dart';
 import 'package:pilipala/pages/member/dynamic/index.dart';
 import 'package:pilipala/pages/member/index.dart';
+import 'package:pilipala/utils/utils.dart';
 
 import 'widgets/profile.dart';
 
@@ -20,21 +21,26 @@ class MemberPage extends StatefulWidget {
 
 class _MemberPageState extends State<MemberPage>
     with SingleTickerProviderStateMixin {
-  final MemberController _memberController = Get.put(MemberController());
+  late String heroTag;
+  late MemberController _memberController;
   Future? _futureBuilderFuture;
   final ScrollController _extendNestCtr = ScrollController();
   late TabController _tabController;
   final StreamController<bool> appbarStream = StreamController<bool>();
+  late int mid;
 
   @override
   void initState() {
     super.initState();
+    mid = int.parse(Get.parameters['mid']!);
+    heroTag = Get.arguments['heroTag'] ?? Utils.makeHeroTag(mid);
+    _memberController = Get.put(MemberController(), tag: heroTag);
     _tabController = TabController(length: 3, vsync: this, initialIndex: 2);
     _futureBuilderFuture = _memberController.getInfo();
     _extendNestCtr.addListener(
       () {
         double offset = _extendNestCtr.position.pixels;
-        if (offset > 250) {
+        if (offset > 230) {
           appbarStream.add(true);
         } else {
           appbarStream.add(false);
@@ -63,7 +69,7 @@ class _MemberPageState extends State<MemberPage>
               elevation: 0,
               scrolledUnderElevation: 1,
               forceElevated: innerBoxIsScrolled,
-              expandedHeight: 320,
+              expandedHeight: 290,
               titleSpacing: 0,
               title: StreamBuilder(
                 stream: appbarStream.stream,
@@ -77,11 +83,13 @@ class _MemberPageState extends State<MemberPage>
                       children: [
                         Row(
                           children: [
-                            NetworkImgLayer(
+                            Obx(
-                              width: 35,
+                              () => NetworkImgLayer(
-                              height: 35,
+                                width: 35,
-                              type: 'avatar',
+                                height: 35,
-                              src: _memberController.face ?? '',
+                                type: 'avatar',
+                                src: _memberController.face.value,
+                              ),
                             ),
                             const SizedBox(width: 10),
                             Obx(
@@ -102,40 +110,83 @@ class _MemberPageState extends State<MemberPage>
                 },
               ),
               actions: [
-                IconButton(onPressed: () {}, icon: const Icon(Icons.more_vert)),
+                IconButton(
+                  onPressed: () => Get.toNamed(
+                      '/memberSearch?mid=${Get.parameters['mid']}&uname=${_memberController.memberInfo.value.name!}'),
+                  icon: const Icon(Icons.search_outlined),
+                ),
+                PopupMenuButton(
+                  icon: const Icon(Icons.more_vert),
+                  itemBuilder: (BuildContext context) => <PopupMenuEntry>[
+                    if (_memberController.ownerMid !=
+                        _memberController.mid) ...[
+                      PopupMenuItem(
+                        onTap: () => _memberController.blockUser(),
+                        child: Row(
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            const Icon(Icons.block, size: 19),
+                            const SizedBox(width: 10),
+                            Text(_memberController.attribute.value != 128
+                                ? '加入黑名单'
+                                : '移除黑名单'),
+                          ],
+                        ),
+                      )
+                    ],
+                    PopupMenuItem(
+                      onTap: () => _memberController.shareUser(),
+                      child: Row(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          const Icon(Icons.share_outlined, size: 19),
+                          const SizedBox(width: 10),
+                          Text(_memberController.ownerMid !=
+                                  _memberController.mid
+                              ? '分享UP主'
+                              : '分享我的主页'),
+                        ],
+                      ),
+                    ),
+                  ],
+                ),
                 const SizedBox(width: 4),
               ],
               flexibleSpace: FlexibleSpaceBar(
                 background: Stack(
                   children: [
-                    if (_memberController.face != null)
+                    Obx(
-                      Positioned.fill(
+                      () => _memberController.face.value != ''
-                        bottom: 10,
+                          ? Positioned.fill(
-                        child: Container(
+                              bottom: 10,
-                          decoration: BoxDecoration(
+                              child: Container(
-                            image: DecorationImage(
+                                decoration: BoxDecoration(
-                              fit: BoxFit.fitWidth,
+                                  image: DecorationImage(
-                              image: NetworkImage(_memberController.face!),
+                                    fit: BoxFit.fitWidth,
-                              alignment: Alignment.topCenter,
+                                    image: NetworkImage(
-                              isAntiAlias: true,
+                                        _memberController.face.value),
-                            ),
+                                    alignment: Alignment.topCenter,
-                          ),
+                                    isAntiAlias: true,
-                          foregroundDecoration: BoxDecoration(
+                                  ),
-                            gradient: LinearGradient(
+                                ),
-                              colors: [
+                                foregroundDecoration: BoxDecoration(
-                                Theme.of(context)
+                                  gradient: LinearGradient(
-                                    .colorScheme
+                                    colors: [
-                                    .background
+                                      Theme.of(context)
-                                    .withOpacity(0.44),
+                                          .colorScheme
-                                Theme.of(context).colorScheme.background,
+                                          .background
-                              ],
+                                          .withOpacity(0.44),
-                              begin: Alignment.topCenter,
+                                      Theme.of(context).colorScheme.background,
-                              end: Alignment.bottomCenter,
+                                    ],
-                              stops: const [0.0, 0.46],
+                                    begin: Alignment.topCenter,
-                            ),
+                                    end: Alignment.bottomCenter,
-                          ),
+                                    stops: const [0.0, 0.46],
-                        ),
+                                  ),
-                      ),
+                                ),
+                              ),
+                            )
+                          : const SizedBox(),
+                    ),
                     Positioned(
                       left: 0,
                       right: 0,
@@ -145,159 +196,7 @@ class _MemberPageState extends State<MemberPage>
                         color: Theme.of(context).colorScheme.background,
                       ),
                     ),
-                    Padding(
+                    profileWidget(),
-                      padding: const EdgeInsets.only(left: 18, right: 18),
-                      child: FutureBuilder(
-                        future: _futureBuilderFuture,
-                        builder: (context, snapshot) {
-                          if (snapshot.connectionState ==
-                              ConnectionState.done) {
-                            Map data = snapshot.data!;
-                            if (data['status']) {
-                              return Obx(
-                                () => Stack(
-                                  alignment: AlignmentDirectional.center,
-                                  children: [
-                                    Column(
-                                      crossAxisAlignment:
-                                          CrossAxisAlignment.start,
-                                      children: [
-                                        profile(_memberController),
-                                        const SizedBox(height: 14),
-                                        Row(
-                                          children: [
-                                            Flexible(
-                                                child: Text(
-                                              _memberController
-                                                  .memberInfo.value.name!,
-                                              maxLines: 1,
-                                              overflow: TextOverflow.ellipsis,
-                                              style: Theme.of(context)
-                                                  .textTheme
-                                                  .bodyLarge!
-                                                  .copyWith(
-                                                      fontWeight:
-                                                          FontWeight.bold),
-                                            )),
-                                            const SizedBox(width: 2),
-                                            if (_memberController
-                                                    .memberInfo.value.sex ==
-                                                '女')
-                                              const Icon(
-                                                FontAwesomeIcons.venus,
-                                                size: 14,
-                                                color: Colors.pink,
-                                              ),
-                                            if (_memberController
-                                                    .memberInfo.value.sex ==
-                                                '男')
-                                              const Icon(
-                                                FontAwesomeIcons.mars,
-                                                size: 14,
-                                                color: Colors.blue,
-                                              ),
-                                            const SizedBox(width: 4),
-                                            Image.asset(
-                                              'assets/images/lv/lv${_memberController.memberInfo.value.level}.png',
-                                              height: 11,
-                                            ),
-                                            const SizedBox(width: 6),
-                                            if (_memberController.memberInfo
-                                                        .value.vip!.status ==
-                                                    1 &&
-                                                _memberController.memberInfo
-                                                            .value.vip!.label![
-                                                        'img_label_uri_hans'] !=
-                                                    '') ...[
-                                              Image.network(
-                                                _memberController.memberInfo
-                                                        .value.vip!.label![
-                                                    'img_label_uri_hans'],
-                                                height: 20,
-                                              ),
-                                            ] else if (_memberController
-                                                        .memberInfo
-                                                        .value
-                                                        .vip!
-                                                        .status ==
-                                                    1 &&
-                                                _memberController.memberInfo
-                                                            .value.vip!.label![
-                                                        'img_label_uri_hans_static'] !=
-                                                    '') ...[
-                                              Image.network(
-                                                _memberController.memberInfo
-                                                        .value.vip!.label![
-                                                    'img_label_uri_hans_static'],
-                                                height: 20,
-                                              ),
-                                            ]
-                                          ],
-                                        ),
-                                        if (_memberController.memberInfo.value
-                                                .official!['title'] !=
-                                            '') ...[
-                                          const SizedBox(height: 6),
-                                          Text.rich(
-                                            maxLines: 2,
-                                            TextSpan(
-                                              text: _memberController
-                                                          .memberInfo
-                                                          .value
-                                                          .official!['role'] ==
-                                                      1
-                                                  ? '个人认证：'
-                                                  : '企业认证：',
-                                              style: TextStyle(
-                                                color: Theme.of(context)
-                                                    .primaryColor,
-                                              ),
-                                              children: [
-                                                TextSpan(
-                                                  text: _memberController
-                                                      .memberInfo
-                                                      .value
-                                                      .official!['title'],
-                                                ),
-                                              ],
-                                            ),
-                                            softWrap: true,
-                                          ),
-                                        ],
-                                        const SizedBox(height: 4),
-                                        if (_memberController
-                                                .memberInfo.value.sign !=
-                                            '')
-                                          SelectableRegion(
-                                            magnifierConfiguration:
-                                                const TextMagnifierConfiguration(),
-                                            focusNode: FocusNode(),
-                                            selectionControls:
-                                                MaterialTextSelectionControls(),
-                                            child: Text(
-                                              _memberController
-                                                  .memberInfo.value.sign!,
-                                              textAlign: TextAlign.left,
-                                              maxLines: 2,
-                                              overflow: TextOverflow.ellipsis,
-                                            ),
-                                          ),
-                                      ],
-                                    ),
-                                  ],
-                                ),
-                              );
-                            } else {
-                              return const SizedBox();
-                            }
-                          } else {
-                            // 骨架屏
-                            return profile(_memberController,
-                                loadingStatus: true);
-                          }
-                        },
-                      ),
-                    )
                   ],
                 ),
               ),
@@ -322,10 +221,10 @@ class _MemberPageState extends State<MemberPage>
             Expanded(
                 child: TabBarView(
               controller: _tabController,
-              children: const [
+              children: [
-                Text('主页'),
+                const Text('主页'),
-                MemberDynamicPanel(),
+                MemberDynamicPanel(mid: mid),
-                ArchivePanel(),
+                ArchivePanel(mid: mid),
               ],
             ))
           ],
@@ -333,4 +232,143 @@ class _MemberPageState extends State<MemberPage>
       ),
     );
   }
+
+  Widget profileWidget() {
+    return Padding(
+      padding: const EdgeInsets.only(left: 18, right: 18),
+      child: FutureBuilder(
+        future: _futureBuilderFuture,
+        builder: (context, snapshot) {
+          if (snapshot.connectionState == ConnectionState.done) {
+            Map data = snapshot.data!;
+            if (data['status']) {
+              return Obx(
+                () => Stack(
+                  alignment: AlignmentDirectional.center,
+                  children: [
+                    Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        profile(_memberController),
+                        const SizedBox(height: 14),
+                        Row(
+                          children: [
+                            Flexible(
+                                child: Text(
+                              _memberController.memberInfo.value.name!,
+                              maxLines: 1,
+                              overflow: TextOverflow.ellipsis,
+                              style: Theme.of(context)
+                                  .textTheme
+                                  .bodyLarge!
+                                  .copyWith(fontWeight: FontWeight.bold),
+                            )),
+                            const SizedBox(width: 2),
+                            if (_memberController.memberInfo.value.sex == '女')
+                              const Icon(
+                                FontAwesomeIcons.venus,
+                                size: 14,
+                                color: Colors.pink,
+                              ),
+                            if (_memberController.memberInfo.value.sex == '男')
+                              const Icon(
+                                FontAwesomeIcons.mars,
+                                size: 14,
+                                color: Colors.blue,
+                              ),
+                            const SizedBox(width: 4),
+                            Image.asset(
+                              'assets/images/lv/lv${_memberController.memberInfo.value.level}.png',
+                              height: 11,
+                            ),
+                            const SizedBox(width: 6),
+                            if (_memberController
+                                        .memberInfo.value.vip!.status ==
+                                    1 &&
+                                _memberController.memberInfo.value.vip!
+                                        .label!['img_label_uri_hans'] !=
+                                    '') ...[
+                              Image.network(
+                                _memberController.memberInfo.value.vip!
+                                    .label!['img_label_uri_hans'],
+                                height: 20,
+                              ),
+                            ] else if (_memberController
+                                        .memberInfo.value.vip!.status ==
+                                    1 &&
+                                _memberController.memberInfo.value.vip!
+                                        .label!['img_label_uri_hans_static'] !=
+                                    '') ...[
+                              Image.network(
+                                _memberController.memberInfo.value.vip!
+                                    .label!['img_label_uri_hans_static'],
+                                height: 20,
+                              ),
+                            ]
+                          ],
+                        ),
+                        if (_memberController
+                                .memberInfo.value.official!['title'] !=
+                            '') ...[
+                          const SizedBox(height: 6),
+                          Text.rich(
+                            maxLines: 2,
+                            TextSpan(
+                              text: _memberController
+                                          .memberInfo.value.official!['role'] ==
+                                      1
+                                  ? '个人认证：'
+                                  : '企业认证：',
+                              style: TextStyle(
+                                color: Theme.of(context).primaryColor,
+                              ),
+                              children: [
+                                TextSpan(
+                                  text: _memberController
+                                      .memberInfo.value.official!['title'],
+                                ),
+                              ],
+                            ),
+                            softWrap: true,
+                          ),
+                        ],
+                        const SizedBox(height: 4),
+                        if (_memberController.memberInfo.value.sign != '')
+                          SelectableText(
+                            _memberController.memberInfo.value.sign!,
+                            maxLines: _memberController
+                                        .memberInfo.value.official!['title'] !=
+                                    ''
+                                ? 1
+                                : 2,
+                            style: const TextStyle(
+                                overflow: TextOverflow.ellipsis),
+                            onTap: () {
+                              showDialog(
+                                context: context,
+                                builder: (context) {
+                                  return AlertDialog(
+                                    content: SelectableText(_memberController
+                                        .memberInfo.value.sign!),
+                                  );
+                                },
+                              );
+                            },
+                          )
+                      ],
+                    ),
+                  ],
+                ),
+              );
+            } else {
+              return const SizedBox();
+            }
+          } else {
+            // 骨架屏
+            return profile(_memberController, loadingStatus: true);
+          }
+        },
+      ),
+    );
+  }
 }

lib/pages/member/widgets/profile.dart

@@ -15,62 +15,63 @@ Widget profile(ctr, {loadingStatus = false}) {
         child: Row(
           children: [
             Hero(
-                tag: ctr.heroTag!,
+              tag: ctr.heroTag!,
-                child: Stack(
+              child: Stack(
-                  children: [
+                children: [
-                    NetworkImgLayer(
+                  NetworkImgLayer(
-                      width: 90,
+                    width: 90,
-                      height: 90,
+                    height: 90,
-                      type: 'avatar',
+                    type: 'avatar',
-                      src: !loadingStatus ? memberInfo.face : ctr.face,
+                    src: !loadingStatus ? memberInfo.face : ctr.face.value,
-                    ),
+                  ),
-                    if (!loadingStatus &&
+                  if (!loadingStatus &&
-                        memberInfo.liveRoom != null &&
+                      memberInfo.liveRoom != null &&
-                        memberInfo.liveRoom!.liveStatus == 1)
+                      memberInfo.liveRoom!.liveStatus == 1)
-                      Positioned(
+                    Positioned(
-                        bottom: 0,
+                      bottom: 0,
-                        left: 14,
+                      left: 14,
-                        child: GestureDetector(
+                      child: GestureDetector(
-                          onTap: () {
+                        onTap: () {
-                            LiveItemModel liveItem = LiveItemModel.fromJson({
+                          LiveItemModel liveItem = LiveItemModel.fromJson({
-                              'title': memberInfo.liveRoom!.title,
+                            'title': memberInfo.liveRoom!.title,
-                              'uname': memberInfo.name,
+                            'uname': memberInfo.name,
-                              'face': memberInfo.face,
+                            'face': memberInfo.face,
-                              'roomid': memberInfo.liveRoom!.roomId,
+                            'roomid': memberInfo.liveRoom!.roomId,
-                              'watched_show': memberInfo.liveRoom!.watchedShow,
+                            'watched_show': memberInfo.liveRoom!.watchedShow,
-                            });
+                          });
-                            Get.toNamed(
+                          Get.toNamed(
-                              '/liveRoom?roomid=${memberInfo.liveRoom!.roomId}',
+                            '/liveRoom?roomid=${memberInfo.liveRoom!.roomId}',
-                              arguments: {'liveItem': liveItem},
+                            arguments: {'liveItem': liveItem},
-                            );
+                          );
-                          },
+                        },
-                          child: Container(
+                        child: Container(
-                            padding: const EdgeInsets.fromLTRB(6, 2, 6, 2),
+                          padding: const EdgeInsets.fromLTRB(6, 2, 6, 2),
-                            decoration: BoxDecoration(
+                          decoration: BoxDecoration(
-                              color: Theme.of(context).colorScheme.primary,
+                            color: Theme.of(context).colorScheme.primary,
-                              borderRadius:
+                            borderRadius:
-                                  const BorderRadius.all(Radius.circular(10)),
+                                const BorderRadius.all(Radius.circular(10)),
-                            ),
-                            child: Row(children: [
-                              Image.asset(
-                                'assets/images/live.gif',
-                                height: 10,
-                              ),
-                              Text(
-                                ' 直播中',
-                                style: TextStyle(
-                                    color: Colors.white,
-                                    fontSize: Theme.of(context)
-                                        .textTheme
-                                        .labelSmall!
-                                        .fontSize),
-                              )
-                            ]),
                           ),
+                          child: Row(children: [
+                            Image.asset(
+                              'assets/images/live.gif',
+                              height: 10,
+                            ),
+                            Text(
+                              ' 直播中',
+                              style: TextStyle(
+                                  color: Colors.white,
+                                  fontSize: Theme.of(context)
+                                      .textTheme
+                                      .labelSmall!
+                                      .fontSize),
+                            )
+                          ]),
                         ),
-                      )
+                      ),
-                  ],
+                    )
-                )),
+                ],
+              ),
+            ),
             const SizedBox(width: 12),
             Expanded(
               child: Column(
@@ -122,12 +123,14 @@ Widget profile(ctr, {loadingStatus = false}) {
                                       : '-',
                                   style: const TextStyle(
                                       fontWeight: FontWeight.bold)),
-                              Text('粉丝',
+                              Text(
-                                  style: TextStyle(
+                                '粉丝',
-                                      fontSize: Theme.of(context)
+                                style: TextStyle(
-                                          .textTheme
+                                    fontSize: Theme.of(context)
-                                          .labelMedium!
+                                        .textTheme
-                                          .fontSize))
+                                        .labelMedium!
+                                        .fontSize),
+                              )
                             ],
                           ),
                         ),
@@ -152,34 +155,41 @@ Widget profile(ctr, {loadingStatus = false}) {
                   if (ctr.ownerMid != ctr.mid) ...[
                     Row(
                       children: [
-                        TextButton(
+                        Obx(
-                          onPressed: () => ctr.actionRelationMod(),
+                          () => Expanded(
-                          style: TextButton.styleFrom(
+                            child: TextButton(
-                            padding: const EdgeInsets.only(left: 42, right: 42),
+                              onPressed: () => ctr.actionRelationMod(),
-                            foregroundColor:
+                              style: TextButton.styleFrom(
-                                !loadingStatus && memberInfo.isFollowed!
+                                foregroundColor: ctr.attribute.value == -1
-                                    ? Theme.of(context).colorScheme.outline
+                                    ? Colors.transparent
-                                    : Theme.of(context).colorScheme.onPrimary,
+                                    : ctr.attribute.value != 0
-                            backgroundColor: !loadingStatus &&
+                                        ? Theme.of(context).colorScheme.outline
-                                    memberInfo.isFollowed!
+                                        : Theme.of(context)
-                                ? Theme.of(context).colorScheme.onInverseSurface
+                                            .colorScheme
-                                : Theme.of(context)
+                                            .onPrimary,
-                                    .colorScheme
+                                backgroundColor: ctr.attribute.value != 0
-                                    .primary, // 设置按钮背景色
+                                    ? Theme.of(context)
+                                        .colorScheme
+                                        .onInverseSurface
+                                    : Theme.of(context)
+                                        .colorScheme
+                                        .primary, // 设置按钮背景色
+                              ),
+                              child: Obx(() => Text(ctr.attributeText.value)),
+                            ),
                           ),
-                          child: Text(!loadingStatus && memberInfo.isFollowed!
-                              ? '取关'
-                              : '关注'),
                         ),
                         const SizedBox(width: 8),
-                        TextButton(
+                        Expanded(
-                          onPressed: () {},
+                          child: TextButton(
-                          style: TextButton.styleFrom(
+                            onPressed: () {},
-                            padding: const EdgeInsets.only(left: 42, right: 42),
+                            style: TextButton.styleFrom(
-                            backgroundColor:
+                              backgroundColor: Theme.of(context)
-                                Theme.of(context).colorScheme.onInverseSurface,
+                                  .colorScheme
+                                  .onInverseSurface,
+                            ),
+                            child: const Text('发消息'),
                           ),
-                          child: const Text('发消息'),
                         )
                       ],
                     )

lib/pages/member_search/controller.dart

@@ -0,0 +1,90 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/http/member.dart';
+import 'package:pilipala/models/member/archive.dart';
+
+class MemberSearchController extends GetxController {
+  final ScrollController scrollController = ScrollController();
+  Rx<TextEditingController> controller = TextEditingController().obs;
+  final FocusNode searchFocusNode = FocusNode();
+  RxString searchKeyWord = ''.obs;
+  String hintText = '搜索';
+  RxString loadingStatus = 'init'.obs;
+  RxString loadingText = '加载中...'.obs;
+  bool hasRequest = false;
+  late int mid;
+  RxString uname = ''.obs;
+  int archivePn = 1;
+  int archiveCount = 0;
+  RxList<VListItemModel> archiveList = <VListItemModel>[].obs;
+  int dynamic_pn = 1;
+  RxList<VListItemModel> dynamicList = <VListItemModel>[].obs;
+
+  int ps = 30;
+
+  @override
+  void onInit() {
+    super.onInit();
+    mid = int.parse(Get.parameters['mid']!);
+    uname.value = Get.parameters['uname']!;
+  }
+
+  // 清空搜索
+  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';
+    if (hasRequest) {
+      archivePn = 1;
+      searchArchives();
+    }
+  }
+
+  // 搜索视频
+  Future searchArchives({type = 'init'}) async {
+    if (type == 'onLoad' && loadingText.value == '没有更多了') {
+      return;
+    }
+    var res = await MemberHttp.memberArchive(
+      mid: mid,
+      pn: archivePn,
+      keyword: controller.value.text,
+      order: 'pubdate',
+    );
+    if (res['status']) {
+      if (type == 'init' || archivePn == 1) {
+        archiveList.value = res['data'].list.vlist;
+      } else {
+        archiveList.addAll(res['data'].list.vlist);
+      }
+      archiveCount = res['data'].page['count'];
+      if (archiveList.length == archiveCount) {
+        loadingText.value = '没有更多了';
+      }
+      archivePn += 1;
+      hasRequest = true;
+    }
+    // loadingStatus.value = 'finish';
+    return res;
+  }
+
+  // 搜索动态
+  Future searchDynamic() async {}
+
+  //
+  onLoad() {
+    searchArchives(type: 'onLoad');
+  }
+}

lib/pages/member_search/index.dart

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

lib/pages/member_search/view.dart

@@ -0,0 +1,195 @@
+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/skeleton/video_card_h.dart';
+import 'package:pilipala/common/widgets/http_error.dart';
+import 'package:pilipala/common/widgets/no_data.dart';
+import 'package:pilipala/common/widgets/video_card_h.dart';
+
+import 'controller.dart';
+
+class MemberSearchPage extends StatefulWidget {
+  const MemberSearchPage({super.key});
+
+  @override
+  State<MemberSearchPage> createState() => _MemberSearchPageState();
+}
+
+class _MemberSearchPageState extends State<MemberSearchPage>
+    with SingleTickerProviderStateMixin {
+  final MemberSearchController _memberSearchCtr =
+      Get.put(MemberSearchController());
+  late ScrollController scrollController;
+
+  @override
+  void initState() {
+    super.initState();
+    scrollController = _memberSearchCtr.scrollController;
+    scrollController.addListener(
+      () {
+        if (scrollController.position.pixels >=
+            scrollController.position.maxScrollExtent - 300) {
+          EasyThrottle.throttle('history', const Duration(seconds: 1), () {
+            _memberSearchCtr.onLoad();
+          });
+        }
+      },
+    );
+    // _tabController = TabController(length: 2, vsync: this);
+  }
+
+  @override
+  void dispose() {
+    // _tabController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        titleSpacing: 0,
+        actions: [
+          IconButton(
+              onPressed: () => _memberSearchCtr.submit(),
+              icon: const Icon(CupertinoIcons.search, size: 22)),
+          const SizedBox(width: 10)
+        ],
+        title: Obx(
+          () => TextField(
+            autofocus: true,
+            focusNode: _memberSearchCtr.searchFocusNode,
+            controller: _memberSearchCtr.controller.value,
+            textInputAction: TextInputAction.search,
+            onChanged: (value) => _memberSearchCtr.onChange(value),
+            decoration: InputDecoration(
+              hintText: _memberSearchCtr.hintText,
+              border: InputBorder.none,
+              suffixIcon: IconButton(
+                icon: Icon(
+                  Icons.clear,
+                  size: 22,
+                  color: Theme.of(context).colorScheme.outline,
+                ),
+                onPressed: () => _memberSearchCtr.onClear(),
+              ),
+            ),
+            onSubmitted: (String value) => _memberSearchCtr.submit(),
+          ),
+        ),
+      ),
+      body: Obx(
+        () => Column(
+          children: _memberSearchCtr.loadingStatus.value == 'init'
+              ? [
+                  Expanded(
+                    child: Center(
+                      child: Text('搜索「${_memberSearchCtr.uname.value}」的动态、视频'),
+                    ),
+                  ),
+                ]
+              : [
+                  // TabBar(
+                  //   controller: _tabController,
+                  //   tabs: const [
+                  //     Tab(text: "视频"),
+                  //     Tab(text: "动态"),
+                  //   ],
+                  // ),
+                  Expanded(
+                    child:
+                        // TabBarView(
+                        //   controller: _tabController,
+                        //   children: [
+                        FutureBuilder(
+                      future: _memberSearchCtr.searchArchives(),
+                      builder: (context, snapshot) {
+                        if (snapshot.connectionState == ConnectionState.done) {
+                          Map data = snapshot.data as Map;
+                          if (data['status']) {
+                            return Obx(
+                              () => _memberSearchCtr.archiveList.isNotEmpty
+                                  ? ListView.builder(
+                                      controller: scrollController,
+                                      itemCount:
+                                          _memberSearchCtr.archiveList.length +
+                                              1,
+                                      itemBuilder: (context, index) {
+                                        if (index ==
+                                            _memberSearchCtr
+                                                .archiveList.length) {
+                                          return Container(
+                                            height: MediaQuery.of(context)
+                                                    .padding
+                                                    .bottom +
+                                                60,
+                                            padding: EdgeInsets.only(
+                                                bottom: MediaQuery.of(context)
+                                                    .padding
+                                                    .bottom),
+                                            child: Center(
+                                              child: Obx(
+                                                () => Text(
+                                                  _memberSearchCtr
+                                                      .loadingText.value,
+                                                  style: TextStyle(
+                                                      color: Theme.of(context)
+                                                          .colorScheme
+                                                          .outline,
+                                                      fontSize: 13),
+                                                ),
+                                              ),
+                                            ),
+                                          );
+                                        } else {
+                                          return VideoCardH(
+                                              videoItem: _memberSearchCtr
+                                                  .archiveList[index]);
+                                        }
+                                      },
+                                    )
+                                  : _memberSearchCtr.loadingStatus.value ==
+                                          'loading'
+                                      ? ListView.builder(
+                                          itemCount: 10,
+                                          itemBuilder: (context, index) {
+                                            return const VideoCardHSkeleton();
+                                          },
+                                        )
+                                      : const CustomScrollView(
+                                          slivers: <Widget>[
+                                            NoData(),
+                                          ],
+                                        ),
+                            );
+                          } else {
+                            return CustomScrollView(
+                              slivers: <Widget>[
+                                HttpError(
+                                  errMsg: data['msg'],
+                                  fn: () => setState(() {}),
+                                )
+                              ],
+                            );
+                          }
+                        } else {
+                          // 骨架屏
+                          return ListView.builder(
+                            itemCount: 10,
+                            itemBuilder: (context, index) {
+                              return const VideoCardHSkeleton();
+                            },
+                          );
+                        }
+                      },
+                    ),
+                    //   ],
+                    // ),
+                  ),
+                ],
+        ),
+      ),
+    );
+  }
+}

lib/pages/mine/controller.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/http/user.dart';
@@ -111,4 +112,20 @@ class MineController extends GetxController {
     }
     Get.forceAppUpdate();
   }
+
+  pushFollow() {
+    if (!userLogin.value) {
+      SmartDialog.showToast('账号未登录');
+      return;
+    }
+    Get.toNamed('/follow?mid=${userInfo.value.mid}');
+  }
+
+  pushFans() {
+    if (!userLogin.value) {
+      SmartDialog.showToast('账号未登录');
+      return;
+    }
+    Get.toNamed('/fan?mid=${userInfo.value.mid}');
+  }
 }

lib/pages/mine/view.dart

@@ -264,7 +264,7 @@ class _MinePageState extends State<MinePage> {
                       ),
                     ),
                     InkWell(
-                      onTap: () => Get.toNamed('/follow'),
+                      onTap: () => _mineController.pushFollow(),
                       borderRadius: StyleString.mdRadius,
                       child: Column(
                         mainAxisAlignment: MainAxisAlignment.center,
@@ -294,7 +294,7 @@ class _MinePageState extends State<MinePage> {
                       ),
                     ),
                     InkWell(
-                      onTap: () => Get.toNamed('/fan'),
+                      onTap: () => _mineController.pushFans(),
                       borderRadius: StyleString.mdRadius,
                       child: Column(
                         mainAxisAlignment: MainAxisAlignment.center,

lib/pages/rcmd/controller.dart

@@ -14,12 +14,13 @@ class RcmdController extends GetxController {
   Box recVideo = GStrorage.recVideo;
   Box setting = GStrorage.setting;
   RxInt crossAxisCount = 2.obs;
+  late bool enableSaveLastData;
 
   @override
   void onInit() {
     super.onInit();
     crossAxisCount.value =
-        setting.get(SettingBoxKey.enableSingleRow, defaultValue: false) ? 1 : 2;
+        setting.get(SettingBoxKey.customRows, defaultValue: 2);
     if (recVideo.get('cacheList') != null &&
         recVideo.get('cacheList').isNotEmpty) {
       List<RecVideoItemAppModel> list = [];
@@ -28,6 +29,8 @@ class RcmdController extends GetxController {
       }
       videoList.value = list;
     }
+    enableSaveLastData =
+        setting.get(SettingBoxKey.enableSaveLastData, defaultValue: false);
   }
 
   // 获取推荐
@@ -49,7 +52,11 @@ class RcmdController extends GetxController {
           videoList.value = res['data'];
         }
       } else if (type == 'onRefresh') {
-        videoList.value = res['data'];
+        if (enableSaveLastData) {
+          videoList.insertAll(0, res['data']);
+        } else {
+          videoList.value = res['data'];
+        }
       } else if (type == 'onLoad') {
         videoList.addAll(res['data']);
       }

lib/pages/search/controller.dart

@@ -12,7 +12,7 @@ class SSearchController extends GetxController {
   final FocusNode searchFocusNode = FocusNode();
   RxString searchKeyWord = ''.obs;
   Rx<TextEditingController> controller = TextEditingController().obs;
-  RxList<HotSearchItem> hotSearchList = [HotSearchItem()].obs;
+  RxList<HotSearchItem> hotSearchList = <HotSearchItem>[].obs;
   Box histiryWord = GStrorage.historyword;
   List historyCacheList = [];
   RxList historyList = [].obs;
@@ -85,7 +85,9 @@ class SSearchController extends GetxController {
   // 获取热搜关键词
   Future queryHotSearchList() async {
     var result = await SearchHttp.hotSearchList();
-    hotSearchList.value = result['data'].list;
+    if (result['status']) {
+      hotSearchList.value = result['data'].list;
+    }
     return result;
   }
 
@@ -103,7 +105,9 @@ class SSearchController extends GetxController {
   Future querySearchSuggest(String value) async {
     var result = await SearchHttp.searchSuggest(term: value);
     if (result['status']) {
-      searchSuggestList.value = result['data'].tag;
+      if (result['data'] is SearchSuggestModel) {
+        searchSuggestList.value = result['data'].tag;
+      }
     }
   }
 

lib/pages/searchPanel/view.dart

@@ -7,6 +7,7 @@ import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/models/common/search_type.dart';
 
 import 'controller.dart';
+import 'widgets/article_panel.dart';
 import 'widgets/live_panel.dart';
 import 'widgets/media_bangumi_panel.dart';
 import 'widgets/user_panel.dart';
@@ -90,6 +91,8 @@ class _SearchPanelState extends State<SearchPanel>
                     return searchUserPanel(context, ctr, list);
                   case SearchType.live_room:
                     return searchLivePanel(context, ctr, list);
+                  case SearchType.article:
+                    return searchArticlePanel(context, ctr, list);
                   default:
                     return const SizedBox();
                 }

lib/pages/searchPanel/widgets/article_panel.dart

@@ -0,0 +1,107 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/constants.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/utils/utils.dart';
+
+Widget searchArticlePanel(BuildContext context, ctr, list) {
+  TextStyle textStyle = TextStyle(
+      fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
+      color: Theme.of(context).colorScheme.outline);
+  return ListView.builder(
+    controller: ctr!.scrollController,
+    itemCount: list.length,
+    itemBuilder: (context, index) {
+      return InkWell(
+        onTap: () {
+          Get.toNamed('/htmlRender', parameters: {
+            'url': 'www.bilibili.com/read/cv${list[index].id}',
+            'title': list[index].subTitle,
+            'id': 'cv${list[index].id}',
+            'dynamicType': 'read'
+          });
+        },
+        child: Padding(
+          padding: const EdgeInsets.fromLTRB(
+              StyleString.safeSpace, 5, StyleString.safeSpace, 5),
+          child: LayoutBuilder(builder: (context, boxConstraints) {
+            double width = (boxConstraints.maxWidth -
+                    StyleString.cardSpace *
+                        6 /
+                        MediaQuery.of(context).textScaleFactor) /
+                2;
+            return Container(
+              constraints: const BoxConstraints(minHeight: 88),
+              height: width / StyleString.aspectRatio,
+              child: Row(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  if (list[index].imageUrls != null &&
+                      list[index].imageUrls.isNotEmpty)
+                    AspectRatio(
+                      aspectRatio: StyleString.aspectRatio,
+                      child: LayoutBuilder(builder: (context, boxConstraints) {
+                        double maxWidth = boxConstraints.maxWidth;
+                        double maxHeight = boxConstraints.maxHeight;
+                        return NetworkImgLayer(
+                          width: maxWidth,
+                          height: maxHeight,
+                          src: list[index].imageUrls.first,
+                        );
+                      }),
+                    ),
+                  Expanded(
+                    child: Padding(
+                      padding: const EdgeInsets.fromLTRB(10, 2, 6, 0),
+                      child: Column(
+                        mainAxisSize: MainAxisSize.min,
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          RichText(
+                            maxLines: 2,
+                            text: TextSpan(
+                              children: [
+                                for (var i in list[index].title) ...[
+                                  TextSpan(
+                                    text: i['text'],
+                                    style: TextStyle(
+                                      fontWeight: FontWeight.w500,
+                                      letterSpacing: 0.3,
+                                      color: i['type'] == 'em'
+                                          ? Theme.of(context)
+                                              .colorScheme
+                                              .primary
+                                          : Theme.of(context)
+                                              .colorScheme
+                                              .onSurface,
+                                    ),
+                                  ),
+                                ]
+                              ],
+                            ),
+                          ),
+                          const Spacer(),
+                          Text(
+                              Utils.dateFormat(list[index].pubTime,
+                                  formatType: 'detail'),
+                              style: textStyle),
+                          Row(
+                            children: [
+                              Text('${list[index].view}浏览', style: textStyle),
+                              Text(' • ', style: textStyle),
+                              Text('${list[index].reply}评论', style: textStyle),
+                            ],
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            );
+          }),
+        ),
+      );
+    },
+  );
+}

lib/pages/setting/extra_setting.dart

@@ -79,6 +79,12 @@ 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),

lib/pages/setting/pages/display_mode.dart

@@ -2,6 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_displaymode/flutter_displaymode.dart';
+import 'package:hive/hive.dart';
+import 'package:pilipala/utils/storage.dart';
 
 class SetDiaplayMode extends StatefulWidget {
   const SetDiaplayMode({super.key});
@@ -14,6 +16,7 @@ class _SetDiaplayModeState extends State<SetDiaplayMode> {
   List<DisplayMode> modes = <DisplayMode>[];
   DisplayMode? active;
   DisplayMode? preferred;
+  Box setting = GStrorage.setting;
 
   final ValueNotifier<int> page = ValueNotifier<int>(0);
   late final PageController controller = PageController()
@@ -29,24 +32,36 @@ class _SetDiaplayModeState extends State<SetDiaplayMode> {
     });
   }
 
+  // 获取所有的mode
   Future<void> fetchAll() async {
     preferred = await FlutterDisplayMode.preferred;
     active = await FlutterDisplayMode.active;
-    // GStorage().setDisplayModeType(preferred!);
+    await setting.put(SettingBoxKey.displayMode, preferred.toString());
     setState(() {});
   }
 
+  // 初始化mode/手动设置
   Future<void> init() async {
     try {
       modes = await FlutterDisplayMode.supported;
     } on PlatformException catch (e) {
       print(e);
     }
-    // var res = await GStorage().getDisplayModeType();
+    var res = await getDisplayModeType(modes);
-    // preferred = modes.toList().firstWhere((el) => el == res);
+
+    preferred = modes.toList().firstWhere((el) => el == res);
     FlutterDisplayMode.setPreferredMode(preferred!);
   }
 
+  Future<DisplayMode> getDisplayModeType(modes) async {
+    var value = setting.get(SettingBoxKey.displayMode);
+    DisplayMode f = DisplayMode.auto;
+    if (value != null) {
+      f = modes.firstWhere((e) => e.toString() == value);
+    }
+    return f;
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(

lib/pages/setting/pages/play_speed_set.dart

@@ -0,0 +1,304 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:hive/hive.dart';
+import 'package:pilipala/plugin/pl_player/models/play_speed.dart';
+import 'package:pilipala/utils/storage.dart';
+
+class PlaySpeedPage extends StatefulWidget {
+  const PlaySpeedPage({super.key});
+
+  @override
+  State<PlaySpeedPage> createState() => _PlaySpeedPageState();
+}
+
+class _PlaySpeedPageState extends State<PlaySpeedPage> {
+  Box videoStorage = GStrorage.video;
+  late double playSpeedDefault;
+  late double longPressSpeedDefault;
+  late List customSpeedsList;
+  List<Map<dynamic, dynamic>> sheetMenu = [
+    {
+      'id': 1,
+      'title': '设置为默认倍速',
+      'leading': const Icon(
+        Icons.speed,
+        size: 21,
+      ),
+    },
+    {
+      'id': 2,
+      'title': '设置为默认长按倍速',
+      'leading': const Icon(
+        Icons.speed_sharp,
+        size: 21,
+      ),
+    },
+    {
+      'id': -1,
+      'title': '删除该项',
+      'leading': const Icon(
+        Icons.delete_outline,
+        size: 21,
+      ),
+    },
+  ];
+
+  @override
+  void initState() {
+    super.initState();
+    // 默认倍速
+    playSpeedDefault =
+        videoStorage.get(VideoBoxKey.playSpeedDefault, defaultValue: 1.0);
+    // 默认长按倍速
+    longPressSpeedDefault =
+        videoStorage.get(VideoBoxKey.longPressSpeedDefault, defaultValue: 2.0);
+    // 自定义倍速
+    customSpeedsList =
+        videoStorage.get(VideoBoxKey.customSpeedsList, defaultValue: []);
+  }
+
+  // 添加自定义倍速
+  void onAddSpeed() {
+    double customSpeed = 1.0;
+    SmartDialog.show(
+      useSystem: true,
+      animationType: SmartAnimationType.centerFade_otherSlide,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: const Text('添加倍速'),
+          content: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              // const Text('输入你想要的视频倍速，例如：1.0'),
+              const SizedBox(height: 12),
+              TextField(
+                keyboardType: TextInputType.number,
+                decoration: InputDecoration(
+                  labelText: '自定义倍速',
+                  border: OutlineInputBorder(
+                    borderRadius: BorderRadius.circular(6.0),
+                  ),
+                ),
+                onChanged: (e) {
+                  customSpeed = double.parse(e);
+                },
+              ),
+            ],
+          ),
+          actions: [
+            TextButton(
+              onPressed: () => SmartDialog.dismiss(),
+              child: const Text('取消'),
+            ),
+            TextButton(
+              onPressed: () async {
+                customSpeedsList.add(customSpeed);
+                await videoStorage.put(
+                    VideoBoxKey.customSpeedsList, customSpeedsList);
+                setState(() {});
+                SmartDialog.dismiss();
+              },
+              child: const Text('确认添加'),
+            )
+          ],
+        );
+      },
+    );
+  }
+
+  // 设定倍速弹窗
+  void showBottomSheet(type, i) {
+    showModalBottomSheet<void>(
+      context: context,
+      isScrollControlled: true,
+      builder: (BuildContext context) {
+        return Container(
+          padding: const EdgeInsets.only(top: 10),
+          child: ListView.builder(
+            shrinkWrap: true,
+            physics: const ClampingScrollPhysics(),
+            //重要
+            itemCount: sheetMenu.length,
+            itemBuilder: (BuildContext context, int index) {
+              return ListTile(
+                onTap: () {
+                  Navigator.pop(context);
+                  menuAction(type, i, sheetMenu[index]['id']);
+                },
+                minLeadingWidth: 0,
+                iconColor: Theme.of(context).colorScheme.onSurface,
+                leading: sheetMenu[index]['leading'],
+                title: Text(
+                  sheetMenu[index]['title'],
+                  style: Theme.of(context).textTheme.titleSmall,
+                ),
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+
+  //
+  void menuAction(type, index, id) async {
+    double chooseSpeed = 1.0;
+    if (type == 'system' && id == -1) {
+      SmartDialog.showToast('系统预设倍速不支持删除');
+      return;
+    }
+    // 获取当前选中的倍速值
+    if (type == 'system') {
+      chooseSpeed = PlaySpeed.values[index].value;
+    } else {
+      chooseSpeed = customSpeedsList[index];
+    }
+    // 设置
+    if (id == 1) {
+      // 设置默认倍速
+      playSpeedDefault = chooseSpeed;
+      videoStorage.put(VideoBoxKey.playSpeedDefault, playSpeedDefault);
+    } else if (id == 2) {
+      // 设置默认长按倍速
+      longPressSpeedDefault = chooseSpeed;
+      videoStorage.put(
+          VideoBoxKey.longPressSpeedDefault, longPressSpeedDefault);
+    } else if (id == -1) {
+      if (customSpeedsList[index] == playSpeedDefault) {
+        playSpeedDefault = 1.0;
+        videoStorage.put(VideoBoxKey.playSpeedDefault, playSpeedDefault);
+      }
+      if (customSpeedsList[index] == longPressSpeedDefault) {
+        longPressSpeedDefault = 2.0;
+        videoStorage.put(
+            VideoBoxKey.longPressSpeedDefault, longPressSpeedDefault);
+      }
+      customSpeedsList.removeAt(index);
+      await videoStorage.put(VideoBoxKey.customSpeedsList, customSpeedsList);
+    }
+    setState(() {});
+    SmartDialog.showToast('操作成功');
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        elevation: 0,
+        scrolledUnderElevation: 0,
+        titleSpacing: 0,
+        centerTitle: false,
+        title: Text(
+          '倍速设置',
+          style: Theme.of(context).textTheme.titleMedium,
+        ),
+      ),
+      body: SingleChildScrollView(
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Padding(
+              padding:
+                  const EdgeInsets.only(left: 14, right: 14, top: 6, bottom: 0),
+              child: Text(
+                '点击下方按钮设置默认（长按）倍速',
+                style: TextStyle(color: Theme.of(context).colorScheme.outline),
+              ),
+            ),
+            ListTile(
+              dense: false,
+              title: const Text('默认倍速'),
+              subtitle: Text(playSpeedDefault.toString()),
+            ),
+            ListTile(
+              dense: false,
+              title: const Text('默认长按倍速'),
+              subtitle: Text(longPressSpeedDefault.toString()),
+            ),
+            Padding(
+              padding: const EdgeInsets.only(
+                left: 14,
+                right: 14,
+                bottom: 10,
+                top: 20,
+              ),
+              child: Text(
+                '系统预设倍速',
+                style: Theme.of(context).textTheme.titleMedium,
+              ),
+            ),
+            Padding(
+              padding: const EdgeInsets.only(
+                left: 18,
+                right: 18,
+                bottom: 30,
+              ),
+              child: Wrap(
+                alignment: WrapAlignment.start,
+                spacing: 8,
+                runSpacing: 2,
+                children: [
+                  for (var i in PlaySpeed.values) ...[
+                    FilledButton.tonal(
+                      onPressed: () => showBottomSheet('system', i.index),
+                      child: Text(i.description),
+                    ),
+                  ]
+                ],
+              ),
+            ),
+            Padding(
+                padding: const EdgeInsets.only(
+                  left: 14,
+                  right: 14,
+                ),
+                child: Row(
+                  children: [
+                    Text(
+                      '自定义倍速',
+                      style: Theme.of(context).textTheme.titleMedium,
+                    ),
+                    const SizedBox(width: 12),
+                    TextButton(
+                      onPressed: () => onAddSpeed(),
+                      child: const Text('添加'),
+                    )
+                  ],
+                )),
+            Padding(
+              padding: EdgeInsets.only(
+                left: 18,
+                right: 18,
+                bottom: MediaQuery.of(context).padding.bottom + 40,
+              ),
+              child: customSpeedsList.isNotEmpty
+                  ? Wrap(
+                      alignment: WrapAlignment.start,
+                      spacing: 8,
+                      runSpacing: 2,
+                      children: [
+                        for (int i = 0; i < customSpeedsList.length; i++) ...[
+                          FilledButton.tonal(
+                            onPressed: () => showBottomSheet('custom', i),
+                            child: Text(customSpeedsList[i].toString()),
+                          ),
+                        ]
+                      ],
+                    )
+                  : SizedBox(
+                      height: 80,
+                      child: Center(
+                        child: Text(
+                          '未添加',
+                          style: TextStyle(
+                              color: Theme.of(context).colorScheme.outline),
+                        ),
+                      ),
+                    ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/pages/setting/play_setting.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/models/video/play/quality.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
@@ -54,6 +55,18 @@ class _PlaySettingState extends State<PlaySetting> {
       ),
       body: ListView(
         children: [
+          ListTile(
+            dense: false,
+            onTap: () => Get.toNamed('/playSpeedSet'),
+            title: Text('倍速设置', style: titleStyle),
+            trailing: const Icon(Icons.arrow_forward_ios, size: 17),
+          ),
+          const SetSwitchItem(
+            title: '开启1080P',
+            subTitle: '免登录查看1080P视频',
+            setKey: SettingBoxKey.p1080,
+            defaultVal: true,
+          ),
           const SetSwitchItem(
             title: '自动播放',
             subTitle: '进入详情页自动播放',

lib/pages/setting/style_setting.dart

@@ -22,12 +22,14 @@ class _StyleSettingState extends State<StyleSetting> {
   Box setting = GStrorage.setting;
   late int picQuality;
   late ThemeType _tempThemeValue;
+  late dynamic defaultCustomRows;
 
   @override
   void initState() {
     super.initState();
     picQuality = setting.get(SettingBoxKey.defaultPicQa, defaultValue: 10);
     _tempThemeValue = settingController.themeType.value;
+    defaultCustomRows = setting.get(SettingBoxKey.customRows, defaultValue: 2);
   }
 
   @override
@@ -76,12 +78,37 @@ class _StyleSettingState extends State<StyleSetting> {
             setKey: SettingBoxKey.iosTransition,
             defaultVal: false,
           ),
-          SetSwitchItem(
+          // SetSwitchItem(
-            title: '首页单列',
+          //   title: '首页单列',
-            subTitle: '每行展示一个内容卡片',
+          //   subTitle: '每行展示一个内容卡片',
-            setKey: SettingBoxKey.enableSingleRow,
+          //   setKey: SettingBoxKey.enableSingleRow,
-            defaultVal: false,
+          //   defaultVal: false,
-            callFn: (val) => {SmartDialog.showToast('下次启动时生效')},
+          //   callFn: (val) => {SmartDialog.showToast('下次启动时生效')},
+          // ),
+          ListTile(
+            dense: false,
+            title: Text('自定义列数', style: titleStyle),
+            subtitle: Text(
+              '当前列数',
+              style: subTitleStyle,
+            ),
+            trailing: PopupMenuButton(
+              initialValue: defaultCustomRows,
+              icon: const Icon(Icons.more_vert_outlined, size: 22),
+              onSelected: (item) {
+                defaultCustomRows = item;
+                setting.put(SettingBoxKey.customRows, item);
+                setState(() {});
+              },
+              itemBuilder: (BuildContext context) => <PopupMenuEntry>[
+                for (var i in [1, 2, 3, 4, 5]) ...[
+                  PopupMenuItem(
+                    value: i,
+                    child: Text(i.toString()),
+                  ),
+                ]
+              ],
+            ),
           ),
           ListTile(
             dense: false,

lib/pages/video/detail/controller.dart

@@ -1,4 +1,6 @@
 import 'dart:async';
+import 'dart:io';
+import 'package:floating/floating.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
@@ -16,11 +18,13 @@ import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
 import 'package:screen_brightness/screen_brightness.dart';
 
+import 'widgets/header_control.dart';
+
 class VideoDetailController extends GetxController
     with GetSingleTickerProviderStateMixin {
   /// 路由传参
   String bvid = Get.parameters['bvid']!;
-  int cid = int.parse(Get.parameters['cid']!);
+  RxInt cid = int.parse(Get.parameters['cid']!).obs;
   RxInt danmakuCid = 0.obs;
   String heroTag = Get.arguments['heroTag'];
   // 视频详情
@@ -76,6 +80,8 @@ class VideoDetailController extends GetxController
   bool enableHeart = true;
   var userInfo;
   late bool isFirstTime = true;
+  Floating? floating;
+  late PreferredSizeWidget headerControl;
 
   @override
   void onInit() {
@@ -103,7 +109,17 @@ class VideoDetailController extends GetxController
         localCache.get(LocalCacheKey.historyPause) == true) {
       enableHeart = false;
     }
-    danmakuCid.value = cid;
+    danmakuCid.value = cid.value;
+
+    ///
+    if (Platform.isAndroid) {
+      floating = Floating();
+    }
+    headerControl = HeaderControl(
+      controller: plPlayerController,
+      videoDetailCtr: this,
+      floating: floating,
+    );
   }
 
   showReplyReplyPanel() {
@@ -199,19 +215,20 @@ class VideoDetailController extends GetxController
       direction: (firstVideo.width! - firstVideo.height!) > 0
           ? 'horizontal'
           : 'vertical',
-      // 默认1倍速
-      speed: 1.0,
       bvid: bvid,
-      cid: cid,
+      cid: cid.value,
       enableHeart: enableHeart,
       isFirstTime: isFirstTime,
       autoplay: autoplay,
     );
+
+    /// 开启自动全屏时，在player初始化完成后立即传入headerControl
+    plPlayerController.headerControl = headerControl;
   }
 
   // 视频链接
   Future queryVideoUrl() async {
-    var result = await VideoHttp.videoUrl(cid: cid, bvid: bvid);
+    var result = await VideoHttp.videoUrl(cid: cid.value, bvid: bvid);
     if (result['status']) {
       data = result['data'];
 
@@ -257,8 +274,8 @@ class VideoDetailController extends GetxController
           currentDecodeFormats = flag
               ? currentDecodeFormats
               : VideoDecodeFormatsCode.fromString(supportDecodeFormats.first)!;
-        } catch (e) {
+        } catch (err) {
-          print(e);
+          SmartDialog.showToast('DecodeFormats error: $err');
         }
 
         /// 取出符合当前解码格式的videoItem
@@ -270,7 +287,7 @@ class VideoDetailController extends GetxController
         }
         videoUrl = firstVideo.baseUrl!;
       } catch (err) {
-        print(err);
+        SmartDialog.showToast('firstVideo error: $err');
       }
 
       /// 优先顺序 设置中指定质量 -> 当前可选的最高质量
@@ -280,7 +297,6 @@ class VideoDetailController extends GetxController
       try {
         int resultAudioQa = setting.get(SettingBoxKey.defaultAudioQa,
             defaultValue: AudioQuality.hiRes.code);
-
         if (data.dash!.dolby?.audio?.isNotEmpty == true) {
           // 杜比
           audiosList.insert(0, data.dash!.dolby!.audio!.first);
@@ -294,16 +310,20 @@ class VideoDetailController extends GetxController
         if (audiosList.isNotEmpty) {
           List<int> numbers = audiosList.map((map) => map.id!).toList();
           int closestNumber = Utils.findClosestNumber(resultAudioQa, numbers);
-          if (!numbers.contains(resultAudioQa)) {
+          if (!numbers.contains(resultAudioQa) &&
+              numbers.any((e) => e > resultAudioQa)) {
             closestNumber = 30280;
           }
           firstAudio = audiosList.firstWhere((e) => e.id == closestNumber);
+        } else {
+          firstAudio = AudioItem();
         }
-      } catch (e) {
+      } catch (err) {
-        print(e);
+        firstAudio = audiosList.isNotEmpty ? audiosList.first : AudioItem();
+        SmartDialog.showToast('firstAudio error: $err');
       }
 
-      audioUrl = firstAudio!.baseUrl ?? '';
+      audioUrl = firstAudio.baseUrl ?? '';
       //
       if (firstAudio.id != null) {
         currentAudioQa = AudioQualityCode.fromCode(firstAudio.id!)!;

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

@@ -11,11 +11,14 @@ import 'package:pilipala/models/user/fav_folder.dart';
 import 'package:pilipala/models/video_detail_res.dart';
 import 'package:pilipala/pages/video/detail/controller.dart';
 import 'package:pilipala/pages/video/detail/reply/index.dart';
+import 'package:pilipala/plugin/pl_player/models/play_repeat.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/id_utils.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:share_plus/share_plus.dart';
 
+import 'widgets/group_panel.dart';
+
 class VideoIntroController extends GetxController {
   // 视频bvid
   String bvid = Get.parameters['bvid']!;
@@ -58,6 +61,7 @@ class VideoIntroController extends GetxController {
   RxString total = '1'.obs;
   Timer? timer;
   bool isPaused = false;
+  String heroTag = Get.arguments['heroTag'];
 
   @override
   void onInit() {
@@ -102,9 +106,10 @@ class VideoIntroController extends GetxController {
       if (videoDetail.value.pages!.isNotEmpty && lastPlayCid.value == 0) {
         lastPlayCid.value = videoDetail.value.pages!.first.cid!;
       }
-      Get.find<VideoDetailController>(tag: Get.arguments['heroTag'])
+      // Get.find<VideoDetailController>(tag: heroTag).tabs.value = [
-          .tabs
+      //   '简介',
-          .value = ['简介', '评论 ${result['data']!.stat!.reply}'];
+      //   '评论 ${result['data']!.stat!.reply}'
+      // ];
       // 获取到粉丝数再返回
       await queryUserStat();
     }
@@ -425,6 +430,20 @@ class VideoIntroController extends GetxController {
                   }
                   followStatus['attribute'] = actionStatus;
                   followStatus.refresh();
+                  if (actionStatus == 2) {
+                    if (context.mounted) {
+                      ScaffoldMessenger.of(context).showSnackBar(
+                        SnackBar(
+                          content: const Text('关注成功'),
+                          duration: const Duration(seconds: 2),
+                          action: SnackBarAction(
+                            label: '设置分组',
+                            onPressed: setFollowGroup,
+                          ),
+                        ),
+                      );
+                    }
+                  }
                 }
                 SmartDialog.dismiss();
               },
@@ -440,16 +459,16 @@ class VideoIntroController extends GetxController {
   Future changeSeasonOrbangu(bvid, cid, aid) async {
     // 重新获取视频资源
     VideoDetailController videoDetailCtr =
-        Get.find<VideoDetailController>(tag: Get.arguments['heroTag']);
+        Get.find<VideoDetailController>(tag: heroTag);
     videoDetailCtr.bvid = bvid;
-    videoDetailCtr.cid = cid;
+    videoDetailCtr.cid.value = cid;
     videoDetailCtr.danmakuCid.value = cid;
     videoDetailCtr.queryVideoUrl();
     // 重新请求评论
     try {
       /// 未渲染回复组件时可能异常
       VideoReplyController videoReplyCtr =
-          Get.find<VideoReplyController>(tag: Get.arguments['heroTag']);
+          Get.find<VideoReplyController>(tag: heroTag);
       videoReplyCtr.aid = aid;
       videoReplyCtr.queryReplyList(type: 'init');
     } catch (_) {}
@@ -486,4 +505,60 @@ class VideoIntroController extends GetxController {
     }
     super.onClose();
   }
+
+  /// 列表循环或者顺序播放时，自动播放下一个
+  void nextPlay() {
+    late List episodes;
+    // if (videoDetail.value.ugcSeason != null) {
+    //   UgcSeason ugcSeason = videoDetail.value.ugcSeason!;
+    //   List<SectionItem> sections = ugcSeason.sections!;
+    //   for (int i = 0; i < sections.length; i++) {
+    //     List<EpisodeItem> episodesList = sections[i].episodes!;
+    //     for (int j = 0; j < episodesList.length; j++) {
+    //       if (episodesList[j].cid == lastPlayCid.value) {
+    //         episodes = episodesList;
+    //         continue;
+    //       }
+    //     }
+    //   }
+    // }
+    if (videoDetail.value.ugcSeason != null) {
+      UgcSeason ugcSeason = videoDetail.value.ugcSeason!;
+      List<SectionItem> sections = ugcSeason.sections!;
+      episodes = [];
+
+      for (int i = 0; i < sections.length; i++) {
+        List<EpisodeItem> episodesList = sections[i].episodes!;
+        episodes.addAll(episodesList);
+      }
+    }
+
+    int currentIndex = episodes.indexWhere((e) => e.cid == lastPlayCid.value);
+    int nextIndex = currentIndex + 1;
+    VideoDetailController videoDetailCtr =
+        Get.find<VideoDetailController>(tag: heroTag);
+    PlayRepeat platRepeat = videoDetailCtr.plPlayerController.playRepeat;
+
+    // 列表循环
+    if (nextIndex >= episodes.length) {
+      if (platRepeat == PlayRepeat.listCycle) {
+        nextIndex = 0;
+      }
+      if (platRepeat == PlayRepeat.listOrder) {
+        return;
+      }
+    }
+    int cid = episodes[nextIndex].cid!;
+    String bvid = episodes[nextIndex].bvid!;
+    int aid = episodes[nextIndex].aid!;
+    changeSeasonOrbangu(bvid, cid, aid);
+  }
+
+  // 设置关注分组
+  void setFollowGroup() {
+    Get.bottomSheet(
+      GroupPanel(mid: videoDetail.value.owner!.mid!),
+      isScrollControlled: true,
+    );
+  }
 }

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

@@ -199,6 +199,9 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
 
   // 视频介绍
   showIntroDetail() {
+    if (loadingStatus) {
+      return;
+    }
     feedBack();
     showBottomSheet(
       context: context,
@@ -236,46 +239,22 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   GestureDetector(
-                    behavior: HitTestBehavior.translucent,
+                      behavior: HitTestBehavior.translucent,
-                    onTap: () => showIntroDetail(),
+                      onTap: () => showIntroDetail(),
-                    child: Row(
+                      child: Padding(
-                      children: [
+                        padding: const EdgeInsets.only(bottom: 6),
-                        Expanded(
+                        child: Text(
-                          child: Text(
+                          !loadingStatus
-                            !loadingStatus
+                              ? widget.videoDetail!.title
-                                ? widget.videoDetail!.title
+                              : videoItem['title'],
-                                : videoItem['title'],
+                          style: const TextStyle(
-                            style: const TextStyle(
+                            fontSize: 16,
-                              fontSize: 16,
+                            fontWeight: FontWeight.w500,
-                              fontWeight: FontWeight.w500,
-                            ),
-                            maxLines: 1,
-                            overflow: TextOverflow.ellipsis,
                           ),
+                          maxLines: 2,
+                          overflow: TextOverflow.ellipsis,
                         ),
-                        const SizedBox(width: 20),
+                      )),
-                        SizedBox(
-                          width: 34,
-                          height: 34,
-                          child: IconButton(
-                            style: ButtonStyle(
-                              padding:
-                                  MaterialStateProperty.all(EdgeInsets.zero),
-                              backgroundColor:
-                                  MaterialStateProperty.resolveWith((states) {
-                                return t.highlightColor.withOpacity(0.2);
-                              }),
-                            ),
-                            onPressed: showIntroDetail,
-                            icon: Icon(
-                              Icons.more_horiz,
-                              color: Theme.of(context).colorScheme.primary,
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
                   GestureDetector(
                     behavior: HitTestBehavior.translucent,
                     onTap: () => showIntroDetail(),
@@ -324,17 +303,17 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                   ),
                   const SizedBox(height: 7),
                   // 点赞收藏转发 布局样式1
-                  SingleChildScrollView(
+                  // SingleChildScrollView(
-                    padding: const EdgeInsets.only(top: 7, bottom: 7),
+                  //   padding: const EdgeInsets.only(top: 7, bottom: 7),
-                    scrollDirection: Axis.horizontal,
+                  //   scrollDirection: Axis.horizontal,
-                    child: actionRow(
+                  //   child: actionRow(
-                      context,
+                  //     context,
-                      videoIntroController,
+                  //     videoIntroController,
-                      videoDetailCtr,
+                  //     videoDetailCtr,
-                    ),
+                  //   ),
-                  ),
+                  // ),
                   // 点赞收藏转发 布局样式2
-                  // actionGrid(context, videoIntroController),
+                  actionGrid(context, videoIntroController),
                   // 合集
                   if (!loadingStatus &&
                       widget.videoDetail!.ugcSeason != null) ...[
@@ -452,7 +431,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
   Widget actionGrid(BuildContext context, videoIntroController) {
     return LayoutBuilder(builder: (context, constraints) {
       return Container(
-        padding: const EdgeInsets.only(top: 6, bottom: 10),
+        margin: const EdgeInsets.only(top: 6, bottom: 4),
         height: constraints.maxWidth / 5 * 0.8,
         child: GridView.count(
           primary: false,
@@ -471,12 +450,12 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                       ? widget.videoDetail!.stat!.like!.toString()
                       : '-'),
             ),
-            ActionItem(
+            // ActionItem(
-                icon: const Icon(FontAwesomeIcons.clock),
+            //     icon: const Icon(FontAwesomeIcons.clock),
-                onTap: () => videoIntroController.actionShareVideo(),
+            //     onTap: () => videoIntroController.actionShareVideo(),
-                selectStatus: false,
+            //     selectStatus: false,
-                loadingStatus: loadingStatus,
+            //     loadingStatus: loadingStatus,
-                text: '稍后再看'),
+            //     text: '稍后再看'),
             Obx(
               () => ActionItem(
                   icon: const Icon(FontAwesomeIcons.b),
@@ -492,22 +471,28 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
               () => ActionItem(
                   icon: const Icon(FontAwesomeIcons.star),
                   selectIcon: const Icon(FontAwesomeIcons.solidStar),
-                  // onTap: () => videoIntroController.actionFavVideo(),
                   onTap: () => showFavBottomSheet(),
+                  onLongPress: () => showFavBottomSheet(type: 'longPress'),
                   selectStatus: videoIntroController.hasFav.value,
                   loadingStatus: loadingStatus,
                   text: !loadingStatus
                       ? widget.videoDetail!.stat!.favorite!.toString()
                       : '-'),
             ),
+            ActionItem(
+                icon: const Icon(FontAwesomeIcons.comment),
+                onTap: () => videoDetailCtr.tabCtr.animateTo(1),
+                selectStatus: false,
+                loadingStatus: loadingStatus,
+                text: !loadingStatus
+                    ? widget.videoDetail!.stat!.reply!.toString()
+                    : '评论'),
             ActionItem(
                 icon: const Icon(FontAwesomeIcons.shareFromSquare),
                 onTap: () => videoIntroController.actionShareVideo(),
                 selectStatus: false,
                 loadingStatus: loadingStatus,
-                text: !loadingStatus
+                text: '分享'),
-                    ? widget.videoDetail!.stat!.share!.toString()
-                    : '-'),
           ],
         ),
       );

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

@@ -6,6 +6,7 @@ class ActionItem extends StatelessWidget {
   final Icon? icon;
   final Icon? selectIcon;
   final Function? onTap;
+  final Function? onLongPress;
   final bool? loadingStatus;
   final String? text;
   final bool selectStatus;
@@ -15,6 +16,7 @@ class ActionItem extends StatelessWidget {
     this.icon,
     this.selectIcon,
     this.onTap,
+    this.onLongPress,
     this.loadingStatus,
     this.text,
     this.selectStatus = false,
@@ -27,6 +29,9 @@ class ActionItem extends StatelessWidget {
         feedBack(),
         onTap!(),
       },
+      onLongPress: () => {
+        if (onLongPress != null) {onLongPress!()}
+      },
       borderRadius: StyleString.mdRadius,
       child: Column(
         mainAxisAlignment: MainAxisAlignment.center,

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

@@ -0,0 +1,156 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:get/get.dart';
+import 'package:hive/hive.dart';
+import 'package:pilipala/common/widgets/http_error.dart';
+import 'package:pilipala/http/member.dart';
+import 'package:pilipala/models/member/tags.dart';
+import 'package:pilipala/utils/feed_back.dart';
+import 'package:pilipala/utils/storage.dart';
+
+class GroupPanel extends StatefulWidget {
+  final int? mid;
+  const GroupPanel({super.key, this.mid});
+
+  @override
+  State<GroupPanel> createState() => _GroupPanelState();
+}
+
+class _GroupPanelState extends State<GroupPanel> {
+  Box localCache = GStrorage.localCache;
+  late double sheetHeight;
+  late Future _futureBuilderFuture;
+  late List<MemberTagItemModel> tagsList;
+  bool showDefault = true;
+
+  @override
+  void initState() {
+    super.initState();
+    sheetHeight = localCache.get('sheetHeight');
+    _futureBuilderFuture = MemberHttp.followUpTags();
+  }
+
+  void onSave() async {
+    feedBack();
+    // 是否有选中的 有选中的带id，没选使用默认0
+    bool anyHasChecked = tagsList.any((e) => e.checked == true);
+    late String tagids;
+    if (anyHasChecked) {
+      List checkedList = tagsList.where((e) => e.checked == true).toList();
+      List<int> tagidList = checkedList.map<int>((e) => e.tagid).toList();
+      tagids = tagidList.join(',');
+    } else {
+      tagids = '0';
+    }
+    // 保存
+    var res = await MemberHttp.addUsers(widget.mid, tagids);
+    SmartDialog.showToast(res['msg']);
+    if (res['status']) {
+      Get.back();
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      height: sheetHeight,
+      color: Theme.of(context).colorScheme.background,
+      child: Column(
+        children: [
+          AppBar(
+            centerTitle: false,
+            elevation: 0,
+            leading: IconButton(
+                onPressed: () => Get.back(),
+                icon: const Icon(Icons.close_outlined)),
+            title:
+                Text('设置关注分组', style: Theme.of(context).textTheme.titleMedium),
+          ),
+          Expanded(
+            child: Material(
+              child: FutureBuilder(
+                future: _futureBuilderFuture,
+                builder: (context, snapshot) {
+                  if (snapshot.connectionState == ConnectionState.done) {
+                    Map data = snapshot.data as Map;
+                    if (data['status']) {
+                      tagsList = data['data'];
+                      return ListView.builder(
+                        itemCount: data['data'].length,
+                        itemBuilder: (context, index) {
+                          return ListTile(
+                            onTap: () {
+                              data['data'][index].checked =
+                                  !data['data'][index].checked;
+                              showDefault =
+                                  !data['data'].any((e) => e.checked == true);
+                              setState(() {});
+                            },
+                            dense: true,
+                            leading: const Icon(Icons.group_outlined),
+                            minLeadingWidth: 0,
+                            title: Text(data['data'][index].name),
+                            subtitle: data['data'][index].tip != ''
+                                ? Text(data['data'][index].tip)
+                                : null,
+                            trailing: Transform.scale(
+                              scale: 0.9,
+                              child: Checkbox(
+                                value: data['data'][index].checked,
+                                onChanged: (bool? checkValue) {
+                                  data['data'][index].checked = checkValue;
+                                  showDefault = !data['data']
+                                      .any((e) => e.checked == true);
+                                  setState(() {});
+                                },
+                              ),
+                            ),
+                          );
+                        },
+                      );
+                    } else {
+                      return HttpError(
+                        errMsg: data['msg'],
+                        fn: () => setState(() {}),
+                      );
+                    }
+                  } else {
+                    // 骨架屏
+                    return const Text('请求中');
+                  }
+                },
+              ),
+            ),
+          ),
+          Divider(
+            height: 1,
+            color: Theme.of(context).disabledColor.withOpacity(0.08),
+          ),
+          Padding(
+            padding: EdgeInsets.only(
+              left: 20,
+              right: 20,
+              top: 12,
+              bottom: MediaQuery.of(context).padding.bottom + 12,
+            ),
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.end,
+              children: [
+                TextButton(
+                  onPressed: () => onSave(),
+                  style: TextButton.styleFrom(
+                    padding: const EdgeInsets.only(left: 30, right: 30),
+                    foregroundColor: Theme.of(context).colorScheme.onPrimary,
+                    backgroundColor:
+                        Theme.of(context).colorScheme.primary, // 设置按钮背景色
+                  ),
+                  child: Text(showDefault ? '保存至默认分组' : '保存'),
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

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

@@ -1,5 +1,6 @@
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/common/widgets/stat/danmu.dart';
@@ -129,7 +130,50 @@ class IntroDetail extends StatelessWidget {
       final currentDesc = descV2[index];
       switch (currentDesc.type) {
         case 1:
-          return TextSpan(text: currentDesc.rawText);
+          List<InlineSpan> spanChildren = [];
+          RegExp urlRegExp = RegExp(r'https?://\S+\b');
+          Iterable<Match> matches = urlRegExp.allMatches(currentDesc.rawText);
+
+          int previousEndIndex = 0;
+          for (Match match in matches) {
+            if (match.start > previousEndIndex) {
+              spanChildren.add(TextSpan(
+                  text: currentDesc.rawText
+                      .substring(previousEndIndex, match.start)));
+            }
+            spanChildren.add(
+              TextSpan(
+                text: match.group(0),
+                style: TextStyle(
+                    color: Theme.of(context).colorScheme.primary), // 设置颜色为蓝色
+                recognizer: TapGestureRecognizer()
+                  ..onTap = () {
+                    // 处理点击事件
+                    try {
+                      Get.toNamed(
+                        '/webview',
+                        parameters: {
+                          'url': match.group(0)!,
+                          'type': 'url',
+                          'pageTitle': match.group(0)!,
+                        },
+                      );
+                    } catch (err) {
+                      SmartDialog.showToast(err.toString());
+                    }
+                  },
+              ),
+            );
+            previousEndIndex = match.end;
+          }
+
+          if (previousEndIndex < currentDesc.rawText.length) {
+            spanChildren.add(TextSpan(
+                text: currentDesc.rawText.substring(previousEndIndex)));
+          }
+
+          TextSpan result = TextSpan(children: spanChildren);
+          return result;
         case 2:
           final colorSchemePrimary = Theme.of(context).colorScheme.primary;
           final heroTag = Utils.makeHeroTag(currentDesc.bizId);

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

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/models/video_detail_res.dart';
+import 'package:pilipala/pages/video/detail/index.dart';
 
 class PagesPanel extends StatefulWidget {
   final List<Part> pages;
@@ -22,13 +23,23 @@ class PagesPanel extends StatefulWidget {
 
 class _PagesPanelState extends State<PagesPanel> {
   late List<Part> episodes;
+  late int cid;
   late int currentIndex;
+  String heroTag = Get.arguments['heroTag'];
+  late VideoDetailController _videoDetailController;
 
   @override
   void initState() {
     super.initState();
+    cid = widget.cid!;
     episodes = widget.pages;
-    currentIndex = episodes.indexWhere((e) => e.cid == widget.cid);
+    _videoDetailController = Get.find<VideoDetailController>(tag: heroTag);
+    currentIndex = episodes.indexWhere((e) => e.cid == cid);
+    _videoDetailController.cid.listen((p0) {
+      cid = p0;
+      setState(() {});
+      currentIndex = episodes.indexWhere((e) => e.cid == cid);
+    });
   }
 
   void changeFucCall(item, i) async {

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

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/models/video_detail_res.dart';
+import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/utils/id_utils.dart';
 
 class SeasonPanel extends StatefulWidget {
@@ -23,11 +24,16 @@ class SeasonPanel extends StatefulWidget {
 
 class _SeasonPanelState extends State<SeasonPanel> {
   late List<EpisodeItem> episodes;
+  late int cid;
   late int currentIndex;
+  String heroTag = Get.arguments['heroTag'];
+  late VideoDetailController _videoDetailController;
 
   @override
   void initState() {
     super.initState();
+    cid = widget.cid!;
+    _videoDetailController = Get.find<VideoDetailController>(tag: heroTag);
 
     /// 根据 cid 找到对应集，找到对应 episodes
     /// 有多个episodes时，只显示其中一个
@@ -36,7 +42,7 @@ class _SeasonPanelState extends State<SeasonPanel> {
     for (int i = 0; i < sections.length; i++) {
       List<EpisodeItem> episodesList = sections[i].episodes!;
       for (int j = 0; j < episodesList.length; j++) {
-        if (episodesList[j].cid == widget.cid) {
+        if (episodesList[j].cid == cid) {
           episodes = episodesList;
           continue;
         }
@@ -47,7 +53,12 @@ class _SeasonPanelState extends State<SeasonPanel> {
     // episodes = widget.ugcSeason.sections!
     //     .firstWhere((e) => e.seasonId == widget.ugcSeason.id)
     //     .episodes!;
-    currentIndex = episodes.indexWhere((e) => e.cid == widget.cid);
+    currentIndex = episodes.indexWhere((e) => e.cid == cid);
+    _videoDetailController.cid.listen((p0) {
+      cid = p0;
+      setState(() {});
+      currentIndex = episodes.indexWhere((e) => e.cid == cid);
+    });
   }
 
   void changeFucCall(item, i) async {
@@ -57,7 +68,9 @@ class _SeasonPanelState extends State<SeasonPanel> {
       item.aid,
     );
     currentIndex = i;
+    setState(() {});
     Get.back();
+    setState(() {});
   }
 
   @override

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

@@ -96,8 +96,8 @@ class VideoReplyController extends GetxController {
       } else {
         replyList.addAll(replies);
       }
+      count.value = res['data'].page.count;
     }
-    count.value = res['data'].page.count;
     isLoadingMore = false;
     return res;
   }

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

@@ -39,6 +39,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
   Future? _futureBuilderFuture;
   bool _isFabVisible = true;
   String replyLevel = '1';
+  late String heroTag;
 
   // 添加页面缓存
   @override
@@ -46,22 +47,29 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
 
   @override
   void initState() {
-    int oid = widget.bvid != null ? IdUtils.bv2av(widget.bvid!) : 0;
     super.initState();
+    int oid = widget.bvid != null ? IdUtils.bv2av(widget.bvid!) : 0;
+    heroTag = Get.arguments['heroTag'];
     replyLevel = widget.replyLevel ?? '1';
     if (replyLevel == '2') {
       _videoReplyController = Get.put(
           VideoReplyController(oid, widget.rpid.toString(), replyLevel),
           tag: widget.rpid.toString());
     } else {
-      _videoReplyController = Get.put(VideoReplyController(oid, '', replyLevel),
+      _videoReplyController =
-          tag: Get.arguments['heroTag']);
+          Get.put(VideoReplyController(oid, '', replyLevel), tag: heroTag);
     }
 
     fabAnimationCtr = AnimationController(
         vsync: this, duration: const Duration(milliseconds: 300));
 
     _futureBuilderFuture = _videoReplyController.queryReplyList();
+
+    fabAnimationCtr.forward();
+    scrollListener();
+  }
+
+  void scrollListener() {
     scrollController = _videoReplyController.scrollController;
     scrollController.addListener(
       () {
@@ -81,7 +89,6 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
         }
       },
     );
-    fabAnimationCtr.forward();
   }
 
   void _showFab() {
@@ -101,7 +108,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
   // 展示二级回复
   void replyReply(replyItem) {
     VideoDetailController videoDetailCtr =
-        Get.find<VideoDetailController>(tag: Get.arguments['heroTag']);
+        Get.find<VideoDetailController>(tag: heroTag);
     if (replyItem != null) {
       videoDetailCtr.oid = replyItem.oid;
       videoDetailCtr.fRpid = replyItem.rpid!;
@@ -112,9 +119,10 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
 
   @override
   void dispose() {
-    super.dispose();
+    scrollController.removeListener(() {});
     fabAnimationCtr.dispose();
     scrollController.dispose();
+    super.dispose();
   }
 
   @override
@@ -128,7 +136,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
       child: Stack(
         children: [
           CustomScrollView(
-            controller: _videoReplyController.scrollController,
+            controller: scrollController,
             key: const PageStorageKey<String>('评论'),
             slivers: <Widget>[
               SliverPersistentHeader(
@@ -187,7 +195,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                 future: _futureBuilderFuture,
                 builder: (context, snapshot) {
                   if (snapshot.connectionState == ConnectionState.done) {
-                    Map data = snapshot.data as Map;
+                    var data = snapshot.data;
                     if (data['status']) {
                       // 请求成功
                       return Obx(

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

@@ -11,6 +11,7 @@ import 'package:pilipala/pages/preview/index.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/pages/video/detail/replyNew/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/utils.dart';
 
@@ -667,10 +668,11 @@ InlineSpan buildContent(
       // 匹配 jumpUrl
       String matchUrl = matchMember;
       if (content.jumpUrl.isNotEmpty && hasMatchMember) {
-        List urlKeys = content.jumpUrl.keys.toList();
+        List urlKeys = content.jumpUrl.keys.toList().reversed.toList();
         matchUrl = matchMember.splitMapJoin(
           /// RegExp.escape() 转义特殊字符
-          RegExp(RegExp.escape(urlKeys.join("|"))),
+          RegExp(urlKeys.map((key) => key).join("|")),
+          // RegExp(RegExp.escape(urlKeys.join("|"))),
           onMatch: (Match match) {
             String matchStr = match[0]!;
             String appUrlSchema = content.jumpUrl[matchStr]['app_url_schema'];
@@ -688,14 +690,26 @@ InlineSpan buildContent(
                 recognizer: TapGestureRecognizer()
                   ..onTap = () {
                     if (appUrlSchema == '') {
-                      Get.toNamed(
+                      String str = Uri.parse(matchStr).pathSegments[0];
-                        '/webview',
+                      Map matchRes = IdUtils.matchAvorBv(input: str);
-                        parameters: {
+                      List matchKeys = matchRes.keys.toList();
-                          'url': matchStr,
+                      if (matchKeys.isNotEmpty) {
-                          'type': 'url',
+                        if (matchKeys.first == 'BV') {
-                          'pageTitle': ''
+                          Get.toNamed(
-                        },
+                            '/searchResult',
-                      );
+                            parameters: {'keyword': matchRes['BV']},
+                          );
+                        }
+                      } else {
+                        Get.toNamed(
+                          '/webview',
+                          parameters: {
+                            'url': matchStr,
+                            'type': 'url',
+                            'pageTitle': ''
+                          },
+                        );
+                      }
                     } else {
                       if (appUrlSchema.startsWith('bilibili://search') &&
                           enableWordRe) {
@@ -744,11 +758,14 @@ InlineSpan buildContent(
               recognizer: TapGestureRecognizer()
                 ..onTap = () {
                   // 跳转到指定位置
-                  Get.find<VideoDetailController>(tag: Get.arguments['heroTag'])
+                  try {
-                      .plPlayerController
+                    Get.find<VideoDetailController>(
-                      .seekTo(
+                            tag: Get.arguments['heroTag'])
-                        Duration(seconds: Utils.duration(matchStr)),
+                        .plPlayerController
-                      );
+                        .seekTo(
+                          Duration(seconds: Utils.duration(matchStr)),
+                        );
+                  } catch (_) {}
                 },
             ),
           );

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

@@ -26,11 +26,6 @@ class VideoReplyReplyController extends GetxController {
     currentPage = 0;
   }
 
-  // 上拉加载
-  Future onLoad() async {
-    queryReplyList(type: 'onLoad');
-  }
-
   Future queryReplyList({type = 'init'}) async {
     if (type == 'init') {
       currentPage = 0;
@@ -49,11 +44,11 @@ class VideoReplyReplyController extends GetxController {
         if (replyList.length == res['data'].page.count) {
           noMore.value = '没有更多了';
         }
+        currentPage++;
       } else {
         // 未登录状态replies可能返回null
         noMore.value = currentPage == 0 ? '还没有评论' : '没有更多了';
       }
-      currentPage++;
       if (type == 'init') {
         // List<ReplyItemModel> replies = res['data'].replies;
         // 添加置顶回复
@@ -72,6 +67,10 @@ class VideoReplyReplyController extends GetxController {
         // res['data'].replies = replies;
         replyList.value = replies;
       } else {
+        // 每次回复之后，翻页请求有且只有相同的一条回复数据
+        if (replies.length == 1 && replies.last.rpid == replyList.last.rpid) {
+          return;
+        }
         replyList.addAll(replies);
         // res['data'].replies.addAll(replyList);
       }

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

@@ -1,3 +1,4 @@
+import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
@@ -54,9 +55,9 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
       () {
         if (scrollController.position.pixels >=
             scrollController.position.maxScrollExtent - 300) {
-          if (!_videoReplyReplyController.isLoadingMore) {
+          EasyThrottle.throttle('replylist', const Duration(seconds: 2), () {
-            _videoReplyReplyController.onLoad();
+            _videoReplyReplyController.queryReplyList(type: 'onLoad');
-          }
+          });
         }
       },
     );

lib/pages/video/detail/view.dart

@@ -20,6 +20,7 @@ import 'package:pilipala/pages/video/detail/controller.dart';
 import 'package:pilipala/pages/video/detail/introduction/index.dart';
 import 'package:pilipala/pages/video/detail/related/index.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
+import 'package:pilipala/plugin/pl_player/models/play_repeat.dart';
 import 'package:pilipala/utils/storage.dart';
 
 import 'widgets/app_bar.dart';
@@ -36,13 +37,13 @@ class VideoDetailPage extends StatefulWidget {
 
 class _VideoDetailPageState extends State<VideoDetailPage>
     with TickerProviderStateMixin, RouteAware {
-  final VideoDetailController videoDetailController =
+  late VideoDetailController videoDetailController;
-      Get.put(VideoDetailController(), tag: Get.arguments['heroTag']);
   PlPlayerController? plPlayerController;
   final ScrollController _extendNestCtr = ScrollController();
   late StreamController<double> appbarStream;
-  final VideoIntroController videoIntroController =
+  late VideoIntroController videoIntroController;
-      Get.put(VideoIntroController(), tag: Get.arguments['heroTag']);
+  late BangumiIntroController bangumiIntroController;
+  late String heroTag;
 
   PlayerStatus playerStatus = PlayerStatus.playing;
   double doubleOffset = 0;
@@ -54,19 +55,22 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   late Future _futureBuilderFuture;
   // 自动退出全屏
   late bool autoExitFullcreen;
-  Floating? floating;
+  late bool autoPlayEnable;
 
   @override
   void initState() {
     super.initState();
+    heroTag = Get.arguments['heroTag'];
+    videoDetailController = Get.put(VideoDetailController(), tag: heroTag);
+    videoIntroController = Get.put(VideoIntroController(), tag: heroTag);
+    bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag);
     statusBarHeight = localCache.get('statusBarHeight');
     autoExitFullcreen =
         setting.get(SettingBoxKey.enableAutoExit, defaultValue: false);
+    autoPlayEnable =
+        setting.get(SettingBoxKey.autoPlayEnable, defaultValue: true);
     videoSourceInit();
     appbarStreamListen();
-    if (Platform.isAndroid) {
-      floating = Floating();
-    }
   }
 
   // 获取视频资源，初始化播放器
@@ -97,11 +101,31 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       if (autoExitFullcreen) {
         plPlayerController!.triggerFullScreen(status: false);
       }
-      // 播放完展示控制栏
+
-      PiPStatus currentStatus = await floating!.pipStatus;
+      /// 顺序播放 列表循环
-      if (currentStatus == PiPStatus.disabled) {
+      if (plPlayerController!.playRepeat != PlayRepeat.pause &&
-        plPlayerController!.onLockControl(false);
+          plPlayerController!.playRepeat != PlayRepeat.singleCycle) {
+        if (videoDetailController.videoType == SearchType.video) {
+          videoIntroController.nextPlay();
+        }
+        if (videoDetailController.videoType == SearchType.media_bangumi) {
+          bangumiIntroController.nextPlay();
+        }
       }
+
+      /// 单个循环
+      if (plPlayerController!.playRepeat == PlayRepeat.singleCycle) {
+        plPlayerController!.seekTo(Duration.zero);
+        plPlayerController!.play();
+      }
+      // 播放完展示控制栏
+      try {
+        PiPStatus currentStatus =
+            await videoDetailController.floating!.pipStatus;
+        if (currentStatus == PiPStatus.disabled) {
+          plPlayerController!.onLockControl(false);
+        }
+      } catch (_) {}
     }
   }
 
@@ -126,8 +150,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       plPlayerController!.removeStatusLister(playerListener);
       plPlayerController!.dispose();
     }
-    if (floating != null) {
+    if (videoDetailController.floating != null) {
-      floating!.dispose();
+      videoDetailController.floating!.dispose();
     }
     super.dispose();
   }
@@ -139,10 +163,12 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     if (setting.get(SettingBoxKey.enableAutoBrightness, defaultValue: false)) {
       videoDetailController.brightness = plPlayerController!.brightness.value;
     }
-    videoDetailController.defaultST = plPlayerController!.position.value;
+    if (plPlayerController != null) {
-    videoIntroController.isPaused = true;
+      videoDetailController.defaultST = plPlayerController!.position.value;
-    plPlayerController!.removeStatusLister(playerListener);
+      videoIntroController.isPaused = true;
-    plPlayerController!.pause();
+      plPlayerController!.removeStatusLister(playerListener);
+      plPlayerController!.pause();
+    }
     super.didPushNext();
   }
 
@@ -150,16 +176,19 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   // 返回当前页面时
   void didPopNext() async {
     videoDetailController.isFirstTime = false;
-    bool autoplay =
+    bool autoplay = autoPlayEnable;
-        setting.get(SettingBoxKey.autoPlayEnable, defaultValue: true);
     videoDetailController.playerInit(autoplay: autoplay);
-    videoDetailController.autoPlay.value = true;
+
+    /// 未开启自动播放时，未播放跳转下一页返回/播放后跳转下一页返回
+    videoDetailController.autoPlay.value =
+        !videoDetailController.isShowCover.value;
     videoIntroController.isPaused = false;
     if (_extendNestCtr.position.pixels == 0 && autoplay) {
       await Future.delayed(const Duration(milliseconds: 300));
-      plPlayerController!.play();
+      plPlayerController!.seekTo(videoDetailController.defaultST);
+      plPlayerController?.play();
     }
-    plPlayerController!.addStatusLister(playerListener);
+    plPlayerController?.addStatusLister(playerListener);
     super.didPopNext();
   }
 
@@ -217,13 +246,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                             ? const SizedBox()
                                             : PLVideoPlayer(
                                                 controller: plPlayerController!,
-                                                headerControl: HeaderControl(
+                                                headerControl:
-                                                  controller:
+                                                    videoDetailController
-                                                      plPlayerController,
+                                                        .headerControl,
-                                                  videoDetailCtr:
-                                                      videoDetailController,
-                                                  floating: floating,
-                                                ),
                                                 danmuWidget: Obx(
                                                   () => PlDanmaku(
                                                     key: Key(
@@ -345,7 +370,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
               },
               onlyOneScrollInBody: true,
               body: Container(
-                key: Key(Get.arguments['heroTag']),
+                key: Key(heroTag),
                 color: Theme.of(context).colorScheme.background,
                 child: Column(
                   children: [
@@ -381,8 +406,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                     const VideoIntroPanel(),
                                   ] else if (videoDetailController.videoType ==
                                       SearchType.media_bangumi) ...[
-                                    BangumiIntroPanel(
+                                    Obx(() => BangumiIntroPanel(
-                                        cid: videoDetailController.cid)
+                                        cid: videoDetailController.cid.value)),
                                   ],
                                   // if (videoDetailController.videoType ==
                                   //     SearchType.video) ...[
@@ -440,7 +465,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       ),
     );
     Widget childWhenEnabled = FutureBuilder(
-      key: Key(Get.arguments['heroTag']),
+      key: Key(heroTag),
       future: _futureBuilderFuture,
       builder: ((context, snapshot) {
         if (snapshot.hasData && snapshot.data['status']) {