diff --git a/.github/workflows/beta_ci.yml b/.github/workflows/beta_ci.yml
index 14b51780..9c40de6b 100644
--- a/.github/workflows/beta_ci.yml
+++ b/.github/workflows/beta_ci.yml
@@ -12,7 +12,6 @@ on:
       - ".idea/**"
       - "!.github/workflows/**"
 
-
 jobs:
   update_version:
     name: Read and update version
@@ -96,7 +95,7 @@ jobs:
         if: steps.cache-flutter.outputs.cache-hit != 'true'
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: 3.16.5
+          flutter-version: 3.19.6
           channel: any
 
       - name: 下载项目依赖
diff --git a/.github/workflows/release_ci.yml b/.github/workflows/release_ci.yml
index 78230645..f7c06d29 100644
--- a/.github/workflows/release_ci.yml
+++ b/.github/workflows/release_ci.yml
@@ -36,7 +36,7 @@ jobs:
         if: steps.cache-flutter.outputs.cache-hit != 'true'
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: 3.16.5
+          flutter-version: 3.19.6
           channel: any
 
       - name: 下载项目依赖
@@ -98,7 +98,7 @@ jobs:
         uses: subosito/flutter-action@v2.10.0
         with:
           cache: true
-          flutter-version: 3.16.5
+          flutter-version: 3.19.6
 
       - name: flutter build ipa
         run: |
diff --git a/assets/images/coin.png b/assets/images/coin.png
index bc2952a7..afca87b2 100644
Binary files a/assets/images/coin.png and b/assets/images/coin.png differ
diff --git a/change_log/1.0.24.0626.md b/change_log/1.0.24.0626.md
new file mode 100644
index 00000000..d9a8892f
--- /dev/null
+++ b/change_log/1.0.24.0626.md
@@ -0,0 +1,23 @@
+## 1.0.24
+
+### 功能
++ 私信功能
++ 回复我的、收到的赞查看
++ 新的登录方式
++ 全屏选集
++ 一键三连
++ 按分区搜索
+
+### 优化
++ 页面跳转动画
++ 评论区跳转
+  
+### 修复
++ 音画不同步问题
++ 分集字幕未同步
++ 多语言字幕
++ 弹幕设置未生效
++ 
+
+
+问题反馈、功能建议请查看「关于」页面。
diff --git a/change_log/1.0.25.1010.md b/change_log/1.0.25.1010.md
new file mode 100644
index 00000000..951efcb1
--- /dev/null
+++ b/change_log/1.0.25.1010.md
@@ -0,0 +1,39 @@
+## 1.0.25
+
+### 功能
++ 直播弹幕
++ 稍后再看、收藏夹播放全部
++ 收藏夹新建、编辑
++ 评论删除
++ 评论保存为图片
++ 动态页滑动切换up
++ up投稿筛选充电视频
++ 直播tab展示关注up
++ up主页专栏展示
+
+### 优化
++ 视频详情页一键三连
++ 动态页标识充电视频
++ 播放器亮度、音量调整百分比展示
++ 封面预览时视频标题可复制
++ 竖屏直播布局
++ 图片预览
++ 专栏渲染优化
++ 私信图片查看
+  
+### 修复
++ 收藏夹点击异常
++ 搜索up异常
++ 系统通知已读异常
++ [赞了我的]展示错误
++ 部分up合集无法打开
++ 切换合集视频投币个数未重置
++ 搜索条件筛选面板无法滚动
++ 部分机型导航条未沉浸
++ 专栏图片渲染问题
++ 专栏浏览历史记录
++ 直播间历史记录
+
+
+更多更新日志可在Github上查看
+问题反馈、功能建议请查看「关于」页面。
diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift
index 70693e4a..dfa078c3 100644
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@@ -1,5 +1,6 @@
 import UIKit
 import Flutter
+import AVFoundation
 
 @UIApplicationMain
 @objc class AppDelegate: FlutterAppDelegate {
@@ -8,6 +9,14 @@ import Flutter
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
     GeneratedPluginRegistrant.register(with: self)
+    
+    // 设置音频会话类别，确保在静音模式下播放音频
+    do {
+      try AVAudioSession.sharedInstance().setCategory(.playback, options: [.duckOthers])
+    } catch {
+      print("Failed to set audio session category: \(error)")
+    }
+    
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
-}
+}
\ No newline at end of file
diff --git a/lib/common/widgets/badge.dart b/lib/common/widgets/badge.dart
index a8f2fc67..1e518f39 100644
--- a/lib/common/widgets/badge.dart
+++ b/lib/common/widgets/badge.dart
@@ -66,7 +66,7 @@ class PBadge extends StatelessWidget {
         border: Border.all(color: borderColor),
       ),
       child: Text(
-        text!,
+        text ?? '',
         style: TextStyle(fontSize: fs ?? fontSize, color: color),
       ),
     );
diff --git a/lib/common/widgets/html_render.dart b/lib/common/widgets/html_render.dart
index bf58d78c..b2aa75ff 100644
--- a/lib/common/widgets/html_render.dart
+++ b/lib/common/widgets/html_render.dart
@@ -1,7 +1,9 @@
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
-import 'package:get/get.dart';
-import 'network_img_layer.dart';
+import 'package:pilipala/plugin/pl_gallery/hero_dialog_route.dart';
+import 'package:pilipala/plugin/pl_gallery/interactiveviewer_gallery.dart';
+import 'package:pilipala/utils/highlight.dart';
 
 // ignore: must_be_immutable
 class HtmlRender extends StatelessWidget {
@@ -22,6 +24,20 @@ class HtmlRender extends StatelessWidget {
       data: htmlContent,
       onLinkTap: (String? url, Map<String, String> buildContext, attributes) {},
       extensions: [
+        TagExtension(
+          tagsToExtend: <String>{'pre'},
+          builder: (ExtensionContext extensionContext) {
+            final Map<String, dynamic> attributes = extensionContext.attributes;
+            final String lang = attributes['data-lang'] as String;
+            final String code = attributes['codecontent'] as String;
+            List<String> selectedLanguages = [lang.split('@').first];
+            TextSpan? result = highlightExistingText(code, selectedLanguages);
+            if (result == null) {
+              return const Center(child: Text('代码块渲染失败'));
+            }
+            return SelectableText.rich(result);
+          },
+        ),
         TagExtension(
           tagsToExtend: <String>{'img'},
           builder: (ExtensionContext extensionContext) {
@@ -44,20 +60,52 @@ class HtmlRender extends StatelessWidget {
               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,
+              return InkWell(
+                onTap: () {
+                  Navigator.of(context).push(
+                    HeroDialogRoute<void>(
+                      builder: (BuildContext context) =>
+                          InteractiveviewerGallery(
+                        sources: imgList ?? [imgUrl],
+                        initIndex: imgList?.indexOf(imgUrl) ?? 0,
+                        itemBuilder: (
+                          BuildContext context,
+                          int index,
+                          bool isFocus,
+                          bool enablePageView,
+                        ) {
+                          return GestureDetector(
+                            behavior: HitTestBehavior.opaque,
+                            onTap: () {
+                              if (enablePageView) {
+                                Navigator.of(context).pop();
+                              }
+                            },
+                            child: Center(
+                              child: Hero(
+                                tag: imgList?[index] ?? imgUrl,
+                                child: CachedNetworkImage(
+                                  fadeInDuration:
+                                      const Duration(milliseconds: 0),
+                                  imageUrl: imgList?[index] ?? imgUrl,
+                                  fit: BoxFit.contain,
+                                ),
+                              ),
+                            ),
+                          );
+                        },
+                        onPageChanged: (int pageIndex) {},
+                      ),
+                    ),
+                  );
+                },
+                child: CachedNetworkImage(imageUrl: imgUrl),
               );
+              // return NetworkImgLayer(
+              //   width: isEmote ? 22 : Get.size.width - 24,
+              //   height: isEmote ? 22 : 200,
+              //   src: imgUrl,
+              // );
             } catch (err) {
               return const SizedBox();
             }
@@ -66,7 +114,7 @@ class HtmlRender extends StatelessWidget {
       ],
       style: {
         'html': Style(
-          fontSize: FontSize.medium,
+          fontSize: FontSize.large,
           lineHeight: LineHeight.percent(140),
         ),
         'body': Style(margin: Margins.zero, padding: HtmlPaddings.zero),
@@ -78,7 +126,7 @@ class HtmlRender extends StatelessWidget {
           margin: Margins.only(bottom: 10),
         ),
         'span': Style(
-          fontSize: FontSize.medium,
+          fontSize: FontSize.large,
           height: Height(1.65),
         ),
         'div': Style(height: Height.auto()),
diff --git a/lib/common/widgets/http_error.dart b/lib/common/widgets/http_error.dart
index cbc6659b..0381319e 100644
--- a/lib/common/widgets/http_error.dart
+++ b/lib/common/widgets/http_error.dart
@@ -2,12 +2,18 @@ import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 
 class HttpError extends StatelessWidget {
-  const HttpError(
-      {required this.errMsg, required this.fn, this.btnText, super.key});
+  const HttpError({
+    required this.errMsg,
+    required this.fn,
+    this.btnText,
+    this.isShowBtn = true,
+    super.key,
+  });
 
   final String? errMsg;
   final Function()? fn;
   final String? btnText;
+  final bool isShowBtn;
 
   @override
   Widget build(BuildContext context) {
@@ -29,20 +35,22 @@ class HttpError extends StatelessWidget {
               style: Theme.of(context).textTheme.titleSmall,
             ),
             const SizedBox(height: 20),
-            FilledButton.tonal(
-              onPressed: () {
-                fn!();
-              },
-              style: ButtonStyle(
-                backgroundColor: MaterialStateProperty.resolveWith((states) {
-                  return Theme.of(context).colorScheme.primary.withAlpha(20);
-                }),
+            if (isShowBtn)
+              FilledButton.tonal(
+                onPressed: () {
+                  fn!();
+                },
+                style: ButtonStyle(
+                  backgroundColor: MaterialStateProperty.resolveWith((states) {
+                    return Theme.of(context).colorScheme.primary.withAlpha(20);
+                  }),
+                ),
+                child: Text(
+                  btnText ?? '点击重试',
+                  style:
+                      TextStyle(color: Theme.of(context).colorScheme.primary),
+                ),
               ),
-              child: Text(
-                btnText ?? '点击重试',
-                style: TextStyle(color: Theme.of(context).colorScheme.primary),
-              ),
-            ),
           ],
         ),
       ),
diff --git a/lib/common/widgets/network_img_layer.dart b/lib/common/widgets/network_img_layer.dart
index d2772478..fbedfbba 100644
--- a/lib/common/widgets/network_img_layer.dart
+++ b/lib/common/widgets/network_img_layer.dart
@@ -2,7 +2,7 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/utils/extension.dart';
-import 'package:pilipala/utils/global_data.dart';
+import 'package:pilipala/utils/global_data_cache.dart';
 import '../../utils/storage.dart';
 import '../constants.dart';
 
@@ -33,7 +33,11 @@ class NetworkImgLayer extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final int defaultImgQuality = GlobalData().imgQuality;
+    int defaultImgQuality = 10;
+    try {
+      defaultImgQuality = GlobalDataCache().imgQuality;
+    } catch (_) {}
+
     if (src == '' || src == null) {
       return placeholder(context);
     }
diff --git a/lib/common/widgets/pull_to_refresh_header.dart b/lib/common/widgets/pull_to_refresh_header.dart
deleted file mode 100644
index 46db5138..00000000
--- a/lib/common/widgets/pull_to_refresh_header.dart
+++ /dev/null
@@ -1,130 +0,0 @@
-// ignore_for_file: depend_on_referenced_packages
-
-import 'dart:math';
-import 'dart:ui' as ui show Image;
-
-import 'package:extended_image/extended_image.dart';
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:pull_to_refresh_notification/pull_to_refresh_notification.dart';
-
-double get maxDragOffset => 100;
-double hideHeight = maxDragOffset / 2.3;
-double refreshHeight = maxDragOffset / 1.5;
-
-class PullToRefreshHeader extends StatelessWidget {
-  const PullToRefreshHeader(
-    this.info,
-    this.lastRefreshTime, {
-    this.color,
-    super.key,
-  });
-
-  final PullToRefreshScrollNotificationInfo? info;
-  final DateTime? lastRefreshTime;
-  final Color? color;
-
-  @override
-  Widget build(BuildContext context) {
-    final PullToRefreshScrollNotificationInfo? infos = info;
-    if (infos == null) {
-      return const SizedBox();
-    }
-    String text = '';
-    if (infos.mode == PullToRefreshIndicatorMode.armed) {
-      text = 'Release to refresh';
-    } else if (infos.mode == PullToRefreshIndicatorMode.refresh ||
-        infos.mode == PullToRefreshIndicatorMode.snap) {
-      text = 'Loading...';
-    } else if (infos.mode == PullToRefreshIndicatorMode.done) {
-      text = 'Refresh completed.';
-    } else if (infos.mode == PullToRefreshIndicatorMode.drag) {
-      text = 'Pull to refresh';
-    } else if (infos.mode == PullToRefreshIndicatorMode.canceled) {
-      text = 'Cancel refresh';
-    }
-
-    final TextStyle ts = const TextStyle(
-      color: Colors.grey,
-    ).copyWith(fontSize: 14);
-
-    final double dragOffset = info?.dragOffset ?? 0.0;
-
-    final DateTime time = lastRefreshTime ?? DateTime.now();
-    final double top = -hideHeight + dragOffset;
-    return Container(
-      height: dragOffset,
-      color: color ?? Colors.transparent,
-      // padding: EdgeInsets.only(top: dragOffset / 3),
-      // padding: EdgeInsets.only(bottom: 5.0),
-      child: Stack(
-        children: <Widget>[
-          Positioned(
-            left: 0.0,
-            right: 0.0,
-            top: top,
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: <Widget>[
-                Expanded(
-                  child: Container(
-                    alignment: Alignment.centerRight,
-                    margin: const EdgeInsets.only(right: 12.0),
-                    child: RefreshImage(top, null),
-                  ),
-                ),
-                Column(
-                  children: <Widget>[
-                    Text(text, style: ts),
-                    Text(
-                      'Last updated:${DateFormat('yyyy-MM-dd hh:mm').format(time)}',
-                      style: ts.copyWith(fontSize: 14),
-                    )
-                  ],
-                ),
-                const Spacer(),
-              ],
-            ),
-          )
-        ],
-      ),
-    );
-  }
-}
-
-class RefreshImage extends StatelessWidget {
-  const RefreshImage(this.top, Key? key) : super(key: key);
-
-  final double top;
-
-  @override
-  Widget build(BuildContext context) {
-    const double imageSize = 30;
-    return ExtendedImage.asset(
-      'assets/flutterCandies_grey.png',
-      width: imageSize,
-      height: imageSize,
-      afterPaintImage: (Canvas canvas, Rect rect, ui.Image image, Paint paint) {
-        final double imageHeight = image.height.toDouble();
-        final double imageWidth = image.width.toDouble();
-        final Size size = rect.size;
-        final double y =
-            (1 - min(top / (refreshHeight - hideHeight), 1)) * imageHeight;
-
-        canvas.drawImageRect(
-          image,
-          Rect.fromLTWH(0.0, y, imageWidth, imageHeight - y),
-          Rect.fromLTWH(rect.left, rect.top + y / imageHeight * size.height,
-              size.width, (imageHeight - y) / imageHeight * size.height),
-          Paint()
-            ..colorFilter =
-                const ColorFilter.mode(Color(0xFFea5504), BlendMode.srcIn)
-            ..isAntiAlias = false
-            ..filterQuality = FilterQuality.low,
-        );
-
-        //canvas.restore();
-      },
-    );
-  }
-}
diff --git a/lib/common/widgets/stat/danmu.dart b/lib/common/widgets/stat/danmu.dart
index 511839a0..9ea05301 100644
--- a/lib/common/widgets/stat/danmu.dart
+++ b/lib/common/widgets/stat/danmu.dart
@@ -6,7 +6,7 @@ class StatDanMu extends StatelessWidget {
   final dynamic danmu;
   final String? size;
 
-  const StatDanMu({Key? key, this.theme, this.danmu, this.size})
+  const StatDanMu({Key? key, this.theme = 'gray', this.danmu, this.size})
       : super(key: key);
 
   @override
@@ -17,21 +17,46 @@ class StatDanMu extends StatelessWidget {
       'black': Theme.of(context).colorScheme.onSurface.withOpacity(0.8),
     };
     Color color = colorObject[theme]!;
+    return StatIconText(
+      icon: Icons.subtitles_outlined,
+      text: Utils.numFormat(danmu!),
+      color: color,
+      size: size,
+    );
+  }
+}
+
+class StatIconText extends StatelessWidget {
+  final IconData icon;
+  final String text;
+  final Color color;
+  final String? size;
+
+  const StatIconText({
+    Key? key,
+    required this.icon,
+    required this.text,
+    required this.color,
+    this.size,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
     return Row(
       children: [
         Icon(
-          Icons.subtitles_outlined,
+          icon,
           size: 14,
           color: color,
         ),
         const SizedBox(width: 2),
         Text(
-          Utils.numFormat(danmu!),
+          text,
           style: TextStyle(
             fontSize: size == 'medium' ? 12 : 11,
             color: color,
           ),
-        )
+        ),
       ],
     );
   }
diff --git a/lib/common/widgets/stat/view.dart b/lib/common/widgets/stat/view.dart
index 5359c979..85bec816 100644
--- a/lib/common/widgets/stat/view.dart
+++ b/lib/common/widgets/stat/view.dart
@@ -6,8 +6,12 @@ class StatView extends StatelessWidget {
   final dynamic view;
   final String? size;
 
-  const StatView({Key? key, this.theme, this.view, this.size})
-      : super(key: key);
+  const StatView({
+    Key? key,
+    this.theme = 'gray',
+    this.view,
+    this.size,
+  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -17,16 +21,41 @@ class StatView extends StatelessWidget {
       'black': Theme.of(context).colorScheme.onSurface.withOpacity(0.8),
     };
     Color color = colorObject[theme]!;
+    return StatIconText(
+      icon: Icons.play_circle_outlined,
+      text: Utils.numFormat(view!),
+      color: color,
+      size: size,
+    );
+  }
+}
+
+class StatIconText extends StatelessWidget {
+  final IconData icon;
+  final String text;
+  final Color color;
+  final String? size;
+
+  const StatIconText({
+    Key? key,
+    required this.icon,
+    required this.text,
+    required this.color,
+    this.size,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
     return Row(
       children: [
         Icon(
-          Icons.play_circle_outlined,
+          icon,
           size: 13,
           color: color,
         ),
         const SizedBox(width: 2),
         Text(
-          Utils.numFormat(view!),
+          text,
           style: TextStyle(
             fontSize: size == 'medium' ? 12 : 11,
             color: color,
diff --git a/lib/common/widgets/video_card_h.dart b/lib/common/widgets/video_card_h.dart
index 1265477f..78c4ba87 100644
--- a/lib/common/widgets/video_card_h.dart
+++ b/lib/common/widgets/video_card_h.dart
@@ -266,17 +266,11 @@ class VideoContent extends StatelessWidget {
             Row(
               children: [
                 if (showView) ...[
-                  StatView(
-                    theme: 'gray',
-                    view: videoItem.stat.view as int,
-                  ),
+                  StatView(view: videoItem.stat.view as int),
                   const SizedBox(width: 8),
                 ],
                 if (showDanmaku)
-                  StatDanMu(
-                    theme: 'gray',
-                    danmu: videoItem.stat.danmaku as int,
-                  ),
+                  StatDanMu(danmu: videoItem.stat.danmaku as int),
                 const Spacer(),
                 if (source == 'normal')
                   SizedBox(
diff --git a/lib/common/widgets/video_card_v.dart b/lib/common/widgets/video_card_v.dart
index 14476cdf..378c9f75 100644
--- a/lib/common/widgets/video_card_v.dart
+++ b/lib/common/widgets/video_card_v.dart
@@ -60,17 +60,13 @@ class VideoCardV extends StatelessWidget {
       // 动态
       case 'picture':
         try {
-          String dynamicType = 'picture';
           String uri = videoItem.uri;
-          String id = '';
           if (videoItem.uri.startsWith('bilibili://article/')) {
             // https://www.bilibili.com/read/cv27063554
-            dynamicType = 'read';
             RegExp regex = RegExp(r'\d+');
             Match match = regex.firstMatch(videoItem.uri)!;
             String matchedNumber = match.group(0)!;
             videoItem.param = int.parse(matchedNumber);
-            id = 'cv${videoItem.param}';
           }
           if (uri.startsWith('http')) {
             String path = Uri.parse(uri).path;
@@ -88,11 +84,10 @@ class VideoCardV extends StatelessWidget {
               return;
             }
           }
-          Get.toNamed('/htmlRender', parameters: {
-            'url': uri,
+          Get.toNamed('/read', parameters: {
             'title': videoItem.title,
-            'id': id,
-            'dynamicType': dynamicType
+            'id': videoItem.param,
+            'articleType': 'read'
           });
         } catch (err) {
           SmartDialog.showToast(err.toString());
@@ -215,9 +210,8 @@ class VideoContent extends StatelessWidget {
             children: [
               if (videoItem.goto == 'bangumi')
                 _buildBadge(videoItem.bangumiBadge, 'line', 9),
-              if (videoItem.rcmdReason?.content != null &&
-                  videoItem.rcmdReason.content != '')
-                _buildBadge(videoItem.rcmdReason.content, 'color'),
+              if (videoItem.rcmdReason != null)
+                _buildBadge(videoItem.rcmdReason, 'color'),
               if (videoItem.goto == 'picture') _buildBadge('动态', 'line', 9),
               if (videoItem.isFollowed == 1) _buildBadge('已关注', 'color'),
               Expanded(
@@ -288,9 +282,9 @@ class VideoStat extends StatelessWidget {
   Widget build(BuildContext context) {
     return Row(
       children: [
-        StatView(theme: 'gray', view: videoItem.stat.view),
+        StatView(view: videoItem.stat.view),
         const SizedBox(width: 8),
-        StatDanMu(theme: 'gray', danmu: videoItem.stat.danmu),
+        StatDanMu(danmu: videoItem.stat.danmu),
         if (videoItem is RecVideoItemModel) ...<Widget>[
           crossAxisCount > 1 ? const Spacer() : const SizedBox(width: 8),
           RichText(
diff --git a/lib/http/api.dart b/lib/http/api.dart
index f20b8bcf..d7d60160 100644
--- a/lib/http/api.dart
+++ b/lib/http/api.dart
@@ -487,6 +487,8 @@ class Api {
   static const getSeasonDetailApi =
       '/x/polymer/web-space/seasons_archives_list';
 
+  static const getSeriesDetailApi = '/x/series/archives';
+
   /// 获取未读动态数
   static const getUnreadDynamic = '/x/web-interface/dynamic/entrance';
 
@@ -548,4 +550,49 @@ class Api {
 
   /// 收到的赞
   static const String messageLikeAPi = '/x/msgfeed/like';
+
+  /// 系统通知
+  static const String messageSystemAPi =
+      '${HttpString.messageBaseUrl}/x/sys-msg/query_unified_notify';
+
+  /// 系统通知 个人
+  static const String userMessageSystemAPi =
+      '${HttpString.messageBaseUrl}/x/sys-msg/query_user_notify';
+
+  /// 系统通知标记已读
+  static const String systemMarkRead =
+      '${HttpString.messageBaseUrl}/x/sys-msg/update_cursor';
+
+  /// 编辑收藏夹
+  static const String editFavFolder = '/x/v3/fav/folder/edit';
+
+  /// 新建收藏夹
+  static const String addFavFolder = '/x/v3/fav/folder/add';
+
+  /// 直播间弹幕信息
+  static const String getDanmuInfo =
+      '${HttpString.liveBaseUrl}/xlive/web-room/v1/index/getDanmuInfo';
+
+  /// 直播间发送弹幕
+  static const String sendLiveMsg = '${HttpString.liveBaseUrl}/msg/send';
+
+  /// 我的关注 - 正在直播
+  static const String getFollowingLive =
+      '${HttpString.liveBaseUrl}/xlive/web-ucenter/user/following';
+
+  /// 稍后再看&收藏夹视频列表
+  static const String mediaList = '/x/v2/medialist/resource/list';
+
+  /// 用户专栏
+  static const String opusList = '/x/polymer/web-dynamic/v1/opus/feed/space';
+
+  ///
+  static const String getViewInfo = '/x/article/viewinfo';
+
+  /// 直播间记录
+  static const String liveRoomEntry =
+      '${HttpString.liveBaseUrl}/xlive/web-room/v1/index/roomEntryAction';
+
+  /// 删除评论
+  static const String replyDel = '/x/v2/reply/del';
 }
diff --git a/lib/http/black.dart b/lib/http/black.dart
index 0c6a63ab..67356a92 100644
--- a/lib/http/black.dart
+++ b/lib/http/black.dart
@@ -28,7 +28,7 @@ class BlackHttp {
   static Future removeBlack({required int fid}) async {
     var res = await Request().post(
       Api.removeBlack,
-      queryParameters: {
+      data: {
         'act': 6,
         'csrf': await Request.getCsrf(),
         'fid': fid,
diff --git a/lib/http/constants.dart b/lib/http/constants.dart
index 3d749ee8..b734c279 100644
--- a/lib/http/constants.dart
+++ b/lib/http/constants.dart
@@ -5,6 +5,8 @@ class HttpString {
   static const String appBaseUrl = 'https://app.bilibili.com';
   static const String liveBaseUrl = 'https://api.live.bilibili.com';
   static const String passBaseUrl = 'https://passport.bilibili.com';
+  static const String messageBaseUrl = 'https://message.bilibili.com';
+  static const String bangumiBaseUrl = 'https://bili.meark.me';
   static const List<int> validateStatusCodes = [
     302,
     304,
diff --git a/lib/http/danmaku.dart b/lib/http/danmaku.dart
index 0b108755..2ed2a415 100644
--- a/lib/http/danmaku.dart
+++ b/lib/http/danmaku.dart
@@ -67,9 +67,6 @@ class DanmakaHttp {
     var response = await Request().post(
       Api.shootDanmaku,
       data: params,
-      options: Options(
-        contentType: Headers.formUrlEncodedContentType,
-      ),
     );
     if (response.statusCode != 200) {
       return {
diff --git a/lib/http/dynamics.dart b/lib/http/dynamics.dart
index 69619361..5ba5675e 100644
--- a/lib/http/dynamics.dart
+++ b/lib/http/dynamics.dart
@@ -1,4 +1,5 @@
 import 'dart:math';
+import 'package:dio/dio.dart';
 import '../models/dynamics/result.dart';
 import '../models/dynamics/up.dart';
 import 'index.dart';
@@ -69,7 +70,7 @@ class DynamicsHttp {
   }) async {
     var res = await Request().post(
       Api.likeDynamic,
-      queryParameters: {
+      data: {
         'dynamic_id': dynamicId,
         'up': up,
         'csrf': await Request.getCsrf(),
@@ -175,27 +176,32 @@ class DynamicsHttp {
         'revs_id': {'dyn_type': 8, 'rid': oid}
       };
     }
-    var res = await Request().post(Api.dynamicCreate, queryParameters: {
-      'platform': 'web',
-      'csrf': await Request.getCsrf(),
-      'x-bili-device-req-json': {'platform': 'web', 'device': 'pc'},
-      'x-bili-web-req-json': {'spm_id': '333.999'},
-    }, data: {
-      'dyn_req': {
-        'content': {
-          'contents': [
-            {'raw_text': rawText ?? '', 'type': 1, 'biz_id': ''}
-          ]
-        },
-        'scene': scene,
-        'attach_card': null,
-        'upload_id': uploadId,
-        'meta': {
-          'app_meta': {'from': 'create.dynamic.web', 'mobi_app': 'web'}
-        }
+    var res = await Request().post(
+      Api.dynamicCreate,
+      queryParameters: {
+        'platform': 'web',
+        'csrf': await Request.getCsrf(),
+        'x-bili-device-req-json': {'platform': 'web', 'device': 'pc'},
+        'x-bili-web-req-json': {'spm_id': '333.999'},
       },
-      'web_repost_src': webRepostSrc
-    });
+      data: {
+        'dyn_req': {
+          'content': {
+            'contents': [
+              {'raw_text': rawText ?? '', 'type': 1, 'biz_id': ''}
+            ]
+          },
+          'scene': scene,
+          'attach_card': null,
+          'upload_id': uploadId,
+          'meta': {
+            'app_meta': {'from': 'create.dynamic.web', 'mobi_app': 'web'}
+          }
+        },
+        'web_repost_src': webRepostSrc
+      },
+      options: Options(contentType: 'application/json'),
+    );
     if (res.data['code'] == 0) {
       return {
         'status': true,
diff --git a/lib/http/fav.dart b/lib/http/fav.dart
new file mode 100644
index 00000000..69577e7e
--- /dev/null
+++ b/lib/http/fav.dart
@@ -0,0 +1,67 @@
+import 'index.dart';
+
+class FavHttp {
+  /// 编辑收藏夹
+  static Future editFolder({
+    required String title,
+    required String intro,
+    required String mediaId,
+    String? cover,
+    int? privacy,
+  }) async {
+    var res = await Request().post(
+      Api.editFavFolder,
+      data: {
+        'title': title,
+        'intro': intro,
+        'media_id': mediaId,
+        'cover': cover ?? '',
+        'privacy': privacy ?? 0,
+        'csrf': await Request.getCsrf(),
+      },
+    );
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': res.data['data'],
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  /// 新建收藏夹
+  static Future addFolder({
+    required String title,
+    required String intro,
+    String? cover,
+    int? privacy,
+  }) async {
+    var res = await Request().post(
+      Api.addFavFolder,
+      data: {
+        'title': title,
+        'intro': intro,
+        'cover': cover ?? '',
+        'privacy': privacy ?? 0,
+        'csrf': await Request.getCsrf(),
+      },
+    );
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': res.data['data'],
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+}
diff --git a/lib/http/init.dart b/lib/http/init.dart
index a0b36369..abe8d019 100644
--- a/lib/http/init.dart
+++ b/lib/http/init.dart
@@ -27,11 +27,14 @@ class Request {
   late bool enableSystemProxy;
   late String systemProxyHost;
   late String systemProxyPort;
-  static final RegExp spmPrefixExp = RegExp(r'<meta name="spm_prefix" content="([^"]+?)">');
+  static final RegExp spmPrefixExp =
+      RegExp(r'<meta name="spm_prefix" content="([^"]+?)">');
+  static String? buvid;
 
   /// 设置cookie
   static setCookie() async {
     Box userInfoCache = GStrorage.userInfo;
+    Box setting = GStrorage.setting;
     final String cookiePath = await Utils.getCookiePath();
     final PersistCookieJar cookieJar = PersistCookieJar(
       ignoreExpires: true,
@@ -54,7 +57,11 @@ class Request {
       }
     }
     setOptionsHeaders(userInfo, userInfo != null && userInfo.mid != null);
-
+    String baseUrlType = 'default';
+    if (setting.get(SettingBoxKey.enableGATMode, defaultValue: false)) {
+      baseUrlType = 'bangumi';
+    }
+    setBaseUrl(type: baseUrlType);
     try {
       await buvidActivate();
     } catch (e) {
@@ -64,6 +71,7 @@ class Request {
     final String cookieString = cookie
         .map((Cookie cookie) => '${cookie.name}=${cookie.value}')
         .join('; ');
+
     dio.options.headers['cookie'] = cookieString;
   }
 
@@ -78,6 +86,30 @@ class Request {
     return token;
   }
 
+  static Future<String> getBuvid() async {
+    if (buvid != null) {
+      return buvid!;
+    }
+
+    final List<Cookie> cookies = await cookieManager.cookieJar
+        .loadForRequest(Uri.parse(HttpString.baseUrl));
+    buvid = cookies.firstWhere((cookie) => cookie.name == 'buvid3').value;
+    if (buvid == null) {
+      try {
+        var result = await Request().get(
+          "${HttpString.apiBaseUrl}/x/frontend/finger/spi",
+        );
+        buvid = result["data"]["b_3"].toString();
+      } catch (e) {
+        // 处理请求错误
+        buvid = '';
+        print("Error fetching buvid: $e");
+      }
+    }
+
+    return buvid!;
+  }
+
   static setOptionsHeaders(userInfo, bool status) {
     if (status) {
       dio.options.headers['x-bili-mid'] = userInfo.mid.toString();
@@ -95,11 +127,10 @@ class Request {
     String spmPrefix = spmPrefixExp.firstMatch(html.data)!.group(1)!;
     Random rand = Random();
     String rand_png_end = base64.encode(
-      List<int>.generate(32, (_) => rand.nextInt(256)) +
-      List<int>.filled(4, 0) +
-      [73, 69, 78, 68] +
-      List<int>.generate(4, (_) => rand.nextInt(256))
-    );
+        List<int>.generate(32, (_) => rand.nextInt(256)) +
+            List<int>.filled(4, 0) +
+            [73, 69, 78, 68] +
+            List<int>.generate(4, (_) => rand.nextInt(256)));
 
     String jsonData = json.encode({
       '3064': 1,
@@ -110,11 +141,9 @@ class Request {
       },
     });
 
-    await Request().post(
-      Api.activateBuvidApi,
-      data: {'payload': jsonData},
-      options: Options(contentType: 'application/json')
-    );
+    await Request().post(Api.activateBuvidApi,
+        data: {'payload': jsonData},
+        options: Options(contentType: 'application/json'));
   }
 
   /*
@@ -188,12 +217,13 @@ class Request {
   /*
    * get请求
    */
-  get(url, {data, options, cancelToken, extra}) async {
+  get(url, {data, Options? options, cancelToken, extra}) async {
     Response response;
-    final Options options = Options();
+    options ??= Options(); // 如果 options 为 null，则初始化一个新的 Options 对象
     ResponseType resType = ResponseType.json;
+
     if (extra != null) {
-      resType = extra!['resType'] ?? ResponseType.json;
+      resType = extra['resType'] ?? ResponseType.json;
       if (extra['ua'] != null) {
         options.headers = {'user-agent': headerUa(type: extra['ua'])};
       }
@@ -209,14 +239,11 @@ class Request {
       );
       return response;
     } on DioException catch (e) {
-      Response errResponse = Response(
-        data: {
-          'message': await ApiInterceptor.dioError(e)
-        }, // 将自定义 Map 数据赋值给 Response 的 data 属性
+      return Response(
+        data: {'message': await ApiInterceptor.dioError(e)},
         statusCode: 200,
         requestOptions: RequestOptions(),
       );
-      return errResponse;
     }
   }
 
@@ -231,7 +258,8 @@ class Request {
         url,
         data: data,
         queryParameters: queryParameters,
-        options: options,
+        options:
+            options ?? Options(contentType: Headers.formUrlEncodedContentType),
         cancelToken: cancelToken,
       );
       // print('post success: ${response.data}');
@@ -294,4 +322,17 @@ class Request {
     }
     return headerUa;
   }
+
+  static setBaseUrl({String type = 'default'}) {
+    switch (type) {
+      case 'default':
+        dio.options.baseUrl = HttpString.apiBaseUrl;
+        break;
+      case 'bangumi':
+        dio.options.baseUrl = HttpString.bangumiBaseUrl;
+        break;
+      default:
+        dio.options.baseUrl = HttpString.apiBaseUrl;
+    }
+  }
 }
diff --git a/lib/http/interceptor.dart b/lib/http/interceptor.dart
index 10b5aee5..259a3bf9 100644
--- a/lib/http/interceptor.dart
+++ b/lib/http/interceptor.dart
@@ -46,7 +46,8 @@ class ApiInterceptor extends Interceptor {
     // 处理网络请求错误
     // handler.next(err);
     String url = err.requestOptions.uri.toString();
-    if (!url.contains('heartbeat')) {
+    final excludedPatterns = RegExp(r'heartbeat|seg\.so|online/total');
+    if (!excludedPatterns.hasMatch(url)) {
       SmartDialog.showToast(
         await dioError(err),
         displayType: SmartToastType.onlyRefresh,
diff --git a/lib/http/live.dart b/lib/http/live.dart
index e624120e..259f86fc 100644
--- a/lib/http/live.dart
+++ b/lib/http/live.dart
@@ -1,3 +1,5 @@
+import 'package:pilipala/models/live/follow.dart';
+
 import '../models/live/item.dart';
 import '../models/live/room_info.dart';
 import '../models/live/room_info_h5.dart';
@@ -65,4 +67,96 @@ class LiveHttp {
       };
     }
   }
+
+  // 获取弹幕信息
+  static Future liveDanmakuInfo({roomId}) async {
+    var res = await Request().get(Api.getDanmuInfo, data: {
+      'id': roomId,
+    });
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': res.data['data'],
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 发送弹幕
+  static Future sendDanmaku({roomId, msg}) async {
+    var res = await Request().post(
+      Api.sendLiveMsg,
+      data: {
+        'bubble': 0,
+        'msg': msg,
+        'color': 16777215, // 颜色
+        'mode': 1, // 模式
+        'room_type': 0,
+        'jumpfrom': 71001, // 直播间来源
+        'reply_mid': 0,
+        'reply_attr': 0,
+        'replay_dmid': '',
+        'statistics': {"appId": 100, "platform": 5},
+        'fontsize': 25, // 字体大小
+        'rnd': DateTime.now().millisecondsSinceEpoch ~/ 1000, // 时间戳
+        'roomid': roomId,
+        'csrf': await Request.getCsrf(),
+        'csrf_token': await Request.getCsrf(),
+      },
+    );
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': res.data['data'],
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 我的关注 正在直播
+  static Future liveFollowing({int? pn, int? ps}) async {
+    var res = await Request().get(Api.getFollowingLive, data: {
+      'page': pn,
+      'page_size': ps,
+      'platform': 'web',
+      'ignoreRecord': 1,
+      'hit_ab': true,
+    });
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': LiveFollowingModel.fromJson(res.data['data'])
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 直播历史记录
+  static Future liveRoomEntry({required int roomId}) async {
+    await Request().post(
+      Api.liveRoomEntry,
+      data: {
+        'room_id': roomId,
+        'platform': 'pc',
+        'csrf_token': await Request.getCsrf(),
+        'csrf': await Request.getCsrf(),
+        'visit_id': '',
+      },
+    );
+  }
 }
diff --git a/lib/http/login.dart b/lib/http/login.dart
index 2437b72a..80f58803 100644
--- a/lib/http/login.dart
+++ b/lib/http/login.dart
@@ -71,9 +71,6 @@ class LoginHttp {
     var res = await Request().post(
       Api.webSmsCode,
       data: formData,
-      options: Options(
-        contentType: Headers.formUrlEncodedContentType,
-      ),
     );
     if (res.data['code'] == 0) {
       return {
@@ -106,9 +103,6 @@ class LoginHttp {
     var res = await Request().post(
       Api.webSmsLogin,
       data: formData,
-      options: Options(
-        contentType: Headers.formUrlEncodedContentType,
-      ),
     );
     if (res.data['code'] == 0) {
       return {
@@ -155,9 +149,6 @@ class LoginHttp {
     var res = await Request().post(
       Api.appSmsCode,
       data: data,
-      options: Options(
-        contentType: Headers.formUrlEncodedContentType,
-      ),
     );
     print(res);
   }
@@ -208,9 +199,6 @@ class LoginHttp {
     var res = await Request().post(
       Api.loginInByPwdApi,
       data: data,
-      options: Options(
-        contentType: Headers.formUrlEncodedContentType,
-      ),
     );
     print(res);
   }
@@ -239,17 +227,27 @@ class LoginHttp {
     var res = await Request().post(
       Api.loginInByWebPwd,
       data: formData,
-      options: Options(
-        contentType: Headers.formUrlEncodedContentType,
-      ),
     );
     if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': res.data['data'],
-      };
+      if (res.data['data']['status'] == 0) {
+        return {
+          'status': true,
+          'data': res.data['data'],
+        };
+      } else {
+        return {
+          'status': false,
+          'code': 1,
+          'data': res.data['data'],
+          'msg': res.data['data']['message'],
+        };
+      }
     } else {
-      return {'status': false, 'data': [], 'msg': res.data['message']};
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
     }
   }
 
diff --git a/lib/http/member.dart b/lib/http/member.dart
index 1af0f9a4..fc99c987 100644
--- a/lib/http/member.dart
+++ b/lib/http/member.dart
@@ -1,5 +1,10 @@
+import 'dart:convert';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:hive/hive.dart';
+import 'package:html/parser.dart';
+import 'package:pilipala/models/member/article.dart';
+import 'package:pilipala/models/member/like.dart';
+import 'package:pilipala/utils/global_data_cache.dart';
 import '../common/constants.dart';
 import '../models/dynamics/result.dart';
 import '../models/follow/result.dart';
@@ -15,14 +20,20 @@ import 'index.dart';
 
 class MemberHttp {
   static Future memberInfo({
-    int? mid,
+    required int mid,
     String token = '',
   }) async {
+    String? wWebid;
+    if ((await getWWebid(mid: mid))['status']) {
+      wWebid = GlobalDataCache().wWebid;
+    }
+
     Map params = await WbiSign().makSign({
       'mid': mid,
       'token': token,
       'platform': 'web',
       'web_location': 1550101,
+      ...wWebid != null ? {'w_webid': wWebid} : {},
     });
     var res = await Request().get(
       Api.memberInfo,
@@ -95,7 +106,14 @@ class MemberHttp {
       'dm_img_str': dmImgStr.substring(0, dmImgStr.length - 2),
       'dm_cover_img_str': dmCoverImgStr.substring(0, dmCoverImgStr.length - 2),
       'dm_img_inter': '{"ds":[],"wh":[0,0,0],"of":[0,0,0]}',
+      ...order == 'charge'
+          ? {
+              'order': 'pubdate',
+              'special_type': 'charging',
+            }
+          : {}
     });
+
     var res = await Request().get(
       Api.memberArchive,
       data: params,
@@ -187,13 +205,15 @@ class MemberHttp {
 
   // 设置分组
   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
-    });
+    var res = await Request().post(
+      Api.addUsers,
+      data: {
+        'fids': fids,
+        'tagids': tagids ?? '0',
+        'csrf': await Request.getCsrf(),
+      },
+      queryParameters: {'cross_domain': true},
+    );
     if (res.data['code'] == 0) {
       return {'status': true, 'data': [], 'msg': '操作成功'};
     } else {
@@ -328,7 +348,9 @@ class MemberHttp {
     if (res.data['code'] == 0) {
       return {
         'status': true,
-        'data': MemberSeasonsDataModel.fromJson(res.data['data']['items_lists'])
+        'data': res.data['data']['list']
+            .map<MemberLikeDataModel>((e) => MemberLikeDataModel.fromJson(e))
+            .toList(),
       };
     } else {
       return {
@@ -409,11 +431,14 @@ class MemberHttp {
   static Future cookieToKey() async {
     var authCodeRes = await getTVCode();
     if (authCodeRes['status']) {
-      var res = await Request().post(Api.cookieToKey, queryParameters: {
-        'auth_code': authCodeRes['data'],
-        'build': 708200,
-        'csrf': await Request.getCsrf(),
-      });
+      var res = await Request().post(
+        Api.cookieToKey,
+        data: {
+          'auth_code': authCodeRes['data'],
+          'build': 708200,
+          'csrf': await Request.getCsrf(),
+        },
+      );
       await Future.delayed(const Duration(milliseconds: 300));
       await qrcodePoll(authCodeRes['data']);
       if (res.data['code'] == 0) {
@@ -510,4 +535,96 @@ class MemberHttp {
       };
     }
   }
+
+  static Future getSeriesDetail({
+    required int mid,
+    required int currentMid,
+    required int seriesId,
+    required int pn,
+  }) async {
+    var res = await Request().get(
+      Api.getSeriesDetailApi,
+      data: {
+        'mid': mid,
+        'series_id': seriesId,
+        'only_normal': true,
+        'sort': 'desc',
+        'pn': pn,
+        'ps': 30,
+        'current_mid': currentMid,
+      },
+    );
+    if (res.data['code'] == 0) {
+      try {
+        return {
+          'status': true,
+          'data': MemberSeasonsDataModel.fromJson(res.data['data'])
+        };
+      } catch (err) {
+        print(err);
+      }
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  static Future getWWebid({required int mid}) async {
+    String? wWebid = GlobalDataCache().wWebid;
+    if (wWebid != null) {
+      return {'status': true, 'data': wWebid};
+    }
+    var res = await Request().get('https://space.bilibili.com/$mid/article');
+    String? headContent = parse(res.data).head?.outerHtml;
+    final regex = RegExp(
+        r'<script id="__RENDER_DATA__" type="application/json">(.*?)</script>');
+    if (headContent != null) {
+      final match = regex.firstMatch(headContent);
+      if (match != null && match.groupCount >= 1) {
+        final content = match.group(1);
+        String decodedString = Uri.decodeComponent(content!);
+        Map<String, dynamic> map = jsonDecode(decodedString);
+        GlobalDataCache().wWebid = map['access_id'];
+        return {'status': true, 'data': map['access_id']};
+      } else {
+        return {'status': false, 'data': '请检查登录状态'};
+      }
+    }
+    return {'status': false, 'data': '请检查登录状态'};
+  }
+
+  // 获取用户专栏
+  static Future getMemberArticle({
+    required int mid,
+    required int pn,
+    String? offset,
+  }) async {
+    String? wWebid;
+    if ((await getWWebid(mid: mid))['status']) {
+      wWebid = GlobalDataCache().wWebid;
+    }
+    Map params = await WbiSign().makSign({
+      'host_mid': mid,
+      'page': pn,
+      'offset': offset,
+      'web_location': 333.999,
+      ...wWebid != null ? {'w_webid': wWebid} : {},
+    });
+    var res = await Request().get(Api.opusList, data: params);
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': MemberArticleDataModel.fromJson(res.data['data'])
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'] ?? '请求异常',
+      };
+    }
+  }
 }
diff --git a/lib/http/msg.dart b/lib/http/msg.dart
index 7c168230..6426a6f2 100644
--- a/lib/http/msg.dart
+++ b/lib/http/msg.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 import 'dart:math';
-import 'package:dio/dio.dart';
 import 'package:pilipala/models/msg/like.dart';
 import 'package:pilipala/models/msg/reply.dart';
+import 'package:pilipala/models/msg/system.dart';
 import '../models/msg/account.dart';
 import '../models/msg/session.dart';
 import '../utils/wbi_sign.dart';
@@ -149,7 +149,7 @@ class MsgHttp {
         'msg[msg_status]': 0,
         'msg[content]': jsonEncode(content),
         'msg[timestamp]': DateTime.now().millisecondsSinceEpoch ~/ 1000,
-        'msg[new_face_version]': 0,
+        'msg[new_face_version]': 1,
         'msg[dev_id]': getDevId(),
         'from_firework': 0,
         'build': 0,
@@ -157,9 +157,6 @@ class MsgHttp {
         'csrf_token': csrf,
         'csrf': csrf,
       },
-      options: Options(
-        contentType: Headers.formUrlEncodedContentType,
-      ),
     );
     if (res.data['code'] == 0) {
       return {
@@ -287,4 +284,69 @@ class MsgHttp {
       return {'status': false, 'date': [], 'msg': res.data['message']};
     }
   }
+
+  static Future messageSystem() async {
+    var res = await Request().get(Api.messageSystemAPi, data: {
+      'csrf': await Request.getCsrf(),
+      'page_size': 20,
+      'build': 0,
+      'mobi_app': 'web',
+    });
+    if (res.data['code'] == 0) {
+      try {
+        return {
+          'status': true,
+          'data': res.data['data']['system_notify_list']
+              .map<MessageSystemModel>((e) => MessageSystemModel.fromJson(e))
+              .toList(),
+        };
+      } catch (err) {
+        return {'status': false, 'date': [], 'msg': err.toString()};
+      }
+    } else {
+      return {'status': false, 'date': [], 'msg': res.data['message']};
+    }
+  }
+
+  // 系统消息标记已读
+  static Future systemMarkRead(int cursor) async {
+    String csrf = await Request.getCsrf();
+    var res = await Request().get(Api.systemMarkRead, data: {
+      'csrf': csrf,
+      'cursor': cursor,
+    });
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+      };
+    } else {
+      return {
+        'status': false,
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  static Future messageSystemAccount() async {
+    var res = await Request().get(Api.userMessageSystemAPi, data: {
+      'csrf': await Request.getCsrf(),
+      'page_size': 20,
+      'build': 0,
+      'mobi_app': 'web',
+    });
+    if (res.data['code'] == 0) {
+      try {
+        return {
+          'status': true,
+          'data': res.data['data']['system_notify_list']
+              .map<MessageSystemModel>((e) => MessageSystemModel.fromJson(e))
+              .toList(),
+        };
+      } catch (err) {
+        return {'status': false, 'date': [], 'msg': err.toString()};
+      }
+    } else {
+      return {'status': false, 'date': [], 'msg': res.data['message']};
+    }
+  }
 }
diff --git a/lib/http/read.dart b/lib/http/read.dart
new file mode 100644
index 00000000..68e72e59
--- /dev/null
+++ b/lib/http/read.dart
@@ -0,0 +1,116 @@
+import 'dart:convert';
+import 'package:html/parser.dart';
+import 'package:pilipala/models/read/opus.dart';
+import 'package:pilipala/models/read/read.dart';
+import 'package:pilipala/utils/wbi_sign.dart';
+import 'index.dart';
+
+class ReadHttp {
+  static List<String> extractScriptContents(String htmlContent) {
+    RegExp scriptRegExp = RegExp(r'<script>([\s\S]*?)<\/script>');
+    Iterable<Match> matches = scriptRegExp.allMatches(htmlContent);
+    List<String> scriptContents = [];
+    for (Match match in matches) {
+      String scriptContent = match.group(1)!;
+      scriptContents.add(scriptContent);
+    }
+    return scriptContents;
+  }
+
+  // 解析专栏 opus格式
+  static Future parseArticleOpus({required String id}) async {
+    var res = await Request().get('https://www.bilibili.com/opus/$id', extra: {
+      'ua': 'pc',
+    });
+    String? headContent = parse(res.data).head?.outerHtml;
+    var document = parse(headContent);
+    var linkTags = document.getElementsByTagName('link');
+    bool isCv = false;
+    String cvId = '';
+    for (var linkTag in linkTags) {
+      var attributes = linkTag.attributes;
+      if (attributes.containsKey('rel') &&
+          attributes['rel'] == 'canonical' &&
+          attributes.containsKey('data-vue-meta') &&
+          attributes['data-vue-meta'] == 'true') {
+        final String cvHref = linkTag.attributes['href']!;
+        RegExp regex = RegExp(r'cv(\d+)');
+        RegExpMatch? match = regex.firstMatch(cvHref);
+        if (match != null) {
+          cvId = match.group(1)!;
+        } else {
+          print('No match found.');
+        }
+        isCv = true;
+        break;
+      }
+    }
+    String scriptContent =
+        extractScriptContents(parse(res.data).body!.outerHtml)[0];
+    int startIndex = scriptContent.indexOf('{');
+    int endIndex = scriptContent.lastIndexOf('};');
+    String jsonContent = scriptContent.substring(startIndex, endIndex + 1);
+    // 解析JSON字符串为Map
+    Map<String, dynamic> jsonData = json.decode(jsonContent);
+    return {
+      'status': true,
+      'data': OpusDataModel.fromJson(jsonData),
+      'isCv': isCv,
+      'cvId': cvId,
+    };
+  }
+
+  // 解析专栏 cv格式
+  static Future parseArticleCv({required String id}) async {
+    var res = await Request().get(
+      'https://www.bilibili.com/read/cv$id',
+      extra: {'ua': 'pc'},
+    );
+    String scriptContent =
+        extractScriptContents(parse(res.data).body!.outerHtml)[0];
+    int startIndex = scriptContent.indexOf('{');
+    int endIndex = scriptContent.lastIndexOf('};');
+    String jsonContent = scriptContent.substring(startIndex, endIndex + 1);
+    // 解析JSON字符串为Map
+    Map<String, dynamic> jsonData = json.decode(jsonContent);
+    return {
+      'status': true,
+      'data': ReadDataModel.fromJson(jsonData),
+    };
+  }
+
+  //
+  static Future getViewInfo({required String id}) async {
+    Map params = await WbiSign().makSign({
+      'id': id,
+      'mobi_app': 'pc',
+      'from': 'web',
+      'gaia_source': 'main_web',
+      'web_location': 333.976,
+    });
+    var res = await Request().get(
+      Api.getViewInfo,
+      data: {
+        'id': id,
+        'mobi_app': 'pc',
+        'from': 'web',
+        'gaia_source': 'main_web',
+        'web_location': 333.976,
+        'w_rid': params['w_rid'],
+        'wts': params['wts'],
+      },
+    );
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': res.data['data'],
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+}
diff --git a/lib/http/reply.dart b/lib/http/reply.dart
index 880f9072..c07d9e81 100644
--- a/lib/http/reply.dart
+++ b/lib/http/reply.dart
@@ -78,7 +78,7 @@ class ReplyHttp {
   }) async {
     var res = await Request().post(
       Api.likeReply,
-      queryParameters: {
+      data: {
         'type': type,
         'oid': oid,
         'rpid': rpid,
@@ -115,4 +115,25 @@ class ReplyHttp {
       };
     }
   }
+
+  static Future replyDel({
+    required int type, //replyType
+    required int oid,
+    required int rpid,
+  }) async {
+    var res = await Request().post(
+      Api.replyDel,
+      queryParameters: {
+        'type': type, //type.index
+        'oid': oid,
+        'rpid': rpid,
+        'csrf': await Request.getCsrf(),
+      },
+    );
+    if (res.data['code'] == 0) {
+      return {'status': true, 'msg': '删除成功'};
+    } else {
+      return {'status': false, 'msg': res.data['message']};
+    }
+  }
 }
diff --git a/lib/http/search.dart b/lib/http/search.dart
index 075defc7..00e51497 100644
--- a/lib/http/search.dart
+++ b/lib/http/search.dart
@@ -88,7 +88,11 @@ class SearchHttp {
       if (tids != null && tids != -1) 'tids': tids,
     };
     var res = await Request().get(Api.searchByType, data: reqData);
-    if (res.data['code'] == 0 && res.data['data']['numPages'] > 0) {
+    if (res.data['code'] == 0) {
+      if (res.data['data']['numPages'] == 0) {
+        // 我想返回数据，使得可以通过data.list 取值，结果为[]
+        return {'status': true, 'data': Data()};
+      }
       Object data;
       try {
         switch (searchType) {
@@ -125,9 +129,7 @@ class SearchHttp {
       return {
         'status': false,
         'data': [],
-        'msg': res.data['data'] != null && res.data['data']['numPages'] == 0
-            ? '没有相关数据'
-            : res.data['message'],
+        'msg': res.data['message'],
       };
     }
   }
@@ -141,7 +143,11 @@ class SearchHttp {
     }
     final dynamic res =
         await Request().get(Api.ab2c, data: <String, dynamic>{...data});
-    return res.data['data'].first['cid'];
+    if (res.data['code'] == 0) {
+      return res.data['data'].first['cid'];
+    } else {
+      return -1;
+    }
   }
 
   static Future<Map<String, dynamic>> bangumiInfo(
@@ -206,3 +212,9 @@ class SearchHttp {
     }
   }
 }
+
+class Data {
+  List<dynamic> list;
+
+  Data({this.list = const []});
+}
diff --git a/lib/http/user.dart b/lib/http/user.dart
index 972acfdd..26b79523 100644
--- a/lib/http/user.dart
+++ b/lib/http/user.dart
@@ -1,4 +1,9 @@
+import 'dart:convert';
+import 'dart:developer';
+
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:html/parser.dart';
+import 'package:pilipala/models/video/later.dart';
 import '../common/constants.dart';
 import '../models/model_hot_video_item.dart';
 import '../models/user/fav_detail.dart';
@@ -57,6 +62,8 @@ class UserHttp {
       if (res.data['data'] != null) {
         data = FavFolderData.fromJson(res.data['data']);
         return {'status': true, 'data': data};
+      } else {
+        return {'status': false, 'msg': '收藏夹为空'};
       }
     } else {
       return {
@@ -146,7 +153,7 @@ class UserHttp {
     // 暂停switchStatus传true 否则false
     var res = await Request().post(
       Api.pauseHistory,
-      queryParameters: {
+      data: {
         'switch': switchStatus,
         'jsonp': 'jsonp',
         'csrf': await Request.getCsrf(),
@@ -165,7 +172,7 @@ class UserHttp {
   static Future clearHistory() async {
     var res = await Request().post(
       Api.clearHistory,
-      queryParameters: {
+      data: {
         'jsonp': 'jsonp',
         'csrf': await Request.getCsrf(),
       },
@@ -183,7 +190,7 @@ class UserHttp {
     }
     var res = await Request().post(
       Api.toViewLater,
-      queryParameters: data,
+      data: data,
     );
     if (res.data['code'] == 0) {
       return {'status': true, 'msg': 'yeah！稍后再看'};
@@ -202,7 +209,7 @@ class UserHttp {
     params[aid != null ? 'aid' : 'viewed'] = aid ?? true;
     var res = await Request().post(
       Api.toViewDel,
-      queryParameters: params,
+      data: params,
     );
     if (res.data['code'] == 0) {
       return {'status': true, 'msg': 'yeah！成功移除'};
@@ -234,7 +241,7 @@ class UserHttp {
   static Future toViewClear() async {
     var res = await Request().post(
       Api.toViewClear,
-      queryParameters: {
+      data: {
         'jsonp': 'jsonp',
         'csrf': await Request.getCsrf(),
       },
@@ -250,7 +257,7 @@ class UserHttp {
   static Future delHistory(kid) async {
     var res = await Request().post(
       Api.delHistory,
-      queryParameters: {
+      data: {
         'kid': kid,
         'jsonp': 'jsonp',
         'csrf': await Request.getCsrf(),
@@ -399,7 +406,7 @@ class UserHttp {
   static Future cancelSub({required int seasonId}) async {
     var res = await Request().post(
       Api.cancelSub,
-      queryParameters: {
+      data: {
         'platform': 'web',
         'season_id': seasonId,
         'csrf': await Request.getCsrf(),
@@ -416,7 +423,7 @@ class UserHttp {
   static Future delFavFolder({required int mediaIds}) async {
     var res = await Request().post(
       Api.delFavFolder,
-      queryParameters: {
+      data: {
         'media_ids': mediaIds,
         'platform': 'web',
         'csrf': await Request.getCsrf(),
@@ -428,4 +435,106 @@ class UserHttp {
       return {'status': false, 'msg': res.data['message']};
     }
   }
+
+  // 稍后再看播放全部
+  // static Future toViewPlayAll({required int oid, required String bvid}) async {
+  //   var res = await Request().get(
+  //     Api.watchLaterHtml,
+  //     data: {
+  //       'oid': oid,
+  //       'bvid': bvid,
+  //     },
+  //   );
+  //   String scriptContent =
+  //       extractScriptContents(parse(res.data).body!.outerHtml)[0];
+  //   int startIndex = scriptContent.indexOf('{');
+  //   int endIndex = scriptContent.lastIndexOf('};');
+  //   String jsonContent = scriptContent.substring(startIndex, endIndex + 1);
+  //   // 解析JSON字符串为Map
+  //   Map<String, dynamic> jsonData = json.decode(jsonContent);
+  //   // 输出解析后的数据
+  //   return {
+  //     'status': true,
+  //     'data': jsonData['resourceList']
+  //         .map((e) => MediaVideoItemModel.fromJson(e))
+  //         .toList()
+  //   };
+  // }
+
+  static List<String> extractScriptContents(String htmlContent) {
+    RegExp scriptRegExp = RegExp(r'<script>([\s\S]*?)<\/script>');
+    Iterable<Match> matches = scriptRegExp.allMatches(htmlContent);
+    List<String> scriptContents = [];
+    for (Match match in matches) {
+      String scriptContent = match.group(1)!;
+      scriptContents.add(scriptContent);
+    }
+    return scriptContents;
+  }
+
+  // 稍后再看列表
+  static Future getMediaList({
+    required int type,
+    required int bizId,
+    required int ps,
+    int? oid,
+  }) async {
+    var res = await Request().get(
+      Api.mediaList,
+      data: {
+        'mobi_app': 'web',
+        'type': type,
+        'biz_id': bizId,
+        'oid': oid ?? '',
+        'otype': 2,
+        'ps': ps,
+        'direction': false,
+        'desc': true,
+        'sort_field': 1,
+        'tid': 0,
+        'with_current': false,
+      },
+    );
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': res.data['data']['media_list'] != null
+            ? res.data['data']['media_list']
+                .map<MediaVideoItemModel>(
+                    (e) => MediaVideoItemModel.fromJson(e))
+                .toList()
+            : []
+      };
+    } else {
+      return {'status': false, 'msg': res.data['message']};
+    }
+  }
+
+  // 解析收藏夹视频
+  static Future parseFavVideo({
+    required int mediaId,
+    required int oid,
+    required String bvid,
+  }) async {
+    var res = await Request().get(
+      'https://www.bilibili.com/list/ml$mediaId',
+      data: {
+        'oid': mediaId,
+        'bvid': bvid,
+      },
+    );
+    String scriptContent =
+        extractScriptContents(parse(res.data).body!.outerHtml)[0];
+    int startIndex = scriptContent.indexOf('{');
+    int endIndex = scriptContent.lastIndexOf('};');
+    String jsonContent = scriptContent.substring(startIndex, endIndex + 1);
+    // 解析JSON字符串为Map
+    Map<String, dynamic> jsonData = json.decode(jsonContent);
+    return {
+      'status': true,
+      'data': jsonData['resourceList']
+          .map<MediaVideoItemModel>((e) => MediaVideoItemModel.fromJson(e))
+          .toList()
+    };
+  }
 }
diff --git a/lib/http/video.dart b/lib/http/video.dart
index 7c1d9ba6..406e59f6 100644
--- a/lib/http/video.dart
+++ b/lib/http/video.dart
@@ -70,47 +70,43 @@ class VideoHttp {
   // 添加额外的loginState变量模拟未登录状态
   static Future rcmdVideoListApp(
       {bool loginStatus = true, required int freshIdx}) async {
-    try {
-      var res = await Request().get(
-        Api.recommendListApp,
-        data: {
-          'idx': freshIdx,
-          'flush': '5',
-          'column': '4',
-          'device': 'pad',
-          'device_type': 0,
-          'device_name': 'vivo',
-          'pull': freshIdx == 0 ? 'true' : 'false',
-          'appkey': Constants.appKey,
-          'access_key': loginStatus
-              ? (localCache.get(LocalCacheKey.accessKey,
-                      defaultValue: {})['value'] ??
-                  '')
-              : ''
-        },
-      );
-      if (res.data['code'] == 0) {
-        List<RecVideoItemAppModel> list = [];
-        List<int> blackMidsList =
-            setting.get(SettingBoxKey.blackMidsList, defaultValue: [-1]);
-        for (var i in res.data['data']['items']) {
-          // 屏蔽推广和拉黑用户
-          if (i['card_goto'] != 'ad_av' &&
-              (!enableRcmdDynamic ? i['card_goto'] != 'picture' : true) &&
-              (i['args'] != null &&
-                  !blackMidsList.contains(i['args']['up_mid']))) {
-            RecVideoItemAppModel videoItem = RecVideoItemAppModel.fromJson(i);
-            if (!RecommendFilter.filter(videoItem)) {
-              list.add(videoItem);
-            }
+    var res = await Request().get(
+      Api.recommendListApp,
+      data: {
+        'idx': freshIdx,
+        'flush': '5',
+        'column': '4',
+        'device': 'pad',
+        'device_type': 0,
+        'device_name': 'vivo',
+        'pull': freshIdx == 0 ? 'true' : 'false',
+        'appkey': Constants.appKey,
+        'access_key': loginStatus
+            ? (localCache
+                    .get(LocalCacheKey.accessKey, defaultValue: {})['value'] ??
+                '')
+            : ''
+      },
+    );
+    if (res.data['code'] == 0) {
+      List<RecVideoItemAppModel> list = [];
+      List<int> blackMidsList =
+          setting.get(SettingBoxKey.blackMidsList, defaultValue: [-1]);
+      for (var i in res.data['data']['items']) {
+        // 屏蔽推广和拉黑用户
+        if (i['card_goto'] != 'ad_av' &&
+            (!enableRcmdDynamic ? i['card_goto'] != 'picture' : true) &&
+            (i['args'] != null &&
+                !blackMidsList.contains(i['args']['up_mid']))) {
+          RecVideoItemAppModel videoItem = RecVideoItemAppModel.fromJson(i);
+          if (!RecommendFilter.filter(videoItem)) {
+            list.add(videoItem);
           }
         }
-        return {'status': true, 'data': list};
-      } else {
-        return {'status': false, 'data': [], 'msg': res.data['message']};
       }
-    } catch (err) {
-      return {'status': false, 'data': [], 'msg': err.toString()};
+      return {'status': true, 'data': list};
+    } else {
+      return {'status': false, 'data': [], 'msg': res.data['message']};
     }
   }
 
@@ -247,7 +243,7 @@ class VideoHttp {
   static Future coinVideo({required String bvid, required int multiply}) async {
     var res = await Request().post(
       Api.coinVideo,
-      queryParameters: {
+      data: {
         'bvid': bvid,
         'multiply': multiply,
         'select_like': 0,
@@ -275,7 +271,7 @@ class VideoHttp {
   static Future oneThree({required String bvid}) async {
     var res = await Request().post(
       Api.oneThree,
-      queryParameters: {
+      data: {
         'bvid': bvid,
         'csrf': await Request.getCsrf(),
       },
@@ -291,7 +287,7 @@ class VideoHttp {
   static Future likeVideo({required String bvid, required bool type}) async {
     var res = await Request().post(
       Api.likeVideo,
-      queryParameters: {
+      data: {
         'bvid': bvid,
         'like': type ? 1 : 2,
         'csrf': await Request.getCsrf(),
@@ -307,13 +303,16 @@ class VideoHttp {
   // （取消）收藏
   static Future favVideo(
       {required int aid, String? addIds, String? delIds}) async {
-    var res = await Request().post(Api.favVideo, queryParameters: {
-      'rid': aid,
-      'type': 2,
-      'add_media_ids': addIds ?? '',
-      'del_media_ids': delIds ?? '',
-      'csrf': await Request.getCsrf(),
-    });
+    var res = await Request().post(
+      Api.favVideo,
+      data: {
+        'rid': aid,
+        'type': 2,
+        'add_media_ids': addIds ?? '',
+        'del_media_ids': delIds ?? '',
+        'csrf': await Request.getCsrf(),
+      },
+    );
     if (res.data['code'] == 0) {
       return {'status': true, 'data': res.data['data']};
     } else {
@@ -351,14 +350,17 @@ class VideoHttp {
     if (message == '') {
       return {'status': false, 'data': [], 'msg': '请输入评论内容'};
     }
-    var res = await Request().post(Api.replyAdd, queryParameters: {
-      'type': type.index,
-      'oid': oid,
-      'root': root == null || root == 0 ? '' : root,
-      'parent': parent == null || parent == 0 ? '' : parent,
-      'message': message,
-      'csrf': await Request.getCsrf(),
-    });
+    var res = await Request().post(
+      Api.replyAdd,
+      data: {
+        'type': type.index,
+        'oid': oid,
+        'root': root == null || root == 0 ? '' : root,
+        'parent': parent == null || parent == 0 ? '' : parent,
+        'message': message,
+        'csrf': await Request.getCsrf(),
+      },
+    );
     log(res.toString());
     if (res.data['code'] == 0) {
       return {'status': true, 'data': res.data['data']};
@@ -380,12 +382,15 @@ class VideoHttp {
   // 操作用户关系
   static Future relationMod(
       {required int mid, required int act, required int reSrc}) async {
-    var res = await Request().post(Api.relationMod, queryParameters: {
-      'fid': mid,
-      'act': act,
-      're_src': reSrc,
-      'csrf': await Request.getCsrf(),
-    });
+    var res = await Request().post(
+      Api.relationMod,
+      data: {
+        'fid': mid,
+        'act': act,
+        're_src': reSrc,
+        'csrf': await Request.getCsrf(),
+      },
+    );
     if (res.data['code'] == 0) {
       if (act == 5) {
         List<int> blackMidsList =
@@ -401,27 +406,33 @@ class VideoHttp {
 
   // 视频播放进度
   static Future heartBeat({bvid, cid, progress, realtime}) async {
-    await Request().post(Api.heartBeat, queryParameters: {
-      // 'aid': aid,
-      'bvid': bvid,
-      'cid': cid,
-      // 'epid': '',
-      // 'sid': '',
-      // 'mid': '',
-      'played_time': progress,
-      // 'realtime': realtime,
-      // 'type': '',
-      // 'sub_type': '',
-      'csrf': await Request.getCsrf(),
-    });
+    await Request().post(
+      Api.heartBeat,
+      data: {
+        // 'aid': aid,
+        'bvid': bvid,
+        'cid': cid,
+        // 'epid': '',
+        // 'sid': '',
+        // 'mid': '',
+        'played_time': progress,
+        // 'realtime': realtime,
+        // 'type': '',
+        // 'sub_type': '',
+        'csrf': await Request.getCsrf(),
+      },
+    );
   }
 
   // 添加追番
   static Future bangumiAdd({int? seasonId}) async {
-    var res = await Request().post(Api.bangumiAdd, queryParameters: {
-      'season_id': seasonId,
-      'csrf': await Request.getCsrf(),
-    });
+    var res = await Request().post(
+      Api.bangumiAdd,
+      data: {
+        'season_id': seasonId,
+        'csrf': await Request.getCsrf(),
+      },
+    );
     if (res.data['code'] == 0) {
       return {'status': true, 'msg': res.data['result']['toast']};
     } else {
@@ -431,10 +442,13 @@ class VideoHttp {
 
   // 取消追番
   static Future bangumiDel({int? seasonId}) async {
-    var res = await Request().post(Api.bangumiDel, queryParameters: {
-      'season_id': seasonId,
-      'csrf': await Request.getCsrf(),
-    });
+    var res = await Request().post(
+      Api.bangumiDel,
+      data: {
+        'season_id': seasonId,
+        'csrf': await Request.getCsrf(),
+      },
+    );
     if (res.data['code'] == 0) {
       return {'status': true, 'msg': res.data['result']['toast']};
     } else {
@@ -492,7 +506,7 @@ class VideoHttp {
         return {'status': false, 'data': [], 'msg': res.data['msg']};
       }
     } catch (err) {
-      print(err);
+      return {'status': false, 'data': [], 'msg': res.data['msg']};
     }
   }
 
@@ -522,7 +536,8 @@ class VideoHttp {
   // 获取字幕内容
   static Future<Map<String, dynamic>> getSubtitleContent(url) async {
     var res = await Request().get('https:$url');
-    final String content = SubTitleUtils.convertToWebVTT(res.data['body']);
+    final String content =
+        await SubTitleUtils.convertToWebVTT(res.data['body']);
     final List body = res.data['body'];
     return {'content': content, 'body': body};
   }
diff --git a/lib/main.dart b/lib/main.dart
index 05c0476c..3ac97b25 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -20,7 +20,7 @@ import 'package:pilipala/pages/main/view.dart';
 import 'package:pilipala/services/service_locator.dart';
 import 'package:pilipala/utils/app_scheme.dart';
 import 'package:pilipala/utils/data.dart';
-import 'package:pilipala/utils/global_data.dart';
+import 'package:pilipala/utils/global_data_cache.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:media_kit/media_kit.dart';
 import 'package:pilipala/utils/recommend_filter.dart';
@@ -33,7 +33,6 @@ void main() async {
   await SystemChrome.setPreferredOrientations(
       [DeviceOrientation.portraitUp, DeviceOrientation.portraitDown]);
   await GStrorage.init();
-  await setupServiceLocator();
   clearLogs();
   Request();
   await Request.setCookie();
@@ -61,10 +60,12 @@ void main() async {
       systemNavigationBarColor: Colors.transparent,
       systemNavigationBarDividerColor: Colors.transparent,
       statusBarColor: Colors.transparent,
+      systemNavigationBarContrastEnforced: false,
     ));
   }
 
   PiliSchame.init();
+  await GlobalDataCache().initialize();
 }
 
 class MyApp extends StatelessWidget {
@@ -266,10 +267,10 @@ class BuildMainApp extends StatelessWidget {
         VideoDetailPage.routeObserver,
         SearchPage.routeObserver,
       ],
-      onInit: () {
+      onReady: () async {
         RecommendFilter();
         Data.init();
-        GlobalData();
+        setupServiceLocator();
       },
     );
   }
diff --git a/lib/models/common/gesture_mode.dart b/lib/models/common/gesture_mode.dart
index 1149ae12..bf51fd96 100644
--- a/lib/models/common/gesture_mode.dart
+++ b/lib/models/common/gesture_mode.dart
@@ -4,9 +4,12 @@ enum FullScreenGestureMode {
 
   /// 从下滑到上
   fromBottomtoTop,
+
+  /// 关闭手势
+  none,
 }
 
 extension FullScreenGestureModeExtension on FullScreenGestureMode {
-  String get values => ['fromToptoBottom', 'fromBottomtoTop'][index];
-  String get labels => ['从上往下滑进入全屏', '从下往上滑进入全屏'][index];
+  String get values => ['fromToptoBottom', 'fromBottomtoTop', 'none'][index];
+  String get labels => ['从上往下滑进入全屏', '从下往上滑进入全屏', '关闭手势'][index];
 }
diff --git a/lib/models/common/search_type.dart b/lib/models/common/search_type.dart
index d7d13aec..843e7954 100644
--- a/lib/models/common/search_type.dart
+++ b/lib/models/common/search_type.dart
@@ -28,7 +28,7 @@ extension SearchTypeExtension on SearchType {
   String get label => ['视频', '番剧', '直播间', '用户', '专栏'][index];
 }
 
-// 搜索类型为视频、专栏及相簿时
+// 搜索类型为视频时
 enum ArchiveFilterType {
   totalrank,
   click,
@@ -44,3 +44,21 @@ extension ArchiveFilterTypeExtension on ArchiveFilterType {
   String get description =>
       ['默认排序', '播放多', '新发布', '弹幕多', '收藏多', '评论多', '最多喜欢'][index];
 }
+
+// 搜索类型为专栏时
+enum ArticleFilterType {
+  // 综合排序
+  totalrank,
+  // 最新发布
+  pubdate,
+  // 最多点击
+  click,
+  // 最多喜欢
+  attention,
+  // 最多评论
+  scores,
+}
+
+extension ArticleFilterTypeExtension on ArticleFilterType {
+  String get description => ['综合排序', '最新发布', '最多点击', '最多喜欢', '最多评论'][index];
+}
diff --git a/lib/models/common/subtitle_type.dart b/lib/models/common/subtitle_type.dart
deleted file mode 100644
index 54b52e8e..00000000
--- a/lib/models/common/subtitle_type.dart
+++ /dev/null
@@ -1,63 +0,0 @@
-enum SubtitleType {
-  // 中文（中国）
-  zhCN,
-  // 中文（自动翻译）
-  aizh,
-  // 英语（自动生成）
-  aien,
-  // 中文（简体）
-  zhHans,
-  // 英文（美国）
-  enUS,
-}
-
-extension SubtitleTypeExtension on SubtitleType {
-  String get description {
-    switch (this) {
-      case SubtitleType.zhCN:
-        return '中文（中国）';
-      case SubtitleType.aizh:
-        return '中文（自动翻译）';
-      case SubtitleType.aien:
-        return '英语（自动生成）';
-      case SubtitleType.zhHans:
-        return '中文（简体）';
-      case SubtitleType.enUS:
-        return '英文（美国）';
-    }
-  }
-}
-
-extension SubtitleIdExtension on SubtitleType {
-  String get id {
-    switch (this) {
-      case SubtitleType.zhCN:
-        return 'zh-CN';
-      case SubtitleType.aizh:
-        return 'ai-zh';
-      case SubtitleType.aien:
-        return 'ai-en';
-      case SubtitleType.zhHans:
-        return 'zh-Hans';
-      case SubtitleType.enUS:
-        return 'en-US';
-    }
-  }
-}
-
-extension SubtitleCodeExtension on SubtitleType {
-  int get code {
-    switch (this) {
-      case SubtitleType.zhCN:
-        return 1;
-      case SubtitleType.aizh:
-        return 2;
-      case SubtitleType.aien:
-        return 3;
-      case SubtitleType.zhHans:
-        return 4;
-      case SubtitleType.enUS:
-        return 5;
-    }
-  }
-}
diff --git a/lib/models/home/rcmd/result.dart b/lib/models/home/rcmd/result.dart
index 0098fe95..88657b33 100644
--- a/lib/models/home/rcmd/result.dart
+++ b/lib/models/home/rcmd/result.dart
@@ -34,7 +34,7 @@ class RecVideoItemAppModel {
   String? title;
   int? isFollowed;
   RcmdOwner? owner;
-  RcmdReason? rcmdReason;
+  String? rcmdReason;
   String? goto;
   int? param;
   String? uri;
@@ -62,25 +62,19 @@ class RecVideoItemAppModel {
     duration =
         json['player_args'] != null ? json['player_args']['duration'] : -1;
     //duration = json['cover_right_text'];
-    title = json['title'];
+    title = json['title'] ?? '获取标题失败';
     owner = RcmdOwner.fromJson(json);
-    rcmdReason = json['rcmd_reason_style'] != null
-        ? RcmdReason.fromJson(json['rcmd_reason_style'])
-        : null;
+    rcmdReason = json['bottom_rcmd_reason'] ?? json['top_rcmd_reason'];
     // 由于app端api并不会直接返回与owner的关注状态
     // 所以借用推荐原因是否为“已关注”、“新关注”等判别关注状态，从而与web端接口等效
     RegExp regex = RegExp(r'已关注|新关注');
-    isFollowed = rcmdReason != null &&
-            rcmdReason!.content != null &&
-            regex.hasMatch(rcmdReason!.content!)
-        ? 1
-        : 0;
+    isFollowed = regex.hasMatch(rcmdReason ?? '') ? 1 : 0;
     // 如果是，就无需再显示推荐原因，交由view统一处理即可
     if (isFollowed == 1) {
       rcmdReason = null;
     }
     goto = json['goto'];
-    param = int.parse(json['param']);
+    param = int.parse(json['param'] ?? '-1');
     uri = json['uri'];
     talkBack = json['talk_back'];
 
diff --git a/lib/models/live/follow.dart b/lib/models/live/follow.dart
new file mode 100644
index 00000000..4a941b8b
--- /dev/null
+++ b/lib/models/live/follow.dart
@@ -0,0 +1,126 @@
+class LiveFollowingModel {
+  int? count;
+  List<LiveFollowingItemModel>? list;
+  int? liveCount;
+  int? neverLivedCount;
+  List? neverLivedFaces;
+  int? pageSize;
+  String? title;
+  int? totalPage;
+
+  LiveFollowingModel({
+    this.count,
+    this.list,
+    this.liveCount,
+    this.neverLivedCount,
+    this.neverLivedFaces,
+    this.pageSize,
+    this.title,
+    this.totalPage,
+  });
+
+  LiveFollowingModel.fromJson(Map<String, dynamic> json) {
+    count = json['count'];
+    if (json['list'] != null) {
+      list = <LiveFollowingItemModel>[];
+      json['list'].forEach((v) {
+        list!.add(LiveFollowingItemModel.fromJson(v));
+      });
+    }
+    liveCount = json['live_count'];
+    neverLivedCount = json['never_lived_count'];
+    if (json['never_lived_faces'] != null) {
+      neverLivedFaces = <dynamic>[];
+      json['never_lived_faces'].forEach((v) {
+        neverLivedFaces!.add(v);
+      });
+    }
+    pageSize = json['pageSize'];
+    title = json['title'];
+    totalPage = json['totalPage'];
+  }
+}
+
+class LiveFollowingItemModel {
+  int? roomId;
+  int? uid;
+  String? uname;
+  String? title;
+  String? face;
+  int? liveStatus;
+  int? recordNum;
+  String? recentRecordId;
+  int? isAttention;
+  int? clipNum;
+  int? fansNum;
+  String? areaName;
+  String? areaValue;
+  String? tags;
+  String? recentRecordIdV2;
+  int? recordNumV2;
+  int? recordLiveTime;
+  String? areaNameV2;
+  String? roomNews;
+  String? watchIcon;
+  String? textSmall;
+  String? roomCover;
+  String? pic;
+  int? parentAreaId;
+  int? areaId;
+
+  LiveFollowingItemModel({
+    this.roomId,
+    this.uid,
+    this.uname,
+    this.title,
+    this.face,
+    this.liveStatus,
+    this.recordNum,
+    this.recentRecordId,
+    this.isAttention,
+    this.clipNum,
+    this.fansNum,
+    this.areaName,
+    this.areaValue,
+    this.tags,
+    this.recentRecordIdV2,
+    this.recordNumV2,
+    this.recordLiveTime,
+    this.areaNameV2,
+    this.roomNews,
+    this.watchIcon,
+    this.textSmall,
+    this.roomCover,
+    this.pic,
+    this.parentAreaId,
+    this.areaId,
+  });
+
+  LiveFollowingItemModel.fromJson(Map<String, dynamic> json) {
+    roomId = json['roomid'];
+    uid = json['uid'];
+    uname = json['uname'];
+    title = json['title'];
+    face = json['face'];
+    liveStatus = json['live_status'];
+    recordNum = json['record_num'];
+    recentRecordId = json['recent_record_id'];
+    isAttention = json['is_attention'];
+    clipNum = json['clipnum'];
+    fansNum = json['fans_num'];
+    areaName = json['area_name'];
+    areaValue = json['area_value'];
+    tags = json['tags'];
+    recentRecordIdV2 = json['recent_record_id_v2'];
+    recordNumV2 = json['record_num_v2'];
+    recordLiveTime = json['record_live_time'];
+    areaNameV2 = json['area_name_v2'];
+    roomNews = json['room_news'];
+    watchIcon = json['watch_icon'];
+    textSmall = json['text_small'];
+    roomCover = json['room_cover'];
+    pic = json['room_cover'];
+    parentAreaId = json['parent_area_id'];
+    areaId = json['area_id'];
+  }
+}
diff --git a/lib/models/live/message.dart b/lib/models/live/message.dart
new file mode 100644
index 00000000..cd0f4b75
--- /dev/null
+++ b/lib/models/live/message.dart
@@ -0,0 +1,101 @@
+class LiveMessageModel {
+  // 消息类型
+  final LiveMessageType type;
+
+  // 用户名
+  final String userName;
+
+  // 信息
+  final String? message;
+
+  // 数据
+  final dynamic data;
+
+  final String? face;
+  final int? uid;
+  final Map<String, dynamic>? emots;
+
+  // 颜色
+  final LiveMessageColor color;
+
+  LiveMessageModel({
+    required this.type,
+    required this.userName,
+    required this.message,
+    required this.color,
+    this.data,
+    this.face,
+    this.uid,
+    this.emots,
+  });
+}
+
+class LiveSuperChatMessage {
+  final String backgroundBottomColor;
+  final String backgroundColor;
+  final DateTime endTime;
+  final String face;
+  final String message;
+  final String price;
+  final DateTime startTime;
+  final String userName;
+
+  LiveSuperChatMessage({
+    required this.backgroundBottomColor,
+    required this.backgroundColor,
+    required this.endTime,
+    required this.face,
+    required this.message,
+    required this.price,
+    required this.startTime,
+    required this.userName,
+  });
+}
+
+enum LiveMessageType {
+  // 普通留言
+  chat,
+  // 醒目留言
+  superChat,
+  //
+  online,
+  // 加入
+  join,
+  // 关注
+  follow,
+}
+
+class LiveMessageColor {
+  final int r, g, b;
+  LiveMessageColor(this.r, this.g, this.b);
+  static LiveMessageColor get white => LiveMessageColor(255, 255, 255);
+  static LiveMessageColor numberToColor(int intColor) {
+    var obj = intColor.toRadixString(16);
+
+    LiveMessageColor color = LiveMessageColor.white;
+    if (obj.length == 4) {
+      obj = "00$obj";
+    }
+    if (obj.length == 6) {
+      var R = int.parse(obj.substring(0, 2), radix: 16);
+      var G = int.parse(obj.substring(2, 4), radix: 16);
+      var B = int.parse(obj.substring(4, 6), radix: 16);
+
+      color = LiveMessageColor(R, G, B);
+    }
+    if (obj.length == 8) {
+      var R = int.parse(obj.substring(2, 4), radix: 16);
+      var G = int.parse(obj.substring(4, 6), radix: 16);
+      var B = int.parse(obj.substring(6, 8), radix: 16);
+      //var A = int.parse(obj.substring(0, 2), radix: 16);
+      color = LiveMessageColor(R, G, B);
+    }
+
+    return color;
+  }
+
+  @override
+  String toString() {
+    return "#${r.toRadixString(16).padLeft(2, '0')}${g.toRadixString(16).padLeft(2, '0')}${b.toRadixString(16).padLeft(2, '0')}";
+  }
+}
diff --git a/lib/models/live/room_info.dart b/lib/models/live/room_info.dart
index 7209ba08..362ba983 100644
--- a/lib/models/live/room_info.dart
+++ b/lib/models/live/room_info.dart
@@ -1,11 +1,13 @@
 class RoomInfoModel {
   RoomInfoModel({
     this.roomId,
+    this.isPortrait,
     this.liveStatus,
     this.liveTime,
     this.playurlInfo,
   });
   int? roomId;
+  bool? isPortrait;
   int? liveStatus;
   int? liveTime;
   PlayurlInfo? playurlInfo;
@@ -13,6 +15,7 @@ class RoomInfoModel {
   RoomInfoModel.fromJson(Map<String, dynamic> json) {
     roomId = json['room_id'];
     liveStatus = json['live_status'];
+    isPortrait = json['is_portrait'];
     liveTime = json['live_time'];
     playurlInfo = PlayurlInfo.fromJson(json['playurl_info']);
   }
diff --git a/lib/models/member/article.dart b/lib/models/member/article.dart
new file mode 100644
index 00000000..8489385e
--- /dev/null
+++ b/lib/models/member/article.dart
@@ -0,0 +1,46 @@
+class MemberArticleDataModel {
+  MemberArticleDataModel({
+    this.hasMore,
+    this.items,
+    this.offset,
+    this.updateNum,
+  });
+
+  bool? hasMore;
+  List<MemberArticleItemModel>? items;
+  String? offset;
+  int? updateNum;
+
+  MemberArticleDataModel.fromJson(Map<String, dynamic> json) {
+    hasMore = json['has_more'];
+    items = json['items']
+        .map<MemberArticleItemModel>((e) => MemberArticleItemModel.fromJson(e))
+        .toList();
+    offset = json['offset'];
+    updateNum = json['update_num'];
+  }
+}
+
+class MemberArticleItemModel {
+  MemberArticleItemModel({
+    this.content,
+    this.cover,
+    this.jumpUrl,
+    this.opusId,
+    this.stat,
+  });
+
+  String? content;
+  Map? cover;
+  String? jumpUrl;
+  String? opusId;
+  Map? stat;
+
+  MemberArticleItemModel.fromJson(Map<String, dynamic> json) {
+    content = json['content'];
+    cover = json['cover'];
+    jumpUrl = json['jump_url'];
+    opusId = json['opus_id'];
+    stat = json['stat'];
+  }
+}
diff --git a/lib/models/member/like.dart b/lib/models/member/like.dart
new file mode 100644
index 00000000..df71e2ec
--- /dev/null
+++ b/lib/models/member/like.dart
@@ -0,0 +1,210 @@
+class MemberLikeDataModel {
+  MemberLikeDataModel({
+    this.aid,
+    this.videos,
+    this.tid,
+    this.tname,
+    this.pic,
+    this.title,
+    this.pubdate,
+    this.ctime,
+    this.desc,
+    this.state,
+    this.duration,
+    this.redirectUrl,
+    this.rights,
+    this.owner,
+    this.stat,
+    this.dimension,
+    this.cover43,
+    this.bvid,
+    this.interVideo,
+    this.resourceType,
+    this.subtitle,
+    this.enableVt,
+  });
+
+  final int? aid;
+  final int? videos;
+  final int? tid;
+  final String? tname;
+  final String? pic;
+  final String? title;
+  final int? pubdate;
+  final int? ctime;
+  final String? desc;
+  final int? state;
+  final int? duration;
+  final String? redirectUrl;
+  final Rights? rights;
+  final Owner? owner;
+  final Stat? stat;
+  final Dimension? dimension;
+  final String? cover43;
+  final String? bvid;
+  final bool? interVideo;
+  final String? resourceType;
+  final String? subtitle;
+  final int? enableVt;
+
+  factory MemberLikeDataModel.fromJson(Map<String, dynamic> json) =>
+      MemberLikeDataModel(
+        aid: json["aid"],
+        videos: json["videos"],
+        tid: json["tid"],
+        tname: json["tname"],
+        pic: json["pic"],
+        title: json["title"],
+        pubdate: json["pubdate"],
+        ctime: json["ctime"],
+        desc: json["desc"],
+        state: json["state"],
+        duration: json["duration"],
+        redirectUrl: json["redirect_url"],
+        rights: Rights.fromJson(json["rights"]),
+        owner: Owner.fromJson(json["owner"]),
+        stat: Stat.fromJson(json["stat"]),
+        dimension: Dimension.fromJson(json["dimension"]),
+        cover43: json["cover43"],
+        bvid: json["bvid"],
+        interVideo: json["inter_video"],
+        resourceType: json["resource_type"],
+        subtitle: json["subtitle"],
+        enableVt: json["enable_vt"],
+      );
+}
+
+class Dimension {
+  Dimension({
+    required this.width,
+    required this.height,
+    required this.rotate,
+  });
+
+  final int width;
+  final int height;
+  final int rotate;
+
+  factory Dimension.fromJson(Map<String, dynamic> json) => Dimension(
+        width: json["width"],
+        height: json["height"],
+        rotate: json["rotate"],
+      );
+}
+
+class Owner {
+  Owner({
+    required this.mid,
+    required this.name,
+    required this.face,
+  });
+
+  final int mid;
+  final String name;
+  final String face;
+
+  factory Owner.fromJson(Map<String, dynamic> json) => Owner(
+        mid: json["mid"],
+        name: json["name"],
+        face: json["face"],
+      );
+}
+
+class Rights {
+  Rights({
+    required this.bp,
+    required this.elec,
+    required this.download,
+    required this.movie,
+    required this.pay,
+    required this.hd5,
+    required this.noReprint,
+    required this.autoplay,
+    required this.ugcPay,
+    required this.isCooperation,
+    required this.ugcPayPreview,
+    required this.noBackground,
+    required this.arcPay,
+    required this.payFreeWatch,
+  });
+
+  final int bp;
+  final int elec;
+  final int download;
+  final int movie;
+  final int pay;
+  final int hd5;
+  final int noReprint;
+  final int autoplay;
+  final int ugcPay;
+  final int isCooperation;
+  final int ugcPayPreview;
+  final int noBackground;
+  final int arcPay;
+  final int payFreeWatch;
+
+  factory Rights.fromJson(Map<String, dynamic> json) => Rights(
+        bp: json["bp"],
+        elec: json["elec"],
+        download: json["download"],
+        movie: json["movie"],
+        pay: json["pay"],
+        hd5: json["hd5"],
+        noReprint: json["no_reprint"],
+        autoplay: json["autoplay"],
+        ugcPay: json["ugc_pay"],
+        isCooperation: json["is_cooperation"],
+        ugcPayPreview: json["ugc_pay_preview"],
+        noBackground: json["no_background"],
+        arcPay: json["arc_pay"],
+        payFreeWatch: json["pay_free_watch"],
+      );
+}
+
+class Stat {
+  Stat({
+    required this.aid,
+    required this.view,
+    required this.danmaku,
+    required this.reply,
+    required this.favorite,
+    required this.coin,
+    required this.share,
+    required this.nowRank,
+    required this.hisRank,
+    required this.like,
+    required this.dislike,
+    required this.vt,
+    required this.vv,
+  });
+
+  final int aid;
+  final int view;
+  final int danmaku;
+  final int reply;
+  final int favorite;
+  final int coin;
+  final int share;
+  final int nowRank;
+  final int hisRank;
+  final int like;
+  final int dislike;
+  final int vt;
+  final int vv;
+
+  factory Stat.fromJson(Map<String, dynamic> json) => Stat(
+        aid: json["aid"],
+        view: json["view"],
+        danmaku: json["danmaku"],
+        reply: json["reply"],
+        favorite: json["favorite"],
+        coin: json["coin"],
+        share: json["share"],
+        nowRank: json["now_rank"],
+        hisRank: json["his_rank"],
+        like: json["like"],
+        dislike: json["dislike"],
+        vt: json["vt"],
+        vv: json["vv"],
+      );
+}
diff --git a/lib/models/member/seasons.dart b/lib/models/member/seasons.dart
index 70230367..275466a6 100644
--- a/lib/models/member/seasons.dart
+++ b/lib/models/member/seasons.dart
@@ -2,18 +2,32 @@ class MemberSeasonsDataModel {
   MemberSeasonsDataModel({
     this.page,
     this.seasonsList,
+    this.seriesList,
   });
 
   Map? page;
   List<MemberSeasonsList>? seasonsList;
+  List<MemberArchiveItem>? seriesList;
 
   MemberSeasonsDataModel.fromJson(Map<String, dynamic> json) {
     page = json['page'];
-    seasonsList = json['seasons_list'] != null
+    var tempList1 = json['seasons_list'] != null
         ? json['seasons_list']
             .map<MemberSeasonsList>((e) => MemberSeasonsList.fromJson(e))
             .toList()
         : [];
+    var tempList2 = json['series_list'] != null
+        ? json['series_list']
+            .map<MemberSeasonsList>((e) => MemberSeasonsList.fromJson(e))
+            .toList()
+        : [];
+    seriesList = json['archives'] != null
+        ? json['archives']
+            .map<MemberArchiveItem>((e) => MemberArchiveItem.fromJson(e))
+            .toList()
+        : [];
+
+    seasonsList = [...tempList1, ...tempList2];
   }
 }
 
@@ -86,6 +100,8 @@ class MamberMeta {
     this.ptime,
     this.seasonId,
     this.total,
+    this.seriesId,
+    this.category,
   });
 
   String? cover;
@@ -95,6 +111,8 @@ class MamberMeta {
   int? ptime;
   int? seasonId;
   int? total;
+  int? seriesId;
+  int? category;
 
   MamberMeta.fromJson(Map<String, dynamic> json) {
     cover = json['cover'];
@@ -104,5 +122,7 @@ class MamberMeta {
     ptime = json['ptime'];
     seasonId = json['season_id'];
     total = json['total'];
+    seriesId = json['series_id'];
+    category = json['category'];
   }
 }
diff --git a/lib/models/model_owner.dart b/lib/models/model_owner.dart
index 70396cbb..6ef425eb 100644
--- a/lib/models/model_owner.dart
+++ b/lib/models/model_owner.dart
@@ -1,19 +1,12 @@
-import 'package:hive/hive.dart';
-
-part 'model_owner.g.dart';
-
-@HiveType(typeId: 3)
 class Owner {
   Owner({
     this.mid,
     this.name,
     this.face,
   });
-  @HiveField(0)
+
   int? mid;
-  @HiveField(1)
   String? name;
-  @HiveField(2)
   String? face;
 
   Owner.fromJson(Map<String, dynamic> json) {
diff --git a/lib/models/model_owner.g.dart b/lib/models/model_owner.g.dart
deleted file mode 100644
index de452713..00000000
--- a/lib/models/model_owner.g.dart
+++ /dev/null
@@ -1,47 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'model_owner.dart';
-
-// **************************************************************************
-// TypeAdapterGenerator
-// **************************************************************************
-
-class OwnerAdapter extends TypeAdapter<Owner> {
-  @override
-  final int typeId = 3;
-
-  @override
-  Owner read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return Owner(
-      mid: fields[0] as int?,
-      name: fields[1] as String?,
-      face: fields[2] as String?,
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, Owner obj) {
-    writer
-      ..writeByte(3)
-      ..writeByte(0)
-      ..write(obj.mid)
-      ..writeByte(1)
-      ..write(obj.name)
-      ..writeByte(2)
-      ..write(obj.face);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is OwnerAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}
diff --git a/lib/models/model_rec_video_item.dart b/lib/models/model_rec_video_item.dart
index 1503f192..b82510db 100644
--- a/lib/models/model_rec_video_item.dart
+++ b/lib/models/model_rec_video_item.dart
@@ -1,9 +1,5 @@
 import './model_owner.dart';
-import 'package:hive/hive.dart';
 
-part 'model_rec_video_item.g.dart';
-
-@HiveType(typeId: 0)
 class RecVideoItemModel {
   RecVideoItemModel({
     this.id,
@@ -21,32 +17,19 @@ class RecVideoItemModel {
     this.rcmdReason,
   });
 
-  @HiveField(0)
   int? id = -1;
-  @HiveField(1)
   String? bvid = '';
-  @HiveField(2)
   int? cid = -1;
-  @HiveField(3)
   String? goto = '';
-  @HiveField(4)
   String? uri = '';
-  @HiveField(5)
   String? pic = '';
-  @HiveField(6)
   String? title = '';
-  @HiveField(7)
   int? duration = -1;
-  @HiveField(8)
   int? pubdate = -1;
-  @HiveField(9)
   Owner? owner;
-  @HiveField(10)
   Stat? stat;
-  @HiveField(11)
   int? isFollowed;
-  @HiveField(12)
-  RcmdReason? rcmdReason;
+  String? rcmdReason;
 
   RecVideoItemModel.fromJson(Map<String, dynamic> json) {
     id = json["id"];
@@ -61,26 +44,20 @@ class RecVideoItemModel {
     owner = Owner.fromJson(json["owner"]);
     stat = Stat.fromJson(json["stat"]);
     isFollowed = json["is_followed"] ?? 0;
-    rcmdReason = json["rcmd_reason"] != null
-        ? RcmdReason.fromJson(json["rcmd_reason"])
-        : RcmdReason(content: '');
+    rcmdReason = json["rcmd_reason"]?['content'];
   }
 }
 
-@HiveType(typeId: 1)
 class Stat {
   Stat({
     this.view,
     this.like,
     this.danmu,
   });
-  @HiveField(0)
-  int? view;
-  @HiveField(1)
-  int? like;
-  @HiveField(2)
-  int? danmu;
 
+  int? view;
+  int? like;
+  int? danmu;
   Stat.fromJson(Map<String, dynamic> json) {
     // 无需在model中转换以保留原始数据，在view层处理即可
     view = json["view"];
@@ -88,20 +65,3 @@ class Stat {
     danmu = json['danmaku'];
   }
 }
-
-@HiveType(typeId: 2)
-class RcmdReason {
-  RcmdReason({
-    this.reasonType,
-    this.content,
-  });
-  @HiveField(0)
-  int? reasonType;
-  @HiveField(1)
-  String? content = '';
-
-  RcmdReason.fromJson(Map<String, dynamic> json) {
-    reasonType = json["reason_type"];
-    content = json["content"] ?? '';
-  }
-}
diff --git a/lib/models/model_rec_video_item.g.dart b/lib/models/model_rec_video_item.g.dart
deleted file mode 100644
index dc614354..00000000
--- a/lib/models/model_rec_video_item.g.dart
+++ /dev/null
@@ -1,154 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'model_rec_video_item.dart';
-
-// **************************************************************************
-// TypeAdapterGenerator
-// **************************************************************************
-
-class RecVideoItemModelAdapter extends TypeAdapter<RecVideoItemModel> {
-  @override
-  final int typeId = 0;
-
-  @override
-  RecVideoItemModel read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return RecVideoItemModel(
-      id: fields[0] as int?,
-      bvid: fields[1] as String?,
-      cid: fields[2] as int?,
-      goto: fields[3] as String?,
-      uri: fields[4] as String?,
-      pic: fields[5] as String?,
-      title: fields[6] as String?,
-      duration: fields[7] as int?,
-      pubdate: fields[8] as int?,
-      owner: fields[9] as Owner?,
-      stat: fields[10] as Stat?,
-      isFollowed: fields[11] as int?,
-      rcmdReason: fields[12] as RcmdReason?,
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, RecVideoItemModel obj) {
-    writer
-      ..writeByte(13)
-      ..writeByte(0)
-      ..write(obj.id)
-      ..writeByte(1)
-      ..write(obj.bvid)
-      ..writeByte(2)
-      ..write(obj.cid)
-      ..writeByte(3)
-      ..write(obj.goto)
-      ..writeByte(4)
-      ..write(obj.uri)
-      ..writeByte(5)
-      ..write(obj.pic)
-      ..writeByte(6)
-      ..write(obj.title)
-      ..writeByte(7)
-      ..write(obj.duration)
-      ..writeByte(8)
-      ..write(obj.pubdate)
-      ..writeByte(9)
-      ..write(obj.owner)
-      ..writeByte(10)
-      ..write(obj.stat)
-      ..writeByte(11)
-      ..write(obj.isFollowed)
-      ..writeByte(12)
-      ..write(obj.rcmdReason);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is RecVideoItemModelAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}
-
-class StatAdapter extends TypeAdapter<Stat> {
-  @override
-  final int typeId = 1;
-
-  @override
-  Stat read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return Stat(
-      view: fields[0] as int?,
-      like: fields[1] as int?,
-      danmu: fields[2] as int?,
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, Stat obj) {
-    writer
-      ..writeByte(3)
-      ..writeByte(0)
-      ..write(obj.view)
-      ..writeByte(1)
-      ..write(obj.like)
-      ..writeByte(2)
-      ..write(obj.danmu);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is StatAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}
-
-class RcmdReasonAdapter extends TypeAdapter<RcmdReason> {
-  @override
-  final int typeId = 2;
-
-  @override
-  RcmdReason read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return RcmdReason(
-      reasonType: fields[0] as int?,
-      content: fields[1] as String?,
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, RcmdReason obj) {
-    writer
-      ..writeByte(2)
-      ..writeByte(0)
-      ..write(obj.reasonType)
-      ..writeByte(1)
-      ..write(obj.content);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is RcmdReasonAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}
diff --git a/lib/models/msg/system.dart b/lib/models/msg/system.dart
new file mode 100644
index 00000000..12b1ac77
--- /dev/null
+++ b/lib/models/msg/system.dart
@@ -0,0 +1,88 @@
+import 'dart:convert';
+
+class MessageSystemModel {
+  int? id;
+  int? cursor;
+  int? type;
+  String? title;
+  dynamic content;
+  Source? source;
+  String? timeAt;
+  int? cardType;
+  String? cardBrief;
+  String? cardMsgBrief;
+  String? cardCover;
+  String? cardStoryTitle;
+  String? cardLink;
+  String? mc;
+  int? isStation;
+  int? isSend;
+  int? notifyCursor;
+
+  MessageSystemModel({
+    this.id,
+    this.cursor,
+    this.type,
+    this.title,
+    this.content,
+    this.source,
+    this.timeAt,
+    this.cardType,
+    this.cardBrief,
+    this.cardMsgBrief,
+    this.cardCover,
+    this.cardStoryTitle,
+    this.cardLink,
+    this.mc,
+    this.isStation,
+    this.isSend,
+    this.notifyCursor,
+  });
+
+  factory MessageSystemModel.fromJson(Map<String, dynamic> jsons) =>
+      MessageSystemModel(
+        id: jsons["id"],
+        cursor: jsons["cursor"],
+        type: jsons["type"],
+        title: jsons["title"],
+        content: isValidJson(jsons["content"])
+            ? json.decode(jsons["content"])
+            : jsons["content"],
+        source: Source.fromJson(jsons["source"]),
+        timeAt: jsons["time_at"],
+        cardType: jsons["card_type"],
+        cardBrief: jsons["card_brief"],
+        cardMsgBrief: jsons["card_msg_brief"],
+        cardCover: jsons["card_cover"],
+        cardStoryTitle: jsons["card_story_title"],
+        cardLink: jsons["card_link"],
+        mc: jsons["mc"],
+        isStation: jsons["is_station"],
+        isSend: jsons["is_send"],
+        notifyCursor: jsons["notify_cursor"],
+      );
+}
+
+class Source {
+  String? name;
+  String? logo;
+
+  Source({
+    this.name,
+    this.logo,
+  });
+
+  factory Source.fromJson(Map<String, dynamic> json) => Source(
+        name: json["name"],
+        logo: json["logo"],
+      );
+}
+
+bool isValidJson(String str) {
+  try {
+    json.decode(str);
+  } catch (e) {
+    return false;
+  }
+  return true;
+}
diff --git a/lib/models/read/opus.dart b/lib/models/read/opus.dart
new file mode 100644
index 00000000..e7b9aca1
--- /dev/null
+++ b/lib/models/read/opus.dart
@@ -0,0 +1,485 @@
+class OpusDataModel {
+  OpusDataModel({
+    this.id,
+    this.detail,
+    this.type,
+    this.theme,
+    this.themeMode,
+  });
+
+  String? id;
+  OpusDetailDataModel? detail;
+  int? type;
+  String? theme;
+  String? themeMode;
+
+  OpusDataModel.fromJson(Map<String, dynamic> json) {
+    id = json['id'];
+    detail = json['detail'] != null
+        ? OpusDetailDataModel.fromJson(json['detail'])
+        : null;
+    type = json['type'];
+    theme = json['theme'];
+    themeMode = json['themeMode'];
+  }
+}
+
+class OpusDetailDataModel {
+  OpusDetailDataModel({
+    this.basic,
+    this.idStr,
+    this.modules,
+    this.type,
+  });
+
+  Basic? basic;
+  String? idStr;
+  List<OpusModuleDataModel>? modules;
+  int? type;
+
+  OpusDetailDataModel.fromJson(Map<String, dynamic> json) {
+    basic = json['basic'] != null ? Basic.fromJson(json['basic']) : null;
+    idStr = json['id_str'];
+    if (json['modules'] != null) {
+      modules = <OpusModuleDataModel>[];
+      json['modules'].forEach((v) {
+        modules!.add(OpusModuleDataModel.fromJson(v));
+      });
+    }
+    type = json['type'];
+  }
+}
+
+class Basic {
+  Basic({
+    this.commentIdStr,
+    this.commentType,
+    this.ridStr,
+    this.title,
+    this.uid,
+  });
+
+  String? commentIdStr;
+  int? commentType;
+  String? ridStr;
+  String? title;
+  int? uid;
+
+  Basic.fromJson(Map<String, dynamic> json) {
+    commentIdStr = json['comment_id_str'];
+    commentType = json['comment_type'];
+    ridStr = json['rid_str'];
+    title = json['title'];
+    uid = json['uid'];
+  }
+}
+
+class OpusModuleDataModel {
+  OpusModuleDataModel({
+    this.moduleTitle,
+    this.moduleAuthor,
+    this.moduleContent,
+    this.moduleExtend,
+    this.moduleBottom,
+    this.moduleStat,
+  });
+
+  ModuleTop? moduleTop;
+  ModuleTitle? moduleTitle;
+  ModuleAuthor? moduleAuthor;
+  ModuleContent? moduleContent;
+  ModuleExtend? moduleExtend;
+  ModuleBottom? moduleBottom;
+  ModuleStat? moduleStat;
+
+  OpusModuleDataModel.fromJson(Map<String, dynamic> json) {
+    moduleTop = json['module_top'] != null
+        ? ModuleTop.fromJson(json['module_top'])
+        : null;
+    moduleTitle = json['module_title'] != null
+        ? ModuleTitle.fromJson(json['module_title'])
+        : null;
+    moduleAuthor = json['module_author'] != null
+        ? ModuleAuthor.fromJson(json['module_author'])
+        : null;
+    moduleContent = json['module_content'] != null
+        ? ModuleContent.fromJson(json['module_content'])
+        : null;
+    moduleExtend = json['module_extend'] != null
+        ? ModuleExtend.fromJson(json['module_extend'])
+        : null;
+    moduleBottom = json['module_bottom'] != null
+        ? ModuleBottom.fromJson(json['module_bottom'])
+        : null;
+    moduleStat = json['module_stat'] != null
+        ? ModuleStat.fromJson(json['module_stat'])
+        : null;
+  }
+}
+
+class ModuleTop {
+  ModuleTop({
+    this.type,
+    this.video,
+  });
+
+  int? type;
+  Map? video;
+
+  ModuleTop.fromJson(Map<String, dynamic> json) {
+    type = json['type'];
+    video = json['video'];
+  }
+}
+
+class ModuleTitle {
+  ModuleTitle({
+    this.text,
+  });
+
+  String? text;
+
+  ModuleTitle.fromJson(Map<String, dynamic> json) {
+    text = json['text'];
+  }
+}
+
+class ModuleAuthor {
+  ModuleAuthor({
+    this.face,
+    this.mid,
+    this.name,
+    this.pubTime,
+  });
+
+  String? face;
+  int? mid;
+  String? name;
+  String? pubTime;
+
+  ModuleAuthor.fromJson(Map<String, dynamic> json) {
+    face = json['face'];
+    mid = json['mid'];
+    name = json['name'];
+    pubTime = json['pub_time'];
+  }
+}
+
+class ModuleContent {
+  ModuleContent({
+    this.paragraphs,
+    this.moduleType,
+  });
+
+  List<ModuleParagraph>? paragraphs;
+  String? moduleType;
+
+  ModuleContent.fromJson(Map<String, dynamic> json) {
+    if (json['paragraphs'] != null) {
+      paragraphs = <ModuleParagraph>[];
+      json['paragraphs'].forEach((v) {
+        paragraphs!.add(ModuleParagraph.fromJson(v));
+      });
+    }
+    moduleType = json['module_type'];
+  }
+}
+
+class ModuleParagraph {
+  ModuleParagraph({
+    this.align,
+    this.paraType,
+    this.pic,
+    this.text,
+  });
+
+  // 0 左对齐  1 居中  2 右对齐
+  int? align;
+  int? paraType;
+  Pics? pic;
+  ModuleParagraphText? text;
+  LinkCard? linkCard;
+
+  ModuleParagraph.fromJson(Map<String, dynamic> json) {
+    align = json['align'];
+    paraType = json['para_type'] == null && json['link_card'] != null
+        ? 3
+        : json['para_type'];
+    pic = json['pic'] != null ? Pics.fromJson(json['pic']) : null;
+    text = json['text'] != null
+        ? ModuleParagraphText.fromJson(json['text'])
+        : null;
+    linkCard =
+        json['link_card'] != null ? LinkCard.fromJson(json['link_card']) : null;
+  }
+}
+
+class Pics {
+  Pics({
+    this.pics,
+    this.style,
+  });
+
+  List<Pic>? pics;
+  int? style;
+
+  Pics.fromJson(Map<String, dynamic> json) {
+    if (json['pics'] != null) {
+      pics = <Pic>[];
+      json['pics'].forEach((v) {
+        pics!.add(Pic.fromJson(v));
+      });
+    }
+    style = json['style'];
+  }
+}
+
+class Pic {
+  Pic({
+    this.height,
+    this.size,
+    this.url,
+    this.width,
+    this.aspectRatio,
+    this.scale,
+  });
+
+  int? height;
+  double? size;
+  String? url;
+  int? width;
+  double? aspectRatio;
+  double? scale;
+
+  Pic.fromJson(Map<String, dynamic> json) {
+    height = json['height'];
+    size = json['size'];
+    url = json['url'];
+    width = json['width'];
+    aspectRatio = json['width'] / json['height'];
+    scale = customDivision(json['width'], 600);
+  }
+}
+
+class LinkCard {
+  LinkCard({
+    this.cover,
+    this.descSecond,
+    this.duration,
+    this.jumpUrl,
+    this.title,
+  });
+
+  String? cover;
+  String? descSecond;
+  String? duration;
+  String? jumpUrl;
+  String? title;
+
+  LinkCard.fromJson(Map<String, dynamic> json) {
+    cover = json['card']['cover'];
+    descSecond = json['card']['desc_second'];
+    duration = json['card']['duration'];
+    jumpUrl = json['card']['jump_url'];
+    title = json['card']['title'];
+  }
+}
+
+class ModuleParagraphText {
+  ModuleParagraphText({
+    this.nodes,
+  });
+
+  List<ModuleParagraphTextNode>? nodes;
+
+  ModuleParagraphText.fromJson(Map<String, dynamic> json) {
+    if (json['nodes'] != null) {
+      nodes = <ModuleParagraphTextNode>[];
+      json['nodes'].forEach((v) {
+        nodes!.add(ModuleParagraphTextNode.fromJson(v));
+      });
+    }
+  }
+}
+
+class ModuleParagraphTextNode {
+  ModuleParagraphTextNode({
+    this.type,
+    this.nodeType,
+    this.word,
+  });
+
+  String? type;
+  int? nodeType;
+  ModuleParagraphTextNodeWord? word;
+
+  ModuleParagraphTextNode.fromJson(Map<String, dynamic> json) {
+    type = json['type'];
+    nodeType = json['node_type'];
+    word = json['word'] != null
+        ? ModuleParagraphTextNodeWord.fromJson(json['word'])
+        : null;
+  }
+}
+
+class ModuleParagraphTextNodeWord {
+  ModuleParagraphTextNodeWord({
+    this.color,
+    this.fontSize,
+    this.style,
+    this.words,
+  });
+
+  String? color;
+  int? fontSize;
+  ModuleParagraphTextNodeWordStyle? style;
+  String? words;
+
+  ModuleParagraphTextNodeWord.fromJson(Map<String, dynamic> json) {
+    color = json['color'];
+    fontSize = json['font_size'];
+    style = json['style'] != null
+        ? ModuleParagraphTextNodeWordStyle.fromJson(json['style'])
+        : null;
+    words = json['words'];
+  }
+}
+
+class ModuleParagraphTextNodeWordStyle {
+  ModuleParagraphTextNodeWordStyle({
+    this.bold,
+  });
+
+  bool? bold;
+
+  ModuleParagraphTextNodeWordStyle.fromJson(Map<String, dynamic> json) {
+    bold = json['bold'];
+  }
+}
+
+class ModuleExtend {
+  ModuleExtend({
+    this.items,
+  });
+
+  List<ModuleExtendItem>? items;
+
+  ModuleExtend.fromJson(Map<String, dynamic> json) {
+    if (json['items'] != null) {
+      items = <ModuleExtendItem>[];
+      json['items'].forEach((v) {
+        items!.add(ModuleExtendItem.fromJson(v));
+      });
+    }
+  }
+}
+
+class ModuleExtendItem {
+  ModuleExtendItem({
+    this.bizId,
+    this.bizType,
+    this.icon,
+    this.jumpUrl,
+    this.text,
+  });
+
+  dynamic bizId;
+  int? bizType;
+  dynamic icon;
+  String? jumpUrl;
+  String? text;
+
+  ModuleExtendItem.fromJson(Map<String, dynamic> json) {
+    bizId = json['biz_id'];
+    bizType = json['biz_type'];
+    icon = json['icon'];
+    jumpUrl = json['jump_url'];
+    text = json['text'];
+  }
+}
+
+class ModuleBottom {
+  ModuleBottom({
+    this.shareInfo,
+  });
+
+  ShareInfo? shareInfo;
+
+  ModuleBottom.fromJson(Map<String, dynamic> json) {
+    shareInfo = json['share_info'] != null
+        ? ShareInfo.fromJson(json['share_info'])
+        : null;
+  }
+}
+
+class ShareInfo {
+  ShareInfo({
+    this.pic,
+    this.summary,
+    this.title,
+  });
+
+  String? pic;
+  String? summary;
+  String? title;
+
+  ShareInfo.fromJson(Map<String, dynamic> json) {
+    pic = json['pic'];
+    summary = json['summary'];
+    title = json['title'];
+  }
+}
+
+class ModuleStat {
+  ModuleStat({
+    this.coin,
+    this.comment,
+    this.favorite,
+    this.forward,
+    this.like,
+  });
+
+  StatItem? coin;
+  StatItem? comment;
+  StatItem? favorite;
+  StatItem? forward;
+  StatItem? like;
+
+  ModuleStat.fromJson(Map<String, dynamic> json) {
+    coin = json['coin'] != null ? StatItem.fromJson(json['coin']) : null;
+    comment =
+        json['comment'] != null ? StatItem.fromJson(json['comment']) : null;
+    favorite =
+        json['favorite'] != null ? StatItem.fromJson(json['favorite']) : null;
+    forward =
+        json['forward'] != null ? StatItem.fromJson(json['forward']) : null;
+    like = json['like'] != null ? StatItem.fromJson(json['like']) : null;
+  }
+}
+
+class StatItem {
+  StatItem({
+    this.count,
+    this.forbidden,
+    this.status,
+  });
+
+  int? count;
+  bool? forbidden;
+  bool? status;
+
+  StatItem.fromJson(Map<String, dynamic> json) {
+    count = json['count'];
+    forbidden = json['forbidden'];
+    status = json['status'];
+  }
+}
+
+double customDivision(int a, int b) {
+  double result = a / b;
+  if (result < 1) {
+    return result;
+  } else {
+    return 1.0;
+  }
+}
diff --git a/lib/models/read/read.dart b/lib/models/read/read.dart
new file mode 100644
index 00000000..fe351da4
--- /dev/null
+++ b/lib/models/read/read.dart
@@ -0,0 +1,286 @@
+import 'package:pilipala/models/member/info.dart';
+
+import 'opus.dart';
+
+class ReadDataModel {
+  ReadDataModel({
+    this.cvid,
+    this.readInfo,
+    this.readViewInfo,
+    this.upInfo,
+    this.catalogList,
+    this.recommendInfoList,
+    this.hiddenInteraction,
+    this.isModern,
+  });
+
+  int? cvid;
+  ReadInfo? readInfo;
+  Map? readViewInfo;
+  Map? upInfo;
+  List<dynamic>? catalogList;
+  List<dynamic>? recommendInfoList;
+  bool? hiddenInteraction;
+  bool? isModern;
+
+  ReadDataModel.fromJson(Map<String, dynamic> json) {
+    cvid = json['cvid'];
+    readInfo =
+        json['readInfo'] != null ? ReadInfo.fromJson(json['readInfo']) : null;
+    readViewInfo = json['readViewInfo'];
+    upInfo = json['upInfo'];
+    if (json['catalogList'] != null) {
+      catalogList = <dynamic>[];
+      json['catalogList'].forEach((v) {
+        catalogList!.add(v);
+      });
+    }
+    if (json['recommendInfoList'] != null) {
+      recommendInfoList = <dynamic>[];
+      json['recommendInfoList'].forEach((v) {
+        recommendInfoList!.add(v);
+      });
+    }
+    hiddenInteraction = json['hiddenInteraction'];
+    isModern = json['isModern'];
+  }
+}
+
+class ReadInfo {
+  ReadInfo({
+    this.id,
+    this.category,
+    this.title,
+    this.summary,
+    this.bannerUrl,
+    this.author,
+    this.publishTime,
+    this.ctime,
+    this.mtime,
+    this.stats,
+    this.attributes,
+    this.words,
+    this.originImageUrls,
+    this.content,
+    this.opus,
+    this.dynIdStr,
+    this.totalArtNum,
+  });
+
+  int? id;
+  Map? category;
+  String? title;
+  String? summary;
+  String? bannerUrl;
+  Author? author;
+  int? publishTime;
+  int? ctime;
+  int? mtime;
+  Map? stats;
+  int? attributes;
+  int? words;
+  List<String>? originImageUrls;
+  String? content;
+  Opus? opus;
+  String? dynIdStr;
+  int? totalArtNum;
+
+  ReadInfo.fromJson(Map<String, dynamic> json) {
+    id = json['id'];
+    category = json['category'];
+    title = json['title'];
+    summary = json['summary'];
+    bannerUrl = json['banner_url'];
+    author = Author.fromJson(json['author']);
+    publishTime = json['publish_time'];
+    ctime = json['ctime'];
+    mtime = json['mtime'];
+    stats = json['stats'];
+    attributes = json['attributes'];
+    words = json['words'];
+    if (json['origin_image_urls'] != null) {
+      originImageUrls = <String>[];
+      json['origin_image_urls'].forEach((v) {
+        originImageUrls!.add(v);
+      });
+    }
+    content = json['content'];
+    opus = json['opus'] != null ? Opus.fromJson(json['opus']) : null;
+    dynIdStr = json['dyn_id_str'];
+    totalArtNum = json['total_art_num'];
+  }
+}
+
+class Author {
+  Author({
+    this.mid,
+    this.name,
+    this.face,
+    this.vip,
+    this.fans,
+    this.level,
+  });
+
+  int? mid;
+  String? name;
+  String? face;
+  Vip? vip;
+  int? fans;
+  int? level;
+
+  Author.fromJson(Map<String, dynamic> json) {
+    mid = json['mid'];
+    name = json['name'];
+    face = json['face'];
+    vip = json['vip'] != null ? Vip.fromJson(json['vip']) : null;
+    fans = json['fans'];
+    level = json['level'];
+  }
+}
+
+class Opus {
+  // "opus_id": 976625853207150600,
+  // "opus_source": 2,
+  // "title": "真的很想骂人 但又没什么好骂的",
+  // "content": {
+  //     "paragraphs": [{
+  //         "para_type": 1,
+  //         "text": {
+  //             "nodes": [{
+  //                 "node_type": 1,
+  //                 "word": {
+  //                     "words": "21年玩到今年4月的号没了  ow1的时候45的号 玩了三年  后面第9赛季一个英杰5的号（虽然是偷的 但我任何违规行为都没有还是给我封了）  最近玩的号叫velleity  只和队友打天梯以及训练赛 又没了 连带着我一个一把没玩过只玩过一场训练赛的小号也没了  实在是无话可说了...",
+  //                     "font_size": 17,
+  //                     "style": {},
+  //                     "font_level": "regular"
+  //                 }
+  //             }]
+  //         }
+  //     }, {
+  //         "para_type": 2,
+  //         "pic": {
+  //             "pics": [{
+  //                 "url": "https:\u002F\u002Fi0.hdslb.com\u002Fbfs\u002Fnew_dyn\u002Fba4e57459451fe74dcb70fd20bde9823316082117.jpg",
+  //                 "width": 1600,
+  //                 "height": 1000,
+  //                 "size": 588.482421875
+  //             }],
+  //             "style": 1
+  //         }
+  //     }, {
+  //         "para_type": 1,
+  //         "text": {
+  //             "nodes": [{
+  //                 "node_type": 1,
+  //                 "word": {
+  //                     "words": "\n",
+  //                     "font_size": 17,
+  //                     "style": {},
+  //                     "font_level": "regular"
+  //                 }
+  //             }]
+  //         }
+  //     }, {
+  //         "para_type": 2,
+  //         "pic": {
+  //             "pics": [{
+  //                 "url": "https:\u002F\u002Fi0.hdslb.com\u002Fbfs\u002Fnew_dyn\u002F0945be6b621091ddb8189482a87a36fb316082117.jpg",
+  //                 "width": 1600,
+  //                 "height": 1002,
+  //                 "size": 665.7861328125
+  //             }],
+  //             "style": 1
+  //         }
+  //     }, {
+  //         "para_type": 1,
+  //         "text": {
+  //             "nodes": [{
+  //                 "node_type": 1,
+  //                 "word": {
+  //                     "words": "\n",
+  //                     "font_size": 17,
+  //                     "style": {},
+  //                     "font_level": "regular"
+  //                 }
+  //             }]
+  //         }
+  //     }, {
+  //         "para_type": 2,
+  //         "pic": {
+  //             "pics": [{
+  //                 "url": "https:\u002F\u002Fi0.hdslb.com\u002Fbfs\u002Fnew_dyn\u002Ffa60649f8786578a764a1e68a2c5d23f316082117.jpg",
+  //                 "width": 1600,
+  //                 "height": 999,
+  //                 "size": 332.970703125
+  //             }],
+  //             "style": 1
+  //         }
+  //     }, {
+  //         "para_type": 1,
+  //         "text": {
+  //             "nodes": [{
+  //                 "node_type": 1,
+  //                 "word": {
+  //                     "words": "\n",
+  //                     "font_size": 17,
+  //                     "style": {},
+  //                     "font_level": "regular"
+  //                 }
+  //             }]
+  //         }
+  //     }]
+  // },
+  // "pub_info": {
+  //     "uid": 316082117,
+  //     "pub_time": 1726226826
+  // },
+  // "article": {
+  //     "category_id": 15,
+  //     "cover": [{
+  //         "url": "https:\u002F\u002Fi0.hdslb.com\u002Fbfs\u002Fnew_dyn\u002Fbanner\u002Feb10074186a62f98c18e1b5b9deb38be316082117.png",
+  //         "width": 1071,
+  //         "height": 315,
+  //         "size": 225.625
+  //     }]
+  // },
+  // "version": {
+  //     "cvid": 38660379,
+  //     "version_id": 101683514411343360
+  // }
+  Opus({
+    this.opusId,
+    this.opusSource,
+    this.title,
+    this.content,
+  });
+
+  int? opusId;
+  int? opusSource;
+  String? title;
+  Content? content;
+
+  Opus.fromJson(Map<String, dynamic> json) {
+    opusId = json['opus_id'];
+    opusSource = json['opus_source'];
+    title = json['title'];
+    content =
+        json['content'] != null ? Content.fromJson(json['content']) : null;
+  }
+}
+
+class Content {
+  Content({
+    this.paragraphs,
+  });
+
+  List<ModuleParagraph>? paragraphs;
+
+  Content.fromJson(Map<String, dynamic> json) {
+    if (json['paragraphs'] != null) {
+      paragraphs = <ModuleParagraph>[];
+      json['paragraphs'].forEach((v) {
+        paragraphs!.add(ModuleParagraph.fromJson(v));
+      });
+    }
+  }
+}
diff --git a/lib/models/search/hot.dart b/lib/models/search/hot.dart
index ce09b2ea..59d7e749 100644
--- a/lib/models/search/hot.dart
+++ b/lib/models/search/hot.dart
@@ -1,14 +1,8 @@
-import 'package:hive/hive.dart';
-
-part 'hot.g.dart';
-
-@HiveType(typeId: 6)
 class HotSearchModel {
   HotSearchModel({
     this.list,
   });
 
-  @HiveField(0)
   List<HotSearchItem>? list;
 
   HotSearchModel.fromJson(Map<String, dynamic> json) {
@@ -18,7 +12,6 @@ class HotSearchModel {
   }
 }
 
-@HiveType(typeId: 7)
 class HotSearchItem {
   HotSearchItem({
     this.keyword,
@@ -27,14 +20,10 @@ class HotSearchItem {
     this.icon,
   });
 
-  @HiveField(0)
   String? keyword;
-  @HiveField(1)
   String? showName;
   // 4/5热 11话题 8普通 7直播
-  @HiveField(2)
   int? wordType;
-  @HiveField(3)
   String? icon;
 
   HotSearchItem.fromJson(Map<String, dynamic> json) {
diff --git a/lib/models/search/hot.g.dart b/lib/models/search/hot.g.dart
deleted file mode 100644
index a06dd475..00000000
--- a/lib/models/search/hot.g.dart
+++ /dev/null
@@ -1,84 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'hot.dart';
-
-// **************************************************************************
-// TypeAdapterGenerator
-// **************************************************************************
-
-class HotSearchModelAdapter extends TypeAdapter<HotSearchModel> {
-  @override
-  final int typeId = 6;
-
-  @override
-  HotSearchModel read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return HotSearchModel(
-      list: (fields[0] as List?)?.cast<HotSearchItem>(),
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, HotSearchModel obj) {
-    writer
-      ..writeByte(1)
-      ..writeByte(0)
-      ..write(obj.list);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is HotSearchModelAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}
-
-class HotSearchItemAdapter extends TypeAdapter<HotSearchItem> {
-  @override
-  final int typeId = 7;
-
-  @override
-  HotSearchItem read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return HotSearchItem(
-      keyword: fields[0] as String?,
-      showName: fields[1] as String?,
-      wordType: fields[2] as int?,
-      icon: fields[3] as String?,
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, HotSearchItem obj) {
-    writer
-      ..writeByte(4)
-      ..writeByte(0)
-      ..write(obj.keyword)
-      ..writeByte(1)
-      ..write(obj.showName)
-      ..writeByte(2)
-      ..write(obj.wordType)
-      ..writeByte(3)
-      ..write(obj.icon);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is HotSearchItemAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}
diff --git a/lib/models/search/result.dart b/lib/models/search/result.dart
index 81917b72..b903c873 100644
--- a/lib/models/search/result.dart
+++ b/lib/models/search/result.dart
@@ -5,10 +5,12 @@ class SearchVideoModel {
   SearchVideoModel({this.list});
   List<SearchVideoItemModel>? list;
   SearchVideoModel.fromJson(Map<String, dynamic> json) {
-    list = json['result']
-        .where((e) => e['available'] == true)
-        .map<SearchVideoItemModel>((e) => SearchVideoItemModel.fromJson(e))
-        .toList();
+    list = json['result'] == null
+        ? []
+        : json['result']
+            .where((e) => e['available'] == true)
+            .map<SearchVideoItemModel>((e) => SearchVideoItemModel.fromJson(e))
+            .toList();
   }
 }
 
diff --git a/lib/models/user/stat.dart b/lib/models/user/stat.dart
index 3b09acb1..0b56a499 100644
--- a/lib/models/user/stat.dart
+++ b/lib/models/user/stat.dart
@@ -1,8 +1,3 @@
-import 'package:hive/hive.dart';
-
-part 'stat.g.dart';
-
-@HiveType(typeId: 1)
 class UserStat {
   UserStat({
     this.following,
@@ -10,11 +5,8 @@ class UserStat {
     this.dynamicCount,
   });
 
-  @HiveField(0)
   int? following;
-  @HiveField(1)
   int? follower;
-  @HiveField(2)
   int? dynamicCount;
 
   UserStat.fromJson(Map<String, dynamic> json) {
diff --git a/lib/models/user/stat.g.dart b/lib/models/user/stat.g.dart
deleted file mode 100644
index 290fe026..00000000
--- a/lib/models/user/stat.g.dart
+++ /dev/null
@@ -1,47 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'stat.dart';
-
-// **************************************************************************
-// TypeAdapterGenerator
-// **************************************************************************
-
-class UserStatAdapter extends TypeAdapter<UserStat> {
-  @override
-  final int typeId = 1;
-
-  @override
-  UserStat read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return UserStat(
-      following: fields[0] as int?,
-      follower: fields[1] as int?,
-      dynamicCount: fields[2] as int?,
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, UserStat obj) {
-    writer
-      ..writeByte(3)
-      ..writeByte(0)
-      ..write(obj.following)
-      ..writeByte(1)
-      ..write(obj.follower)
-      ..writeByte(2)
-      ..write(obj.dynamicCount);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is UserStatAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}
diff --git a/lib/models/video/ai.dart b/lib/models/video/ai.dart
index a06fa79d..0816c09d 100644
--- a/lib/models/video/ai.dart
+++ b/lib/models/video/ai.dart
@@ -39,11 +39,11 @@ class ModelResult {
   ModelResult.fromJson(Map<String, dynamic> json) {
     resultType = json['result_type'];
     summary = json['summary'];
-    outline = json['result_type'] == 2
-        ? json['outline']
+    outline = json['result_type'] == 0
+        ? <OutlineItem>[]
+        : json['outline']
             .map<OutlineItem>((e) => OutlineItem.fromJson(e))
-            .toList()
-        : <OutlineItem>[];
+            .toList();
   }
 }
 
diff --git a/lib/models/video/later.dart b/lib/models/video/later.dart
new file mode 100644
index 00000000..7829e1c7
--- /dev/null
+++ b/lib/models/video/later.dart
@@ -0,0 +1,276 @@
+class MediaVideoItemModel {
+  MediaVideoItemModel({
+    this.id,
+    this.aid,
+    this.offset,
+    this.index,
+    this.intro,
+    this.attr,
+    this.tid,
+    this.copyRight,
+    this.cntInfo,
+    this.cover,
+    this.duration,
+    this.pubtime,
+    this.likeState,
+    this.favState,
+    this.page,
+    this.cid,
+    this.pages,
+    this.title,
+    this.type,
+    this.upper,
+    this.link,
+    this.bvid,
+    this.shortLink,
+    this.rights,
+    this.elecInfo,
+    this.coin,
+    this.progressPercent,
+    this.badge,
+    this.forbidFav,
+    this.moreType,
+    this.businessOid,
+  });
+
+  int? id;
+  int? aid;
+  int? offset;
+  int? index;
+  String? intro;
+  int? attr;
+  int? tid;
+  int? copyRight;
+  Map? cntInfo;
+  String? cover;
+  int? duration;
+  int? pubtime;
+  int? likeState;
+  int? favState;
+  int? page;
+  int? cid;
+  List<Page>? pages;
+  String? title;
+  int? type;
+  Upper? upper;
+  String? link;
+  String? bvid;
+  String? shortLink;
+  Rights? rights;
+  dynamic elecInfo;
+  Coin? coin;
+  double? progressPercent;
+  dynamic badge;
+  bool? forbidFav;
+  int? moreType;
+  int? businessOid;
+
+  factory MediaVideoItemModel.fromJson(Map<String, dynamic> json) =>
+      MediaVideoItemModel(
+        id: json["id"],
+        aid: json["id"],
+        offset: json["offset"],
+        index: json["index"],
+        intro: json["intro"],
+        attr: json["attr"],
+        tid: json["tid"],
+        copyRight: json["copy_right"],
+        cntInfo: json["cnt_info"],
+        cover: json["cover"],
+        duration: json["duration"],
+        pubtime: json["pubtime"],
+        likeState: json["like_state"],
+        favState: json["fav_state"],
+        page: json["page"],
+        cid: json["pages"] == null ? -1 : json["pages"].first['id'],
+        // json["pages"] 可能为null
+        pages: json["pages"] == null
+            ? []
+            : List<Page>.from(json["pages"].map((x) => Page.fromJson(x))),
+        title: json["title"],
+        type: json["type"],
+        upper: Upper.fromJson(json["upper"]),
+        link: json["link"],
+        bvid: json["bv_id"],
+        shortLink: json["short_link"],
+        rights: Rights.fromJson(json["rights"]),
+        elecInfo: json["elec_info"],
+        coin: Coin.fromJson(json["coin"]),
+        progressPercent: json["progress_percent"].toDouble(),
+        badge: json["badge"],
+        forbidFav: json["forbid_fav"],
+        moreType: json["more_type"],
+        businessOid: json["business_oid"],
+      );
+}
+
+class Coin {
+  Coin({
+    this.maxNum,
+    this.coinNumber,
+  });
+
+  int? maxNum;
+  int? coinNumber;
+
+  factory Coin.fromJson(Map<String, dynamic> json) => Coin(
+        maxNum: json["max_num"],
+        coinNumber: json["coin_number"],
+      );
+}
+
+class Page {
+  Page({
+    this.id,
+    this.title,
+    this.intro,
+    this.duration,
+    this.link,
+    this.page,
+    this.metas,
+    this.from,
+    this.dimension,
+  });
+
+  int? id;
+  String? title;
+  String? intro;
+  int? duration;
+  String? link;
+  int? page;
+  List<Meta>? metas;
+  String? from;
+  Dimension? dimension;
+
+  factory Page.fromJson(Map<String, dynamic> json) => Page(
+        id: json["id"],
+        title: json["title"],
+        intro: json["intro"],
+        duration: json["duration"],
+        link: json["link"],
+        page: json["page"],
+        metas: List<Meta>.from(json["metas"].map((x) => Meta.fromJson(x))),
+        from: json["from"],
+        dimension: Dimension.fromJson(json["dimension"]),
+      );
+}
+
+class Dimension {
+  Dimension({
+    this.width,
+    this.height,
+    this.rotate,
+  });
+
+  int? width;
+  int? height;
+  int? rotate;
+
+  factory Dimension.fromJson(Map<String, dynamic> json) => Dimension(
+        width: json["width"],
+        height: json["height"],
+        rotate: json["rotate"],
+      );
+}
+
+class Meta {
+  Meta({
+    this.quality,
+    this.size,
+  });
+
+  int? quality;
+  int? size;
+
+  factory Meta.fromJson(Map<String, dynamic> json) => Meta(
+        quality: json["quality"],
+        size: json["size"],
+      );
+}
+
+class Rights {
+  Rights({
+    this.bp,
+    this.elec,
+    this.download,
+    this.movie,
+    this.pay,
+    this.ugcPay,
+    this.hd5,
+    this.noReprint,
+    this.autoplay,
+    this.noBackground,
+  });
+
+  int? bp;
+  int? elec;
+  int? download;
+  int? movie;
+  int? pay;
+  int? ugcPay;
+  int? hd5;
+  int? noReprint;
+  int? autoplay;
+  int? noBackground;
+
+  factory Rights.fromJson(Map<String, dynamic> json) => Rights(
+        bp: json["bp"],
+        elec: json["elec"],
+        download: json["download"],
+        movie: json["movie"],
+        pay: json["pay"],
+        ugcPay: json["ugc_pay"],
+        hd5: json["hd5"],
+        noReprint: json["no_reprint"],
+        autoplay: json["autoplay"],
+        noBackground: json["no_background"],
+      );
+}
+
+class Upper {
+  Upper({
+    this.mid,
+    this.name,
+    this.face,
+    this.followed,
+    this.fans,
+    this.vipType,
+    this.vipStatue,
+    this.vipDueDate,
+    this.vipPayType,
+    this.officialRole,
+    this.officialTitle,
+    this.officialDesc,
+    this.displayName,
+  });
+
+  int? mid;
+  String? name;
+  String? face;
+  int? followed;
+  int? fans;
+  int? vipType;
+  int? vipStatue;
+  int? vipDueDate;
+  int? vipPayType;
+  int? officialRole;
+  String? officialTitle;
+  String? officialDesc;
+  String? displayName;
+
+  factory Upper.fromJson(Map<String, dynamic> json) => Upper(
+        mid: json["mid"],
+        name: json["name"],
+        face: json["face"],
+        followed: json["followed"],
+        fans: json["fans"],
+        vipType: json["vip_type"],
+        vipStatue: json["vip_statue"],
+        vipDueDate: json["vip_due_date"],
+        vipPayType: json["vip_pay_type"],
+        officialRole: json["official_role"],
+        officialTitle: json["official_title"],
+        officialDesc: json["official_desc"],
+        displayName: json["display_name"],
+      );
+}
diff --git a/lib/models/video/play/ao_output.dart b/lib/models/video/play/ao_output.dart
new file mode 100644
index 00000000..170a78c5
--- /dev/null
+++ b/lib/models/video/play/ao_output.dart
@@ -0,0 +1,6 @@
+final List aoOutputList = [
+  {'title': 'audiotrack,opensles', 'value': '0'},
+  {'title': 'opensles,audiotrack', 'value': '1'},
+  {'title': 'audiotrack', 'value': '2'},
+  {'title': 'opensles', 'value': '3'},
+];
diff --git a/lib/models/video/subTitile/result.dart b/lib/models/video/subTitile/result.dart
index d3e32e55..e137439f 100644
--- a/lib/models/video/subTitile/result.dart
+++ b/lib/models/video/subTitile/result.dart
@@ -1,6 +1,3 @@
-import 'package:get/get.dart';
-import '../../common/subtitle_type.dart';
-
 class SubTitlteModel {
   SubTitlteModel({
     this.aid,
@@ -78,11 +75,6 @@ class SubTitlteItemModel {
         aiType: json["ai_type"],
         aiStatus: json["ai_status"],
         title: json["lan_doc"],
-        code: SubtitleType.values
-                .firstWhereOrNull(
-                    (element) => element.id.toString() == json["lan"])
-                ?.index ??
-            -1,
         content: '',
         body: [],
       );
diff --git a/lib/pages/about/index.dart b/lib/pages/about/index.dart
index 81d3c3f4..9164d4e9 100644
--- a/lib/pages/about/index.dart
+++ b/lib/pages/about/index.dart
@@ -295,7 +295,7 @@ class AboutController extends GetxController {
       displayTime: const Duration(milliseconds: 500),
     ).then(
       (value) => launchUrl(
-        Uri.parse('https://www.123pan.com/s/9sVqVv-flu0A.html'),
+        Uri.parse('https://www.123684.com/s/9sVqVv-DEZ0A'),
         mode: LaunchMode.externalApplication,
       ),
     );
@@ -349,7 +349,7 @@ class AboutController extends GetxController {
   // 官网
   webSiteUrl() {
     launchUrl(
-      Uri.parse('https://pilipalanet.mysxl.cn'),
+      Uri.parse('https://pilipala.life'),
       mode: LaunchMode.externalApplication,
     );
   }
diff --git a/lib/pages/bangumi/introduction/controller.dart b/lib/pages/bangumi/introduction/controller.dart
index 65cd5dd8..208a85e4 100644
--- a/lib/pages/bangumi/introduction/controller.dart
+++ b/lib/pages/bangumi/introduction/controller.dart
@@ -225,6 +225,8 @@ class BangumiIntroController extends GetxController {
     videoDetailCtr.oid.value = aid;
     videoDetailCtr.cover.value = cover;
     videoDetailCtr.queryVideoUrl();
+    videoDetailCtr.getSubtitle();
+    videoDetailCtr.setSubtitleContent();
     // 重新请求评论
     try {
       /// 未渲染回复组件时可能异常
diff --git a/lib/pages/bangumi/introduction/view.dart b/lib/pages/bangumi/introduction/view.dart
index 95d4d898..188debef 100644
--- a/lib/pages/bangumi/introduction/view.dart
+++ b/lib/pages/bangumi/introduction/view.dart
@@ -189,8 +189,8 @@ class _BangumiInfoState extends State<BangumiInfo> {
               Stack(
                 children: [
                   NetworkImgLayer(
-                    width: 105,
-                    height: 160,
+                    width: 115,
+                    height: 115 / 0.75,
                     src: widget.bangumiDetail!.cover!,
                   ),
                   PBadge(
@@ -208,7 +208,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
                 child: InkWell(
                   onTap: () => showIntroDetail(),
                   child: SizedBox(
-                    height: 158,
+                    height: 115 / 0.75,
                     child: Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       mainAxisSize: MainAxisSize.min,
@@ -255,13 +255,11 @@ class _BangumiInfoState extends State<BangumiInfo> {
                         Row(
                           children: [
                             StatView(
-                              theme: 'gray',
                               view: widget.bangumiDetail!.stat!['views'],
                               size: 'medium',
                             ),
                             const SizedBox(width: 6),
                             StatDanMu(
-                              theme: 'gray',
                               danmu: widget.bangumiDetail!.stat!['danmakus'],
                               size: 'medium',
                             ),
diff --git a/lib/pages/bangumi/introduction/widgets/intro_detail.dart b/lib/pages/bangumi/introduction/widgets/intro_detail.dart
index 07684a86..409474a9 100644
--- a/lib/pages/bangumi/introduction/widgets/intro_detail.dart
+++ b/lib/pages/bangumi/introduction/widgets/intro_detail.dart
@@ -60,13 +60,11 @@ class IntroDetail extends StatelessWidget {
                   Row(
                     children: [
                       StatView(
-                        theme: 'gray',
                         view: bangumiDetail!.stat!['views'],
                         size: 'medium',
                       ),
                       const SizedBox(width: 6),
                       StatDanMu(
-                        theme: 'gray',
                         danmu: bangumiDetail!.stat!['danmakus'],
                         size: 'medium',
                       ),
diff --git a/lib/pages/bangumi/view.dart b/lib/pages/bangumi/view.dart
index 3adfdc1f..9ec72350 100644
--- a/lib/pages/bangumi/view.dart
+++ b/lib/pages/bangumi/view.dart
@@ -96,7 +96,8 @@ class _BangumiPageState extends State<BangumiPage>
                       ),
                     ),
                     SizedBox(
-                      height: 268,
+                      height: Get.size.width / 3 / 0.75 +
+                          MediaQuery.textScalerOf(context).scale(50.0),
                       child: FutureBuilder(
                         future: _futureBuilderFutureFollow,
                         builder:
@@ -117,7 +118,6 @@ class _BangumiPageState extends State<BangumiPage>
                                         itemBuilder: (context, index) {
                                           return Container(
                                             width: Get.size.width / 3,
-                                            height: 254,
                                             margin: EdgeInsets.only(
                                                 left: StyleString.safeSpace,
                                                 right: index ==
@@ -208,8 +208,8 @@ class _BangumiPageState extends State<BangumiPage>
         crossAxisSpacing: StyleString.cardSpace,
         // 列数
         crossAxisCount: 3,
-        mainAxisExtent: Get.size.width / 3 / 0.65 +
-            MediaQuery.textScalerOf(context).scale(32.0),
+        mainAxisExtent: Get.size.width / 3 / 0.75 +
+            MediaQuery.textScalerOf(context).scale(42.0),
       ),
       delegate: SliverChildBuilderDelegate(
         (BuildContext context, int index) {
diff --git a/lib/pages/bangumi/widgets/bangumi_panel.dart b/lib/pages/bangumi/widgets/bangumi_panel.dart
index 3df7ce25..3a589db6 100644
--- a/lib/pages/bangumi/widgets/bangumi_panel.dart
+++ b/lib/pages/bangumi/widgets/bangumi_panel.dart
@@ -86,9 +86,11 @@ class _BangumiPanelState extends State<BangumiPanel> {
       item.aid,
       item.cover,
     );
-    if (_bottomSheetController != null) {
-      _bottomSheetController?.close();
-    }
+    try {
+      if (_bottomSheetController != null) {
+        _bottomSheetController?.close();
+      }
+    } catch (_) {}
     currentIndex.value = i;
     scrollToIndex();
   }
diff --git a/lib/pages/bangumi/widgets/bangumu_card_v.dart b/lib/pages/bangumi/widgets/bangumu_card_v.dart
index a1d7a931..10d95a1c 100644
--- a/lib/pages/bangumi/widgets/bangumu_card_v.dart
+++ b/lib/pages/bangumi/widgets/bangumu_card_v.dart
@@ -37,7 +37,7 @@ class BangumiCardV extends StatelessWidget {
               StyleString.imgRadius,
             ),
             child: AspectRatio(
-              aspectRatio: 0.65,
+              aspectRatio: 0.75,
               child: LayoutBuilder(builder: (context, boxConstraints) {
                 final double maxWidth = boxConstraints.maxWidth;
                 final double maxHeight = boxConstraints.maxHeight;
diff --git a/lib/pages/blacklist/index.dart b/lib/pages/blacklist/index.dart
index 402790f5..fb7e0891 100644
--- a/lib/pages/blacklist/index.dart
+++ b/lib/pages/blacklist/index.dart
@@ -61,7 +61,7 @@ class _BlackListPageState extends State<BlackListPage> {
         centerTitle: false,
         title: Obx(
           () => Text(
-            '黑名单管理 - ${_blackListController.total.value}',
+            '黑名单管理 ${_blackListController.total.value == 0 ? '' : '- ${_blackListController.total.value}'}',
             style: Theme.of(context).textTheme.titleMedium,
           ),
         ),
@@ -76,8 +76,12 @@ class _BlackListPageState extends State<BlackListPage> {
               if (data['status']) {
                 List<BlackListItem> list = _blackListController.blackList;
                 return Obx(
-                  () => list.length == 1
-                      ? const SizedBox()
+                  () => list.isEmpty
+                      ? CustomScrollView(
+                          slivers: [
+                            HttpError(errMsg: '你没有拉黑任何人哦～_～', fn: () => {})
+                          ],
+                        )
                       : ListView.builder(
                           controller: scrollController,
                           itemCount: list.length,
diff --git a/lib/pages/danmaku/controller.dart b/lib/pages/danmaku/controller.dart
index 11e097e1..ed259b96 100644
--- a/lib/pages/danmaku/controller.dart
+++ b/lib/pages/danmaku/controller.dart
@@ -2,8 +2,9 @@ import 'package:pilipala/http/danmaku.dart';
 import 'package:pilipala/models/danmaku/dm.pb.dart';
 
 class PlDanmakuController {
-  PlDanmakuController(this.cid);
+  PlDanmakuController(this.cid, this.type);
   final int cid;
+  final String type;
   Map<int, List<DanmakuElem>> dmSegMap = {};
   // 已请求的段落标记
   List<bool> requestedSeg = [];
@@ -17,7 +18,11 @@ class PlDanmakuController {
       int segCount = (videoDuration / segmentLength).ceil();
       requestedSeg = List<bool>.generate(segCount, (index) => false);
     }
-    queryDanmaku(calcSegment(progress));
+    try {
+      queryDanmaku(calcSegment(progress));
+    } catch (e) {
+      print(e);
+    }
   }
 
   void dispose() {
@@ -31,16 +36,18 @@ class PlDanmakuController {
 
   void queryDanmaku(int segmentIndex) async {
     assert(requestedSeg[segmentIndex] == false);
-    requestedSeg[segmentIndex] = true;
-    final DmSegMobileReply result = await DanmakaHttp.queryDanmaku(
-        cid: cid, segmentIndex: segmentIndex + 1);
-    if (result.elems.isNotEmpty) {
-      for (var element in result.elems) {
-        int pos = element.progress ~/ 100; //每0.1秒存储一次
-        if (dmSegMap[pos] == null) {
-          dmSegMap[pos] = [];
+    if (requestedSeg.length > segmentIndex) {
+      requestedSeg[segmentIndex] = true;
+      final DmSegMobileReply result = await DanmakaHttp.queryDanmaku(
+          cid: cid, segmentIndex: segmentIndex + 1);
+      if (result.elems.isNotEmpty) {
+        for (var element in result.elems) {
+          int pos = element.progress ~/ 100; //每0.1秒存储一次
+          if (dmSegMap[pos] == null) {
+            dmSegMap[pos] = [];
+          }
+          dmSegMap[pos]!.add(element);
         }
-        dmSegMap[pos]!.add(element);
       }
     }
   }
diff --git a/lib/pages/danmaku/view.dart b/lib/pages/danmaku/view.dart
index 109f0206..3cf1ed8a 100644
--- a/lib/pages/danmaku/view.dart
+++ b/lib/pages/danmaku/view.dart
@@ -12,11 +12,15 @@ import 'package:pilipala/utils/storage.dart';
 class PlDanmaku extends StatefulWidget {
   final int cid;
   final PlPlayerController playerController;
+  final String type;
+  final Function(DanmakuController)? createdController;
 
   const PlDanmaku({
     super.key,
     required this.cid,
     required this.playerController,
+    this.type = 'video',
+    this.createdController,
   });
 
   @override
@@ -43,9 +47,9 @@ class _PlDanmakuState extends State<PlDanmaku> {
     super.initState();
     enableShowDanmaku =
         setting.get(SettingBoxKey.enableShowDanmaku, defaultValue: false);
-    _plDanmakuController = PlDanmakuController(widget.cid);
-    if (mounted) {
-      playerController = widget.playerController;
+    _plDanmakuController = PlDanmakuController(widget.cid, widget.type);
+    playerController = widget.playerController;
+    if (mounted && widget.type == 'video') {
       if (enableShowDanmaku || playerController.isOpenDanmu.value) {
         _plDanmakuController.initiate(
             playerController.duration.value.inMilliseconds,
@@ -55,13 +59,15 @@ class _PlDanmakuState extends State<PlDanmaku> {
         ..addStatusLister(playerListener)
         ..addPositionListener(videoPositionListen);
     }
-    playerController.isOpenDanmu.listen((p0) {
-      if (p0 && !_plDanmakuController.initiated) {
-        _plDanmakuController.initiate(
-            playerController.duration.value.inMilliseconds,
-            playerController.position.value.inMilliseconds);
-      }
-    });
+    if (widget.type == 'video') {
+      playerController.isOpenDanmu.listen((p0) {
+        if (p0 && !_plDanmakuController.initiated) {
+          _plDanmakuController.initiate(
+              playerController.duration.value.inMilliseconds,
+              playerController.position.value.inMilliseconds);
+        }
+      });
+    }
     blockTypes = playerController.blockTypes;
     showArea = playerController.showArea;
     opacityVal = playerController.opacityVal;
@@ -128,6 +134,7 @@ class _PlDanmakuState extends State<PlDanmaku> {
           child: DanmakuView(
             createdController: (DanmakuController e) async {
               playerController.danmakuController = _controller = e;
+              widget.createdController?.call(e);
             },
             option: DanmakuOption(
               fontSize: 15 * fontSizeVal,
@@ -136,8 +143,7 @@ class _PlDanmakuState extends State<PlDanmaku> {
               hideTop: blockTypes.contains(5),
               hideScroll: blockTypes.contains(2),
               hideBottom: blockTypes.contains(4),
-              duration:
-                  danmakuDurationVal / playerController.playbackSpeed,
+              duration: danmakuDurationVal / playerController.playbackSpeed,
               strokeWidth: strokeWidth,
               // initDuration /
               //     (danmakuSpeedVal * widget.playerController.playbackSpeed),
diff --git a/lib/pages/dynamics/controller.dart b/lib/pages/dynamics/controller.dart
index 9bed3685..df5b154e 100644
--- a/lib/pages/dynamics/controller.dart
+++ b/lib/pages/dynamics/controller.dart
@@ -6,9 +6,7 @@ import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/http/dynamics.dart';
 import 'package:pilipala/http/search.dart';
-import 'package:pilipala/models/bangumi/info.dart';
 import 'package:pilipala/models/common/dynamics_type.dart';
-import 'package:pilipala/models/common/search_type.dart';
 import 'package:pilipala/models/dynamics/result.dart';
 import 'package:pilipala/models/dynamics/up.dart';
 import 'package:pilipala/models/live/item.dart';
@@ -16,7 +14,6 @@ import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/id_utils.dart';
 import 'package:pilipala/utils/route_push.dart';
 import 'package:pilipala/utils/storage.dart';
-import 'package:pilipala/utils/utils.dart';
 
 class DynamicsController extends GetxController {
   int page = 1;
@@ -149,20 +146,26 @@ class DynamicsController extends GetxController {
       /// 专栏文章查看
       case 'DYNAMIC_TYPE_ARTICLE':
         String title = item.modules.moduleDynamic.major.opus.title;
-        String url = item.modules.moduleDynamic.major.opus.jumpUrl;
-        if (url.contains('opus') || url.contains('read')) {
+        String jumpUrl = item.modules.moduleDynamic.major.opus.jumpUrl;
+        String url =
+            jumpUrl.startsWith('//') ? jumpUrl.split('//').last : jumpUrl;
+        if (jumpUrl.contains('opus') || jumpUrl.contains('read')) {
           RegExp digitRegExp = RegExp(r'\d+');
-          Iterable<Match> matches = digitRegExp.allMatches(url);
+          Iterable<Match> matches = digitRegExp.allMatches(jumpUrl);
           String number = matches.first.group(0)!;
-          if (url.contains('read')) {
-            number = 'cv$number';
+          if (jumpUrl.contains('read')) {
+            Get.toNamed('/read', parameters: {
+              'title': title,
+              'id': number,
+              'articleType': url.split('/')[1]
+            });
+          } else {
+            Get.toNamed('/opus', parameters: {
+              'title': title,
+              'id': number,
+              'articleType': 'opus'
+            });
           }
-          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',
@@ -282,4 +285,11 @@ class DynamicsController extends GetxController {
     dynamicsList.value = <DynamicItemModel>[];
     queryFollowDynamic();
   }
+
+  // 点击up主
+  void onTapUp(data) {
+    mid.value = data.mid;
+    upInfo.value = data;
+    onSelectUp(data.mid);
+  }
 }
diff --git a/lib/pages/dynamics/detail/view.dart b/lib/pages/dynamics/detail/view.dart
index e83b5547..7e5f1562 100644
--- a/lib/pages/dynamics/detail/view.dart
+++ b/lib/pages/dynamics/detail/view.dart
@@ -32,7 +32,8 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
   late DynamicDetailController _dynamicDetailController;
   late AnimationController fabAnimationCtr;
   Future? _futureBuilderFuture;
-  late StreamController<bool> titleStreamC; // appBar title
+  late StreamController<bool> titleStreamC =
+      StreamController<bool>.broadcast(); // appBar title
   late ScrollController scrollController;
   bool _visibleTitle = false;
   String? action;
@@ -48,7 +49,6 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
     super.initState();
     // floor 1原创 2转发
     init();
-    titleStreamC = StreamController<bool>();
     if (action == 'comment') {
       _visibleTitle = true;
       titleStreamC.add(true);
@@ -106,7 +106,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
   }
 
   // 查看二级评论
-  void replyReply(replyItem) {
+  void replyReply(replyItem, currentReply, loadMore) {
     int oid = replyItem.oid;
     int rpid = replyItem.rpid!;
     Get.to(
@@ -125,6 +125,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
           source: 'dynamic',
           replyType: ReplyType.values[replyType],
           firstFloor: replyItem,
+          loadMore: loadMore,
         ),
       ),
     );
@@ -324,8 +325,10 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
                                       replyItem: replyList[index],
                                       showReplyRow: true,
                                       replyLevel: '1',
-                                      replyReply: (replyItem) =>
-                                          replyReply(replyItem),
+                                      replyReply:
+                                          (replyItem, currentReply, loadMore) =>
+                                              replyReply(replyItem,
+                                                  currentReply, loadMore),
                                       replyType: ReplyType.values[replyType],
                                       addReply: (replyItem) {
                                         replyList[index]
diff --git a/lib/pages/dynamics/up_dynamic/controller.dart b/lib/pages/dynamics/up_dynamic/controller.dart
new file mode 100644
index 00000000..a30a0148
--- /dev/null
+++ b/lib/pages/dynamics/up_dynamic/controller.dart
@@ -0,0 +1,46 @@
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/http/dynamics.dart';
+import 'package:pilipala/models/dynamics/result.dart';
+import 'package:pilipala/models/dynamics/up.dart';
+
+class UpDynamicsController extends GetxController {
+  UpDynamicsController(this.upInfo);
+  UpItem upInfo;
+  RxList<DynamicItemModel> dynamicsList = <DynamicItemModel>[].obs;
+  RxBool isLoadingDynamic = false.obs;
+  String? offset = '';
+  int page = 1;
+
+  Future queryFollowDynamic({type = 'init'}) async {
+    if (type == 'init') {
+      dynamicsList.clear();
+    }
+    // 下拉刷新数据渲染时会触发onLoad
+    if (type == 'onLoad' && page == 1) {
+      return;
+    }
+    isLoadingDynamic.value = true;
+    var res = await DynamicsHttp.followDynamic(
+      page: type == 'init' ? 1 : page,
+      type: 'all',
+      offset: offset,
+      mid: upInfo.mid,
+    );
+    isLoadingDynamic.value = false;
+    if (res['status']) {
+      if (type == 'onLoad' && res['data'].items.isEmpty) {
+        SmartDialog.showToast('没有更多了');
+        return;
+      }
+      if (type == 'init') {
+        dynamicsList.value = res['data'].items;
+      } else {
+        dynamicsList.addAll(res['data'].items);
+      }
+      offset = res['data'].offset;
+      page++;
+    }
+    return res;
+  }
+}
diff --git a/lib/pages/dynamics/up_dynamic/index.dart b/lib/pages/dynamics/up_dynamic/index.dart
new file mode 100644
index 00000000..2de4c7e4
--- /dev/null
+++ b/lib/pages/dynamics/up_dynamic/index.dart
@@ -0,0 +1,4 @@
+library up_dynamics;
+
+export './controller.dart';
+export './view.dart';
diff --git a/lib/pages/dynamics/up_dynamic/route_panel.dart b/lib/pages/dynamics/up_dynamic/route_panel.dart
new file mode 100644
index 00000000..40c725a8
--- /dev/null
+++ b/lib/pages/dynamics/up_dynamic/route_panel.dart
@@ -0,0 +1,151 @@
+import 'package:easy_debounce/easy_throttle.dart';
+import 'package:get/get.dart';
+import 'package:flutter/material.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/models/dynamics/up.dart';
+import 'package:pilipala/utils/feed_back.dart';
+import '../controller.dart';
+import 'index.dart';
+
+class OverlayPanel extends StatefulWidget {
+  const OverlayPanel({super.key, required this.ctr, required this.upInfo});
+
+  final DynamicsController ctr;
+  final UpItem upInfo;
+
+  @override
+  State<OverlayPanel> createState() => _OverlayPanelState();
+}
+
+class _OverlayPanelState extends State<OverlayPanel>
+    with SingleTickerProviderStateMixin {
+  static const itemPadding = EdgeInsets.symmetric(horizontal: 6, vertical: 0);
+  final PageController pageController = PageController();
+  late double contentWidth = 50;
+  late List<UpItem> upList;
+  late RxInt currentMid = (-1).obs;
+  TabController? _tabController;
+
+  @override
+  void initState() {
+    super.initState();
+    upList = widget.ctr.upData.value.upList!
+        .map<UpItem>((element) => element)
+        .toList();
+    upList.removeAt(0);
+    _tabController = TabController(length: upList.length, vsync: this);
+
+    currentMid.value = widget.upInfo.mid!;
+
+    pageController.addListener(() {
+      int index = pageController.page!.round();
+      int mid = upList[index].mid!;
+      if (mid != currentMid.value) {
+        currentMid.value = mid;
+        _tabController?.animateTo(index,
+            duration: Duration.zero, curve: Curves.linear);
+        onClickUp(upList[index], index, type: 'pageChange');
+      }
+    });
+
+    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+      int index =
+          upList.indexWhere((element) => element.mid == widget.upInfo.mid);
+      pageController.jumpToPage(index);
+      onClickUp(widget.upInfo, index);
+      _tabController?.animateTo(index,
+          duration: Duration.zero, curve: Curves.linear);
+      onClickUp(upList[index], index, type: 'pageChange');
+    });
+  }
+
+  void onClickUp(data, i, {type = 'click'}) {
+    if (type == 'click') {
+      pageController.jumpToPage(i);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: Get.width,
+      height: Get.height,
+      clipBehavior: Clip.antiAlias,
+      margin: EdgeInsets.fromLTRB(
+        0,
+        MediaQuery.of(context).padding.top + 4,
+        0,
+        MediaQuery.of(context).padding.bottom + 4,
+      ),
+      decoration: BoxDecoration(
+        color: Colors.transparent,
+        borderRadius: BorderRadius.circular(20),
+      ),
+      child: Column(
+        children: [
+          SizedBox(
+            height: 50,
+            child: TabBar(
+              controller: _tabController,
+              dividerColor: Colors.transparent,
+              automaticIndicatorColorAdjustment: false,
+              tabAlignment: TabAlignment.start,
+              padding: const EdgeInsets.only(left: 12, right: 12),
+              indicatorPadding: EdgeInsets.zero,
+              indicatorSize: TabBarIndicatorSize.label,
+              indicator: const BoxDecoration(),
+              labelPadding: itemPadding,
+              indicatorWeight: 1,
+              isScrollable: true,
+              tabs: upList.map((e) => Tab(child: upItemBuild(e))).toList(),
+              onTap: (index) {
+                feedBack();
+                EasyThrottle.throttle(
+                    'follow', const Duration(milliseconds: 200), () {
+                  onClickUp(upList[index], index);
+                });
+              },
+            ),
+          ),
+          Expanded(
+            child: PageView.builder(
+              itemCount: upList.length,
+              controller: pageController,
+              itemBuilder: (BuildContext context, int index) {
+                return Container(
+                  clipBehavior: Clip.antiAlias,
+                  margin: const EdgeInsets.fromLTRB(10, 12, 10, 0),
+                  decoration: BoxDecoration(
+                    color: Theme.of(context).colorScheme.surface,
+                    borderRadius: BorderRadius.circular(20),
+                  ),
+                  child: UpDyanmicsPage(upInfo: upList[index], ctr: widget.ctr),
+                );
+              },
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget upItemBuild(data) {
+    return Obx(
+      () => AnimatedOpacity(
+        opacity: currentMid == data.mid ? 1 : 0.3,
+        duration: const Duration(milliseconds: 200),
+        curve: Curves.easeInOut,
+        child: AnimatedScale(
+          duration: const Duration(milliseconds: 200),
+          scale: currentMid == data.mid ? 1 : 0.9,
+          child: NetworkImgLayer(
+            width: contentWidth,
+            height: contentWidth,
+            src: data.face,
+            type: 'avatar',
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/dynamics/up_dynamic/view.dart b/lib/pages/dynamics/up_dynamic/view.dart
new file mode 100644
index 00000000..4b3fb0c7
--- /dev/null
+++ b/lib/pages/dynamics/up_dynamic/view.dart
@@ -0,0 +1,178 @@
+import 'package:easy_debounce/easy_throttle.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/skeleton/dynamic_card.dart';
+import 'package:pilipala/common/widgets/http_error.dart';
+import 'package:pilipala/common/widgets/no_data.dart';
+import 'package:pilipala/models/dynamics/result.dart';
+import 'package:pilipala/models/dynamics/up.dart';
+import 'package:pilipala/pages/dynamics/up_dynamic/index.dart';
+
+import '../index.dart';
+import '../widgets/dynamic_panel.dart';
+
+class UpDyanmicsPage extends StatefulWidget {
+  final UpItem upInfo;
+  final DynamicsController ctr;
+
+  const UpDyanmicsPage({
+    required this.upInfo,
+    required this.ctr,
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  State<UpDyanmicsPage> createState() => _UpDyanmicsPageState();
+}
+
+class _UpDyanmicsPageState extends State<UpDyanmicsPage>
+    with AutomaticKeepAliveClientMixin {
+  late UpDynamicsController _upDynamicsController;
+  final ScrollController scrollController = ScrollController();
+  late Future _futureBuilderFuture;
+
+  @override
+  bool get wantKeepAlive => true;
+
+  @override
+  void initState() {
+    super.initState();
+    _upDynamicsController = Get.put(UpDynamicsController(widget.upInfo),
+        tag: widget.upInfo.mid.toString());
+    _futureBuilderFuture = _upDynamicsController.queryFollowDynamic();
+
+    scrollController.addListener(
+      () async {
+        if (scrollController.position.pixels >=
+            scrollController.position.maxScrollExtent - 200) {
+          EasyThrottle.throttle(
+              'queryFollowDynamic', const Duration(seconds: 1), () {
+            _upDynamicsController.queryFollowDynamic(type: 'onLoad');
+          });
+        }
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    super.build(context);
+    return CustomScrollView(
+      controller: scrollController,
+      physics: const AlwaysScrollableScrollPhysics(),
+      slivers: [
+        SliverPersistentHeader(
+          pinned: true,
+          floating: true,
+          delegate: _MySliverPersistentHeaderDelegate(
+            child: Container(
+              height: 50,
+              padding: const EdgeInsets.fromLTRB(20, 4, 4, 4),
+              decoration: BoxDecoration(
+                color: Theme.of(context).colorScheme.surface,
+                border: Border(
+                  bottom: BorderSide(
+                    color: Theme.of(context).colorScheme.onSurface,
+                    width: 0.1,
+                  ),
+                ),
+              ),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  Text(
+                    widget.upInfo.uname!,
+                    style: Theme.of(context)
+                        .textTheme
+                        .titleMedium!
+                        .copyWith(fontWeight: FontWeight.bold),
+                  ),
+                  IconButton(
+                    onPressed: () => Navigator.of(context).pop(),
+                    icon: const Icon(Icons.close),
+                  )
+                ],
+              ),
+            ),
+          ),
+        ),
+        FutureBuilder(
+          future: _futureBuilderFuture,
+          builder: (context, snapshot) {
+            if (snapshot.connectionState == ConnectionState.done) {
+              if (snapshot.data == null) {
+                return const SliverToBoxAdapter(child: SizedBox());
+              }
+              Map? data = snapshot.data;
+              if (data != null && data['status']) {
+                List<DynamicItemModel> list =
+                    _upDynamicsController.dynamicsList;
+                return Obx(
+                  () {
+                    if (list.isEmpty) {
+                      if (_upDynamicsController.isLoadingDynamic.value) {
+                        return skeleton();
+                      } else {
+                        return const NoData();
+                      }
+                    } else {
+                      return SliverList(
+                        delegate: SliverChildBuilderDelegate(
+                          (context, index) {
+                            return DynamicPanel(item: list[index]);
+                          },
+                          childCount: list.length,
+                        ),
+                      );
+                    }
+                  },
+                );
+              } else {
+                return HttpError(
+                  errMsg: data?['msg'] ?? '请求异常',
+                  btnText: data?['code'] == -101 ? '去登录' : null,
+                  fn: () {},
+                );
+              }
+            } else {
+              // 骨架屏
+              return skeleton();
+            }
+          },
+        ),
+      ],
+    );
+  }
+
+  Widget skeleton() {
+    return SliverList(
+      delegate: SliverChildBuilderDelegate((context, index) {
+        return const DynamicCardSkeleton();
+      }, childCount: 5),
+    );
+  }
+}
+
+class _MySliverPersistentHeaderDelegate extends SliverPersistentHeaderDelegate {
+  _MySliverPersistentHeaderDelegate({required this.child});
+  final double _minExtent = 50;
+  final double _maxExtent = 50;
+  final Widget child;
+
+  @override
+  Widget build(
+      BuildContext context, double shrinkOffset, bool overlapsContent) {
+    return child;
+  }
+
+  @override
+  double get maxExtent => _maxExtent;
+
+  @override
+  double get minExtent => _minExtent;
+
+  @override
+  bool shouldRebuild(covariant _MySliverPersistentHeaderDelegate oldDelegate) {
+    return true;
+  }
+}
diff --git a/lib/pages/dynamics/view.dart b/lib/pages/dynamics/view.dart
index 1775798e..38411613 100644
--- a/lib/pages/dynamics/view.dart
+++ b/lib/pages/dynamics/view.dart
@@ -9,6 +9,7 @@ import 'package:pilipala/common/skeleton/dynamic_card.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/no_data.dart';
 import 'package:pilipala/models/dynamics/result.dart';
+import 'package:pilipala/plugin/pl_popup/index.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/main_stream.dart';
 import 'package:pilipala/utils/route_push.dart';
@@ -17,6 +18,7 @@ import 'package:pilipala/utils/storage.dart';
 import '../mine/controller.dart';
 import 'controller.dart';
 import 'widgets/dynamic_panel.dart';
+import 'up_dynamic/route_panel.dart';
 import 'widgets/up_panel.dart';
 
 class DynamicsPage extends StatefulWidget {
@@ -80,7 +82,6 @@ class _DynamicsPageState extends State<DynamicsPage>
       appBar: AppBar(
         elevation: 0,
         scrolledUnderElevation: 0,
-        titleSpacing: 0,
         title: SizedBox(
           height: 34,
           child: Stack(
@@ -202,7 +203,21 @@ class _DynamicsPageState extends State<DynamicsPage>
                   }
                   Map data = snapshot.data;
                   if (data['status']) {
-                    return Obx(() => UpPanel(_dynamicsController.upData.value));
+                    return Obx(
+                      () => UpPanel(
+                        upData: _dynamicsController.upData.value,
+                        onClickUpCb: (data) {
+                          // _dynamicsController.onTapUp(data);
+                          Navigator.push(
+                            context,
+                            PlPopupRoute(
+                              child: OverlayPanel(
+                                  ctr: _dynamicsController, upInfo: data),
+                            ),
+                          );
+                        },
+                      ),
+                    );
                   } else {
                     return const SliverToBoxAdapter(
                       child: SizedBox(height: 80),
diff --git a/lib/pages/dynamics/widgets/content_panel.dart b/lib/pages/dynamics/widgets/content_panel.dart
index e1beaeb2..c1a6185e 100644
--- a/lib/pages/dynamics/widgets/content_panel.dart
+++ b/lib/pages/dynamics/widgets/content_panel.dart
@@ -4,8 +4,7 @@ import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/badge.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 'package:pilipala/plugin/pl_gallery/index.dart';
 import 'rich_node_panel.dart';
 
 // ignore: must_be_immutable
@@ -59,17 +58,15 @@ class _ContentState extends State<Content> {
                   (pictureItem.height != null && pictureItem.width != null
                       ? pictureItem.height! / pictureItem.width!
                       : 1);
-              return GestureDetector(
-                onTap: () {
-                  showDialog(
-                    useSafeArea: false,
-                    context: context,
-                    builder: (context) {
-                      return ImagePreview(initialPage: 0, imgList: picList);
-                    },
-                  );
+              return Hero(
+                tag: pictureItem.url!,
+                placeholderBuilder:
+                    (BuildContext context, Size heroSize, Widget child) {
+                  return child;
                 },
-                child: Container(
+                child: GestureDetector(
+                  onTap: () => onPreviewImg(picList, 1, context),
+                  child: Container(
                     padding: const EdgeInsets.only(top: 4),
                     constraints: BoxConstraints(maxHeight: maxHeight),
                     width: box.maxWidth / 2,
@@ -91,7 +88,9 @@ class _ContentState extends State<Content> {
                               )
                             : const SizedBox(),
                       ],
-                    )),
+                    ),
+                  ),
+                ),
               );
             },
           ),
@@ -102,26 +101,23 @@ class _ContentState extends State<Content> {
       List<Widget> list = [];
       for (var i = 0; i < len; i++) {
         picList.add(pics[i].url!);
+      }
+      for (var i = 0; i < len; i++) {
         list.add(
           LayoutBuilder(
             builder: (context, BoxConstraints box) {
               double maxWidth = box.maxWidth.truncateToDouble();
-              return GestureDetector(
-                onTap: () {
-                  showDialog(
-                    useSafeArea: false,
-                    context: context,
-                    builder: (context) {
-                      return ImagePreview(initialPage: i, imgList: picList);
-                    },
-                  );
-                },
-                child: NetworkImgLayer(
-                  src: pics[i].url,
-                  width: maxWidth,
-                  height: maxWidth,
-                  origAspectRatio:
-                      pics[i].width!.toInt() / pics[i].height!.toInt(),
+              return Hero(
+                tag: picList[i],
+                child: GestureDetector(
+                  onTap: () => onPreviewImg(picList, i, context),
+                  child: NetworkImgLayer(
+                    src: pics[i].url,
+                    width: maxWidth,
+                    height: maxWidth,
+                    origAspectRatio:
+                        pics[i].width!.toInt() / pics[i].height!.toInt(),
+                  ),
                 ),
               );
             },
@@ -163,6 +159,18 @@ class _ContentState extends State<Content> {
     );
   }
 
+  void onPreviewImg(picList, initIndex, context) {
+    Navigator.of(context).push(
+      HeroDialogRoute<void>(
+        builder: (BuildContext context) => InteractiveviewerGallery(
+          sources: picList,
+          initIndex: initIndex,
+          onPageChanged: (int pageIndex) {},
+        ),
+      ),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     TextStyle authorStyle =
diff --git a/lib/pages/dynamics/widgets/pic_panel.dart b/lib/pages/dynamics/widgets/pic_panel.dart
index 4e94e6fd..bd3f91f6 100644
--- a/lib/pages/dynamics/widgets/pic_panel.dart
+++ b/lib/pages/dynamics/widgets/pic_panel.dart
@@ -3,7 +3,19 @@ import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/badge.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
-import 'package:pilipala/pages/preview/index.dart';
+import 'package:pilipala/plugin/pl_gallery/index.dart';
+
+void onPreviewImg(currentUrl, picList, initIndex, context) {
+  Navigator.of(context).push(
+    HeroDialogRoute<void>(
+      builder: (BuildContext context) => InteractiveviewerGallery(
+        sources: picList,
+        initIndex: initIndex,
+        onPageChanged: (int pageIndex) {},
+      ),
+    ),
+  );
+}
 
 Widget picWidget(item, context) {
   String type = item.modules.moduleDynamic.major.type;
@@ -21,25 +33,25 @@ Widget picWidget(item, context) {
   List<Widget> list = [];
   for (var i = 0; i < len; i++) {
     picList.add(pictures[i].src ?? pictures[i].url);
+  }
+  for (var i = 0; i < len; i++) {
     list.add(
       LayoutBuilder(
         builder: (context, BoxConstraints box) {
-          return GestureDetector(
-            onTap: () {
-              showDialog(
-                useSafeArea: false,
-                context: context,
-                builder: (context) {
-                  return ImagePreview(initialPage: i, imgList: picList);
-                },
-              );
+          return Hero(
+            tag: picList[i],
+            placeholderBuilder:
+                (BuildContext context, Size heroSize, Widget child) {
+              return child;
             },
-            child: NetworkImgLayer(
-              src: pictures[i].src ?? pictures[i].url,
-              width: box.maxWidth,
-              height: box.maxWidth,
+            child: GestureDetector(
+              onTap: () => onPreviewImg(picList[i], picList, i, context),
+              child: NetworkImgLayer(
+                src: pictures[i].src ?? pictures[i].url,
+                width: box.maxWidth,
+                height: box.maxWidth,
+              ),
             ),
-            // ),
           );
         },
       ),
diff --git a/lib/pages/dynamics/widgets/up_panel.dart b/lib/pages/dynamics/widgets/up_panel.dart
index f8c973a0..3a0edcf6 100644
--- a/lib/pages/dynamics/widgets/up_panel.dart
+++ b/lib/pages/dynamics/widgets/up_panel.dart
@@ -4,13 +4,18 @@ import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/models/dynamics/up.dart';
 import 'package:pilipala/models/live/item.dart';
-import 'package:pilipala/pages/dynamics/controller.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/utils.dart';
 
 class UpPanel extends StatefulWidget {
   final FollowUpModel upData;
-  const UpPanel(this.upData, {Key? key}) : super(key: key);
+  final Function? onClickUpCb;
+
+  const UpPanel({
+    super.key,
+    required this.upData,
+    this.onClickUpCb,
+  });
 
   @override
   State<UpPanel> createState() => _UpPanelState();
@@ -33,27 +38,25 @@ class _UpPanelState extends State<UpPanel> {
 
   void onClickUp(data, i) {
     currentMid = data.mid;
-    Get.find<DynamicsController>().mid.value = data.mid;
-    Get.find<DynamicsController>().upInfo.value = data;
-    Get.find<DynamicsController>().onSelectUp(data.mid);
-    int liveLen = liveList.length;
-    int upLen = upList.length;
-    double itemWidth = contentWidth + itemPadding.horizontal;
-    double screenWidth = MediaQuery.sizeOf(context).width;
-    double moveDistance = 0.0;
-    if (itemWidth * (upList.length + liveList.length) <= screenWidth) {
-    } else if ((upLen - i - 0.5) * itemWidth > screenWidth / 2) {
-      moveDistance = (i + liveLen + 0.5) * itemWidth + 46 - screenWidth / 2;
-    } else {
-      moveDistance = (upLen + liveLen) * itemWidth + 46 - screenWidth;
-    }
-    data.hasUpdate = false;
-    scrollController.animateTo(
-      moveDistance,
-      duration: const Duration(milliseconds: 200),
-      curve: Curves.linear,
-    );
-    setState(() {});
+    widget.onClickUpCb?.call(data);
+    // int liveLen = liveList.length;
+    // int upLen = upList.length;
+    // double itemWidth = contentWidth + itemPadding.horizontal;
+    // double screenWidth = MediaQuery.sizeOf(context).width;
+    // double moveDistance = 0.0;
+    // if (itemWidth * (upList.length + liveList.length) <= screenWidth) {
+    // } else if ((upLen - i - 0.5) * itemWidth > screenWidth / 2) {
+    //   moveDistance = (i + liveLen + 0.5) * itemWidth + 46 - screenWidth / 2;
+    // } else {
+    //   moveDistance = (upLen + liveLen) * itemWidth + 46 - screenWidth;
+    // }
+    // data.hasUpdate = false;
+    // scrollController.animateTo(
+    //   moveDistance,
+    //   duration: const Duration(milliseconds: 200),
+    //   curve: Curves.linear,
+    // );
+    // setState(() {});
   }
 
   @override
diff --git a/lib/pages/dynamics/widgets/video_panel.dart b/lib/pages/dynamics/widgets/video_panel.dart
index 828fb283..75f16a3b 100644
--- a/lib/pages/dynamics/widgets/video_panel.dart
+++ b/lib/pages/dynamics/widgets/video_panel.dart
@@ -86,7 +86,7 @@ Widget videoSeasonWidget(item, context, type, {floor = 1}) {
               height: width / StyleString.aspectRatio,
               src: content.cover,
             ),
-            if (content.badge != null && type == 'pgc')
+            if (content.badge != null && content.badge['text'] != null)
               PBadge(
                 text: content.badge['text'],
                 top: 8.0,
diff --git a/lib/pages/fan/controller.dart b/lib/pages/fan/controller.dart
index c1c2a427..6661d9fe 100644
--- a/lib/pages/fan/controller.dart
+++ b/lib/pages/fan/controller.dart
@@ -49,7 +49,6 @@ class FansController extends GetxController {
       } else if (type == 'onLoad') {
         fansList.addAll(res['data'].list);
       }
-      print(total);
       if ((pn == 1 && total < ps) || res['data'].list.isEmpty) {
         loadingText.value = '没有更多了';
       }
diff --git a/lib/pages/fan/view.dart b/lib/pages/fan/view.dart
index 47372057..5d5c02a7 100644
--- a/lib/pages/fan/view.dart
+++ b/lib/pages/fan/view.dart
@@ -103,9 +103,17 @@ class _FansPageState extends State<FansPage> {
                         ),
                 );
               } else {
-                return HttpError(
-                  errMsg: data['msg'],
-                  fn: () => _fansController.queryFans('init'),
+                return CustomScrollView(
+                  physics: const NeverScrollableScrollPhysics(),
+                  slivers: [
+                    HttpError(
+                      errMsg: data['msg'],
+                      fn: () {
+                        _futureBuilderFuture =
+                            _fansController.queryFans('init');
+                      },
+                    )
+                  ],
                 );
               }
             } else {
diff --git a/lib/pages/fav/controller.dart b/lib/pages/fav/controller.dart
index 8fcbf971..5be46bf0 100644
--- a/lib/pages/fav/controller.dart
+++ b/lib/pages/fav/controller.dart
@@ -16,10 +16,16 @@ class FavController extends GetxController {
   int currentPage = 1;
   int pageSize = 60;
   RxBool hasMore = true.obs;
+  late int mid;
+  late int ownerMid;
+  RxBool isOwner = false.obs;
 
   @override
   void onInit() {
+    mid = int.parse(Get.parameters['mid'] ?? '-1');
     userInfo = userInfoCache.get('userInfoCache');
+    ownerMid = userInfo != null ? userInfo!.mid! : -1;
+    isOwner.value = mid == -1 || mid == ownerMid;
     super.onInit();
   }
 
@@ -33,7 +39,7 @@ class FavController extends GetxController {
     var res = await UserHttp.userfavFolder(
       pn: currentPage,
       ps: pageSize,
-      mid: userInfo!.mid!,
+      mid: isOwner.value ? ownerMid : mid,
     );
     if (res['status']) {
       if (type == 'init') {
diff --git a/lib/pages/fav/view.dart b/lib/pages/fav/view.dart
index 4f48213e..317ba4d5 100644
--- a/lib/pages/fav/view.dart
+++ b/lib/pages/fav/view.dart
@@ -42,67 +42,105 @@ class _FavPageState extends State<FavPage> {
       appBar: AppBar(
         centerTitle: false,
         titleSpacing: 0,
-        title: Text(
-          '我的收藏',
-          style: Theme.of(context).textTheme.titleMedium,
-        ),
+        title: Obx(() => Text(
+              '${_favController.isOwner.value ? '我' : 'Ta'}的收藏',
+              style: Theme.of(context).textTheme.titleMedium,
+            )),
         actions: [
+          Obx(() => !_favController.isOwner.value
+              ? IconButton(
+                  onPressed: () =>
+                      Get.toNamed('/subscription?mid=${_favController.mid}'),
+                  icon: const Icon(Icons.subscriptions_outlined, size: 21),
+                  tooltip: 'Ta的订阅',
+                )
+              : const SizedBox.shrink()),
+
+          // 新建收藏夹
+          Obx(() => _favController.isOwner.value
+              ? IconButton(
+                  onPressed: () async {
+                    await Get.toNamed('/favEdit');
+                    _favController.hasMore.value = true;
+                    _favController.currentPage = 1;
+                    setState(() {
+                      _futureBuilderFuture = _favController.queryFavFolder();
+                    });
+                  },
+                  icon: const Icon(Icons.add_outlined),
+                  tooltip: '新建收藏夹',
+                )
+              : const SizedBox.shrink()),
           IconButton(
             onPressed: () => Get.toNamed(
                 '/favSearch?searchType=1&mediaId=${_favController.favFolderData.value.list!.first.id}'),
             icon: const Icon(Icons.search_outlined),
           ),
-          const SizedBox(width: 6),
+          const SizedBox(width: 14),
         ],
       ),
-      body: FutureBuilder(
-        future: _futureBuilderFuture,
-        builder: (context, snapshot) {
-          if (snapshot.connectionState == ConnectionState.done) {
-            Map? data = snapshot.data;
-            if (data != null && data['status']) {
-              return Obx(
-                () => ListView.builder(
-                  controller: scrollController,
-                  itemCount: _favController.favFolderList.length,
-                  itemBuilder: (context, index) {
-                    return FavItem(
-                        favFolderItem: _favController.favFolderList[index]);
-                  },
-                ),
-              );
-            } else {
-              return CustomScrollView(
-                physics: const NeverScrollableScrollPhysics(),
-                slivers: [
-                  HttpError(
-                    errMsg: data?['msg'] ?? '请求异常',
-                    btnText: data?['code'] == -101 ? '去登录' : null,
-                    fn: () {
-                      if (data?['code'] == -101) {
-                        RoutePush.loginRedirectPush();
-                      } else {
-                        setState(() {
-                          _futureBuilderFuture =
-                              _favController.queryFavFolder();
-                        });
-                      }
-                    },
-                  ),
-                ],
-              );
-            }
-          } else {
-            // 骨架屏
-            return ListView.builder(
-              itemBuilder: (context, index) {
-                return const VideoCardHSkeleton();
-              },
-              itemCount: 10,
-            );
-          }
+      body: RefreshIndicator(
+        onRefresh: () async {
+          _favController.hasMore.value = true;
+          _favController.currentPage = 1;
+          setState(() {
+            _futureBuilderFuture = _favController.queryFavFolder(type: 'init');
+          });
         },
+        child: _buildBody(),
       ),
     );
   }
+
+  Widget _buildBody() {
+    return FutureBuilder(
+      future: _futureBuilderFuture,
+      builder: (context, snapshot) {
+        if (snapshot.connectionState == ConnectionState.done) {
+          Map? data = snapshot.data;
+          if (data != null && data['status']) {
+            return Obx(
+              () => ListView.builder(
+                controller: scrollController,
+                itemCount: _favController.favFolderList.length,
+                itemBuilder: (context, index) {
+                  return FavItem(
+                    favFolderItem: _favController.favFolderList[index],
+                    isOwner: _favController.isOwner.value,
+                  );
+                },
+              ),
+            );
+          } else {
+            return CustomScrollView(
+              physics: const NeverScrollableScrollPhysics(),
+              slivers: [
+                HttpError(
+                  errMsg: data?['msg'] ?? '请求异常',
+                  btnText: data?['code'] == -101 ? '去登录' : null,
+                  fn: () {
+                    if (data?['code'] == -101) {
+                      RoutePush.loginRedirectPush();
+                    } else {
+                      setState(() {
+                        _futureBuilderFuture = _favController.queryFavFolder();
+                      });
+                    }
+                  },
+                ),
+              ],
+            );
+          }
+        } else {
+          // 骨架屏
+          return ListView.builder(
+            itemBuilder: (context, index) {
+              return const VideoCardHSkeleton();
+            },
+            itemCount: 10,
+          );
+        }
+      },
+    );
+  }
 }
diff --git a/lib/pages/fav/widgets/item.dart b/lib/pages/fav/widgets/item.dart
index 3c44ec9d..25b92a5c 100644
--- a/lib/pages/fav/widgets/item.dart
+++ b/lib/pages/fav/widgets/item.dart
@@ -7,7 +7,9 @@ import 'package:pilipala/utils/utils.dart';
 class FavItem extends StatelessWidget {
   // ignore: prefer_typing_uninitialized_variables
   final favFolderItem;
-  const FavItem({super.key, required this.favFolderItem});
+  final bool isOwner;
+  const FavItem(
+      {super.key, required this.favFolderItem, required this.isOwner});
 
   @override
   Widget build(BuildContext context) {
@@ -20,6 +22,7 @@ class FavItem extends StatelessWidget {
           parameters: {
             'heroTag': heroTag,
             'mediaId': favFolderItem.id.toString(),
+            'isOwner': isOwner ? '1' : '0',
           },
         );
       },
@@ -71,7 +74,7 @@ class VideoContent extends StatelessWidget {
   Widget build(BuildContext context) {
     return Expanded(
       child: Padding(
-        padding: const EdgeInsets.fromLTRB(10, 2, 6, 0),
+        padding: const EdgeInsets.fromLTRB(10, 2, 6, 10),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
@@ -91,6 +94,15 @@ class VideoContent extends StatelessWidget {
                 color: Theme.of(context).colorScheme.outline,
               ),
             ),
+            const Spacer(),
+            Text(
+              [23, 1].contains(favFolderItem.attr) ? '私密' : '公开',
+              textAlign: TextAlign.start,
+              style: TextStyle(
+                fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
+                color: Theme.of(context).colorScheme.outline,
+              ),
+            ),
           ],
         ),
       ),
diff --git a/lib/pages/fav_detail/controller.dart b/lib/pages/fav_detail/controller.dart
index 7af398e8..ba722481 100644
--- a/lib/pages/fav_detail/controller.dart
+++ b/lib/pages/fav_detail/controller.dart
@@ -6,26 +6,30 @@ import 'package:pilipala/http/video.dart';
 import 'package:pilipala/models/user/fav_detail.dart';
 import 'package:pilipala/models/user/fav_folder.dart';
 import 'package:pilipala/pages/fav/index.dart';
+import 'package:pilipala/utils/utils.dart';
 
 class FavDetailController extends GetxController {
   FavFolderItemData? item;
-  Rx<FavDetailData> favDetailData = FavDetailData().obs;
+  RxString title = ''.obs;
 
   int? mediaId;
   late String heroTag;
   int currentPage = 1;
   bool isLoadingMore = false;
   RxMap favInfo = {}.obs;
-  RxList favList = [].obs;
+  RxList<FavDetailItemData> favList = <FavDetailItemData>[].obs;
   RxString loadingText = '加载中...'.obs;
   RxInt mediaCount = 0.obs;
+  late String isOwner;
 
   @override
   void onInit() {
     item = Get.arguments;
+    title.value = item!.title!;
     if (Get.parameters.keys.isNotEmpty) {
       mediaId = int.parse(Get.parameters['mediaId']!);
       heroTag = Get.parameters['heroTag']!;
+      isOwner = Get.parameters['isOwner']!;
     }
     super.onInit();
   }
@@ -113,4 +117,37 @@ class FavDetailController extends GetxController {
       },
     );
   }
+
+  onEditFavFolder() async {
+    var res = await Get.toNamed(
+      '/favEdit',
+      arguments: {
+        'mediaId': mediaId.toString(),
+        'title': item!.title,
+        'intro': item!.intro,
+        'cover': item!.cover,
+        'privacy': [23, 1].contains(item!.attr) ? 1 : 0,
+      },
+    );
+    title.value = res['title'];
+    print(title);
+  }
+
+  Future toViewPlayAll() async {
+    final FavDetailItemData firstItem = favList.first;
+    final String heroTag = Utils.makeHeroTag(firstItem.bvid);
+    Get.toNamed(
+      '/video?bvid=${firstItem.bvid}&cid=${firstItem.cid}',
+      arguments: {
+        'videoItem': firstItem,
+        'heroTag': heroTag,
+        'sourceType': 'fav',
+        'mediaId': favInfo['id'],
+        'oid': firstItem.id,
+        'favTitle': favInfo['title'],
+        'favInfo': favInfo,
+        'count': favInfo['media_count'],
+      },
+    );
+  }
 }
diff --git a/lib/pages/fav_detail/view.dart b/lib/pages/fav_detail/view.dart
index 1bf5cb6f..d4c10d31 100644
--- a/lib/pages/fav_detail/view.dart
+++ b/lib/pages/fav_detail/view.dart
@@ -22,7 +22,8 @@ class _FavDetailPageState extends State<FavDetailPage> {
   late final ScrollController _controller = ScrollController();
   final FavDetailController _favDetailController =
       Get.put(FavDetailController());
-  late StreamController<bool> titleStreamC; // a
+  late StreamController<bool> titleStreamC =
+      StreamController<bool>.broadcast(); // a
   Future? _futureBuilderFuture;
   late String mediaId;
 
@@ -31,7 +32,6 @@ class _FavDetailPageState extends State<FavDetailPage> {
     super.initState();
     mediaId = Get.parameters['mediaId']!;
     _futureBuilderFuture = _favDetailController.queryUserFavFolderDetail();
-    titleStreamC = StreamController<bool>();
     _controller.addListener(
       () {
         if (_controller.offset > 160) {
@@ -80,9 +80,11 @@ class _FavDetailPageState extends State<FavDetailPage> {
                       Column(
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
-                          Text(
-                            _favDetailController.item!.title!,
-                            style: Theme.of(context).textTheme.titleMedium,
+                          Obx(
+                            () => Text(
+                              _favDetailController.title.value,
+                              style: Theme.of(context).textTheme.titleMedium,
+                            ),
                           ),
                           Text(
                             '共${_favDetailController.mediaCount}条视频',
@@ -106,6 +108,11 @@ class _FavDetailPageState extends State<FavDetailPage> {
                 position: PopupMenuPosition.under,
                 onSelected: (String type) {},
                 itemBuilder: (BuildContext context) => <PopupMenuEntry<String>>[
+                  PopupMenuItem<String>(
+                    onTap: () => _favDetailController.onEditFavFolder(),
+                    value: 'edit',
+                    child: const Text('编辑收藏夹'),
+                  ),
                   PopupMenuItem<String>(
                     onTap: () => _favDetailController.onDelFavFolder(),
                     value: 'pause',
@@ -151,14 +158,16 @@ class _FavDetailPageState extends State<FavDetailPage> {
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
                             const SizedBox(height: 4),
-                            Text(
-                              _favDetailController.item!.title!,
-                              style: TextStyle(
-                                  fontSize: Theme.of(context)
-                                      .textTheme
-                                      .titleMedium!
-                                      .fontSize,
-                                  fontWeight: FontWeight.bold),
+                            Obx(
+                              () => Text(
+                                _favDetailController.title.value,
+                                style: TextStyle(
+                                    fontSize: Theme.of(context)
+                                        .textTheme
+                                        .titleMedium!
+                                        .fontSize,
+                                    fontWeight: FontWeight.bold),
+                              ),
                             ),
                             const SizedBox(height: 4),
                             Text(
@@ -212,6 +221,7 @@ class _FavDetailPageState extends State<FavDetailPage> {
                                   SliverChildBuilderDelegate((context, index) {
                                 return FavVideoCardH(
                                   videoItem: favList[index],
+                                  isOwner: _favDetailController.isOwner,
                                   callFn: () => _favDetailController
                                       .onCancelFav(favList[index].id),
                                 );
@@ -254,6 +264,15 @@ class _FavDetailPageState extends State<FavDetailPage> {
           )
         ],
       ),
+      floatingActionButton: Obx(
+        () => _favDetailController.mediaCount > 0
+            ? FloatingActionButton.extended(
+                onPressed: _favDetailController.toViewPlayAll,
+                label: const Text('播放全部'),
+                icon: const Icon(Icons.playlist_play),
+              )
+            : const SizedBox(),
+      ),
     );
   }
 }
diff --git a/lib/pages/fav_detail/widget/fav_video_card.dart b/lib/pages/fav_detail/widget/fav_video_card.dart
index 79e5c073..ecb4dd4a 100644
--- a/lib/pages/fav_detail/widget/fav_video_card.dart
+++ b/lib/pages/fav_detail/widget/fav_video_card.dart
@@ -18,12 +18,14 @@ class FavVideoCardH extends StatelessWidget {
   final dynamic videoItem;
   final Function? callFn;
   final int? searchType;
+  final String isOwner;
 
   const FavVideoCardH({
     Key? key,
     required this.videoItem,
     this.callFn,
     this.searchType,
+    required this.isOwner,
   }) : super(key: key);
 
   @override
@@ -123,6 +125,7 @@ class FavVideoCardH extends StatelessWidget {
                         videoItem: videoItem,
                         callFn: callFn,
                         searchType: searchType,
+                        isOwner: isOwner,
                       )
                     ],
                   ),
@@ -140,11 +143,13 @@ class VideoContent extends StatelessWidget {
   final dynamic videoItem;
   final Function? callFn;
   final int? searchType;
+  final String isOwner;
   const VideoContent({
     super.key,
     required this.videoItem,
     this.callFn,
     this.searchType,
+    required this.isOwner,
   });
 
   @override
@@ -198,20 +203,16 @@ class VideoContent extends StatelessWidget {
                   padding: const EdgeInsets.only(top: 2),
                   child: Row(
                     children: [
-                      StatView(
-                        theme: 'gray',
-                        view: videoItem.cntInfo['play'],
-                      ),
+                      StatView(view: videoItem.cntInfo['play']),
                       const SizedBox(width: 8),
-                      StatDanMu(
-                          theme: 'gray', danmu: videoItem.cntInfo['danmaku']),
+                      StatDanMu(danmu: videoItem.cntInfo['danmaku']),
                       const Spacer(),
                     ],
                   ),
                 ),
               ],
             ),
-            searchType != 1
+            searchType != 1 && isOwner == '1'
                 ? Positioned(
                     right: 0,
                     bottom: -4,
diff --git a/lib/pages/fav_edit/controller.dart b/lib/pages/fav_edit/controller.dart
new file mode 100644
index 00000000..bf310389
--- /dev/null
+++ b/lib/pages/fav_edit/controller.dart
@@ -0,0 +1,77 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/http/fav.dart';
+
+class FavEditController extends GetxController {
+  final GlobalKey formKey = GlobalKey<FormState>();
+  final TextEditingController titleController = TextEditingController();
+  final TextEditingController contentController = TextEditingController();
+
+  final FocusNode titleTextFieldNode = FocusNode();
+  final FocusNode contentTextFieldNode = FocusNode();
+
+  // 默认新建
+  RxString type = 'add'.obs;
+
+  String? mediaId;
+  String cover = ''; // 封面
+  String title = ''; // 名称
+  String intro = ''; // 简介
+  RxInt privacy = 0.obs; // 是否公开 0公开 1私密
+
+  @override
+  void onInit() {
+    super.onInit();
+    var args = Get.arguments;
+    if (args != null) {
+      type.value = 'edit';
+      mediaId = args['mediaId'];
+      title = args['title'];
+      intro = args['intro'];
+      cover = args['cover'];
+      privacy.value = args['privacy'];
+      titleController.text = title;
+      contentController.text = intro;
+    }
+  }
+
+  void onSubmit() async {
+    // 表单验证
+    if ((formKey.currentState as FormState).validate()) {
+      if (type.value == 'edit') {
+        await editFolder();
+      } else {
+        await addFolder();
+      }
+    }
+  }
+
+  Future<void> editFolder() async {
+    var res = await FavHttp.editFolder(
+      title: title,
+      intro: intro,
+      mediaId: mediaId!,
+      cover: cover,
+    );
+    if (res['status']) {
+      SmartDialog.showToast('编辑成功');
+      Get.back(result: {'title': title});
+    } else {
+      SmartDialog.showToast(res['msg']);
+    }
+  }
+
+  Future<void> addFolder() async {
+    var res = await FavHttp.addFolder(
+      title: title,
+      intro: intro,
+    );
+    if (res['status']) {
+      SmartDialog.showToast('新建成功');
+      Get.back();
+    } else {
+      SmartDialog.showToast(res['msg']);
+    }
+  }
+}
diff --git a/lib/pages/preview/index.dart b/lib/pages/fav_edit/index.dart
similarity index 73%
rename from lib/pages/preview/index.dart
rename to lib/pages/fav_edit/index.dart
index 9fb82e8d..872df8d4 100644
--- a/lib/pages/preview/index.dart
+++ b/lib/pages/fav_edit/index.dart
@@ -1,4 +1,4 @@
-library preview;
+library fav_edit;
 
 export './controller.dart';
 export './view.dart';
diff --git a/lib/pages/fav_edit/view.dart b/lib/pages/fav_edit/view.dart
new file mode 100644
index 00000000..3ef7cda3
--- /dev/null
+++ b/lib/pages/fav_edit/view.dart
@@ -0,0 +1,111 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+
+import 'controller.dart';
+
+class FavEditPage extends StatefulWidget {
+  const FavEditPage({super.key});
+
+  @override
+  State<FavEditPage> createState() => _FavEditPageState();
+}
+
+class _FavEditPageState extends State<FavEditPage> {
+  final FavEditController _favEditController = Get.put(FavEditController());
+  String title = '';
+  String content = '';
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        elevation: 0,
+        scrolledUnderElevation: 0,
+        title: Obx(
+          () => _favEditController.type.value == 'add'
+              ? Text(
+                  '新建收藏夹',
+                  style: Theme.of(context).textTheme.titleMedium,
+                )
+              : Text(
+                  '编辑收藏夹',
+                  style: Theme.of(context).textTheme.titleMedium,
+                ),
+        ),
+        centerTitle: false,
+        actions: [
+          Obx(
+            () => _favEditController.privacy.value == 0
+                ? IconButton(
+                    onPressed: () {
+                      _favEditController.privacy.value = 1;
+                    },
+                    icon: const Icon(Icons.lock_open_outlined))
+                : IconButton(
+                    onPressed: () {
+                      _favEditController.privacy.value = 0;
+                    },
+                    icon: Icon(
+                      Icons.lock_outlined,
+                      color: Theme.of(context).colorScheme.error,
+                    )),
+          ),
+          TextButton(
+              onPressed: _favEditController.onSubmit, child: const Text('保存')),
+          const SizedBox(width: 14),
+        ],
+      ),
+      body: Form(
+        key: _favEditController.formKey, //设置globalKey，用于后面获取FormState
+        autovalidateMode: AutovalidateMode.disabled,
+        child: Column(
+          children: [
+            Container(
+              padding: const EdgeInsets.fromLTRB(14, 10, 14, 5),
+              decoration: BoxDecoration(
+                border: Border(
+                  bottom: BorderSide(
+                    color: Theme.of(context).dividerColor.withOpacity(0.2),
+                  ),
+                ),
+              ),
+              child: TextFormField(
+                autofocus: true,
+                controller: _favEditController.titleController,
+                focusNode: _favEditController.titleTextFieldNode,
+                decoration: const InputDecoration(
+                  hintText: "收藏夹名称",
+                  enabledBorder: InputBorder.none,
+                  focusedBorder: InputBorder.none,
+                ),
+                // 校验标题
+                validator: (v) {
+                  return v!.trim().isNotEmpty ? null : "请输入收藏夹名称";
+                },
+                onChanged: (val) {
+                  _favEditController.title = val;
+                },
+              ),
+            ),
+            Expanded(
+              child: Container(
+                  padding:
+                      const EdgeInsets.symmetric(horizontal: 14, vertical: 5),
+                  child: TextFormField(
+                    controller: _favEditController.contentController,
+                    minLines: 1,
+                    maxLines: 5,
+                    decoration: const InputDecoration(
+                        hintText: '输入收藏夹简介', border: InputBorder.none),
+                    style: Theme.of(context).textTheme.bodyLarge,
+                    onChanged: (val) {
+                      _favEditController.intro = val;
+                    },
+                  )),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/fav_search/view.dart b/lib/pages/fav_search/view.dart
index 9b2ab15d..2654ccb1 100644
--- a/lib/pages/fav_search/view.dart
+++ b/lib/pages/fav_search/view.dart
@@ -100,6 +100,7 @@ class _FavSearchPageState extends State<FavSearchPage> {
                         return FavVideoCardH(
                           videoItem: _favSearchCtr.favList[index],
                           searchType: searchType,
+                          isOwner: '0',
                           callFn: () => searchType != 1
                               ? _favSearchCtr
                                   .onCancelFav(_favSearchCtr.favList[index].id!)
diff --git a/lib/pages/follow/widgets/follow_item.dart b/lib/pages/follow/widgets/follow_item.dart
index d21a89bc..6ee93a98 100644
--- a/lib/pages/follow/widgets/follow_item.dart
+++ b/lib/pages/follow/widgets/follow_item.dart
@@ -1,3 +1,4 @@
+import 'package:bottom_sheet/bottom_sheet.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
@@ -47,9 +48,24 @@ class FollowItem extends StatelessWidget {
               height: 34,
               child: TextButton(
                 onPressed: () async {
-                  await Get.bottomSheet(
-                    GroupPanel(mid: item.mid!),
-                    isScrollControlled: true,
+                  await showFlexibleBottomSheet(
+                    bottomSheetBorderRadius: const BorderRadius.only(
+                      topLeft: Radius.circular(16),
+                      topRight: Radius.circular(16),
+                    ),
+                    minHeight: 1,
+                    initHeight: 1,
+                    maxHeight: 1,
+                    context: Get.context!,
+                    builder: (BuildContext context,
+                        ScrollController scrollController, double offset) {
+                      return GroupPanel(
+                        mid: item.mid!,
+                        scrollController: scrollController,
+                      );
+                    },
+                    anchors: [1],
+                    isSafeArea: true,
                   );
                 },
                 style: TextButton.styleFrom(
diff --git a/lib/pages/follow_search/controller.dart b/lib/pages/follow_search/controller.dart
index 9fd1590d..7dc47a45 100644
--- a/lib/pages/follow_search/controller.dart
+++ b/lib/pages/follow_search/controller.dart
@@ -48,7 +48,7 @@ class FollowSearchController extends GetxController {
       return {'status': true, 'data': <FollowItemModel>[].obs};
     }
     if (type == 'init') {
-      ps = 1;
+      pn = 1;
     }
     var res = await MemberHttp.getfollowSearch(
       mid: mid,
diff --git a/lib/pages/history/widgets/item.dart b/lib/pages/history/widgets/item.dart
index baebfedb..50466a6b 100644
--- a/lib/pages/history/widgets/item.dart
+++ b/lib/pages/history/widgets/item.dart
@@ -43,14 +43,17 @@ class HistoryItem extends StatelessWidget {
         }
         if (videoItem.history.business.contains('article')) {
           int cid = videoItem.history.cid ??
-              // videoItem.history.oid ??
+              videoItem.history.oid ??
               await SearchHttp.ab2c(aid: aid, bvid: bvid);
+          if (cid == -1) {
+            return SmartDialog.showToast('无法获取文章内容');
+          }
           Get.toNamed(
-            '/webview',
+            '/read',
             parameters: {
-              'url': 'https://www.bilibili.com/read/cv$cid',
-              'type': 'note',
-              'pageTitle': videoItem.title
+              'title': videoItem.title,
+              'id': cid.toString(),
+              'articleType': 'read',
             },
           );
         } else if (videoItem.history.business == 'live') {
diff --git a/lib/pages/home/controller.dart b/lib/pages/home/controller.dart
index f197fdfa..ea6e72ba 100644
--- a/lib/pages/home/controller.dart
+++ b/lib/pages/home/controller.dart
@@ -8,7 +8,7 @@ import 'package:pilipala/utils/storage.dart';
 import '../../http/index.dart';
 
 class HomeController extends GetxController with GetTickerProviderStateMixin {
-  bool flag = false;
+  bool flag = true;
   late RxList tabs = [].obs;
   RxInt initialIndex = 1.obs;
   late TabController tabController;
diff --git a/lib/pages/home/view.dart b/lib/pages/home/view.dart
index a25389bd..187ed6c3 100644
--- a/lib/pages/home/view.dart
+++ b/lib/pages/home/view.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -46,104 +47,73 @@ class _HomePageState extends State<HomePage>
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    Brightness currentBrightness = MediaQuery.of(context).platformBrightness;
-    // 设置状态栏图标的亮度
-    if (_homeController.enableGradientBg) {
-      SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
-        statusBarIconBrightness: currentBrightness == Brightness.light
-            ? Brightness.dark
-            : Brightness.light,
-      ));
-    }
     return Scaffold(
       extendBody: true,
       extendBodyBehindAppBar: true,
-      appBar: _homeController.enableGradientBg
-          ? null
-          : AppBar(toolbarHeight: 0, elevation: 0),
-      body: Stack(
+      backgroundColor: Colors.transparent,
+      appBar: AppBar(
+        toolbarHeight: 0,
+        elevation: 0,
+        backgroundColor: Colors.transparent,
+        systemOverlayStyle: Platform.isAndroid
+            ? SystemUiOverlayStyle(
+                statusBarIconBrightness:
+                    Theme.of(context).brightness == Brightness.dark
+                        ? Brightness.light
+                        : Brightness.dark,
+              )
+            : Theme.of(context).brightness == Brightness.dark
+                ? SystemUiOverlayStyle.light
+                : SystemUiOverlayStyle.dark,
+      ),
+      body: Column(
         children: [
-          // gradient background
-          if (_homeController.enableGradientBg) ...[
-            Align(
-              alignment: Alignment.topLeft,
-              child: Opacity(
-                opacity: 0.6,
-                child: Container(
-                  width: MediaQuery.of(context).size.width,
-                  height: MediaQuery.of(context).size.height,
-                  decoration: BoxDecoration(
-                    gradient: LinearGradient(
-                        colors: [
-                          Theme.of(context)
-                              .colorScheme
-                              .primary
-                              .withOpacity(0.9),
-                          Theme.of(context)
-                              .colorScheme
-                              .primary
-                              .withOpacity(0.5),
-                          Theme.of(context).colorScheme.surface
-                        ],
-                        begin: Alignment.topLeft,
-                        end: Alignment.bottomRight,
-                        stops: const [0, 0.0034, 0.34]),
+          CustomAppBar(
+            stream: _homeController.hideSearchBar
+                ? stream
+                : StreamController<bool>.broadcast().stream,
+            ctr: _homeController,
+            callback: showUserBottomSheet,
+          ),
+          if (_homeController.tabs.length > 1) ...[
+            if (_homeController.enableGradientBg) ...[
+              const CustomTabs(),
+            ] else ...[
+              Container(
+                width: double.infinity,
+                height: 42,
+                padding: const EdgeInsets.only(top: 4),
+                child: Align(
+                  alignment: Alignment.center,
+                  child: TabBar(
+                    controller: _homeController.tabController,
+                    tabs: [
+                      for (var i in _homeController.tabs) Tab(text: i['label'])
+                    ],
+                    isScrollable: true,
+                    dividerColor: Colors.transparent,
+                    enableFeedback: true,
+                    splashBorderRadius: BorderRadius.circular(10),
+                    tabAlignment: TabAlignment.center,
+                    onTap: (value) {
+                      feedBack();
+                      if (_homeController.initialIndex.value == value) {
+                        _homeController.tabsCtrList[value]().animateToTop();
+                      }
+                      _homeController.initialIndex.value = value;
+                    },
                   ),
                 ),
               ),
-            ),
-          ],
-          Column(
-            children: [
-              CustomAppBar(
-                stream: _homeController.hideSearchBar
-                    ? stream
-                    : StreamController<bool>.broadcast().stream,
-                ctr: _homeController,
-                callback: showUserBottomSheet,
-              ),
-              if (_homeController.tabs.length > 1) ...[
-                if (_homeController.enableGradientBg) ...[
-                  const CustomTabs(),
-                ] else ...[
-                  const SizedBox(height: 4),
-                  SizedBox(
-                    width: double.infinity,
-                    height: 42,
-                    child: Align(
-                      alignment: Alignment.center,
-                      child: TabBar(
-                        controller: _homeController.tabController,
-                        tabs: [
-                          for (var i in _homeController.tabs)
-                            Tab(text: i['label'])
-                        ],
-                        isScrollable: true,
-                        dividerColor: Colors.transparent,
-                        enableFeedback: true,
-                        splashBorderRadius: BorderRadius.circular(10),
-                        tabAlignment: TabAlignment.center,
-                        onTap: (value) {
-                          feedBack();
-                          if (_homeController.initialIndex.value == value) {
-                            _homeController.tabsCtrList[value]().animateToTop();
-                          }
-                          _homeController.initialIndex.value = value;
-                        },
-                      ),
-                    ),
-                  ),
-                ],
-              ] else ...[
-                const SizedBox(height: 6),
-              ],
-              Expanded(
-                child: TabBarView(
-                  controller: _homeController.tabController,
-                  children: _homeController.tabsPageList,
-                ),
-              ),
             ],
+          ] else ...[
+            const SizedBox(height: 6),
+          ],
+          Expanded(
+            child: TabBarView(
+              controller: _homeController.tabController,
+              children: _homeController.tabsPageList,
+            ),
           ),
         ],
       ),
@@ -280,7 +250,10 @@ class DefaultUser extends StatelessWidget {
         style: ButtonStyle(
           padding: MaterialStateProperty.all(EdgeInsets.zero),
           backgroundColor: MaterialStateProperty.resolveWith((states) {
-            return Theme.of(context).colorScheme.onInverseSurface;
+            return Theme.of(context)
+                .colorScheme
+                .onSecondaryContainer
+                .withOpacity(0.05);
           }),
         ),
         onPressed: () => callback?.call(),
@@ -317,7 +290,7 @@ class _CustomTabsState extends State<CustomTabs> {
   Widget build(BuildContext context) {
     return Container(
       height: 44,
-      margin: const EdgeInsets.only(top: 4),
+      margin: const EdgeInsets.only(top: 8),
       child: Obx(
         () => ListView.separated(
           padding: const EdgeInsets.symmetric(horizontal: 14.0),
@@ -357,25 +330,29 @@ class CustomChip extends StatelessWidget {
   Widget build(BuildContext context) {
     final ColorScheme colorTheme = Theme.of(context).colorScheme;
     final Color secondaryContainer = colorTheme.secondaryContainer;
+    final Color onPrimary = colorTheme.onPrimary;
+    final Color primary = colorTheme.primary;
     final TextStyle chipTextStyle = selected
-        ? const TextStyle(fontWeight: FontWeight.bold, fontSize: 13)
-        : const TextStyle(fontSize: 13);
-    final ColorScheme colorScheme = Theme.of(context).colorScheme;
+        ? TextStyle(fontSize: 13, color: onPrimary)
+        : TextStyle(fontSize: 13, color: colorTheme.onSecondaryContainer);
     const VisualDensity visualDensity =
         VisualDensity(horizontal: -4.0, vertical: -2.0);
     return InputChip(
-      side: BorderSide(
-        color: selected
-            ? colorScheme.onSecondaryContainer.withOpacity(0.2)
-            : Colors.transparent,
-      ),
+      side: BorderSide.none,
       backgroundColor: secondaryContainer,
-      selectedColor: secondaryContainer,
-      color: MaterialStateProperty.resolveWith<Color>(
-          (Set<MaterialState> states) => secondaryContainer.withAlpha(200)),
-      padding: const EdgeInsets.fromLTRB(7, 1, 7, 1),
+      color: MaterialStateProperty.resolveWith((states) {
+        if (states.contains(MaterialState.selected) ||
+            states.contains(MaterialState.hovered)) {
+          return primary;
+        }
+        return colorTheme.secondaryContainer;
+      }),
+      padding: const EdgeInsets.fromLTRB(6, 1, 6, 1),
       label: Text(label, style: chipTextStyle),
       onPressed: () => onTap(),
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(6),
+      ),
       selected: selected,
       showCheckmark: false,
       visualDensity: visualDensity,
diff --git a/lib/pages/later/controller.dart b/lib/pages/later/controller.dart
index f7dfea9f..dd8f3c5a 100644
--- a/lib/pages/later/controller.dart
+++ b/lib/pages/later/controller.dart
@@ -6,6 +6,7 @@ import 'package:pilipala/http/user.dart';
 import 'package:pilipala/models/model_hot_video_item.dart';
 import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/utils/storage.dart';
+import 'package:pilipala/utils/utils.dart';
 
 class LaterController extends GetxController {
   final ScrollController scrollController = ScrollController();
@@ -48,7 +49,7 @@ class LaterController extends GetxController {
               aid != null ? '即将移除该视频，确定是否移除' : '即将删除所有已观看视频，此操作不可恢复。确定是否删除？'),
           actions: [
             TextButton(
-              onPressed: () => SmartDialog.dismiss(),
+              onPressed: SmartDialog.dismiss,
               child: Text(
                 '取消',
                 style: TextStyle(color: Theme.of(context).colorScheme.outline),
@@ -87,7 +88,7 @@ class LaterController extends GetxController {
           content: const Text('确定要清空你的稍后再看列表吗？'),
           actions: [
             TextButton(
-              onPressed: () => SmartDialog.dismiss(),
+              onPressed: SmartDialog.dismiss,
               child: Text(
                 '取消',
                 style: TextStyle(color: Theme.of(context).colorScheme.outline),
@@ -109,4 +110,19 @@ class LaterController extends GetxController {
       },
     );
   }
+
+  // 稍后再看播放全部
+  Future toViewPlayAll() async {
+    final HotVideoItemModel firstItem = laterList.first;
+    final String heroTag = Utils.makeHeroTag(firstItem.bvid);
+    Get.toNamed(
+      '/video?bvid=${firstItem.bvid}&cid=${firstItem.cid}',
+      arguments: {
+        'videoItem': firstItem,
+        'heroTag': heroTag,
+        'sourceType': 'watchLater',
+        'count': laterList.length,
+      },
+    );
+  }
 }
diff --git a/lib/pages/later/view.dart b/lib/pages/later/view.dart
index 0a02cb79..771d8631 100644
--- a/lib/pages/later/view.dart
+++ b/lib/pages/later/view.dart
@@ -128,6 +128,15 @@ class _LaterPageState extends State<LaterPage> {
           )
         ],
       ),
+      floatingActionButton: Obx(
+        () => _laterController.laterList.isNotEmpty
+            ? FloatingActionButton.extended(
+                onPressed: _laterController.toViewPlayAll,
+                label: const Text('播放全部'),
+                icon: const Icon(Icons.playlist_play),
+              )
+            : const SizedBox(),
+      ),
     );
   }
 }
diff --git a/lib/pages/live/controller.dart b/lib/pages/live/controller.dart
index 74fb6e9a..0ca9c815 100644
--- a/lib/pages/live/controller.dart
+++ b/lib/pages/live/controller.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/http/live.dart';
+import 'package:pilipala/models/live/follow.dart';
 import 'package:pilipala/models/live/item.dart';
 import 'package:pilipala/utils/storage.dart';
 
@@ -11,6 +12,8 @@ class LiveController extends GetxController {
   int _currentPage = 1;
   RxInt crossAxisCount = 2.obs;
   RxList<LiveItemModel> liveList = <LiveItemModel>[].obs;
+  RxList<LiveFollowingItemModel> liveFollowingList =
+      <LiveFollowingItemModel>[].obs;
   bool flag = false;
   OverlayEntry? popupDialog;
   Box setting = GStrorage.setting;
@@ -44,6 +47,7 @@ class LiveController extends GetxController {
   // 下拉刷新
   Future onRefresh() async {
     queryLiveList('init');
+    fetchLiveFollowing();
   }
 
   // 上拉加载
@@ -61,4 +65,17 @@ class LiveController extends GetxController {
           duration: const Duration(milliseconds: 500), curve: Curves.easeInOut);
     }
   }
+
+  //
+  Future fetchLiveFollowing() async {
+    var res = await LiveHttp.liveFollowing(pn: 1, ps: 20);
+    if (res['status']) {
+      liveFollowingList.value =
+          (res['data'].list as List<LiveFollowingItemModel>)
+              .where((LiveFollowingItemModel item) =>
+                  item.liveStatus == 1 && item.recordLiveTime == 0) // 根据条件过滤
+              .toList();
+    }
+    return res;
+  }
 }
diff --git a/lib/pages/live/view.dart b/lib/pages/live/view.dart
index 83605495..51316fe3 100644
--- a/lib/pages/live/view.dart
+++ b/lib/pages/live/view.dart
@@ -6,6 +6,8 @@ import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/skeleton/video_card_v.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/models/live/follow.dart';
 import 'package:pilipala/utils/main_stream.dart';
 
 import 'controller.dart';
@@ -22,6 +24,7 @@ class _LivePageState extends State<LivePage>
     with AutomaticKeepAliveClientMixin {
   final LiveController _liveController = Get.put(LiveController());
   late Future _futureBuilderFuture;
+  late Future _futureBuilderFuture2;
   late ScrollController scrollController;
 
   @override
@@ -31,6 +34,7 @@ class _LivePageState extends State<LivePage>
   void initState() {
     super.initState();
     _futureBuilderFuture = _liveController.queryLiveList('init');
+    _futureBuilderFuture2 = _liveController.fetchLiveFollowing();
     scrollController = _liveController.scrollController;
     scrollController.addListener(
       () {
@@ -69,6 +73,7 @@ class _LivePageState extends State<LivePage>
         child: CustomScrollView(
           controller: _liveController.scrollController,
           slivers: [
+            buildFollowingList(),
             SliverPadding(
               // 单列布局 EdgeInsets.zero
               padding:
@@ -147,4 +152,148 @@ class _LivePageState extends State<LivePage>
       ),
     );
   }
+
+  // 关注的up直播
+  Widget buildFollowingList() {
+    return SliverPadding(
+      padding: const EdgeInsets.only(top: 16),
+      sliver: SliverToBoxAdapter(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Obx(
+              () => Text.rich(
+                TextSpan(
+                  children: [
+                    const TextSpan(
+                      text: ' 我的关注 ',
+                      style: TextStyle(
+                        fontWeight: FontWeight.bold,
+                        fontSize: 15,
+                      ),
+                    ),
+                    TextSpan(
+                      text: ' ${_liveController.liveFollowingList.length}',
+                      style: TextStyle(
+                        fontSize: 12,
+                        color: Theme.of(context).colorScheme.primary,
+                      ),
+                    ),
+                    TextSpan(
+                      text: '人正在直播',
+                      style: TextStyle(
+                        fontSize: 12,
+                        color: Theme.of(context).colorScheme.outline,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+            FutureBuilder(
+              future: _futureBuilderFuture2,
+              builder: (context, snapshot) {
+                if (snapshot.connectionState == ConnectionState.done) {
+                  if (snapshot.data == null) {
+                    return const SizedBox();
+                  }
+                  Map? data = snapshot.data;
+                  if (data?['status']) {
+                    RxList list = _liveController.liveFollowingList;
+                    // ignore: invalid_use_of_protected_member
+                    return Obx(() => LiveFollowingListView(list: list.value));
+                  } else {
+                    return SizedBox(
+                      height: 80,
+                      child: Center(
+                        child: Text(
+                          data?['msg'] ?? '',
+                          style: TextStyle(
+                            color: Theme.of(context).colorScheme.outline,
+                            fontSize: 12,
+                          ),
+                        ),
+                      ),
+                    );
+                  }
+                } else {
+                  return const SizedBox();
+                }
+              },
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class LiveFollowingListView extends StatelessWidget {
+  final List list;
+
+  const LiveFollowingListView({super.key, required this.list});
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      height: 100,
+      child: ListView.builder(
+        scrollDirection: Axis.horizontal,
+        itemBuilder: (context, index) {
+          final LiveFollowingItemModel item = list[index];
+          return Padding(
+            padding: const EdgeInsets.fromLTRB(3, 12, 3, 0),
+            child: Column(
+              children: [
+                InkWell(
+                  onTap: () {
+                    Get.toNamed(
+                      '/liveRoom?roomid=${item.roomId}',
+                      arguments: {
+                        'liveItem': item,
+                        'heroTag': item.roomId.toString()
+                      },
+                    );
+                  },
+                  child: Container(
+                    width: 54,
+                    height: 54,
+                    padding: const EdgeInsets.all(2),
+                    decoration: BoxDecoration(
+                      borderRadius: BorderRadius.circular(27),
+                      border: Border.all(
+                        color: Theme.of(context).colorScheme.primary,
+                        width: 1.5,
+                      ),
+                    ),
+                    child: NetworkImgLayer(
+                      width: 50,
+                      height: 50,
+                      type: 'avatar',
+                      src: list[index].face,
+                    ),
+                  ),
+                ),
+                const SizedBox(height: 6),
+                SizedBox(
+                  width: 62,
+                  child: Text(
+                    list[index].uname,
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    textAlign: TextAlign.center,
+                    style: const TextStyle(
+                      fontSize: 12,
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          );
+        },
+        itemCount: list.length,
+      ),
+    );
+  }
 }
diff --git a/lib/pages/live_room/controller.dart b/lib/pages/live_room/controller.dart
index 4e67fa2c..0d347bf2 100644
--- a/lib/pages/live_room/controller.dart
+++ b/lib/pages/live_room/controller.dart
@@ -1,10 +1,19 @@
+import 'dart:async';
+import 'dart:convert';
+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:ns_danmaku/ns_danmaku.dart';
 import 'package:pilipala/http/constants.dart';
+import 'package:pilipala/http/init.dart';
 import 'package:pilipala/http/live.dart';
+import 'package:pilipala/models/live/message.dart';
 import 'package:pilipala/models/live/quality.dart';
 import 'package:pilipala/models/live/room_info.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
+import 'package:pilipala/plugin/pl_socket/index.dart';
+import 'package:pilipala/utils/live.dart';
 import '../../models/live/room_info_h5.dart';
 import '../../utils/storage.dart';
 import '../../utils/video_utils.dart';
@@ -24,6 +33,22 @@ class LiveRoomController extends GetxController {
   int? tempCurrentQn;
   late List<Map<String, dynamic>> acceptQnList;
   RxString currentQnDesc = ''.obs;
+  Box userInfoCache = GStrorage.userInfo;
+  int userId = 0;
+  PlSocket? plSocket;
+  List<String> danmuHostList = [];
+  String token = '';
+  // 弹幕消息列表
+  RxList<LiveMessageModel> messageList = <LiveMessageModel>[].obs;
+  DanmakuController? danmakuController;
+  // 输入控制器
+  TextEditingController inputController = TextEditingController();
+  // 加入直播间提示
+  RxMap<String, String> joinRoomTip = {'userName': '', 'message': ''}.obs;
+  // 直播间弹幕开关 默认打开
+  RxBool danmakuSwitch = true.obs;
+  late String buvid;
+  RxBool isPortrait = false.obs;
 
   @override
   void onInit() {
@@ -34,15 +59,25 @@ class LiveRoomController extends GetxController {
     if (Get.arguments != null) {
       liveItem = Get.arguments['liveItem'];
       heroTag = Get.arguments['heroTag'] ?? '';
-      if (liveItem != null && liveItem.pic != null && liveItem.pic != '') {
-        cover = liveItem.pic;
-      }
-      if (liveItem != null && liveItem.cover != null && liveItem.cover != '') {
-        cover = liveItem.cover;
+      if (liveItem != null) {
+        cover = (liveItem.pic != null && liveItem.pic != '')
+            ? liveItem.pic
+            : (liveItem.cover != null && liveItem.cover != '')
+                ? liveItem.cover
+                : '';
       }
+      Request.getBuvid().then((value) => buvid = value);
     }
     // CDN优化
     enableCDN = setting.get(SettingBoxKey.enableCDN, defaultValue: true);
+    final userInfo = userInfoCache.get('userInfoCache');
+    if (userInfo != null && userInfo.mid != null) {
+      userId = userInfo.mid;
+    }
+    liveDanmakuInfo().then((value) => initSocket());
+    danmakuSwitch.listen((p0) {
+      plPlayerController.isOpenDanmu.value = p0;
+    });
   }
 
   playerInit(source) async {
@@ -61,11 +96,14 @@ class LiveRoomController extends GetxController {
       enableHA: true,
       autoplay: true,
     );
+    plPlayerController.isOpenDanmu.value = danmakuSwitch.value;
+    heartBeat();
   }
 
   Future queryLiveInfo() async {
     var res = await LiveHttp.liveRoomInfo(roomId: roomId, qn: currentQn);
     if (res['status']) {
+      isPortrait.value = res['data'].isPortrait;
       List<CodecItem> codec =
           res['data'].playurlInfo.playurl.stream.first.format.first.codec;
       CodecItem item = codec.first;
@@ -127,4 +165,138 @@ class LiveRoomController extends GetxController {
         .description;
     await queryLiveInfo();
   }
+
+  Future liveDanmakuInfo() async {
+    var res = await LiveHttp.liveDanmakuInfo(roomId: roomId);
+    if (res['status']) {
+      danmuHostList = (res["data"]["host_list"] as List)
+          .map<String>((e) => '${e["host"]}:${e['wss_port']}')
+          .toList();
+      token = res["data"]["token"];
+      return res;
+    }
+  }
+
+  // 建立socket
+  void initSocket() async {
+    final wsUrl = danmuHostList.isNotEmpty
+        ? danmuHostList.first
+        : "broadcastlv.chat.bilibili.com";
+    plSocket = PlSocket(
+      url: 'wss://$wsUrl/sub',
+      heartTime: 30,
+      onReadyCb: () {
+        joinRoom();
+      },
+      onMessageCb: (message) {
+        final List<LiveMessageModel>? liveMsg =
+            LiveUtils.decodeMessage(message);
+        if (liveMsg != null && liveMsg.isNotEmpty) {
+          if (liveMsg.first.type == LiveMessageType.online) {
+            print('当前直播间人气：${liveMsg.first.data}');
+          } else if (liveMsg.first.type == LiveMessageType.join ||
+              liveMsg.first.type == LiveMessageType.follow) {
+            // 每隔一秒依次liveMsg中的每一项赋给activeUserName
+
+            int index = 0;
+            Timer.periodic(const Duration(seconds: 2), (timer) {
+              if (index < liveMsg.length) {
+                if (liveMsg[index].type == LiveMessageType.join ||
+                    liveMsg[index].type == LiveMessageType.follow) {
+                  joinRoomTip.value = {
+                    'userName': liveMsg[index].userName,
+                    'message': liveMsg[index].message!,
+                  };
+                }
+                index++;
+              } else {
+                timer.cancel();
+              }
+            });
+
+            return;
+          }
+          // 过滤出聊天消息
+          var chatMessages =
+              liveMsg.where((msg) => msg.type == LiveMessageType.chat).toList();
+
+          // 添加到 messageList
+          messageList.addAll(chatMessages);
+
+          // 将 chatMessages 转换为 danmakuItems 列表
+          List<DanmakuItem> danmakuItems = chatMessages.map<DanmakuItem>((e) {
+            return DanmakuItem(
+              e.message ?? '',
+              color: Color.fromARGB(
+                255,
+                e.color.r,
+                e.color.g,
+                e.color.b,
+              ),
+            );
+          }).toList();
+
+          // 添加到 danmakuController
+          if (danmakuSwitch.value) {
+            danmakuController?.addItems(danmakuItems);
+          }
+        }
+      },
+      onErrorCb: (e) {
+        print('error: $e');
+      },
+    );
+    await plSocket?.connect();
+  }
+
+  void joinRoom() async {
+    var joinData = LiveUtils.encodeData(
+      json.encode({
+        "uid": userId,
+        "roomid": roomId,
+        "protover": 3,
+        "buvid": buvid,
+        "platform": "web",
+        "type": 2,
+        "key": token,
+      }),
+      7,
+    );
+    plSocket?.sendMessage(joinData);
+  }
+
+  // 发送弹幕
+  void sendMsg() async {
+    final msg = inputController.text;
+    if (msg.isEmpty) {
+      return;
+    }
+    final res = await LiveHttp.sendDanmaku(
+      roomId: roomId,
+      msg: msg,
+    );
+    if (res['status']) {
+      inputController.clear();
+    } else {
+      SmartDialog.showToast(res['msg']);
+    }
+  }
+
+  // 历史记录
+  void heartBeat() {
+    LiveHttp.liveRoomEntry(roomId: roomId);
+  }
+
+  String encodeToBase64(String input) {
+    List<int> bytes = utf8.encode(input);
+    String base64Str = base64.encode(bytes);
+    return base64Str;
+  }
+
+  @override
+  void onClose() {
+    heartBeat();
+    plSocket?.onClose();
+    super.onClose();
+  }
 }
diff --git a/lib/pages/live_room/view.dart b/lib/pages/live_room/view.dart
index 37981b1d..1e0814e9 100644
--- a/lib/pages/live_room/view.dart
+++ b/lib/pages/live_room/view.dart
@@ -1,9 +1,13 @@
 import 'dart:io';
 
 import 'package:floating/floating.dart';
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/models/live/message.dart';
+import 'package:pilipala/pages/danmaku/index.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
 
 import 'controller.dart';
@@ -16,15 +20,20 @@ class LiveRoomPage extends StatefulWidget {
   State<LiveRoomPage> createState() => _LiveRoomPageState();
 }
 
-class _LiveRoomPageState extends State<LiveRoomPage> {
+class _LiveRoomPageState extends State<LiveRoomPage>
+    with TickerProviderStateMixin {
   final LiveRoomController _liveRoomController = Get.put(LiveRoomController());
-  PlPlayerController? plPlayerController;
+  late PlPlayerController plPlayerController;
   late Future? _futureBuilder;
   late Future? _futureBuilderFuture;
 
   bool isShowCover = true;
   bool isPlay = true;
   Floating? floating;
+  final ScrollController _scrollController = ScrollController();
+  late AnimationController fabAnimationCtr;
+  bool _shouldAutoScroll = true;
+  final int roomId = int.parse(Get.parameters['roomid']!);
 
   @override
   void initState() {
@@ -34,6 +43,13 @@ class _LiveRoomPageState extends State<LiveRoomPage> {
     }
     videoSourceInit();
     _futureBuilderFuture = _liveRoomController.queryLiveInfo();
+    // 监听滚动事件
+    _scrollController.addListener(_onScroll);
+    fabAnimationCtr = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 300),
+      value: 0.0,
+    );
   }
 
   Future<void> videoSourceInit() async {
@@ -41,23 +57,73 @@ class _LiveRoomPageState extends State<LiveRoomPage> {
     plPlayerController = _liveRoomController.plPlayerController;
   }
 
+  void _onScroll() {
+    // 反向时，展示按钮
+    if (_scrollController.position.userScrollDirection ==
+        ScrollDirection.forward) {
+      _shouldAutoScroll = false;
+      fabAnimationCtr.forward();
+    } else {
+      _shouldAutoScroll = true;
+      fabAnimationCtr.reverse();
+    }
+  }
+
+  // 监听messageList的变化，自动滚动到底部
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    _liveRoomController.messageList.listen((_) {
+      if (_shouldAutoScroll) {
+        _scrollToBottom();
+      }
+    });
+  }
+
+  void _scrollToBottom() {
+    if (_scrollController.hasClients) {
+      _scrollController
+          .animateTo(
+        _scrollController.position.maxScrollExtent,
+        duration: const Duration(milliseconds: 300),
+        curve: Curves.easeOut,
+      )
+          .then((value) {
+        _shouldAutoScroll = true;
+        // fabAnimationCtr.forward();
+      });
+    }
+  }
+
   @override
   void dispose() {
-    plPlayerController!.dispose();
+    plPlayerController.dispose();
     if (floating != null) {
       floating!.dispose();
     }
+    _scrollController.dispose();
+    fabAnimationCtr.dispose();
     super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
+    final mediaQuery = MediaQuery.of(context);
+    final isPortrait = mediaQuery.orientation == Orientation.portrait;
+    final isLandscape = mediaQuery.orientation == Orientation.landscape;
+
+    final padding = mediaQuery.padding;
+
     Widget videoPlayerPanel = FutureBuilder(
       future: _futureBuilderFuture,
       builder: (BuildContext context, AsyncSnapshot snapshot) {
         if (snapshot.hasData && snapshot.data['status']) {
+          plPlayerController = _liveRoomController.plPlayerController;
           return PLVideoPlayer(
-            controller: plPlayerController!,
+            controller: plPlayerController,
+            alignment: _liveRoomController.isPortrait.value
+                ? Alignment.topCenter
+                : Alignment.center,
             bottomControl: BottomControl(
               controller: plPlayerController,
               liveRoomCtr: _liveRoomController,
@@ -68,6 +134,14 @@ class _LiveRoomPageState extends State<LiveRoomPage> {
                 });
               },
             ),
+            danmuWidget: PlDanmaku(
+              cid: roomId,
+              playerController: plPlayerController,
+              type: 'live',
+              createdController: (e) {
+                _liveRoomController.danmakuController = e;
+              },
+            ),
           );
         } else {
           return const SizedBox();
@@ -80,20 +154,6 @@ class _LiveRoomPageState extends State<LiveRoomPage> {
       backgroundColor: Colors.black,
       body: Stack(
         children: [
-          Positioned(
-            left: 0,
-            right: 0,
-            bottom: 0,
-            child: Opacity(
-              opacity: 0.8,
-              child: Image.asset(
-                'assets/images/live/default_bg.webp',
-                fit: BoxFit.cover,
-                // width: Get.width,
-                // height: Get.height,
-              ),
-            ),
-          ),
           Obx(
             () => Positioned(
               left: 0,
@@ -106,7 +166,7 @@ class _LiveRoomPageState extends State<LiveRoomPage> {
                               .roomInfoH5.value.roomInfo?.appBackground !=
                           null
                   ? Opacity(
-                      opacity: 0.8,
+                      opacity: 0.6,
                       child: NetworkImgLayer(
                         width: Get.width,
                         height: Get.height,
@@ -116,93 +176,253 @@ class _LiveRoomPageState extends State<LiveRoomPage> {
                             '',
                       ),
                     )
-                  : const SizedBox(),
+                  : Opacity(
+                      opacity: 0.6,
+                      child: Image.asset(
+                        'assets/images/live/default_bg.webp',
+                        fit: BoxFit.cover,
+                        // width: Get.width,
+                        // height: Get.height,
+                      ),
+                    ),
             ),
           ),
+
           Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              AppBar(
-                centerTitle: false,
-                titleSpacing: 0,
-                backgroundColor: Colors.transparent,
-                foregroundColor: Colors.white,
-                toolbarHeight:
-                    MediaQuery.of(context).orientation == Orientation.portrait
-                        ? 56
-                        : 0,
-                title: FutureBuilder(
-                  future: _futureBuilder,
-                  builder: (context, snapshot) {
-                    if (snapshot.data == null) {
-                      return const SizedBox();
-                    }
-                    Map data = snapshot.data as Map;
-                    if (data['status']) {
-                      return Obx(
-                        () => Row(
-                          children: [
-                            NetworkImgLayer(
-                              width: 34,
-                              height: 34,
-                              type: 'avatar',
-                              src: _liveRoomController
-                                  .roomInfoH5.value.anchorInfo!.baseInfo!.face,
-                            ),
-                            const SizedBox(width: 10),
-                            Column(
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                Text(
-                                  _liveRoomController.roomInfoH5.value
-                                      .anchorInfo!.baseInfo!.uname!,
-                                  style: const TextStyle(fontSize: 14),
-                                ),
-                                const SizedBox(height: 1),
-                                if (_liveRoomController
-                                        .roomInfoH5.value.watchedShow !=
-                                    null)
-                                  Text(
-                                    _liveRoomController.roomInfoH5.value
-                                            .watchedShow!['text_large'] ??
-                                        '',
-                                    style: const TextStyle(fontSize: 12),
-                                  ),
-                              ],
-                            ),
-                          ],
-                        ),
-                      );
-                    } else {
-                      return const SizedBox();
-                    }
-                  },
+              Obx(
+                () => SizedBox(
+                  height: padding.top +
+                      (_liveRoomController.isPortrait.value || isLandscape
+                          ? 0
+                          : kToolbarHeight),
                 ),
               ),
               PopScope(
-                canPop: plPlayerController?.isFullScreen.value != true,
+                canPop: plPlayerController.isFullScreen.value != true,
                 onPopInvoked: (bool didPop) {
-                  if (plPlayerController?.isFullScreen.value == true) {
-                    plPlayerController!.triggerFullScreen(status: false);
+                  if (plPlayerController.isFullScreen.value == true) {
+                    plPlayerController.triggerFullScreen(status: false);
                   }
-                  if (MediaQuery.of(context).orientation ==
-                      Orientation.landscape) {
+                  if (isLandscape) {
                     verticalScreen();
                   }
                 },
-                child: SizedBox(
-                  width: Get.size.width,
-                  height: MediaQuery.of(context).orientation ==
-                          Orientation.landscape
-                      ? Get.size.height
-                      : Get.size.width * 9 / 16,
-                  child: videoPlayerPanel,
+                child: Obx(
+                  () => Container(
+                    width: Get.size.width,
+                    height: isLandscape
+                        ? Get.size.height
+                        : !_liveRoomController.isPortrait.value
+                            ? Get.size.width * 9 / 16
+                            : Get.size.height - padding.top,
+                    clipBehavior: Clip.hardEdge,
+                    decoration: const BoxDecoration(
+                      borderRadius: BorderRadius.all(Radius.circular(6)),
+                    ),
+                    child: videoPlayerPanel,
+                  ),
                 ),
               ),
             ],
           ),
+          // 定位 快速滑动到底部
+          Positioned(
+            right: 20,
+            bottom: padding.bottom + 80,
+            child: SlideTransition(
+              position: Tween<Offset>(
+                begin: const Offset(0, 4),
+                end: const Offset(0, 0),
+              ).animate(CurvedAnimation(
+                parent: fabAnimationCtr,
+                curve: Curves.easeInOut,
+              )),
+              child: ElevatedButton.icon(
+                onPressed: () {
+                  _scrollToBottom();
+                },
+                icon: const Icon(Icons.keyboard_arrow_down), // 图标
+                label: const Text('新消息'), // 文字
+                style: ElevatedButton.styleFrom(
+                  // primary: Colors.blue, // 按钮背景颜色
+                  // onPrimary: Colors.white, // 按钮文字颜色
+                  padding: const EdgeInsets.fromLTRB(14, 12, 20, 12), // 按钮内边距
+                ),
+              ),
+            ),
+          ),
+          // 顶栏
+          Positioned(
+            top: 0,
+            left: 0,
+            right: 0,
+            child: AppBar(
+              centerTitle: false,
+              titleSpacing: 0,
+              backgroundColor: Colors.transparent,
+              foregroundColor: Colors.white,
+              toolbarHeight: isPortrait ? 56 : 0,
+              title: FutureBuilder(
+                future: _futureBuilder,
+                builder: (context, snapshot) {
+                  if (snapshot.data == null) {
+                    return const SizedBox();
+                  }
+                  Map data = snapshot.data as Map;
+                  if (data['status']) {
+                    return Obx(
+                      () => Row(
+                        children: [
+                          NetworkImgLayer(
+                            width: 34,
+                            height: 34,
+                            type: 'avatar',
+                            src: _liveRoomController
+                                .roomInfoH5.value.anchorInfo!.baseInfo!.face,
+                          ),
+                          const SizedBox(width: 10),
+                          Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Text(
+                                _liveRoomController.roomInfoH5.value.anchorInfo!
+                                    .baseInfo!.uname!,
+                                style: const TextStyle(fontSize: 14),
+                              ),
+                              const SizedBox(height: 1),
+                              if (_liveRoomController
+                                      .roomInfoH5.value.watchedShow !=
+                                  null)
+                                Text(
+                                  _liveRoomController.roomInfoH5.value
+                                          .watchedShow!['text_large'] ??
+                                      '',
+                                  style: const TextStyle(fontSize: 12),
+                                ),
+                            ],
+                          ),
+                        ],
+                      ),
+                    );
+                  } else {
+                    return const SizedBox();
+                  }
+                },
+              ),
+            ),
+          ),
+          // 消息列表
+          Obx(
+            () => Align(
+              alignment: Alignment.bottomCenter,
+              child: Container(
+                margin: EdgeInsets.only(
+                  bottom: 90 + padding.bottom,
+                ),
+                height: Get.size.height -
+                    (padding.top +
+                        kToolbarHeight +
+                        (_liveRoomController.isPortrait.value
+                            ? Get.size.width
+                            : Get.size.width * 9 / 16) +
+                        100 +
+                        padding.bottom),
+                child: buildMessageListUI(
+                  context,
+                  _liveRoomController,
+                  _scrollController,
+                ),
+              ),
+            ),
+          ),
+          // 消息输入框
+          Visibility(
+            visible: isPortrait,
+            child: Positioned(
+              bottom: 0,
+              left: 0,
+              right: 0,
+              child: Container(
+                padding: EdgeInsets.only(
+                    left: 14, right: 14, top: 4, bottom: padding.bottom + 20),
+                decoration: BoxDecoration(
+                  color: Colors.grey.withOpacity(0.1),
+                  borderRadius: const BorderRadius.all(Radius.circular(20)),
+                  border: Border(
+                    top: BorderSide(
+                      color: Colors.white.withOpacity(0.1),
+                    ),
+                  ),
+                ),
+                child: Row(
+                  children: [
+                    SizedBox(
+                      width: 34,
+                      height: 34,
+                      child: Obx(
+                        () => IconButton(
+                          style: ButtonStyle(
+                            padding: MaterialStateProperty.all(EdgeInsets.zero),
+                            backgroundColor: MaterialStateProperty.resolveWith(
+                                (Set<MaterialState> states) {
+                              return Colors.grey.withOpacity(0.1);
+                            }),
+                          ),
+                          onPressed: () {
+                            _liveRoomController.danmakuSwitch.value =
+                                !_liveRoomController.danmakuSwitch.value;
+                          },
+                          icon: Icon(
+                            _liveRoomController.danmakuSwitch.value
+                                ? Icons.subtitles_outlined
+                                : Icons.subtitles_off_outlined,
+                            size: 19,
+                            color: Colors.white,
+                          ),
+                        ),
+                      ),
+                    ),
+                    const SizedBox(width: 8),
+                    Expanded(
+                      child: TextField(
+                        controller: _liveRoomController.inputController,
+                        style:
+                            const TextStyle(color: Colors.white, fontSize: 13),
+                        decoration: InputDecoration(
+                          hintText: '发送弹幕',
+                          hintStyle: TextStyle(
+                            color: Colors.white.withOpacity(0.6),
+                          ),
+                          border: InputBorder.none,
+                        ),
+                      ),
+                    ),
+                    SizedBox(
+                      width: 34,
+                      height: 34,
+                      child: IconButton(
+                        style: ButtonStyle(
+                          padding: MaterialStateProperty.all(EdgeInsets.zero),
+                        ),
+                        onPressed: () => _liveRoomController.sendMsg(),
+                        icon: const Icon(
+                          Icons.send,
+                          color: Colors.white,
+                          size: 20,
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
         ],
       ),
     );
+
     if (Platform.isAndroid) {
       return PiPSwitcher(
         childWhenDisabled: childWhenDisabled,
@@ -214,3 +434,138 @@ class _LiveRoomPageState extends State<LiveRoomPage> {
     }
   }
 }
+
+Widget buildMessageListUI(
+  BuildContext context,
+  LiveRoomController liveRoomController,
+  ScrollController scrollController,
+) {
+  return Obx(
+    () => MediaQuery.removePadding(
+      context: context,
+      removeTop: true,
+      removeBottom: true,
+      child: ShaderMask(
+        shaderCallback: (Rect bounds) {
+          return LinearGradient(
+            begin: Alignment.topCenter,
+            end: Alignment.bottomCenter,
+            colors: [
+              Colors.transparent,
+              Colors.black.withOpacity(0.5),
+              Colors.black,
+            ],
+            stops: const [0.01, 0.05, 0.2],
+          ).createShader(bounds);
+        },
+        blendMode: BlendMode.dstIn,
+        child: GestureDetector(
+          onTap: () {
+            // 键盘失去焦点
+            FocusScope.of(context).requestFocus(FocusNode());
+          },
+          child: ListView.builder(
+            controller: scrollController,
+            itemCount: liveRoomController.messageList.length,
+            itemBuilder: (context, index) {
+              final LiveMessageModel liveMsgItem =
+                  liveRoomController.messageList[index];
+              return Align(
+                alignment: Alignment.centerLeft,
+                child: Container(
+                  decoration: BoxDecoration(
+                    color: liveRoomController.isPortrait.value
+                        ? Colors.black.withOpacity(0.3)
+                        : Colors.grey.withOpacity(0.1),
+                    borderRadius: const BorderRadius.all(Radius.circular(20)),
+                  ),
+                  margin: EdgeInsets.only(
+                    top: index == 0 ? 20.0 : 0.0,
+                    bottom: 6.0,
+                    left: 14.0,
+                    right: 14.0,
+                  ),
+                  padding: const EdgeInsets.symmetric(
+                    vertical: 3.0,
+                    horizontal: 10.0,
+                  ),
+                  child: Text.rich(
+                    TextSpan(
+                      style: const TextStyle(color: Colors.white),
+                      children: [
+                        TextSpan(
+                          text: '${liveMsgItem.userName}: ',
+                          style: TextStyle(
+                            color: Colors.white.withOpacity(0.6),
+                          ),
+                          recognizer: TapGestureRecognizer()
+                            ..onTap = () {
+                              // 处理点击事件
+                              print('Text clicked');
+                            },
+                        ),
+                        TextSpan(
+                          children: [
+                            ...buildMessageTextSpan(context, liveMsgItem)
+                          ],
+                          // text: liveMsgItem.message,
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              );
+            },
+          ),
+        ),
+      ),
+    ),
+  );
+}
+
+List<InlineSpan> buildMessageTextSpan(
+  BuildContext context,
+  LiveMessageModel liveMsgItem,
+) {
+  final List<InlineSpan> inlineSpanList = [];
+
+  // 是否包含表情包
+  if (liveMsgItem.emots == null) {
+    // 没有表情包的消息
+    inlineSpanList.add(
+      TextSpan(text: liveMsgItem.message ?? ''),
+    );
+  } else {
+    // 有表情包的消息 使用正则匹配 表情包用图片渲染
+    final List<String> emotsKeys = liveMsgItem.emots!.keys.toList();
+    final RegExp pattern = RegExp(emotsKeys.map(RegExp.escape).join('|'));
+
+    liveMsgItem.message?.splitMapJoin(
+      pattern,
+      onMatch: (Match match) {
+        final emoteItem = liveMsgItem.emots![match.group(0)];
+        if (emoteItem != null) {
+          inlineSpanList.add(
+            WidgetSpan(
+              child: NetworkImgLayer(
+                width: emoteItem['width'].toDouble(),
+                height: emoteItem['height'].toDouble(),
+                type: 'emote',
+                src: emoteItem['url'],
+              ),
+            ),
+          );
+        }
+        return '';
+      },
+      onNonMatch: (String nonMatch) {
+        inlineSpanList.add(
+          TextSpan(text: nonMatch),
+        );
+        return nonMatch;
+      },
+    );
+  }
+
+  return inlineSpanList;
+}
diff --git a/lib/pages/login/controller.dart b/lib/pages/login/controller.dart
index fbb06e2f..9e7fb339 100644
--- a/lib/pages/login/controller.dart
+++ b/lib/pages/login/controller.dart
@@ -45,6 +45,7 @@ class LoginPageController extends GetxController {
   RxInt validSeconds = 180.obs;
   Timer? validTimer;
   late String qrcodeKey;
+  RxBool passwordVisible = false.obs;
 
   // 监听pageView切换
   void onPageChange(int index) {
@@ -128,7 +129,14 @@ class LoginPageController extends GetxController {
           if (res['status']) {
             await LoginUtils.confirmLogin('', null);
           } else {
-            SmartDialog.showToast(res['msg']);
+            await SmartDialog.showToast(res['msg']);
+            if (res.containsKey('code') && res['code'] == 1) {
+              Get.toNamed('/webview', parameters: {
+                'url': res['data']['data']['url'],
+                'type': 'url',
+                'pageTitle': '登录验证',
+              });
+            }
           }
         } else {
           SmartDialog.showToast(webKeyRes['msg']);
diff --git a/lib/pages/login/view.dart b/lib/pages/login/view.dart
index 85a8adf0..4fe21792 100644
--- a/lib/pages/login/view.dart
+++ b/lib/pages/login/view.dart
@@ -269,25 +269,46 @@ class _LoginPageState extends State<LoginPage> {
                           ),
                           Container(
                             margin: const EdgeInsets.only(top: 38, bottom: 15),
-                            child: TextFormField(
-                              controller: _loginPageCtr.passwordTextController,
-                              focusNode: _loginPageCtr.passwordTextFieldNode,
-                              keyboardType: TextInputType.visiblePassword,
-                              decoration: InputDecoration(
-                                isDense: true,
-                                labelText: '输入密码',
-                                border: OutlineInputBorder(
-                                  borderRadius: BorderRadius.circular(6.0),
-                                ),
-                              ),
-                              // 校验用户名
-                              validator: (v) {
-                                return v!.trim().isNotEmpty ? null : "密码不能为空";
-                              },
-                              onSaved: (val) {
-                                print(val);
-                              },
-                            ),
+                            child: Obx(() => TextFormField(
+                                  controller:
+                                      _loginPageCtr.passwordTextController,
+                                  focusNode:
+                                      _loginPageCtr.passwordTextFieldNode,
+                                  keyboardType: TextInputType.visiblePassword,
+                                  obscureText:
+                                      _loginPageCtr.passwordVisible.value,
+                                  decoration: InputDecoration(
+                                    isDense: true,
+                                    labelText: '输入密码',
+                                    border: OutlineInputBorder(
+                                      borderRadius: BorderRadius.circular(6.0),
+                                    ),
+                                    suffixIcon: IconButton(
+                                      icon: Icon(
+                                        _loginPageCtr.passwordVisible.value
+                                            ? Icons.visibility
+                                            : Icons.visibility_off,
+                                        color: Theme.of(context)
+                                            .colorScheme
+                                            .primary,
+                                      ),
+                                      onPressed: () {
+                                        _loginPageCtr.passwordVisible.value =
+                                            !_loginPageCtr
+                                                .passwordVisible.value;
+                                      },
+                                    ),
+                                  ),
+                                  // 校验用户名
+                                  validator: (v) {
+                                    return v!.trim().isNotEmpty
+                                        ? null
+                                        : "密码不能为空";
+                                  },
+                                  onSaved: (val) {
+                                    print(val);
+                                  },
+                                )),
                           ),
                           const Spacer(),
                           Row(
diff --git a/lib/pages/main/controller.dart b/lib/pages/main/controller.dart
index 2ef2bf7f..fd18d728 100644
--- a/lib/pages/main/controller.dart
+++ b/lib/pages/main/controller.dart
@@ -13,6 +13,7 @@ import '../../models/common/nav_bar_config.dart';
 
 class MainController extends GetxController {
   List<Widget> pages = <Widget>[];
+  List<int> pagesIds = <int>[];
   RxList navigationBars = [].obs;
   late List defaultNavTabs;
   late List<int> navBarSort;
@@ -26,6 +27,8 @@ class MainController extends GetxController {
   Box userInfoCache = GStrorage.userInfo;
   RxBool userLogin = false.obs;
   late Rx<DynamicBadgeMode> dynamicBadgeType = DynamicBadgeMode.number.obs;
+  late bool enableGradientBg;
+  bool imgPreviewStatus = false;
 
   @override
   void onInit() {
@@ -41,9 +44,12 @@ class MainController extends GetxController {
         SettingBoxKey.dynamicBadgeMode,
         defaultValue: DynamicBadgeMode.number.code)];
     setNavBarConfig();
-    if (dynamicBadgeType.value != DynamicBadgeMode.hidden) {
+    if (dynamicBadgeType.value != DynamicBadgeMode.hidden &&
+        pagesIds.contains(2)) {
       getUnreadDynamic();
     }
+    enableGradientBg =
+        setting.get(SettingBoxKey.enableGradientBg, defaultValue: true);
   }
 
   void onBackPressed(BuildContext context) {
@@ -100,6 +106,7 @@ class MainController extends GetxController {
     // 如果找不到匹配项，默认索引设置为0或其他合适的值
     selectedIndex = defaultIndex != -1 ? defaultIndex : 0;
     pages = navigationBars.map<Widget>((e) => e['page']).toList();
+    pagesIds = navigationBars.map<int>((e) => e['id']).toList();
   }
 
   @override
diff --git a/lib/pages/main/view.dart b/lib/pages/main/view.dart
index 29573501..e978eaaa 100644
--- a/lib/pages/main/view.dart
+++ b/lib/pages/main/view.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/models/common/dynamic_badge_mode.dart';
@@ -10,7 +11,6 @@ import 'package:pilipala/pages/media/index.dart';
 import 'package:pilipala/pages/rank/index.dart';
 import 'package:pilipala/utils/event_bus.dart';
 import 'package:pilipala/utils/feed_back.dart';
-import 'package:pilipala/utils/global_data.dart';
 import 'package:pilipala/utils/storage.dart';
 import './controller.dart';
 
@@ -23,13 +23,14 @@ class MainApp extends StatefulWidget {
 
 class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
   final MainController _mainController = Get.put(MainController());
-  final HomeController _homeController = Get.put(HomeController());
-  final RankController _rankController = Get.put(RankController());
-  final DynamicsController _dynamicController = Get.put(DynamicsController());
-  final MediaController _mediaController = Get.put(MediaController());
+  late HomeController _homeController;
+  RankController? _rankController;
+  late DynamicsController _dynamicController;
+  late MediaController _mediaController;
 
   int? _lastSelectTime; //上次点击时间
   Box setting = GStrorage.setting;
+  late bool enableMYBar;
 
   @override
   void initState() {
@@ -37,6 +38,8 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
     _lastSelectTime = DateTime.now().millisecondsSinceEpoch;
     _mainController.pageController =
         PageController(initialPage: _mainController.selectedIndex);
+    enableMYBar = setting.get(SettingBoxKey.enableMYBar, defaultValue: true);
+    controllerInit();
   }
 
   void setIndex(int value) async {
@@ -59,18 +62,18 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
     }
 
     if (currentPage is RankPage) {
-      if (_rankController.flag) {
+      if (_rankController!.flag) {
         // 单击返回顶部 双击并刷新
         if (DateTime.now().millisecondsSinceEpoch - _lastSelectTime! < 500) {
-          _rankController.onRefresh();
+          _rankController!.onRefresh();
         } else {
-          _rankController.animateToTop();
+          _rankController!.animateToTop();
         }
         _lastSelectTime = DateTime.now().millisecondsSinceEpoch;
       }
-      _rankController.flag = true;
+      _rankController!.flag = true;
     } else {
-      _rankController.flag = false;
+      _rankController?.flag = false;
     }
 
     if (currentPage is DynamicsPage) {
@@ -94,6 +97,21 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
     }
   }
 
+  void controllerInit() {
+    _homeController = Get.put(HomeController());
+    _dynamicController = Get.put(DynamicsController());
+    _mediaController = Get.put(MediaController());
+    if (_mainController.pagesIds.contains(1)) {
+      _rankController = Get.put(RankController());
+    }
+    if (_mainController.pagesIds.contains(2)) {
+      _dynamicController = Get.put(DynamicsController());
+    }
+    if (_mainController.pagesIds.contains(3)) {
+      _mediaController = Get.put(MediaController());
+    }
+  }
+
   @override
   void dispose() async {
     await GStrorage.close();
@@ -110,6 +128,14 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
         MediaQuery.sizeOf(context).width * 9 / 16;
     localCache.put('sheetHeight', sheetHeight);
     localCache.put('statusBarHeight', statusBarHeight);
+
+    SystemChrome.setSystemUIOverlayStyle(
+      SystemUiOverlayStyle(
+        systemNavigationBarColor: Colors.transparent,
+        systemNavigationBarIconBrightness:
+            Get.isDarkMode ? Brightness.light : Brightness.dark,
+      ),
+    );
     return PopScope(
       canPop: false,
       onPopInvoked: (bool didPop) async {
@@ -117,14 +143,48 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
       },
       child: Scaffold(
         extendBody: true,
-        body: PageView(
-          physics: const NeverScrollableScrollPhysics(),
-          controller: _mainController.pageController,
-          onPageChanged: (index) {
-            _mainController.selectedIndex = index;
-            setState(() {});
-          },
-          children: _mainController.pages,
+        body: Stack(
+          children: [
+            if (_mainController.enableGradientBg)
+              Align(
+                alignment: Alignment.topLeft,
+                child: Opacity(
+                  opacity: Theme.of(context).brightness == Brightness.dark
+                      ? 0.3
+                      : 0.6,
+                  child: Container(
+                    width: MediaQuery.of(context).size.width,
+                    height: MediaQuery.of(context).size.height,
+                    decoration: BoxDecoration(
+                      gradient: LinearGradient(
+                          colors: [
+                            Theme.of(context)
+                                .colorScheme
+                                .primary
+                                .withOpacity(0.7),
+                            Theme.of(context).colorScheme.surface,
+                            Theme.of(context)
+                                .colorScheme
+                                .surface
+                                .withOpacity(0.3),
+                          ],
+                          begin: Alignment.topCenter,
+                          end: Alignment.bottomCenter,
+                          stops: const [0.1, 0.3, 5]),
+                    ),
+                  ),
+                ),
+              ),
+            PageView(
+              physics: const NeverScrollableScrollPhysics(),
+              controller: _mainController.pageController,
+              onPageChanged: (index) {
+                _mainController.selectedIndex = index;
+                setState(() {});
+              },
+              children: _mainController.pages,
+            ),
+          ],
         ),
         bottomNavigationBar: _mainController.navigationBars.length > 1
             ? StreamBuilder(
@@ -137,7 +197,7 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
                     curve: Curves.easeInOutCubicEmphasized,
                     duration: const Duration(milliseconds: 500),
                     offset: Offset(0, snapshot.data ? 0 : 1),
-                    child: GlobalData().enableMYBar
+                    child: enableMYBar
                         ? Obx(
                             () => NavigationBar(
                               onDestinationSelected: (value) => setIndex(value),
diff --git a/lib/pages/media/view.dart b/lib/pages/media/view.dart
index cc413e59..965628c4 100644
--- a/lib/pages/media/view.dart
+++ b/lib/pages/media/view.dart
@@ -1,11 +1,11 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/models/user/fav_folder.dart';
 import 'package:pilipala/pages/media/index.dart';
-import 'package:pilipala/utils/main_stream.dart';
 import 'package:pilipala/utils/utils.dart';
 
 class MediaPage extends StatefulWidget {
@@ -236,9 +236,11 @@ class FavFolderItem extends StatelessWidget {
     return Container(
       margin: EdgeInsets.only(left: index == 0 ? 20 : 0, right: 14),
       child: GestureDetector(
-        onTap: () => Get.toNamed('/favDetail',
-            arguments: item,
-            parameters: {'mediaId': item!.id.toString(), 'heroTag': heroTag}),
+        onTap: () => Get.toNamed('/favDetail', arguments: item, parameters: {
+          'mediaId': item!.id.toString(),
+          'heroTag': heroTag,
+          'isOwner': '1',
+        }),
         child: Column(
           mainAxisAlignment: MainAxisAlignment.start,
           crossAxisAlignment: CrossAxisAlignment.start,
diff --git a/lib/pages/member/controller.dart b/lib/pages/member/controller.dart
index 0aa7166f..8454cebe 100644
--- a/lib/pages/member/controller.dart
+++ b/lib/pages/member/controller.dart
@@ -8,6 +8,7 @@ import 'package:pilipala/http/video.dart';
 import 'package:pilipala/models/member/archive.dart';
 import 'package:pilipala/models/member/coin.dart';
 import 'package:pilipala/models/member/info.dart';
+import 'package:pilipala/models/member/like.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:share_plus/share_plus.dart';
 
@@ -25,6 +26,8 @@ class MemberController extends GetxController {
   RxInt attribute = (-1).obs;
   RxString attributeText = '关注'.obs;
   RxList<MemberCoinsDataModel> recentCoinsList = <MemberCoinsDataModel>[].obs;
+  RxList<MemberLikeDataModel> recentLikeList = <MemberLikeDataModel>[].obs;
+  RxBool isOwner = false.obs;
 
   @override
   void onInit() {
@@ -32,6 +35,7 @@ class MemberController extends GetxController {
     mid = int.parse(Get.parameters['mid']!);
     userInfo = userInfoCache.get('userInfoCache');
     ownerMid = userInfo != null ? userInfo.mid : -1;
+    isOwner.value = mid == ownerMid;
     face.value = Get.arguments['face'] ?? '';
     heroTag = Get.arguments['heroTag'] ?? '';
     relationSearch();
@@ -45,6 +49,8 @@ class MemberController extends GetxController {
     if (res['status']) {
       memberInfo.value = res['data'];
       face.value = res['data'].face;
+    } else {
+      SmartDialog.showToast('用户信息请求异常：${res['msg']}');
     }
     return res;
   }
@@ -74,42 +80,10 @@ class MemberController extends GetxController {
       return;
     }
     if (attribute.value == 128) {
-      blockUser();
-      return;
+      modifyRelation('block');
+    } else {
+      modifyRelation('follow');
     }
-    SmartDialog.show(
-      useSystem: true,
-      animationType: SmartAnimationType.centerFade_otherSlide,
-      builder: (BuildContext context) {
-        return AlertDialog(
-          title: const Text('提示'),
-          content: Text(memberInfo.value.isFollowed! ? '取消关注UP主?' : '关注UP主?'),
-          actions: [
-            TextButton(
-              onPressed: () => SmartDialog.dismiss(),
-              child: Text(
-                '点错了',
-                style: TextStyle(color: Theme.of(context).colorScheme.outline),
-              ),
-            ),
-            TextButton(
-              onPressed: () async {
-                await VideoHttp.relationMod(
-                  mid: mid,
-                  act: memberInfo.value.isFollowed! ? 2 : 1,
-                  reSrc: 11,
-                );
-                memberInfo.value.isFollowed = !memberInfo.value.isFollowed!;
-                relationSearch();
-                SmartDialog.dismiss();
-                memberInfo.update((val) {});
-              },
-              child: const Text('确认'),
-            )
-          ],
-        );
-      },
-    );
   }
 
   // 关系查询
@@ -119,24 +93,15 @@ class MemberController extends GetxController {
     var res = await UserHttp.hasFollow(mid);
     if (res['status']) {
       attribute.value = res['data']['attribute'];
-      switch (attribute.value) {
-        case 1:
-          attributeText.value = '悄悄关注';
-          break;
-        case 2:
-          attributeText.value = '已关注';
-          break;
-        case 6:
-          attributeText.value = '已互关';
-          break;
-        case 128:
-          attributeText.value = '已拉黑';
-          break;
-        default:
-          attributeText.value = '关注';
-      }
+      final Map<int, String> attributeTextMap = {
+        1: '悄悄关注',
+        2: '已关注',
+        6: '已互关',
+        128: '已拉黑',
+      };
+      attributeText.value = attributeTextMap[attribute.value] ?? '关注';
       if (res['data']['special'] == 1) {
-        attributeText.value += 'SP';
+        attributeText.value = '特别关注';
       }
     }
   }
@@ -147,16 +112,37 @@ class MemberController extends GetxController {
       SmartDialog.showToast('账号未登录');
       return;
     }
-    SmartDialog.show(
-      useSystem: true,
-      animationType: SmartAnimationType.centerFade_otherSlide,
+    modifyRelation('block');
+  }
+
+// 合并关注/取关和拉黑逻辑
+  Future modifyRelation(String actionType) async {
+    if (userInfo == null) {
+      SmartDialog.showToast('账号未登录');
+      return;
+    }
+
+    String contentText;
+    int act;
+    if (actionType == 'follow') {
+      contentText = memberInfo.value.isFollowed! ? '确定取消关注UP主?' : '确定关注UP主?';
+      act = memberInfo.value.isFollowed! ? 2 : 1;
+    } else if (actionType == 'block') {
+      contentText = attribute.value != 128 ? '确定拉黑UP主?' : '确定从黑名单移除UP主？';
+      act = attribute.value != 128 ? 5 : 6;
+    } else {
+      return;
+    }
+
+    showDialog(
+      context: Get.context!,
       builder: (BuildContext context) {
         return AlertDialog(
           title: const Text('提示'),
-          content: Text(attribute.value != 128 ? '确定拉黑UP主?' : '从黑名单移除UP主'),
+          content: Text(contentText),
           actions: [
             TextButton(
-              onPressed: () => SmartDialog.dismiss(),
+              onPressed: () => Navigator.of(context).pop(),
               child: Text(
                 '点错了',
                 style: TextStyle(color: Theme.of(context).colorScheme.outline),
@@ -166,19 +152,26 @@ class MemberController extends GetxController {
               onPressed: () async {
                 var res = await VideoHttp.relationMod(
                   mid: mid,
-                  act: attribute.value != 128 ? 5 : 6,
+                  act: act,
                   reSrc: 11,
                 );
                 SmartDialog.dismiss();
                 if (res['status']) {
-                  attribute.value = attribute.value != 128 ? 128 : 0;
-                  attributeText.value = attribute.value == 128 ? '已拉黑' : '关注';
-                  memberInfo.value.isFollowed = false;
+                  if (actionType == 'follow') {
+                    memberInfo.value.isFollowed = !memberInfo.value.isFollowed!;
+                  } else if (actionType == 'block') {
+                    attribute.value = attribute.value != 128 ? 128 : 0;
+                    attributeText.value = attribute.value == 128 ? '已拉黑' : '关注';
+                    memberInfo.value.isFollowed = false;
+                  }
                   relationSearch();
+                  if (context.mounted) {
+                    Navigator.of(context).pop();
+                  }
                   memberInfo.update((val) {});
                 }
               },
-              child: const Text('确认'),
+              child: const Text('确定'),
             )
           ],
         );
@@ -190,12 +183,18 @@ class MemberController extends GetxController {
     Share.share('${memberInfo.value.name} - https://space.bilibili.com/$mid');
   }
 
-  // 请求专栏
+  // 请求合集
   Future getMemberSeasons() async {
     if (userInfo == null) return;
     var res = await MemberHttp.getMemberSeasons(mid, 1, 10);
     if (!res['status']) {
-      SmartDialog.showToast("用户专栏请求异常：${res['msg']}");
+      SmartDialog.showToast("用户合集请求异常：${res['msg']}");
+    } else {
+      // 只取前四个专栏
+      res['data'].seasonsList.map((e) {
+        e.archives =
+            e.archives!.length > 4 ? e.archives!.sublist(0, 4) : e.archives!;
+      }).toList();
     }
     return res;
   }
@@ -208,16 +207,25 @@ class MemberController extends GetxController {
     return res;
   }
 
+  // 请求点赞视频
+  Future getRecentLikeVideo() async {
+    if (userInfo == null) return;
+    var res = await MemberHttp.getRecentLikeVideo(mid: mid);
+    recentLikeList.value = res['data'];
+    return res;
+  }
+
   // 跳转查看动态
   void pushDynamicsPage() => Get.toNamed('/memberDynamics?mid=$mid');
-
   // 跳转查看投稿
   void pushArchivesPage() => Get.toNamed('/memberArchive?mid=$mid');
-
-  // 跳转查看专栏
-  void pushSeasonsPage() {}
   // 跳转查看最近投币
   void pushRecentCoinsPage() async {
     if (recentCoinsList.isNotEmpty) {}
   }
+
+  // 跳转查看收藏夹
+  void pushfavPage() => Get.toNamed('/fav?mid=$mid');
+  // 跳转图文专栏
+  void pushArticlePage() => Get.toNamed('/memberArticle?mid=$mid');
 }
diff --git a/lib/pages/member/view.dart b/lib/pages/member/view.dart
index bb0d92be..df501253 100644
--- a/lib/pages/member/view.dart
+++ b/lib/pages/member/view.dart
@@ -1,14 +1,15 @@
 import 'dart:async';
-
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/models/member/info.dart';
 import 'package:pilipala/pages/member/index.dart';
 import 'package:pilipala/utils/utils.dart';
-
+import 'widgets/commen_widget.dart';
 import 'widgets/conis.dart';
+import 'widgets/like.dart';
 import 'widgets/profile.dart';
 import 'widgets/seasons.dart';
 
@@ -26,8 +27,10 @@ class _MemberPageState extends State<MemberPage>
   late Future _futureBuilderFuture;
   late Future _memberSeasonsFuture;
   late Future _memberCoinsFuture;
+  late Future _memberLikeFuture;
   final ScrollController _extendNestCtr = ScrollController();
-  final StreamController<bool> appbarStream = StreamController<bool>();
+  final StreamController<bool> appbarStream =
+      StreamController<bool>.broadcast();
   late int mid;
 
   @override
@@ -39,6 +42,7 @@ class _MemberPageState extends State<MemberPage>
     _futureBuilderFuture = _memberController.getInfo();
     _memberSeasonsFuture = _memberController.getMemberSeasons();
     _memberCoinsFuture = _memberController.getRecentCoinVideo();
+    _memberLikeFuture = _memberController.getRecentLikeVideo();
     _extendNestCtr.addListener(
       () {
         final double offset = _extendNestCtr.position.pixels;
@@ -61,212 +65,233 @@ class _MemberPageState extends State<MemberPage>
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      primary: true,
-      body: Column(
-        children: [
-          AppBar(
-            title: StreamBuilder(
-              stream: appbarStream.stream.distinct(),
-              initialData: false,
-              builder: (BuildContext context, AsyncSnapshot snapshot) {
-                return AnimatedOpacity(
-                  opacity: snapshot.data ? 1 : 0,
-                  curve: Curves.easeOut,
-                  duration: const Duration(milliseconds: 500),
-                  child: Row(
-                    children: [
-                      Row(
-                        children: [
-                          Obx(
-                            () => NetworkImgLayer(
-                              width: 35,
-                              height: 35,
-                              type: 'avatar',
-                              src: _memberController.face.value,
-                            ),
-                          ),
-                          const SizedBox(width: 10),
-                          Obx(
-                            () => Text(
-                              _memberController.memberInfo.value.name ?? '',
-                              style: TextStyle(
-                                  color:
-                                      Theme.of(context).colorScheme.onSurface,
-                                  fontSize: 14),
-                            ),
-                          ),
-                        ],
-                      )
-                    ],
+      appBar: AppBar(
+        title: StreamBuilder(
+          stream: appbarStream.stream.distinct(),
+          initialData: false,
+          builder: (BuildContext context, AsyncSnapshot snapshot) {
+            return AnimatedOpacity(
+              opacity: snapshot.data ? 1 : 0,
+              curve: Curves.easeOut,
+              duration: const Duration(milliseconds: 500),
+              child: Row(
+                children: [
+                  Obx(
+                    () => NetworkImgLayer(
+                      width: 35,
+                      height: 35,
+                      type: 'avatar',
+                      src: _memberController.face.value,
+                    ),
                   ),
-                );
-              },
-            ),
-            actions: [
-              IconButton(
-                onPressed: () => Get.toNamed(
-                    '/memberSearch?mid=$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: 10),
+                  Obx(
+                    () => Text(
+                      _memberController.memberInfo.value.name ?? '',
+                      style: TextStyle(
+                          color: Theme.of(context).colorScheme.onSurface,
+                          fontSize: 14),
                     ),
                   ),
                 ],
               ),
-              const SizedBox(width: 4),
-            ],
+            );
+          },
+        ),
+        actions: [
+          IconButton(
+            onPressed: () => Get.toNamed(
+                '/memberSearch?mid=$mid&uname=${_memberController.memberInfo.value.name!}'),
+            icon: const Icon(Icons.search_outlined),
           ),
-          Expanded(
-            child: SingleChildScrollView(
-              controller: _extendNestCtr,
-              child: Padding(
-                padding: EdgeInsets.only(
-                  bottom: MediaQuery.of(context).padding.bottom + 20,
-                ),
-                child: Column(
+          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: [
-                    profileWidget(),
-
-                    /// 动态链接
-                    ListTile(
-                      onTap: _memberController.pushDynamicsPage,
-                      title: const Text('Ta的动态'),
-                      trailing:
-                          const Icon(Icons.arrow_forward_outlined, size: 19),
-                    ),
-
-                    /// 视频
-                    ListTile(
-                      onTap: _memberController.pushArchivesPage,
-                      title: const Text('Ta的投稿'),
-                      trailing:
-                          const Icon(Icons.arrow_forward_outlined, size: 19),
-                    ),
-
-                    /// 专栏
-                    ListTile(
-                      onTap: () {},
-                      title: const Text('Ta的专栏'),
-                    ),
-                    MediaQuery.removePadding(
-                      removeTop: true,
-                      removeBottom: true,
-                      context: context,
-                      child: Padding(
-                        padding: const EdgeInsets.only(
-                          left: StyleString.safeSpace,
-                          right: StyleString.safeSpace,
-                        ),
-                        child: FutureBuilder(
-                          future: _memberSeasonsFuture,
-                          builder: (context, snapshot) {
-                            if (snapshot.connectionState ==
-                                ConnectionState.done) {
-                              if (snapshot.data == null) {
-                                return const SizedBox();
-                              }
-                              if (snapshot.data['status']) {
-                                Map data = snapshot.data as Map;
-                                if (data['data'].seasonsList.isEmpty) {
-                                  return commenWidget('用户没有设置专栏');
-                                } else {
-                                  return MemberSeasonsPanel(data: data['data']);
-                                }
-                              } else {
-                                // 请求错误
-                                return const SizedBox();
-                              }
-                            } else {
-                              return const SizedBox();
-                            }
-                          },
-                        ),
-                      ),
-                    ),
-
-                    /// 收藏
-
-                    /// 追番
-                    /// 最近投币
-                    Obx(
-                      () => _memberController.recentCoinsList.isNotEmpty
-                          ? ListTile(
-                              onTap: () {},
-                              title: const Text('最近投币的视频'),
-                              // trailing: const Icon(Icons.arrow_forward_outlined,
-                              //     size: 19),
-                            )
-                          : const SizedBox(),
-                    ),
-                    MediaQuery.removePadding(
-                      removeTop: true,
-                      removeBottom: true,
-                      context: context,
-                      child: Padding(
-                        padding: const EdgeInsets.only(
-                          left: StyleString.safeSpace,
-                          right: StyleString.safeSpace,
-                        ),
-                        child: FutureBuilder(
-                          future: _memberCoinsFuture,
-                          builder: (context, snapshot) {
-                            if (snapshot.connectionState ==
-                                ConnectionState.done) {
-                              if (snapshot.data == null) {
-                                return const SizedBox();
-                              }
-                              if (snapshot.data['status']) {
-                                Map data = snapshot.data as Map;
-                                return MemberCoinsPanel(data: data['data']);
-                              } else {
-                                // 请求错误
-                                return const SizedBox();
-                              }
-                            } else {
-                              return const SizedBox();
-                            }
-                          },
-                        ),
-                      ),
-                    ),
-                    // 最近点赞
-                    // ListTile(
-                    //   onTap: () {},
-                    //   title: const Text('最近点赞的视频'),
-                    //   trailing:
-                    //       const Icon(Icons.arrow_forward_outlined, size: 19),
-                    // ),
+                    const Icon(Icons.share_outlined, size: 19),
+                    const SizedBox(width: 10),
+                    Text(_memberController.ownerMid != _memberController.mid
+                        ? '分享UP主'
+                        : '分享我的主页'),
                   ],
                 ),
               ),
+            ],
+          ),
+          const SizedBox(width: 4),
+        ],
+      ),
+      primary: true,
+      body: ListView(
+        controller: _extendNestCtr,
+        padding: EdgeInsets.only(
+          bottom: MediaQuery.of(context).padding.bottom + 20,
+        ),
+        children: [
+          profileWidget(),
+
+          /// 动态链接
+          Obx(
+            () => ListTile(
+              onTap: _memberController.pushDynamicsPage,
+              title: Text('${_memberController.isOwner.value ? '我' : 'Ta'}的动态'),
+              trailing: const Icon(Icons.arrow_forward_outlined, size: 19),
+            ),
+          ),
+
+          /// 视频
+          Obx(
+            () => ListTile(
+              onTap: _memberController.pushArchivesPage,
+              title: Text('${_memberController.isOwner.value ? '我' : 'Ta'}的投稿'),
+              trailing: const Icon(Icons.arrow_forward_outlined, size: 19),
+            ),
+          ),
+
+          /// 他的收藏夹
+          Obx(
+            () => ListTile(
+              onTap: _memberController.pushfavPage,
+              title: Text('${_memberController.isOwner.value ? '我' : 'Ta'}的收藏'),
+              trailing: const Icon(Icons.arrow_forward_outlined, size: 19),
+            ),
+          ),
+
+          /// 专栏
+          Obx(
+            () => ListTile(
+              onTap: _memberController.pushArticlePage,
+              title: Text('${_memberController.isOwner.value ? '我' : 'Ta'}的专栏'),
+              trailing: const Icon(Icons.arrow_forward_outlined, size: 19),
+            ),
+          ),
+
+          /// 合集
+          Obx(
+            () => ListTile(
+              title: Text('${_memberController.isOwner.value ? '我' : 'Ta'}的合集'),
+            ),
+          ),
+          MediaQuery.removePadding(
+            removeTop: true,
+            removeBottom: true,
+            context: context,
+            child: FutureBuilder(
+              future: _memberSeasonsFuture,
+              builder: (context, snapshot) {
+                if (snapshot.connectionState == ConnectionState.done) {
+                  if (snapshot.data == null) {
+                    return const SizedBox();
+                  }
+                  if (snapshot.data['status']) {
+                    Map data = snapshot.data as Map;
+                    if (data['data'].seasonsList.isEmpty) {
+                      return const CommenWidget(msg: '用户没有设置合集');
+                    } else {
+                      return MemberSeasonsPanel(data: data['data']);
+                    }
+                  } else {
+                    // 请求错误
+                    return const SizedBox();
+                  }
+                } else {
+                  return const SizedBox();
+                }
+              },
+            ),
+          ),
+
+          /// 追番
+          /// 最近投币
+          Obx(
+            () => _memberController.recentCoinsList.isNotEmpty
+                ? const ListTile(title: Text('最近投币的视频'))
+                : const SizedBox(),
+          ),
+          MediaQuery.removePadding(
+            removeTop: true,
+            removeBottom: true,
+            context: context,
+            child: Padding(
+              padding: const EdgeInsets.only(
+                left: StyleString.safeSpace,
+                right: StyleString.safeSpace,
+              ),
+              child: FutureBuilder(
+                future: _memberCoinsFuture,
+                builder: (context, snapshot) {
+                  if (snapshot.connectionState == ConnectionState.done) {
+                    if (snapshot.data == null) {
+                      return const SizedBox();
+                    }
+                    if (snapshot.data['status']) {
+                      Map data = snapshot.data as Map;
+                      return MemberCoinsPanel(data: data['data']);
+                    } else {
+                      // 请求错误
+                      return const SizedBox();
+                    }
+                  } else {
+                    return const SizedBox();
+                  }
+                },
+              ),
+            ),
+          ),
+
+          /// 最近点赞
+          Obx(
+            () => _memberController.recentLikeList.isNotEmpty
+                ? const ListTile(title: Text('最近点赞的视频'))
+                : const SizedBox(),
+          ),
+          MediaQuery.removePadding(
+            removeTop: true,
+            removeBottom: true,
+            context: context,
+            child: Padding(
+              padding: const EdgeInsets.only(
+                left: StyleString.safeSpace,
+                right: StyleString.safeSpace,
+              ),
+              child: FutureBuilder(
+                future: _memberLikeFuture,
+                builder: (context, snapshot) {
+                  if (snapshot.connectionState == ConnectionState.done) {
+                    if (snapshot.data == null) {
+                      return const SizedBox();
+                    }
+                    if (snapshot.data['status']) {
+                      Map data = snapshot.data as Map;
+                      return MemberLikePanel(data: data['data']);
+                    } else {
+                      // 请求错误
+                      return const SizedBox();
+                    }
+                  } else {
+                    return const SizedBox();
+                  }
+                },
+              ),
             ),
           ),
         ],
@@ -283,115 +308,90 @@ class _MemberPageState extends State<MemberPage>
           if (snapshot.connectionState == ConnectionState.done) {
             Map? data = snapshot.data;
             if (data != null && data['status']) {
+              Rx<MemberInfoModel> memberInfo = _memberController.memberInfo;
               return Obx(
-                () => Stack(
-                  alignment: AlignmentDirectional.center,
+                () => Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
+                    ProfilePanel(ctr: _memberController),
+                    const SizedBox(height: 20),
+                    Row(
                       children: [
-                        ProfilePanel(ctr: _memberController),
-                        const SizedBox(height: 20),
-                        Row(
-                          children: [
-                            Flexible(
-                                child: Text(
-                              _memberController.memberInfo.value.name!,
-                              maxLines: 1,
-                              overflow: TextOverflow.ellipsis,
-                              style: Theme.of(context)
-                                  .textTheme
-                                  .titleMedium!
-                                  .copyWith(
-                                      fontWeight: FontWeight.bold,
-                                      color: _memberController.memberInfo.value
-                                                  .vip!.nicknameColor !=
-                                              null
-                                          ? Color(_memberController.memberInfo
-                                              .value.vip!.nicknameColor!)
-                                          : null),
-                            )),
-                            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,
-                              ),
-                            ]
-                          ],
+                        Flexible(
+                            child: Text(
+                          memberInfo.value.name!,
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                          style: Theme.of(context)
+                              .textTheme
+                              .titleMedium!
+                              .copyWith(
+                                  fontWeight: FontWeight.bold,
+                                  color: memberInfo.value.vip!.nicknameColor !=
+                                          null
+                                      ? Color(_memberController
+                                          .memberInfo.value.vip!.nicknameColor!)
+                                      : null),
+                        )),
+                        const SizedBox(width: 2),
+                        if (memberInfo.value.sex == '女')
+                          const Icon(
+                            FontAwesomeIcons.venus,
+                            size: 14,
+                            color: Colors.pink,
+                          ),
+                        if (memberInfo.value.sex == '男')
+                          const Icon(
+                            FontAwesomeIcons.mars,
+                            size: 14,
+                            color: Colors.blue,
+                          ),
+                        const SizedBox(width: 4),
+                        Image.asset(
+                          'assets/images/lv/lv${memberInfo.value.level}.png',
+                          height: 11,
                         ),
-                        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(width: 6),
+                        if (memberInfo.value.vip!.status == 1 &&
+                            memberInfo
+                                    .value.vip!.label!['img_label_uri_hans'] !=
+                                '') ...[
+                          Image.network(
+                            memberInfo.value.vip!.label!['img_label_uri_hans'],
+                            height: 20,
                           ),
-                        ],
-                        const SizedBox(height: 6),
-                        if (_memberController.memberInfo.value.sign != '')
-                          SelectableText(
-                            _memberController.memberInfo.value.sign!,
+                        ] else if (memberInfo.value.vip!.status == 1 &&
+                            memberInfo.value.vip!
+                                    .label!['img_label_uri_hans_static'] !=
+                                '') ...[
+                          Image.network(
+                            memberInfo
+                                .value.vip!.label!['img_label_uri_hans_static'],
+                            height: 20,
                           ),
+                        ]
                       ],
                     ),
+                    if (memberInfo.value.official!['title'] != '') ...[
+                      const SizedBox(height: 6),
+                      Text(
+                        memberInfo.value.official!['role'] == 1
+                            ? '个人认证：${memberInfo.value.official!['title']}'
+                            : '企业认证：${memberInfo.value.official!['title']}',
+                        maxLines: 2,
+                        softWrap: true,
+                        style: TextStyle(
+                          color: Theme.of(context).colorScheme.primary,
+                        ),
+                      ),
+                    ],
+                    const SizedBox(height: 6),
+                    SelectableText(memberInfo.value.sign ?? ''),
                   ],
                 ),
               );
             } else {
-              return const SizedBox();
+              return ProfilePanel(ctr: _memberController, loadingStatus: true);
             }
           } else {
             // 骨架屏
@@ -401,22 +401,4 @@ class _MemberPageState extends State<MemberPage>
       ),
     );
   }
-
-  Widget commenWidget(msg) {
-    return Padding(
-      padding: const EdgeInsets.only(
-        top: 20,
-        bottom: 30,
-      ),
-      child: Center(
-        child: Text(
-          msg,
-          style: Theme.of(context)
-              .textTheme
-              .labelMedium!
-              .copyWith(color: Theme.of(context).colorScheme.outline),
-        ),
-      ),
-    );
-  }
 }
diff --git a/lib/pages/member/widgets/commen_widget.dart b/lib/pages/member/widgets/commen_widget.dart
new file mode 100644
index 00000000..0c92803e
--- /dev/null
+++ b/lib/pages/member/widgets/commen_widget.dart
@@ -0,0 +1,24 @@
+import 'package:flutter/material.dart';
+
+class CommenWidget extends StatelessWidget {
+  final String msg;
+
+  const CommenWidget({required this.msg, Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 20.0, horizontal: 10.0),
+      child: Center(
+        child: Text(
+          msg,
+          textAlign: TextAlign.center,
+          style: Theme.of(context)
+              .textTheme
+              .labelMedium!
+              .copyWith(color: Theme.of(context).colorScheme.outline),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/member/widgets/conis.dart b/lib/pages/member/widgets/conis.dart
index 57a8a583..bdff2120 100644
--- a/lib/pages/member/widgets/conis.dart
+++ b/lib/pages/member/widgets/conis.dart
@@ -4,8 +4,8 @@ import 'package:pilipala/models/member/coin.dart';
 import 'package:pilipala/pages/member_coin/widgets/item.dart';
 
 class MemberCoinsPanel extends StatelessWidget {
-  final List<MemberCoinsDataModel>? data;
-  const MemberCoinsPanel({super.key, this.data});
+  final List<MemberCoinsDataModel> data;
+  const MemberCoinsPanel({super.key, required this.data});
 
   @override
   Widget build(BuildContext context) {
@@ -20,9 +20,9 @@ class MemberCoinsPanel extends StatelessWidget {
           ),
           physics: const NeverScrollableScrollPhysics(),
           shrinkWrap: true,
-          itemCount: data!.length,
+          itemCount: data.length,
           itemBuilder: (context, i) {
-            return MemberCoinsItem(coinItem: data![i]);
+            return MemberCoinsItem(coinItem: data[i]);
           },
         );
       },
diff --git a/lib/pages/member/widgets/like.dart b/lib/pages/member/widgets/like.dart
new file mode 100644
index 00000000..6342c274
--- /dev/null
+++ b/lib/pages/member/widgets/like.dart
@@ -0,0 +1,31 @@
+import 'package:flutter/material.dart';
+import 'package:pilipala/common/constants.dart';
+import 'package:pilipala/models/member/like.dart';
+import 'package:pilipala/pages/member_like/widgets/item.dart';
+
+class MemberLikePanel extends StatelessWidget {
+  final List<MemberLikeDataModel> data;
+  const MemberLikePanel({super.key, required this.data});
+
+  @override
+  Widget build(BuildContext context) {
+    return LayoutBuilder(
+      builder: (context, boxConstraints) {
+        return GridView.builder(
+          gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+            crossAxisCount: 2, // Use a fixed count for GridView
+            crossAxisSpacing: StyleString.safeSpace,
+            mainAxisSpacing: StyleString.safeSpace,
+            childAspectRatio: 0.94,
+          ),
+          physics: const NeverScrollableScrollPhysics(),
+          shrinkWrap: true,
+          itemCount: data.length,
+          itemBuilder: (context, i) {
+            return MemberLikeItem(likeItem: data[i]);
+          },
+        );
+      },
+    );
+  }
+}
diff --git a/lib/pages/member/widgets/profile.dart b/lib/pages/member/widgets/profile.dart
index 8c6385db..7001c886 100644
--- a/lib/pages/member/widgets/profile.dart
+++ b/lib/pages/member/widgets/profile.dart
@@ -18,253 +18,245 @@ class ProfilePanel extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     MemberInfoModel memberInfo = ctr.memberInfo.value;
-    return Builder(
-      builder: ((context) {
-        return Padding(
-          padding:
-              EdgeInsets.only(top: MediaQuery.of(context).padding.top - 20),
-          child: Row(
-            children: [
-              Hero(
-                tag: ctr.heroTag!,
-                child: Stack(
-                  children: [
-                    NetworkImgLayer(
-                      width: 90,
-                      height: 90,
-                      type: 'avatar',
-                      src: !loadingStatus ? memberInfo.face : ctr.face.value,
-                    ),
-                    if (!loadingStatus &&
-                        memberInfo.liveRoom != null &&
-                        memberInfo.liveRoom!.liveStatus == 1)
-                      Positioned(
-                        bottom: 0,
-                        left: 14,
-                        child: GestureDetector(
-                          onTap: () {
-                            LiveItemModel liveItem = LiveItemModel.fromJson({
-                              'title': memberInfo.liveRoom!.title,
-                              'uname': memberInfo.name,
-                              'face': memberInfo.face,
-                              'roomid': memberInfo.liveRoom!.roomId,
-                              'watched_show': memberInfo.liveRoom!.watchedShow,
-                            });
-                            Get.toNamed(
-                              '/liveRoom?roomid=${memberInfo.liveRoom!.roomId}',
-                              arguments: {'liveItem': liveItem},
-                            );
-                          },
-                          child: Container(
-                            padding: const EdgeInsets.fromLTRB(6, 2, 6, 2),
-                            decoration: BoxDecoration(
-                              color: Theme.of(context).colorScheme.primary,
-                              borderRadius:
-                                  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),
-                              )
-                            ]),
-                          ),
-                        ),
-                      )
-                  ],
+    final int? mid = memberInfo.mid;
+    final String? name = memberInfo.name;
+
+    Map<String, dynamic> buildStatItem({
+      required String label,
+      required String value,
+      required VoidCallback onTap,
+    }) {
+      return {
+        'label': label,
+        'value': value,
+        'fn': onTap,
+      };
+    }
+
+    final List<Map<String, dynamic>> statList = [
+      buildStatItem(
+        label: '关注',
+        value: !loadingStatus ? "${ctr.userStat!['following']}" : '-',
+        onTap: () {
+          Get.toNamed('/follow?mid=$mid&name=$name');
+        },
+      ),
+      buildStatItem(
+        label: '粉丝',
+        value: !loadingStatus
+            ? ctr.userStat!['follower'] != null
+                ? Utils.numFormat(ctr.userStat!['follower'])
+                : '-'
+            : '-',
+        onTap: () {
+          Get.toNamed('/fan?mid=$mid&name=$name');
+        },
+      ),
+      buildStatItem(
+        label: '获赞',
+        value: !loadingStatus
+            ? ctr.userStat!['likes'] != null
+                ? Utils.numFormat(ctr.userStat!['likes'])
+                : '-'
+            : '-',
+        onTap: () {},
+      ),
+    ];
+
+    return Padding(
+      padding: const EdgeInsets.only(top: 30, left: 4),
+      child: Row(
+        children: [
+          Hero(
+            tag: ctr.heroTag!,
+            child: Stack(
+              children: [
+                NetworkImgLayer(
+                  width: 90,
+                  height: 90,
+                  type: 'avatar',
+                  src: !loadingStatus ? memberInfo.face : ctr.face.value,
                 ),
-              ),
-              const SizedBox(width: 12),
-              Expanded(
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Padding(
-                      padding:
-                          const EdgeInsets.only(top: 10, left: 10, right: 10),
-                      child: Row(
-                        mainAxisSize: MainAxisSize.max,
-                        mainAxisAlignment: MainAxisAlignment.spaceAround,
-                        children: [
-                          InkWell(
-                            onTap: () {
-                              Get.toNamed(
-                                  '/follow?mid=${memberInfo.mid}&name=${memberInfo.name}');
-                            },
-                            child: Column(
-                              children: [
-                                Text(
-                                  !loadingStatus
-                                      ? ctr.userStat!['following'].toString()
-                                      : '-',
-                                  style: const TextStyle(
-                                      fontWeight: FontWeight.bold),
-                                ),
-                                Text(
-                                  '关注',
-                                  style: TextStyle(
-                                      fontSize: Theme.of(context)
-                                          .textTheme
-                                          .labelMedium!
-                                          .fontSize),
-                                )
-                              ],
-                            ),
+                if (!loadingStatus &&
+                    memberInfo.liveRoom != null &&
+                    memberInfo.liveRoom!.liveStatus == 1)
+                  Positioned(
+                    bottom: 0,
+                    left: 14,
+                    child: GestureDetector(
+                      onTap: () {
+                        LiveItemModel liveItem = LiveItemModel(
+                          title: memberInfo.liveRoom!.title,
+                          uname: memberInfo.name,
+                          face: memberInfo.face,
+                          roomId: memberInfo.liveRoom!.roomId,
+                          watchedShow: memberInfo.liveRoom!.watchedShow,
+                        );
+                        Get.toNamed(
+                          '/liveRoom?roomid=${memberInfo.liveRoom!.roomId}',
+                          arguments: {'liveItem': liveItem},
+                        );
+                      },
+                      child: Container(
+                        padding: const EdgeInsets.fromLTRB(6, 2, 6, 2),
+                        decoration: BoxDecoration(
+                          color: Theme.of(context).colorScheme.primary,
+                          borderRadius:
+                              const BorderRadius.all(Radius.circular(10)),
+                        ),
+                        child: Row(children: [
+                          Image.asset(
+                            'assets/images/live.gif',
+                            height: 10,
                           ),
-                          InkWell(
-                            onTap: () {
-                              Get.toNamed(
-                                  '/fan?mid=${memberInfo.mid}&name=${memberInfo.name}');
-                            },
-                            child: Column(
-                              children: [
-                                Text(
-                                    !loadingStatus
-                                        ? ctr.userStat!['follower'] != null
-                                            ? Utils.numFormat(
-                                                ctr.userStat!['follower'],
-                                              )
-                                            : '-'
-                                        : '-',
-                                    style: const TextStyle(
-                                        fontWeight: FontWeight.bold)),
-                                Text(
-                                  '粉丝',
-                                  style: TextStyle(
-                                      fontSize: Theme.of(context)
-                                          .textTheme
-                                          .labelMedium!
-                                          .fontSize),
-                                )
-                              ],
-                            ),
-                          ),
-                          Column(
-                            children: [
-                              Text(
-                                  !loadingStatus
-                                      ? ctr.userStat!['likes'] != null
-                                          ? Utils.numFormat(
-                                              ctr.userStat!['likes'],
-                                            )
-                                          : '-'
-                                      : '-',
-                                  style: const TextStyle(
-                                      fontWeight: FontWeight.bold)),
-                              Text(
-                                '获赞',
-                                style: TextStyle(
-                                    fontSize: Theme.of(context)
-                                        .textTheme
-                                        .labelMedium!
-                                        .fontSize),
-                              )
-                            ],
-                          ),
-                        ],
+                          Text(
+                            ' 直播中',
+                            style: TextStyle(
+                                color: Colors.white,
+                                fontSize: Theme.of(context)
+                                    .textTheme
+                                    .labelSmall!
+                                    .fontSize),
+                          )
+                        ]),
                       ),
                     ),
-                    const SizedBox(height: 10),
-                    if (ctr.ownerMid != ctr.mid && ctr.ownerMid != -1) ...[
-                      Row(
-                        children: [
-                          Obx(
-                            () => Expanded(
-                              child: TextButton(
-                                onPressed: () => loadingStatus
-                                    ? null
-                                    : ctr.actionRelationMod(),
-                                style: TextButton.styleFrom(
-                                  foregroundColor: ctr.attribute.value == -1
-                                      ? Colors.transparent
-                                      : ctr.attribute.value != 0
-                                          ? Theme.of(context)
-                                              .colorScheme
-                                              .outline
-                                          : Theme.of(context)
-                                              .colorScheme
-                                              .onPrimary,
-                                  backgroundColor: ctr.attribute.value != 0
-                                      ? Theme.of(context)
-                                          .colorScheme
-                                          .onInverseSurface
-                                      : Theme.of(context)
-                                          .colorScheme
-                                          .primary, // 设置按钮背景色
-                                ),
-                                child: Obx(() => Text(ctr.attributeText.value)),
-                              ),
-                            ),
-                          ),
-                          const SizedBox(width: 8),
-                          Expanded(
-                            child: TextButton(
-                              onPressed: () {
-                                Get.toNamed(
-                                  '/whisperDetail',
-                                  parameters: {
-                                    'name': memberInfo.name!,
-                                    'face': memberInfo.face!,
-                                    'mid': memberInfo.mid.toString(),
-                                    'heroTag': ctr.heroTag!,
-                                  },
-                                );
-                              },
-                              style: TextButton.styleFrom(
-                                backgroundColor: Theme.of(context)
-                                    .colorScheme
-                                    .onInverseSurface,
-                              ),
-                              child: const Text('发消息'),
-                            ),
-                          )
-                        ],
-                      )
-                    ],
-                    if (ctr.ownerMid == ctr.mid && ctr.ownerMid != -1) ...[
-                      TextButton(
-                        onPressed: () {
-                          SmartDialog.showToast('功能开发中 💪');
-                        },
-                        style: TextButton.styleFrom(
-                          padding: const EdgeInsets.only(left: 80, right: 80),
-                          foregroundColor:
-                              Theme.of(context).colorScheme.onPrimary,
-                          backgroundColor:
-                              Theme.of(context).colorScheme.primary,
-                        ),
-                        child: const Text('编辑资料'),
-                      )
-                    ],
-                    if (ctr.ownerMid == -1) ...[
-                      TextButton(
-                        onPressed: () {},
-                        style: TextButton.styleFrom(
-                          padding: const EdgeInsets.only(left: 80, right: 80),
-                          foregroundColor:
-                              Theme.of(context).colorScheme.outline,
-                          backgroundColor:
-                              Theme.of(context).colorScheme.onInverseSurface,
-                        ),
-                        child: const Text('未登录'),
-                      )
-                    ]
-                  ],
-                ),
-              ),
-            ],
+                  )
+              ],
+            ),
           ),
-        );
-      }),
+          const SizedBox(width: 12),
+          Expanded(
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 10),
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceAround,
+                    children: statList.map((item) {
+                      return buildStatColumn(
+                        context,
+                        item['label'],
+                        item['value'],
+                        item['fn'],
+                      );
+                    }).toList(),
+                  ),
+                ),
+                const SizedBox(height: 16),
+                if (ctr.ownerMid != ctr.mid && ctr.ownerMid != -1)
+                  buildActionButtons(context, ctr, memberInfo),
+                if (ctr.ownerMid == ctr.mid && ctr.ownerMid != -1)
+                  buildEditProfileButton(context),
+                if (ctr.ownerMid == -1) buildNotLoggedInButton(context),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget buildStatColumn(
+    BuildContext context,
+    String label,
+    String value,
+    VoidCallback? onTap,
+  ) {
+    return InkWell(
+      onTap: onTap,
+      child: Column(
+        children: [
+          Text(
+            value,
+            style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 16),
+          ),
+          Text(
+            label,
+            style: TextStyle(
+              fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget buildActionButtons(
+    BuildContext context,
+    dynamic ctr,
+    MemberInfoModel memberInfo,
+  ) {
+    ColorScheme colorScheme = Theme.of(context).colorScheme;
+    return Row(
+      children: [
+        const SizedBox(width: 20),
+        Obx(
+          () => Expanded(
+            child: TextButton(
+              onPressed: () => loadingStatus ? null : ctr.actionRelationMod(),
+              style: TextButton.styleFrom(
+                foregroundColor: ctr.attribute.value == -1
+                    ? Colors.transparent
+                    : ctr.attribute.value != 0
+                        ? colorScheme.outline
+                        : colorScheme.onPrimary,
+                backgroundColor: ctr.attribute.value != 0
+                    ? colorScheme.onInverseSurface
+                    : colorScheme.primary,
+              ),
+              child: Obx(() => Text(ctr.attributeText.value)),
+            ),
+          ),
+        ),
+        const SizedBox(width: 8),
+        Expanded(
+          child: TextButton(
+            onPressed: () {
+              Get.toNamed(
+                '/whisperDetail',
+                parameters: {
+                  'name': memberInfo.name!,
+                  'face': memberInfo.face!,
+                  'mid': memberInfo.mid.toString(),
+                  'heroTag': ctr.heroTag!,
+                },
+              );
+            },
+            style: TextButton.styleFrom(
+              backgroundColor: colorScheme.onInverseSurface,
+            ),
+            child: const Text('发消息'),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget buildEditProfileButton(BuildContext context) {
+    return TextButton(
+      onPressed: () {
+        SmartDialog.showToast('功能开发中 💪');
+      },
+      style: TextButton.styleFrom(
+        padding: const EdgeInsets.symmetric(horizontal: 80),
+        foregroundColor: Theme.of(context).colorScheme.onPrimary,
+        backgroundColor: Theme.of(context).colorScheme.primary,
+      ),
+      child: const Text('编辑资料'),
+    );
+  }
+
+  Widget buildNotLoggedInButton(BuildContext context) {
+    return TextButton(
+      onPressed: () {},
+      style: TextButton.styleFrom(
+        padding: const EdgeInsets.symmetric(horizontal: 80),
+        foregroundColor: Theme.of(context).colorScheme.outline,
+        backgroundColor: Theme.of(context).colorScheme.onInverseSurface,
+      ),
+      child: const Text('未登录'),
     );
   }
 }
diff --git a/lib/pages/member/widgets/seasons.dart b/lib/pages/member/widgets/seasons.dart
index 125c978f..615fc44c 100644
--- a/lib/pages/member/widgets/seasons.dart
+++ b/lib/pages/member/widgets/seasons.dart
@@ -24,8 +24,28 @@ class MemberSeasonsPanel extends StatelessWidget {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               ListTile(
-                onTap: () => Get.toNamed(
-                    '/memberSeasons?mid=${item.meta!.mid}&seasonId=${item.meta!.seasonId}'),
+                onTap: () {
+                  final int category = item.meta!.category!;
+                  Map<String, String> parameters = {};
+                  if (category == 0) {
+                    parameters = {
+                      'category': '0',
+                      'mid': item.meta!.mid.toString(),
+                      'seasonId': item.meta!.seasonId.toString(),
+                      'seasonName': item.meta!.name!,
+                    };
+                  }
+                  // 2为直播回放
+                  if (category == 1 || category == 2) {
+                    parameters = {
+                      'category': '1',
+                      'mid': item.meta!.mid.toString(),
+                      'seriesId': item.meta!.seriesId.toString(),
+                      'seasonName': item.meta!.name!,
+                    };
+                  }
+                  Get.toNamed('/memberSeasons', parameters: parameters);
+                },
                 title: Text(
                   item.meta!.name!,
                   maxLines: 1,
@@ -44,24 +64,30 @@ class MemberSeasonsPanel extends StatelessWidget {
                 ),
               ),
               const SizedBox(height: 10),
-              LayoutBuilder(
-                builder: (context, boxConstraints) {
-                  return GridView.builder(
-                    gridDelegate:
-                        const SliverGridDelegateWithFixedCrossAxisCount(
-                      crossAxisCount: 2, // Use a fixed count for GridView
-                      crossAxisSpacing: StyleString.safeSpace,
-                      mainAxisSpacing: StyleString.safeSpace,
-                      childAspectRatio: 0.94,
-                    ),
-                    physics: const NeverScrollableScrollPhysics(),
-                    shrinkWrap: true,
-                    itemCount: item.archives!.length,
-                    itemBuilder: (context, i) {
-                      return MemberSeasonsItem(seasonItem: item.archives![i]);
-                    },
-                  );
-                },
+              Padding(
+                padding: const EdgeInsets.only(
+                  left: StyleString.safeSpace,
+                  right: StyleString.safeSpace,
+                ),
+                child: LayoutBuilder(
+                  builder: (context, boxConstraints) {
+                    return GridView.builder(
+                      gridDelegate:
+                          const SliverGridDelegateWithFixedCrossAxisCount(
+                        crossAxisCount: 2, // Use a fixed count for GridView
+                        crossAxisSpacing: StyleString.safeSpace,
+                        mainAxisSpacing: StyleString.safeSpace,
+                        childAspectRatio: 0.94,
+                      ),
+                      physics: const NeverScrollableScrollPhysics(),
+                      shrinkWrap: true,
+                      itemCount: item.archives!.length,
+                      itemBuilder: (context, i) {
+                        return MemberSeasonsItem(seasonItem: item.archives![i]);
+                      },
+                    );
+                  },
+                ),
               ),
             ],
           ),
diff --git a/lib/pages/member_archive/controller.dart b/lib/pages/member_archive/controller.dart
index 4c41de4c..20cf38d3 100644
--- a/lib/pages/member_archive/controller.dart
+++ b/lib/pages/member_archive/controller.dart
@@ -9,12 +9,14 @@ class MemberArchiveController extends GetxController {
   int pn = 1;
   int count = 0;
   RxMap<String, String> currentOrder = <String, String>{}.obs;
-  List<Map<String, String>> orderList = [
+  RxList<Map<String, String>> orderList = [
     {'type': 'pubdate', 'label': '最新发布'},
     {'type': 'click', 'label': '最多播放'},
     {'type': 'stow', 'label': '最多收藏'},
-  ];
+    {'type': 'charge', 'label': '充电专属'},
+  ].obs;
   RxList<VListItemModel> archivesList = <VListItemModel>[].obs;
+  RxBool isLoading = false.obs;
 
   @override
   void onInit() {
@@ -25,8 +27,13 @@ class MemberArchiveController extends GetxController {
 
   // 获取用户投稿
   Future getMemberArchive(type) async {
+    if (isLoading.value) {
+      return;
+    }
+    isLoading.value = true;
     if (type == 'init') {
       pn = 1;
+      archivesList.clear();
     }
     var res = await MemberHttp.memberArchive(
       mid: mid,
@@ -43,6 +50,7 @@ class MemberArchiveController extends GetxController {
       count = res['data'].page['count'];
       pn += 1;
     }
+    isLoading.value = false;
     return res;
   }
 
diff --git a/lib/pages/member_archive/view.dart b/lib/pages/member_archive/view.dart
index f38ca0cb..898aa915 100644
--- a/lib/pages/member_archive/view.dart
+++ b/lib/pages/member_archive/view.dart
@@ -1,6 +1,8 @@
 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/common/widgets/video_card_h.dart';
 import 'package:pilipala/utils/utils.dart';
 import '../../common/widgets/http_error.dart';
@@ -47,14 +49,29 @@ class _MemberArchivePageState extends State<MemberArchivePage> {
       appBar: AppBar(
         titleSpacing: 0,
         centerTitle: false,
-        title: Text('他的投稿', style: Theme.of(context).textTheme.titleMedium),
+        title: Obx(
+          () => Text(
+              '他的投稿 - ${_memberArchivesController.currentOrder['label']}',
+              style: Theme.of(context).textTheme.titleMedium),
+        ),
         actions: [
-          Obx(
-            () => TextButton.icon(
-              icon: const Icon(Icons.sort, size: 20),
-              onPressed: _memberArchivesController.toggleSort,
-              label: Text(_memberArchivesController.currentOrder['label']!),
-            ),
+          // Obx(
+          PopupMenuButton(
+            icon: const Icon(Icons.more_vert),
+            onSelected: (value) {
+              // 这里处理选择逻辑
+              _memberArchivesController.currentOrder.value = value;
+              _memberArchivesController.getMemberArchive('init');
+            },
+            itemBuilder: (BuildContext context) =>
+                _memberArchivesController.orderList.map(
+              (e) {
+                return PopupMenuItem(
+                  value: e,
+                  child: Text(e['label']!),
+                );
+              },
+            ).toList(),
           ),
           const SizedBox(width: 6),
         ],
@@ -85,7 +102,14 @@ class _MemberArchivePageState extends State<MemberArchivePage> {
                                 childCount: list.length,
                               ),
                             )
-                          : const SliverToBoxAdapter(),
+                          : _memberArchivesController.isLoading.value
+                              ? SliverList(
+                                  delegate: SliverChildBuilderDelegate(
+                                      (context, index) {
+                                    return const VideoCardHSkeleton();
+                                  }, childCount: 10),
+                                )
+                              : const NoData(),
                     );
                   } else {
                     return HttpError(
@@ -100,7 +124,11 @@ class _MemberArchivePageState extends State<MemberArchivePage> {
                   );
                 }
               } else {
-                return const SliverToBoxAdapter();
+                return SliverList(
+                  delegate: SliverChildBuilderDelegate((context, index) {
+                    return const VideoCardHSkeleton();
+                  }, childCount: 10),
+                );
               }
             },
           ),
diff --git a/lib/pages/member_article/controller.dart b/lib/pages/member_article/controller.dart
new file mode 100644
index 00000000..d79fb4a6
--- /dev/null
+++ b/lib/pages/member_article/controller.dart
@@ -0,0 +1,52 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/http/member.dart';
+import 'package:pilipala/models/member/article.dart';
+
+class MemberArticleController extends GetxController {
+  final ScrollController scrollController = ScrollController();
+  late int mid;
+  int pn = 1;
+  String? offset;
+  bool hasMore = true;
+  RxBool isLoading = false.obs;
+  RxList<MemberArticleItemModel> articleList = <MemberArticleItemModel>[].obs;
+
+  @override
+  void onInit() {
+    super.onInit();
+    mid = int.parse(Get.parameters['mid']!);
+  }
+
+  Future getMemberArticle(type) async {
+    if (isLoading.value) {
+      return;
+    }
+    isLoading.value = true;
+    if (type == 'init') {
+      pn = 1;
+      articleList.clear();
+    }
+    var res = await MemberHttp.getMemberArticle(
+      mid: mid,
+      pn: pn,
+      offset: offset,
+    );
+    if (res['status']) {
+      offset = res['data'].offset;
+      hasMore = res['data'].hasMore!;
+      if (type == 'init') {
+        articleList.value = res['data'].items;
+      }
+      if (type == 'onLoad') {
+        articleList.addAll(res['data'].items);
+      }
+      pn += 1;
+    } else {
+      SmartDialog.showToast(res['msg']);
+    }
+    isLoading.value = false;
+    return res;
+  }
+}
diff --git a/lib/pages/member_article/index.dart b/lib/pages/member_article/index.dart
new file mode 100644
index 00000000..bfc2f344
--- /dev/null
+++ b/lib/pages/member_article/index.dart
@@ -0,0 +1,4 @@
+library member_article;
+
+export './controller.dart';
+export './view.dart';
diff --git a/lib/pages/member_article/view.dart b/lib/pages/member_article/view.dart
new file mode 100644
index 00000000..e23e208d
--- /dev/null
+++ b/lib/pages/member_article/view.dart
@@ -0,0 +1,176 @@
+import 'package:easy_debounce/easy_throttle.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/skeleton/skeleton.dart';
+import 'package:pilipala/common/widgets/http_error.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/common/widgets/no_data.dart';
+import 'package:pilipala/utils/utils.dart';
+
+import 'controller.dart';
+
+class MemberArticlePage extends StatefulWidget {
+  const MemberArticlePage({super.key});
+
+  @override
+  State<MemberArticlePage> createState() => _MemberArticlePageState();
+}
+
+class _MemberArticlePageState extends State<MemberArticlePage> {
+  late MemberArticleController _memberArticleController;
+  late Future _futureBuilderFuture;
+  late ScrollController scrollController;
+  late int mid;
+
+  @override
+  void initState() {
+    super.initState();
+    mid = int.parse(Get.parameters['mid']!);
+    final String heroTag = Utils.makeHeroTag(mid);
+    _memberArticleController = Get.put(MemberArticleController(), tag: heroTag);
+    _futureBuilderFuture = _memberArticleController.getMemberArticle('init');
+    scrollController = _memberArticleController.scrollController;
+
+    scrollController.addListener(_scrollListener);
+  }
+
+  void _scrollListener() {
+    if (scrollController.position.pixels >=
+        scrollController.position.maxScrollExtent - 200) {
+      EasyThrottle.throttle(
+          'member_archives', const Duration(milliseconds: 500), () {
+        _memberArticleController.getMemberArticle('onLoad');
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        titleSpacing: 0,
+        centerTitle: false,
+        title: const Text('Ta的图文', style: TextStyle(fontSize: 16)),
+      ),
+      body: FutureBuilder(
+        future: _futureBuilderFuture,
+        builder: (BuildContext context, snapshot) {
+          if (snapshot.connectionState == ConnectionState.done) {
+            if (snapshot.data != null) {
+              return _buildContent(snapshot.data as Map);
+            } else {
+              return _buildError(snapshot.data['msg']);
+            }
+          } else {
+            return ListView.builder(
+              itemCount: 10,
+              itemBuilder: (BuildContext context, int index) {
+                return _buildSkeleton();
+              },
+            );
+          }
+        },
+      ),
+    );
+  }
+
+  Widget _buildContent(Map data) {
+    RxList list = _memberArticleController.articleList;
+    if (data['status']) {
+      return Obx(
+        () => list.isNotEmpty
+            ? ListView.separated(
+                controller: scrollController,
+                itemCount: list.length,
+                separatorBuilder: (BuildContext context, int index) {
+                  return Divider(
+                    height: 10,
+                    color: Theme.of(context).dividerColor.withOpacity(0.15),
+                  );
+                },
+                itemBuilder: (BuildContext context, int index) {
+                  return _buildListItem(list[index]);
+                },
+              )
+            : const CustomScrollView(
+                physics: NeverScrollableScrollPhysics(),
+                slivers: [
+                  NoData(),
+                ],
+              ),
+      );
+    } else {
+      return _buildError(data['msg']);
+    }
+  }
+
+  Widget _buildListItem(dynamic item) {
+    return ListTile(
+      onTap: () {
+        Get.toNamed('/opus', parameters: {
+          'title': item.content,
+          'id': item.opusId,
+          'articleType': 'opus',
+        });
+      },
+      leading: NetworkImgLayer(
+        width: 50,
+        height: 50,
+        type: 'emote',
+        src: item.cover['url'],
+      ),
+      title: Text(
+        item.content,
+        maxLines: 2,
+        overflow: TextOverflow.ellipsis,
+      ),
+      subtitle: Padding(
+        padding: const EdgeInsets.only(top: 4),
+        child: Text(
+          '${item.stat["like"]}人点赞',
+          style: TextStyle(
+            fontSize: 12,
+            color: Theme.of(context).colorScheme.outline,
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildError(String errMsg) {
+    return CustomScrollView(
+      physics: const NeverScrollableScrollPhysics(),
+      slivers: [
+        SliverToBoxAdapter(
+          child: HttpError(
+            errMsg: errMsg,
+            fn: () {},
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildSkeleton() {
+    return Skeleton(
+      child: ListTile(
+        leading: Container(
+          width: 50,
+          height: 50,
+          decoration: BoxDecoration(
+            color: Theme.of(context).colorScheme.onInverseSurface,
+            borderRadius: BorderRadius.circular(4),
+          ),
+        ),
+        title: Container(
+          height: 16,
+          color: Theme.of(context).colorScheme.onInverseSurface,
+        ),
+        subtitle: Container(
+          height: 11,
+          color: Theme.of(context).colorScheme.onInverseSurface,
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/member_coin/widgets/item.dart b/lib/pages/member_coin/widgets/item.dart
index de28585c..6d732694 100644
--- a/lib/pages/member_coin/widgets/item.dart
+++ b/lib/pages/member_coin/widgets/item.dart
@@ -69,10 +69,7 @@ class MemberCoinsItem extends StatelessWidget {
                   const SizedBox(height: 4),
                   Row(
                     children: [
-                      StatView(
-                        view: coinItem.view,
-                        theme: 'gray',
-                      ),
+                      StatView(view: coinItem.view),
                       const Spacer(),
                       Text(
                         Utils.CustomStamp_str(
diff --git a/lib/pages/member_like/widgets/item.dart b/lib/pages/member_like/widgets/item.dart
new file mode 100644
index 00000000..3b3c81da
--- /dev/null
+++ b/lib/pages/member_like/widgets/item.dart
@@ -0,0 +1,93 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/constants.dart';
+import 'package:pilipala/common/widgets/badge.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/common/widgets/stat/view.dart';
+import 'package:pilipala/http/search.dart';
+import 'package:pilipala/models/member/like.dart';
+import 'package:pilipala/utils/utils.dart';
+
+class MemberLikeItem extends StatelessWidget {
+  final MemberLikeDataModel likeItem;
+
+  const MemberLikeItem({
+    Key? key,
+    required this.likeItem,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    String heroTag = Utils.makeHeroTag(likeItem.aid);
+    return Card(
+      elevation: 0,
+      clipBehavior: Clip.hardEdge,
+      margin: EdgeInsets.zero,
+      child: InkWell(
+        onTap: () async {
+          int cid =
+              await SearchHttp.ab2c(aid: likeItem.aid, bvid: likeItem.bvid);
+          Get.toNamed('/video?bvid=${likeItem.bvid}&cid=$cid',
+              arguments: {'videoItem': likeItem, 'heroTag': heroTag});
+        },
+        child: Column(
+          children: [
+            AspectRatio(
+              aspectRatio: StyleString.aspectRatio,
+              child: LayoutBuilder(builder: (context, boxConstraints) {
+                double maxWidth = boxConstraints.maxWidth;
+                double maxHeight = boxConstraints.maxHeight;
+                return Stack(
+                  children: [
+                    NetworkImgLayer(
+                      src: likeItem.pic,
+                      width: maxWidth,
+                      height: maxHeight,
+                    ),
+                    if (likeItem.duration != null)
+                      PBadge(
+                        bottom: 6,
+                        right: 6,
+                        type: 'gray',
+                        text: Utils.timeFormat(likeItem.duration),
+                      )
+                  ],
+                );
+              }),
+            ),
+            Padding(
+              padding: const EdgeInsets.fromLTRB(5, 6, 0, 0),
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    likeItem.title!,
+                    maxLines: 2,
+                    overflow: TextOverflow.ellipsis,
+                  ),
+                  const SizedBox(height: 4),
+                  Row(
+                    children: [
+                      StatView(view: likeItem.stat!.view),
+                      const Spacer(),
+                      Text(
+                        Utils.CustomStamp_str(
+                            timestamp: likeItem.pubdate, date: 'MM-DD'),
+                        style: TextStyle(
+                          fontSize: 11,
+                          color: Theme.of(context).colorScheme.outline,
+                        ),
+                      ),
+                      const SizedBox(width: 6)
+                    ],
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/member_seasons/controller.dart b/lib/pages/member_seasons/controller.dart
index 82ef0af0..4e7c9762 100644
--- a/lib/pages/member_seasons/controller.dart
+++ b/lib/pages/member_seasons/controller.dart
@@ -6,7 +6,9 @@ import 'package:pilipala/models/member/seasons.dart';
 class MemberSeasonsController extends GetxController {
   final ScrollController scrollController = ScrollController();
   late int mid;
-  late int seasonId;
+  int? seasonId;
+  int? seriesId;
+  late String category;
   int pn = 1;
   int ps = 30;
   int count = 0;
@@ -17,17 +19,23 @@ class MemberSeasonsController extends GetxController {
   void onInit() {
     super.onInit();
     mid = int.parse(Get.parameters['mid']!);
-    seasonId = int.parse(Get.parameters['seasonId']!);
+    category = Get.parameters['category']!;
+    if (category == '0') {
+      seasonId = int.parse(Get.parameters['seasonId']!);
+    }
+    if (category == '1') {
+      seriesId = int.parse(Get.parameters['seriesId']!);
+    }
   }
 
-  // 获取专栏详情
+  // 获取专栏详情 0: 专栏 1: 系列
   Future getSeasonDetail(type) async {
     if (type == 'onRefresh') {
       pn = 1;
     }
     var res = await MemberHttp.getSeasonDetail(
       mid: mid,
-      seasonId: seasonId,
+      seasonId: seasonId!,
       pn: pn,
       ps: ps,
       sortReverse: false,
@@ -40,8 +48,32 @@ class MemberSeasonsController extends GetxController {
     return res;
   }
 
+  // 获取系列详情 0: 专栏 1: 系列
+  Future getSeriesDetail(type) async {
+    if (type == 'onRefresh') {
+      pn = 1;
+    }
+    var res = await MemberHttp.getSeriesDetail(
+      mid: mid,
+      seriesId: seriesId!,
+      pn: pn,
+      currentMid: 17340771,
+    );
+    if (res['status']) {
+      seasonsList.addAll(res['data'].seriesList);
+      page = res['data'].page;
+      pn += 1;
+    }
+    return res;
+  }
+
   // 上拉加载
   Future onLoad() async {
-    getSeasonDetail('onLoad');
+    if (category == '0') {
+      getSeasonDetail('onLoad');
+    }
+    if (category == '1') {
+      getSeriesDetail('onLoad');
+    }
   }
 }
diff --git a/lib/pages/member_seasons/view.dart b/lib/pages/member_seasons/view.dart
index 06944f10..b8c0407d 100644
--- a/lib/pages/member_seasons/view.dart
+++ b/lib/pages/member_seasons/view.dart
@@ -17,12 +17,15 @@ class _MemberSeasonsPageState extends State<MemberSeasonsPage> {
       Get.put(MemberSeasonsController());
   late Future _futureBuilderFuture;
   late ScrollController scrollController;
+  late String category;
 
   @override
   void initState() {
     super.initState();
-    _futureBuilderFuture =
-        _memberSeasonsController.getSeasonDetail('onRefresh');
+    category = Get.parameters['category']!;
+    _futureBuilderFuture = category == '0'
+        ? _memberSeasonsController.getSeasonDetail('onRefresh')
+        : _memberSeasonsController.getSeriesDetail('onRefresh');
     scrollController = _memberSeasonsController.scrollController;
     scrollController.addListener(
       () {
@@ -43,7 +46,8 @@ class _MemberSeasonsPageState extends State<MemberSeasonsPage> {
       appBar: AppBar(
         titleSpacing: 0,
         centerTitle: false,
-        title: Text('他的专栏', style: Theme.of(context).textTheme.titleMedium),
+        title: Text(Get.parameters['seasonName']!,
+            style: Theme.of(context).textTheme.titleMedium),
       ),
       body: Padding(
         padding: const EdgeInsets.only(
diff --git a/lib/pages/member_seasons/widgets/item.dart b/lib/pages/member_seasons/widgets/item.dart
index 85b763b7..8d877773 100644
--- a/lib/pages/member_seasons/widgets/item.dart
+++ b/lib/pages/member_seasons/widgets/item.dart
@@ -78,10 +78,7 @@ class MemberSeasonsItem extends StatelessWidget {
                   const SizedBox(height: 4),
                   Row(
                     children: [
-                      StatView(
-                        view: seasonItem.view,
-                        theme: 'gray',
-                      ),
+                      StatView(view: seasonItem.view),
                       const Spacer(),
                       Text(
                         Utils.CustomStamp_str(
diff --git a/lib/pages/message/like/view.dart b/lib/pages/message/like/view.dart
index e677fb25..8b061505 100644
--- a/lib/pages/message/like/view.dart
+++ b/lib/pages/message/like/view.dart
@@ -203,13 +203,13 @@ class LikeItem extends StatelessWidget {
                       Text.rich(TextSpan(children: [
                         TextSpan(text: nickNameList.join('、')),
                         const TextSpan(text: ' '),
-                        if (item.users!.length > 1)
+                        if (item.counts! > 1)
                           TextSpan(
-                            text: '等总计${item.users!.length}人',
+                            text: '等总计${item.counts}人',
                             style: TextStyle(color: outline),
                           ),
                         TextSpan(
-                          text: '赞了我的评论',
+                          text: '赞了我的${item.item!.business}',
                           style: TextStyle(color: outline),
                         ),
                       ])),
diff --git a/lib/pages/message/reply/view.dart b/lib/pages/message/reply/view.dart
index 881f8650..9776c7f7 100644
--- a/lib/pages/message/reply/view.dart
+++ b/lib/pages/message/reply/view.dart
@@ -196,7 +196,7 @@ class ReplyItem extends StatelessWidget {
                         style: TextStyle(color: outline),
                       ),
                       const SizedBox(width: 16),
-                      Text('回复', style: TextStyle(color: outline)),
+                      // Text('回复', style: TextStyle(color: outline)),
                     ],
                   )
                 ],
diff --git a/lib/pages/message/system/controller.dart b/lib/pages/message/system/controller.dart
index ad28af56..c4731120 100644
--- a/lib/pages/message/system/controller.dart
+++ b/lib/pages/message/system/controller.dart
@@ -1,3 +1,54 @@
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
+import 'package:pilipala/http/msg.dart';
+import 'package:pilipala/models/msg/system.dart';
 
-class MessageSystemController extends GetxController {}
+class MessageSystemController extends GetxController {
+  RxList<MessageSystemModel> systemItems = <MessageSystemModel>[].obs;
+
+  Future<void> queryAndProcessMessages({String type = 'init'}) async {
+    // 并行调用两个接口
+    var results = await Future.wait([
+      queryMessageSystem(type: type),
+      queryMessageSystemAccount(type: type),
+    ]);
+
+    // 对返回的数据进行处理
+    var systemRes = results[0];
+    var accountRes = results[1];
+
+    if (systemRes['status'] || accountRes['status']) {
+      // 处理返回的数据
+      List<MessageSystemModel> combinedData = [
+        ...systemRes['data'],
+        ...accountRes['data']
+      ];
+      combinedData.sort((a, b) => b.cursor!.compareTo(a.cursor!));
+      systemItems.addAll(combinedData);
+      systemItems.refresh();
+      if (systemItems.isNotEmpty) {
+        systemMarkRead(systemItems.first.cursor!);
+      }
+    } else {
+      SmartDialog.showToast(systemRes['msg'] ?? accountRes['msg']);
+    }
+    return systemRes;
+  }
+
+  // 获取系统消息
+  Future queryMessageSystem({String type = 'init'}) async {
+    var res = await MsgHttp.messageSystem();
+    return res;
+  }
+
+  // 获取系统消息 个人
+  Future queryMessageSystemAccount({String type = 'init'}) async {
+    var res = await MsgHttp.messageSystemAccount();
+    return res;
+  }
+
+  // 标记已读
+  void systemMarkRead(int cursor) async {
+    await MsgHttp.systemMarkRead(cursor);
+  }
+}
diff --git a/lib/pages/message/system/view.dart b/lib/pages/message/system/view.dart
index da0f1219..ee10b639 100644
--- a/lib/pages/message/system/view.dart
+++ b/lib/pages/message/system/view.dart
@@ -1,4 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/widgets/http_error.dart';
+import 'package:pilipala/models/msg/system.dart';
+import 'controller.dart';
 
 class MessageSystemPage extends StatefulWidget {
   const MessageSystemPage({super.key});
@@ -8,12 +12,111 @@ class MessageSystemPage extends StatefulWidget {
 }
 
 class _MessageSystemPageState extends State<MessageSystemPage> {
+  final MessageSystemController _messageSystemCtr =
+      Get.put(MessageSystemController());
+  late Future _futureBuilderFuture;
+  final ScrollController scrollController = ScrollController();
+
+  @override
+  void initState() {
+    super.initState();
+    _futureBuilderFuture = _messageSystemCtr.queryAndProcessMessages();
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
         title: const Text('系统通知'),
       ),
+      body: RefreshIndicator(
+        onRefresh: () async {
+          await _messageSystemCtr.queryAndProcessMessages();
+        },
+        child: FutureBuilder(
+          future: _futureBuilderFuture,
+          builder: (BuildContext context, AsyncSnapshot snapshot) {
+            if (snapshot.connectionState == ConnectionState.done) {
+              if (snapshot.data == null) {
+                return const SizedBox();
+              }
+              if (snapshot.data['status']) {
+                final systemItems = _messageSystemCtr.systemItems;
+                return Obx(
+                  () => ListView.separated(
+                    controller: scrollController,
+                    itemBuilder: (context, index) => SystemItem(
+                      item: systemItems[index],
+                      index: index,
+                      messageSystemCtr: _messageSystemCtr,
+                    ),
+                    itemCount: systemItems.length,
+                    separatorBuilder: (BuildContext context, int index) {
+                      return Divider(
+                        indent: 14,
+                        endIndent: 14,
+                        height: 1,
+                        color: Colors.grey.withOpacity(0.1),
+                      );
+                    },
+                  ),
+                );
+              } else {
+                // 请求错误
+                return CustomScrollView(
+                  slivers: [
+                    HttpError(
+                      errMsg: snapshot.data['msg'],
+                      fn: () {
+                        setState(() {
+                          _futureBuilderFuture =
+                              _messageSystemCtr.queryMessageSystem();
+                        });
+                      },
+                    )
+                  ],
+                );
+              }
+            } else {
+              return const SizedBox();
+            }
+          },
+        ),
+      ),
+    );
+  }
+}
+
+class SystemItem extends StatelessWidget {
+  final MessageSystemModel item;
+  final int index;
+  final MessageSystemController messageSystemCtr;
+
+  const SystemItem(
+      {super.key,
+      required this.item,
+      required this.index,
+      required this.messageSystemCtr});
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.fromLTRB(14, 14, 14, 12),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(item.title!,
+              style:
+                  const TextStyle(fontSize: 16, fontWeight: FontWeight.bold)),
+          const SizedBox(height: 4),
+          Text(
+            item.timeAt!,
+            style: TextStyle(color: Theme.of(context).colorScheme.outline),
+          ),
+          const SizedBox(height: 6),
+          Text(item.content is String ? item.content : item.content!['web']),
+        ],
+      ),
     );
   }
 }
diff --git a/lib/pages/opus/controller.dart b/lib/pages/opus/controller.dart
new file mode 100644
index 00000000..f00c45b5
--- /dev/null
+++ b/lib/pages/opus/controller.dart
@@ -0,0 +1,84 @@
+import 'dart:async';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/http/read.dart';
+import 'package:pilipala/models/read/opus.dart';
+import 'package:pilipala/plugin/pl_gallery/hero_dialog_route.dart';
+import 'package:pilipala/plugin/pl_gallery/interactiveviewer_gallery.dart';
+
+class OpusController extends GetxController {
+  late String url;
+  RxString title = ''.obs;
+  late String id;
+  late String articleType;
+  Rx<OpusDataModel> opusData = OpusDataModel().obs;
+  final ScrollController scrollController = ScrollController();
+  late StreamController<bool> appbarStream = StreamController<bool>.broadcast();
+
+  @override
+  void onInit() {
+    super.onInit();
+    title.value = Get.parameters['title'] ?? '';
+    id = Get.parameters['id']!;
+    articleType = Get.parameters['articleType']!;
+    if (articleType == 'opus') {
+      url = 'https://www.bilibili.com/opus/$id';
+    }
+    scrollController.addListener(_scrollListener);
+  }
+
+  Future fetchOpusData() async {
+    var res = await ReadHttp.parseArticleOpus(id: id);
+    if (res['status']) {
+      List<String> keys = res.keys.toList();
+      if (keys.contains('isCv') && res['isCv']) {
+        Get.offNamed('/read', parameters: {
+          'id': res['cvId'],
+          'title': title.value,
+          'articleType': 'cv',
+        });
+      } else {
+        title.value = res['data'].detail!.basic!.title!;
+        opusData.value = res['data'];
+      }
+    }
+    return res;
+  }
+
+  void _scrollListener() {
+    final double offset = scrollController.position.pixels;
+    if (offset > 100) {
+      appbarStream.add(true);
+    } else {
+      appbarStream.add(false);
+    }
+  }
+
+  void onPreviewImg(picList, initIndex, context) {
+    Navigator.of(context).push(
+      HeroDialogRoute<void>(
+        builder: (BuildContext context) => InteractiveviewerGallery(
+          sources: picList,
+          initIndex: initIndex,
+          onPageChanged: (int pageIndex) {},
+        ),
+      ),
+    );
+  }
+
+  // 跳转webview
+  void onJumpWebview() {
+    Get.toNamed('/webview', parameters: {
+      'url': url,
+      'type': 'webview',
+      'pageTitle': title.value,
+    });
+  }
+
+  @override
+  void onClose() {
+    scrollController.removeListener(_scrollListener);
+    appbarStream.close();
+    super.onClose();
+  }
+}
diff --git a/lib/pages/opus/index.dart b/lib/pages/opus/index.dart
new file mode 100644
index 00000000..a65b57a0
--- /dev/null
+++ b/lib/pages/opus/index.dart
@@ -0,0 +1,4 @@
+library opus;
+
+export 'controller.dart';
+export 'view.dart';
diff --git a/lib/pages/opus/text_helper.dart b/lib/pages/opus/text_helper.dart
new file mode 100644
index 00000000..0ec8b088
--- /dev/null
+++ b/lib/pages/opus/text_helper.dart
@@ -0,0 +1,62 @@
+import 'package:flutter/material.dart';
+import 'package:pilipala/models/read/opus.dart';
+
+class TextHelper {
+  static Alignment getAlignment(int? align) {
+    switch (align) {
+      case 1:
+        return Alignment.center;
+      case 0:
+        return Alignment.centerLeft;
+      case 2:
+        return Alignment.centerRight;
+      default:
+        return Alignment.centerLeft;
+    }
+  }
+
+  static TextSpan buildTextSpan(
+      ModuleParagraphTextNode node, int? align, BuildContext context) {
+    // 获取node的所有key
+    if (node.nodeType != null) {
+      return TextSpan(
+        text: node.word?.words ?? '',
+        style: TextStyle(
+          fontSize:
+              node.word?.fontSize != null ? node.word!.fontSize! * 0.95 : 14,
+          fontWeight: node.word?.style?.bold != null
+              ? FontWeight.bold
+              : FontWeight.normal,
+          height: align == 1 ? 2 : 1.5,
+          color: node.word?.color != null
+              ? Color(int.parse(node.word!.color!.substring(1, 7), radix: 16) +
+                  0xFF000000)
+              : Theme.of(context).colorScheme.onBackground,
+        ),
+      );
+    } else {
+      switch (node.type) {
+        case 'TEXT_NODE_TYPE_WORD':
+          return TextSpan(
+            text: node.word?.words ?? '',
+            style: TextStyle(
+              fontSize: node.word?.fontSize != null
+                  ? node.word!.fontSize! * 0.95
+                  : 14,
+              fontWeight: node.word?.style?.bold != null
+                  ? FontWeight.bold
+                  : FontWeight.normal,
+              height: align == 1 ? 2 : 1.5,
+              color: node.word?.color != null
+                  ? Color(
+                      int.parse(node.word!.color!.substring(1, 7), radix: 16) +
+                          0xFF000000)
+                  : Theme.of(context).colorScheme.onBackground,
+            ),
+          );
+        default:
+          return const TextSpan(text: '');
+      }
+    }
+  }
+}
diff --git a/lib/pages/opus/view.dart b/lib/pages/opus/view.dart
new file mode 100644
index 00000000..42c0c419
--- /dev/null
+++ b/lib/pages/opus/view.dart
@@ -0,0 +1,291 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/models/read/opus.dart';
+import 'controller.dart';
+import 'text_helper.dart';
+
+class OpusPage extends StatefulWidget {
+  const OpusPage({super.key});
+
+  @override
+  State<OpusPage> createState() => _OpusPageState();
+}
+
+class _OpusPageState extends State<OpusPage> {
+  final OpusController controller = Get.put(OpusController());
+  late Future _futureBuilderFuture;
+
+  @override
+  void initState() {
+    super.initState();
+    _futureBuilderFuture = controller.fetchOpusData();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: _buildAppBar(),
+      body: SingleChildScrollView(
+        controller: controller.scrollController,
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.start,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            _buildTitle(),
+            _buildFutureContent(),
+          ],
+        ),
+      ),
+    );
+  }
+
+  AppBar _buildAppBar() {
+    return AppBar(
+      title: StreamBuilder(
+        stream: controller.appbarStream.stream.distinct(),
+        initialData: false,
+        builder: (BuildContext context, AsyncSnapshot snapshot) {
+          return AnimatedOpacity(
+            opacity: snapshot.data ? 1 : 0,
+            curve: Curves.easeOut,
+            duration: const Duration(milliseconds: 500),
+            child: Obx(
+              () => Text(
+                controller.title.value,
+                style: const TextStyle(fontSize: 16),
+              ),
+            ),
+          );
+        },
+      ),
+      actions: [
+        PopupMenuButton(
+          icon: const Icon(Icons.more_vert_outlined),
+          itemBuilder: (BuildContext context) => <PopupMenuEntry>[
+            PopupMenuItem(
+              onTap: controller.onJumpWebview,
+              child: const Text('查看原网页'),
+            )
+          ],
+        ),
+        const SizedBox(width: 16),
+      ],
+    );
+  }
+
+  Widget _buildTitle() {
+    return Padding(
+      padding: const EdgeInsets.fromLTRB(16, 16, 16, 4),
+      child: Obx(
+        () => Text(
+          controller.title.value,
+          style: const TextStyle(
+            fontSize: 24,
+            fontWeight: FontWeight.bold,
+            letterSpacing: 1,
+            height: 1.5,
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildFutureContent() {
+    return FutureBuilder(
+      future: _futureBuilderFuture,
+      builder: (BuildContext context, AsyncSnapshot snapshot) {
+        if (snapshot.connectionState == ConnectionState.done) {
+          if (snapshot.data == null) {
+            return const SizedBox();
+          }
+          if (snapshot.data['status']) {
+            return _buildContent(controller.opusData.value);
+          } else {
+            return _buildError(snapshot.data['message']);
+          }
+        } else {
+          return _buildLoading();
+        }
+      },
+    );
+  }
+
+  Widget _buildContent(OpusDataModel opusData) {
+    if (opusData.detail == null) {
+      return const SizedBox();
+    }
+    final modules = opusData.detail!.modules!;
+    late ModuleContent moduleContent;
+    // 获取所有的图片链接
+    final List<String> picList = [];
+    final int moduleIndex =
+        modules.indexWhere((module) => module.moduleContent != null);
+    if (moduleIndex != -1) {
+      moduleContent = modules[moduleIndex].moduleContent!;
+      for (var paragraph in moduleContent.paragraphs!) {
+        if (paragraph.paraType == 2) {
+          for (var pic in paragraph.pic!.pics!) {
+            picList.add(pic.url!);
+          }
+        }
+      }
+    } else {
+      print('No moduleContent found');
+    }
+
+    return Padding(
+      padding: EdgeInsets.fromLTRB(
+          16, 0, 16, MediaQuery.of(context).padding.bottom + 40),
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.start,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Padding(
+            padding: const EdgeInsets.only(bottom: 30),
+            child: _buildStatsWidget(opusData),
+          ),
+          Padding(
+            padding: const EdgeInsets.only(bottom: 20),
+            child: _buildAuthorWidget(opusData),
+          ),
+          ...moduleContent.paragraphs!.map(
+            (ModuleParagraph paragraph) {
+              return Column(
+                children: [
+                  if (paragraph.paraType == 1) ...[
+                    Container(
+                      alignment: TextHelper.getAlignment(paragraph.align),
+                      margin: const EdgeInsets.only(bottom: 10),
+                      child: SelectableText.rich(
+                        TextSpan(
+                          children: paragraph.text?.nodes?.map((node) {
+                                return TextHelper.buildTextSpan(
+                                    node, paragraph.align, context);
+                              }).toList() ??
+                              [],
+                        ),
+                      ),
+                    )
+                  ] else if (paragraph.paraType == 2) ...[
+                    ...paragraph.pic?.pics?.map(
+                          (Pic pic) => Center(
+                            child: Padding(
+                              padding:
+                                  const EdgeInsets.only(top: 10, bottom: 10),
+                              child: InkWell(
+                                onTap: () {
+                                  controller.onPreviewImg(
+                                    picList,
+                                    picList.indexOf(pic.url!),
+                                    context,
+                                  );
+                                },
+                                child: NetworkImgLayer(
+                                  src: pic.url,
+                                  width: (Get.size.width - 32) * pic.scale!,
+                                  height: (Get.size.width - 32) *
+                                      pic.scale! /
+                                      pic.aspectRatio!,
+                                  type: 'emote',
+                                ),
+                              ),
+                            ),
+                          ),
+                        ) ??
+                        [],
+                  ] else
+                    const SizedBox(),
+                ],
+              );
+            },
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildAuthorWidget(OpusDataModel opusData) {
+    final modules = opusData.detail!.modules!;
+    late ModuleAuthor moduleAuthor;
+    final int moduleIndex =
+        modules.indexWhere((module) => module.moduleAuthor != null);
+    if (moduleIndex != -1) {
+      moduleAuthor = modules[moduleIndex].moduleAuthor!;
+    } else {
+      return const SizedBox();
+    }
+    return Row(
+      children: [
+        NetworkImgLayer(
+          width: 48,
+          height: 48,
+          type: 'avatar',
+          src: moduleAuthor.face,
+        ),
+        const SizedBox(width: 10),
+        Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              moduleAuthor.name!,
+              style: const TextStyle(
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+            StyledText(moduleAuthor.pubTime!),
+          ],
+        ),
+      ],
+    );
+  }
+
+  Widget _buildStatsWidget(OpusDataModel opusData) {
+    final modules = opusData.detail!.modules!;
+    final ModuleStat moduleStat = modules.last.moduleStat!;
+    return Row(
+      children: [
+        StyledText('${moduleStat.comment!.count}评论'),
+        const SizedBox(width: 10),
+        StyledText('${moduleStat.like!.count}赞'),
+        const SizedBox(width: 10),
+        StyledText('${moduleStat.favorite!.count}转发'),
+      ],
+    );
+  }
+
+  Widget _buildError(String message) {
+    return SizedBox(
+      height: 100,
+      child: Center(
+        child: Text(message),
+      ),
+    );
+  }
+
+  Widget _buildLoading() {
+    return const SizedBox(
+      height: 100,
+      child: Center(
+        child: CircularProgressIndicator(),
+      ),
+    );
+  }
+}
+
+class StyledText extends StatelessWidget {
+  final String text;
+
+  const StyledText(this.text, {Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Text(
+      text,
+      style: TextStyle(
+        fontSize: 13,
+        color: Theme.of(context).colorScheme.outline,
+      ),
+    );
+  }
+}
diff --git a/lib/pages/preview/controller.dart b/lib/pages/preview/controller.dart
deleted file mode 100644
index bb06b275..00000000
--- a/lib/pages/preview/controller.dart
+++ /dev/null
@@ -1,50 +0,0 @@
-import 'dart:io';
-
-import 'package:device_info_plus/device_info_plus.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
-import 'package:get/get.dart';
-import 'package:dio/dio.dart';
-import 'package:path_provider/path_provider.dart';
-import 'package:permission_handler/permission_handler.dart';
-import 'package:share_plus/share_plus.dart';
-
-class PreviewController extends GetxController {
-  DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
-  RxInt initialPage = 0.obs;
-  RxInt currentPage = 1.obs;
-  RxList imgList = [].obs;
-  bool storage = true;
-  bool videos = true;
-  bool photos = true;
-  String currentImgUrl = '';
-
-  requestPermission() async {
-    Map<Permission, PermissionStatus> statuses = await [
-      Permission.storage,
-      // Permission.photos
-    ].request();
-
-    statuses[Permission.storage].toString();
-    // final photosInfo = statuses[Permission.photos].toString();
-  }
-
-  // 图片分享
-  void onShareImg() async {
-    SmartDialog.showLoading();
-    var response = await Dio().get(imgList[initialPage.value],
-        options: Options(responseType: ResponseType.bytes));
-    final temp = await getTemporaryDirectory();
-    SmartDialog.dismiss();
-    String imgName =
-        "plpl_pic_${DateTime.now().toString().split('-').join()}.jpg";
-    var path = '${temp.path}/$imgName';
-    File(path).writeAsBytesSync(response.data);
-    Share.shareXFiles([XFile(path)], subject: imgList[initialPage.value]);
-  }
-
-  void onChange(int index) {
-    initialPage.value = index;
-    currentPage.value = index + 1;
-    currentImgUrl = imgList[index];
-  }
-}
diff --git a/lib/pages/preview/view.dart b/lib/pages/preview/view.dart
deleted file mode 100644
index 13868d37..00000000
--- a/lib/pages/preview/view.dart
+++ /dev/null
@@ -1,290 +0,0 @@
-// ignore_for_file: library_private_types_in_public_api
-
-import 'dart:io';
-
-import 'package:dismissible_page/dismissible_page.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
-import 'package:get/get.dart';
-import 'package:flutter/material.dart';
-import 'package:extended_image/extended_image.dart';
-import 'package:pilipala/utils/download.dart';
-import 'controller.dart';
-import 'package:status_bar_control/status_bar_control.dart';
-
-typedef DoubleClickAnimationListener = void Function();
-
-class ImagePreview extends StatefulWidget {
-  final int? initialPage;
-  final List<String>? imgList;
-  const ImagePreview({
-    Key? key,
-    this.initialPage,
-    this.imgList,
-  }) : super(key: key);
-
-  @override
-  _ImagePreviewState createState() => _ImagePreviewState();
-}
-
-class _ImagePreviewState extends State<ImagePreview>
-    with TickerProviderStateMixin {
-  final PreviewController _previewController = Get.put(PreviewController());
-  // late AnimationController animationController;
-  late AnimationController _doubleClickAnimationController;
-  Animation<double>? _doubleClickAnimation;
-  late DoubleClickAnimationListener _doubleClickAnimationListener;
-  List<double> doubleTapScales = <double>[1.0, 2.0];
-  bool _dismissDisabled = false;
-
-  @override
-  void initState() {
-    super.initState();
-
-    _previewController.initialPage.value = widget.initialPage!;
-    _previewController.currentPage.value = widget.initialPage! + 1;
-    _previewController.imgList.value = widget.imgList!;
-    _previewController.currentImgUrl = widget.imgList![widget.initialPage!];
-    // animationController = AnimationController(
-    //     vsync: this, duration: const Duration(milliseconds: 400));
-    setStatusBar();
-    _doubleClickAnimationController = AnimationController(
-        duration: const Duration(milliseconds: 250), vsync: this);
-  }
-
-  onOpenMenu() {
-    showDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return AlertDialog(
-          clipBehavior: Clip.hardEdge,
-          contentPadding: const EdgeInsets.fromLTRB(0, 12, 0, 12),
-          content: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              ListTile(
-                onTap: () {
-                  _previewController.onShareImg();
-                  Get.back();
-                },
-                dense: true,
-                title: const Text('分享', style: TextStyle(fontSize: 14)),
-              ),
-              ListTile(
-                onTap: () {
-                  Clipboard.setData(
-                          ClipboardData(text: _previewController.currentImgUrl))
-                      .then((value) {
-                    Get.back();
-                    SmartDialog.showToast('已复制到粘贴板');
-                  }).catchError((err) {
-                    SmartDialog.showNotify(
-                      msg: err.toString(),
-                      notifyType: NotifyType.error,
-                    );
-                  });
-                },
-                dense: true,
-                title: const Text('复制链接', style: TextStyle(fontSize: 14)),
-              ),
-              ListTile(
-                onTap: () {
-                  Get.back();
-                  DownloadUtils.downloadImg(_previewController.currentImgUrl);
-                },
-                dense: true,
-                title: const Text('保存到手机', style: TextStyle(fontSize: 14)),
-              ),
-            ],
-          ),
-        );
-      },
-    );
-  }
-
-  // 隐藏状态栏，避免遮挡图片内容
-  setStatusBar() async {
-    if (Platform.isIOS || Platform.isAndroid) {
-      await StatusBarControl.setHidden(true,
-          animation: StatusBarAnimation.SLIDE);
-    }
-  }
-
-  @override
-  void dispose() {
-    // animationController.dispose();
-    try {
-      StatusBarControl.setHidden(false, animation: StatusBarAnimation.SLIDE);
-    } catch (_) {}
-    _doubleClickAnimationController.dispose();
-    clearGestureDetailsCache();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Colors.black,
-      primary: false,
-      extendBody: true,
-      appBar: AppBar(
-        primary: false,
-        toolbarHeight: 0,
-        backgroundColor: Colors.black,
-        systemOverlayStyle: SystemUiOverlayStyle.dark,
-      ),
-      body: Stack(
-        children: [
-          GestureDetector(
-            onLongPress: () => onOpenMenu(),
-            child: ExtendedImageGesturePageView.builder(
-              controller: ExtendedPageController(
-                initialPage: _previewController.initialPage.value,
-                pageSpacing: 0,
-              ),
-              onPageChanged: (int index) => _previewController.onChange(index),
-              canScrollPage: (GestureDetails? gestureDetails) =>
-                  gestureDetails!.totalScale! <= 1.0,
-              itemCount: widget.imgList!.length,
-              itemBuilder: (BuildContext context, int index) {
-                return ExtendedImage.network(
-                  widget.imgList![index],
-                  fit: BoxFit.contain,
-                  mode: ExtendedImageMode.gesture,
-                  onDoubleTap: (ExtendedImageGestureState state) {
-                    final Offset? pointerDownPosition =
-                        state.pointerDownPosition;
-                    final double? begin = state.gestureDetails!.totalScale;
-                    double end;
-
-                    //remove old
-                    _doubleClickAnimation
-                        ?.removeListener(_doubleClickAnimationListener);
-
-                    //stop pre
-                    _doubleClickAnimationController.stop();
-
-                    //reset to use
-                    _doubleClickAnimationController.reset();
-
-                    if (begin == doubleTapScales[0]) {
-                      setState(() {
-                        _dismissDisabled = true;
-                      });
-                      end = doubleTapScales[1];
-                    } else {
-                      setState(() {
-                        _dismissDisabled = false;
-                      });
-                      end = doubleTapScales[0];
-                    }
-
-                    _doubleClickAnimationListener = () {
-                      state.handleDoubleTap(
-                          scale: _doubleClickAnimation!.value,
-                          doubleTapPosition: pointerDownPosition);
-                    };
-                    _doubleClickAnimation = _doubleClickAnimationController
-                        .drive(Tween<double>(begin: begin, end: end));
-
-                    _doubleClickAnimation!
-                        .addListener(_doubleClickAnimationListener);
-
-                    _doubleClickAnimationController.forward();
-                  },
-                  // ignore: body_might_complete_normally_nullable
-                  loadStateChanged: (ExtendedImageState state) {
-                    if (state.extendedImageLoadState == LoadState.loading) {
-                      final ImageChunkEvent? loadingProgress =
-                          state.loadingProgress;
-                      final double? progress =
-                          loadingProgress?.expectedTotalBytes != null
-                              ? loadingProgress!.cumulativeBytesLoaded /
-                                  loadingProgress.expectedTotalBytes!
-                              : null;
-                      return Center(
-                        child: Column(
-                          mainAxisAlignment: MainAxisAlignment.center,
-                          crossAxisAlignment: CrossAxisAlignment.center,
-                          children: <Widget>[
-                            SizedBox(
-                              width: 150.0,
-                              child: LinearProgressIndicator(
-                                value: progress,
-                                color: Colors.white,
-                              ),
-                            ),
-                            // const SizedBox(height: 10.0),
-                            // Text('${((progress ?? 0.0) * 100).toInt()}%',),
-                          ],
-                        ),
-                      );
-                    }
-                  },
-                  initGestureConfigHandler: (ExtendedImageState state) {
-                    return GestureConfig(
-                      inPageView: true,
-                      initialScale: 1.0,
-                      maxScale: 5.0,
-                      animationMaxScale: 6.0,
-                      initialAlignment: InitialAlignment.center,
-                    );
-                  },
-                );
-              },
-            ),
-          ),
-          Positioned(
-            left: 0,
-            right: 0,
-            bottom: 0,
-            child: Container(
-                padding: EdgeInsets.only(
-                    left: 20,
-                    right: 20,
-                    bottom: MediaQuery.of(context).padding.bottom + 30),
-                decoration: const BoxDecoration(
-                  gradient: LinearGradient(
-                    begin: Alignment.topCenter,
-                    end: Alignment.bottomCenter,
-                    colors: <Color>[
-                      Colors.transparent,
-                      Colors.black87,
-                    ],
-                    tileMode: TileMode.mirror,
-                  ),
-                ),
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    widget.imgList!.length > 1
-                        ? Obx(
-                            () => Text.rich(
-                              textAlign: TextAlign.center,
-                              TextSpan(
-                                  style: const TextStyle(
-                                      color: Colors.white, fontSize: 16),
-                                  children: [
-                                    TextSpan(
-                                        text: _previewController.currentPage
-                                            .toString()),
-                                    const TextSpan(text: ' / '),
-                                    TextSpan(
-                                        text:
-                                            widget.imgList!.length.toString()),
-                                  ]),
-                            ),
-                          )
-                        : const SizedBox(),
-                    IconButton(
-                      onPressed: () => Get.back(),
-                      icon: const Icon(Icons.close, color: Colors.white),
-                    ),
-                  ],
-                )),
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/pages/rank/controller.dart b/lib/pages/rank/controller.dart
index 64395ec7..bb34b13f 100644
--- a/lib/pages/rank/controller.dart
+++ b/lib/pages/rank/controller.dart
@@ -17,13 +17,10 @@ class RankController extends GetxController with GetTickerProviderStateMixin {
   Box setting = GStrorage.setting;
   late final StreamController<bool> searchBarStream =
       StreamController<bool>.broadcast();
-  late bool enableGradientBg;
 
   @override
   void onInit() {
     super.onInit();
-    enableGradientBg =
-        setting.get(SettingBoxKey.enableGradientBg, defaultValue: true);
     // 进行tabs配置
     setTabConfig();
   }
diff --git a/lib/pages/rank/view.dart b/lib/pages/rank/view.dart
index 4efa2b4e..cf7789a2 100644
--- a/lib/pages/rank/view.dart
+++ b/lib/pages/rank/view.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -31,94 +32,63 @@ class _RankPageState extends State<RankPage>
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    Brightness currentBrightness = MediaQuery.of(context).platformBrightness;
-    // 设置状态栏图标的亮度
-    if (_rankController.enableGradientBg) {
-      SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
-        statusBarIconBrightness: currentBrightness == Brightness.light
-            ? Brightness.dark
-            : Brightness.light,
-      ));
-    }
     return Scaffold(
       extendBody: true,
-      extendBodyBehindAppBar: false,
-      appBar: _rankController.enableGradientBg
-          ? null
-          : AppBar(toolbarHeight: 0, elevation: 0),
-      body: Stack(
+      extendBodyBehindAppBar: true,
+      backgroundColor: Colors.transparent,
+      appBar: AppBar(
+        toolbarHeight: 0,
+        elevation: 0,
+        backgroundColor: Colors.transparent,
+        systemOverlayStyle: Platform.isAndroid
+            ? SystemUiOverlayStyle(
+                statusBarIconBrightness:
+                    Theme.of(context).brightness == Brightness.dark
+                        ? Brightness.light
+                        : Brightness.dark,
+              )
+            : Theme.of(context).brightness == Brightness.dark
+                ? SystemUiOverlayStyle.light
+                : SystemUiOverlayStyle.dark,
+      ),
+      body: Column(
         children: [
-          // gradient background
-          if (_rankController.enableGradientBg) ...[
-            Align(
-              alignment: Alignment.topLeft,
-              child: Opacity(
-                opacity: 0.6,
-                child: Container(
-                  width: MediaQuery.of(context).size.width,
-                  height: MediaQuery.of(context).size.height,
-                  decoration: BoxDecoration(
-                    gradient: LinearGradient(
-                        colors: [
-                          Theme.of(context)
-                              .colorScheme
-                              .primary
-                              .withOpacity(0.9),
-                          Theme.of(context)
-                              .colorScheme
-                              .primary
-                              .withOpacity(0.5),
-                          Theme.of(context).colorScheme.surface
-                        ],
-                        begin: Alignment.topLeft,
-                        end: Alignment.bottomRight,
-                        stops: const [0, 0.0034, 0.34]),
-                  ),
+          const CustomAppBar(),
+          if (_rankController.tabs.length > 1) ...[
+            const SizedBox(height: 4),
+            SizedBox(
+              width: double.infinity,
+              height: 42,
+              child: Align(
+                alignment: Alignment.center,
+                child: TabBar(
+                  controller: _rankController.tabController,
+                  tabs: [
+                    for (var i in _rankController.tabs) Tab(text: i['label'])
+                  ],
+                  isScrollable: true,
+                  dividerColor: Colors.transparent,
+                  enableFeedback: true,
+                  splashBorderRadius: BorderRadius.circular(10),
+                  tabAlignment: TabAlignment.center,
+                  onTap: (value) {
+                    feedBack();
+                    if (_rankController.initialIndex.value == value) {
+                      _rankController.tabsCtrList[value].animateToTop();
+                    }
+                    _rankController.initialIndex.value = value;
+                  },
                 ),
               ),
             ),
+          ] else ...[
+            const SizedBox(height: 6),
           ],
-          Column(
-            children: [
-              const CustomAppBar(),
-              if (_rankController.tabs.length > 1) ...[
-                const SizedBox(height: 4),
-                SizedBox(
-                  width: double.infinity,
-                  height: 42,
-                  child: Align(
-                    alignment: Alignment.center,
-                    child: TabBar(
-                      controller: _rankController.tabController,
-                      tabs: [
-                        for (var i in _rankController.tabs)
-                          Tab(text: i['label'])
-                      ],
-                      isScrollable: true,
-                      dividerColor: Colors.transparent,
-                      enableFeedback: true,
-                      splashBorderRadius: BorderRadius.circular(10),
-                      tabAlignment: TabAlignment.center,
-                      onTap: (value) {
-                        feedBack();
-                        if (_rankController.initialIndex.value == value) {
-                          _rankController.tabsCtrList[value].animateToTop();
-                        }
-                        _rankController.initialIndex.value = value;
-                      },
-                    ),
-                  ),
-                ),
-              ] else ...[
-                const SizedBox(height: 6),
-              ],
-              Expanded(
-                child: TabBarView(
-                  controller: _rankController.tabController,
-                  children: _rankController.tabsPageList,
-                ),
-              ),
-            ],
+          Expanded(
+            child: TabBarView(
+              controller: _rankController.tabController,
+              children: _rankController.tabsPageList,
+            ),
           ),
         ],
       ),
diff --git a/lib/pages/read/controller.dart b/lib/pages/read/controller.dart
new file mode 100644
index 00000000..b580b964
--- /dev/null
+++ b/lib/pages/read/controller.dart
@@ -0,0 +1,78 @@
+import 'dart:async';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/http/read.dart';
+import 'package:pilipala/models/read/read.dart';
+import 'package:pilipala/plugin/pl_gallery/hero_dialog_route.dart';
+import 'package:pilipala/plugin/pl_gallery/interactiveviewer_gallery.dart';
+
+class ReadPageController extends GetxController {
+  late String url;
+  RxString title = ''.obs;
+  late String id;
+  late String articleType;
+  Rx<ReadDataModel> cvData = ReadDataModel().obs;
+  final ScrollController scrollController = ScrollController();
+  late StreamController<bool> appbarStream = StreamController<bool>.broadcast();
+
+  @override
+  void onInit() {
+    super.onInit();
+    title.value = Get.parameters['title'] ?? '';
+    id = Get.parameters['id']!;
+    articleType = Get.parameters['articleType'] ?? 'read';
+    url = 'https://www.bilibili.com/read/cv$id';
+    scrollController.addListener(_scrollListener);
+    fetchViewInfo();
+  }
+
+  Future fetchCvData() async {
+    var res = await ReadHttp.parseArticleCv(id: id);
+    if (res['status']) {
+      cvData.value = res['data'];
+      title.value = cvData.value.readInfo!.title!;
+    }
+    return res;
+  }
+
+  void _scrollListener() {
+    final double offset = scrollController.position.pixels;
+    if (offset > 100) {
+      appbarStream.add(true);
+    } else {
+      appbarStream.add(false);
+    }
+  }
+
+  void onPreviewImg(picList, initIndex, context) {
+    Navigator.of(context).push(
+      HeroDialogRoute<void>(
+        builder: (BuildContext context) => InteractiveviewerGallery(
+          sources: picList,
+          initIndex: initIndex,
+          onPageChanged: (int pageIndex) {},
+        ),
+      ),
+    );
+  }
+
+  void fetchViewInfo() {
+    ReadHttp.getViewInfo(id: id);
+  }
+
+  // 跳转webview
+  void onJumpWebview() {
+    Get.toNamed('/webview', parameters: {
+      'url': url,
+      'type': 'webview',
+      'pageTitle': title.value,
+    });
+  }
+
+  @override
+  void onClose() {
+    scrollController.removeListener(_scrollListener);
+    appbarStream.close();
+    super.onClose();
+  }
+}
diff --git a/lib/pages/read/index.dart b/lib/pages/read/index.dart
new file mode 100644
index 00000000..3603c994
--- /dev/null
+++ b/lib/pages/read/index.dart
@@ -0,0 +1,4 @@
+library read;
+
+export 'controller.dart';
+export 'view.dart';
diff --git a/lib/pages/read/view.dart b/lib/pages/read/view.dart
new file mode 100644
index 00000000..710934eb
--- /dev/null
+++ b/lib/pages/read/view.dart
@@ -0,0 +1,348 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/widgets/html_render.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/models/read/opus.dart';
+import 'package:pilipala/models/read/read.dart';
+import 'package:pilipala/pages/opus/text_helper.dart';
+import 'package:pilipala/utils/utils.dart';
+import 'controller.dart';
+
+class ReadPage extends StatefulWidget {
+  const ReadPage({super.key});
+
+  @override
+  State<ReadPage> createState() => _ReadPageState();
+}
+
+class _ReadPageState extends State<ReadPage> {
+  final ReadPageController controller = Get.put(ReadPageController());
+  late Future _futureBuilderFuture;
+
+  @override
+  void initState() {
+    super.initState();
+    _futureBuilderFuture = controller.fetchCvData();
+  }
+
+  List<String> extractDataSrc(String input) {
+    final regex = RegExp(r'data-src="([^"]*)"');
+    final matches = regex.allMatches(input);
+    return matches.map((match) {
+      final dataSrc = match.group(1)!;
+      return dataSrc.startsWith('//') ? 'https:$dataSrc' : dataSrc;
+    }).toList();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: _buildAppBar(),
+      body: SingleChildScrollView(
+        controller: controller.scrollController,
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.start,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            _buildTitle(),
+            _buildFutureContent(),
+          ],
+        ),
+      ),
+    );
+  }
+
+  AppBar _buildAppBar() {
+    return AppBar(
+      title: StreamBuilder(
+        stream: controller.appbarStream.stream.distinct(),
+        initialData: false,
+        builder: (BuildContext context, AsyncSnapshot snapshot) {
+          return AnimatedOpacity(
+            opacity: snapshot.data ? 1 : 0,
+            curve: Curves.easeOut,
+            duration: const Duration(milliseconds: 500),
+            child: Obx(
+              () => Text(
+                controller.title.value,
+                style: const TextStyle(fontSize: 16),
+              ),
+            ),
+          );
+        },
+      ),
+      actions: [
+        PopupMenuButton(
+          icon: const Icon(Icons.more_vert_outlined),
+          itemBuilder: (BuildContext context) => <PopupMenuEntry>[
+            PopupMenuItem(
+              onTap: controller.onJumpWebview,
+              child: const Text('查看原网页'),
+            )
+          ],
+        ),
+        const SizedBox(width: 16),
+      ],
+    );
+  }
+
+  Widget _buildTitle() {
+    return Padding(
+      padding: const EdgeInsets.fromLTRB(16, 16, 16, 4),
+      child: Obx(
+        () => Text(
+          controller.title.value,
+          style: const TextStyle(
+            fontSize: 24,
+            fontWeight: FontWeight.bold,
+            letterSpacing: 1,
+            height: 1.5,
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildFutureContent() {
+    return FutureBuilder(
+      future: _futureBuilderFuture,
+      builder: (BuildContext context, AsyncSnapshot snapshot) {
+        if (snapshot.connectionState == ConnectionState.done) {
+          if (snapshot.data == null) {
+            return const SizedBox();
+          }
+          if (snapshot.data['status']) {
+            return _buildContent(snapshot.data['data']);
+          } else {
+            return _buildError(snapshot.data['message']);
+          }
+        } else {
+          return _buildLoading();
+        }
+      },
+    );
+  }
+
+  Widget _buildContent(ReadDataModel cvData) {
+    final List<String> picList = _extractPicList(cvData);
+    final List<String> imgList = extractDataSrc(cvData.readInfo!.content!);
+    return Padding(
+      padding: EdgeInsets.fromLTRB(
+          16, 0, 16, MediaQuery.of(context).padding.bottom + 40),
+      child: cvData.readInfo!.opus == null
+          ? _buildNonOpusContent(cvData, imgList)
+          : _buildOpusContent(cvData, picList),
+    );
+  }
+
+  List<String> _extractPicList(ReadDataModel cvData) {
+    final List<String> picList = [];
+    if (cvData.readInfo!.opus != null) {
+      final List<ModuleParagraph> paragraphs =
+          cvData.readInfo!.opus!.content!.paragraphs!;
+      for (var paragraph in paragraphs) {
+        if (paragraph.paraType == 2) {
+          for (var pic in paragraph.pic!.pics!) {
+            picList.add(pic.url!);
+          }
+        }
+      }
+    }
+    return picList;
+  }
+
+  Widget _buildNonOpusContent(ReadDataModel cvData, List<String> imgList) {
+    return Column(
+      children: [
+        Padding(
+          padding: const EdgeInsets.only(bottom: 30),
+          child: _buildStatsWidget(cvData),
+        ),
+        Padding(
+          padding: const EdgeInsets.only(bottom: 20),
+          child: _buildAuthorWidget(cvData),
+        ),
+        SelectionArea(
+          child: HtmlRender(
+            htmlContent: cvData.readInfo!.content!,
+            imgList: imgList,
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildOpusContent(ReadDataModel cvData, List<String> picList) {
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.start,
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Padding(
+          padding: const EdgeInsets.only(bottom: 30),
+          child: _buildStatsWidget(cvData),
+        ),
+        Padding(
+          padding: const EdgeInsets.only(bottom: 20),
+          child: _buildAuthorWidget(cvData),
+        ),
+        ...cvData.readInfo!.opus!.content!.paragraphs!.map(
+          (ModuleParagraph paragraph) {
+            return Column(
+              children: [
+                if (paragraph.paraType == 1)
+                  _buildTextParagraph(paragraph)
+                else if (paragraph.paraType == 2)
+                  ..._buildPics(paragraph, picList)
+                else
+                  const SizedBox(),
+              ],
+            );
+          },
+        ),
+      ],
+    );
+  }
+
+  Widget _buildTextParagraph(ModuleParagraph paragraph) {
+    return Container(
+      alignment: TextHelper.getAlignment(paragraph.align),
+      margin: const EdgeInsets.only(bottom: 10),
+      child: SelectableText.rich(
+        TextSpan(
+          children: paragraph.text?.nodes?.map((node) {
+                return TextHelper.buildTextSpan(node, paragraph.align, context);
+              }).toList() ??
+              [],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildError(String message) {
+    return SizedBox(
+      height: 100,
+      child: Center(
+        child: Text(message),
+      ),
+    );
+  }
+
+  Widget _buildLoading() {
+    return const SizedBox(
+      height: 100,
+      child: Center(
+        child: CircularProgressIndicator(),
+      ),
+    );
+  }
+
+  Widget _buildStatsWidget(ReadDataModel cvData) {
+    return Row(
+      children: [
+        StyledText(Utils.CustomStamp_str(
+          timestamp: cvData.readInfo!.publishTime!,
+          date: 'YY-MM-DD hh:mm',
+          toInt: false,
+        )),
+        const SizedBox(width: 10),
+        StyledText('${Utils.numFormat(cvData.readInfo!.stats!['view'])}浏览'),
+        const StyledText(' · '),
+        StyledText('${cvData.readInfo!.stats!['like']}点赞'),
+        // const StyledText(' · '),
+        // StyledText('${cvData.readInfo!.stats!['reply']}评论'),
+      ],
+    );
+  }
+
+  Widget _buildAuthorWidget(ReadDataModel cvData) {
+    final Author author = cvData.readInfo!.author!;
+    return Row(
+      children: [
+        NetworkImgLayer(
+          width: 48,
+          height: 48,
+          type: 'avatar',
+          src: author.face,
+        ),
+        const SizedBox(width: 10),
+        Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Text(
+                  author.name!,
+                  style: TextStyle(
+                    color: author.vip!.nicknameColor != null
+                        ? Color(author.vip!.nicknameColor!)
+                        : null,
+                    fontWeight: FontWeight.w500,
+                  ),
+                ),
+                const SizedBox(width: 6),
+                Image.asset(
+                  'assets/images/lv/lv${author.level}.png',
+                  height: 11,
+                ),
+              ],
+            ),
+            Row(
+              children: [
+                StyledText('粉丝: ${Utils.numFormat(author.fans)}'),
+                const SizedBox(width: 10),
+                StyledText(
+                    '文章: ${Utils.numFormat(cvData.readInfo!.totalArtNum)}'),
+              ],
+            ),
+          ],
+        ),
+      ],
+    );
+  }
+
+  List<Widget> _buildPics(ModuleParagraph paragraph, List<String> picList) {
+    return paragraph.pic?.pics
+            ?.map(
+              (Pic pic) => Center(
+                child: Padding(
+                  padding: const EdgeInsets.only(top: 10, bottom: 10),
+                  child: InkWell(
+                    onTap: () {
+                      controller.onPreviewImg(
+                        picList,
+                        picList.indexOf(pic.url!),
+                        context,
+                      );
+                    },
+                    child: NetworkImgLayer(
+                      src: pic.url,
+                      width: (Get.size.width - 32) * pic.scale!,
+                      height:
+                          (Get.size.width - 32) * pic.scale! / pic.aspectRatio!,
+                      type: 'emote',
+                    ),
+                  ),
+                ),
+              ),
+            )
+            .toList() ??
+        [];
+  }
+}
+
+class StyledText extends StatelessWidget {
+  final String text;
+
+  const StyledText(this.text, {Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Text(
+      text,
+      style: TextStyle(
+        fontSize: 13,
+        color: Theme.of(context).colorScheme.outline,
+      ),
+    );
+  }
+}
diff --git a/lib/pages/search_panel/controller.dart b/lib/pages/search_panel/controller.dart
index 35113198..2d1aa228 100644
--- a/lib/pages/search_panel/controller.dart
+++ b/lib/pages/search_panel/controller.dart
@@ -24,15 +24,17 @@ class SearchPanelController extends GetxController {
       searchType: searchType!,
       keyword: keyword!,
       page: page.value,
-      order: searchType!.type != 'video' ? null : order.value,
+      order: !['video', 'article'].contains(searchType!.type)
+          ? null
+          : (order.value == '' ? null : order.value),
       duration: searchType!.type != 'video' ? null : duration.value,
       tids: searchType!.type != 'video' ? null : tids.value,
     );
     if (result['status']) {
       if (type == 'onRefresh') {
-        resultList.value = result['data'].list;
+        resultList.value = result['data'].list ?? [];
       } else {
-        resultList.addAll(result['data'].list);
+        resultList.addAll(result['data'].list ?? []);
       }
       page.value++;
       onPushDetail(keyword, resultList);
diff --git a/lib/pages/search_panel/view.dart b/lib/pages/search_panel/view.dart
index c5824d70..fa669489 100644
--- a/lib/pages/search_panel/view.dart
+++ b/lib/pages/search_panel/view.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: invalid_use_of_protected_member
+
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
@@ -45,6 +47,11 @@ class _SearchPanelState extends State<SearchPanel>
       ),
       tag: widget.searchType!.type + widget.keyword!,
     );
+
+    /// 专栏默认排序
+    if (widget.searchType == SearchType.article) {
+      _searchPanelController.order.value = 'totalrank';
+    }
     scrollController = _searchPanelController.scrollController;
     scrollController.addListener(() async {
       if (scrollController.position.pixels >=
@@ -84,7 +91,6 @@ class _SearchPanelState extends State<SearchPanel>
                     case SearchType.video:
                       return SearchVideoPanel(
                         ctr: _searchPanelController,
-                        // ignore: invalid_use_of_protected_member
                         list: list.value,
                       );
                     case SearchType.media_bangumi:
@@ -94,7 +100,10 @@ class _SearchPanelState extends State<SearchPanel>
                     case SearchType.live_room:
                       return searchLivePanel(context, ctr, list);
                     case SearchType.article:
-                      return searchArticlePanel(context, ctr, list);
+                      return SearchArticlePanel(
+                        ctr: _searchPanelController,
+                        list: list.value,
+                      );
                     default:
                       return const SizedBox();
                   }
diff --git a/lib/pages/search_panel/widgets/article_panel.dart b/lib/pages/search_panel/widgets/article_panel.dart
index c7074229..be08ed56 100644
--- a/lib/pages/search_panel/widgets/article_panel.dart
+++ b/lib/pages/search_panel/widgets/article_panel.dart
@@ -1,107 +1,249 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
+import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/models/common/search_type.dart';
+import 'package:pilipala/pages/search_panel/index.dart';
 import 'package:pilipala/utils/utils.dart';
 
+class SearchArticlePanel extends StatelessWidget {
+  SearchArticlePanel({
+    required this.ctr,
+    this.list,
+    Key? key,
+  }) : super(key: key);
+
+  final SearchPanelController ctr;
+  final List? list;
+
+  final ArticlePanelController controller = Get.put(ArticlePanelController());
+
+  @override
+  Widget build(BuildContext context) {
+    return Stack(
+      alignment: Alignment.topCenter,
+      children: [
+        searchArticlePanel(context, ctr, list),
+        Container(
+          width: double.infinity,
+          height: 36,
+          padding: const EdgeInsets.only(left: 8, top: 0, right: 8),
+          child: Row(
+            children: [
+              Expanded(
+                child: SingleChildScrollView(
+                  scrollDirection: Axis.horizontal,
+                  child: Obx(
+                    () => Wrap(
+                      // spacing: ,
+                      children: [
+                        for (var i in controller.filterList) ...[
+                          CustomFilterChip(
+                            label: i['label'],
+                            type: i['type'],
+                            selectedType: controller.selectedType.value,
+                            callFn: (bool selected) async {
+                              controller.selectedType.value = i['type'];
+                              ctr.order.value =
+                                  i['type'].toString().split('.').last;
+                              SmartDialog.showLoading(msg: 'loading');
+                              await ctr.onRefresh();
+                              SmartDialog.dismiss();
+                            },
+                          ),
+                        ]
+                      ],
+                    ),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+}
+
 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) {
-            final double width = (boxConstraints.maxWidth -
-                    StyleString.cardSpace *
-                        6 /
-                        MediaQuery.textScalerOf(context).scale(1.0)) /
-                2;
-            return Container(
-              constraints: const BoxConstraints(minHeight: 88),
-              height: width / StyleString.aspectRatio,
-              child: Row(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: <Widget>[
-                  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,
+  return Padding(
+    padding: const EdgeInsets.only(top: 36),
+    child: list!.isNotEmpty
+        ? ListView.builder(
+            controller: ctr!.scrollController,
+            addAutomaticKeepAlives: false,
+            addRepaintBoundaries: false,
+            itemCount: list.length,
+            itemBuilder: (context, index) {
+              return InkWell(
+                onTap: () {
+                  Get.toNamed('/read', parameters: {
+                    'title': list[index].subTitle,
+                    'id': list[index].id.toString(),
+                    'articleType': 'read'
+                  });
+                },
+                child: Padding(
+                  padding: const EdgeInsets.fromLTRB(
+                      StyleString.safeSpace, 5, StyleString.safeSpace, 5),
+                  child: LayoutBuilder(builder: (context, boxConstraints) {
+                    final double width = (boxConstraints.maxWidth -
+                            StyleString.cardSpace *
+                                6 /
+                                MediaQuery.textScalerOf(context).scale(1.0)) /
+                        2;
+                    return Container(
+                      constraints: const BoxConstraints(minHeight: 88),
+                      height: width / StyleString.aspectRatio,
+                      child: Row(
                         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,
+                        children: <Widget>[
+                          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),
+                                    ],
+                                  ),
+                                ],
+                              ),
                             ),
                           ),
-                          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),
-                            ],
-                          ),
                         ],
                       ),
-                    ),
-                  ),
-                ],
-              ),
-            );
-          }),
-        ),
-      );
-    },
+                    );
+                  }),
+                ),
+              );
+            },
+          )
+        : CustomScrollView(
+            slivers: [
+              HttpError(
+                errMsg: '没有数据',
+                isShowBtn: false,
+                fn: () => {},
+              )
+            ],
+          ),
   );
 }
+
+class CustomFilterChip extends StatelessWidget {
+  const CustomFilterChip({
+    this.label,
+    this.type,
+    this.selectedType,
+    this.callFn,
+    Key? key,
+  }) : super(key: key);
+
+  final String? label;
+  final ArticleFilterType? type;
+  final ArticleFilterType? selectedType;
+  final Function? callFn;
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      height: 34,
+      child: FilterChip(
+        padding: const EdgeInsets.only(left: 11, right: 11),
+        labelPadding: EdgeInsets.zero,
+        label: Text(
+          label!,
+          style: const TextStyle(fontSize: 13),
+        ),
+        labelStyle: TextStyle(
+            color: type == selectedType
+                ? Theme.of(context).colorScheme.primary
+                : Theme.of(context).colorScheme.outline),
+        selected: type == selectedType,
+        showCheckmark: false,
+        shape: ContinuousRectangleBorder(
+          borderRadius: BorderRadius.circular(12),
+        ),
+        selectedColor: Colors.transparent,
+        // backgroundColor:
+        //     Theme.of(context).colorScheme.surfaceVariant.withOpacity(0.5),
+        backgroundColor: Colors.transparent,
+        side: BorderSide.none,
+        onSelected: (bool selected) => callFn!(selected),
+      ),
+    );
+  }
+}
+
+class ArticlePanelController extends GetxController {
+  RxList<Map> filterList = [{}].obs;
+  Rx<ArticleFilterType> selectedType = ArticleFilterType.values.first.obs;
+
+  @override
+  void onInit() {
+    List<Map<String, dynamic>> list = ArticleFilterType.values
+        .map((type) => {
+              'label': type.description,
+              'type': type,
+            })
+        .toList();
+    filterList.value = list;
+    super.onInit();
+  }
+}
diff --git a/lib/pages/search_panel/widgets/video_panel.dart b/lib/pages/search_panel/widgets/video_panel.dart
index 15745bde..7da6aaaa 100644
--- a/lib/pages/search_panel/widgets/video_panel.dart
+++ b/lib/pages/search_panel/widgets/video_panel.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
+import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/video_card_h.dart';
 import 'package:pilipala/models/common/search_type.dart';
 import 'package:pilipala/pages/search/widgets/search_text.dart';
@@ -25,25 +26,35 @@ class SearchVideoPanel extends StatelessWidget {
       children: [
         Padding(
           padding: const EdgeInsets.only(top: 36),
-          child: ListView.builder(
-            controller: ctr!.scrollController,
-            addAutomaticKeepAlives: false,
-            addRepaintBoundaries: false,
-            itemCount: list!.length,
-            itemBuilder: (context, index) {
-              var i = list![index];
-              return Padding(
-                padding: index == 0
-                    ? const EdgeInsets.only(top: 2)
-                    : EdgeInsets.zero,
-                child: VideoCardH(
-                  videoItem: i,
-                  showPubdate: true,
-                  source: 'search',
+          child: list!.isNotEmpty
+              ? ListView.builder(
+                  controller: ctr!.scrollController,
+                  addAutomaticKeepAlives: false,
+                  addRepaintBoundaries: false,
+                  itemCount: list!.length,
+                  itemBuilder: (context, index) {
+                    var i = list![index];
+                    return Padding(
+                      padding: index == 0
+                          ? const EdgeInsets.only(top: 2)
+                          : EdgeInsets.zero,
+                      child: VideoCardH(
+                        videoItem: i,
+                        showPubdate: true,
+                        source: 'search',
+                      ),
+                    );
+                  },
+                )
+              : CustomScrollView(
+                  slivers: [
+                    HttpError(
+                      errMsg: '没有数据',
+                      isShowBtn: false,
+                      fn: () => {},
+                    )
+                  ],
                 ),
-              );
-            },
-          ),
         ),
         // 分类筛选
         Container(
@@ -250,90 +261,97 @@ class VideoPanelController extends GetxController {
   onShowFilterSheet(searchPanelCtr) {
     showModalBottomSheet(
       context: Get.context!,
+      isScrollControlled: true,
       builder: (context) {
         return StatefulBuilder(
           builder: (context, StateSetter setState) {
-            return Container(
-              color: Theme.of(Get.context!).colorScheme.surface,
-              padding: const EdgeInsets.only(top: 12),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
+            return Padding(
+              padding: EdgeInsets.only(
+                  top: 12, bottom: MediaQuery.of(context).padding.bottom + 20),
+              child: Wrap(
                 children: [
-                  const ListTile(
-                    title: Text('内容时长'),
-                  ),
-                  Padding(
-                    padding: const EdgeInsets.only(
-                      left: 14,
-                      right: 14,
-                      bottom: 14,
-                    ),
-                    child: Wrap(
-                      spacing: 10,
-                      runSpacing: 10,
-                      direction: Axis.horizontal,
-                      textDirection: TextDirection.ltr,
-                      children: [
-                        for (var i in timeFiltersList)
-                          Obx(
-                            () => SearchText(
-                              searchText: i['label'],
-                              searchTextIdx: i['value'],
-                              isSelect:
-                                  currentTimeFilterval.value == i['value'],
-                              onSelect: (value) async {
-                                currentTimeFilterval.value = i['value'];
-                                setState(() {});
-                                SmartDialog.showToast("「${i['label']}」的筛选结果");
-                                SearchPanelController ctr =
-                                    Get.find<SearchPanelController>(
+                  Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      const ListTile(
+                        title: Text('内容时长'),
+                      ),
+                      Padding(
+                        padding: const EdgeInsets.only(
+                          left: 14,
+                          right: 14,
+                          bottom: 14,
+                        ),
+                        child: Wrap(
+                          spacing: 10,
+                          runSpacing: 10,
+                          direction: Axis.horizontal,
+                          textDirection: TextDirection.ltr,
+                          children: [
+                            for (var i in timeFiltersList)
+                              Obx(
+                                () => SearchText(
+                                  searchText: i['label'],
+                                  searchTextIdx: i['value'],
+                                  isSelect:
+                                      currentTimeFilterval.value == i['value'],
+                                  onSelect: (value) async {
+                                    currentTimeFilterval.value = i['value'];
+                                    setState(() {});
+                                    SmartDialog.showToast(
+                                        "「${i['label']}」的筛选结果");
+                                    SearchPanelController ctr = Get.find<
+                                            SearchPanelController>(
                                         tag: 'video${searchPanelCtr.keyword!}');
-                                ctr.duration.value = i['value'];
-                                Get.back();
-                                SmartDialog.showLoading(msg: '获取中');
-                                await ctr.onRefresh();
-                                SmartDialog.dismiss();
-                              },
-                              onLongSelect: (value) => {},
-                            ),
-                          )
-                      ],
-                    ),
-                  ),
-                  const ListTile(
-                    title: Text('内容分区'),
-                  ),
-                  Padding(
-                    padding: const EdgeInsets.only(left: 14, right: 14),
-                    child: Wrap(
-                      spacing: 10,
-                      runSpacing: 10,
-                      direction: Axis.horizontal,
-                      textDirection: TextDirection.ltr,
-                      children: [
-                        for (var i in partFiltersList)
-                          SearchText(
-                            searchText: i['label'],
-                            searchTextIdx: i['value'],
-                            isSelect: currentPartFilterval.value == i['value'],
-                            onSelect: (value) async {
-                              currentPartFilterval.value = i['value'];
-                              setState(() {});
-                              SmartDialog.showToast("「${i['label']}」的筛选结果");
-                              SearchPanelController ctr =
-                                  Get.find<SearchPanelController>(
+                                    ctr.duration.value = i['value'];
+                                    Get.back();
+                                    SmartDialog.showLoading(msg: '获取中');
+                                    await ctr.onRefresh();
+                                    SmartDialog.dismiss();
+                                  },
+                                  onLongSelect: (value) => {},
+                                ),
+                              )
+                          ],
+                        ),
+                      ),
+                      const ListTile(
+                        title: Text('内容分区'),
+                      ),
+                      Padding(
+                        padding: const EdgeInsets.only(left: 14, right: 14),
+                        child: Wrap(
+                          spacing: 10,
+                          runSpacing: 10,
+                          direction: Axis.horizontal,
+                          textDirection: TextDirection.ltr,
+                          children: [
+                            for (var i in partFiltersList)
+                              SearchText(
+                                searchText: i['label'],
+                                searchTextIdx: i['value'],
+                                isSelect:
+                                    currentPartFilterval.value == i['value'],
+                                onSelect: (value) async {
+                                  currentPartFilterval.value = i['value'];
+                                  setState(() {});
+                                  SmartDialog.showToast("「${i['label']}」的筛选结果");
+                                  SearchPanelController ctr = Get.find<
+                                          SearchPanelController>(
                                       tag: 'video${searchPanelCtr.keyword!}');
-                              ctr.tids.value = i['value'];
-                              Get.back();
-                              SmartDialog.showLoading(msg: '获取中');
-                              await ctr.onRefresh();
-                              SmartDialog.dismiss();
-                            },
-                            onLongSelect: (value) => {},
-                          )
-                      ],
-                    ),
-                  )
+                                  ctr.tids.value = i['value'];
+                                  Get.back();
+                                  SmartDialog.showLoading(msg: '获取中');
+                                  await ctr.onRefresh();
+                                  SmartDialog.dismiss();
+                                },
+                                onLongSelect: (value) => {},
+                              )
+                          ],
+                        ),
+                      )
+                    ],
+                  ),
                 ],
               ),
             );
diff --git a/lib/pages/setting/pages/action_menu_set.dart b/lib/pages/setting/pages/action_menu_set.dart
index 7a4fd9ba..3655df73 100644
--- a/lib/pages/setting/pages/action_menu_set.dart
+++ b/lib/pages/setting/pages/action_menu_set.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/models/common/action_type.dart';
-import 'package:pilipala/utils/global_data.dart';
+import 'package:pilipala/utils/global_data_cache.dart';
 import '../../../utils/storage.dart';
 
 class ActionMenuSetPage extends StatefulWidget {
@@ -38,7 +38,7 @@ class _ActionMenuSetPageState extends State<ActionMenuSetPage> {
         .map<String>((i) => (i['value'] as ActionType).value)
         .toList();
     setting.put(SettingBoxKey.actionTypeSort, sortedTabbar);
-    GlobalData().actionTypeSort = sortedTabbar;
+    GlobalDataCache().actionTypeSort = sortedTabbar;
     SmartDialog.showToast('操作成功');
   }
 
diff --git a/lib/pages/setting/pages/navigation_bar_set.dart b/lib/pages/setting/pages/navigation_bar_set.dart
index 09e92bc3..05407c16 100644
--- a/lib/pages/setting/pages/navigation_bar_set.dart
+++ b/lib/pages/setting/pages/navigation_bar_set.dart
@@ -74,7 +74,6 @@ class _NavigationbarSetPageState extends State<NavigationBarSetPage> {
           },
           title: Text(defaultNavTabs[i]['label']),
           secondary: const Icon(Icons.drag_indicator_rounded),
-          enabled: defaultNavTabs[i]['id'] != 0,
         )
       ]
     ];
diff --git a/lib/pages/setting/pages/play_gesture_set.dart b/lib/pages/setting/pages/play_gesture_set.dart
index f688c43c..9659e58a 100644
--- a/lib/pages/setting/pages/play_gesture_set.dart
+++ b/lib/pages/setting/pages/play_gesture_set.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:hive/hive.dart';
-import 'package:pilipala/utils/global_data.dart';
+import 'package:pilipala/utils/global_data_cache.dart';
 
 import '../../../models/common/gesture_mode.dart';
 import '../../../utils/storage.dart';
@@ -22,7 +23,7 @@ class _PlayGesturePageState extends State<PlayGesturePage> {
   void initState() {
     super.initState();
     fullScreenGestureMode = setting.get(SettingBoxKey.fullScreenGestureMode,
-        defaultValue: FullScreenGestureMode.values.last.index);
+        defaultValue: FullScreenGestureMode.fromBottomtoTop.index);
   }
 
   @override
@@ -64,13 +65,14 @@ class _PlayGesturePageState extends State<PlayGesturePage> {
                 },
               );
               if (result != null) {
-                GlobalData().fullScreenGestureMode = FullScreenGestureMode
+                GlobalDataCache().fullScreenGestureMode = FullScreenGestureMode
                     .values
                     .firstWhere((element) => element.values == result);
                 fullScreenGestureMode =
-                    GlobalData().fullScreenGestureMode.index;
+                    GlobalDataCache().fullScreenGestureMode.index;
                 setting.put(
                     SettingBoxKey.fullScreenGestureMode, fullScreenGestureMode);
+                SmartDialog.showToast('设置成功');
                 setState(() {});
               }
             },
diff --git a/lib/pages/setting/play_setting.dart b/lib/pages/setting/play_setting.dart
index 4a8495e5..a3c75ab5 100644
--- a/lib/pages/setting/play_setting.dart
+++ b/lib/pages/setting/play_setting.dart
@@ -3,11 +3,13 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
+import 'package:pilipala/http/init.dart';
+import 'package:pilipala/models/video/play/ao_output.dart';
 import 'package:pilipala/models/video/play/quality.dart';
 import 'package:pilipala/pages/setting/widgets/select_dialog.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
 import 'package:pilipala/services/service_locator.dart';
-import 'package:pilipala/utils/global_data.dart';
+import 'package:pilipala/utils/global_data_cache.dart';
 import 'package:pilipala/utils/storage.dart';
 
 import '../../models/live/quality.dart';
@@ -28,6 +30,7 @@ class _PlaySettingState extends State<PlaySetting> {
   late dynamic defaultDecode;
   late int defaultFullScreenMode;
   late int defaultBtmProgressBehavior;
+  late String defaultAoOutput;
 
   @override
   void initState() {
@@ -44,6 +47,8 @@ class _PlaySettingState extends State<PlaySetting> {
         defaultValue: FullScreenMode.values.first.code);
     defaultBtmProgressBehavior = setting.get(SettingBoxKey.btmProgressBehavior,
         defaultValue: BtmProgresBehavior.values.first.code);
+    defaultAoOutput =
+        setting.get(SettingBoxKey.defaultAoOutput, defaultValue: '0');
   }
 
   @override
@@ -157,8 +162,16 @@ class _PlaySettingState extends State<PlaySetting> {
               setKey: SettingBoxKey.enablePlayerControlAnimation,
               defaultVal: true,
               callFn: (bool val) {
-                GlobalData().enablePlayerControlAnimation = val;
+                GlobalDataCache().enablePlayerControlAnimation = val;
               }),
+          SetSwitchItem(
+            title: '港澳台模式',
+            setKey: SettingBoxKey.enableGATMode,
+            defaultVal: false,
+            callFn: (bool val) {
+              Request.setBaseUrl(type: val ? 'bangumi' : 'default');
+            },
+          ),
           ListTile(
             dense: false,
             title: Text('默认视频画质', style: titleStyle),
@@ -263,6 +276,31 @@ class _PlaySettingState extends State<PlaySetting> {
               }
             },
           ),
+          ListTile(
+            dense: false,
+            title: Text('音频输出方式', style: titleStyle),
+            subtitle: Text(
+              '当前输出方式 ${aoOutputList.firstWhere((element) => element['value'] == defaultAoOutput)['title']}',
+              style: subTitleStyle,
+            ),
+            onTap: () async {
+              String? result = await showDialog(
+                context: context,
+                builder: (context) {
+                  return SelectDialog<String>(
+                    title: '音频输出方式',
+                    value: defaultAoOutput,
+                    values: aoOutputList,
+                  );
+                },
+              );
+              if (result != null) {
+                defaultAoOutput = result;
+                setting.put(SettingBoxKey.defaultAoOutput, result);
+                setState(() {});
+              }
+            },
+          ),
           ListTile(
             dense: false,
             title: Text('默认全屏方式', style: titleStyle),
diff --git a/lib/pages/setting/style_setting.dart b/lib/pages/setting/style_setting.dart
index 5fca0c86..80f3b1ed 100644
--- a/lib/pages/setting/style_setting.dart
+++ b/lib/pages/setting/style_setting.dart
@@ -8,7 +8,7 @@ import 'package:pilipala/models/common/theme_type.dart';
 import 'package:pilipala/pages/setting/pages/color_select.dart';
 import 'package:pilipala/pages/setting/widgets/select_dialog.dart';
 import 'package:pilipala/pages/setting/widgets/slide_dialog.dart';
-import 'package:pilipala/utils/global_data.dart';
+import 'package:pilipala/utils/global_data_cache.dart';
 import 'package:pilipala/utils/storage.dart';
 
 import '../../models/common/dynamic_badge_mode.dart';
@@ -103,7 +103,7 @@ class _StyleSettingState extends State<StyleSetting> {
             needReboot: true,
           ),
           const SetSwitchItem(
-            title: '首页底栏背景渐变',
+            title: '首页顶部背景渐变',
             setKey: SettingBoxKey.enableGradientBg,
             defaultVal: true,
             needReboot: true,
@@ -176,7 +176,7 @@ class _StyleSettingState extends State<StyleSetting> {
                                   SettingBoxKey.defaultPicQa, picQuality);
                               Get.back();
                               settingController.picQuality.value = picQuality;
-                              GlobalData().imgQuality = picQuality;
+                              GlobalDataCache().imgQuality = picQuality;
                               SmartDialog.showToast('设置成功');
                             },
                             child: const Text('确定'),
diff --git a/lib/pages/subscription/controller.dart b/lib/pages/subscription/controller.dart
index d8a76d44..b59a42f0 100644
--- a/lib/pages/subscription/controller.dart
+++ b/lib/pages/subscription/controller.dart
@@ -16,11 +16,17 @@ class SubController extends GetxController {
   int currentPage = 1;
   int pageSize = 20;
   RxBool hasMore = true.obs;
+  late int mid;
+  late int ownerMid;
+  RxBool isOwner = false.obs;
 
   @override
   void onInit() {
     super.onInit();
+    mid = int.parse(Get.parameters['mid'] ?? '-1');
     userInfo = userInfoCache.get('userInfoCache');
+    ownerMid = userInfo != null ? userInfo!.mid! : -1;
+    isOwner.value = mid == -1 || mid == ownerMid;
   }
 
   Future<dynamic> querySubFolder({type = 'init'}) async {
@@ -30,7 +36,7 @@ class SubController extends GetxController {
     var res = await UserHttp.userSubFolder(
       pn: currentPage,
       ps: pageSize,
-      mid: userInfo!.mid!,
+      mid: isOwner.value ? ownerMid : mid,
     );
     if (res['status']) {
       if (type == 'init') {
diff --git a/lib/pages/subscription/view.dart b/lib/pages/subscription/view.dart
index e1d1820d..cb9993b0 100644
--- a/lib/pages/subscription/view.dart
+++ b/lib/pages/subscription/view.dart
@@ -42,10 +42,10 @@ class _SubPageState extends State<SubPage> {
       appBar: AppBar(
         centerTitle: false,
         titleSpacing: 0,
-        title: Text(
-          '我的订阅',
-          style: Theme.of(context).textTheme.titleMedium,
-        ),
+        title: Obx(() => Text(
+              '${_subController.isOwner.value ? '我' : 'Ta'}的订阅',
+              style: Theme.of(context).textTheme.titleMedium,
+            )),
       ),
       body: FutureBuilder(
         future: _futureBuilderFuture,
@@ -62,6 +62,7 @@ class _SubPageState extends State<SubPage> {
                       return SubItem(
                           subFolderItem:
                               _subController.subFolderData.value.list![index],
+                          isOwner: _subController.isOwner.value,
                           cancelSub: _subController.cancelSub);
                     },
                   ),
diff --git a/lib/pages/subscription/widgets/item.dart b/lib/pages/subscription/widgets/item.dart
index b244d3c7..0389b4a6 100644
--- a/lib/pages/subscription/widgets/item.dart
+++ b/lib/pages/subscription/widgets/item.dart
@@ -8,10 +8,12 @@ import '../../../models/user/sub_folder.dart';
 
 class SubItem extends StatelessWidget {
   final SubFolderItemData subFolderItem;
+  final bool isOwner;
   final Function(SubFolderItemData) cancelSub;
   const SubItem({
     super.key,
     required this.subFolderItem,
+    required this.isOwner,
     required this.cancelSub,
   });
 
@@ -59,6 +61,7 @@ class SubItem extends StatelessWidget {
                   ),
                   VideoContent(
                     subFolderItem: subFolderItem,
+                    isOwner: isOwner,
                     cancelSub: cancelSub,
                   )
                 ],
@@ -73,8 +76,14 @@ class SubItem extends StatelessWidget {
 
 class VideoContent extends StatelessWidget {
   final SubFolderItemData subFolderItem;
+  final bool isOwner;
   final Function(SubFolderItemData)? cancelSub;
-  const VideoContent({super.key, required this.subFolderItem, this.cancelSub});
+  const VideoContent({
+    super.key,
+    required this.subFolderItem,
+    required this.isOwner,
+    this.cancelSub,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -111,22 +120,24 @@ class VideoContent extends StatelessWidget {
               ),
             ),
             const Spacer(),
-            Row(
-              mainAxisAlignment: MainAxisAlignment.end,
-              children: [
-                IconButton(
-                  style: ButtonStyle(
-                    padding: MaterialStateProperty.all(EdgeInsets.zero),
-                  ),
-                  onPressed: () => cancelSub?.call(subFolderItem),
-                  icon: Icon(
-                    Icons.clear_outlined,
-                    color: Theme.of(context).colorScheme.outline,
-                    size: 18,
-                  ),
-                )
-              ],
-            )
+            isOwner
+                ? Row(
+                    mainAxisAlignment: MainAxisAlignment.end,
+                    children: [
+                      IconButton(
+                        style: ButtonStyle(
+                          padding: MaterialStateProperty.all(EdgeInsets.zero),
+                        ),
+                        onPressed: () => cancelSub?.call(subFolderItem),
+                        icon: Icon(
+                          Icons.clear_outlined,
+                          color: Theme.of(context).colorScheme.outline,
+                          size: 18,
+                        ),
+                      )
+                    ],
+                  )
+                : const SizedBox()
           ],
         ),
       ),
diff --git a/lib/pages/subscription_detail/view.dart b/lib/pages/subscription_detail/view.dart
index 4ca241fe..b41754d9 100644
--- a/lib/pages/subscription_detail/view.dart
+++ b/lib/pages/subscription_detail/view.dart
@@ -24,14 +24,14 @@ class _SubDetailPageState extends State<SubDetailPage> {
   late final ScrollController _controller = ScrollController();
   final SubDetailController _subDetailController =
       Get.put(SubDetailController());
-  late StreamController<bool> titleStreamC; // a
+  late StreamController<bool> titleStreamC =
+      StreamController<bool>.broadcast(); // a
   late Future _futureBuilderFuture;
 
   @override
   void initState() {
     super.initState();
     _futureBuilderFuture = _subDetailController.queryUserSeasonList();
-    titleStreamC = StreamController<bool>();
     _controller.addListener(
       () {
         if (_controller.offset > 160) {
diff --git a/lib/pages/subscription_detail/widget/sub_video_card.dart b/lib/pages/subscription_detail/widget/sub_video_card.dart
index dcdee4ef..268c4a00 100644
--- a/lib/pages/subscription_detail/widget/sub_video_card.dart
+++ b/lib/pages/subscription_detail/widget/sub_video_card.dart
@@ -154,13 +154,9 @@ class VideoContent extends StatelessWidget {
                   padding: const EdgeInsets.only(top: 2),
                   child: Row(
                     children: [
-                      StatView(
-                        theme: 'gray',
-                        view: videoItem.cntInfo['play'],
-                      ),
+                      StatView(view: videoItem.cntInfo['play']),
                       const SizedBox(width: 8),
-                      StatDanMu(
-                          theme: 'gray', danmu: videoItem.cntInfo['danmaku']),
+                      StatDanMu(danmu: videoItem.cntInfo['danmaku']),
                       const Spacer(),
                     ],
                   ),
diff --git a/lib/pages/video/detail/controller.dart b/lib/pages/video/detail/controller.dart
index 38c62d7e..3fead9c7 100644
--- a/lib/pages/video/detail/controller.dart
+++ b/lib/pages/video/detail/controller.dart
@@ -7,9 +7,11 @@ import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:ns_danmaku/ns_danmaku.dart';
 import 'package:pilipala/http/constants.dart';
+import 'package:pilipala/http/user.dart';
 import 'package:pilipala/http/video.dart';
 import 'package:pilipala/models/common/reply_type.dart';
 import 'package:pilipala/models/common/search_type.dart';
+import 'package:pilipala/models/video/later.dart';
 import 'package:pilipala/models/video/play/quality.dart';
 import 'package:pilipala/models/video/play/url.dart';
 import 'package:pilipala/models/video/reply/item.dart';
@@ -24,7 +26,10 @@ import '../../../models/video/subTitile/content.dart';
 import '../../../http/danmaku.dart';
 import '../../../plugin/pl_player/models/bottom_control_type.dart';
 import '../../../utils/id_utils.dart';
+import 'introduction/controller.dart';
+import 'reply/controller.dart';
 import 'widgets/header_control.dart';
+import 'widgets/watch_later_list.dart';
 
 class VideoDetailController extends GetxController
     with GetSingleTickerProviderStateMixin {
@@ -37,9 +42,10 @@ class VideoDetailController extends GetxController
   Map videoItem = {};
   // 视频类型 默认投稿视频
   SearchType videoType = Get.arguments['videoType'] ?? SearchType.video;
+  // 页面来源 稍后再看 收藏夹
+  RxString sourceType = 'normal'.obs;
 
   /// tabs相关配置
-  int tabInitialIndex = 0;
   late TabController tabCtr;
   RxList<String> tabs = <String>['简介', '评论'].obs;
 
@@ -109,6 +115,10 @@ class VideoDetailController extends GetxController
   ].obs;
   RxDouble sheetHeight = 0.0.obs;
   RxString archiveSourceType = 'dash'.obs;
+  ScrollController? replyScrollController;
+  List<MediaVideoItemModel> mediaList = <MediaVideoItemModel>[];
+  RxBool isWatchLaterVisible = false.obs;
+  RxString watchLaterTitle = ''.obs;
 
   @override
   void onInit() {
@@ -118,9 +128,7 @@ class VideoDetailController extends GetxController
     if (argMap.containsKey('videoItem')) {
       var args = argMap['videoItem'];
       updateCover(args.pic);
-    }
-
-    if (argMap.containsKey('pic')) {
+    } else if (argMap.containsKey('pic')) {
       updateCover(argMap['pic']);
     }
 
@@ -140,13 +148,7 @@ class VideoDetailController extends GetxController
     if (Platform.isAndroid) {
       floating = Floating();
     }
-    headerControl = HeaderControl(
-      controller: plPlayerController,
-      videoDetailCtr: this,
-      floating: floating,
-      bvid: bvid,
-      videoType: videoType,
-    );
+
     // CDN优化
     enableCDN = setting.get(SettingBoxKey.enableCDN, defaultValue: true);
     // 预设的画质
@@ -158,9 +160,31 @@ class VideoDetailController extends GetxController
         defaultValue: AudioQuality.hiRes.code);
     oid.value = IdUtils.bv2av(Get.parameters['bvid']!);
     getSubtitle();
+    headerControl = HeaderControl(
+      controller: plPlayerController,
+      videoDetailCtr: this,
+      floating: floating,
+      bvid: bvid,
+      videoType: videoType,
+    );
+
+    sourceType.value = argMap['sourceType'] ?? 'normal';
+    isWatchLaterVisible.value =
+        sourceType.value == 'watchLater' || sourceType.value == 'fav';
+    if (sourceType.value == 'watchLater') {
+      watchLaterTitle.value = '稍后再看';
+      fetchMediaList();
+    }
+    if (sourceType.value == 'fav') {
+      watchLaterTitle.value = argMap['favTitle'];
+      queryFavVideoList();
+    }
+    tabCtr.addListener(() {
+      onTabChanged();
+    });
   }
 
-  showReplyReplyPanel(oid, fRpid, firstFloor) {
+  showReplyReplyPanel(oid, fRpid, firstFloor, currentReply, loadMore) {
     replyReplyBottomSheetCtr =
         scaffoldKey.currentState?.showBottomSheet((BuildContext context) {
       return VideoReplyReplyPanel(
@@ -173,6 +197,8 @@ class VideoDetailController extends GetxController
         replyType: ReplyType.video,
         source: 'videoDetail',
         sheetHeight: sheetHeight.value,
+        currentReply: currentReply,
+        loadMore: loadMore,
       );
     });
     replyReplyBottomSheetCtr?.closed.then((value) {
@@ -431,28 +457,23 @@ class VideoDetailController extends GetxController
     if (result['status']) {
       if (result['data'].subtitles.isNotEmpty) {
         subtitles = result['data'].subtitles;
-        if (subtitles.isNotEmpty) {
-          for (var i in subtitles) {
-            final Map<String, dynamic> res = await VideoHttp.getSubtitleContent(
-              i.subtitleUrl,
-            );
-            i.content = res['content'];
-            i.body = res['body'];
-          }
-        }
+        getDanmaku(subtitles);
       }
-      return result['data'];
     }
   }
 
-  // 获取字幕内容
-  // Future getSubtitleContent(String url) async {
-  //   var res = await Request().get('https:$url');
-  //   subtitleContents.value = res.data['body'].map<SubTitileContentModel>((e) {
-  //     return SubTitileContentModel.fromJson(e);
-  //   }).toList();
-  //   setSubtitleContent();
-  // }
+  // 获取弹幕
+  Future getDanmaku(List subtitles) async {
+    if (subtitles.isNotEmpty) {
+      for (var i in subtitles) {
+        final Map<String, dynamic> res = await VideoHttp.getSubtitleContent(
+          i.subtitleUrl,
+        );
+        i.content = res['content'];
+        i.body = res['body'];
+      }
+    }
+  }
 
   setSubtitleContent() {
     plPlayerController.subtitleContent.value = '';
@@ -551,4 +572,111 @@ class VideoDetailController extends GetxController
       cover.value = videoItem['pic'] = pic;
     }
   }
+
+  void onControllerCreated(ScrollController controller) {
+    replyScrollController = controller;
+  }
+
+  void onTapTabbar(int index) {
+    if (tabCtr.animation!.isCompleted && index == 1 && tabCtr.index == 1) {
+      replyScrollController?.animateTo(0,
+          duration: const Duration(milliseconds: 300), curve: Curves.ease);
+    }
+  }
+
+  void toggeleWatchLaterVisible(bool val) {
+    if (sourceType.value == 'watchLater' || sourceType.value == 'fav') {
+      isWatchLaterVisible.value = !isWatchLaterVisible.value;
+    }
+  }
+
+  // 获取稍后再看列表
+  Future fetchMediaList() async {
+    final Map argMap = Get.arguments;
+    var count = argMap['count'];
+    var res = await UserHttp.getMediaList(
+      type: 2,
+      bizId: userInfo.mid,
+      ps: count,
+    );
+    if (res['status']) {
+      mediaList = res['data'].reversed.toList();
+    } else {
+      SmartDialog.showToast(res['msg']);
+    }
+  }
+
+  // 稍后再看面板展开
+  showMediaListPanel() {
+    replyReplyBottomSheetCtr =
+        scaffoldKey.currentState?.showBottomSheet((BuildContext context) {
+      return MediaListPanel(
+        sheetHeight: sheetHeight.value,
+        mediaList: mediaList,
+        changeMediaList: changeMediaList,
+        panelTitle: watchLaterTitle.value,
+        bvid: bvid,
+        mediaId: Get.arguments['mediaId'],
+        hasMore: mediaList.length != Get.arguments['count'],
+      );
+    });
+    replyReplyBottomSheetCtr?.closed.then((value) {
+      isWatchLaterVisible.value = true;
+    });
+  }
+
+  // 切换稍后再看
+  Future changeMediaList(bvidVal, cidVal, aidVal, coverVal) async {
+    final VideoIntroController videoIntroCtr =
+        Get.find<VideoIntroController>(tag: heroTag);
+    bvid = bvidVal;
+    oid.value = aidVal ?? IdUtils.bv2av(bvid);
+    cid.value = cidVal;
+    danmakuCid.value = cidVal;
+    cover.value = coverVal;
+    queryVideoUrl();
+    clearSubtitleContent();
+    await getSubtitle();
+    setSubtitleContent();
+    // 重新请求评论
+    try {
+      /// 未渲染回复组件时可能异常
+      final VideoReplyController videoReplyCtr =
+          Get.find<VideoReplyController>(tag: heroTag);
+      videoReplyCtr.aid = aidVal;
+      videoReplyCtr.queryReplyList(type: 'init');
+    } catch (_) {}
+    videoIntroCtr.lastPlayCid.value = cidVal;
+    videoIntroCtr.bvid = bvidVal;
+    replyReplyBottomSheetCtr!.close();
+    await videoIntroCtr.queryVideoIntro();
+  }
+
+  // 获取收藏夹视频列表
+  Future queryFavVideoList() async {
+    final Map argMap = Get.arguments;
+    var mediaId = argMap['mediaId'];
+    var oid = argMap['oid'];
+    var res = await UserHttp.parseFavVideo(
+      mediaId: mediaId,
+      oid: oid,
+      bvid: bvid,
+    );
+    if (res['status']) {
+      mediaList = res['data'];
+    }
+  }
+
+  // 监听tabBarView切换
+  void onTabChanged() {
+    isWatchLaterVisible.value = tabCtr.index == 0;
+  }
+
+  @override
+  void onClose() {
+    super.onClose();
+    tabCtr.removeListener(() {
+      onTabChanged();
+    });
+  }
 }
diff --git a/lib/pages/video/detail/introduction/controller.dart b/lib/pages/video/detail/introduction/controller.dart
index 9c542f21..bc9af109 100644
--- a/lib/pages/video/detail/introduction/controller.dart
+++ b/lib/pages/video/detail/introduction/controller.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:bottom_sheet/bottom_sheet.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
@@ -31,7 +32,7 @@ class VideoIntroController extends GetxController {
   // 视频详情 请求返回
   Rx<VideoDetailData> videoDetail = VideoDetailData().obs;
   // up主粉丝数
-  Map userStat = {'follower': '-'};
+  RxInt follower = 0.obs;
   // 是否点赞
   RxBool hasLike = false.obs;
   // 是否投币
@@ -113,7 +114,7 @@ class VideoIntroController extends GetxController {
   Future queryUserStat() async {
     var result = await UserHttp.userStat(mid: videoDetail.value.owner!.mid!);
     if (result['status']) {
-      userStat = result['data'];
+      follower.value = result['data']['follower'];
     }
   }
 
@@ -152,11 +153,10 @@ class VideoIntroController extends GetxController {
     }
     if (hasLike.value && hasCoin.value && hasFav.value) {
       // 已点赞、投币、收藏
-      SmartDialog.showToast('🙏 UP已经收到了～');
+      SmartDialog.showToast('UP已经收到了～');
       return false;
     }
     var result = await VideoHttp.oneThree(bvid: bvid);
-    print('🤣🦴：${result["data"]}');
     if (result['status']) {
       hasLike.value = result["data"]["like"];
       hasCoin.value = result["data"]["coin"];
@@ -196,45 +196,38 @@ class VideoIntroController extends GetxController {
       SmartDialog.showToast('账号未登录');
       return;
     }
-    if (hasCoin.value) {
-      SmartDialog.showToast('已投过币了');
-      return;
-    }
     showDialog(
         context: Get.context!,
         builder: (context) {
           return AlertDialog(
             title: const Text('选择投币个数'),
             contentPadding: const EdgeInsets.fromLTRB(0, 12, 0, 24),
-            content: StatefulBuilder(builder: (context, StateSetter setState) {
-              return Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [1, 2]
-                    .map(
-                      (e) => RadioListTile(
-                        value: e,
-                        title: Text('$e枚'),
-                        groupValue: _tempThemeValue,
-                        onChanged: (value) async {
-                          _tempThemeValue = value!;
-                          setState(() {});
-                          var res = await VideoHttp.coinVideo(
-                              bvid: bvid, multiply: _tempThemeValue);
-                          if (res['status']) {
-                            SmartDialog.showToast('投币成功');
-                            hasCoin.value = true;
-                            videoDetail.value.stat!.coin =
-                                videoDetail.value.stat!.coin! + _tempThemeValue;
-                          } else {
-                            SmartDialog.showToast(res['msg']);
-                          }
-                          Get.back();
-                        },
+            content: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [1, 2]
+                  .map(
+                    (e) => ListTile(
+                      title: Padding(
+                        padding: const EdgeInsets.only(left: 20),
+                        child: Text('$e 枚'),
                       ),
-                    )
-                    .toList(),
-              );
-            }),
+                      onTap: () async {
+                        var res =
+                            await VideoHttp.coinVideo(bvid: bvid, multiply: e);
+                        if (res['status']) {
+                          SmartDialog.showToast('投币成功');
+                          hasCoin.value = true;
+                          videoDetail.value.stat!.coin =
+                              videoDetail.value.stat!.coin! + e;
+                        } else {
+                          SmartDialog.showToast(res['msg']);
+                        }
+                        Get.back();
+                      },
+                    ),
+                  )
+                  .toList(),
+            ),
           );
         });
   }
@@ -418,7 +411,12 @@ class VideoIntroController extends GetxController {
   }
 
   // 修改分P或番剧分集
-  Future changeSeasonOrbangu(bvid, cid, aid, cover) async {
+  Future changeSeasonOrbangu(
+    String bvid,
+    int cid,
+    int? aid,
+    String? cover,
+  ) async {
     // 重新获取视频资源
     final VideoDetailController videoDetailCtr =
         Get.find<VideoDetailController>(tag: heroTag);
@@ -429,13 +427,16 @@ class VideoIntroController extends GetxController {
       releatedCtr.queryRelatedVideo();
     }
 
-    videoDetailCtr.bvid = bvid;
-    videoDetailCtr.oid.value = aid ?? IdUtils.bv2av(bvid);
-    videoDetailCtr.cid.value = cid;
-    videoDetailCtr.danmakuCid.value = cid;
-    videoDetailCtr.cover.value = cover;
-    videoDetailCtr.queryVideoUrl();
-    videoDetailCtr.getSubtitle();
+    videoDetailCtr
+      ..bvid = bvid
+      ..oid.value = aid ?? IdUtils.bv2av(bvid)
+      ..cid.value = cid
+      ..danmakuCid.value = cid
+      ..cover.value = cover ?? ''
+      ..queryVideoUrl()
+      ..clearSubtitleContent();
+    await videoDetailCtr.getSubtitle();
+    videoDetailCtr.setSubtitleContent();
     // 重新请求评论
     try {
       /// 未渲染回复组件时可能异常
@@ -483,7 +484,13 @@ class VideoIntroController extends GetxController {
     final List episodes = [];
     bool isPages = false;
     late String cover;
-    if (videoDetail.value.ugcSeason != null) {
+    final VideoDetailController videoDetailCtr =
+        Get.find<VideoDetailController>(tag: heroTag);
+
+    /// 优先稍后再看、收藏夹
+    if (videoDetailCtr.isWatchLaterVisible.value) {
+      episodes.addAll(videoDetailCtr.mediaList);
+    } else if (videoDetail.value.ugcSeason != null) {
       final UgcSeason ugcSeason = videoDetail.value.ugcSeason!;
       final List<SectionItem> sections = ugcSeason.sections!;
       for (int i = 0; i < sections.length; i++) {
@@ -500,10 +507,15 @@ class VideoIntroController extends GetxController {
         episodes.indexWhere((e) => e.cid == lastPlayCid.value);
     int nextIndex = currentIndex + 1;
     cover = episodes[nextIndex].cover;
-    final VideoDetailController videoDetailCtr =
-        Get.find<VideoDetailController>(tag: heroTag);
     final PlayRepeat platRepeat = videoDetailCtr.plPlayerController.playRepeat;
 
+    int cid = episodes[nextIndex].cid!;
+    while (cid == -1) {
+      nextIndex += 1;
+      SmartDialog.showToast('当前视频暂不支持播放，自动跳过');
+      cid = episodes[nextIndex].cid!;
+    }
+
     // 列表循环
     if (nextIndex >= episodes.length) {
       if (platRepeat == PlayRepeat.listCycle) {
@@ -513,7 +525,6 @@ class VideoIntroController extends GetxController {
         return;
       }
     }
-    final int cid = episodes[nextIndex].cid!;
     final String rBvid = isPages ? bvid : episodes[nextIndex].bvid;
     final int rAid = isPages ? IdUtils.bv2av(bvid) : episodes[nextIndex].aid!;
     changeSeasonOrbangu(rBvid, cid, rAid, cover);
@@ -521,15 +532,30 @@ class VideoIntroController extends GetxController {
 
   // 设置关注分组
   void setFollowGroup() {
-    Get.bottomSheet(
-      GroupPanel(mid: videoDetail.value.owner!.mid!),
-      isScrollControlled: true,
+    showFlexibleBottomSheet(
+      bottomSheetBorderRadius: const BorderRadius.only(
+        topLeft: Radius.circular(16),
+        topRight: Radius.circular(16),
+      ),
+      minHeight: 0.6,
+      initHeight: 0.6,
+      maxHeight: 1,
+      context: Get.context!,
+      builder: (BuildContext context, ScrollController scrollController,
+          double offset) {
+        return GroupPanel(
+          mid: videoDetail.value.owner!.mid!,
+          scrollController: scrollController,
+        );
+      },
+      anchors: [0.6, 1],
+      isSafeArea: true,
     );
   }
 
   // ai总结
   Future aiConclusion() async {
-    SmartDialog.showLoading(msg: '正在生产ai总结');
+    SmartDialog.showLoading(msg: '正在生成ai总结');
     final res = await VideoHttp.aiConclusion(
       bvid: bvid,
       cid: lastPlayCid.value,
@@ -539,7 +565,7 @@ class VideoIntroController extends GetxController {
     if (res['status']) {
       modelResult = res['data'].modelResult;
     } else {
-      SmartDialog.showToast("当前视频可能暂不支持AI视频总结");
+      SmartDialog.showToast("当前视频暂不支持AI视频总结");
     }
     return res;
   }
@@ -592,4 +618,34 @@ class VideoIntroController extends GetxController {
       ).buildShowContent(Get.context!),
     );
   }
+
+  //
+  oneThreeDialog() {
+    showDialog(
+      context: Get.context!,
+      builder: (context) {
+        return AlertDialog(
+          title: const Text('提示'),
+          content: const Text('是否一键三连'),
+          actions: [
+            TextButton(
+              onPressed: () => navigator!.pop(),
+              child: Text(
+                '取消',
+                style: TextStyle(
+                    color: Theme.of(Get.context!).colorScheme.outline),
+              ),
+            ),
+            TextButton(
+              onPressed: () async {
+                actionOneThree();
+                navigator!.pop();
+              },
+              child: const Text('确认'),
+            )
+          ],
+        );
+      },
+    );
+  }
 }
diff --git a/lib/pages/video/detail/introduction/view.dart b/lib/pages/video/detail/introduction/view.dart
index 93cc26c9..31edab2f 100644
--- a/lib/pages/video/detail/introduction/view.dart
+++ b/lib/pages/video/detail/introduction/view.dart
@@ -1,7 +1,8 @@
-import 'package:easy_debounce/easy_throttle.dart';
+import 'package:bottom_sheet/bottom_sheet.dart';
 import 'package:expandable/expandable.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
 import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
@@ -16,7 +17,7 @@ import 'package:pilipala/models/video_detail_res.dart';
 import 'package:pilipala/pages/video/detail/introduction/controller.dart';
 import 'package:pilipala/pages/video/detail/widgets/ai_detail.dart';
 import 'package:pilipala/utils/feed_back.dart';
-import 'package:pilipala/utils/global_data.dart';
+import 'package:pilipala/utils/global_data_cache.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
 import '../../../../http/user.dart';
@@ -140,7 +141,6 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
   final Box<dynamic> setting = GStrorage.setting;
   late double sheetHeight;
   late final dynamic owner;
-  late final dynamic follower;
   late int mid;
   late String memberHeroTag;
   late bool enableAi;
@@ -148,11 +148,6 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
   RxBool isExpand = false.obs;
   late ExpandableController _expandableCtr;
 
-  // 一键三连动画
-  late AnimationController _controller;
-  late Animation<double> _scaleTransition;
-  final RxDouble _progress = 0.0.obs;
-
   void Function()? handleState(Future<dynamic> Function() action) {
     return isProcessing
         ? null
@@ -173,29 +168,8 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
     sheetHeight = localCache.get('sheetHeight');
 
     owner = widget.videoDetail!.owner;
-    follower = Utils.numFormat(videoIntroController.userStat['follower']);
     enableAi = setting.get(SettingBoxKey.enableAi, defaultValue: true);
     _expandableCtr = ExpandableController(initialExpanded: false);
-
-    /// 一键三连动画
-    _controller = AnimationController(
-      duration: const Duration(milliseconds: 1500),
-      reverseDuration: const Duration(milliseconds: 300),
-      vsync: this,
-    );
-    _scaleTransition = Tween<double>(begin: 0.5, end: 1.5).animate(_controller)
-      ..addListener(() async {
-        _progress.value =
-            double.parse((_scaleTransition.value - 0.5).toStringAsFixed(3));
-        if (_progress.value == 1) {
-          if (_controller.status == AnimationStatus.completed) {
-            await videoIntroController.actionOneThree();
-          }
-          _progress.value = 0;
-          _scaleTransition.removeListener(() {});
-          _controller.stop();
-        }
-      });
   }
 
   // 收藏
@@ -214,37 +188,38 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
         if (!videoIntroController.hasFav.value) {
           videoIntroController.actionFavVideo(type: 'default');
         } else {
-          showModalBottomSheet(
-            context: context,
-            useRootNavigator: true,
-            isScrollControlled: true,
-            builder: (BuildContext context) {
-              return FavPanel(ctr: videoIntroController);
-            },
-          );
+          _showFavPanel();
         }
       } else {
-        showModalBottomSheet(
-          context: context,
-          useRootNavigator: true,
-          isScrollControlled: true,
-          builder: (BuildContext context) {
-            return FavPanel(ctr: videoIntroController);
-          },
-        );
+        _showFavPanel();
       }
     } else if (type != 'longPress') {
-      showModalBottomSheet(
-        context: context,
-        useRootNavigator: true,
-        isScrollControlled: true,
-        builder: (BuildContext context) {
-          return FavPanel(ctr: videoIntroController);
-        },
-      );
+      _showFavPanel();
     }
   }
 
+  void _showFavPanel() {
+    showFlexibleBottomSheet(
+      bottomSheetBorderRadius: const BorderRadius.only(
+        topLeft: Radius.circular(16),
+        topRight: Radius.circular(16),
+      ),
+      minHeight: 0.6,
+      initHeight: 0.6,
+      maxHeight: 1,
+      context: context,
+      builder: (BuildContext context, ScrollController scrollController,
+          double offset) {
+        return FavPanel(
+          ctr: videoIntroController,
+          scrollController: scrollController,
+        );
+      },
+      anchors: [0.6, 1],
+      isSafeArea: true,
+    );
+  }
+
   // 视频介绍
   showIntroDetail() {
     feedBack();
@@ -276,8 +251,6 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
   @override
   void dispose() {
     _expandableCtr.dispose();
-    _controller.dispose();
-    _scaleTransition.removeListener(() {});
     super.dispose();
   }
 
@@ -319,7 +292,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
               expanded: Text(
                 widget.videoDetail!.title!,
                 softWrap: true,
-                maxLines: 4,
+                maxLines: 10,
                 style: const TextStyle(
                   fontSize: 18,
                   fontWeight: FontWeight.bold,
@@ -344,13 +317,11 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                   child: Row(
                     children: [
                       StatView(
-                        theme: 'gray',
                         view: widget.videoDetail!.stat!.view,
                         size: 'medium',
                       ),
                       const SizedBox(width: 10),
                       StatDanMu(
-                        theme: 'gray',
                         danmu: widget.videoDetail!.stat!.danmaku,
                         size: 'medium',
                       ),
@@ -467,13 +438,16 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                       fadeOutDuration: Duration.zero,
                     ),
                     const SizedBox(width: 10),
-                    Text(owner.name, style: const TextStyle(fontSize: 13)),
+                    Text(widget.videoDetail!.owner!.name!,
+                        style: const TextStyle(fontSize: 13)),
                     const SizedBox(width: 6),
-                    Text(
-                      follower,
-                      style: TextStyle(
-                        fontSize: t.textTheme.labelSmall!.fontSize,
-                        color: outline,
+                    Obx(
+                      () => Text(
+                        Utils.numFormat(videoIntroController.follower.value),
+                        style: TextStyle(
+                          fontSize: t.textTheme.labelSmall!.fontSize,
+                          color: outline,
+                        ),
                       ),
                     ),
                     const Spacer(),
@@ -567,132 +541,40 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
   }
 
   Widget actionGrid(BuildContext context, videoIntroController) {
-    final actionTypeSort = GlobalData().actionTypeSort;
-
-    Widget progressWidget(progress) {
-      return SizedBox(
-        width: const IconThemeData.fallback().size! + 5,
-        height: const IconThemeData.fallback().size! + 5,
-        child: CircularProgressIndicator(
-          value: progress.value,
-          strokeWidth: 2,
-        ),
-      );
-    }
+    final actionTypeSort = GlobalDataCache().actionTypeSort;
 
     Map<String, Widget> menuListWidgets = {
       'like': Obx(
-        () {
-          bool likeStatus = videoIntroController.hasLike.value;
-          ColorScheme colorScheme = Theme.of(context).colorScheme;
-          return Stack(
-            children: [
-              Positioned(
-                  top: ((Get.size.width - 24) / 5) / 2 -
-                      (const IconThemeData.fallback().size!),
-                  left: ((Get.size.width - 24) / 5) / 2 -
-                      (const IconThemeData.fallback().size! + 5) / 2,
-                  child: progressWidget(_progress)),
-              InkWell(
-                onTapDown: (details) {
-                  feedBack();
-                  if (videoIntroController.userInfo == null) {
-                    SmartDialog.showToast('账号未登录');
-                    return;
-                  }
-                  _controller.forward();
-                },
-                onTapUp: (TapUpDetails details) {
-                  if (_progress.value == 0) {
-                    feedBack();
-                    EasyThrottle.throttle(
-                        'my-throttler', const Duration(milliseconds: 200), () {
-                      videoIntroController.actionLikeVideo();
-                    });
-                  }
-                  _controller.reverse();
-                },
-                borderRadius: StyleString.mdRadius,
-                child: SizedBox(
-                  width: (Get.size.width - 24) / 5,
-                  child: Column(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      const SizedBox(height: 4),
-                      AnimatedSwitcher(
-                        duration: const Duration(milliseconds: 300),
-                        transitionBuilder:
-                            (Widget child, Animation<double> animation) {
-                          return ScaleTransition(
-                              scale: animation, child: child);
-                        },
-                        child: Icon(
-                          key: ValueKey<bool>(likeStatus),
-                          likeStatus
-                              ? Icons.thumb_up
-                              : Icons.thumb_up_alt_outlined,
-                          color: likeStatus
-                              ? colorScheme.primary
-                              : colorScheme.outline,
-                        ),
-                      ),
-                      const SizedBox(height: 6),
-                      Text(
-                        widget.videoDetail!.stat!.like!.toString(),
-                        style: TextStyle(
-                          color: likeStatus ? colorScheme.primary : null,
-                          fontSize:
-                              Theme.of(context).textTheme.labelSmall!.fontSize,
-                        ),
-                      )
-                    ],
-                  ),
-                ),
-              ),
-            ],
-          );
-        },
+        () => ActionItem(
+          icon: const Icon(FontAwesomeIcons.thumbsUp),
+          selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp),
+          onTap: handleState(videoIntroController.actionLikeVideo),
+          onLongPress: () => videoIntroController.oneThreeDialog(),
+          selectStatus: videoIntroController.hasLike.value,
+          text: widget.videoDetail!.stat!.like!.toString(),
+        ),
       ),
       'coin': Obx(
-        () => Stack(
-          children: [
-            Positioned(
-                top: ((Get.size.width - 24) / 5) / 2 -
-                    (const IconThemeData.fallback().size!),
-                left: ((Get.size.width - 24) / 5) / 2 -
-                    (const IconThemeData.fallback().size! + 5) / 2,
-                child: progressWidget(_progress)),
-            ActionItem(
-              icon: Image.asset('assets/images/coin.png', width: 30),
-              onTap: handleState(videoIntroController.actionCoinVideo),
-              selectStatus: videoIntroController.hasCoin.value,
-              text: widget.videoDetail!.stat!.coin!.toString(),
-            ),
-          ],
+        () => ActionItem(
+          icon: const Icon(FontAwesomeIcons.b),
+          selectIcon: const Icon(FontAwesomeIcons.b),
+          onTap: handleState(videoIntroController.actionCoinVideo),
+          selectStatus: videoIntroController.hasCoin.value,
+          text: widget.videoDetail!.stat!.coin!.toString(),
         ),
       ),
       'collect': Obx(
-        () => Stack(
-          children: [
-            Positioned(
-                top: ((Get.size.width - 24) / 5) / 2 -
-                    (const IconThemeData.fallback().size!),
-                left: ((Get.size.width - 24) / 5) / 2 -
-                    (const IconThemeData.fallback().size! + 5) / 2,
-                child: progressWidget(_progress)),
-            ActionItem(
-              icon: const Icon(Icons.star_border),
-              selectIcon: const Icon(Icons.star),
-              onTap: () => showFavBottomSheet(),
-              onLongPress: () => showFavBottomSheet(type: 'longPress'),
-              selectStatus: videoIntroController.hasFav.value,
-              text: widget.videoDetail!.stat!.favorite!.toString(),
-            ),
-          ],
+        () => ActionItem(
+          icon: const Icon(FontAwesomeIcons.star),
+          selectIcon: const Icon(FontAwesomeIcons.solidStar),
+          onTap: () => showFavBottomSheet(),
+          onLongPress: () => showFavBottomSheet(type: 'longPress'),
+          selectStatus: videoIntroController.hasFav.value,
+          text: widget.videoDetail!.stat!.favorite!.toString(),
         ),
       ),
       'watchLater': ActionItem(
-        icon: const Icon(Icons.watch_later_outlined),
+        icon: const Icon(FontAwesomeIcons.clock),
         onTap: () async {
           final res =
               await UserHttp.toViewLater(bvid: widget.videoDetail!.bvid);
@@ -702,15 +584,15 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
         text: '稍后看',
       ),
       'share': ActionItem(
-        icon: const Icon(Icons.share),
+        icon: const Icon(FontAwesomeIcons.shareFromSquare),
         onTap: () => videoIntroController.actionShareVideo(),
         selectStatus: false,
         text: '分享',
       ),
       'dislike': Obx(
         () => ActionItem(
-          icon: const Icon(Icons.thumb_down_alt_outlined),
-          selectIcon: const Icon(Icons.thumb_down),
+          icon: const Icon(FontAwesomeIcons.thumbsDown),
+          selectIcon: const Icon(FontAwesomeIcons.solidThumbsDown),
           onTap: () {},
           selectStatus: videoIntroController.hasDisLike.value,
           text: '不喜欢',
diff --git a/lib/pages/video/detail/introduction/widgets/action_item.dart b/lib/pages/video/detail/introduction/widgets/action_item.dart
index 3288b2fa..fd0b9fef 100644
--- a/lib/pages/video/detail/introduction/widgets/action_item.dart
+++ b/lib/pages/video/detail/introduction/widgets/action_item.dart
@@ -51,6 +51,7 @@ class ActionItem extends StatelessWidget {
                       color: selectStatus
                           ? Theme.of(context).colorScheme.primary
                           : Theme.of(context).colorScheme.outline,
+                      size: 20,
                     )
                   : Image.asset(
                       key: ValueKey<bool>(selectStatus),
diff --git a/lib/pages/video/detail/introduction/widgets/fav_panel.dart b/lib/pages/video/detail/introduction/widgets/fav_panel.dart
index 5ef78967..2cf7d236 100644
--- a/lib/pages/video/detail/introduction/widgets/fav_panel.dart
+++ b/lib/pages/video/detail/introduction/widgets/fav_panel.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
@@ -6,8 +7,9 @@ import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/storage.dart';
 
 class FavPanel extends StatefulWidget {
-  const FavPanel({super.key, this.ctr});
+  const FavPanel({super.key, this.ctr, this.scrollController});
   final dynamic ctr;
+  final ScrollController? scrollController;
 
   @override
   State<FavPanel> createState() => _FavPanelState();
@@ -15,130 +17,128 @@ class FavPanel extends StatefulWidget {
 
 class _FavPanelState extends State<FavPanel> {
   final Box<dynamic> localCache = GStrorage.localCache;
-  late double sheetHeight;
   late Future _futureBuilderFuture;
 
   @override
   void initState() {
     super.initState();
-    sheetHeight = localCache.get('sheetHeight');
     _futureBuilderFuture = widget.ctr!.queryVideoInFolder();
   }
 
   @override
   Widget build(BuildContext context) {
-    return Container(
-      height: sheetHeight,
-      color: Theme.of(context).colorScheme.surface,
-      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),
+    return Column(
+      children: [
+        AppBar(
+          centerTitle: false,
+          elevation: 0,
+          automaticallyImplyLeading: false,
+          leadingWidth: 0,
+          title: Text(
+            '选择收藏夹',
+            style: Theme.of(context)
+                .textTheme
+                .titleMedium!
+                .copyWith(fontWeight: FontWeight.bold),
           ),
-          Expanded(
-            child: Material(
-              child: FutureBuilder(
-                future: _futureBuilderFuture,
-                builder: (BuildContext context, AsyncSnapshot snapshot) {
-                  if (snapshot.connectionState == ConnectionState.done) {
-                    Map data = snapshot.data as Map;
-                    if (data['status']) {
-                      return Obx(
-                        () => ListView.builder(
-                          itemCount:
-                              widget.ctr!.favFolderData.value.list!.length,
-                          itemBuilder: (context, index) {
-                            return ListTile(
-                              onTap: () => widget.ctr!.onChoose(
-                                  widget.ctr!.favFolderData.value.list![index]
-                                          .favState !=
-                                      1,
-                                  index),
-                              dense: true,
-                              leading: const Icon(Icons.folder_outlined),
-                              minLeadingWidth: 0,
-                              title: Text(widget.ctr!.favFolderData.value
-                                  .list![index].title!),
-                              subtitle: Text(
-                                '${widget.ctr!.favFolderData.value.list![index].mediaCount}个内容',
+        ),
+        Expanded(
+          child: Material(
+            child: FutureBuilder(
+              future: _futureBuilderFuture,
+              builder: (BuildContext context, AsyncSnapshot snapshot) {
+                if (snapshot.connectionState == ConnectionState.done) {
+                  Map data = snapshot.data as Map;
+                  if (data['status']) {
+                    return Obx(
+                      () => ListView.builder(
+                        controller: widget.scrollController,
+                        itemCount: widget.ctr!.favFolderData.value.list!.length,
+                        itemBuilder: (context, index) {
+                          final item =
+                              widget.ctr!.favFolderData.value.list![index];
+                          return ListTile(
+                            onTap: () =>
+                                widget.ctr!.onChoose(item.favState != 1, index),
+                            dense: true,
+                            leading: Icon([23, 1].contains(item.attr)
+                                ? Icons.lock_outline
+                                : Icons.folder_outlined),
+                            minLeadingWidth: 0,
+                            title: Text(item.title!),
+                            subtitle: Text(
+                              '${item.mediaCount}个内容 - ${[
+                                23,
+                                1
+                              ].contains(item.attr) ? '私密' : '公开'}',
+                            ),
+                            trailing: Transform.scale(
+                              scale: 0.9,
+                              child: Checkbox(
+                                value: item.favState == 1,
+                                onChanged: (bool? checkValue) =>
+                                    widget.ctr!.onChoose(checkValue!, index),
                               ),
-                              trailing: Transform.scale(
-                                scale: 0.9,
-                                child: Checkbox(
-                                  value: widget.ctr!.favFolderData.value
-                                          .list![index].favState ==
-                                      1,
-                                  onChanged: (bool? checkValue) =>
-                                      widget.ctr!.onChoose(checkValue!, index),
-                                ),
-                              ),
-                            );
-                          },
-                        ),
-                      );
-                    } else {
-                      return HttpError(
-                        errMsg: data['msg'],
-                        fn: () => setState(() {}),
-                      );
-                    }
+                            ),
+                          );
+                        },
+                      ),
+                    );
                   } else {
-                    // 骨架屏
-                    return const Text('请求中');
+                    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: <Widget>[
+              TextButton(
+                onPressed: () => Get.back(),
+                style: TextButton.styleFrom(
+                  padding: const EdgeInsets.only(left: 30, right: 30),
+                  backgroundColor:
+                      Theme.of(context).colorScheme.onInverseSurface, // 设置按钮背景色
+                ),
+                child: 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: <Widget>[
-                TextButton(
-                  onPressed: () => Get.back(),
-                  style: TextButton.styleFrom(
-                    padding: const EdgeInsets.only(left: 30, right: 30),
-                    backgroundColor: Theme.of(context)
-                        .colorScheme
-                        .onInverseSurface, // 设置按钮背景色
-                  ),
-                  child: const Text('取消'),
+              const SizedBox(width: 10),
+              TextButton(
+                onPressed: () async {
+                  feedBack();
+                  await widget.ctr!.actionFavVideo();
+                },
+                style: TextButton.styleFrom(
+                  padding: const EdgeInsets.only(left: 30, right: 30),
+                  foregroundColor: Theme.of(context).colorScheme.onPrimary,
+                  backgroundColor:
+                      Theme.of(context).colorScheme.primary, // 设置按钮背景色
                 ),
-                const SizedBox(width: 10),
-                TextButton(
-                  onPressed: () async {
-                    feedBack();
-                    await widget.ctr!.actionFavVideo();
-                  },
-                  style: TextButton.styleFrom(
-                    padding: const EdgeInsets.only(left: 30, right: 30),
-                    foregroundColor: Theme.of(context).colorScheme.onPrimary,
-                    backgroundColor:
-                        Theme.of(context).colorScheme.primary, // 设置按钮背景色
-                  ),
-                  child: const Text('完成'),
-                ),
-              ],
-            ),
+                child: const Text('确认'),
+              ),
+            ],
           ),
-        ],
-      ),
+        ),
+      ],
     );
   }
 }
diff --git a/lib/pages/video/detail/introduction/widgets/group_panel.dart b/lib/pages/video/detail/introduction/widgets/group_panel.dart
index dcdaf9c5..c007d52d 100644
--- a/lib/pages/video/detail/introduction/widgets/group_panel.dart
+++ b/lib/pages/video/detail/introduction/widgets/group_panel.dart
@@ -10,7 +10,8 @@ import 'package:pilipala/utils/storage.dart';
 
 class GroupPanel extends StatefulWidget {
   final int? mid;
-  const GroupPanel({super.key, this.mid});
+  final ScrollController scrollController;
+  const GroupPanel({super.key, this.mid, required this.scrollController});
 
   @override
   State<GroupPanel> createState() => _GroupPanelState();
@@ -18,7 +19,6 @@ class GroupPanel extends StatefulWidget {
 
 class _GroupPanelState extends State<GroupPanel> {
   final Box<dynamic> localCache = GStrorage.localCache;
-  late double sheetHeight;
   late Future _futureBuilderFuture;
   late List<MemberTagItemModel> tagsList;
   bool showDefault = true;
@@ -26,7 +26,6 @@ class _GroupPanelState extends State<GroupPanel> {
   @override
   void initState() {
     super.initState();
-    sheetHeight = localCache.get('sheetHeight');
     _futureBuilderFuture = MemberHttp.followUpTags();
   }
 
@@ -55,105 +54,101 @@ class _GroupPanelState extends State<GroupPanel> {
 
   @override
   Widget build(BuildContext context) {
-    return Container(
-      height: sheetHeight,
-      color: Theme.of(context).colorScheme.surface,
-      child: Column(
-        children: <Widget>[
-          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: (BuildContext context, AsyncSnapshot 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(() {});
-                                },
-                              ),
+    return Column(
+      children: <Widget>[
+        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: (BuildContext context, AsyncSnapshot snapshot) {
+                if (snapshot.connectionState == ConnectionState.done) {
+                  Map data = snapshot.data as Map;
+                  if (data['status']) {
+                    tagsList = data['data'];
+                    return ListView.builder(
+                      controller: widget.scrollController,
+                      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('请求中');
+                    return HttpError(
+                      errMsg: data['msg'],
+                      fn: () => setState(() {}),
+                    );
                   }
-                },
-              ),
+                } else {
+                  // 骨架屏
+                  return const Text('请求中');
+                }
+              },
             ),
           ),
-          Divider(
-            height: 1,
-            color: Theme.of(context).disabledColor.withOpacity(0.08),
+        ),
+        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,
           ),
-          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 ? '保存至默认分组' : '保存'),
+          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 ? '保存至默认分组' : '保存'),
+              ),
+            ],
           ),
-        ],
-      ),
+        ),
+      ],
     );
   }
 }
diff --git a/lib/pages/video/detail/reply/view.dart b/lib/pages/video/detail/reply/view.dart
index 653fe7e0..1b70015c 100644
--- a/lib/pages/video/detail/reply/view.dart
+++ b/lib/pages/video/detail/reply/view.dart
@@ -19,12 +19,14 @@ class VideoReplyPanel extends StatefulWidget {
   final int? oid;
   final int rpid;
   final String? replyLevel;
+  final Function(ScrollController)? onControllerCreated;
 
   const VideoReplyPanel({
     this.bvid,
     this.oid,
     this.rpid = 0,
     this.replyLevel,
+    this.onControllerCreated,
     super.key,
   });
 
@@ -68,6 +70,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
 
     _futureBuilderFuture = _videoReplyController.queryReplyList();
     scrollController = ScrollController();
+    widget.onControllerCreated?.call(scrollController);
     fabAnimationCtr.forward();
     scrollListener();
   }
@@ -109,7 +112,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
   }
 
   // 展示二级回复
-  void replyReply(replyItem) {
+  void replyReply(replyItem, currentReply, loadMore) {
     final VideoDetailController videoDetailCtr =
         Get.find<VideoDetailController>(tag: heroTag);
     if (replyItem != null) {
@@ -117,7 +120,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
       videoDetailCtr.fRpid = replyItem.rpid!;
       videoDetailCtr.firstFloor = replyItem;
       videoDetailCtr.showReplyReplyPanel(
-          replyItem.oid, replyItem.rpid!, replyItem);
+          replyItem.oid, replyItem.rpid!, replyItem, currentReply, loadMore);
     }
   }
 
@@ -150,7 +153,17 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                   child: Container(
                     height: 40,
                     padding: const EdgeInsets.fromLTRB(12, 0, 6, 0),
-                    color: Theme.of(context).colorScheme.surface,
+                    decoration: BoxDecoration(
+                      color: Theme.of(context).colorScheme.surface,
+                      boxShadow: [
+                        BoxShadow(
+                          color: Theme.of(context).colorScheme.surface,
+                          blurRadius: 0.0,
+                          spreadRadius: 0.0,
+                          offset: const Offset(2, 0),
+                        ),
+                      ],
+                    ),
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
@@ -185,7 +198,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                   if (snapshot.connectionState == ConnectionState.done) {
                     var data = snapshot.data;
                     if (_videoReplyController.replyList.isNotEmpty ||
-                        (data && data['status'])) {
+                        (data != null && data['status'])) {
                       // 请求成功
                       return Obx(
                         () => _videoReplyController.isLoadingMore &&
@@ -229,8 +242,10 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                                             .replyList[index],
                                         showReplyRow: true,
                                         replyLevel: replyLevel,
-                                        replyReply: (replyItem) =>
-                                            replyReply(replyItem),
+                                        replyReply: (replyItem, currentReply,
+                                                loadMore) =>
+                                            replyReply(replyItem, currentReply,
+                                                loadMore),
                                         replyType: ReplyType.video,
                                       );
                                     }
diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart
index 08e4d405..18242fea 100644
--- a/lib/pages/video/detail/reply/widgets/reply_item.dart
+++ b/lib/pages/video/detail/reply/widgets/reply_item.dart
@@ -1,3 +1,5 @@
+import 'dart:math';
+
 import 'package:appscheme/appscheme.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
@@ -7,17 +9,22 @@ import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/common/widgets/badge.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/http/reply.dart';
 import 'package:pilipala/models/common/reply_type.dart';
 import 'package:pilipala/models/video/reply/item.dart';
-import 'package:pilipala/pages/preview/index.dart';
+import 'package:pilipala/pages/main/index.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/pages/video/detail/reply_new/index.dart';
+import 'package:pilipala/plugin/pl_gallery/index.dart';
+import 'package:pilipala/plugin/pl_popup/index.dart';
 import 'package:pilipala/utils/app_scheme.dart';
 import 'package:pilipala/utils/feed_back.dart';
+import 'package:pilipala/utils/global_data_cache.dart';
 import 'package:pilipala/utils/id_utils.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/url_utils.dart';
 import 'package:pilipala/utils/utils.dart';
+import 'reply_save.dart';
 import 'zan.dart';
 
 Box setting = GStrorage.setting;
@@ -30,6 +37,7 @@ class ReplyItem extends StatelessWidget {
     this.showReplyRow = true,
     this.replyReply,
     this.replyType,
+    this.replySave = false,
     super.key,
   });
   final ReplyItemModel? replyItem;
@@ -38,26 +46,39 @@ class ReplyItem extends StatelessWidget {
   final bool? showReplyRow;
   final Function? replyReply;
   final ReplyType? replyType;
+  final bool? replySave;
 
   @override
   Widget build(BuildContext context) {
+    final bool isOwner = int.parse(replyItem!.member!.mid!) ==
+        (GlobalDataCache().userInfo?.mid ?? -1);
     return Material(
       child: InkWell(
         // 点击整个评论区 评论详情/回复
         onTap: () {
+          if (replySave!) {
+            return;
+          }
           feedBack();
           if (replyReply != null) {
-            replyReply!(replyItem);
+            replyReply!(replyItem, null, replyItem!.replies!.isNotEmpty);
           }
         },
         onLongPress: () {
+          if (replySave!) {
+            return;
+          }
           feedBack();
           showModalBottomSheet(
             context: context,
             useRootNavigator: true,
             isScrollControlled: true,
             builder: (context) {
-              return MorePanel(item: replyItem);
+              return MorePanel(
+                item: replyItem,
+                mainFloor: true,
+                isOwner: isOwner,
+              );
             },
           );
         },
@@ -179,25 +200,36 @@ class ReplyItem extends StatelessWidget {
                         ),
                     ],
                   ),
-                  Row(
-                    children: <Widget>[
-                      Text(
-                        Utils.dateFormat(replyItem!.ctime),
-                        style: TextStyle(
-                          fontSize: textTheme.labelSmall!.fontSize,
-                          color: colorScheme.outline,
-                        ),
-                      ),
-                      if (replyItem!.replyControl != null &&
-                          replyItem!.replyControl!.location != '')
-                        Text(
-                          ' • ${replyItem!.replyControl!.location!}',
+                  RichText(
+                    text: TextSpan(
+                      children: [
+                        TextSpan(
+                          text: Utils.dateFormat(replyItem!.ctime),
                           style: TextStyle(
-                              fontSize: textTheme.labelSmall!.fontSize,
-                              color: colorScheme.outline),
+                            fontSize: textTheme.labelSmall!.fontSize,
+                            color: colorScheme.outline,
+                          ),
                         ),
-                    ],
-                  )
+                        if (replyItem!.replyControl != null &&
+                            replyItem!.replyControl!.location != '')
+                          TextSpan(
+                            text: ' • ${replyItem!.replyControl!.location!}',
+                            style: TextStyle(
+                              fontSize: textTheme.labelSmall!.fontSize,
+                              color: colorScheme.outline,
+                            ),
+                          ),
+                        if (replyItem!.invisible!)
+                          TextSpan(
+                            text: ' • 隐藏的评论',
+                            style: TextStyle(
+                              color: colorScheme.outline,
+                              fontSize: textTheme.labelSmall!.fontSize,
+                            ),
+                          ),
+                      ],
+                    ),
+                  ),
                 ],
               ),
             ],
@@ -230,7 +262,7 @@ class ReplyItem extends StatelessWidget {
           ),
         ),
         // 操作区域
-        bottonAction(context, replyItem!.replyControl),
+        bottonAction(context, replyItem!.replyControl, replySave),
         // 一楼的评论
         if ((replyItem!.replyControl!.isShow! ||
                 replyItem!.replies!.isNotEmpty) &&
@@ -251,7 +283,7 @@ class ReplyItem extends StatelessWidget {
   }
 
   // 感谢、回复、复制
-  Widget bottonAction(BuildContext context, replyControl) {
+  Widget bottonAction(BuildContext context, replyControl, replySave) {
     ColorScheme colorScheme = Theme.of(context).colorScheme;
     TextTheme textTheme = Theme.of(context).textTheme;
     return Row(
@@ -284,16 +316,26 @@ class ReplyItem extends StatelessWidget {
                   });
             },
             child: Row(children: [
-              Icon(Icons.reply,
-                  size: 18, color: colorScheme.outline.withOpacity(0.8)),
-              const SizedBox(width: 3),
-              Text(
-                '回复',
-                style: TextStyle(
-                  fontSize: textTheme.labelMedium!.fontSize,
-                  color: colorScheme.outline,
+              if (!replySave!) ...[
+                Icon(Icons.reply,
+                    size: 18, color: colorScheme.outline.withOpacity(0.8)),
+                const SizedBox(width: 3),
+                Text(
+                  '回复',
+                  style: TextStyle(
+                    fontSize: textTheme.labelMedium!.fontSize,
+                    color: colorScheme.outline,
+                  ),
+                )
+              ],
+              if (replySave!)
+                Text(
+                  IdUtils.av2bv(replyItem!.oid!),
+                  style: TextStyle(
+                    fontSize: textTheme.labelMedium!.fontSize,
+                    color: colorScheme.outline,
+                  ),
                 ),
-              ),
             ]),
           ),
         ),
@@ -360,9 +402,13 @@ class ReplyItemRow extends StatelessWidget {
               for (int i = 0; i < replies!.length; i++) ...[
                 InkWell(
                   // 一楼点击评论展开评论详情
-                  // onTap: () {
-                  //   replyReply?.call(replyItem);
-                  // },
+                  onTap: () {
+                    replyReply?.call(
+                      replyItem,
+                      replies![i],
+                      replyItem!.replies!.isNotEmpty,
+                    );
+                  },
                   onLongPress: () {
                     feedBack();
                     showModalBottomSheet(
@@ -430,7 +476,8 @@ class ReplyItemRow extends StatelessWidget {
             if (extraRow == 1)
               InkWell(
                 // 一楼点击【共xx条回复】展开评论详情
-                onTap: () => replyReply!(replyItem),
+                onTap: () => replyReply?.call(replyItem, null, true),
+                onLongPress: () => {},
                 child: Container(
                   width: double.infinity,
                   padding: const EdgeInsets.fromLTRB(8, 5, 8, 8),
@@ -533,9 +580,31 @@ InlineSpan buildContent(
     spanChilds.add(
       TextSpan(
         text: str,
-        recognizer: TapGestureRecognizer()
-          ..onTap = () =>
-              replyReply?.call(replyItem.root == 0 ? replyItem : fReplyItem),
+        // recognizer: TapGestureRecognizer()
+        //   ..onTap = () => replyReply?.call(
+        //         replyItem.root == 0 ? replyItem : fReplyItem,
+        //         replyItem,
+        //         fReplyItem!.replies!.isNotEmpty,
+        //       ),
+      ),
+    );
+  }
+
+  void onPreviewImg(picList, initIndex, randomInt) {
+    final MainController mainController = Get.find<MainController>();
+    mainController.imgPreviewStatus = true;
+    Navigator.of(context).push(
+      HeroDialogRoute<void>(
+        builder: (BuildContext context) => InteractiveviewerGallery(
+          sources: picList,
+          initIndex: initIndex,
+          onPageChanged: (int pageIndex) {},
+          onDismissed: (int value) {
+            print('onDismissed');
+            final MainController mainController = Get.find<MainController>();
+            mainController.imgPreviewStatus = false;
+          },
+        ),
       ),
     );
   }
@@ -644,8 +713,14 @@ InlineSpan buildContent(
                           title,
                           '',
                         );
+                      } else if (RegExp(r'^cv\d+$').hasMatch(matchStr)) {
+                        Get.toNamed('/read', parameters: {
+                          'title': title,
+                          'id': Utils.matchNum(matchStr).first.toString(),
+                          'articleType': 'read',
+                        });
                       } else {
-                        Uri uri = Uri.parse(matchStr);
+                        Uri uri = Uri.parse(matchStr.replaceAll('/?', '?'));
                         SchemeEntity scheme = SchemeEntity(
                           scheme: uri.scheme,
                           host: uri.host,
@@ -700,9 +775,10 @@ InlineSpan buildContent(
           );
           // 只显示一次
           matchedStrs.add(matchStr);
-        } else if (content
-                .topicsMeta[matchStr.substring(1, matchStr.length - 1)] !=
-            null) {
+        } else if (content.topicsMeta.keys.isNotEmpty &&
+            matchStr.length > 1 &&
+            content.topicsMeta[matchStr.substring(1, matchStr.length - 1)] !=
+                null) {
           spanChilds.add(
             TextSpan(
               text: matchStr,
@@ -820,39 +896,35 @@ InlineSpan buildContent(
                         pictureItem['img_width']))
                     .truncateToDouble();
               } catch (_) {}
+              String randomInt = Random().nextInt(101).toString();
 
-              return GestureDetector(
-                onTap: () {
-                  showDialog(
-                    useSafeArea: false,
-                    context: context,
-                    builder: (BuildContext context) {
-                      return ImagePreview(initialPage: 0, imgList: picList);
-                    },
-                  );
-                },
-                child: Container(
-                  padding: const EdgeInsets.only(top: 4),
-                  constraints: BoxConstraints(maxHeight: maxHeight),
-                  width: box.maxWidth / 2,
-                  height: height,
-                  child: Stack(
-                    children: [
-                      Positioned.fill(
-                        child: NetworkImgLayer(
-                          src: pictureItem['img_src'],
-                          width: box.maxWidth / 2,
-                          height: height,
+              return Hero(
+                tag: picList[0] + randomInt,
+                child: GestureDetector(
+                  onTap: () => onPreviewImg(picList, 0, randomInt),
+                  child: Container(
+                    padding: const EdgeInsets.only(top: 4),
+                    constraints: BoxConstraints(maxHeight: maxHeight),
+                    width: box.maxWidth / 2,
+                    height: height,
+                    child: Stack(
+                      children: [
+                        Positioned.fill(
+                          child: NetworkImgLayer(
+                            src: picList[0],
+                            width: box.maxWidth / 2,
+                            height: height,
+                          ),
                         ),
-                      ),
-                      height > Get.size.height * 0.9
-                          ? const PBadge(
-                              text: '长图',
-                              right: 8,
-                              bottom: 8,
-                            )
-                          : const SizedBox(),
-                    ],
+                        height > Get.size.height * 0.9
+                            ? const PBadge(
+                                text: '长图',
+                                right: 8,
+                                bottom: 8,
+                              )
+                            : const SizedBox(),
+                      ],
+                    ),
                   ),
                 ),
               );
@@ -864,25 +936,23 @@ InlineSpan buildContent(
       List<Widget> list = [];
       for (var i = 0; i < len; i++) {
         picList.add(content.pictures[i]['img_src']);
+      }
+      for (var i = 0; i < len; i++) {
+        String randomInt = Random().nextInt(101).toString();
         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: content.pictures[i]['img_src'],
-                    width: box.maxWidth,
-                    height: box.maxWidth,
-                    origAspectRatio: content.pictures[i]['img_width'] /
-                        content.pictures[i]['img_height']),
+              return Hero(
+                tag: picList[i] + randomInt,
+                child: GestureDetector(
+                  onTap: () => onPreviewImg(picList, i, randomInt),
+                  child: NetworkImgLayer(
+                      src: picList[i],
+                      width: box.maxWidth,
+                      height: box.maxWidth,
+                      origAspectRatio: content.pictures[i]['img_width'] /
+                          content.pictures[i]['img_height']),
+                ),
               );
             },
           ),
@@ -946,7 +1016,14 @@ InlineSpan buildContent(
 
 class MorePanel extends StatelessWidget {
   final dynamic item;
-  const MorePanel({super.key, required this.item});
+  final bool mainFloor;
+  final bool isOwner;
+  const MorePanel({
+    super.key,
+    required this.item,
+    this.mainFloor = false,
+    this.isOwner = false,
+  });
 
   Future<dynamic> menuActionHandler(String type) async {
     String message = item.content.message ?? item.content;
@@ -968,15 +1045,56 @@ class MorePanel extends StatelessWidget {
           },
         );
         break;
+      case 'save':
+        Get.back();
+        Navigator.push(
+          Get.context!,
+          PlPopupRoute(child: ReplySave(replyItem: item)),
+        );
+        break;
       // case 'block':
       //   SmartDialog.showToast('加入黑名单');
       //   break;
       // case 'report':
       //   SmartDialog.showToast('举报');
       //   break;
-      // case 'delete':
-      //   SmartDialog.showToast('删除');
-      //   break;
+      case 'delete':
+        // 删除评论提示
+        await showDialog(
+          context: Get.context!,
+          builder: (context) {
+            return AlertDialog(
+              title: const Text('删除评论'),
+              content: const Text('删除评论后，评论下所有回复将被删除，确定删除吗？'),
+              actions: <Widget>[
+                TextButton(
+                  onPressed: () => Get.back(),
+                  child: Text('取消',
+                      style: TextStyle(
+                          color: Theme.of(context).colorScheme.outline)),
+                ),
+                TextButton(
+                  onPressed: () async {
+                    Get.back();
+                    var result = await ReplyHttp.replyDel(
+                      type: item.type!,
+                      oid: item.oid!,
+                      rpid: item.rpid!,
+                    );
+                    if (result['status']) {
+                      SmartDialog.showToast('评论删除成功，需手动刷新');
+                      Get.back();
+                    } else {
+                      SmartDialog.showToast(result['msg']);
+                    }
+                  },
+                  child: const Text('确定'),
+                ),
+              ],
+            );
+          },
+        );
+        break;
       default:
     }
   }
@@ -985,6 +1103,7 @@ class MorePanel extends StatelessWidget {
   Widget build(BuildContext context) {
     ColorScheme colorScheme = Theme.of(context).colorScheme;
     TextTheme textTheme = Theme.of(context).textTheme;
+    Color errorColor = colorScheme.error;
     return Container(
       padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
       child: Column(
@@ -1018,6 +1137,13 @@ class MorePanel extends StatelessWidget {
             leading: const Icon(Icons.copy_outlined, size: 19),
             title: Text('自由复制', style: textTheme.titleSmall),
           ),
+          if (mainFloor && item.content.pictures.isEmpty)
+            ListTile(
+              onTap: () async => await menuActionHandler('save'),
+              minLeadingWidth: 0,
+              leading: const Icon(Icons.save_alt_rounded, size: 19),
+              title: Text('本地保存', style: textTheme.titleSmall),
+            ),
           // ListTile(
           //   onTap: () async => await menuActionHandler('block'),
           //   minLeadingWidth: 0,
@@ -1030,12 +1156,14 @@ class MorePanel extends StatelessWidget {
           //   leading: Icon(Icons.report_outlined, color: errorColor),
           //   title: Text('举报', style: TextStyle(color: errorColor)),
           // ),
-          // ListTile(
-          //   onTap: () async => await menuActionHandler('del'),
-          //   minLeadingWidth: 0,
-          //   leading: Icon(Icons.delete_outline, color: errorColor),
-          //   title: Text('删除', style: TextStyle(color: errorColor)),
-          // ),
+          if (isOwner)
+            ListTile(
+              onTap: () async => await menuActionHandler('delete'),
+              minLeadingWidth: 0,
+              leading: Icon(Icons.delete_outline, color: errorColor),
+              title: Text('删除评论',
+                  style: textTheme.titleSmall!.copyWith(color: errorColor)),
+            ),
         ],
       ),
     );
diff --git a/lib/pages/video/detail/reply/widgets/reply_save.dart b/lib/pages/video/detail/reply/widgets/reply_save.dart
new file mode 100644
index 00000000..9eed4923
--- /dev/null
+++ b/lib/pages/video/detail/reply/widgets/reply_save.dart
@@ -0,0 +1,148 @@
+import 'dart:math';
+import 'dart:typed_data';
+import 'dart:ui';
+import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/models/video/reply/item.dart';
+import 'package:pilipala/pages/video/detail/reply/widgets/reply_item.dart';
+import 'package:saver_gallery/saver_gallery.dart';
+
+class ReplySave extends StatefulWidget {
+  final ReplyItemModel? replyItem;
+  const ReplySave({required this.replyItem, super.key});
+
+  @override
+  State<ReplySave> createState() => _ReplySaveState();
+}
+
+class _ReplySaveState extends State<ReplySave> {
+  final _boundaryKey = GlobalKey();
+
+  void _generatePicWidget() async {
+    SmartDialog.showLoading(msg: '保存中');
+    try {
+      RenderRepaintBoundary boundary = _boundaryKey.currentContext!
+          .findRenderObject() as RenderRepaintBoundary;
+      var image = await boundary.toImage(pixelRatio: 3);
+      ByteData? byteData = await image.toByteData(format: ImageByteFormat.png);
+      Uint8List pngBytes = byteData!.buffer.asUint8List();
+      String picName =
+          "plpl_reply_${DateTime.now().toString().replaceAll(RegExp(r'[- :]'), '').split('.').first}";
+      final result = await SaverGallery.saveImage(
+        Uint8List.fromList(pngBytes),
+        name: '$picName.png',
+        androidRelativePath: "Pictures/PiliPala",
+        androidExistNotSave: false,
+      );
+      if (result.isSuccess) {
+        SmartDialog.showToast('保存成功');
+      }
+    } catch (err) {
+      print(err);
+    } finally {
+      SmartDialog.dismiss();
+    }
+  }
+
+  List<Widget> _createWidgets(int count, Widget Function() builder) {
+    return List<Widget>.generate(count, (_) => Expanded(child: builder()));
+  }
+
+  List<Widget> _createColumnWidgets() {
+    return _createWidgets(3, () => Row(children: _createRowWidgets()));
+  }
+
+  List<Widget> _createRowWidgets() {
+    return _createWidgets(
+      4,
+      () => Center(
+        child: Transform.rotate(
+          angle: pi / 10,
+          child: const Text(
+            'PiliPala',
+            style: TextStyle(
+              color: Color(0x08000000),
+              fontSize: 18,
+              fontWeight: FontWeight.bold,
+              decoration: TextDecoration.none,
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SafeArea(
+      top: false,
+      bottom: false,
+      child: BackdropFilter(
+        filter: ImageFilter.blur(sigmaX: 4.0, sigmaY: 4.0),
+        child: Container(
+          width: Get.width,
+          height: Get.height,
+          padding: EdgeInsets.fromLTRB(
+            0,
+            MediaQuery.of(context).padding.top + 4,
+            0,
+            MediaQuery.of(context).padding.bottom + 4,
+          ),
+          color: Colors.black54,
+          child: Column(
+            children: [
+              Expanded(
+                child: Container(
+                  clipBehavior: Clip.antiAlias,
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(20),
+                  ),
+                  child: Center(
+                    child: SingleChildScrollView(
+                      child: RepaintBoundary(
+                        key: _boundaryKey,
+                        child: IntrinsicHeight(
+                          child: Stack(
+                            children: [
+                              ReplyItem(
+                                replyItem: widget.replyItem,
+                                showReplyRow: false,
+                                replySave: true,
+                              ),
+                              Positioned.fill(
+                                child: Column(
+                                  children: _createColumnWidgets(),
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+              const SizedBox(height: 20),
+              Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  FilledButton(
+                    onPressed: () => Get.back(),
+                    child: const Text('取消'),
+                  ),
+                  const SizedBox(width: 40),
+                  FilledButton(
+                    onPressed: _generatePicWidget,
+                    child: const Text('保存'),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/video/detail/reply_reply/controller.dart b/lib/pages/video/detail/reply_reply/controller.dart
index e94aaea5..3d5644e8 100644
--- a/lib/pages/video/detail/reply_reply/controller.dart
+++ b/lib/pages/video/detail/reply_reply/controller.dart
@@ -26,7 +26,7 @@ class VideoReplyReplyController extends GetxController {
     currentPage = 0;
   }
 
-  Future queryReplyList({type = 'init'}) async {
+  Future queryReplyList({type = 'init', currentReply}) async {
     if (type == 'init') {
       currentPage = 0;
     }
@@ -63,6 +63,17 @@ class VideoReplyReplyController extends GetxController {
         // res['data'].replies.addAll(replyList);
       }
     }
+    if (replyList.isNotEmpty && currentReply != null) {
+      int indexToRemove =
+          replyList.indexWhere((item) => currentReply.rpid == item.rpid);
+      // 如果找到了指定ID的项，则移除
+      if (indexToRemove != -1) {
+        replyList.removeAt(indexToRemove);
+      }
+      if (currentPage == 1 && type == 'init') {
+        replyList.insert(0, currentReply);
+      }
+    }
     isLoadingMore = false;
     return res;
   }
diff --git a/lib/pages/video/detail/reply_reply/view.dart b/lib/pages/video/detail/reply_reply/view.dart
index 6dda9512..06a40cd6 100644
--- a/lib/pages/video/detail/reply_reply/view.dart
+++ b/lib/pages/video/detail/reply_reply/view.dart
@@ -20,6 +20,8 @@ class VideoReplyReplyPanel extends StatefulWidget {
     this.source,
     this.replyType,
     this.sheetHeight,
+    this.currentReply,
+    this.loadMore = true,
     super.key,
   });
   final int? oid;
@@ -29,6 +31,8 @@ class VideoReplyReplyPanel extends StatefulWidget {
   final String? source;
   final ReplyType? replyType;
   final double? sheetHeight;
+  final dynamic currentReply;
+  final bool loadMore;
 
   @override
   State<VideoReplyReplyPanel> createState() => _VideoReplyReplyPanelState();
@@ -63,7 +67,9 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
       },
     );
 
-    _futureBuilderFuture = _videoReplyReplyController.queryReplyList();
+    _futureBuilderFuture = _videoReplyReplyController.queryReplyList(
+      currentReply: widget.currentReply,
+    );
   }
 
   void replyReply(replyItem) {}
@@ -107,7 +113,9 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
               onRefresh: () async {
                 setState(() {});
                 _videoReplyReplyController.currentPage = 0;
-                return await _videoReplyReplyController.queryReplyList();
+                return await _videoReplyReplyController.queryReplyList(
+                  currentReply: widget.currentReply,
+                );
               },
               child: CustomScrollView(
                 controller: _videoReplyReplyController.scrollController,
@@ -134,84 +142,102 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
                       ),
                     ),
                   ],
-                  FutureBuilder(
-                    future: _futureBuilderFuture,
-                    builder: (BuildContext context, snapshot) {
-                      if (snapshot.connectionState == ConnectionState.done) {
-                        Map? data = snapshot.data;
-                        if (data != null && data['status']) {
-                          // 请求成功
-                          return Obx(
-                            () => SliverList(
-                              delegate: SliverChildBuilderDelegate(
-                                (BuildContext context, int index) {
-                                  if (index ==
-                                      _videoReplyReplyController
-                                          .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(
+                  widget.loadMore
+                      ? FutureBuilder(
+                          future: _futureBuilderFuture,
+                          builder: (BuildContext context, snapshot) {
+                            if (snapshot.connectionState ==
+                                ConnectionState.done) {
+                              Map? data = snapshot.data;
+                              if (data != null && data['status']) {
+                                // 请求成功
+                                return Obx(
+                                  () => SliverList(
+                                    delegate: SliverChildBuilderDelegate(
+                                      (BuildContext context, int index) {
+                                        if (index ==
                                             _videoReplyReplyController
-                                                .noMore.value,
-                                            style: TextStyle(
-                                              fontSize: 12,
-                                              color: Theme.of(context)
-                                                  .colorScheme
-                                                  .outline,
+                                                .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(
+                                                  _videoReplyReplyController
+                                                      .noMore.value,
+                                                  style: TextStyle(
+                                                    fontSize: 12,
+                                                    color: Theme.of(context)
+                                                        .colorScheme
+                                                        .outline,
+                                                  ),
+                                                ),
+                                              ),
                                             ),
-                                          ),
-                                        ),
-                                      ),
-                                    );
-                                  } else {
-                                    return ReplyItem(
-                                      replyItem: _videoReplyReplyController
-                                          .replyList[index],
-                                      replyLevel: '2',
-                                      showReplyRow: false,
-                                      addReply: (replyItem) {
-                                        _videoReplyReplyController.replyList
-                                            .add(replyItem);
+                                          );
+                                        } else {
+                                          return ReplyItem(
+                                            replyItem:
+                                                _videoReplyReplyController
+                                                    .replyList[index],
+                                            replyLevel: '2',
+                                            showReplyRow: false,
+                                            addReply: (replyItem) {
+                                              _videoReplyReplyController
+                                                  .replyList
+                                                  .add(replyItem);
+                                            },
+                                            replyType: widget.replyType,
+                                            replyReply: (replyItem) =>
+                                                replyReply(replyItem),
+                                          );
+                                        }
                                       },
-                                      replyType: widget.replyType,
-                                      replyReply: (replyItem) =>
-                                          replyReply(replyItem),
-                                    );
-                                  }
-                                },
-                                childCount: _videoReplyReplyController
-                                        .replyList.length +
-                                    1,
+                                      childCount: _videoReplyReplyController
+                                              .replyList.length +
+                                          1,
+                                    ),
+                                  ),
+                                );
+                              } else {
+                                // 请求错误
+                                return HttpError(
+                                  errMsg: data?['msg'] ?? '请求错误',
+                                  fn: () => setState(() {}),
+                                );
+                              }
+                            } else {
+                              // 骨架屏
+                              return SliverList(
+                                delegate: SliverChildBuilderDelegate(
+                                    (BuildContext context, int index) {
+                                  return const VideoReplySkeleton();
+                                }, childCount: 8),
+                              );
+                            }
+                          },
+                        )
+                      : SliverToBoxAdapter(
+                          child: SizedBox(
+                            height: 200,
+                            child: Center(
+                              child: Text(
+                                '还没有评论',
+                                style: TextStyle(
+                                  fontSize: 12,
+                                  color: Theme.of(context).colorScheme.outline,
+                                ),
                               ),
                             ),
-                          );
-                        } else {
-                          // 请求错误
-                          return HttpError(
-                            errMsg: data?['msg'] ?? '请求错误',
-                            fn: () => setState(() {}),
-                          );
-                        }
-                      } else {
-                        // 骨架屏
-                        return SliverList(
-                          delegate: SliverChildBuilderDelegate(
-                              (BuildContext context, int index) {
-                            return const VideoReplySkeleton();
-                          }, childCount: 8),
-                        );
-                      }
-                    },
-                  )
+                          ),
+                        )
                 ],
               ),
             ),
diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart
index ef067d1b..7fe76745 100644
--- a/lib/pages/video/detail/view.dart
+++ b/lib/pages/video/detail/view.dart
@@ -1,20 +1,22 @@
 import 'dart:async';
 import 'dart:io';
-import 'dart:ui';
 
 import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart';
 import 'package:floating/floating.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
 import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
+import 'package:lottie/lottie.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/http/user.dart';
 import 'package:pilipala/models/common/search_type.dart';
 import 'package:pilipala/pages/bangumi/introduction/index.dart';
 import 'package:pilipala/pages/danmaku/view.dart';
+import 'package:pilipala/pages/main/index.dart';
 import 'package:pilipala/pages/video/detail/reply/index.dart';
 import 'package:pilipala/pages/video/detail/controller.dart';
 import 'package:pilipala/pages/video/detail/introduction/index.dart';
@@ -28,6 +30,7 @@ import 'package:status_bar_control/status_bar_control.dart';
 import '../../../plugin/pl_player/models/bottom_control_type.dart';
 import '../../../services/shutdown_timer_service.dart';
 import 'widgets/app_bar.dart';
+import 'widgets/header_control.dart';
 
 class VideoDetailPage extends StatefulWidget {
   const VideoDetailPage({Key? key}) : super(key: key);
@@ -61,7 +64,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   late bool autoPlayEnable;
   late bool autoPiP;
   late Floating floating;
-  bool isShowing = true;
+  RxBool isShowing = true.obs;
   // 生命周期监听
   late final AppLifecycleListener _lifecycleListener;
   late double statusHeight;
@@ -79,14 +82,16 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     videoIntroController.videoDetail.listen((value) {
       videoPlayerServiceHandler.onVideoDetailChange(value, vdCtr.cid.value);
     });
-    bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag);
-    bangumiIntroController.bangumiDetail.listen((value) {
-      videoPlayerServiceHandler.onVideoDetailChange(value, vdCtr.cid.value);
-    });
-    vdCtr.cid.listen((p0) {
-      videoPlayerServiceHandler.onVideoDetailChange(
-          bangumiIntroController.bangumiDetail.value, p0);
-    });
+    if (vdCtr.videoType == SearchType.media_bangumi) {
+      bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag);
+      bangumiIntroController.bangumiDetail.listen((value) {
+        videoPlayerServiceHandler.onVideoDetailChange(value, vdCtr.cid.value);
+      });
+      vdCtr.cid.listen((p0) {
+        videoPlayerServiceHandler.onVideoDetailChange(
+            bangumiIntroController.bangumiDetail.value, p0);
+      });
+    }
     statusBarHeight = localCache.get('statusBarHeight');
     autoExitFullcreen =
         setting.get(SettingBoxKey.enableAutoExit, defaultValue: false);
@@ -181,6 +186,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     plPlayerController!.addStatusLister(playerListener);
     vdCtr.autoPlay.value = true;
     vdCtr.isShowCover.value = false;
+    isShowing.value = true;
     autoEnterPip(status: PlayerStatus.playing);
   }
 
@@ -208,6 +214,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
           vdCtr.bottomList.removeAt(3);
         }
       }
+      vdCtr.toggeleWatchLaterVisible(!isFullScreen);
     });
   }
 
@@ -239,6 +246,11 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   @override
   // 离开当前页面时
   void didPushNext() async {
+    final MainController mainController = Get.find<MainController>();
+    if (mainController.imgPreviewStatus) {
+      return;
+    }
+
     /// 开启
     if (setting.get(SettingBoxKey.enableAutoBrightness, defaultValue: false)
         as bool) {
@@ -251,19 +263,22 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       plPlayerController!.pause();
       vdCtr.clearSubtitleContent();
     }
-    setState(() => isShowing = false);
+    isShowing.value = false;
     super.didPushNext();
   }
 
   @override
   // 返回当前页面时
   void didPopNext() async {
+    final MainController mainController = Get.find<MainController>();
+    if (mainController.imgPreviewStatus) {
+      return;
+    }
+
     if (plPlayerController != null &&
         plPlayerController!.videoPlayerController != null) {
-      setState(() {
-        vdCtr.setSubtitleContent();
-        isShowing = true;
-      });
+      vdCtr.setSubtitleContent();
+      isShowing.value = true;
     }
     vdCtr.isFirstTime = false;
     final bool autoplay = autoPlayEnable;
@@ -278,6 +293,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       plPlayerController?.play();
     }
     plPlayerController?.addStatusLister(playerListener);
+    appbarStream.add(0);
     super.didPopNext();
   }
 
@@ -318,12 +334,14 @@ class _VideoDetailPageState extends State<VideoDetailPage>
         plPlayerController?.danmakuController?.clear();
         break;
       case 'pause':
-        vdCtr.hiddenReplyReplyPanel();
-        if (vdCtr.videoType == SearchType.video) {
-          videoIntroController.hiddenEpisodeBottomSheet();
-        }
-        if (vdCtr.videoType == SearchType.media_bangumi) {
-          bangumiIntroController.hiddenEpisodeBottomSheet();
+        if (autoPiP) {
+          vdCtr.hiddenReplyReplyPanel();
+          if (vdCtr.videoType == SearchType.video) {
+            videoIntroController.hiddenEpisodeBottomSheet();
+          }
+          if (vdCtr.videoType == SearchType.media_bangumi) {
+            bangumiIntroController.hiddenEpisodeBottomSheet();
+          }
         }
         break;
     }
@@ -387,6 +405,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                   dividerColor: Colors.transparent,
                   tabs:
                       vdCtr.tabs.map((String name) => Tab(text: name)).toList(),
+                  onTap: (index) => vdCtr.onTapTabbar(index),
                 ),
               ),
             ),
@@ -492,46 +511,86 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       exitFullScreen();
     }
 
-    /// 播放器面板
-    Widget videoPlayerPanel = FutureBuilder(
-      future: _futureBuilderFuture,
-      builder: (BuildContext context, AsyncSnapshot snapshot) {
-        if (snapshot.hasData && snapshot.data['status']) {
-          return Obx(
-            () {
-              return !vdCtr.autoPlay.value
-                  ? const SizedBox()
-                  : Obx(
-                      () => PLVideoPlayer(
-                        controller: plPlayerController!,
-                        headerControl: vdCtr.headerControl,
-                        danmuWidget: PlDanmaku(
-                          key: Key(vdCtr.danmakuCid.value.toString()),
-                          cid: vdCtr.danmakuCid.value,
-                          playerController: plPlayerController!,
-                        ),
-                        bottomList: vdCtr.bottomList,
-                        showEposideCb: () => vdCtr.videoType == SearchType.video
-                            ? videoIntroController.showEposideHandler()
-                            : bangumiIntroController.showEposideHandler(),
-                        fullScreenCb: (bool status) {
-                          if (status) {
-                            videoHeight.value = Get.size.height;
-                          } else {
-                            videoHeight.value = defaultVideoHeight;
-                          }
-                        },
-                      ),
-                    );
-            },
-          );
-        } else {
-          // 加载失败异常处理
-          return const SizedBox();
-        }
-      },
+    SystemChrome.setSystemUIOverlayStyle(
+      SystemUiOverlayStyle(
+        systemNavigationBarColor: Colors.transparent,
+        systemNavigationBarIconBrightness:
+            Get.isDarkMode ? Brightness.light : Brightness.dark,
+      ),
     );
 
+    Widget buildLoadingWidget() {
+      return Center(child: Lottie.asset('assets/loading.json', width: 200));
+    }
+
+    Widget buildVideoPlayerWidget(AsyncSnapshot snapshot) {
+      return Obx(() => !vdCtr.autoPlay.value
+          ? const SizedBox()
+          : PLVideoPlayer(
+              controller: plPlayerController!,
+              headerControl: vdCtr.headerControl,
+              danmuWidget: PlDanmaku(
+                key: Key(vdCtr.danmakuCid.value.toString()),
+                cid: vdCtr.danmakuCid.value,
+                playerController: plPlayerController!,
+              ),
+              bottomList: vdCtr.bottomList,
+              showEposideCb: () => vdCtr.videoType == SearchType.video
+                  ? videoIntroController.showEposideHandler()
+                  : bangumiIntroController.showEposideHandler(),
+              fullScreenCb: (bool status) {
+                videoHeight.value =
+                    status ? Get.size.height : defaultVideoHeight;
+              },
+            ));
+    }
+
+    Widget buildErrorWidget(dynamic error) {
+      return Obx(
+        () => SizedBox(
+          height: videoHeight.value,
+          width: Get.size.width,
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              const Text('加载失败', style: TextStyle(color: Colors.white)),
+              Text('$error', style: const TextStyle(color: Colors.white)),
+              const SizedBox(height: 10),
+              IconButton.filled(
+                onPressed: () {
+                  setState(() {
+                    _futureBuilderFuture = vdCtr.queryVideoUrl();
+                  });
+                },
+                icon: const Icon(Icons.refresh),
+              )
+            ],
+          ),
+        ),
+      );
+    }
+
+    /// 播放器面板
+    Widget buildVideoPlayerPanel() {
+      return FutureBuilder(
+        future: _futureBuilderFuture,
+        builder: (BuildContext context, AsyncSnapshot snapshot) {
+          if (snapshot.connectionState == ConnectionState.waiting) {
+            return buildLoadingWidget();
+          } else if (snapshot.connectionState == ConnectionState.done) {
+            if (snapshot.hasData && snapshot.data['status']) {
+              return buildVideoPlayerWidget(snapshot);
+            } else {
+              return buildErrorWidget(snapshot.error);
+            }
+          } else {
+            return buildErrorWidget('未知错误');
+          }
+        },
+      );
+    }
+
     Widget childWhenDisabled = SafeArea(
       top: MediaQuery.of(context).orientation == Orientation.portrait &&
           plPlayerController?.isFullScreen.value == true,
@@ -546,9 +605,16 @@ class _VideoDetailPageState extends State<VideoDetailPage>
             key: vdCtr.scaffoldKey,
             appBar: PreferredSize(
               preferredSize: const Size.fromHeight(0),
-              child: AppBar(
-                backgroundColor: Colors.black,
-                elevation: 0,
+              child: StreamBuilder(
+                stream: appbarStream.stream.distinct(),
+                initialData: 0,
+                builder: ((context, snapshot) {
+                  return AppBar(
+                    backgroundColor: Colors.black,
+                    elevation: 0,
+                    scrolledUnderElevation: 0,
+                  );
+                }),
               ),
             ),
             body: ExtendedNestedScrollView(
@@ -605,7 +671,11 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                   tag: heroTag,
                                   child: Stack(
                                     children: <Widget>[
-                                      if (isShowing) videoPlayerPanel,
+                                      Obx(
+                                        () => isShowing.value
+                                            ? buildVideoPlayerPanel()
+                                            : const SizedBox(),
+                                      ),
 
                                       /// 关闭自动播放时 手动播放
                                       Obx(
@@ -683,6 +753,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                           () => VideoReplyPanel(
                             bvid: vdCtr.bvid,
                             oid: vdCtr.oid.value,
+                            onControllerCreated: vdCtr.onControllerCreated,
                           ),
                         )
                       ],
@@ -706,6 +777,62 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                 null,
               );
             }),
+          ),
+
+          /// 稍后再看列表
+          Obx(
+            () => Visibility(
+              visible: vdCtr.sourceType.value == 'watchLater' ||
+                  vdCtr.sourceType.value == 'fav',
+              child: AnimatedPositioned(
+                duration: const Duration(milliseconds: 400),
+                curve: Curves.easeInOut,
+                left: 12,
+                bottom: vdCtr.isWatchLaterVisible.value
+                    ? MediaQuery.of(context).padding.bottom + 12
+                    : -100,
+                child: Material(
+                  color: Colors.transparent,
+                  child: InkWell(
+                    onTap: () {
+                      vdCtr.toggeleWatchLaterVisible(
+                          !vdCtr.isWatchLaterVisible.value);
+                      vdCtr.showMediaListPanel();
+                    },
+                    borderRadius: const BorderRadius.all(Radius.circular(14)),
+                    child: Container(
+                      width: Get.width - 24,
+                      height: 54,
+                      padding: const EdgeInsets.symmetric(horizontal: 16),
+                      decoration: BoxDecoration(
+                        color: Theme.of(context)
+                            .colorScheme
+                            .secondaryContainer
+                            .withOpacity(0.95),
+                        borderRadius:
+                            const BorderRadius.all(Radius.circular(14)),
+                      ),
+                      child: Row(children: [
+                        const Icon(Icons.playlist_play, size: 24),
+                        const SizedBox(width: 10),
+                        Text(
+                          vdCtr.watchLaterTitle.value,
+                          style: TextStyle(
+                            color: Theme.of(context)
+                                .colorScheme
+                                .onSecondaryContainer,
+                            fontWeight: FontWeight.bold,
+                            letterSpacing: 0.2,
+                          ),
+                        ),
+                        const Spacer(),
+                        const Icon(Icons.keyboard_arrow_up_rounded, size: 26),
+                      ]),
+                    ),
+                  ),
+                ),
+              ),
+            ),
           )
         ],
       ),
@@ -714,7 +841,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     if (Platform.isAndroid) {
       return PiPSwitcher(
         childWhenDisabled: childWhenDisabled,
-        childWhenEnabled: videoPlayerPanel,
+        childWhenEnabled: buildVideoPlayerPanel(),
         floating: floating,
       );
     } else {
diff --git a/lib/pages/video/detail/widgets/ai_detail.dart b/lib/pages/video/detail/widgets/ai_detail.dart
index 37d51106..b71b026d 100644
--- a/lib/pages/video/detail/widgets/ai_detail.dart
+++ b/lib/pages/video/detail/widgets/ai_detail.dart
@@ -49,15 +49,18 @@ class AiDetail extends StatelessWidget {
             child: SingleChildScrollView(
               child: Column(
                 children: [
-                  SelectableText(
-                    modelResult!.summary!,
-                    style: const TextStyle(
-                      fontSize: 15,
-                      fontWeight: FontWeight.bold,
-                      height: 1.5,
+                  if (modelResult!.resultType != 0 &&
+                      modelResult!.summary != '') ...[
+                    SelectableText(
+                      modelResult!.summary!,
+                      style: const TextStyle(
+                        fontSize: 15,
+                        fontWeight: FontWeight.bold,
+                        height: 1.5,
+                      ),
                     ),
-                  ),
-                  const SizedBox(height: 20),
+                    const SizedBox(height: 20),
+                  ],
                   ListView.builder(
                     shrinkWrap: true,
                     physics: const NeverScrollableScrollPhysics(),
diff --git a/lib/pages/video/detail/widgets/header_control.dart b/lib/pages/video/detail/widgets/header_control.dart
index f51edff1..b2bed21c 100644
--- a/lib/pages/video/detail/widgets/header_control.dart
+++ b/lib/pages/video/detail/widgets/header_control.dart
@@ -30,6 +30,7 @@ class HeaderControl extends StatefulWidget implements PreferredSizeWidget {
     this.floating,
     this.bvid,
     this.videoType,
+    this.showSubtitleBtn,
     super.key,
   });
   final PlPlayerController? controller;
@@ -37,6 +38,7 @@ class HeaderControl extends StatefulWidget implements PreferredSizeWidget {
   final Floating? floating;
   final String? bvid;
   final SearchType? videoType;
+  final bool? showSubtitleBtn;
 
   @override
   State<HeaderControl> createState() => _HeaderControlState();
@@ -426,49 +428,59 @@ class _HeaderControlState extends State<HeaderControl> {
   /// 选择字幕
   void showSubtitleDialog() async {
     int tempThemeValue = widget.controller!.subTitleCode.value;
-    int len = widget.videoDetailCtr!.subtitles.length;
+    final List subtitles = widget.videoDetailCtr!.subtitles;
+    int len = subtitles.length;
+    if (subtitles.firstWhereOrNull((element) => element.id == tempThemeValue) ==
+        null) {
+      tempThemeValue = -1;
+    }
     showDialog(
         context: context,
         builder: (BuildContext context) {
           return AlertDialog(
             title: const Text('选择字幕'),
             contentPadding: const EdgeInsets.fromLTRB(0, 12, 0, 18),
-            content: StatefulBuilder(builder: (context, StateSetter setState) {
-              return len == 0
-                  ? const SizedBox(
-                      height: 60,
-                      child: Center(
-                        child: Text('没有字幕'),
-                      ),
-                    )
-                  : Column(
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        RadioListTile(
-                          value: -1,
-                          title: const Text('关闭字幕'),
-                          groupValue: tempThemeValue,
-                          onChanged: (value) {
-                            tempThemeValue = value!;
-                            widget.controller?.toggleSubtitle(value);
-                            Get.back();
-                          },
+            content: StatefulBuilder(
+              builder: (context, StateSetter setState) {
+                return len == 0
+                    ? const SizedBox(
+                        height: 60,
+                        child: Center(
+                          child: Text('没有字幕'),
                         ),
-                        ...widget.videoDetailCtr!.subtitles
-                            .map((e) => RadioListTile(
-                                  value: e.code,
-                                  title: Text(e.title),
-                                  groupValue: tempThemeValue,
-                                  onChanged: (value) {
-                                    tempThemeValue = value!;
-                                    widget.controller?.toggleSubtitle(value);
-                                    Get.back();
-                                  },
-                                ))
-                            .toList(),
-                      ],
-                    );
-            }),
+                      )
+                    : SingleChildScrollView(
+                        child: Column(
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            RadioListTile(
+                              value: -1,
+                              title: const Text('关闭字幕'),
+                              groupValue: tempThemeValue,
+                              onChanged: (value) {
+                                tempThemeValue = value!;
+                                widget.controller?.toggleSubtitle(value);
+                                Get.back();
+                              },
+                            ),
+                            ...widget.videoDetailCtr!.subtitles
+                                .map((e) => RadioListTile(
+                                      value: e.id,
+                                      title: Text(e.title),
+                                      groupValue: tempThemeValue,
+                                      onChanged: (value) {
+                                        tempThemeValue = value!;
+                                        widget.controller
+                                            ?.toggleSubtitle(value);
+                                        Get.back();
+                                      },
+                                    ))
+                                .toList(),
+                          ],
+                        ),
+                      );
+              },
+            ),
           );
         });
   }
@@ -1317,14 +1329,15 @@ class _HeaderControlState extends State<HeaderControl> {
           ],
 
           /// 字幕
-          ComBtn(
-            icon: const Icon(
-              Icons.closed_caption_off,
-              size: 22,
-              color: Colors.white,
+          if (widget.showSubtitleBtn ?? true)
+            ComBtn(
+              icon: const Icon(
+                Icons.closed_caption_off,
+                size: 22,
+                color: Colors.white,
+              ),
+              fuc: () => showSubtitleDialog(),
             ),
-            fuc: () => showSubtitleDialog(),
-          ),
           SizedBox(width: buttonSpace),
           Obx(
             () => SizedBox(
diff --git a/lib/pages/video/detail/widgets/watch_later_list.dart b/lib/pages/video/detail/widgets/watch_later_list.dart
new file mode 100644
index 00000000..8e83af4e
--- /dev/null
+++ b/lib/pages/video/detail/widgets/watch_later_list.dart
@@ -0,0 +1,229 @@
+import 'package:easy_debounce/easy_throttle.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/constants.dart';
+import 'package:pilipala/common/widgets/badge.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/common/widgets/stat/danmu.dart';
+import 'package:pilipala/common/widgets/stat/view.dart';
+import 'package:pilipala/http/search.dart';
+import 'package:pilipala/http/user.dart';
+import 'package:pilipala/models/video/later.dart';
+import 'package:pilipala/utils/utils.dart';
+
+class MediaListPanel extends StatefulWidget {
+  const MediaListPanel({
+    this.sheetHeight,
+    required this.mediaList,
+    this.changeMediaList,
+    this.panelTitle,
+    this.bvid,
+    this.mediaId,
+    this.hasMore = false,
+    super.key,
+  });
+
+  final double? sheetHeight;
+  final List<MediaVideoItemModel> mediaList;
+  final Function? changeMediaList;
+  final String? panelTitle;
+  final String? bvid;
+  final int? mediaId;
+  final bool hasMore;
+
+  @override
+  State<MediaListPanel> createState() => _MediaListPanelState();
+}
+
+class _MediaListPanelState extends State<MediaListPanel> {
+  RxList<MediaVideoItemModel> mediaList = <MediaVideoItemModel>[].obs;
+  final ScrollController _scrollController = ScrollController();
+
+  @override
+  void initState() {
+    super.initState();
+    mediaList.value = widget.mediaList;
+    _scrollController.addListener(() {
+      if (_scrollController.position.pixels >=
+          _scrollController.position.maxScrollExtent - 200) {
+        if (widget.hasMore) {
+          EasyThrottle.throttle(
+              'queryFollowDynamic', const Duration(seconds: 1), () {
+            loadMore();
+          });
+        }
+      }
+    });
+  }
+
+  void loadMore() async {
+    var res = await UserHttp.getMediaList(
+      type: 3,
+      bizId: widget.mediaId!,
+      ps: 20,
+      oid: mediaList.last.id,
+    );
+    if (res['status']) {
+      if (res['data'].isNotEmpty) {
+        mediaList.addAll(res['data']);
+      }
+    } else {
+      SmartDialog.showToast(res['msg']);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      height: widget.sheetHeight,
+      color: Theme.of(context).colorScheme.surface,
+      child: Column(
+        children: [
+          AppBar(
+            toolbarHeight: 45,
+            automaticallyImplyLeading: false,
+            centerTitle: false,
+            title: Text(
+              widget.panelTitle ?? '稍后再看',
+              style: Theme.of(context).textTheme.titleSmall,
+            ),
+            actions: [
+              IconButton(
+                icon: const Icon(Icons.close, size: 20),
+                onPressed: () {
+                  Navigator.pop(context);
+                },
+              ),
+              const SizedBox(width: 14),
+            ],
+          ),
+          Expanded(
+            child: Material(
+              color: Theme.of(context).colorScheme.surface,
+              child: Obx(
+                () => ListView.builder(
+                  controller: _scrollController,
+                  itemCount: mediaList.length,
+                  itemBuilder: ((context, index) {
+                    var item = mediaList[index];
+                    return InkWell(
+                      onTap: () async {
+                        String bvid = item.bvid!;
+                        int? aid = item.id;
+                        String cover = item.cover ?? '';
+                        final int cid =
+                            await SearchHttp.ab2c(aid: aid, bvid: bvid);
+                        widget.changeMediaList?.call(bvid, cid, aid, cover);
+                      },
+                      child: Padding(
+                        padding: const EdgeInsets.symmetric(
+                            horizontal: 10, vertical: 8),
+                        child: LayoutBuilder(
+                          builder: (BuildContext context,
+                              BoxConstraints boxConstraints) {
+                            const double width = 120;
+                            return Container(
+                              constraints: const BoxConstraints(minHeight: 88),
+                              height: width / StyleString.aspectRatio,
+                              child: Row(
+                                mainAxisAlignment: MainAxisAlignment.start,
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: <Widget>[
+                                  AspectRatio(
+                                    aspectRatio: StyleString.aspectRatio,
+                                    child: LayoutBuilder(
+                                      builder: (BuildContext context,
+                                          BoxConstraints boxConstraints) {
+                                        final double maxWidth =
+                                            boxConstraints.maxWidth;
+                                        final double maxHeight =
+                                            boxConstraints.maxHeight;
+                                        return Stack(
+                                          children: [
+                                            NetworkImgLayer(
+                                              src: item.cover ?? '',
+                                              width: maxWidth,
+                                              height: maxHeight,
+                                            ),
+                                            PBadge(
+                                              text: Utils.timeFormat(
+                                                  item.duration!),
+                                              right: 6.0,
+                                              bottom: 6.0,
+                                              type: 'gray',
+                                            ),
+                                          ],
+                                        );
+                                      },
+                                    ),
+                                  ),
+                                  Expanded(
+                                    child: Padding(
+                                      padding: const EdgeInsets.fromLTRB(
+                                          10, 0, 6, 0),
+                                      child: Column(
+                                        crossAxisAlignment:
+                                            CrossAxisAlignment.start,
+                                        children: [
+                                          Text(
+                                            item.title as String,
+                                            textAlign: TextAlign.start,
+                                            maxLines: 2,
+                                            overflow: TextOverflow.ellipsis,
+                                            style: TextStyle(
+                                              fontWeight: FontWeight.w500,
+                                              color: item.bvid == widget.bvid
+                                                  ? Theme.of(context)
+                                                      .colorScheme
+                                                      .primary
+                                                  : null,
+                                            ),
+                                          ),
+                                          const Spacer(),
+                                          Text(
+                                            item.upper?.name as String,
+                                            style: TextStyle(
+                                              fontSize: Theme.of(context)
+                                                  .textTheme
+                                                  .labelMedium!
+                                                  .fontSize,
+                                              color: Theme.of(context)
+                                                  .colorScheme
+                                                  .outline,
+                                            ),
+                                          ),
+                                          const SizedBox(height: 2),
+                                          Row(
+                                            children: [
+                                              StatView(
+                                                  view: item.cntInfo!['play']
+                                                      as int),
+                                              const SizedBox(width: 8),
+                                              StatDanMu(
+                                                  danmu:
+                                                      item.cntInfo!['danmaku']
+                                                          as int),
+                                            ],
+                                          ),
+                                        ],
+                                      ),
+                                    ),
+                                  )
+                                ],
+                              ),
+                            );
+                          },
+                        ),
+                      ),
+                    );
+                  }),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/pages/webview/controller.dart b/lib/pages/webview/controller.dart
index e0ff113c..93a7144d 100644
--- a/lib/pages/webview/controller.dart
+++ b/lib/pages/webview/controller.dart
@@ -1,19 +1,8 @@
-// ignore_for_file: avoid_print
-
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
-import 'package:hive/hive.dart';
 import 'package:pilipala/http/init.dart';
-import 'package:pilipala/http/user.dart';
-import 'package:pilipala/pages/home/index.dart';
-import 'package:pilipala/pages/media/index.dart';
-import 'package:pilipala/utils/cookie.dart';
 import 'package:pilipala/utils/event_bus.dart';
 import 'package:pilipala/utils/id_utils.dart';
 import 'package:pilipala/utils/login.dart';
-import 'package:pilipala/utils/storage.dart';
 import 'package:webview_flutter/webview_flutter.dart';
 
 class WebviewController extends GetxController {
@@ -95,6 +84,6 @@ class WebviewController extends GetxController {
           },
         ),
       )
-      ..loadRequest(Uri.parse(url));
+      ..loadRequest(Uri.parse(url.startsWith('http') ? url : 'https://$url'));
   }
 }
diff --git a/lib/pages/whisper/controller.dart b/lib/pages/whisper/controller.dart
index 2614bf5a..749a3482 100644
--- a/lib/pages/whisper/controller.dart
+++ b/lib/pages/whisper/controller.dart
@@ -17,7 +17,7 @@ class WhisperController extends GetxController {
     },
     {
       'icon': Icons.alternate_email,
-      'title': '@ 我的',
+      'title': '@我的',
       'path': '/messageAt',
       'count': 0,
     },
diff --git a/lib/pages/whisper/view.dart b/lib/pages/whisper/view.dart
index fccdd844..e97aa79b 100644
--- a/lib/pages/whisper/view.dart
+++ b/lib/pages/whisper/view.dart
@@ -1,5 +1,6 @@
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/skeleton/skeleton.dart';
@@ -69,7 +70,19 @@ class _WhisperPageState extends State<WhisperPage> {
                           children: [
                             ..._whisperController.noticesList.map((element) {
                               return InkWell(
-                                onTap: () => Get.toNamed(element['path']),
+                                onTap: () {
+                                  if (['/messageAt']
+                                      .contains(element['path'])) {
+                                    SmartDialog.showToast('功能开发中');
+                                    return;
+                                  }
+                                  Get.toNamed(element['path']);
+
+                                  if (element['count'] > 0) {
+                                    element['count'] = 0;
+                                  }
+                                  _whisperController.noticesList.refresh();
+                                },
                                 onLongPress: () {},
                                 borderRadius: StyleString.mdRadius,
                                 child: Column(
@@ -201,9 +214,10 @@ class SessionItem extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final String heroTag = Utils.makeHeroTag(sessionItem.accountInfo.mid);
+    final String heroTag = Utils.makeHeroTag(sessionItem.accountInfo?.mid ?? 0);
     final content = sessionItem.lastMsg.content;
     final msgStatus = sessionItem.lastMsg.msgStatus;
+    final int msgType = sessionItem.lastMsg.msgType;
 
     return ListTile(
       onTap: () {
@@ -215,7 +229,7 @@ class SessionItem extends StatelessWidget {
             'talkerId': sessionItem.talkerId.toString(),
             'name': sessionItem.accountInfo.name,
             'face': sessionItem.accountInfo.face,
-            'mid': sessionItem.accountInfo.mid.toString(),
+            'mid': (sessionItem.accountInfo?.mid ?? 0).toString(),
             'heroTag': heroTag,
           },
         );
@@ -238,13 +252,15 @@ class SessionItem extends StatelessWidget {
       subtitle: Text(
           msgStatus == 1
               ? '你撤回了一条消息'
-              : content != null && content != ''
-                  ? (content['text'] ??
-                      content['content'] ??
-                      content['title'] ??
-                      content['reply_content'] ??
-                      '不支持的消息类型')
-                  : '不支持的消息类型',
+              : msgType == 2
+                  ? '[图片]'
+                  : content != null && content != ''
+                      ? (content['text'] ??
+                          content['content'] ??
+                          content['title'] ??
+                          content['reply_content'] ??
+                          '不支持的消息类型')
+                      : '不支持的消息类型',
           maxLines: 1,
           overflow: TextOverflow.ellipsis,
           style: Theme.of(context)
diff --git a/lib/pages/whisper_detail/controller.dart b/lib/pages/whisper_detail/controller.dart
index 32e0ceb0..ec828afb 100644
--- a/lib/pages/whisper_detail/controller.dart
+++ b/lib/pages/whisper_detail/controller.dart
@@ -22,6 +22,7 @@ class WhisperDetailController extends GetxController {
   final TextEditingController replyContentController = TextEditingController();
   Box userInfoCache = GStrorage.userInfo;
   List emoteList = [];
+  List<String> picList = [];
 
   @override
   void onInit() {
@@ -41,6 +42,18 @@ class WhisperDetailController extends GetxController {
     var res = await MsgHttp.sessionMsg(talkerId: talkerId);
     if (res['status']) {
       messageList.value = res['data'].messages;
+      // 找出图片
+      try {
+        for (var item in messageList) {
+          if (item.msgType == 2) {
+            picList.add(item.content['url']);
+          }
+        }
+        picList = picList.reversed.toList();
+      } catch (e) {
+        print('e: $e');
+      }
+
       if (messageList.isNotEmpty) {
         ackSessionMsg();
         if (res['data'].eInfos != null) {
diff --git a/lib/pages/whisper_detail/view.dart b/lib/pages/whisper_detail/view.dart
index 912b5dc5..3ea59343 100644
--- a/lib/pages/whisper_detail/view.dart
+++ b/lib/pages/whisper_detail/view.dart
@@ -193,27 +193,21 @@ class _WhisperDetailPageState extends State<WhisperDetailPage>
                             ? const SizedBox()
                             : Align(
                                 alignment: Alignment.topCenter,
-                                child: ListView.builder(
+                                child: ListView.separated(
                                   itemCount: messageList.length,
                                   shrinkWrap: true,
                                   reverse: true,
                                   itemBuilder: (_, int i) {
-                                    if (i == 0) {
-                                      return Column(
-                                        children: [
-                                          ChatItem(
-                                              item: messageList[i],
-                                              e_infos: _whisperDetailController
-                                                  .eInfos),
-                                          const SizedBox(height: 20),
-                                        ],
-                                      );
-                                    } else {
-                                      return ChatItem(
-                                          item: messageList[i],
-                                          e_infos:
-                                              _whisperDetailController.eInfos);
-                                    }
+                                    return ChatItem(
+                                      item: messageList[i],
+                                      e_infos: _whisperDetailController.eInfos,
+                                      ctr: _whisperDetailController,
+                                    );
+                                  },
+                                  separatorBuilder: (_, int i) {
+                                    return i == 0
+                                        ? const SizedBox(height: 20)
+                                        : const SizedBox.shrink();
                                   },
                                 ),
                               ),
diff --git a/lib/pages/whisper_detail/widget/chat_item.dart b/lib/pages/whisper_detail/widget/chat_item.dart
index f64cf223..01ede374 100644
--- a/lib/pages/whisper_detail/widget/chat_item.dart
+++ b/lib/pages/whisper_detail/widget/chat_item.dart
@@ -1,15 +1,18 @@
 // ignore_for_file: must_be_immutable
+// ignore_for_file: constant_identifier_names
 
 import 'dart:convert';
 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/plugin/pl_gallery/hero_dialog_route.dart';
+import 'package:pilipala/plugin/pl_gallery/interactiveviewer_gallery.dart';
 import 'package:pilipala/utils/route_push.dart';
 import 'package:pilipala/utils/utils.dart';
 import 'package:pilipala/utils/storage.dart';
-
 import '../../../http/search.dart';
+import '../controller.dart';
 
 enum MsgType {
   invalid(value: 0, label: "空空的~"),
@@ -42,10 +45,12 @@ enum MsgType {
 class ChatItem extends StatelessWidget {
   dynamic item;
   List? e_infos;
+  WhisperDetailController ctr;
 
   ChatItem({
     super.key,
-    this.item,
+    required this.item,
+    required this.ctr,
     this.e_infos,
   });
 
@@ -84,7 +89,7 @@ class ChatItem extends StatelessWidget {
           emojiMap[e['text']] = e['url'];
         }
         text.splitMapJoin(
-          RegExp(r"\[.+?\]"),
+          RegExp(r"\[[^\[\]]+\]"),
           onMatch: (Match match) {
             final String emojiKey = match[0]!;
             if (emojiMap.containsKey(emojiKey)) {
@@ -95,6 +100,17 @@ class ChatItem extends StatelessWidget {
                   src: emojiMap[emojiKey]!,
                 ),
               ));
+            } else {
+              children.add(
+                TextSpan(
+                  text: emojiKey,
+                  style: TextStyle(
+                    color: textColor(context),
+                    letterSpacing: 0.6,
+                    height: 1.5,
+                  ),
+                ),
+              );
             }
             return '';
           },
@@ -109,13 +125,13 @@ class ChatItem extends StatelessWidget {
             return '';
           },
         );
-        return RichText(
-          text: TextSpan(
+        return SelectableText.rich(
+          TextSpan(
             children: children,
           ),
         );
       } else {
-        return Text(
+        return SelectableText(
           text,
           style: TextStyle(
             letterSpacing: 0.6,
@@ -133,7 +149,7 @@ class ChatItem extends StatelessWidget {
         case MsgType.pic_card:
           return SystemNotice2(item: item);
         case MsgType.notify_text:
-          return Text(
+          return SelectableText(
             jsonDecode(content['content'])
                 .map((m) => m['text'] as String)
                 .join("\n"),
@@ -146,10 +162,23 @@ class ChatItem extends StatelessWidget {
         case MsgType.text:
           return richTextMessage(context);
         case MsgType.pic:
-          return NetworkImgLayer(
-            width: 220,
-            height: 220 * content['height'] / content['width'],
-            src: content['url'],
+          return InkWell(
+            onTap: () {
+              Navigator.of(context).push(
+                HeroDialogRoute<void>(
+                  builder: (BuildContext context) => InteractiveviewerGallery(
+                    sources: ctr.picList,
+                    initIndex: ctr.picList.indexOf(content['url']),
+                    onPageChanged: (int pageIndex) {},
+                  ),
+                ),
+              );
+            },
+            child: NetworkImgLayer(
+              width: 220,
+              height: 220 * content['height'] / content['width'],
+              src: content['url'],
+            ),
           );
         case MsgType.share_v2:
           return Column(
@@ -409,12 +438,6 @@ class ChatItem extends StatelessWidget {
                   crossAxisAlignment: CrossAxisAlignment.center,
                   children: [
                     const SizedBox(width: safeDistanceval),
-                    if (isOwner)
-                      Text(
-                        Utils.dateFormat(item.timestamp),
-                        style: Theme.of(context).textTheme.labelSmall!.copyWith(
-                            color: Theme.of(context).colorScheme.outline),
-                      ),
                     Container(
                       constraints: const BoxConstraints(
                         maxWidth: 300.0, // 设置最大宽度为200.0
@@ -444,51 +467,45 @@ class ChatItem extends StatelessWidget {
                         right: 8,
                       ),
                       padding: const EdgeInsets.all(paddingVal),
-                      child: messageContent(context),
-                      // child: Column(
-                      //   crossAxisAlignment: isOwner
-                      //       ? CrossAxisAlignment.end
-                      //       : CrossAxisAlignment.start,
-                      //   children: [
-                      //     messageContent(context),
-                      //     SizedBox(height: isPic ? 7 : 2),
-                      //     Row(
-                      //       mainAxisSize: MainAxisSize.min,
-                      //       children: [
-                      //         Text(
-                      //           Utils.dateFormat(item.timestamp),
-                      //           style: Theme.of(context)
-                      //               .textTheme
-                      //               .labelSmall!
-                      //               .copyWith(
-                      //                   color: isOwner
-                      //                       ? Theme.of(context)
-                      //                           .colorScheme
-                      //                           .onPrimary
-                      //                           .withOpacity(0.8)
-                      //                       : Theme.of(context)
-                      //                           .colorScheme
-                      //                           .onSecondaryContainer
-                      //                           .withOpacity(0.8)),
-                      //         ),
-                      //         item.msgStatus == 1
-                      //             ? Text(
-                      //                 '  已撤回',
-                      //                 style:
-                      //                     Theme.of(context).textTheme.labelSmall!,
-                      //               )
-                      //             : const SizedBox()
-                      //       ],
-                      //     )
-                      //   ],
-                      // ),
-                    ),
-                    if (!isOwner)
-                      Text(
-                        Utils.dateFormat(item.timestamp),
-                        style: Theme.of(context).textTheme.labelSmall!.copyWith(
-                            color: Theme.of(context).colorScheme.outline),
+                      child: Column(
+                        crossAxisAlignment: isOwner
+                            ? CrossAxisAlignment.end
+                            : CrossAxisAlignment.start,
+                        children: [
+                          messageContent(context),
+                          SizedBox(height: isPic ? 7 : 4),
+                          Row(
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              Text(
+                                Utils.dateFormat(item.timestamp),
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .labelSmall!
+                                    .copyWith(
+                                        color: isOwner
+                                            ? Theme.of(context)
+                                                .colorScheme
+                                                .onPrimary
+                                                .withOpacity(0.8)
+                                            : Theme.of(context)
+                                                .colorScheme
+                                                .onSecondaryContainer
+                                                .withOpacity(0.8)),
+                              ),
+                              item.msgStatus == 1
+                                  ? Text(
+                                      '  已撤回',
+                                      style: Theme.of(context)
+                                          .textTheme
+                                          .labelSmall!,
+                                    )
+                                  : const SizedBox()
+                            ],
+                          )
+                        ],
                       ),
+                    ),
                     const SizedBox(width: safeDistanceval),
                   ],
                 ),
@@ -542,7 +559,7 @@ class SystemNotice extends StatelessWidget {
               Divider(
                 color: Theme.of(context).colorScheme.primary.withOpacity(0.05),
               ),
-              Text(
+              SelectableText(
                 content['text'],
               )
             ],
diff --git a/lib/plugin/pl_gallery/custom_dismissible.dart b/lib/plugin/pl_gallery/custom_dismissible.dart
new file mode 100644
index 00000000..05761cac
--- /dev/null
+++ b/lib/plugin/pl_gallery/custom_dismissible.dart
@@ -0,0 +1,156 @@
+import 'package:flutter/material.dart';
+
+/// A widget used to dismiss its [child].
+///
+/// Similar to [Dismissible] with some adjustments.
+class CustomDismissible extends StatefulWidget {
+  const CustomDismissible({
+    required this.child,
+    this.onDismissed,
+    this.dismissThreshold = 0.2,
+    this.enabled = true,
+    Key? key,
+  }) : super(key: key);
+
+  final Widget child;
+  final double dismissThreshold;
+  final VoidCallback? onDismissed;
+  final bool enabled;
+
+  @override
+  State<CustomDismissible> createState() => _CustomDismissibleState();
+}
+
+class _CustomDismissibleState extends State<CustomDismissible>
+    with SingleTickerProviderStateMixin {
+  late AnimationController _animateController;
+  late Animation<Offset> _moveAnimation;
+  late Animation<double> _scaleAnimation;
+  late Animation<Decoration> _opacityAnimation;
+
+  double _dragExtent = 0;
+  bool _dragUnderway = false;
+
+  bool get _isActive => _dragUnderway || _animateController.isAnimating;
+
+  @override
+  void initState() {
+    super.initState();
+
+    _animateController = AnimationController(
+      duration: const Duration(milliseconds: 300),
+      vsync: this,
+    );
+
+    _updateMoveAnimation();
+  }
+
+  @override
+  void dispose() {
+    _animateController.dispose();
+
+    super.dispose();
+  }
+
+  void _updateMoveAnimation() {
+    final double end = _dragExtent.sign;
+
+    _moveAnimation = _animateController.drive(
+      Tween<Offset>(
+        begin: Offset.zero,
+        end: Offset(0, end),
+      ),
+    );
+
+    _scaleAnimation = _animateController.drive(Tween<double>(
+      begin: 1,
+      end: 0.5,
+    ));
+
+    _opacityAnimation = DecorationTween(
+      begin: const BoxDecoration(color: Color(0xFF000000)),
+      end: const BoxDecoration(color: Color(0x00000000)),
+    ).animate(_animateController);
+  }
+
+  void _handleDragStart(DragStartDetails details) {
+    _dragUnderway = true;
+
+    if (_animateController.isAnimating) {
+      _dragExtent =
+          _animateController.value * context.size!.height * _dragExtent.sign;
+      _animateController.stop();
+    } else {
+      _dragExtent = 0.0;
+      _animateController.value = 0.0;
+    }
+    setState(_updateMoveAnimation);
+  }
+
+  void _handleDragUpdate(DragUpdateDetails details) {
+    if (!_isActive || _animateController.isAnimating) {
+      return;
+    }
+
+    final double delta = details.primaryDelta!;
+    final double oldDragExtent = _dragExtent;
+
+    if (_dragExtent + delta < 0) {
+      _dragExtent += delta;
+    } else if (_dragExtent + delta > 0) {
+      _dragExtent += delta;
+    }
+
+    if (oldDragExtent.sign != _dragExtent.sign) {
+      setState(_updateMoveAnimation);
+    }
+
+    if (!_animateController.isAnimating) {
+      _animateController.value = _dragExtent.abs() / context.size!.height;
+    }
+  }
+
+  void _handleDragEnd(DragEndDetails details) {
+    if (!_isActive || _animateController.isAnimating) {
+      return;
+    }
+
+    _dragUnderway = false;
+
+    if (_animateController.isCompleted) {
+      return;
+    }
+
+    if (!_animateController.isDismissed) {
+      // if the dragged value exceeded the dismissThreshold, call onDismissed
+      // else animate back to initial position.
+      if (_animateController.value > widget.dismissThreshold) {
+        widget.onDismissed?.call();
+      } else {
+        _animateController.reverse();
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final Widget content = DecoratedBoxTransition(
+      decoration: _opacityAnimation,
+      child: SlideTransition(
+        position: _moveAnimation,
+        child: ScaleTransition(
+          scale: _scaleAnimation,
+          child: widget.child,
+        ),
+      ),
+    );
+
+    return GestureDetector(
+      behavior: HitTestBehavior.translucent,
+      onVerticalDragStart: widget.enabled ? _handleDragStart : null,
+      onVerticalDragUpdate: widget.enabled ? _handleDragUpdate : null,
+      onVerticalDragEnd: widget.enabled ? _handleDragEnd : null,
+      child: content,
+    );
+  }
+}
diff --git a/lib/plugin/pl_gallery/hero_dialog_route.dart b/lib/plugin/pl_gallery/hero_dialog_route.dart
new file mode 100644
index 00000000..d9f129d2
--- /dev/null
+++ b/lib/plugin/pl_gallery/hero_dialog_route.dart
@@ -0,0 +1,63 @@
+import 'package:flutter/material.dart';
+
+/// A [PageRoute] with a semi transparent background.
+///
+/// Similar to calling [showDialog] except it can be used with a [Navigator] to
+/// show a [Hero] animation.
+class HeroDialogRoute<T> extends PageRoute<T> {
+  HeroDialogRoute({
+    required this.builder,
+    this.onBackgroundTap,
+  }) : super();
+
+  final WidgetBuilder builder;
+
+  /// Called when the background is tapped.
+  final VoidCallback? onBackgroundTap;
+
+  @override
+  bool get opaque => false;
+
+  @override
+  bool get barrierDismissible => true;
+
+  @override
+  String? get barrierLabel => null;
+
+  @override
+  Duration get transitionDuration => const Duration(milliseconds: 300);
+
+  @override
+  bool get maintainState => true;
+
+  @override
+  Color? get barrierColor => null;
+
+  @override
+  Widget buildTransitions(
+    BuildContext context,
+    Animation<double> animation,
+    Animation<double> secondaryAnimation,
+    Widget child,
+  ) {
+    return FadeTransition(
+      opacity: CurvedAnimation(parent: animation, curve: Curves.easeOut),
+      child: child,
+    );
+  }
+
+  @override
+  Widget buildPage(
+    BuildContext context,
+    Animation<double> animation,
+    Animation<double> secondaryAnimation,
+  ) {
+    final Widget child = builder(context);
+    final Widget result = Semantics(
+      scopesRoute: true,
+      explicitChildNodes: true,
+      child: child,
+    );
+    return result;
+  }
+}
diff --git a/lib/plugin/pl_gallery/index.dart b/lib/plugin/pl_gallery/index.dart
new file mode 100644
index 00000000..5a6f04e1
--- /dev/null
+++ b/lib/plugin/pl_gallery/index.dart
@@ -0,0 +1,6 @@
+library pl_gallery;
+
+export './hero_dialog_route.dart';
+export './custom_dismissible.dart';
+export './interactiveviewer_gallery.dart';
+export './interactive_viewer_boundary.dart';
diff --git a/lib/plugin/pl_gallery/interactive_viewer_boundary.dart b/lib/plugin/pl_gallery/interactive_viewer_boundary.dart
new file mode 100644
index 00000000..929b7a6d
--- /dev/null
+++ b/lib/plugin/pl_gallery/interactive_viewer_boundary.dart
@@ -0,0 +1,117 @@
+import 'package:flutter/material.dart';
+
+/// A callback for the [InteractiveViewerBoundary] that is called when the scale
+/// changed.
+typedef ScaleChanged = void Function(double scale);
+
+/// Builds an [InteractiveViewer] and provides callbacks that are called when a
+/// horizontal boundary has been hit.
+///
+/// The callbacks are called when an interaction ends by listening to the
+/// [InteractiveViewer.onInteractionEnd] callback.
+class InteractiveViewerBoundary extends StatefulWidget {
+  const InteractiveViewerBoundary({
+    required this.child,
+    required this.boundaryWidth,
+    this.controller,
+    this.onScaleChanged,
+    this.onLeftBoundaryHit,
+    this.onRightBoundaryHit,
+    this.onNoBoundaryHit,
+    this.maxScale,
+    this.minScale,
+    Key? key,
+  }) : super(key: key);
+
+  final Widget child;
+
+  /// The max width this widget can have.
+  ///
+  /// If the [InteractiveViewer] can take up the entire screen width, this
+  /// should be set to `MediaQuery.of(context).size.width`.
+  final double boundaryWidth;
+
+  /// The [TransformationController] for the [InteractiveViewer].
+  final TransformationController? controller;
+
+  /// Called when the scale changed after an interaction ended.
+  final ScaleChanged? onScaleChanged;
+
+  /// Called when the left boundary has been hit after an interaction ended.
+  final VoidCallback? onLeftBoundaryHit;
+
+  /// Called when the right boundary has been hit after an interaction ended.
+  final VoidCallback? onRightBoundaryHit;
+
+  /// Called when no boundary has been hit after an interaction ended.
+  final VoidCallback? onNoBoundaryHit;
+
+  final double? maxScale;
+
+  final double? minScale;
+
+  @override
+  InteractiveViewerBoundaryState createState() =>
+      InteractiveViewerBoundaryState();
+}
+
+class InteractiveViewerBoundaryState extends State<InteractiveViewerBoundary> {
+  TransformationController? _controller;
+
+  double? _scale;
+
+  @override
+  void initState() {
+    super.initState();
+
+    _controller = widget.controller ?? TransformationController();
+  }
+
+  @override
+  void dispose() {
+    _controller!.dispose();
+
+    super.dispose();
+  }
+
+  void _updateBoundaryDetection() {
+    final double scale = _controller!.value.row0[0];
+
+    if (_scale != scale) {
+      // the scale changed
+      _scale = scale;
+      widget.onScaleChanged?.call(scale);
+    }
+
+    if (scale <= 1.01) {
+      // cant hit any boundaries when the child is not scaled
+      return;
+    }
+
+    final double xOffset = _controller!.value.row0[3];
+    final double boundaryWidth = widget.boundaryWidth;
+    final double boundaryEnd = boundaryWidth * scale;
+    final double xPos = boundaryEnd + xOffset;
+
+    if (boundaryEnd.round() == xPos.round()) {
+      // left boundary hit
+      widget.onLeftBoundaryHit?.call();
+    } else if (boundaryWidth.round() == xPos.round()) {
+      // right boundary hit
+      widget.onRightBoundaryHit?.call();
+    } else {
+      widget.onNoBoundaryHit?.call();
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return InteractiveViewer(
+      maxScale: widget.maxScale!,
+      minScale: widget.minScale!,
+      transformationController: _controller,
+      onInteractionEnd: (_) => _updateBoundaryDetection(),
+      child: widget.child,
+    );
+  }
+}
diff --git a/lib/plugin/pl_gallery/interactiveviewer_gallery.dart b/lib/plugin/pl_gallery/interactiveviewer_gallery.dart
new file mode 100644
index 00000000..cd13194e
--- /dev/null
+++ b/lib/plugin/pl_gallery/interactiveviewer_gallery.dart
@@ -0,0 +1,486 @@
+library interactiveviewer_gallery;
+
+import 'dart:io';
+
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:dio/dio.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:get/get.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:pilipala/utils/download.dart';
+import 'package:share_plus/share_plus.dart';
+import 'package:status_bar_control/status_bar_control.dart';
+import 'custom_dismissible.dart';
+import 'interactive_viewer_boundary.dart';
+
+/// Builds a carousel controlled by a [PageView] for the tweet media sources.
+///
+/// Used for showing a full screen view of the [TweetMedia] sources.
+///
+/// The sources can be panned and zoomed interactively using an
+/// [InteractiveViewer].
+/// An [InteractiveViewerBoundary] is used to detect when the boundary of the
+/// source is hit after zooming in to disable or enable the swiping gesture of
+/// the [PageView].
+///
+typedef IndexedFocusedWidgetBuilder = Widget Function(
+    BuildContext context, int index, bool isFocus, bool enablePageView);
+
+typedef IndexedTagStringBuilder = String Function(int index);
+
+class InteractiveviewerGallery<T> extends StatefulWidget {
+  const InteractiveviewerGallery({
+    required this.sources,
+    required this.initIndex,
+    this.itemBuilder,
+    this.maxScale = 4.5,
+    this.minScale = 1.0,
+    this.onPageChanged,
+    this.onDismissed,
+    Key? key,
+  }) : super(key: key);
+
+  /// The sources to show.
+  final List<T> sources;
+
+  /// The index of the first source in [sources] to show.
+  final int initIndex;
+
+  /// The item content
+  final IndexedFocusedWidgetBuilder? itemBuilder;
+
+  final double maxScale;
+
+  final double minScale;
+
+  final ValueChanged<int>? onPageChanged;
+
+  final ValueChanged<int>? onDismissed;
+
+  @override
+  State<InteractiveviewerGallery> createState() =>
+      _InteractiveviewerGalleryState();
+}
+
+class _InteractiveviewerGalleryState extends State<InteractiveviewerGallery>
+    with SingleTickerProviderStateMixin {
+  PageController? _pageController;
+  TransformationController? _transformationController;
+
+  /// The controller to animate the transformation value of the
+  /// [InteractiveViewer] when it should reset.
+  late AnimationController _animationController;
+  Animation<Matrix4>? _animation;
+
+  /// `true` when an source is zoomed in and not at the at a horizontal boundary
+  /// to disable the [PageView].
+  bool _enablePageView = true;
+
+  /// `true` when an source is zoomed in to disable the [CustomDismissible].
+  bool _enableDismiss = true;
+
+  late Offset _doubleTapLocalPosition;
+
+  int? currentIndex;
+
+  @override
+  void initState() {
+    super.initState();
+
+    _pageController = PageController(initialPage: widget.initIndex);
+
+    _transformationController = TransformationController();
+
+    _animationController = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 300),
+    )
+      ..addListener(() {
+        _transformationController!.value =
+            _animation?.value ?? Matrix4.identity();
+      })
+      ..addStatusListener((AnimationStatus status) {
+        if (status == AnimationStatus.completed && !_enableDismiss) {
+          setState(() {
+            _enableDismiss = true;
+          });
+        }
+      });
+
+    currentIndex = widget.initIndex;
+    setStatusBar();
+  }
+
+  setStatusBar() async {
+    if (Platform.isIOS || Platform.isAndroid) {
+      await StatusBarControl.setHidden(true,
+          animation: StatusBarAnimation.FADE);
+    }
+  }
+
+  @override
+  void dispose() {
+    _pageController!.dispose();
+    _animationController.dispose();
+    try {
+      StatusBarControl.setHidden(false, animation: StatusBarAnimation.FADE);
+    } catch (_) {}
+    super.dispose();
+  }
+
+  /// When the source gets scaled up, the swipe up / down to dismiss gets
+  /// disabled.
+  ///
+  /// When the scale resets, the dismiss and the page view swiping gets enabled.
+  void _onScaleChanged(double scale) {
+    final bool initialScale = scale <= widget.minScale;
+
+    if (initialScale) {
+      if (!_enableDismiss) {
+        setState(() {
+          _enableDismiss = true;
+        });
+      }
+
+      if (!_enablePageView) {
+        setState(() {
+          _enablePageView = true;
+        });
+      }
+    } else {
+      if (_enableDismiss) {
+        setState(() {
+          _enableDismiss = false;
+        });
+      }
+
+      if (_enablePageView) {
+        setState(() {
+          _enablePageView = false;
+        });
+      }
+    }
+  }
+
+  /// When the left boundary has been hit after scaling up the source, the page
+  /// view swiping gets enabled if it has a page to swipe to.
+  void _onLeftBoundaryHit() {
+    if (!_enablePageView && _pageController!.page!.floor() > 0) {
+      setState(() {
+        _enablePageView = true;
+      });
+    }
+  }
+
+  /// When the right boundary has been hit after scaling up the source, the page
+  /// view swiping gets enabled if it has a page to swipe to.
+  void _onRightBoundaryHit() {
+    if (!_enablePageView &&
+        _pageController!.page!.floor() < widget.sources.length - 1) {
+      setState(() {
+        _enablePageView = true;
+      });
+    }
+  }
+
+  /// When the source has been scaled up and no horizontal boundary has been hit,
+  /// the page view swiping gets disabled.
+  void _onNoBoundaryHit() {
+    if (_enablePageView) {
+      setState(() {
+        _enablePageView = false;
+      });
+    }
+  }
+
+  /// When the page view changed its page, the source will animate back into the
+  /// original scale if it was scaled up.
+  ///
+  /// Additionally the swipe up / down to dismiss gets enabled.
+  void _onPageChanged(int page) {
+    setState(() {
+      currentIndex = page;
+    });
+    widget.onPageChanged?.call(page);
+    if (_transformationController!.value != Matrix4.identity()) {
+      // animate the reset for the transformation of the interactive viewer
+
+      _animation = Matrix4Tween(
+        begin: _transformationController!.value,
+        end: Matrix4.identity(),
+      ).animate(
+        CurveTween(curve: Curves.easeOut).animate(_animationController),
+      );
+
+      _animationController.forward(from: 0);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return InteractiveViewerBoundary(
+      controller: _transformationController,
+      boundaryWidth: MediaQuery.of(context).size.width,
+      onScaleChanged: _onScaleChanged,
+      onLeftBoundaryHit: _onLeftBoundaryHit,
+      onRightBoundaryHit: _onRightBoundaryHit,
+      onNoBoundaryHit: _onNoBoundaryHit,
+      maxScale: widget.maxScale,
+      minScale: widget.minScale,
+      child: Stack(children: [
+        CustomDismissible(
+          onDismissed: () {
+            Navigator.of(context).pop();
+            widget.onDismissed?.call(_pageController!.page!.floor());
+          },
+          enabled: _enableDismiss,
+          child: PageView.builder(
+            onPageChanged: _onPageChanged,
+            controller: _pageController,
+            physics:
+                _enablePageView ? null : const NeverScrollableScrollPhysics(),
+            itemCount: widget.sources.length,
+            itemBuilder: (BuildContext context, int index) {
+              return GestureDetector(
+                onDoubleTapDown: (TapDownDetails details) {
+                  _doubleTapLocalPosition = details.localPosition;
+                },
+                onDoubleTap: onDoubleTap,
+                onLongPress: onLongPress,
+                child: widget.itemBuilder != null
+                    ? widget.itemBuilder!(
+                        context,
+                        index,
+                        index == currentIndex,
+                        _enablePageView,
+                      )
+                    : _itemBuilder(widget.sources, index),
+              );
+            },
+          ),
+        ),
+        Positioned(
+          bottom: 0,
+          left: 0,
+          right: 0,
+          child: Container(
+            padding: EdgeInsets.fromLTRB(
+                12, 8, 20, MediaQuery.of(context).padding.bottom + 8),
+            decoration: _enablePageView
+                ? BoxDecoration(
+                    gradient: LinearGradient(
+                      begin: Alignment.topCenter,
+                      end: Alignment.bottomCenter,
+                      colors: [
+                        Colors.transparent,
+                        Colors.black.withOpacity(0.3)
+                      ],
+                    ),
+                  )
+                : null,
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                IconButton(
+                  icon: const Icon(Icons.close, color: Colors.white),
+                  onPressed: () {
+                    Navigator.of(context).pop();
+                    widget.onDismissed?.call(_pageController!.page!.floor());
+                  },
+                ),
+                widget.sources.length > 1
+                    ? Text(
+                        "${currentIndex! + 1}/${widget.sources.length}",
+                        style: const TextStyle(color: Colors.white),
+                      )
+                    : const SizedBox(),
+                PopupMenuButton(
+                  itemBuilder: (context) {
+                    return [
+                      PopupMenuItem(
+                        value: 0,
+                        onTap: () => onShareImg(widget.sources[currentIndex!]),
+                        child: const Text("分享图片"),
+                      ),
+                      PopupMenuItem(
+                        value: 1,
+                        onTap: () {
+                          onCopyImg(widget.sources[currentIndex!].toString());
+                        },
+                        child: const Text("复制图片"),
+                      ),
+                      PopupMenuItem(
+                        value: 2,
+                        onTap: () {
+                          DownloadUtils.downloadImg(
+                              widget.sources[currentIndex!]);
+                        },
+                        child: const Text("保存图片"),
+                      ),
+                    ];
+                  },
+                  child: const Icon(Icons.more_horiz, color: Colors.white),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ]),
+    );
+  }
+
+  // 图片分享
+  void onShareImg(String imgUrl) async {
+    SmartDialog.showLoading();
+    var response = await Dio()
+        .get(imgUrl, options: Options(responseType: ResponseType.bytes));
+    final temp = await getTemporaryDirectory();
+    SmartDialog.dismiss();
+    String imgName =
+        "plpl_pic_${DateTime.now().toString().split('-').join()}.jpg";
+    var path = '${temp.path}/$imgName';
+    File(path).writeAsBytesSync(response.data);
+    Share.shareXFiles([XFile(path)], subject: imgUrl);
+  }
+
+  // 复制图片
+  void onCopyImg(String imgUrl) {
+    Clipboard.setData(
+            ClipboardData(text: widget.sources[currentIndex!].toString()))
+        .then((value) {
+      SmartDialog.showToast('已复制到粘贴板');
+    }).catchError((err) {
+      SmartDialog.showNotify(
+        msg: err.toString(),
+        notifyType: NotifyType.error,
+      );
+    });
+  }
+
+  Widget _itemBuilder(sources, index) {
+    return GestureDetector(
+      behavior: HitTestBehavior.opaque,
+      onTap: () {
+        if (_enablePageView) {
+          Navigator.of(context).pop();
+        }
+      },
+      child: Center(
+        child: Hero(
+          tag: sources[index],
+          child: CachedNetworkImage(
+            fadeInDuration: const Duration(milliseconds: 0),
+            imageUrl: sources[index],
+            fit: BoxFit.contain,
+          ),
+        ),
+      ),
+    );
+  }
+
+  onDoubleTap() {
+    Matrix4 matrix = _transformationController!.value.clone();
+    double currentScale = matrix.row0.x;
+
+    double targetScale = widget.minScale;
+
+    if (currentScale <= widget.minScale) {
+      targetScale = widget.maxScale * 0.7;
+    }
+
+    double offSetX = targetScale == 1.0
+        ? 0.0
+        : -_doubleTapLocalPosition.dx * (targetScale - 1);
+    double offSetY = targetScale == 1.0
+        ? 0.0
+        : -_doubleTapLocalPosition.dy * (targetScale - 1);
+
+    matrix = Matrix4.fromList([
+      targetScale,
+      matrix.row1.x,
+      matrix.row2.x,
+      matrix.row3.x,
+      matrix.row0.y,
+      targetScale,
+      matrix.row2.y,
+      matrix.row3.y,
+      matrix.row0.z,
+      matrix.row1.z,
+      targetScale,
+      matrix.row3.z,
+      offSetX,
+      offSetY,
+      matrix.row2.w,
+      matrix.row3.w
+    ]);
+
+    _animation = Matrix4Tween(
+      begin: _transformationController!.value,
+      end: matrix,
+    ).animate(
+      CurveTween(curve: Curves.easeOut).animate(_animationController),
+    );
+    _animationController
+        .forward(from: 0)
+        .whenComplete(() => _onScaleChanged(targetScale));
+  }
+
+  onLongPress() {
+    showModalBottomSheet(
+      context: context,
+      useRootNavigator: true,
+      isScrollControlled: true,
+      builder: (context) {
+        return Container(
+          padding:
+              EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              InkWell(
+                onTap: () => Get.back(),
+                child: Container(
+                  height: 35,
+                  padding: const EdgeInsets.only(bottom: 2),
+                  child: Center(
+                    child: Container(
+                      width: 32,
+                      height: 3,
+                      decoration: BoxDecoration(
+                          color: Theme.of(context).colorScheme.outline,
+                          borderRadius:
+                              const BorderRadius.all(Radius.circular(3))),
+                    ),
+                  ),
+                ),
+              ),
+              ListTile(
+                onTap: () {
+                  onShareImg(widget.sources[currentIndex!]);
+                  Navigator.of(context).pop();
+                },
+                title: const Text('分享图片'),
+              ),
+              ListTile(
+                onTap: () {
+                  onCopyImg(widget.sources[currentIndex!].toString());
+                  Navigator.of(context).pop();
+                },
+                title: const Text('复制图片'),
+              ),
+              ListTile(
+                onTap: () {
+                  DownloadUtils.downloadImg(widget.sources[currentIndex!]);
+                  Navigator.of(context).pop();
+                },
+                title: const Text('保存图片'),
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}
diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart
index 2865a117..0bd7950c 100644
--- a/lib/plugin/pl_player/controller.dart
+++ b/lib/plugin/pl_player/controller.dart
@@ -13,10 +13,12 @@ import 'package:media_kit/media_kit.dart';
 import 'package:media_kit_video/media_kit_video.dart';
 import 'package:ns_danmaku/ns_danmaku.dart';
 import 'package:pilipala/http/video.dart';
+import 'package:pilipala/models/video/play/ao_output.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
 import 'package:pilipala/plugin/pl_player/models/play_repeat.dart';
 import 'package:pilipala/services/service_locator.dart';
 import 'package:pilipala/utils/feed_back.dart';
+import 'package:pilipala/utils/global_data_cache.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:screen_brightness/screen_brightness.dart';
 import 'package:status_bar_control/status_bar_control.dart';
@@ -122,7 +124,7 @@ class PlPlayerController {
   PreferredSizeWidget? headerControl;
   PreferredSizeWidget? bottomControl;
   Widget? danmuWidget;
-  late RxList subtitles;
+  RxList subtitles = [].obs;
   String videoType = 'archive';
 
   /// 数据加载监听
@@ -276,50 +278,19 @@ class PlPlayerController {
 
   // 添加一个私有构造函数
   PlPlayerController._internal(this.videoType) {
-    isOpenDanmu.value =
-        setting.get(SettingBoxKey.enableShowDanmaku, defaultValue: false);
-    blockTypes =
-        localCache.get(LocalCacheKey.danmakuBlockType, defaultValue: []);
-    showArea = localCache.get(LocalCacheKey.danmakuShowArea, defaultValue: 0.5);
-    // 不透明度
-    opacityVal =
-        localCache.get(LocalCacheKey.danmakuOpacity, defaultValue: 1.0);
-    // 字体大小
-    fontSizeVal =
-        localCache.get(LocalCacheKey.danmakuFontScale, defaultValue: 1.0);
-    // 弹幕时间
-    danmakuDurationVal =
-        localCache.get(LocalCacheKey.danmakuDuration, defaultValue: 4.0);
-    // 描边粗细
-    strokeWidth = localCache.get(LocalCacheKey.strokeWidth, defaultValue: 1.5);
-    playRepeat = PlayRepeat.values.toList().firstWhere(
-          (e) =>
-              e.value ==
-              videoStorage.get(VideoBoxKey.playRepeat,
-                  defaultValue: PlayRepeat.pause.value),
-        );
-    _playbackSpeed.value =
-        videoStorage.get(VideoBoxKey.playSpeedDefault, defaultValue: 1.0);
-    enableAutoLongPressSpeed = setting
-        .get(SettingBoxKey.enableAutoLongPressSpeed, defaultValue: false);
-    if (!enableAutoLongPressSpeed) {
-      _longPressSpeed.value = videoStorage
-          .get(VideoBoxKey.longPressSpeedDefault, defaultValue: 2.0);
-    }
-    // 自定义倍速集合
-    speedsList = List<double>.from(videoStorage
-        .get(VideoBoxKey.customSpeedsList, defaultValue: <double>[]));
-    // 默认倍速
-    speedsList = List<double>.from(videoStorage
-        .get(VideoBoxKey.customSpeedsList, defaultValue: <double>[]));
-    //playSpeedSystem
-    final List<double> playSpeedSystem =
-        videoStorage.get(VideoBoxKey.playSpeedSystem, defaultValue: playSpeed);
-
-    // for (final PlaySpeed i in PlaySpeed.values) {
-    speedsList.addAll(playSpeedSystem);
-    // }
-
+    final cache = GlobalDataCache();
+    isOpenDanmu.value = cache.isOpenDanmu;
+    blockTypes = cache.blockTypes;
+    showArea = cache.showArea;
+    opacityVal = cache.opacityVal;
+    fontSizeVal = cache.fontSizeVal;
+    danmakuDurationVal = cache.danmakuDurationVal;
+    strokeWidth = cache.strokeWidth;
+    playRepeat = cache.playRepeat;
+    _playbackSpeed.value = cache.playbackSpeed;
+    enableAutoLongPressSpeed = cache.enableAutoLongPressSpeed;
+    _longPressSpeed.value = cache.longPressSpeed;
+    speedsList = cache.speedsList;
     // _playerEventSubs = onPlayerStatusChanged.listen((PlayerStatus status) {
     //   if (status == PlayerStatus.playing) {
     //     WakelockPlus.enable();
@@ -453,7 +424,13 @@ class PlPlayerController {
     //  音量不一致
     if (Platform.isAndroid) {
       await pp.setProperty("volume-max", "100");
-      await pp.setProperty("ao", "audiotrack,opensles");
+      String defaultAoOutput =
+          setting.get(SettingBoxKey.defaultAoOutput, defaultValue: '0');
+      await pp.setProperty(
+          "ao",
+          aoOutputList
+              .where((e) => e['value'] == defaultAoOutput)
+              .first['title']);
     }
 
     await player.setAudioTrack(
@@ -635,10 +612,6 @@ class PlPlayerController {
               const Duration(seconds: 1),
               () => videoPlayerServiceHandler.onPositionChange(event));
         }),
-
-        // onSubTitleOpenChanged.listen((bool event) {
-        //   toggleSubtitle(event ? subTitleCode.value : -1);
-        // })
       ],
     );
   }
@@ -1042,25 +1015,6 @@ class PlPlayerController {
   void toggleSubtitle(int code) {
     _subTitleOpen.value = code != -1;
     _subTitleCode.value = code;
-    // if (code == -1) {
-    //   // 关闭字幕
-    //   _subTitleOpen.value = false;
-    //   _subTitleCode.value = code;
-    //   _videoPlayerController?.setSubtitleTrack(SubtitleTrack.no());
-    //   return;
-    // }
-    // final SubTitlteItemModel? subtitle = subtitles?.firstWhereOrNull(
-    //   (element) => element.code == code,
-    // );
-    // _subTitleOpen.value = true;
-    // _subTitleCode.value = code;
-    // _videoPlayerController?.setSubtitleTrack(
-    //   SubtitleTrack.data(
-    //     subtitle!.content!,
-    //     title: subtitle.title,
-    //     language: subtitle.lan,
-    //   ),
-    // );
   }
 
   void querySubtitleContent(double progress) {
@@ -1072,7 +1026,7 @@ class PlPlayerController {
       return;
     }
     final SubTitlteItemModel? subtitle = subtitles.firstWhereOrNull(
-      (element) => element.code == subTitleCode.value,
+      (element) => element.id == subTitleCode.value,
     );
     if (subtitle != null && subtitle.body!.isNotEmpty) {
       for (var content in subtitle.body!) {
@@ -1091,6 +1045,14 @@ class PlPlayerController {
 
   /// 缓存本次弹幕选项
   cacheDanmakuOption() {
+    final cache = GlobalDataCache();
+    cache.blockTypes = blockTypes;
+    cache.showArea = showArea;
+    cache.opacityVal = opacityVal;
+    cache.fontSizeVal = fontSizeVal;
+    cache.danmakuDurationVal = danmakuDurationVal;
+    cache.strokeWidth = strokeWidth;
+
     localCache.put(LocalCacheKey.danmakuBlockType, blockTypes);
     localCache.put(LocalCacheKey.danmakuShowArea, showArea);
     localCache.put(LocalCacheKey.danmakuOpacity, opacityVal);
diff --git a/lib/plugin/pl_player/view.dart b/lib/plugin/pl_player/view.dart
index f3e0946b..b69a3d16 100644
--- a/lib/plugin/pl_player/view.dart
+++ b/lib/plugin/pl_player/view.dart
@@ -19,13 +19,14 @@ import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:screen_brightness/screen_brightness.dart';
 
-import '../../utils/global_data.dart';
+import '../../utils/global_data_cache.dart';
 import 'models/bottom_control_type.dart';
 import 'models/bottom_progress_behavior.dart';
 import 'widgets/app_bar_ani.dart';
 import 'widgets/backward_seek.dart';
 import 'widgets/bottom_control.dart';
 import 'widgets/common_btn.dart';
+import 'widgets/control_bar.dart';
 import 'widgets/forward_seek.dart';
 import 'widgets/play_pause_btn.dart';
 
@@ -40,6 +41,7 @@ class PLVideoPlayer extends StatefulWidget {
     this.customWidgets,
     this.showEposideCb,
     this.fullScreenCb,
+    this.alignment = Alignment.center,
     super.key,
   });
 
@@ -54,6 +56,7 @@ class PLVideoPlayer extends StatefulWidget {
   final List<Widget>? customWidgets;
   final Function? showEposideCb;
   final Function? fullScreenCb;
+  final Alignment? alignment;
 
   @override
   State<PLVideoPlayer> createState() => _PLVideoPlayerState();
@@ -87,7 +90,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
   late bool enableBackgroundPlay;
   late double screenWidth;
   final FullScreenGestureMode fullScreenGestureMode =
-      GlobalData().fullScreenGestureMode;
+      GlobalDataCache().fullScreenGestureMode;
 
   // 用于记录上一次全屏切换手势触发时间，避免误触
   DateTime? lastFullScreenToggleTime;
@@ -132,7 +135,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
     screenWidth = Get.size.width;
     animationController = AnimationController(
       vsync: this,
-      duration: GlobalData().enablePlayerControlAnimation
+      duration: GlobalDataCache().enablePlayerControlAnimation
           ? const Duration(milliseconds: 150)
           : const Duration(milliseconds: 10),
     );
@@ -201,6 +204,14 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
     widget.controller.brightness.value = value;
   }
 
+  bool isUsingFullScreenGestures(double tapPosition, double sectionWidth) {
+    if (fullScreenGestureMode == FullScreenGestureMode.none) {
+      return false;
+    } else {
+      return tapPosition < sectionWidth * 2;
+    }
+  }
+
   @override
   void dispose() {
     animationController.dispose();
@@ -392,6 +403,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
             key: ValueKey(_.videoFit.value),
             controller: videoController,
             controls: NoVideoControls,
+            alignment: widget.alignment!,
             pauseUponEnteringBackgroundMode: !enableBackgroundPlay,
             resumeUponEnteringForegroundMode: true,
             subtitleViewConfiguration: const SubtitleViewConfiguration(
@@ -484,104 +496,27 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
 
         /// 音量🔊 控制条展示
         Obx(
-          () => Align(
-            child: AnimatedOpacity(
-              curve: Curves.easeInOut,
-              opacity: _volumeIndicator.value ? 1.0 : 0.0,
-              duration: const Duration(milliseconds: 150),
-              child: Container(
-                alignment: Alignment.center,
-                decoration: BoxDecoration(
-                  color: const Color(0x88000000),
-                  borderRadius: BorderRadius.circular(64.0),
-                ),
-                height: 34.0,
-                width: 70.0,
-                child: Row(
-                  mainAxisSize: MainAxisSize.min,
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: <Widget>[
-                    Container(
-                      height: 34.0,
-                      width: 28.0,
-                      alignment: Alignment.centerRight,
-                      child: Icon(
-                        _volumeValue.value == 0.0
-                            ? Icons.volume_off
-                            : _volumeValue.value < 0.5
-                                ? Icons.volume_down
-                                : Icons.volume_up,
-                        color: const Color(0xFFFFFFFF),
-                        size: 20.0,
-                      ),
-                    ),
-                    Expanded(
-                      child: Text(
-                        '${(_volumeValue.value * 100.0).round()}%',
-                        textAlign: TextAlign.center,
-                        style: const TextStyle(
-                          fontSize: 13.0,
-                          color: Color(0xFFFFFFFF),
-                        ),
-                      ),
-                    ),
-                    const SizedBox(width: 6.0),
-                  ],
-                ),
-              ),
-            ),
+          () => ControlBar(
+            visible: _volumeIndicator.value,
+            icon: _volumeValue.value < 1.0 / 3.0
+                ? Icons.volume_mute
+                : _volumeValue.value < 2.0 / 3.0
+                    ? Icons.volume_down
+                    : Icons.volume_up,
+            value: _volumeValue.value,
           ),
         ),
 
         /// 亮度🌞 控制条展示
         Obx(
-          () => Align(
-            child: AnimatedOpacity(
-              curve: Curves.easeInOut,
-              opacity: _brightnessIndicator.value ? 1.0 : 0.0,
-              duration: const Duration(milliseconds: 150),
-              child: Container(
-                alignment: Alignment.center,
-                decoration: BoxDecoration(
-                  color: const Color(0x88000000),
-                  borderRadius: BorderRadius.circular(64.0),
-                ),
-                height: 34.0,
-                width: 70.0,
-                child: Row(
-                  mainAxisSize: MainAxisSize.min,
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: <Widget>[
-                    Container(
-                      height: 30.0,
-                      width: 28.0,
-                      alignment: Alignment.centerRight,
-                      child: Icon(
-                        _brightnessValue.value < 1.0 / 3.0
-                            ? Icons.brightness_low
-                            : _brightnessValue.value < 2.0 / 3.0
-                                ? Icons.brightness_medium
-                                : Icons.brightness_high,
-                        color: const Color(0xFFFFFFFF),
-                        size: 18.0,
-                      ),
-                    ),
-                    const SizedBox(width: 2.0),
-                    Expanded(
-                      child: Text(
-                        '${(_brightnessValue.value * 100.0).round()}%',
-                        textAlign: TextAlign.center,
-                        style: const TextStyle(
-                          fontSize: 13.0,
-                          color: Color(0xFFFFFFFF),
-                        ),
-                      ),
-                    ),
-                    const SizedBox(width: 6.0),
-                  ],
-                ),
-              ),
-            ),
+          () => ControlBar(
+            visible: _brightnessIndicator.value,
+            icon: _brightnessValue.value < 1.0 / 3.0
+                ? Icons.brightness_low
+                : _brightnessValue.value < 2.0 / 3.0
+                    ? Icons.brightness_medium
+                    : Icons.brightness_high,
+            value: _brightnessValue.value,
           ),
         ),
 
@@ -733,12 +668,12 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                     _brightnessValue.value - delta / level;
                 final double result = brightness.clamp(0.0, 1.0);
                 setBrightness(result);
-              } else if (tapPosition < sectionWidth * 2) {
+              } else if (isUsingFullScreenGestures(tapPosition, sectionWidth)) {
                 // 全屏
                 final double dy = details.delta.dy;
                 const double threshold = 7.0; // 滑动阈值
-                final bool flag =
-                    fullScreenGestureMode != FullScreenGestureMode.values.last;
+                final bool flag = fullScreenGestureMode !=
+                    FullScreenGestureMode.fromBottomtoTop;
                 if (dy > _distance.value &&
                     dy > threshold &&
                     !_.controlsLock.value) {
diff --git a/lib/plugin/pl_player/widgets/control_bar.dart b/lib/plugin/pl_player/widgets/control_bar.dart
new file mode 100644
index 00000000..44e2abfa
--- /dev/null
+++ b/lib/plugin/pl_player/widgets/control_bar.dart
@@ -0,0 +1,50 @@
+import 'package:flutter/material.dart';
+
+class ControlBar extends StatelessWidget {
+  final bool visible;
+  final IconData icon;
+  final double value;
+
+  const ControlBar({
+    Key? key,
+    required this.visible,
+    required this.icon,
+    required this.value,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    Color color = const Color(0xFFFFFFFF);
+    return Align(
+      child: AnimatedOpacity(
+        curve: Curves.easeInOut,
+        opacity: visible ? 1.0 : 0.0,
+        duration: const Duration(milliseconds: 150),
+        child: IntrinsicWidth(
+          child: Container(
+            padding: const EdgeInsets.fromLTRB(10, 2, 10, 2),
+            decoration: BoxDecoration(
+              color: const Color(0x88000000),
+              borderRadius: BorderRadius.circular(64.0),
+            ),
+            height: 34.0,
+            child: Row(
+              children: <Widget>[
+                Icon(icon, color: color, size: 18.0),
+                const SizedBox(width: 4.0),
+                Container(
+                  constraints: const BoxConstraints(minWidth: 30.0),
+                  child: Text(
+                    '${(value * 100.0).round()}%',
+                    textAlign: TextAlign.center,
+                    style: TextStyle(fontSize: 13.0, color: color),
+                  ),
+                )
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/plugin/pl_popup/index.dart b/lib/plugin/pl_popup/index.dart
new file mode 100644
index 00000000..678eb049
--- /dev/null
+++ b/lib/plugin/pl_popup/index.dart
@@ -0,0 +1,43 @@
+import 'package:flutter/material.dart';
+
+class PlPopupRoute extends PopupRoute<void> {
+  PlPopupRoute({
+    this.backgroudColor,
+    this.alignment = Alignment.center,
+    required this.child,
+    this.onClick,
+  });
+
+  /// backgroudColor
+  final Color? backgroudColor;
+
+  /// child'alignment, default value: [Alignment.center]
+  final Alignment alignment;
+
+  /// child
+  final Widget child;
+
+  /// backgroudView action
+  final Function? onClick;
+
+  @override
+  Duration get transitionDuration => const Duration(milliseconds: 300);
+
+  @override
+  bool get barrierDismissible => false;
+
+  @override
+  Color get barrierColor => Colors.black54;
+
+  @override
+  String? get barrierLabel => null;
+
+  @override
+  Widget buildPage(
+    BuildContext context,
+    Animation<double> animation,
+    Animation<double> secondaryAnimation,
+  ) {
+    return child;
+  }
+}
diff --git a/lib/plugin/pl_socket/index.dart b/lib/plugin/pl_socket/index.dart
new file mode 100644
index 00000000..1ad6af94
--- /dev/null
+++ b/lib/plugin/pl_socket/index.dart
@@ -0,0 +1,107 @@
+import 'dart:async';
+
+import 'package:pilipala/utils/live.dart';
+import 'package:web_socket_channel/io.dart';
+import 'package:web_socket_channel/web_socket_channel.dart';
+
+enum SocketStatus {
+  connected,
+  failed,
+  closed,
+}
+
+class PlSocket {
+  SocketStatus status = SocketStatus.closed;
+  // 链接
+  final String url;
+  // 心跳时间
+  final int heartTime;
+  // 监听初始化完成
+  final Function? onReadyCb;
+  // 监听关闭
+  final Function? onCloseCb;
+  // 监听异常
+  final Function? onErrorCb;
+  // 监听消息
+  final Function? onMessageCb;
+  // 请求头
+  final Map<String, dynamic>? headers;
+
+  PlSocket({
+    required this.url,
+    required this.heartTime,
+    this.onReadyCb,
+    this.onCloseCb,
+    this.onErrorCb,
+    this.onMessageCb,
+    this.headers,
+  });
+
+  WebSocketChannel? channel;
+  StreamSubscription<dynamic>? channelStreamSub;
+
+  // 建立连接
+  Future connect() async {
+    // 连接之前关闭上次连接
+    onClose();
+    try {
+      channel = IOWebSocketChannel.connect(
+        url,
+        connectTimeout: const Duration(seconds: 15),
+        headers: null,
+      );
+      await channel?.ready;
+      onReady();
+    } catch (err) {
+      connect();
+      onError(err);
+    }
+  }
+
+  // 初始化完成
+  void onReady() {
+    status = SocketStatus.connected;
+    onReadyCb?.call();
+    channelStreamSub = channel?.stream.listen((message) {
+      onMessageCb?.call(message);
+    }, onDone: () {
+      // 流被关闭
+      print('结束了');
+    }, onError: (err) {
+      onError(err);
+    });
+    // 每30s发送心跳
+    Timer.periodic(Duration(seconds: heartTime), (timer) {
+      if (status == SocketStatus.connected) {
+        sendMessage(LiveUtils.encodeData(
+          "",
+          2,
+        ));
+      } else {
+        timer.cancel();
+      }
+    });
+  }
+
+  // 连接关闭
+  void onClose() {
+    status = SocketStatus.closed;
+    onCloseCb?.call();
+    channelStreamSub?.cancel();
+    channel?.sink.close();
+  }
+
+  // 连接异常
+  void onError(err) {
+    onErrorCb?.call(err);
+  }
+
+  // 接收消息
+  void onMessage() {}
+
+  void sendMessage(dynamic message) {
+    if (status == SocketStatus.connected) {
+      channel?.sink.add(message);
+    }
+  }
+}
diff --git a/lib/router/app_pages.dart b/lib/router/app_pages.dart
index a6b48f0d..25f42d56 100644
--- a/lib/router/app_pages.dart
+++ b/lib/router/app_pages.dart
@@ -3,11 +3,15 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
+import 'package:pilipala/pages/fav_edit/index.dart';
 import 'package:pilipala/pages/follow_search/view.dart';
+import 'package:pilipala/pages/member_article/index.dart';
 import 'package:pilipala/pages/message/at/index.dart';
 import 'package:pilipala/pages/message/like/index.dart';
 import 'package:pilipala/pages/message/reply/index.dart';
 import 'package:pilipala/pages/message/system/index.dart';
+import 'package:pilipala/pages/opus/index.dart';
+import 'package:pilipala/pages/read/index.dart';
 import 'package:pilipala/pages/setting/pages/logs.dart';
 
 import '../pages/about/index.dart';
@@ -70,14 +74,6 @@ class Routes {
     CustomGetPage(name: '/hot', page: () => const HotPage()),
     // 视频详情
     CustomGetPage(name: '/video', page: () => const VideoDetailPage()),
-    // 图片预览
-    // GetPage(
-    //   name: '/preview',
-    //   page: () => const ImagePreview(),
-    //   transition: Transition.fade,
-    //   transitionDuration: const Duration(milliseconds: 300),
-    //   showCupertinoParallax: false,
-    // ),
     //
     CustomGetPage(name: '/webview', page: () => const WebviewPage()),
     // 设置
@@ -191,6 +187,15 @@ class Routes {
     // 系统通知
     CustomGetPage(
         name: '/messageSystem', page: () => const MessageSystemPage()),
+    // 收藏夹编辑
+    CustomGetPage(name: '/favEdit', page: () => const FavEditPage()),
+
+    // 专栏
+    CustomGetPage(name: '/opus', page: () => const OpusPage()),
+    CustomGetPage(name: '/read', page: () => const ReadPage()),
+    // 用户专栏
+    CustomGetPage(
+        name: '/memberArticle', page: () => const MemberArticlePage()),
   ];
 }
 
diff --git a/lib/utils/app_scheme.dart b/lib/utils/app_scheme.dart
index 17d20bcd..f26eff77 100644
--- a/lib/utils/app_scheme.dart
+++ b/lib/utils/app_scheme.dart
@@ -82,14 +82,11 @@ class PiliSchame {
         case 'opus':
           if (path.startsWith('/detail')) {
             var opusId = path.split('/').last;
-            Get.toNamed(
-              '/webview',
-              parameters: {
-                'url': 'https://www.bilibili.com/opus/$opusId',
-                'type': 'url',
-                'pageTitle': '',
-              },
-            );
+            Get.toNamed('/opus', parameters: {
+              'title': '',
+              'id': opusId,
+              'articleType': 'opus',
+            });
           }
           break;
         case 'search':
@@ -97,12 +94,14 @@ class PiliSchame {
           break;
         case 'article':
           final String id = path.split('/').last.split('?').first;
-          Get.toNamed('/htmlRender', parameters: {
-            'url': 'https://www.bilibili.com/read/cv$id',
-            'title': 'cv$id',
-            'id': 'cv$id',
-            'dynamicType': 'read'
-          });
+          Get.toNamed(
+            '/read',
+            parameters: {
+              'title': 'cv$id',
+              'id': id,
+              'dynamicType': 'read',
+            },
+          );
           break;
         case 'pgc':
           if (path.contains('ep')) {
@@ -176,6 +175,11 @@ class PiliSchame {
         if (lastPathSegment.contains('ep')) {
           RoutePush.bangumiPush(null, Utils.matchNum(lastPathSegment).first);
         }
+      } else if (path.startsWith('/BV')) {
+        final String bvid = path.split('?').first.split('/').last;
+        _videoPush(null, bvid);
+      } else if (path.startsWith('/av')) {
+        _videoPush(Utils.matchNum(path.split('?').first).first, null);
       }
     } else if (host.contains('live')) {
       int roomId = int.parse(path!.split('/').last);
@@ -243,12 +247,12 @@ class PiliSchame {
           break;
         case 'read':
           print('专栏');
-          String id = 'cv${Utils.matchNum(query!['id']!).first}';
-          Get.toNamed('/htmlRender', parameters: {
+          String id = Utils.matchNum(query!['id']!).first.toString();
+          Get.toNamed('/read', parameters: {
             'url': value.dataString!,
             'title': '',
             'id': id,
-            'dynamicType': 'read'
+            'articleType': 'read'
           });
           break;
         case 'space':
diff --git a/lib/utils/binary_writer.dart b/lib/utils/binary_writer.dart
new file mode 100644
index 00000000..929bc573
--- /dev/null
+++ b/lib/utils/binary_writer.dart
@@ -0,0 +1,117 @@
+import 'dart:typed_data';
+
+class BinaryWriter {
+  List<int> buffer;
+  int position = 0;
+  BinaryWriter(this.buffer);
+  int get length => buffer.length;
+
+  void writeBytes(List<int> list) {
+    buffer.addAll(list);
+    position += list.length;
+  }
+
+  void writeInt(int value, int len, {Endian endian = Endian.big}) {
+    var bytes = _createByteData(len);
+    switch (len) {
+      case 1:
+        bytes.setUint8(0, value.toUnsigned(8));
+        break;
+      case 2:
+        bytes.setInt16(0, value, endian);
+        break;
+      case 4:
+        bytes.setInt32(0, value, endian);
+        break;
+      case 8:
+        bytes.setInt64(0, value, endian);
+        break;
+      default:
+        throw ArgumentError('Invalid length for writeInt: $len');
+    }
+    _addBytesToBuffer(bytes, len);
+  }
+
+  void writeDouble(double value, int len, {Endian endian = Endian.big}) {
+    var bytes = _createByteData(len);
+    switch (len) {
+      case 4:
+        bytes.setFloat32(0, value, endian);
+        break;
+      case 8:
+        bytes.setFloat64(0, value, endian);
+        break;
+      default:
+        throw ArgumentError('Invalid length for writeDouble: $len');
+    }
+    _addBytesToBuffer(bytes, len);
+  }
+
+  ByteData _createByteData(int len) {
+    var b = Uint8List(len).buffer;
+    return ByteData.view(b);
+  }
+
+  void _addBytesToBuffer(ByteData bytes, int len) {
+    buffer.addAll(bytes.buffer.asUint8List());
+    position += len;
+  }
+}
+
+class BinaryReader {
+  Uint8List buffer;
+  int position = 0;
+  BinaryReader(this.buffer);
+  int get length => buffer.length;
+
+  int read() {
+    return buffer[position++];
+  }
+
+  int readInt(int len, {Endian endian = Endian.big}) {
+    var bytes = _getBytes(len);
+    var data = ByteData.view(bytes.buffer);
+    switch (len) {
+      case 1:
+        return data.getUint8(0);
+      case 2:
+        return data.getInt16(0, endian);
+      case 4:
+        return data.getInt32(0, endian);
+      case 8:
+        return data.getInt64(0, endian);
+      default:
+        throw ArgumentError('Invalid length for readInt: $len');
+    }
+  }
+
+  int readByte({Endian endian = Endian.big}) => readInt(1, endian: endian);
+  int readShort({Endian endian = Endian.big}) => readInt(2, endian: endian);
+  int readInt32({Endian endian = Endian.big}) => readInt(4, endian: endian);
+  int readLong({Endian endian = Endian.big}) => readInt(8, endian: endian);
+
+  Uint8List readBytes(int len) {
+    var bytes = _getBytes(len);
+    return bytes;
+  }
+
+  double readFloat(int len, {Endian endian = Endian.big}) {
+    var bytes = _getBytes(len);
+    var data = ByteData.view(bytes.buffer);
+    switch (len) {
+      case 4:
+        return data.getFloat32(0, endian);
+      case 8:
+        return data.getFloat64(0, endian);
+      default:
+        throw ArgumentError('Invalid length for readFloat: $len');
+    }
+  }
+
+  Uint8List _getBytes(int len) {
+    var bytes =
+        Uint8List.fromList(buffer.getRange(position, position + len).toList());
+    position += len;
+    return bytes;
+  }
+}
diff --git a/lib/utils/cache_manage.dart b/lib/utils/cache_manage.dart
index d6bbb816..4603da9f 100644
--- a/lib/utils/cache_manage.dart
+++ b/lib/utils/cache_manage.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 import 'package:flutter/material.dart';
+import 'package:get/get.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 
@@ -50,13 +51,17 @@ class CacheManage {
   Future<double> getTotalSizeOfFilesInDir(final FileSystemEntity file) async {
     if (file is File) {
       int length = await file.length();
-      return double.parse(length.toString());
+      return length.toDouble();
     }
     if (file is Directory) {
-      final List<FileSystemEntity> children = file.listSync();
       double total = 0;
-      for (final FileSystemEntity child in children) {
-        total += await getTotalSizeOfFilesInDir(child);
+      try {
+        await for (final FileSystemEntity child in file.list()) {
+          total += await getTotalSizeOfFilesInDir(child);
+        }
+      } catch (e) {
+        // 处理错误，例如记录日志或显示错误消息
+        print('读取目录时出错: $e');
       }
       return total;
     }
@@ -77,16 +82,17 @@ class CacheManage {
 
   // 清除缓存
   Future<bool> clearCacheAll() async {
-    bool cleanStatus = await SmartDialog.show(
-      useSystem: true,
-      animationType: SmartAnimationType.centerFade_otherSlide,
+    bool? cleanStatus = await showDialog<bool>(
+      context: Get.context!,
       builder: (BuildContext context) {
         return AlertDialog(
           title: const Text('提示'),
           content: const Text('该操作将清除图片及网络请求缓存数据，确认清除？'),
           actions: [
             TextButton(
-              onPressed: (() => {SmartDialog.dismiss()}),
+              onPressed: () {
+                Navigator.of(context).pop(false);
+              },
               child: Text(
                 '取消',
                 style: TextStyle(color: Theme.of(context).colorScheme.outline),
@@ -94,40 +100,45 @@ class CacheManage {
             ),
             TextButton(
               onPressed: () async {
-                SmartDialog.dismiss();
-                SmartDialog.showLoading(msg: '正在清除...');
-                try {
-                  // 清除缓存 图片缓存
-                  await clearLibraryCache();
-                  SmartDialog.dismiss().then((res) {
-                    SmartDialog.showToast('清除完成');
-                  });
-                } catch (err) {
-                  SmartDialog.dismiss();
-                  SmartDialog.showToast(err.toString());
-                }
+                Navigator.of(context).pop(true);
               },
               child: const Text('确认'),
-            )
+            ),
           ],
         );
       },
-    ).then((res) {
-      return true;
-    });
-    return cleanStatus;
+    );
+    if (cleanStatus != null && cleanStatus) {
+      SmartDialog.showLoading(msg: '正在清除...');
+      try {
+        // 清除缓存 图片缓存
+        await clearLibraryCache();
+        SmartDialog.dismiss().then((res) {
+          SmartDialog.showToast('清除完成');
+        });
+      } catch (err) {
+        SmartDialog.dismiss();
+        SmartDialog.showToast(err.toString());
+      }
+    }
+    return cleanStatus!;
   }
 
   /// 清除 Documents 目录下的 DioCache.db
-  Future clearApplicationCache() async {
-    Directory directory = await getApplicationDocumentsDirectory();
-    if (directory.existsSync()) {
-      String dioCacheFileName =
-          '${directory.path}${Platform.pathSeparator}DioCache.db';
-      var dioCacheFile = File(dioCacheFileName);
-      if (dioCacheFile.existsSync()) {
-        dioCacheFile.delete();
+  Future<void> clearApplicationCache() async {
+    try {
+      Directory directory = await getApplicationDocumentsDirectory();
+      if (directory.existsSync()) {
+        String dioCacheFileName =
+            '${directory.path}${Platform.pathSeparator}DioCache.db';
+        File dioCacheFile = File(dioCacheFileName);
+        if (await dioCacheFile.exists()) {
+          await dioCacheFile.delete();
+        }
       }
+    } catch (e) {
+      // 处理错误，例如记录日志或显示错误消息
+      print('清除缓存时出错: $e');
     }
   }
 
diff --git a/lib/utils/global_data.dart b/lib/utils/global_data.dart
deleted file mode 100644
index 97bff5a5..00000000
--- a/lib/utils/global_data.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:hive/hive.dart';
-import 'package:pilipala/utils/storage.dart';
-import '../models/common/index.dart';
-
-Box setting = GStrorage.setting;
-
-class GlobalData {
-  int imgQuality = 10;
-  FullScreenGestureMode fullScreenGestureMode =
-      FullScreenGestureMode.values.last;
-  bool enablePlayerControlAnimation = true;
-  final bool enableMYBar =
-      setting.get(SettingBoxKey.enableMYBar, defaultValue: true);
-  List<String> actionTypeSort = setting.get(SettingBoxKey.actionTypeSort,
-      defaultValue: ['like', 'coin', 'collect', 'watchLater', 'share']);
-  // 私有构造函数
-  GlobalData._();
-
-  // 单例实例
-  static final GlobalData _instance = GlobalData._();
-
-  // 获取全局实例
-  factory GlobalData() => _instance;
-}
diff --git a/lib/utils/global_data_cache.dart b/lib/utils/global_data_cache.dart
new file mode 100644
index 00000000..a2b454a9
--- /dev/null
+++ b/lib/utils/global_data_cache.dart
@@ -0,0 +1,107 @@
+import 'package:hive/hive.dart';
+import 'package:pilipala/models/user/info.dart';
+import 'package:pilipala/plugin/pl_player/models/play_repeat.dart';
+import 'package:pilipala/plugin/pl_player/models/play_speed.dart';
+import 'package:pilipala/utils/storage.dart';
+import '../models/common/index.dart';
+
+Box setting = GStrorage.setting;
+Box localCache = GStrorage.localCache;
+Box videoStorage = GStrorage.video;
+Box userInfoCache = GStrorage.userInfo;
+
+class GlobalDataCache {
+  late int imgQuality;
+  late FullScreenGestureMode fullScreenGestureMode;
+  late bool enablePlayerControlAnimation;
+  late List<String> actionTypeSort;
+  String? wWebid;
+
+  /// 播放器相关
+  // 弹幕开关
+  late bool isOpenDanmu;
+  // 弹幕屏蔽类型
+  late List<dynamic> blockTypes;
+  // 弹幕展示区域
+  late double showArea;
+  // 弹幕透明度
+  late double opacityVal;
+  // 弹幕字体大小
+  late double fontSizeVal;
+  // 弹幕显示时间
+  late double danmakuDurationVal;
+  // 弹幕描边宽度
+  late double strokeWidth;
+  // 播放器循环模式
+  late PlayRepeat playRepeat;
+  // 播放器默认播放速度
+  late double playbackSpeed;
+  // 播放器自动长按速度
+  late bool enableAutoLongPressSpeed;
+  // 播放器长按速度
+  late double longPressSpeed;
+  // 播放器速度列表
+  late List<double> speedsList;
+  // 用户信息
+  UserInfoData? userInfo;
+
+  // 私有构造函数
+  GlobalDataCache._();
+
+  // 单例实例
+  static final GlobalDataCache _instance = GlobalDataCache._();
+
+  // 获取全局实例
+  factory GlobalDataCache() => _instance;
+
+  // 异步初始化方法
+  Future<void> initialize() async {
+    imgQuality = await setting.get(SettingBoxKey.defaultPicQa,
+        defaultValue: 10); // 设置全局变量
+    fullScreenGestureMode = FullScreenGestureMode.values[setting.get(
+        SettingBoxKey.fullScreenGestureMode,
+        defaultValue: FullScreenGestureMode.values.last.index) as int];
+    enablePlayerControlAnimation = setting
+        .get(SettingBoxKey.enablePlayerControlAnimation, defaultValue: true);
+    actionTypeSort = await setting.get(SettingBoxKey.actionTypeSort,
+        defaultValue: ['like', 'coin', 'collect', 'watchLater', 'share']);
+
+    isOpenDanmu =
+        await setting.get(SettingBoxKey.enableShowDanmaku, defaultValue: false);
+    blockTypes =
+        await localCache.get(LocalCacheKey.danmakuBlockType, defaultValue: []);
+    showArea =
+        await localCache.get(LocalCacheKey.danmakuShowArea, defaultValue: 0.5);
+    opacityVal =
+        await localCache.get(LocalCacheKey.danmakuOpacity, defaultValue: 1.0);
+    fontSizeVal =
+        await localCache.get(LocalCacheKey.danmakuFontScale, defaultValue: 1.0);
+    danmakuDurationVal =
+        await localCache.get(LocalCacheKey.danmakuDuration, defaultValue: 4.0);
+    strokeWidth =
+        await localCache.get(LocalCacheKey.strokeWidth, defaultValue: 1.5);
+
+    var defaultPlayRepeat = await videoStorage.get(VideoBoxKey.playRepeat,
+        defaultValue: PlayRepeat.pause.value);
+    playRepeat = PlayRepeat.values
+        .toList()
+        .firstWhere((e) => e.value == defaultPlayRepeat);
+    playbackSpeed =
+        await videoStorage.get(VideoBoxKey.playSpeedDefault, defaultValue: 1.0);
+    enableAutoLongPressSpeed = await setting
+        .get(SettingBoxKey.enableAutoLongPressSpeed, defaultValue: false);
+    if (!enableAutoLongPressSpeed) {
+      longPressSpeed = await videoStorage.get(VideoBoxKey.longPressSpeedDefault,
+          defaultValue: 2.0);
+    } else {
+      longPressSpeed = 2.0;
+    }
+    speedsList = List<double>.from(await videoStorage
+        .get(VideoBoxKey.customSpeedsList, defaultValue: <double>[]));
+    final List<double> playSpeedSystem = await videoStorage
+        .get(VideoBoxKey.playSpeedSystem, defaultValue: playSpeed);
+    speedsList.addAll(playSpeedSystem);
+
+    userInfo = userInfoCache.get('userInfoCache');
+  }
+}
diff --git a/lib/utils/highlight.dart b/lib/utils/highlight.dart
new file mode 100644
index 00000000..c19b2f43
--- /dev/null
+++ b/lib/utils/highlight.dart
@@ -0,0 +1,14 @@
+import 'package:flutter/material.dart';
+import 'package:re_highlight/languages/all.dart';
+import 'package:re_highlight/re_highlight.dart';
+import 'package:re_highlight/styles/all.dart';
+
+TextSpan? highlightExistingText(String text, List<String> languages) {
+  final Highlight highlight = Highlight();
+  highlight.registerLanguages(builtinAllLanguages);
+  final HighlightResult result = highlight.highlightAuto(text, languages);
+  final TextSpanRenderer renderer =
+      TextSpanRenderer(const TextStyle(), builtinAllThemes['github']!);
+  result.render(renderer);
+  return renderer.span;
+}
diff --git a/lib/utils/image_save.dart b/lib/utils/image_save.dart
index 0b77b7cc..99513ac8 100644
--- a/lib/utils/image_save.dart
+++ b/lib/utils/image_save.dart
@@ -57,7 +57,7 @@ Future imageSaveDialog(context, videoItem, closeFn) {
             child: Row(
               children: [
                 Expanded(
-                  child: Text(
+                  child: SelectableText(
                     videoItem.title! as String,
                     style: Theme.of(context).textTheme.titleSmall,
                   ),
diff --git a/lib/utils/live.dart b/lib/utils/live.dart
new file mode 100644
index 00000000..dd56616e
--- /dev/null
+++ b/lib/utils/live.dart
@@ -0,0 +1,196 @@
+import 'dart:convert';
+import 'dart:io';
+import 'dart:typed_data';
+import 'package:brotli/brotli.dart';
+import 'package:pilipala/models/live/message.dart';
+import 'package:pilipala/utils/binary_writer.dart';
+
+class LiveUtils {
+  static List<int> encodeData(String msg, int action) {
+    var data = utf8.encode(msg);
+    //头部长度固定16
+    var length = data.length + 16;
+    var buffer = Uint8List(length);
+
+    var writer = BinaryWriter([]);
+
+    //数据包长度
+    writer.writeInt(buffer.length, 4);
+    //数据包头部长度,固定16
+    writer.writeInt(16, 2);
+
+    //协议版本，0=JSON,1=Int32,2=Buffer
+    writer.writeInt(0, 2);
+
+    //操作类型
+    writer.writeInt(action, 4);
+
+    //数据包头部长度,固定1
+
+    writer.writeInt(1, 4);
+
+    writer.writeBytes(data);
+
+    return writer.buffer;
+  }
+
+  static List<LiveMessageModel>? decodeMessage(List<int> data) {
+    try {
+      //操作类型。3=心跳回应，内容为房间人气值；5=通知，弹幕、广播等全部信息；8=进房回应，空
+      int operation = readInt(data, 8, 4);
+      //内容
+      var body = data.skip(16).toList();
+      if (operation == 3) {
+        var online = readInt(body, 0, 4);
+        final LiveMessageModel liveMsg = LiveMessageModel(
+          type: LiveMessageType.online,
+          userName: '',
+          message: '',
+          color: LiveMessageColor.white,
+          data: online,
+        );
+        return [liveMsg];
+      } else if (operation == 5) {
+        //协议版本。0为JSON，可以直接解析；1为房间人气值,Body为4位Int32；2为压缩过Buffer，需要解压再处理
+        int protocolVersion = readInt(data, 6, 2);
+        if (protocolVersion == 2) {
+          body = zlib.decode(body);
+        } else if (protocolVersion == 3) {
+          body = brotli.decode(body);
+        }
+
+        var text = utf8.decode(body, allowMalformed: true);
+
+        var group =
+            text.split(RegExp(r"[\x00-\x1f]+", unicode: true, multiLine: true));
+        List<LiveMessageModel> messages = [];
+        for (var item
+            in group.where((x) => x.length > 2 && x.startsWith('{'))) {
+          if (parseMessage(item) is LiveMessageModel) {
+            messages.add(parseMessage(item)!);
+          }
+        }
+        return messages;
+      }
+    } catch (e) {
+      print(e);
+    }
+    return null;
+  }
+
+  static LiveMessageModel? parseMessage(String jsonMessage) {
+    try {
+      var obj = json.decode(jsonMessage);
+      var cmd = obj["cmd"].toString();
+      if (cmd.contains("DANMU_MSG")) {
+        if (obj["info"] != null && obj["info"].length != 0) {
+          var message = obj["info"][1].toString();
+          var color = asT<int?>(obj["info"][0][3]) ?? 0;
+          if (obj["info"][2] != null && obj["info"][2].length != 0) {
+            var extra = obj["info"][0][15]['extra'];
+            var user = obj["info"][0][15]['user']['base'];
+            Map<String, dynamic> extraMap = jsonDecode(extra);
+            final int userId = obj["info"][2][0];
+            final LiveMessageModel liveMsg = LiveMessageModel(
+              type: LiveMessageType.chat,
+              userName: user['name'],
+              message: message,
+              color: color == 0
+                  ? LiveMessageColor.white
+                  : LiveMessageColor.numberToColor(color),
+              face: user['face'],
+              uid: userId,
+              emots: extraMap['emots'],
+            );
+            return liveMsg;
+          }
+        }
+      } else if (cmd == "SUPER_CHAT_MESSAGE") {
+        if (obj["data"] == null) {
+          return null;
+        }
+        final data = obj["data"];
+        final userInfo = data["user_info"];
+        final String backgroundBottomColor =
+            data["background_bottom_color"].toString();
+        final String backgroundColor = data["background_color"].toString();
+        final DateTime endTime =
+            DateTime.fromMillisecondsSinceEpoch(data["end_time"] * 1000);
+        final String face = "${userInfo["face"]}@200w.jpg";
+        final String message = data["message"].toString();
+        final String price = data["price"];
+        final DateTime startTime =
+            DateTime.fromMillisecondsSinceEpoch(data["start_time"] * 1000);
+        final String userName = userInfo["uname"].toString();
+
+        final LiveMessageModel liveMsg = LiveMessageModel(
+          type: LiveMessageType.superChat,
+          userName: "SUPER_CHAT_MESSAGE",
+          message: "SUPER_CHAT_MESSAGE",
+          color: LiveMessageColor.white,
+          data: {
+            "backgroundBottomColor": backgroundBottomColor,
+            "backgroundColor": backgroundColor,
+            "endTime": endTime,
+            "face": face,
+            "message": message,
+            "price": price,
+            "startTime": startTime,
+            "userName": userName,
+          },
+        );
+        return liveMsg;
+      } else if (cmd == 'INTERACT_WORD') {
+        if (obj["data"] == null) {
+          return null;
+        }
+        final data = obj["data"];
+        final String userName = data['uname'];
+        final int msgType = data['msg_type'];
+        final LiveMessageModel liveMsg = LiveMessageModel(
+          type: msgType == 1 ? LiveMessageType.join : LiveMessageType.follow,
+          userName: userName,
+          message: msgType == 1 ? '进入直播间' : '关注了主播',
+          color: LiveMessageColor.white,
+        );
+        return liveMsg;
+      }
+    } catch (e) {
+      print(e);
+    }
+    return null;
+  }
+
+  static T? asT<T>(dynamic value) {
+    if (value is T) {
+      return value;
+    }
+    return null;
+  }
+
+  static int readInt(List<int> buffer, int start, int len) {
+    var data = _getByteData(buffer, start, len);
+    return _readIntFromByteData(data, len);
+  }
+
+  static ByteData _getByteData(List<int> buffer, int start, int len) {
+    var bytes =
+        Uint8List.fromList(buffer.getRange(start, start + len).toList());
+    return ByteData.view(bytes.buffer);
+  }
+
+  static int _readIntFromByteData(ByteData data, int len) {
+    switch (len) {
+      case 1:
+        return data.getUint8(0);
+      case 2:
+        return data.getInt16(0, Endian.big);
+      case 4:
+        return data.getInt32(0, Endian.big);
+      case 8:
+        return data.getInt64(0, Endian.big);
+      default:
+        throw ArgumentError('Invalid length: $len');
+    }
+  }
+}
diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart
index 4a163446..d9b9e100 100644
--- a/lib/utils/storage.dart
+++ b/lib/utils/storage.dart
@@ -1,11 +1,7 @@
 import 'dart:io';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:pilipala/models/model_owner.dart';
-import 'package:pilipala/models/search/hot.dart';
 import 'package:pilipala/models/user/info.dart';
-import '../models/common/gesture_mode.dart';
-import 'global_data.dart';
 
 class GStrorage {
   static late final Box<dynamic> userInfo;
@@ -44,21 +40,11 @@ class GStrorage {
     );
     // 视频设置
     video = await Hive.openBox('video');
-    GlobalData().imgQuality =
-        setting.get(SettingBoxKey.defaultPicQa, defaultValue: 10); // 设置全局变量
-    GlobalData().fullScreenGestureMode = FullScreenGestureMode.values[
-        setting.get(SettingBoxKey.fullScreenGestureMode,
-            defaultValue: FullScreenGestureMode.values.last.index) as int];
-    GlobalData().enablePlayerControlAnimation = setting
-        .get(SettingBoxKey.enablePlayerControlAnimation, defaultValue: true);
   }
 
   static void regAdapter() {
-    Hive.registerAdapter(OwnerAdapter());
     Hive.registerAdapter(UserInfoDataAdapter());
     Hive.registerAdapter(LevelInfoAdapter());
-    Hive.registerAdapter(HotSearchModelAdapter());
-    Hive.registerAdapter(HotSearchItemAdapter());
   }
 
   static Future<void> close() async {
@@ -102,6 +88,10 @@ class SettingBoxKey {
       autoPiP = 'autoPiP',
       enableAutoLongPressSpeed = 'enableAutoLongPressSpeed',
       enablePlayerControlAnimation = 'enablePlayerControlAnimation',
+      // 默认音频输出方式
+      defaultAoOutput = 'defaultAoOutput',
+      // 港澳台模式
+      enableGATMode = 'enableGATMode',
 
       // youtube 双击快进快退
       enableQuickDouble = 'enableQuickDouble',
diff --git a/lib/utils/subtitle.dart b/lib/utils/subtitle.dart
index 1b4088f3..9743711c 100644
--- a/lib/utils/subtitle.dart
+++ b/lib/utils/subtitle.dart
@@ -1,21 +1,51 @@
+import 'dart:async';
+import 'dart:isolate';
+
 class SubTitleUtils {
   // 格式整理
-  static String convertToWebVTT(List jsonData) {
-    String webVTTContent = 'WEBVTT FILE\n\n';
+  static Future<String> convertToWebVTT(List jsonData) async {
+    final receivePort = ReceivePort();
+    await Isolate.spawn(_convertToWebVTTIsolate, receivePort.sendPort);
 
-    for (int i = 0; i < jsonData.length; i++) {
-      final item = jsonData[i];
-      double from = double.parse(item['from'].toString());
-      double to = double.parse(item['to'].toString());
-      int sid = (item['sid'] ?? 0) as int;
-      String content = item['content'] as String;
+    final sendPort = await receivePort.first as SendPort;
+    final response = ReceivePort();
+    sendPort.send([jsonData, response.sendPort]);
 
-      webVTTContent += '$sid\n';
-      webVTTContent += '${formatTime(from)} --> ${formatTime(to)}\n';
-      webVTTContent += '$content\n\n';
+    return await response.first as String;
+  }
+
+  static void _convertToWebVTTIsolate(SendPort sendPort) async {
+    final port = ReceivePort();
+    sendPort.send(port.sendPort);
+
+    await for (final message in port) {
+      final List jsonData = message[0];
+      final SendPort replyTo = message[1];
+
+      String webVTTContent = 'WEBVTT FILE\n\n';
+      int chunkSize = 100; // 每次处理100条数据
+      int totalChunks = (jsonData.length / chunkSize).ceil();
+
+      for (int chunk = 0; chunk < totalChunks; chunk++) {
+        int start = chunk * chunkSize;
+        int end = start + chunkSize;
+        if (end > jsonData.length) end = jsonData.length;
+
+        for (int i = start; i < end; i++) {
+          final item = jsonData[i];
+          double from = double.parse(item['from'].toString());
+          double to = double.parse(item['to'].toString());
+          int sid = (item['sid'] ?? 0) as int;
+          String content = item['content'] as String;
+
+          webVTTContent += '$sid\n';
+          webVTTContent += '${formatTime(from)} --> ${formatTime(to)}\n';
+          webVTTContent += '$content\n\n';
+        }
+      }
+
+      replyTo.send(webVTTContent);
     }
-
-    return webVTTContent;
   }
 
   static String formatTime(num seconds) {
diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart
index e50c295c..7a254f7d 100644
--- a/lib/utils/utils.dart
+++ b/lib/utils/utils.dart
@@ -306,7 +306,7 @@ class Utils {
                 onPressed: () async {
                   await SmartDialog.dismiss();
                   launchUrl(
-                    Uri.parse('https://www.123pan.com/s/9sVqVv-flu0A.html'),
+                    Uri.parse('https://www.123684.com/s/9sVqVv-DEZ0A'),
                     mode: LaunchMode.externalApplication,
                   );
                 },
diff --git a/pubspec.lock b/pubspec.lock
index c73ce395..b9d48c78 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -113,6 +113,30 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.1"
+  bottom_inset_observer:
+    dependency: transitive
+    description:
+      name: bottom_inset_observer
+      sha256: cbfb01e0e07cc4922052701786d5e607765a6f54e1844f41061abf8744519a7d
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.1.0"
+  bottom_sheet:
+    dependency: "direct main"
+    description:
+      name: bottom_sheet
+      sha256: efd28f52357d23e1c01eaeb45466b407f1e29318305bd6d10baf814fda18bd7e
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "4.0.4"
+  brotli:
+    dependency: "direct main"
+    description:
+      name: brotli
+      sha256: "7f891558ed779aab2bed874f0a36b8123f9ff3f19cf6efbee89e18ed294945ae"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.6.0"
   build:
     dependency: transitive
     description:
@@ -441,22 +465,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "5.0.1"
-  extended_image:
-    dependency: "direct main"
-    description:
-      name: extended_image
-      sha256: d7f091d068fcac7246c4b22a84b8dac59a62e04d29a5c172710c696e67a22f94
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "8.2.0"
-  extended_image_library:
-    dependency: transitive
-    description:
-      name: extended_image_library
-      sha256: c9caee8fe9b6547bd41c960c4f2d1ef8e34321804de6a1777f1d614a24247ad6
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "4.0.4"
   extended_list:
     dependency: transitive
     description:
@@ -726,14 +734,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.2.0"
-  http_client_helper:
-    dependency: transitive
-    description:
-      name: http_client_helper
-      sha256: "8a9127650734da86b5c73760de2b404494c968a3fd55602045ffec789dac3cb1"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "3.0.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -1234,6 +1234,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.1.0"
+  re_highlight:
+    dependency: "direct main"
+    description:
+      name: re_highlight
+      sha256: "6c4ac3f76f939fb7ca9df013df98526634e17d8f7460e028bd23a035870024f2"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.0.3"
   rxdart:
     dependency: transitive
     description:
@@ -1680,13 +1688,13 @@ packages:
     source: hosted
     version: "0.5.1"
   web_socket_channel:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: web_socket_channel
-      sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b
+      sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.5"
   webview_cookie_manager:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 66187abf..ac04a1b0 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.23+1023
+version: 1.0.25+1025
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
@@ -49,7 +49,6 @@ dependencies:
 
   # 图片
   cached_network_image: ^3.3.0
-  extended_image: ^8.2.0
   saver_gallery: ^3.0.1
 
   # 存储
@@ -147,6 +146,11 @@ dependencies:
   lottie: ^3.1.2
   # 二维码
   qr_flutter: ^4.1.0
+  bottom_sheet: ^4.0.4
+  web_socket_channel: ^2.4.5
+  brotli: ^0.6.0
+  # 文本语法高亮
+  re_highlight: ^0.0.3
 
 dev_dependencies:
   flutter_test: