diff --git a/analysis_options.yaml b/analysis_options.yaml
index 2e03c015e..0a3be5cca 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -61,5 +61,7 @@ linter:
     - use_decorated_box
     - use_named_constants
     - use_null_aware_elements
+    - unnecessary_lambdas
+    - use_is_even_rather_than_modulo
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
diff --git a/lib/common/skeleton/video_card_h.dart b/lib/common/skeleton/video_card_h.dart
index 7210ef4c0..b25a6a9dd 100644
--- a/lib/common/skeleton/video_card_h.dart
+++ b/lib/common/skeleton/video_card_h.dart
@@ -19,15 +19,11 @@ class VideoCardHSkeleton extends StatelessWidget {
           children: [
             AspectRatio(
               aspectRatio: StyleString.aspectRatio,
-              child: LayoutBuilder(
-                builder: (context, boxConstraints) {
-                  return DecoratedBox(
-                    decoration: BoxDecoration(
-                      color: color,
-                      borderRadius: StyleString.mdRadius,
-                    ),
-                  );
-                },
+              child: DecoratedBox(
+                decoration: BoxDecoration(
+                  color: color,
+                  borderRadius: StyleString.mdRadius,
+                ),
               ),
             ),
             Expanded(
diff --git a/lib/common/skeleton/video_card_v.dart b/lib/common/skeleton/video_card_v.dart
index 265ba58c8..f8f9a2cb5 100644
--- a/lib/common/skeleton/video_card_v.dart
+++ b/lib/common/skeleton/video_card_v.dart
@@ -13,15 +13,11 @@ class VideoCardVSkeleton extends StatelessWidget {
         children: [
           AspectRatio(
             aspectRatio: StyleString.aspectRatio,
-            child: LayoutBuilder(
-              builder: (context, boxConstraints) {
-                return DecoratedBox(
-                  decoration: BoxDecoration(
-                    color: color,
-                    borderRadius: StyleString.mdRadius,
-                  ),
-                );
-              },
+            child: DecoratedBox(
+              decoration: BoxDecoration(
+                color: color,
+                borderRadius: StyleString.mdRadius,
+              ),
             ),
           ),
           Padding(
diff --git a/lib/common/widgets/dyn/ink_well.dart b/lib/common/widgets/dyn/ink_well.dart
index 14c197be5..110f5f762 100644
--- a/lib/common/widgets/dyn/ink_well.dart
+++ b/lib/common/widgets/dyn/ink_well.dart
@@ -980,9 +980,7 @@ class _InkResponseState extends State<_InkResponseStateWidget>
     if (!mounted) {
       return;
     }
-    setState(() {
-      updateFocusHighlights();
-    });
+    setState(updateFocusHighlights);
   }
 
   bool get _shouldShowFocus =>
diff --git a/lib/common/widgets/image/network_img_layer.dart b/lib/common/widgets/image/network_img_layer.dart
index 2213ff3ad..878ab396a 100644
--- a/lib/common/widgets/image/network_img_layer.dart
+++ b/lib/common/widgets/image/network_img_layer.dart
@@ -47,24 +47,32 @@ class NetworkImgLayer extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final noRadius = type == ImageType.emote || radius == 0;
+    final Widget child;
 
     if (src?.isNotEmpty == true) {
-      Widget child = _buildImage(context, noRadius);
-      if (noRadius) {
-        return child;
-      }
-      if (type == ImageType.avatar) {
-        return ClipOval(child: child);
-      }
-      return ClipRRect(
-        borderRadius: radius != null
-            ? BorderRadius.circular(radius!)
-            : StyleString.mdRadius,
-        child: child,
-      );
+      child = noRadius
+          ? _buildImage(context, noRadius)
+          : type == ImageType.avatar
+          ? ClipOval(child: _buildImage(context, noRadius))
+          : ClipRRect(
+              borderRadius: radius != null
+                  ? BorderRadius.circular(radius!)
+                  : StyleString.mdRadius,
+              child: _buildImage(context, noRadius),
+            );
+    } else {
+      child = getPlaceHolder?.call() ?? _placeholder(context, noRadius);
     }
 
-    return getPlaceHolder?.call() ?? _placeholder(context, noRadius);
+    return semanticsLabel?.isNotEmpty == true
+        ? Semantics(
+            container: true,
+            image: true,
+            excludeSemantics: true,
+            label: semanticsLabel,
+            child: child,
+          )
+        : child;
   }
 
   Widget _buildImage(BuildContext context, bool noRadius) {
diff --git a/lib/common/widgets/page/tabs.dart b/lib/common/widgets/page/tabs.dart
index cd567232d..c16e02457 100644
--- a/lib/common/widgets/page/tabs.dart
+++ b/lib/common/widgets/page/tabs.dart
@@ -244,9 +244,7 @@ class _CustomTabBarViewState extends State<CustomTabBarView> {
       );
     }
     if (mounted) {
-      setState(() {
-        _updateChildren();
-      });
+      setState(_updateChildren);
     }
     return Future<void>.value();
   }
@@ -286,9 +284,7 @@ class _CustomTabBarViewState extends State<CustomTabBarView> {
     }
 
     if (mounted) {
-      setState(() {
-        _updateChildren();
-      });
+      setState(_updateChildren);
     }
   }
 
diff --git a/lib/common/widgets/stat/stat.dart b/lib/common/widgets/stat/stat.dart
index 53780027f..b87606fd3 100644
--- a/lib/common/widgets/stat/stat.dart
+++ b/lib/common/widgets/stat/stat.dart
@@ -27,6 +27,7 @@ class StatWidget extends StatelessWidget {
       children: [
         Icon(
           type.iconData,
+          semanticLabel: type.label,
           size: iconSize,
           color: color,
         ),
diff --git a/lib/common/widgets/tabs.dart b/lib/common/widgets/tabs.dart
index 7d5b9deb5..cf3807362 100644
--- a/lib/common/widgets/tabs.dart
+++ b/lib/common/widgets/tabs.dart
@@ -238,9 +238,7 @@ class _CustomTabBarViewState extends State<CustomTabBarView> {
       );
     }
     if (mounted) {
-      setState(() {
-        _updateChildren();
-      });
+      setState(_updateChildren);
     }
     return Future<void>.value();
   }
@@ -280,9 +278,7 @@ class _CustomTabBarViewState extends State<CustomTabBarView> {
     }
 
     if (mounted) {
-      setState(() {
-        _updateChildren();
-      });
+      setState(_updateChildren);
     }
   }
 
diff --git a/lib/common/widgets/video_card/video_card_v.dart b/lib/common/widgets/video_card/video_card_v.dart
index 843703df8..76a085fa3 100644
--- a/lib/common/widgets/video_card/video_card_v.dart
+++ b/lib/common/widgets/video_card/video_card_v.dart
@@ -190,6 +190,7 @@ class VideoCardV extends StatelessWidget {
                     videoItem.owner.name.toString(),
                     maxLines: 1,
                     overflow: TextOverflow.clip,
+                    semanticsLabel: 'UP：${videoItem.owner.name}',
                     style: TextStyle(
                       height: 1.5,
                       fontSize: theme.textTheme.labelMedium!.fontSize,
@@ -234,8 +235,8 @@ class VideoCardV extends StatelessWidget {
               ),
               text: DateUtil.dateFormat(
                 videoItem.pubdate,
-                shortFormat: shortFormat,
-                longFormat: longFormat,
+                short: shortFormat,
+                long: longFormat,
               ),
             ),
           ),
diff --git a/lib/grpc/reply.dart b/lib/grpc/reply.dart
index 48c2e96d4..9bafc6e24 100644
--- a/lib/grpc/reply.dart
+++ b/lib/grpc/reply.dart
@@ -73,7 +73,7 @@ class ReplyGrpc {
         mainListReply.replies.removeWhere((item) {
           final hasMatch = needRemoveGrpc(item);
           if (!hasMatch && item.replies.isNotEmpty) {
-            item.replies.removeWhere((i) => needRemoveGrpc(i));
+            item.replies.removeWhere(needRemoveGrpc);
           }
           return hasMatch;
         });
@@ -104,7 +104,7 @@ class ReplyGrpc {
       DetailListReply.fromBuffer,
     );
     return res
-      ..dataOrNull?.root.replies.removeWhere((item) => needRemoveGrpc(item));
+      ..dataOrNull?.root.replies.removeWhere(needRemoveGrpc);
   }
 
   static Future<LoadingState<DialogListReply>> dialogList({
@@ -125,7 +125,7 @@ class ReplyGrpc {
       ),
       DialogListReply.fromBuffer,
     );
-    return res..dataOrNull?.replies.removeWhere((item) => needRemoveGrpc(item));
+    return res..dataOrNull?.replies.removeWhere(needRemoveGrpc);
   }
 
   static Future<LoadingState<SearchItemReply>> searchItem({
diff --git a/lib/http/user.dart b/lib/http/user.dart
index 002375470..9fcd49ede 100644
--- a/lib/http/user.dart
+++ b/lib/http/user.dart
@@ -301,18 +301,22 @@ class UserHttp {
     }
   }
 
-  static Future<Map<String, dynamic>> videoTags({required String bvid}) async {
+  static Future<LoadingState<List<VideoTagItem>?>> videoTags({
+    required String bvid,
+    Object? cid,
+  }) async {
     var res = await Request().get(
       Api.videoTags,
-      queryParameters: {'bvid': bvid},
+      queryParameters: {'bvid': bvid, 'cid': ?cid},
     );
     if (res.data['code'] == 0) {
-      List<VideoTagItem>? list = (res.data['data'] as List?)
-          ?.map((e) => VideoTagItem.fromJson(e))
-          .toList();
-      return {'status': true, 'data': list};
+      return Success(
+        (res.data['data'] as List?)
+            ?.map((e) => VideoTagItem.fromJson(e))
+            .toList(),
+      );
     } else {
-      return {'status': false};
+      return const Error(null);
     }
   }
 
diff --git a/lib/main.dart b/lib/main.dart
index 1c34de2e3..8786c77dc 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -6,7 +6,7 @@ import 'package:PiliPlus/http/init.dart';
 import 'package:PiliPlus/models/common/theme/theme_color_type.dart';
 import 'package:PiliPlus/router/app_pages.dart';
 import 'package:PiliPlus/services/account_service.dart';
-import 'package:PiliPlus/services/loggeer.dart';
+import 'package:PiliPlus/services/logger.dart';
 import 'package:PiliPlus/services/service_locator.dart';
 import 'package:PiliPlus/utils/app_scheme.dart';
 import 'package:PiliPlus/utils/cache_manage.dart';
@@ -81,7 +81,7 @@ Commit Hash: ${BuildConfig.commitHash}''';
     final Catcher2Options debugConfig = Catcher2Options(
       SilentReportMode(),
       [
-        FileHandler(await getLogsPath()),
+        FileHandler(await LoggerUtils.getLogsPath()),
         ConsoleHandler(
           enableDeviceParameters: false,
           enableApplicationParameters: false,
@@ -96,7 +96,7 @@ Commit Hash: ${BuildConfig.commitHash}''';
     final Catcher2Options releaseConfig = Catcher2Options(
       SilentReportMode(),
       [
-        FileHandler(await getLogsPath()),
+        FileHandler(await LoggerUtils.getLogsPath()),
         ConsoleHandler(
           enableCustomParameters: true,
         ),
diff --git a/lib/models/common/stat_type.dart b/lib/models/common/stat_type.dart
index d43eaa886..228530f84 100644
--- a/lib/models/common/stat_type.dart
+++ b/lib/models/common/stat_type.dart
@@ -1,14 +1,15 @@
 import 'package:flutter/material.dart' show IconData, Icons;
 
 enum StatType {
-  view(Icons.remove_red_eye_outlined),
-  danmaku(Icons.subtitles_outlined),
-  like(Icons.thumb_up_outlined),
-  reply(Icons.comment_outlined),
-  follow(Icons.favorite_border),
-  play(Icons.play_circle_outlined),
-  listen(Icons.headset_outlined);
+  view(Icons.remove_red_eye_outlined, '观看'),
+  danmaku(Icons.subtitles_outlined, '弹幕'),
+  like(Icons.thumb_up_outlined, '点赞'),
+  reply(Icons.comment_outlined, '评论'),
+  follow(Icons.favorite_border, '关注'),
+  play(Icons.play_circle_outlined, '播放'),
+  listen(Icons.headset_outlined, '播放');
 
   final IconData iconData;
-  const StatType(this.iconData);
+  final String label;
+  const StatType(this.iconData, this.label);
 }
diff --git a/lib/models/dynamics/result.dart b/lib/models/dynamics/result.dart
index 96dc89c03..c6a2afdd2 100644
--- a/lib/models/dynamics/result.dart
+++ b/lib/models/dynamics/result.dart
@@ -118,7 +118,7 @@ class DynamicItemModel {
     idStr = json['item']?['id_str'];
     // type = json['type']; // int
     if (json['item']?['modules'] case List list) {
-      modules = ItemModulesModel.fromOpusJson(list.cast());
+      modules = ItemModulesModel.fromOpusJson(list);
     } else {
       modules = ItemModulesModel();
     }
@@ -181,8 +181,8 @@ class ItemModulesModel {
         : null;
   }
 
-  ItemModulesModel.fromOpusJson(List<Map<String, dynamic>> json) {
-    for (var i in json) {
+  ItemModulesModel.fromOpusJson(List json) {
+    for (Map<String, dynamic> i in json) {
       switch (i['module_type']) {
         case 'MODULE_TYPE_TOP':
           moduleTop = i['module_top'] == null
diff --git a/lib/models/dynamics/vote_model.dart b/lib/models/dynamics/vote_model.dart
index fbff1fbaa..5e2373606 100644
--- a/lib/models/dynamics/vote_model.dart
+++ b/lib/models/dynamics/vote_model.dart
@@ -1,3 +1,5 @@
+import 'package:PiliPlus/utils/extension.dart';
+
 class SimpleVoteInfo {
   int? choiceCnt;
   int? defaultShare;
@@ -73,7 +75,7 @@ class VoteInfo extends SimpleVoteInfo {
     title = json['title'];
     uid = json['vote_publisher'];
     ctime = json['ctime'];
-    myVotes = (json['my_votes'] as List?)?.cast(); // doVote
+    myVotes = (json['my_votes'] as List?)?.fromCast(); // doVote
     options =
         (json['options'] as List?)?.map((v) => Option.fromJson(v)).toList() ??
         <Option>[];
@@ -87,7 +89,7 @@ class VoteInfo extends SimpleVoteInfo {
 
   factory VoteInfo.fromSeparatedJson(Map<String, dynamic> json) {
     return VoteInfo.fromJson(json['vote_info'])
-      ..myVotes = (json['my_votes'] as List?)?.cast(); // voteInfo
+      ..myVotes = (json['my_votes'] as List?)?.fromCast(); // voteInfo
   }
 
   Map<String, dynamic> toJson() => {
diff --git a/lib/models/search/result.dart b/lib/models/search/result.dart
index 0faaaf1f2..aaaa5c199 100644
--- a/lib/models/search/result.dart
+++ b/lib/models/search/result.dart
@@ -425,7 +425,7 @@ class SearchArticleItemModel {
     subTitle = title.map((e) => e.text).join();
     rankOffset = json['rank_offset'];
     mid = json['mid'];
-    imageUrls = (json['image_urls'] as List?)?.cast();
+    imageUrls = (json['image_urls'] as List?)?.fromCast();
     id = json['id'];
     categoryId = json['category_id'];
     view = json['view'];
diff --git a/lib/models/user/info.dart b/lib/models/user/info.dart
index 3bf261a14..0e3f6edaf 100644
--- a/lib/models/user/info.dart
+++ b/lib/models/user/info.dart
@@ -1,3 +1,4 @@
+import 'package:PiliPlus/utils/extension.dart';
 import 'package:hive/hive.dart';
 
 part 'info.g.dart';
diff --git a/lib/models/user/info.g.dart b/lib/models/user/info.g.dart
index ce1744c2f..98199b60b 100644
--- a/lib/models/user/info.g.dart
+++ b/lib/models/user/info.g.dart
@@ -25,9 +25,9 @@ class UserInfoDataAdapter extends TypeAdapter<UserInfoData> {
       mobileVerified: fields[5] as int?,
       money: fields[6] as double?,
       moral: fields[7] as int?,
-      official: (fields[8] as Map?)?.cast<dynamic, dynamic>(),
-      officialVerify: (fields[9] as Map?)?.cast<dynamic, dynamic>(),
-      pendant: (fields[10] as Map?)?.cast<dynamic, dynamic>(),
+      official: (fields[8] as Map?)?.fromCast<dynamic, dynamic>(),
+      officialVerify: (fields[9] as Map?)?.fromCast<dynamic, dynamic>(),
+      pendant: (fields[10] as Map?)?.fromCast<dynamic, dynamic>(),
       scores: fields[11] as int?,
       uname: fields[12] as String?,
       vipDueDate: fields[13] as int?,
@@ -35,10 +35,10 @@ class UserInfoDataAdapter extends TypeAdapter<UserInfoData> {
       vipType: fields[15] as int?,
       vipPayType: fields[16] as int?,
       vipThemeType: fields[17] as int?,
-      vipLabel: (fields[18] as Map?)?.cast<dynamic, dynamic>(),
+      vipLabel: (fields[18] as Map?)?.fromCast<dynamic, dynamic>(),
       vipAvatarSub: fields[19] as int?,
       vipNicknameColor: fields[20] as String?,
-      wallet: (fields[21] as Map?)?.cast<dynamic, dynamic>(),
+      wallet: (fields[21] as Map?)?.fromCast<dynamic, dynamic>(),
       hasShop: fields[22] as bool?,
       shopUrl: fields[23] as String?,
       isSeniorMember: fields[24] as int?,
diff --git a/lib/models/video/play/url.dart b/lib/models/video/play/url.dart
index 879bd5432..4d19b3d3b 100644
--- a/lib/models/video/play/url.dart
+++ b/lib/models/video/play/url.dart
@@ -1,5 +1,6 @@
 import 'package:PiliPlus/models/common/video/audio_quality.dart';
 import 'package:PiliPlus/models/common/video/video_quality.dart';
+import 'package:PiliPlus/utils/extension.dart';
 
 class PlayUrlModel {
   PlayUrlModel({
@@ -172,7 +173,8 @@ abstract class BaseItem {
     id = json['id'];
     baseUrl = json['baseUrl'] ?? json['base_url'];
     final backupUrls =
-        ((json['backupUrl'] ?? json['backup_url']) as List?)?.cast<String>() ??
+        ((json['backupUrl'] ?? json['backup_url']) as List?)
+            ?.fromCast<String>() ??
         <String>[];
     backupUrl = backupUrls.isNotEmpty
         ? backupUrls.firstWhere(
@@ -248,7 +250,7 @@ class FormatItem {
     format = json['format'];
     newDesc = json['new_description'];
     displayDesc = json['display_desc'];
-    codecs = (json['codecs'] as List?)?.cast<String>();
+    codecs = (json['codecs'] as List?)?.fromCast<String>();
   }
 }
 
diff --git a/lib/models_new/article/article_info/data.dart b/lib/models_new/article/article_info/data.dart
index 5fe8b4086..4390a1b6f 100644
--- a/lib/models_new/article/article_info/data.dart
+++ b/lib/models_new/article/article_info/data.dart
@@ -1,5 +1,6 @@
 import 'package:PiliPlus/models_new/article/article_info/share_channel.dart';
 import 'package:PiliPlus/models_new/article/article_info/stats.dart';
+import 'package:PiliPlus/utils/extension.dart';
 
 class ArticleInfoData {
   int? like;
@@ -66,8 +67,8 @@ class ArticleInfoData {
         mid: json['mid'] as int?,
         authorName: json['author_name'] as String?,
         isAuthor: json['is_author'] as bool?,
-        imageUrls: (json['image_urls'] as List?)?.cast(),
-        originImageUrls: (json['origin_image_urls'] as List?)?.cast(),
+        imageUrls: (json['image_urls'] as List?)?.fromCast(),
+        originImageUrls: (json['origin_image_urls'] as List?)?.fromCast(),
         shareable: json['shareable'] as bool?,
         showLaterWatch: json['show_later_watch'] as bool?,
         showSmallWindow: json['show_small_window'] as bool?,
diff --git a/lib/models_new/article/article_list/article.dart b/lib/models_new/article/article_list/article.dart
index 22cf74c5e..18f1c892c 100644
--- a/lib/models_new/article/article_list/article.dart
+++ b/lib/models_new/article/article_list/article.dart
@@ -1,5 +1,6 @@
 import 'package:PiliPlus/models_new/article/article_list/category.dart';
 import 'package:PiliPlus/models_new/article/article_list/stats.dart';
+import 'package:PiliPlus/utils/extension.dart';
 
 class ArticleListItemModel {
   int? id;
@@ -45,7 +46,7 @@ class ArticleListItemModel {
         state: json['state'] as int?,
         publishTime: json['publish_time'] as int?,
         words: json['words'] as int?,
-        imageUrls: (json['image_urls'] as List?)?.cast(),
+        imageUrls: (json['image_urls'] as List?)?.fromCast(),
         category: json['category'] == null
             ? null
             : Category.fromJson(json['category'] as Map<String, dynamic>),
diff --git a/lib/models_new/article/article_list/last.dart b/lib/models_new/article/article_list/last.dart
index 66dea0970..3678509cb 100644
--- a/lib/models_new/article/article_list/last.dart
+++ b/lib/models_new/article/article_list/last.dart
@@ -1,4 +1,5 @@
 import 'package:PiliPlus/models_new/article/article_list/category.dart';
+import 'package:PiliPlus/utils/extension.dart';
 
 class Last {
   int? id;
@@ -39,7 +40,7 @@ class Last {
     state: json['state'] as int?,
     publishTime: json['publish_time'] as int?,
     words: json['words'] as int?,
-    imageUrls: (json['image_urls'] as List?)?.cast(),
+    imageUrls: (json['image_urls'] as List?)?.fromCast(),
     category: json['category'] == null
         ? null
         : Category.fromJson(json['category'] as Map<String, dynamic>),
diff --git a/lib/models_new/article/article_view/data.dart b/lib/models_new/article/article_view/data.dart
index 03e0005f0..70d2a9d34 100644
--- a/lib/models_new/article/article_view/data.dart
+++ b/lib/models_new/article/article_view/data.dart
@@ -5,6 +5,7 @@ import 'package:PiliPlus/models_new/article/article_view/ops.dart';
 import 'package:PiliPlus/models_new/article/article_view/opus.dart';
 import 'package:PiliPlus/models_new/article/article_view/stats.dart';
 import 'package:PiliPlus/models_new/article/article_view/tag.dart';
+import 'package:PiliPlus/utils/extension.dart';
 
 class ArticleViewData {
   int? id;
@@ -111,7 +112,7 @@ class ArticleViewData {
             ? null
             : Avatar.fromJson(json['author'] as Map<String, dynamic>),
         reprint: json['reprint'] as int?,
-        imageUrls: (json['image_urls'] as List?)?.cast(),
+        imageUrls: (json['image_urls'] as List?)?.fromCast(),
         publishTime: json['publish_time'] as int?,
         ctime: json['ctime'] as int?,
         mtime: json['mtime'] as int?,
@@ -122,7 +123,7 @@ class ArticleViewData {
             ?.map((e) => Tag.fromJson(e as Map<String, dynamic>))
             .toList(),
         words: json['words'] as int?,
-        originImageUrls: (json['origin_image_urls'] as List?)?.cast(),
+        originImageUrls: (json['origin_image_urls'] as List?)?.fromCast(),
         list: json['list'] as dynamic,
         isLike: json['is_like'] as bool?,
         media: json['media'] == null
diff --git a/lib/models_new/fav/fav_pgc/list.dart b/lib/models_new/fav/fav_pgc/list.dart
index e902670cc..b68bc095b 100644
--- a/lib/models_new/fav/fav_pgc/list.dart
+++ b/lib/models_new/fav/fav_pgc/list.dart
@@ -12,6 +12,7 @@ import 'package:PiliPlus/models_new/fav/fav_pgc/section.dart';
 import 'package:PiliPlus/models_new/fav/fav_pgc/series.dart';
 import 'package:PiliPlus/models_new/fav/fav_pgc/stat.dart';
 import 'package:PiliPlus/pages/common/multi_select/base.dart';
+import 'package:PiliPlus/utils/extension.dart';
 
 class FavPgcItemModel with MultiSelectData {
   int? seasonId;
@@ -194,7 +195,7 @@ class FavPgcItemModel with MultiSelectData {
         ?.map((e) => Producer.fromJson(e as Map<String, dynamic>))
         .toList(),
     summary: json['summary'] as String?,
-    styles: (json['styles'] as List?)?.cast(),
+    styles: (json['styles'] as List?)?.fromCast(),
     configAttrs: json['config_attrs'] == null
         ? null
         : ConfigAttrs.fromJson(json['config_attrs'] as Map<String, dynamic>),
diff --git a/lib/models_new/fav/fav_pgc/section.dart b/lib/models_new/fav/fav_pgc/section.dart
index 184b1504e..44941f5a3 100644
--- a/lib/models_new/fav/fav_pgc/section.dart
+++ b/lib/models_new/fav/fav_pgc/section.dart
@@ -1,3 +1,5 @@
+import 'package:PiliPlus/utils/extension.dart';
+
 class Section {
   int? sectionId;
   int? seasonId;
@@ -24,6 +26,6 @@ class Section {
     watchPlatform: json['watch_platform'] as int?,
     copyright: json['copyright'] as String?,
     banAreaShow: json['ban_area_show'] as int?,
-    episodeIds: (json['episode_ids'] as List?)?.cast(),
+    episodeIds: (json['episode_ids'] as List?)?.fromCast(),
   );
 }
diff --git a/lib/models_new/history/list.dart b/lib/models_new/history/list.dart
index 1633da42f..abecdf127 100644
--- a/lib/models_new/history/list.dart
+++ b/lib/models_new/history/list.dart
@@ -1,5 +1,6 @@
 import 'package:PiliPlus/models_new/history/history.dart';
 import 'package:PiliPlus/pages/common/multi_select/base.dart';
+import 'package:PiliPlus/utils/extension.dart';
 
 class HistoryItemModel with MultiSelectData {
   String? title;
@@ -57,7 +58,7 @@ class HistoryItemModel with MultiSelectData {
         title: json['title'] as String?,
         longTitle: json['long_title'] as String?,
         cover: json['cover'] as String?,
-        covers: (json['covers'] as List?)?.cast(),
+        covers: (json['covers'] as List?)?.fromCast(),
         uri: json['uri'] as String?,
         history: json['history'] == null
             ? History()
diff --git a/lib/models_new/live/live_danmaku/danmaku_msg.dart b/lib/models_new/live/live_danmaku/danmaku_msg.dart
new file mode 100644
index 000000000..ced02b091
--- /dev/null
+++ b/lib/models_new/live/live_danmaku/danmaku_msg.dart
@@ -0,0 +1,22 @@
+import 'package:PiliPlus/models_new/live/live_danmaku/live_emote.dart';
+
+class DanmakuMsg {
+  late String name;
+  late Object uid;
+  late String text;
+  Map<String, BaseEmote>? emots;
+  BaseEmote? uemote;
+
+  DanmakuMsg();
+
+  DanmakuMsg.fromPrefetch(Map<String, dynamic> obj) {
+    final user = obj['user'];
+    name = user['base']['name'];
+    uid = user['uid'];
+    text = obj['text'];
+    emots = (obj['emots'] as Map<String, dynamic>?)?.map((k, v) => MapEntry(k, BaseEmote.fromJson(v)));
+    if ((obj['emoticon']?['emoticon_unique'] as String?)?.isNotEmpty == true) {
+      uemote = BaseEmote.fromJson(obj['emoticon']);
+    }
+  }
+}
diff --git a/lib/models_new/live/live_danmaku/live_emote.dart b/lib/models_new/live/live_danmaku/live_emote.dart
new file mode 100644
index 000000000..17ec8aa3f
--- /dev/null
+++ b/lib/models_new/live/live_danmaku/live_emote.dart
@@ -0,0 +1,48 @@
+class BaseEmote {
+  late String url;
+  late String emoticonUnique;
+  late double width;
+  double? height;
+
+  BaseEmote.fromJson(Map<String, dynamic> json) {
+    url = json['url'];
+    emoticonUnique = json['emoticon_unique'];
+    width = (json['width'] as num).toDouble();
+    height = (json['height'] as num?)?.toDouble();
+  }
+}
+
+// class Emote extends BaseEmote {
+//   late int count;
+//   late String descript;
+//   late String emoji;
+//   late int emoticonId;
+// }
+
+/*
+{
+  "bulge_display": 1,
+  "emoticon_unique": "upower_[{{emote}}]",
+  "height": {{height}},
+  "in_player_area": 1,
+  "is_dynamic": 0, // 0 or 1
+  "url": "{{url}}",
+  "width": {{width}}
+}
+
+{
+  "bulge_display": 1,
+  "emoticon_unique": "room_{{room_id}}_{{int}}",
+  "height": {{height}},
+  "in_player_area": 1,
+  "is_dynamic": 1,
+  "url": "{{url}}",
+  "width": {{width}}
+}
+
+*/
+// class Uemote extends BaseEmote {
+//   late int bulgeDisplay;
+//   late int inPlayerArea;
+//   late int isDynamic;
+// }
diff --git a/lib/models_new/live/live_dm_block/shield_info.dart b/lib/models_new/live/live_dm_block/shield_info.dart
index 537cb4e72..3d7693133 100644
--- a/lib/models_new/live/live_dm_block/shield_info.dart
+++ b/lib/models_new/live/live_dm_block/shield_info.dart
@@ -1,5 +1,6 @@
 import 'package:PiliPlus/models_new/live/live_dm_block/shield_rules.dart';
 import 'package:PiliPlus/models_new/live/live_dm_block/shield_user_list.dart';
+import 'package:PiliPlus/utils/extension.dart';
 
 class ShieldInfo {
   List<ShieldUserList>? shieldUserList;
@@ -20,7 +21,7 @@ class ShieldInfo {
     shieldUserList: (json['shield_user_list'] as List<dynamic>?)
         ?.map((e) => ShieldUserList.fromJson(e as Map<String, dynamic>))
         .toList(),
-    keywordList: (json['keyword_list'] as List?)?.cast(),
+    keywordList: (json['keyword_list'] as List?)?.fromCast(),
     shieldRules: json['shield_rules'] == null
         ? null
         : ShieldRules.fromJson(json['shield_rules'] as Map<String, dynamic>),
diff --git a/lib/models_new/live/live_room_info_h5/like_info_v3.dart b/lib/models_new/live/live_room_info_h5/like_info_v3.dart
index ffcaf268e..d551c8578 100644
--- a/lib/models_new/live/live_room_info_h5/like_info_v3.dart
+++ b/lib/models_new/live/live_room_info_h5/like_info_v3.dart
@@ -1,3 +1,5 @@
+import 'package:PiliPlus/utils/extension.dart';
+
 class LikeInfoV3 {
   int? totalLikes;
   bool? clickBlock;
@@ -50,8 +52,8 @@ class LikeInfoV3 {
     guildEmoText: json['guild_emo_text'] as String?,
     guildDmText: json['guild_dm_text'] as String?,
     likeDmText: json['like_dm_text'] as String?,
-    handIcons: (json['hand_icons'] as List?)?.cast(),
-    dmIcons: (json['dm_icons'] as List?)?.cast(),
+    handIcons: (json['hand_icons'] as List?)?.fromCast(),
+    dmIcons: (json['dm_icons'] as List?)?.fromCast(),
     eggshellsIcon: json['eggshells_icon'] as String?,
     countShowTime: json['count_show_time'] as int?,
     processIcon: json['process_icon'] as String?,
@@ -62,7 +64,7 @@ class LikeInfoV3 {
     icon: json['icon'] as String?,
     cooldown: (json['cooldown'] as num?)?.toDouble(),
     handUseFace: json['hand_use_face'] as bool?,
-    guideIconUrls: (json['guide_icon_urls'] as List?)?.cast(),
+    guideIconUrls: (json['guide_icon_urls'] as List?)?.fromCast(),
     guideIconRatio: (json['guide_icon_ratio'] as num?)?.toDouble(),
   );
 }
diff --git a/lib/models_new/live/live_room_play_info/codec.dart b/lib/models_new/live/live_room_play_info/codec.dart
index c8a082f1c..a74c38b89 100644
--- a/lib/models_new/live/live_room_play_info/codec.dart
+++ b/lib/models_new/live/live_room_play_info/codec.dart
@@ -1,4 +1,5 @@
 import 'package:PiliPlus/models_new/live/live_room_play_info/url_info.dart';
+import 'package:PiliPlus/utils/extension.dart';
 
 class CodecItem {
   String? codecName;
@@ -26,7 +27,7 @@ class CodecItem {
   factory CodecItem.fromJson(Map<String, dynamic> json) => CodecItem(
     codecName: json['codec_name'] as String?,
     currentQn: json['current_qn'] as int?,
-    acceptQn: (json['accept_qn'] as List?)?.cast(),
+    acceptQn: (json['accept_qn'] as List?)?.fromCast(),
     baseUrl: json['base_url'] as String?,
     urlInfo: (json['url_info'] as List<dynamic>?)
         ?.map((e) => UrlInfo.fromJson(e as Map<String, dynamic>))
diff --git a/lib/models_new/reply/cursor.dart b/lib/models_new/reply/cursor.dart
index 03be1a4d7..4477310ea 100644
--- a/lib/models_new/reply/cursor.dart
+++ b/lib/models_new/reply/cursor.dart
@@ -1,4 +1,5 @@
 import 'package:PiliPlus/models_new/reply/pagination_reply.dart';
+import 'package:PiliPlus/utils/extension.dart';
 
 class ReplyCursor {
   bool? isBegin;
@@ -41,7 +42,7 @@ class ReplyCursor {
     mode: json['mode'] as int?,
     modeText: json['mode_text'] as String?,
     allCount: json['all_count'] as int?,
-    supportMode: (json['support_mode'] as List?)?.cast(),
+    supportMode: (json['support_mode'] as List?)?.fromCast(),
     name: json['name'] as String?,
   );
 }
diff --git a/lib/models_new/space/space_article/item.dart b/lib/models_new/space/space_article/item.dart
index c8a9ac5c1..48fe8752a 100644
--- a/lib/models_new/space/space_article/item.dart
+++ b/lib/models_new/space/space_article/item.dart
@@ -2,6 +2,7 @@ import 'package:PiliPlus/models_new/space/space_article/author.dart';
 import 'package:PiliPlus/models_new/space/space_article/category.dart';
 import 'package:PiliPlus/models_new/space/space_article/media.dart';
 import 'package:PiliPlus/models_new/space/space_article/stats.dart';
+import 'package:PiliPlus/utils/extension.dart';
 
 class SpaceArticleItem {
   int? id;
@@ -100,7 +101,7 @@ class SpaceArticleItem {
             ? null
             : Author.fromJson(json['author'] as Map<String, dynamic>),
         reprint: json['reprint'] as int?,
-        imageUrls: (json['image_urls'] as List?)?.cast(),
+        imageUrls: (json['image_urls'] as List?)?.fromCast(),
         publishTime: json['publish_time'] as int?,
         ctime: json['ctime'] as int?,
         mtime: json['mtime'] as int?,
@@ -109,7 +110,7 @@ class SpaceArticleItem {
             : Stats.fromJson(json['stats'] as Map<String, dynamic>),
         attributes: json['attributes'] as int?,
         words: json['words'] as int?,
-        originImageUrls: (json['origin_image_urls'] as List?)?.cast(),
+        originImageUrls: (json['origin_image_urls'] as List?)?.fromCast(),
         list: json['list'] as dynamic,
         isLike: json['is_like'] as bool?,
         media: json['media'] == null
diff --git a/lib/models_new/space/space_cheese/item.dart b/lib/models_new/space/space_cheese/item.dart
index 6e279c27c..3f8f8d573 100644
--- a/lib/models_new/space/space_cheese/item.dart
+++ b/lib/models_new/space/space_cheese/item.dart
@@ -1,3 +1,5 @@
+import 'package:PiliPlus/utils/extension.dart';
+
 class SpaceCheeseItem {
   bool? cooperated;
   String? cooperationMark;
@@ -36,7 +38,7 @@ class SpaceCheeseItem {
         cover: json['cover'] as String?,
         epCount: json['ep_count'] as int?,
         link: json['link'] as String?,
-        marks: (json['marks'] as List?)?.cast(),
+        marks: (json['marks'] as List?)?.fromCast(),
         page: json['page'] as int?,
         play: json['play'] as int?,
         seasonId: json['season_id'] as int?,
diff --git a/lib/models_new/space/space_season_series/season.dart b/lib/models_new/space/space_season_series/season.dart
index 9af14aa21..352d96cbb 100644
--- a/lib/models_new/space/space_season_series/season.dart
+++ b/lib/models_new/space/space_season_series/season.dart
@@ -1,5 +1,6 @@
 import 'package:PiliPlus/models_new/space/space_season_series/archive.dart';
 import 'package:PiliPlus/models_new/space/space_season_series/stat.dart';
+import 'package:PiliPlus/utils/extension.dart';
 
 class SpaceSsModel {
   List<SpaceSsArchive>? archives;
@@ -17,6 +18,6 @@ class SpaceSsModel {
         ?.map((e) => SpaceSsArchive.fromJson(e))
         .toList(),
     meta: json["meta"] == null ? null : SpaceSsMeta.fromJson(json["meta"]),
-    recentAids: (json["recent_aids"] as List?)?.cast(),
+    recentAids: (json["recent_aids"] as List?)?.fromCast(),
   );
 }
diff --git a/lib/models_new/upower_rank/data.dart b/lib/models_new/upower_rank/data.dart
index ddb69ed3e..351aa9121 100644
--- a/lib/models_new/upower_rank/data.dart
+++ b/lib/models_new/upower_rank/data.dart
@@ -2,6 +2,7 @@ import 'package:PiliPlus/models_new/upower_rank/level_info.dart';
 import 'package:PiliPlus/models_new/upower_rank/rank_info.dart';
 import 'package:PiliPlus/models_new/upower_rank/up_info.dart';
 import 'package:PiliPlus/models_new/upower_rank/user_info.dart';
+import 'package:PiliPlus/utils/extension.dart';
 
 class UpowerRankData {
   UpInfo? upInfo;
@@ -37,7 +38,7 @@ class UpowerRankData {
     memberTotal: json['member_total'] as int?,
     privilegeType: json['privilege_type'] as int?,
     isCharge: json['is_charge'] as bool?,
-    tabs: (json['tabs'] as List?)?.cast(),
+    tabs: (json['tabs'] as List?)?.fromCast(),
     levelInfo: (json['level_info'] as List<dynamic>?)
         ?.map((e) => LevelInfo.fromJson(e as Map<String, dynamic>))
         .toList(),
diff --git a/lib/models_new/video/video_shot/data.dart b/lib/models_new/video/video_shot/data.dart
index e61950cf0..71e2adda6 100644
--- a/lib/models_new/video/video_shot/data.dart
+++ b/lib/models_new/video/video_shot/data.dart
@@ -29,6 +29,6 @@ class VideoShotData {
     image: (json["image"] as List)
         .map((e) => (e as String).http2https)
         .toList(),
-    index: (json["index"] as List).cast(),
+    index: (json["index"] as List).fromCast(),
   );
 }
diff --git a/lib/pages/about/view.dart b/lib/pages/about/view.dart
index 4570172c5..64c4277ec 100644
--- a/lib/pages/about/view.dart
+++ b/lib/pages/about/view.dart
@@ -5,7 +5,7 @@ import 'dart:io';
 import 'package:PiliPlus/build_config.dart';
 import 'package:PiliPlus/common/widgets/dialog/dialog.dart';
 import 'package:PiliPlus/pages/mine/controller.dart';
-import 'package:PiliPlus/services/loggeer.dart';
+import 'package:PiliPlus/services/logger.dart';
 import 'package:PiliPlus/utils/accounts.dart';
 import 'package:PiliPlus/utils/accounts/account.dart';
 import 'package:PiliPlus/utils/cache_manage.dart';
@@ -194,7 +194,7 @@ Commit Hash: ${BuildConfig.commitHash}''',
           ),
           ListTile(
             onTap: () => Get.toNamed('/logs'),
-            onLongPress: clearLogs,
+            onLongPress: LoggerUtils.clearLogs,
             leading: const Icon(Icons.bug_report_outlined),
             title: const Text('错误日志'),
             subtitle: Text('长按清除日志', style: subTitleStyle),
diff --git a/lib/pages/article/controller.dart b/lib/pages/article/controller.dart
index 4d9d8aff8..ad3846791 100644
--- a/lib/pages/article/controller.dart
+++ b/lib/pages/article/controller.dart
@@ -1,9 +1,7 @@
 import 'package:PiliPlus/grpc/bilibili/main/community/reply/v1.pb.dart'
     show MainListReply, ReplyInfo;
-import 'package:PiliPlus/grpc/reply.dart';
 import 'package:PiliPlus/http/dynamics.dart';
 import 'package:PiliPlus/http/fav.dart';
-import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/http/video.dart';
 import 'package:PiliPlus/models/dynamics/article_content_model.dart'
     show ArticleContentModel;
@@ -19,7 +17,7 @@ import 'package:PiliPlus/utils/url_utils.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 
-class ArticleController extends CommonDynController<MainListReply> {
+class ArticleController extends CommonDynController {
   late String id;
   late String type;
 
@@ -175,15 +173,6 @@ class ArticleController extends CommonDynController<MainListReply> {
     return response.replies;
   }
 
-  @override
-  Future<LoadingState<MainListReply>> customGetData() => ReplyGrpc.mainList(
-    type: commentType,
-    oid: commentId,
-    mode: mode.value,
-    cursorNext: cursorNext,
-    offset: paginationReply?.nextOffset,
-  );
-
   Future<void> onFav() async {
     final favorite = stats.value?.favorite;
     bool isFav = favorite?.status == true;
diff --git a/lib/pages/article/view.dart b/lib/pages/article/view.dart
index 7a294d1db..1718b229a 100644
--- a/lib/pages/article/view.dart
+++ b/lib/pages/article/view.dart
@@ -21,13 +21,10 @@ import 'package:PiliPlus/pages/common/dyn/common_dyn_page.dart';
 import 'package:PiliPlus/pages/dynamics_repost/view.dart';
 import 'package:PiliPlus/pages/video/reply/widgets/reply_item_grpc.dart';
 import 'package:PiliPlus/utils/date_util.dart';
-import 'package:PiliPlus/utils/feed_back.dart';
 import 'package:PiliPlus/utils/grid.dart';
 import 'package:PiliPlus/utils/image_util.dart';
 import 'package:PiliPlus/utils/num_util.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
-import 'package:PiliPlus/utils/storage.dart';
-import 'package:PiliPlus/utils/storage_key.dart';
 import 'package:PiliPlus/utils/utils.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
@@ -36,7 +33,7 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart' hide ContextExtensionss;
 import 'package:html/parser.dart' as parser;
 
-class ArticlePage extends CommonDynPage {
+class ArticlePage extends StatefulWidget {
   const ArticlePage({super.key});
 
   @override
@@ -479,49 +476,7 @@ class _ArticlePageState extends CommonDynPageState<ArticlePage> {
     }),
     actions: [
       const SizedBox(width: 4),
-      if (!isPortrait)
-        IconButton(
-          tooltip: '页面比例调节',
-          onPressed: () => showDialog(
-            context: context,
-            builder: (context) => Align(
-              alignment: Alignment.topRight,
-              child: Container(
-                margin: const EdgeInsets.only(
-                  top: 56,
-                  right: 16,
-                ),
-                width: maxWidth / 4,
-                height: 32,
-                child: Builder(
-                  builder: (context) => Slider(
-                    min: 1,
-                    max: 100,
-                    value: controller.ratio.first,
-                    onChanged: (value) {
-                      if (value >= 10 && value <= 90) {
-                        value = value.toPrecision(2);
-                        controller.ratio
-                          ..[0] = value
-                          ..[1] = 100 - value;
-                        GStorage.setting.put(
-                          SettingBoxKey.dynamicDetailRatio,
-                          controller.ratio,
-                        );
-                        (context as Element).markNeedsBuild();
-                        setState(() {});
-                      }
-                    },
-                  ),
-                ),
-              ),
-            ),
-          ),
-          icon: Transform.rotate(
-            angle: pi / 2,
-            child: const Icon(Icons.splitscreen, size: 19),
-          ),
-        ),
+      if (!isPortrait) ratioWidget(maxWidth),
       IconButton(
         tooltip: '浏览器打开',
         onPressed: () => PageUtils.inAppWebview(controller.url),
@@ -605,20 +560,6 @@ class _ArticlePageState extends CommonDynPageState<ArticlePage> {
       position: controller.fabAnim,
       child: Builder(
         builder: (context) {
-          Widget button() => FloatingActionButton(
-            heroTag: null,
-            onPressed: () {
-              feedBack();
-              controller.onReply(
-                context,
-                oid: controller.commentId,
-                replyType: controller.commentType,
-              );
-            },
-            tooltip: '评论动态',
-            child: const Icon(Icons.reply),
-          );
-
           if (!controller.showDynActionBar) {
             return Align(
               alignment: Alignment.bottomRight,
@@ -627,7 +568,7 @@ class _ArticlePageState extends CommonDynPageState<ArticlePage> {
                   right: 14,
                   bottom: padding.bottom + 14,
                 ),
-                child: button(),
+                child: replyButton,
               ),
             );
           }
@@ -671,7 +612,7 @@ class _ArticlePageState extends CommonDynPageState<ArticlePage> {
                 right: 14,
                 bottom: 14 + (stats != null ? 0 : padding.bottom),
               ),
-              child: button(),
+              child: replyButton,
             );
 
             if (stats == null) {
diff --git a/lib/pages/common/common_intro_controller.dart b/lib/pages/common/common_intro_controller.dart
index d35eca4c4..d9a82c054 100644
--- a/lib/pages/common/common_intro_controller.dart
+++ b/lib/pages/common/common_intro_controller.dart
@@ -276,12 +276,8 @@ abstract class CommonIntroController extends GetxController {
   }
 
   Future<void> queryVideoTags() async {
-    var result = await UserHttp.videoTags(bvid: bvid);
-    if (result['status']) {
-      videoTags.value = result['data'];
-    } else {
-      videoTags.value = null;
-    }
+    final result = await UserHttp.videoTags(bvid: bvid, cid: cid.value);
+    videoTags.value = result.dataOrNull;
   }
 
   Future<void> viewLater() async {
diff --git a/lib/pages/common/common_page.dart b/lib/pages/common/common_page.dart
index 40cae3e49..221b565e3 100644
--- a/lib/pages/common/common_page.dart
+++ b/lib/pages/common/common_page.dart
@@ -8,11 +8,10 @@ import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:get/get.dart';
 
-abstract class CommonPage extends StatefulWidget {
-  const CommonPage({super.key});
-}
-
-abstract class CommonPageState<T extends CommonPage, R extends CommonController>
+abstract class CommonPageState<
+  T extends StatefulWidget,
+  R extends CommonController
+>
     extends State<T> {
   R get controller;
   StreamController<bool>? mainStream;
diff --git a/lib/pages/common/dyn/common_dyn_controller.dart b/lib/pages/common/dyn/common_dyn_controller.dart
index 00bca0be8..917a97217 100644
--- a/lib/pages/common/dyn/common_dyn_controller.dart
+++ b/lib/pages/common/dyn/common_dyn_controller.dart
@@ -1,10 +1,13 @@
+import 'package:PiliPlus/grpc/bilibili/main/community/reply/v1.pb.dart';
+import 'package:PiliPlus/grpc/reply.dart';
+import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/pages/common/reply_controller.dart';
 import 'package:PiliPlus/utils/storage_pref.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart' show ScrollDirection;
 import 'package:get/get.dart';
 
-abstract class CommonDynController<R> extends ReplyController<R>
+abstract class CommonDynController extends ReplyController<MainListReply>
     with GetSingleTickerProviderStateMixin {
   int get oid;
   int get replyType;
@@ -77,4 +80,13 @@ abstract class CommonDynController<R> extends ReplyController<R>
     scrollController.removeListener(listener);
     super.onClose();
   }
+
+  @override
+  Future<LoadingState<MainListReply>> customGetData() => ReplyGrpc.mainList(
+    type: replyType,
+    oid: oid,
+    mode: mode.value,
+    cursorNext: cursorNext,
+    offset: paginationReply?.nextOffset,
+  );
 }
diff --git a/lib/pages/common/dyn/common_dyn_page.dart b/lib/pages/common/dyn/common_dyn_page.dart
index d9df85cf4..463bc6495 100644
--- a/lib/pages/common/dyn/common_dyn_page.dart
+++ b/lib/pages/common/dyn/common_dyn_page.dart
@@ -1,3 +1,5 @@
+import 'dart:math' show pi;
+
 import 'package:PiliPlus/common/skeleton/video_reply.dart';
 import 'package:PiliPlus/common/widgets/custom_sliver_persistent_header_delegate.dart';
 import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart';
@@ -8,17 +10,16 @@ import 'package:PiliPlus/pages/common/dyn/common_dyn_controller.dart';
 import 'package:PiliPlus/pages/video/reply/widgets/reply_item_grpc.dart';
 import 'package:PiliPlus/pages/video/reply_reply/view.dart';
 import 'package:PiliPlus/utils/context_ext.dart';
+import 'package:PiliPlus/utils/feed_back.dart';
 import 'package:PiliPlus/utils/num_util.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
+import 'package:PiliPlus/utils/storage.dart';
+import 'package:PiliPlus/utils/storage_key.dart';
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart' hide ContextExtensionss;
 
-abstract class CommonDynPage extends StatefulWidget {
-  const CommonDynPage({super.key});
-}
-
-abstract class CommonDynPageState<T extends CommonDynPage> extends State<T>
+abstract class CommonDynPageState<T extends StatefulWidget> extends State<T>
     with TickerProviderStateMixin {
   CommonDynController get controller;
 
@@ -226,4 +227,61 @@ abstract class CommonDynPageState<T extends CommonDynPage> extends State<T>
       }
     });
   }
+
+  Widget ratioWidget(double maxWidth) => IconButton(
+    tooltip: '页面比例调节',
+    onPressed: () => showDialog(
+      context: context,
+      builder: (context) => Align(
+        alignment: Alignment.topRight,
+        child: Container(
+          margin: const EdgeInsets.only(
+            top: 56,
+            right: 16,
+          ),
+          width: maxWidth / 4,
+          height: 32,
+          child: Builder(
+            builder: (context) => Slider(
+              min: 1,
+              max: 100,
+              value: controller.ratio.first,
+              onChanged: (value) {
+                if (value >= 10 && value <= 90) {
+                  value = value.toPrecision(2);
+                  controller.ratio
+                    ..[0] = value
+                    ..[1] = 100 - value;
+                  GStorage.setting.put(
+                    SettingBoxKey.dynamicDetailRatio,
+                    controller.ratio,
+                  );
+                  (context as Element).markNeedsBuild();
+                  setState(() {});
+                }
+              },
+            ),
+          ),
+        ),
+      ),
+    ),
+    icon: Transform.rotate(
+      angle: pi / 2,
+      child: const Icon(Icons.splitscreen, size: 19),
+    ),
+  );
+
+  Widget get replyButton => FloatingActionButton(
+    heroTag: null,
+    onPressed: () {
+      feedBack();
+      controller.onReply(
+        context,
+        oid: controller.oid,
+        replyType: controller.replyType,
+      );
+    },
+    tooltip: '评论',
+    child: const Icon(Icons.reply),
+  );
 }
diff --git a/lib/pages/dynamics/controller.dart b/lib/pages/dynamics/controller.dart
index b7666c632..f6213e9fc 100644
--- a/lib/pages/dynamics/controller.dart
+++ b/lib/pages/dynamics/controller.dart
@@ -136,7 +136,7 @@ class DynamicsController extends GetxController
 
         final list = data.upList;
         _cacheUpList = List<UpItem>.from(list);
-        list.addAll(list1..removeWhere((e) => list.contains(e)));
+        list.addAll(list1..removeWhere(list.contains));
       }
       upState.value = Success(data);
     } else {
diff --git a/lib/pages/dynamics_detail/controller.dart b/lib/pages/dynamics_detail/controller.dart
index fda4f1092..0dd11f4de 100644
--- a/lib/pages/dynamics_detail/controller.dart
+++ b/lib/pages/dynamics_detail/controller.dart
@@ -1,8 +1,6 @@
 import 'package:PiliPlus/grpc/bilibili/main/community/reply/v1.pb.dart'
     show MainListReply, ReplyInfo;
-import 'package:PiliPlus/grpc/reply.dart';
 import 'package:PiliPlus/http/dynamics.dart';
-import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/models/dynamics/result.dart';
 import 'package:PiliPlus/pages/common/dyn/common_dyn_controller.dart';
 import 'package:PiliPlus/utils/id_utils.dart';
@@ -10,7 +8,7 @@ import 'package:PiliPlus/utils/storage_pref.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 
-class DynamicDetailController extends CommonDynController<MainListReply> {
+class DynamicDetailController extends CommonDynController {
   @override
   late int oid;
   @override
@@ -54,13 +52,4 @@ class DynamicDetailController extends CommonDynController<MainListReply> {
   List<ReplyInfo>? getDataList(MainListReply response) {
     return response.replies;
   }
-
-  @override
-  Future<LoadingState<MainListReply>> customGetData() => ReplyGrpc.mainList(
-    type: replyType,
-    oid: oid,
-    mode: mode.value,
-    cursorNext: cursorNext,
-    offset: paginationReply?.nextOffset,
-  );
 }
diff --git a/lib/pages/dynamics_detail/view.dart b/lib/pages/dynamics_detail/view.dart
index 51382d334..3b8a92787 100644
--- a/lib/pages/dynamics_detail/view.dart
+++ b/lib/pages/dynamics_detail/view.dart
@@ -9,18 +9,15 @@ import 'package:PiliPlus/pages/dynamics/widgets/author_panel.dart';
 import 'package:PiliPlus/pages/dynamics/widgets/dynamic_panel.dart';
 import 'package:PiliPlus/pages/dynamics_detail/controller.dart';
 import 'package:PiliPlus/pages/dynamics_repost/view.dart';
-import 'package:PiliPlus/utils/feed_back.dart';
 import 'package:PiliPlus/utils/grid.dart';
 import 'package:PiliPlus/utils/num_util.dart';
 import 'package:PiliPlus/utils/request_utils.dart';
-import 'package:PiliPlus/utils/storage.dart';
-import 'package:PiliPlus/utils/storage_key.dart';
 import 'package:PiliPlus/utils/utils.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart' hide ContextExtensionss;
 
-class DynamicDetailPage extends CommonDynPage {
+class DynamicDetailPage extends StatefulWidget {
   const DynamicDetailPage({super.key});
 
   @override
@@ -94,45 +91,7 @@ class _DynamicDetailPageState extends CommonDynPageState<DynamicDetailPage> {
     actions: isPortrait
         ? null
         : [
-            IconButton(
-              tooltip: '页面比例调节',
-              onPressed: () => showDialog(
-                context: context,
-                builder: (context) => Align(
-                  alignment: Alignment.topRight,
-                  child: Container(
-                    margin: const EdgeInsets.only(top: 56, right: 16),
-                    width: maxWidth / 4,
-                    height: 32,
-                    child: Builder(
-                      builder: (context) => Slider(
-                        min: 1,
-                        max: 100,
-                        value: controller.ratio.first,
-                        onChanged: (value) {
-                          if (value >= 10 && value <= 90) {
-                            value = value.toPrecision(2);
-                            controller.ratio
-                              ..[0] = value
-                              ..[1] = 100 - value;
-                            GStorage.setting.put(
-                              SettingBoxKey.dynamicDetailRatio,
-                              controller.ratio,
-                            );
-                            (context as Element).markNeedsBuild();
-                            setState(() {});
-                          }
-                        },
-                      ),
-                    ),
-                  ),
-                ),
-              ),
-              icon: Transform.rotate(
-                angle: pi / 2,
-                child: const Icon(Icons.splitscreen, size: 19),
-              ),
-            ),
+            ratioWidget(maxWidth),
             const SizedBox(width: 16),
           ],
   );
@@ -237,20 +196,6 @@ class _DynamicDetailPageState extends CommonDynPageState<DynamicDetailPage> {
         position: controller.fabAnim,
         child: Builder(
           builder: (context) {
-            Widget button() => FloatingActionButton(
-              heroTag: null,
-              onPressed: () {
-                feedBack();
-                controller.onReply(
-                  context,
-                  oid: controller.oid,
-                  replyType: controller.replyType,
-                );
-              },
-              tooltip: '评论动态',
-              child: const Icon(Icons.reply),
-            );
-
             if (!controller.showDynActionBar) {
               return Align(
                 alignment: Alignment.bottomRight,
@@ -259,7 +204,7 @@ class _DynamicDetailPageState extends CommonDynPageState<DynamicDetailPage> {
                     right: 14,
                     bottom: padding.bottom + 14,
                   ),
-                  child: button(),
+                  child: replyButton,
                 ),
               );
             }
@@ -302,7 +247,7 @@ class _DynamicDetailPageState extends CommonDynPageState<DynamicDetailPage> {
               children: [
                 Padding(
                   padding: const EdgeInsets.only(right: 14, bottom: 14),
-                  child: button(),
+                  child: replyButton,
                 ),
                 Container(
                   decoration: BoxDecoration(
diff --git a/lib/pages/dynamics_tab/view.dart b/lib/pages/dynamics_tab/view.dart
index 7aa8aa602..7258f3291 100644
--- a/lib/pages/dynamics_tab/view.dart
+++ b/lib/pages/dynamics_tab/view.dart
@@ -18,7 +18,7 @@ import 'package:get/get.dart';
 import 'package:waterfall_flow/waterfall_flow.dart'
     hide SliverWaterfallFlowDelegateWithMaxCrossAxisExtent;
 
-class DynamicsTabPage extends CommonPage {
+class DynamicsTabPage extends StatefulWidget {
   const DynamicsTabPage({super.key, required this.dynamicsType});
 
   final DynamicsTabType dynamicsType;
diff --git a/lib/pages/group_panel/view.dart b/lib/pages/group_panel/view.dart
index 7a3eb751a..190840722 100644
--- a/lib/pages/group_panel/view.dart
+++ b/lib/pages/group_panel/view.dart
@@ -26,7 +26,9 @@ class GroupPanel extends StatefulWidget {
 class _GroupPanelState extends State<GroupPanel> {
   LoadingState<List<MemberTagItemModel>> loadingState = LoadingState.loading();
   RxBool showDefaultBtn = true.obs;
-  late final Set<int> tags = widget.tags?.cast<int>().toSet() ?? {};
+  late final Set<int> tags = widget.tags == null
+      ? {}
+      : Set<int>.from(widget.tags!);
 
   @override
   void initState() {
diff --git a/lib/pages/home/controller.dart b/lib/pages/home/controller.dart
index 0753af5e5..d7f1deaae 100644
--- a/lib/pages/home/controller.dart
+++ b/lib/pages/home/controller.dart
@@ -6,6 +6,8 @@ import 'package:PiliPlus/http/init.dart';
 import 'package:PiliPlus/models/common/home_tab_type.dart';
 import 'package:PiliPlus/pages/common/common_controller.dart';
 import 'package:PiliPlus/services/account_service.dart';
+import 'package:PiliPlus/utils/storage.dart';
+import 'package:PiliPlus/utils/storage_key.dart';
 import 'package:PiliPlus/utils/storage_pref.dart';
 import 'package:flutter/foundation.dart' show kDebugMode;
 import 'package:flutter/material.dart';
@@ -55,13 +57,16 @@ class HomeController extends GetxController
   }
 
   void setTabConfig() {
-    tabs =
-        Pref.tabbarSort?.map((i) => HomeTabType.values[i]).toList() ??
-        HomeTabType.values;
+    final tabs = GStorage.setting.get(SettingBoxKey.tabBarSort) as List?;
+    if (tabs != null) {
+      this.tabs = tabs.map((i) => HomeTabType.values[i]).toList();
+    } else {
+      this.tabs = HomeTabType.values;
+    }
 
     tabController = TabController(
-      initialIndex: max(0, tabs.indexOf(HomeTabType.rcmd)),
-      length: tabs.length,
+      initialIndex: max(0, this.tabs.indexOf(HomeTabType.rcmd)),
+      length: this.tabs.length,
       vsync: this,
     );
   }
diff --git a/lib/pages/hot/view.dart b/lib/pages/hot/view.dart
index 9b79a50f1..b4856b6ec 100644
--- a/lib/pages/hot/view.dart
+++ b/lib/pages/hot/view.dart
@@ -15,7 +15,7 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
-class HotPage extends CommonPage {
+class HotPage extends StatefulWidget {
   const HotPage({super.key});
 
   @override
diff --git a/lib/pages/live/view.dart b/lib/pages/live/view.dart
index c101c05d6..259bdaaf9 100644
--- a/lib/pages/live/view.dart
+++ b/lib/pages/live/view.dart
@@ -21,7 +21,7 @@ import 'package:PiliPlus/utils/page_utils.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
-class LivePage extends CommonPage {
+class LivePage extends StatefulWidget {
   const LivePage({super.key});
 
   @override
diff --git a/lib/pages/live_room/controller.dart b/lib/pages/live_room/controller.dart
index 38bec011b..48b51f785 100644
--- a/lib/pages/live_room/controller.dart
+++ b/lib/pages/live_room/controller.dart
@@ -6,6 +6,8 @@ import 'package:PiliPlus/http/constants.dart';
 import 'package:PiliPlus/http/live.dart';
 import 'package:PiliPlus/http/video.dart';
 import 'package:PiliPlus/models/common/video/live_quality.dart';
+import 'package:PiliPlus/models_new/live/live_danmaku/danmaku_msg.dart';
+import 'package:PiliPlus/models_new/live/live_danmaku/live_emote.dart';
 import 'package:PiliPlus/models_new/live/live_dm_info/data.dart';
 import 'package:PiliPlus/models_new/live/live_room_info_h5/data.dart';
 import 'package:PiliPlus/models_new/live/live_room_play_info/codec.dart';
@@ -22,6 +24,7 @@ import 'package:PiliPlus/utils/video_utils.dart';
 import 'package:canvas_danmaku/canvas_danmaku.dart';
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:easy_debounce/easy_throttle.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
@@ -60,7 +63,7 @@ class LiveRoomController extends GetxController {
   // dm
   LiveDmInfoData? dmInfo;
   List<RichTextItem>? savedDanmaku;
-  RxList<dynamic> messages = [].obs;
+  RxList<DanmakuMsg> messages = <DanmakuMsg>[].obs;
   RxBool disableAutoScroll = false.obs;
   LiveMessageStream? _msgStream;
   late final ScrollController scrollController = ScrollController()
@@ -214,20 +217,12 @@ class LiveRoomController extends GetxController {
           if (v['data'] case List list) {
             try {
               messages.addAll(
-                list.map(
-                  (obj) => {
-                    'name': obj['user']['base']['name'],
-                    'uid': obj['user']['uid'],
-                    'text': obj['text'],
-                    'emots': obj['emots'],
-                    'uemote': obj['emoticon']['emoticon_unique'] != ""
-                        ? obj['emoticon']
-                        : null,
-                  },
-                ),
+                list.cast<Map<String, dynamic>>().map(DanmakuMsg.fromPrefetch),
               );
               WidgetsBinding.instance.addPostFrameCallback(scrollToBottom);
-            } catch (_) {}
+            } catch (e) {
+              if (kDebugMode) debugPrint(e.toString());
+            }
           }
         }
       });
@@ -307,13 +302,18 @@ class LiveRoomController extends GetxController {
                 final extra = jsonDecode(content['extra']);
                 final user = content['user'];
                 final uid = user['uid'];
-                messages.add({
-                  'name': user['base']['name'],
-                  'uid': uid,
-                  'text': info[1],
-                  'emots': extra['emots'],
-                  'uemote': first[13],
-                });
+                messages.add(
+                  DanmakuMsg()
+                    ..name = user['base']['name']
+                    ..uid = uid
+                    ..text = info[1]
+                    ..emots = (extra['emots'] as Map<String, dynamic>?)?.map(
+                      (k, v) => MapEntry(k, BaseEmote.fromJson(v)),
+                    )
+                    ..uemote = first[13] is Map<String, dynamic>
+                        ? BaseEmote.fromJson(first[13])
+                        : null,
+                );
 
                 if (plPlayerController.showDanmaku) {
                   plPlayerController.danmakuController?.addDanmaku(
@@ -335,7 +335,9 @@ class LiveRoomController extends GetxController {
                   }
                 }
               }
-            } catch (_) {}
+            } catch (e) {
+              if (kDebugMode) debugPrint(e.toString());
+            }
           })
           ..init();
   }
diff --git a/lib/pages/live_room/widgets/chat.dart b/lib/pages/live_room/widgets/chat.dart
index cf8a1ea97..0139b5c05 100644
--- a/lib/pages/live_room/widgets/chat.dart
+++ b/lib/pages/live_room/widgets/chat.dart
@@ -1,5 +1,6 @@
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/models/common/image_type.dart';
+import 'package:PiliPlus/models_new/live/live_danmaku/danmaku_msg.dart';
 import 'package:PiliPlus/pages/live_room/controller.dart';
 import 'package:flutter/foundation.dart' show kDebugMode;
 import 'package:flutter/gestures.dart';
@@ -54,7 +55,7 @@ class LiveRoomChat extends StatelessWidget {
                     TextSpan(
                       children: [
                         TextSpan(
-                          text: '${item['name']}: ',
+                          text: '${item.name}: ',
                           style: TextStyle(
                             color: nameColor,
                             fontSize: 14,
@@ -62,7 +63,7 @@ class LiveRoomChat extends StatelessWidget {
                           recognizer: TapGestureRecognizer()
                             ..onTap = () {
                               try {
-                                Get.toNamed('/member?mid=${item['uid']}');
+                                Get.toNamed('/member?mid=${item.uid}');
                               } catch (err) {
                                 if (kDebugMode) debugPrint(err.toString());
                               }
@@ -99,31 +100,37 @@ class LiveRoomChat extends StatelessWidget {
     );
   }
 
-  TextSpan _buildMsg(dynamic obj) {
-    dynamic emots = obj['emots'];
-    dynamic uemote = obj['uemote'];
-    List<String> list = [
-      if (emots != null) ...emots.keys,
-      if (uemote is Map) uemote['emoticon_unique'].replaceFirst('upower_', ''),
-    ];
-    if (list.isNotEmpty) {
-      RegExp regExp = RegExp(list.map(RegExp.escape).join('|'));
+  InlineSpan _buildMsg(DanmakuMsg obj) {
+    final uemote = obj.uemote;
+    if (uemote != null) {
+      // "room_{{room_id}}_{{int}}" or "upower_[{{emote}}]"
+      return WidgetSpan(
+        child: NetworkImgLayer(
+          src: uemote.url,
+          type: ImageType.emote,
+          width: uemote.width,
+          height: uemote.height,
+          semanticsLabel: obj.text,
+        ),
+      );
+    }
+    final emots = obj.emots;
+    if (emots != null) {
+      RegExp regExp = RegExp(emots.keys.map(RegExp.escape).join('|'));
       final List<InlineSpan> spanChildren = <InlineSpan>[];
-      (obj['text'] as String).splitMapJoin(
+      obj.text.splitMapJoin(
         regExp,
-        onMatch: (Match match) {
-          String key = match[0]!;
-          dynamic emote = emots?[key] ?? uemote;
+        onMatch: (match) {
+          final key = match[0]!;
+          final emote = emots[key]!;
           spanChildren.add(
             WidgetSpan(
-              child: ExcludeSemantics(
-                child: NetworkImgLayer(
-                  src: emote['url'],
-                  type: ImageType.emote,
-                  width: emote['width'].toDouble(),
-                  height: emote['height'].toDouble(),
-                  semanticsLabel: key,
-                ),
+              child: NetworkImgLayer(
+                src: emote.url,
+                type: ImageType.emote,
+                width: emote.width,
+                height: emote.height,
+                semanticsLabel: key,
               ),
             ),
           );
@@ -145,7 +152,7 @@ class LiveRoomChat extends StatelessWidget {
       return TextSpan(children: spanChildren);
     } else {
       return TextSpan(
-        text: obj['text'],
+        text: obj.text,
         style: const TextStyle(
           color: Colors.white,
           fontSize: 14,
diff --git a/lib/pages/login/controller.dart b/lib/pages/login/controller.dart
index 7eccc35a1..80e14b8f2 100644
--- a/lib/pages/login/controller.dart
+++ b/lib/pages/login/controller.dart
@@ -500,9 +500,7 @@ class LoginPageController extends GetxController
           String geeGt = captureUri.queryParameters['gee_gt']!;
           String geeChallenge = captureUri.queryParameters['gee_challenge']!;
 
-          getCaptcha(geeGt, geeChallenge, () {
-            loginByPassword();
-          });
+          getCaptcha(geeGt, geeChallenge, loginByPassword);
           break;
         default:
           SmartDialog.showToast(res['msg']);
@@ -665,9 +663,7 @@ class LoginPageController extends GetxController
             return;
           }
 
-          getCaptcha(geeGt, geeChallenge, () {
-            sendSmsCode();
-          });
+          getCaptcha(geeGt, geeChallenge, sendSmsCode);
           break;
         default:
           SmartDialog.showToast(res['msg']);
@@ -706,8 +702,8 @@ class LoginPageController extends GetxController
     final selectAccount = Map.of(Accounts.accountMode);
     final options = {
       AnonymousAccount(): '0',
-      ...Accounts.account.toMap().cast<String, Account>().map(
-        (k, v) => MapEntry(v, k),
+      ...Accounts.account.toMap().map(
+        (k, v) => MapEntry(v, k as String),
       ),
     };
     return showDialog(
diff --git a/lib/pages/main/controller.dart b/lib/pages/main/controller.dart
index bebf78bd6..bd7a70ecc 100644
--- a/lib/pages/main/controller.dart
+++ b/lib/pages/main/controller.dart
@@ -13,6 +13,7 @@ import 'package:PiliPlus/pages/dynamics/controller.dart';
 import 'package:PiliPlus/pages/home/controller.dart';
 import 'package:PiliPlus/pages/mine/view.dart';
 import 'package:PiliPlus/services/account_service.dart';
+import 'package:PiliPlus/utils/extension.dart';
 import 'package:PiliPlus/utils/feed_back.dart';
 import 'package:PiliPlus/utils/storage.dart';
 import 'package:PiliPlus/utils/storage_key.dart';
@@ -208,7 +209,7 @@ class MainController extends GetxController
 
   void setNavBarConfig() {
     List<int>? navBarSort =
-        (GStorage.setting.get(SettingBoxKey.navBarSort) as List?)?.cast();
+        (GStorage.setting.get(SettingBoxKey.navBarSort) as List?)?.fromCast();
     int defaultHomePage = Pref.defaultHomePage;
     late final List<NavigationBarType> navigationBars;
     if (navBarSort == null || navBarSort.isEmpty) {
diff --git a/lib/pages/match_info/controller.dart b/lib/pages/match_info/controller.dart
index 653a1d37b..a4afb7248 100644
--- a/lib/pages/match_info/controller.dart
+++ b/lib/pages/match_info/controller.dart
@@ -1,16 +1,15 @@
 import 'package:PiliPlus/grpc/bilibili/main/community/reply/v1.pb.dart';
-import 'package:PiliPlus/grpc/reply.dart';
 import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/http/match.dart';
 import 'package:PiliPlus/models_new/match/match_info/contest.dart';
 import 'package:PiliPlus/pages/common/dyn/common_dyn_controller.dart';
 import 'package:get/get.dart';
 
-class MatchInfoController extends CommonDynController<MainListReply> {
+class MatchInfoController extends CommonDynController {
   @override
   final int oid = int.parse(Get.parameters['cid']!);
   @override
-  int get replyType => 27;
+  final int replyType = 27;
 
   @override
   dynamic get sourceId => oid.toString();
@@ -37,13 +36,4 @@ class MatchInfoController extends CommonDynController<MainListReply> {
   List<ReplyInfo>? getDataList(MainListReply response) {
     return response.replies;
   }
-
-  @override
-  Future<LoadingState<MainListReply>> customGetData() => ReplyGrpc.mainList(
-    type: replyType,
-    oid: oid,
-    mode: mode.value,
-    cursorNext: cursorNext,
-    offset: paginationReply?.nextOffset,
-  );
 }
diff --git a/lib/pages/match_info/view.dart b/lib/pages/match_info/view.dart
index 10b9d69d3..d5f802c40 100644
--- a/lib/pages/match_info/view.dart
+++ b/lib/pages/match_info/view.dart
@@ -15,7 +15,6 @@ import 'package:PiliPlus/pages/match_info/controller.dart';
 import 'package:PiliPlus/pages/video/reply/widgets/reply_item_grpc.dart';
 import 'package:PiliPlus/pages/video/reply_reply/view.dart';
 import 'package:PiliPlus/utils/date_util.dart';
-import 'package:PiliPlus/utils/feed_back.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
 import 'package:PiliPlus/utils/utils.dart';
 import 'package:easy_debounce/easy_throttle.dart';
@@ -23,7 +22,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:intl/intl.dart';
 
-class MatchInfoPage extends CommonDynPage {
+class MatchInfoPage extends StatefulWidget {
   const MatchInfoPage({super.key});
 
   @override
@@ -63,19 +62,7 @@ class _MatchInfoPageState extends CommonDynPageState<MatchInfoPage> {
       ),
       floatingActionButton: SlideTransition(
         position: controller.fabAnim,
-        child: FloatingActionButton(
-          heroTag: null,
-          onPressed: () {
-            feedBack();
-            controller.onReply(
-              context,
-              oid: controller.oid,
-              replyType: controller.replyType,
-            );
-          },
-          tooltip: '评论动态',
-          child: const Icon(Icons.reply),
-        ),
+        child: replyButton,
       ),
     );
   }
diff --git a/lib/pages/member/widget/user_info_card.dart b/lib/pages/member/widget/user_info_card.dart
index 125e575ce..f249bc3e2 100644
--- a/lib/pages/member/widget/user_info_card.dart
+++ b/lib/pages/member/widget/user_info_card.dart
@@ -304,7 +304,7 @@ class UserInfoCard extends StatelessWidget {
       Row(
         children: List.generate(
           5,
-          (index) => index % 2 == 0
+          (index) => index.isEven
               ? _countWidget(
                   colorScheme: colorScheme,
                   title: ['粉丝', '关注', '获赞'][index ~/ 2],
diff --git a/lib/pages/member_coin_arc/widgets/item.dart b/lib/pages/member_coin_arc/widgets/item.dart
index 8a534eb13..4de158eb8 100644
--- a/lib/pages/member_coin_arc/widgets/item.dart
+++ b/lib/pages/member_coin_arc/widgets/item.dart
@@ -120,8 +120,8 @@ class MemberCoinLikeItem extends StatelessWidget {
                       Text(
                         DateUtil.dateFormat(
                           item.ctime,
-                          shortFormat: VideoCardV.shortFormat,
-                          longFormat: VideoCardV.longFormat,
+                          short: VideoCardV.shortFormat,
+                          long: VideoCardV.longFormat,
                         ),
                         style: TextStyle(
                           fontSize: 11,
diff --git a/lib/pages/mine/view.dart b/lib/pages/mine/view.dart
index 489cf32b9..82d291b48 100644
--- a/lib/pages/mine/view.dart
+++ b/lib/pages/mine/view.dart
@@ -20,7 +20,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 
-class MinePage extends CommonPage {
+class MinePage extends StatefulWidget {
   const MinePage({super.key});
 
   @override
diff --git a/lib/pages/pgc/view.dart b/lib/pages/pgc/view.dart
index 1f9d6a2ee..19cf44c1b 100644
--- a/lib/pages/pgc/view.dart
+++ b/lib/pages/pgc/view.dart
@@ -24,7 +24,7 @@ import 'package:PiliPlus/utils/grid.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
-class PgcPage extends CommonPage {
+class PgcPage extends StatefulWidget {
   const PgcPage({
     super.key,
     required this.tabType,
diff --git a/lib/pages/rank/zone/view.dart b/lib/pages/rank/zone/view.dart
index a4ef30610..9d03e67eb 100644
--- a/lib/pages/rank/zone/view.dart
+++ b/lib/pages/rank/zone/view.dart
@@ -10,7 +10,7 @@ import 'package:PiliPlus/utils/grid.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
-class ZonePage extends CommonPage {
+class ZonePage extends StatefulWidget {
   const ZonePage({super.key, this.rid, this.seasonType});
 
   final int? rid;
diff --git a/lib/pages/rcmd/view.dart b/lib/pages/rcmd/view.dart
index 708b4955d..1acbfb870 100644
--- a/lib/pages/rcmd/view.dart
+++ b/lib/pages/rcmd/view.dart
@@ -10,7 +10,7 @@ import 'package:PiliPlus/utils/grid.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
-class RcmdPage extends CommonPage {
+class RcmdPage extends StatefulWidget {
   const RcmdPage({super.key});
 
   @override
diff --git a/lib/pages/search/widgets/search_text.dart b/lib/pages/search/widgets/search_text.dart
index 51b57c20b..c1884912d 100644
--- a/lib/pages/search/widgets/search_text.dart
+++ b/lib/pages/search/widgets/search_text.dart
@@ -24,9 +24,9 @@ class SearchText extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    late final theme = Theme.of(context);
+    late final colorScheme = Theme.of(context).colorScheme;
     return Material(
-      color: bgColor ?? theme.colorScheme.onInverseSurface,
+      color: bgColor ?? colorScheme.onInverseSurface,
       borderRadius: const BorderRadius.all(Radius.circular(6)),
       child: InkWell(
         onTap: () => onTap?.call(text),
@@ -41,7 +41,7 @@ class SearchText extends StatelessWidget {
             textAlign: textAlign,
             style: TextStyle(
               fontSize: fontSize,
-              color: textColor ?? theme.colorScheme.onSurfaceVariant,
+              color: textColor ?? colorScheme.onSurfaceVariant,
             ),
           ),
         ),
diff --git a/lib/pages/setting/pages/bar_set.dart b/lib/pages/setting/pages/bar_set.dart
index 973af68a4..66e46cca6 100644
--- a/lib/pages/setting/pages/bar_set.dart
+++ b/lib/pages/setting/pages/bar_set.dart
@@ -24,7 +24,7 @@ class _BarSetPageState extends State<BarSetPage> {
     key = args['key'];
     title = args['title'] ?? '';
     defaultBars = List<EnumWithLabel>.from(args['defaultBars']);
-    List<int>? bars = (GStorage.setting.get(key) as List?)?.cast();
+    List? bars = GStorage.setting.get(key);
     if (bars != null) {
       barIndex = {for (var (k, v) in bars.indexed) v: k};
 
diff --git a/lib/pages/setting/pages/logs.dart b/lib/pages/setting/pages/logs.dart
index 66af092e1..d9d131ae0 100644
--- a/lib/pages/setting/pages/logs.dart
+++ b/lib/pages/setting/pages/logs.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 
 import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart';
-import 'package:PiliPlus/services/loggeer.dart';
+import 'package:PiliPlus/services/logger.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
 import 'package:PiliPlus/utils/storage.dart';
 import 'package:PiliPlus/utils/storage_key.dart';
@@ -18,16 +18,18 @@ class LogsPage extends StatefulWidget {
   State<LogsPage> createState() => _LogsPageState();
 }
 
+typedef _LogInfo = ({Object? date, String body});
+
 class _LogsPageState extends State<LogsPage> {
   late File logsPath;
   late String fileContent;
-  List logsContent = [];
+  List<_LogInfo> logsContent = [];
   DateTime? latestLog;
   late bool enableLog = Pref.enableLog;
 
   @override
   void initState() {
-    getPath();
+    getLog();
     super.initState();
   }
 
@@ -35,20 +37,20 @@ class _LogsPageState extends State<LogsPage> {
   void dispose() {
     if (latestLog != null) {
       if (DateTime.now().difference(latestLog!) >= const Duration(days: 14)) {
-        clearLogs();
+        LoggerUtils.clearLogs();
       }
     }
     super.dispose();
   }
 
-  Future<void> getPath() async {
-    logsPath = await getLogsPath();
+  Future<void> getLog() async {
+    logsPath = await LoggerUtils.getLogsPath();
     fileContent = await logsPath.readAsString();
     logsContent = parseLogs(fileContent);
     setState(() {});
   }
 
-  List<Map<String, dynamic>> parseLogs(String fileContent) {
+  List<_LogInfo> parseLogs(String fileContent) {
     const String splitToken =
         '======================================================================';
     List contentList = fileContent.split(splitToken).map((item) {
@@ -62,9 +64,9 @@ class _LogsPageState extends State<LogsPage> {
           .replaceAll('ERROR', '错误信息')
           .replaceAll('STACK TRACE', '错误堆栈');
     }).toList();
-    List<Map<String, dynamic>> result = [];
+    List<_LogInfo> result = [];
     for (String i in contentList) {
-      dynamic date;
+      Object? date;
       String body = i
           .split("\n")
           .map((l) {
@@ -84,7 +86,7 @@ class _LogsPageState extends State<LogsPage> {
           .where((l) => l.replaceAll("\n", "").trim().isNotEmpty)
           .join("\n");
       if (date != null || body != '') {
-        result.add({'date': date, 'body': body, 'expand': false});
+        result.add((date: date, body: body));
       }
     }
     return result.reversed.toList();
@@ -100,12 +102,12 @@ class _LogsPageState extends State<LogsPage> {
   }
 
   Future<void> clearLogsHandle() async {
-    if (await clearLogs()) {
+    if (await LoggerUtils.clearLogs()) {
       if (mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
           const SnackBar(content: Text('已清空')),
         );
-        logsContent = [];
+        logsContent.clear();
         setState(() {});
       }
     }
@@ -173,8 +175,8 @@ class _LogsPageState extends State<LogsPage> {
               itemCount: logsContent.length,
               itemBuilder: (context, index) {
                 final log = logsContent[index];
-                if (log['date'] is DateTime) {
-                  latestLog ??= log['date'];
+                if (log.date case DateTime date) {
+                  latestLog ??= date;
                 }
                 return Padding(
                   padding: const EdgeInsets.symmetric(horizontal: 16),
@@ -187,7 +189,7 @@ class _LogsPageState extends State<LogsPage> {
                         spacing: 10,
                         children: [
                           Text(
-                            log['date'].toString(),
+                            log.date.toString(),
                             style: TextStyle(
                               fontSize: Theme.of(
                                 context,
@@ -201,14 +203,14 @@ class _LogsPageState extends State<LogsPage> {
                             ),
                             onPressed: () {
                               Utils.copyText(
-                                '```\n${log['body']}\n```',
+                                '```\n${log.body}\n```',
                                 needToast: false,
                               );
                               if (context.mounted) {
                                 ScaffoldMessenger.of(context).showSnackBar(
                                   SnackBar(
                                     content: Text(
-                                      '已将 ${log['date'].toString()} 复制至剪贴板',
+                                      '已将 ${log.date} 复制至剪贴板',
                                     ),
                                   ),
                                 );
@@ -223,7 +225,7 @@ class _LogsPageState extends State<LogsPage> {
                         child: Container(
                           width: double.infinity,
                           padding: const EdgeInsets.all(12.0),
-                          child: SelectableText(log['body']),
+                          child: SelectableText(log.body),
                         ),
                       ),
                     ],
diff --git a/lib/pages/video/member/view.dart b/lib/pages/video/member/view.dart
index b3b1eca38..9e8da659b 100644
--- a/lib/pages/video/member/view.dart
+++ b/lib/pages/video/member/view.dart
@@ -259,7 +259,7 @@ class _HorizontalMemberPageState extends State<HorizontalMemberPage>
       Obx(
         () => Row(
           children: List.generate(5, (index) {
-            if (index % 2 == 0) {
+            if (index.isEven) {
               return _buildChildInfo(
                 theme: theme,
                 title: const ['粉丝', '关注', '获赞'][index ~/ 2],
diff --git a/lib/pages/video/post_panel/view.dart b/lib/pages/video/post_panel/view.dart
index 588264bbf..55db1cd5f 100644
--- a/lib/pages/video/post_panel/view.dart
+++ b/lib/pages/video/post_panel/view.dart
@@ -262,7 +262,7 @@ class _PostPanelState extends CommonCollapseSlidePageState<PostPanel> {
                 List<num> split = res
                     .split(':')
                     .reversed
-                    .map((e) => num.parse(e))
+                    .map(num.parse)
                     .toList();
                 double duration = 0;
                 for (int i = 0; i < split.length; i++) {
diff --git a/lib/services/audio_handler.dart b/lib/services/audio_handler.dart
index 7e4455c77..7c9429d11 100644
--- a/lib/services/audio_handler.dart
+++ b/lib/services/audio_handler.dart
@@ -10,7 +10,7 @@ import 'package:get/get_utils/get_utils.dart';
 
 Future<VideoPlayerServiceHandler> initAudioService() async {
   return AudioService.init(
-    builder: () => VideoPlayerServiceHandler(),
+    builder: VideoPlayerServiceHandler.new,
     config: const AudioServiceConfig(
       androidNotificationChannelId: 'com.example.piliplus.audio',
       androidNotificationChannelName: 'Audio Service PiliPlus',
diff --git a/lib/services/loggeer.dart b/lib/services/loggeer.dart
deleted file mode 100644
index 4f4a76d9d..000000000
--- a/lib/services/loggeer.dart
+++ /dev/null
@@ -1,55 +0,0 @@
-import 'dart:io';
-
-import 'package:logger/logger.dart';
-import 'package:path/path.dart' as p;
-import 'package:path_provider/path_provider.dart';
-
-final _loggerFactory = PiliLogger();
-
-PiliLogger getLogger<T>() {
-  return _loggerFactory;
-}
-
-class PiliLogger extends Logger {
-  PiliLogger() : super();
-
-  @override
-  Future<void> log(
-    Level level,
-    dynamic message, {
-    Object? error,
-    StackTrace? stackTrace,
-    DateTime? time,
-  }) async {
-    if (level == Level.error || level == Level.fatal) {
-      // 添加至文件末尾
-      File logFile = await getLogsPath();
-      logFile.writeAsString(
-        "**${DateTime.now()}** \n $message \n $stackTrace",
-        mode: FileMode.writeOnlyAppend,
-      );
-    }
-    super.log(level, "$message", error: error, stackTrace: stackTrace);
-  }
-}
-
-Future<File> getLogsPath() async {
-  String dir = (await getApplicationDocumentsDirectory()).path;
-  final String filename = p.join(dir, ".pili_logs");
-  final File file = File(filename);
-  if (!file.existsSync()) {
-    await file.create(recursive: true);
-  }
-  return file;
-}
-
-Future<bool> clearLogs() async {
-  final File file = await getLogsPath();
-  try {
-    await file.writeAsString('');
-  } catch (e) {
-    // if (kDebugMode) debugPrint('Error clearing file: $e');
-    return false;
-  }
-  return true;
-}
diff --git a/lib/services/logger.dart b/lib/services/logger.dart
new file mode 100644
index 000000000..0d5c66de6
--- /dev/null
+++ b/lib/services/logger.dart
@@ -0,0 +1,57 @@
+import 'dart:io';
+
+import 'package:logger/logger.dart';
+import 'package:path/path.dart' as p;
+import 'package:path_provider/path_provider.dart';
+
+final logger = PiliLogger();
+
+class PiliLogger extends Logger {
+  PiliLogger() : super();
+
+  @override
+  Future<void> log(
+    Level level,
+    dynamic message, {
+    Object? error,
+    StackTrace? stackTrace,
+    DateTime? time,
+  }) async {
+    if (level == Level.error || level == Level.fatal) {
+      // 添加至文件末尾
+      File logFile = await LoggerUtils.getLogsPath();
+      logFile.writeAsString(
+        "**${DateTime.now()}** \n $message \n $stackTrace",
+        mode: FileMode.writeOnlyAppend,
+      );
+    }
+    super.log(level, "$message", error: error, stackTrace: stackTrace);
+  }
+}
+
+class LoggerUtils {
+  static File? _logFile;
+
+  static Future<File> getLogsPath() async {
+    if (_logFile != null) return _logFile!;
+
+    String dir = (await getApplicationDocumentsDirectory()).path;
+    final String filename = p.join(dir, ".pili_logs");
+    final File file = File(filename);
+    if (!file.existsSync()) {
+      await file.create(recursive: true);
+    }
+    return _logFile = file;
+  }
+
+  static Future<bool> clearLogs() async {
+    final file = await getLogsPath();
+    try {
+      await file.writeAsBytes(const [], flush: true);
+    } catch (e) {
+      // if (kDebugMode) debugPrint('Error clearing file: $e');
+      return false;
+    }
+    return true;
+  }
+}
diff --git a/lib/tcp/live.dart b/lib/tcp/live.dart
index 1d6ef07e9..89e11f954 100644
--- a/lib/tcp/live.dart
+++ b/lib/tcp/live.dart
@@ -3,66 +3,64 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:PiliPlus/services/loggeer.dart';
+import 'package:PiliPlus/services/logger.dart';
 import 'package:brotli/brotli.dart';
 import 'package:flutter/foundation.dart' show kDebugMode;
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:web_socket_channel/web_socket_channel.dart';
 
 class PackageHeader {
-  int totalSize;
-  int headerSize;
-  int protocolVer;
-  int operationCode;
-  int seq;
+  final int protocolVer;
+  final int operationCode;
+  final int seq;
 
   @override
   String toString() {
-    return 'PackageHeader{totalSize: $totalSize, headerSize: $headerSize, protocolVer: $protocolVer, operationCode: $operationCode, seq: $seq}';
+    return 'PackageHeader{protocolVer: $protocolVer, operationCode: $operationCode, seq: $seq}';
   }
 
-  PackageHeader({
-    required this.totalSize,
-    required this.headerSize,
+  const PackageHeader({
     required this.protocolVer,
     required this.operationCode,
     required this.seq,
   });
 
-  Uint8List toBytes() {
-    final buffer = BytesBuilder()
-      ..add(_int32ToBytes(totalSize))
-      ..add(_int16ToBytes(headerSize))
-      ..add(_int16ToBytes(protocolVer))
-      ..add(_int32ToBytes(operationCode))
-      ..add(_int32ToBytes(seq));
-    return buffer.toBytes();
-  }
-
-  List<int> _int32ToBytes(int value) {
-    final bytes = ByteData(4)..setInt32(0, value, Endian.big);
+  Uint8List toBytes(int contentSize) {
+    final bytes = ByteData(0x10)
+      ..setInt32(0, 0x10 + contentSize, Endian.big)
+      ..setInt16(4, 0x10, Endian.big)
+      ..setInt16(6, protocolVer, Endian.big)
+      ..setInt32(8, operationCode, Endian.big)
+      ..setInt32(12, seq, Endian.big);
     return bytes.buffer.asUint8List();
   }
+}
 
-  List<int> _int16ToBytes(int value) {
-    final bytes = ByteData(2)..setInt16(0, value, Endian.big);
-    return bytes.buffer.asUint8List();
-  }
+class PackageHeaderRes extends PackageHeader {
+  PackageHeaderRes({
+    required this.totalSize,
+    required this.headerSize,
+    required super.protocolVer,
+    required super.operationCode,
+    required super.seq,
+  });
+  final int totalSize;
+  final int headerSize;
 
-  static PackageHeader? fromBytesData(Uint8List data) {
+  static PackageHeaderRes? fromBytesData(Uint8List data) {
     if (data.length < 10) {
-      getLogger().i('数据不足以解析PackageHeader');
+      logger.i('数据不足以解析PackageHeader');
       return null;
     }
     final byteData = ByteData.sublistView(data);
 
-    int totalSize = byteData.getUint32(0, Endian.big);
-    int headerSize = byteData.getUint16(4, Endian.big);
-    int protocolVer = byteData.getUint16(6, Endian.big);
-    int operationCode = byteData.getUint32(8, Endian.big);
-    int seq = byteData.getUint32(12, Endian.big);
+    final totalSize = byteData.getUint32(0, Endian.big);
+    final headerSize = byteData.getUint16(4, Endian.big);
+    final protocolVer = byteData.getUint16(6, Endian.big);
+    final operationCode = byteData.getUint32(8, Endian.big);
+    final seq = byteData.getUint32(12, Endian.big);
 
-    return PackageHeader(
+    return PackageHeaderRes(
       totalSize: totalSize,
       headerSize: headerSize,
       protocolVer: protocolVer,
@@ -70,11 +68,15 @@ class PackageHeader {
       seq: seq,
     );
   }
+
+  @override
+  String toString() {
+    return 'PackageHeaderRes{totalSize: $totalSize, headerSize: $headerSize, protocolVer: $protocolVer, operationCode: $operationCode, seq: $seq}';
+  }
 }
 
 abstract class Message {
   String toJsonStr();
-  int getMessageSize();
 }
 
 class AuthMessage implements Message {
@@ -106,11 +108,6 @@ class AuthMessage implements Message {
     };
     return jsonEncode(message);
   }
-
-  @override
-  int getMessageSize() {
-    return utf8.encode(toJsonStr()).length;
-  }
 }
 
 abstract class AbstractPackage<T> {
@@ -126,13 +123,10 @@ class AuthPackage extends AbstractPackage<Message> {
 
   @override
   Uint8List marshal() {
-    int size = body.getMessageSize();
-    header.headerSize = 0x10; // 固定大小
-    size += header.headerSize;
-    header.totalSize = size;
+    final json = utf8.encode(body.toJsonStr());
     final buffer = BytesBuilder()
-      ..add(header.toBytes())
-      ..add(utf8.encode(body.toJsonStr()));
+      ..add(header.toBytes(json.length))
+      ..add(json);
     return buffer.toBytes();
   }
 }
@@ -143,12 +137,7 @@ class HeartbeatPackage extends AbstractPackage<dynamic> {
 
   @override
   Uint8List marshal() {
-    final buffer = BytesBuilder();
-    header
-      ..headerSize = 0x10
-      ..totalSize = 0x10;
-    buffer.add(header.toBytes());
-    return buffer.toBytes();
+    return header.toBytes(0);
   }
 }
 
@@ -168,14 +157,11 @@ class LiveMessageStream {
   WebSocketChannel? _channel;
   StreamSubscription? _socketSubscription;
   Timer? _timer;
-  PiliLogger logger = getLogger();
   final String logTag = "LiveStreamService";
 
   Future<void> init() async {
     final authPackage = AuthPackage(
-      header: PackageHeader(
-        totalSize: 0,
-        headerSize: 0,
+      header: const PackageHeader(
         protocolVer: 1,
         operationCode: 7,
         seq: 1,
@@ -215,7 +201,7 @@ class LiveMessageStream {
       //   ..d('$logTag ===> 发送认证包');
       _socketSubscription = _channel?.stream.listen(
         (data) {
-          PackageHeader? header = PackageHeader.fromBytesData(data);
+          final header = PackageHeaderRes.fromBytesData(data);
           if (header != null) {
             List<int> decompressedData = [];
             //心跳包回复不用处理
@@ -249,18 +235,17 @@ class LiveMessageStream {
       );
       _channel?.sink.add(authPackage.marshal());
     } catch (e) {
-      SmartDialog.showToast("弹幕地址链接失败");
-      if (kDebugMode) logger.i('$logTag ===> TCP连接失败: $e');
+      SmartDialog.showToast("弹幕地址链接失败: $e");
     }
   }
 
   void _processingData(List<int> data) {
     try {
-      PackageHeader? subHeader = PackageHeader.fromBytesData(
+      final subHeader = PackageHeaderRes.fromBytesData(
         Uint8List.fromList(data),
       );
       if (subHeader != null) {
-        var msgBody = utf8.decode(
+        final msgBody = utf8.decode(
           data.sublist(subHeader.headerSize, subHeader.totalSize),
         );
         for (var f in _eventListeners) {
@@ -291,10 +276,8 @@ class LiveMessageStream {
         return;
       }
       if (kDebugMode) logger.i("$logTag heartBeat $hashCode");
-      var package = HeartbeatPackage(
+      final package = HeartbeatPackage(
         header: PackageHeader(
-          totalSize: 0,
-          headerSize: 0,
           protocolVer: 1,
           operationCode: 2,
           seq: heartBeatCount,
diff --git a/lib/utils/accounts.dart b/lib/utils/accounts.dart
index dd5866430..05dde8bdd 100644
--- a/lib/utils/accounts.dart
+++ b/lib/utils/accounts.dart
@@ -78,7 +78,7 @@ class Accounts {
     }
     await Future.wait(
       (accountMode.values.toSet()..retainWhere((i) => !i.activited)).map(
-        (i) => Request.buvidActive(i),
+        Request.buvidActive,
       ),
     );
   }
diff --git a/lib/utils/accounts/account_manager/account_mgr.dart b/lib/utils/accounts/account_manager/account_mgr.dart
index 8c3977ab9..1b4cb7d49 100644
--- a/lib/utils/accounts/account_manager/account_mgr.dart
+++ b/lib/utils/accounts/account_manager/account_mgr.dart
@@ -159,7 +159,7 @@ class AccountManager extends Interceptor {
               ...?previousCookies
                   ?.split(';')
                   .where((e) => e.isNotEmpty)
-                  .map((c) => Cookie.fromSetCookieValue(c)),
+                  .map(Cookie.fromSetCookieValue),
               ...cookies,
             ]);
             options.headers[HttpHeaders.cookieHeader] = newCookies.isNotEmpty
@@ -257,7 +257,7 @@ class AccountManager extends Interceptor {
         .map((str) => str.split(_setCookieReg))
         .expand((cookie) => cookie)
         .where((cookie) => cookie.isNotEmpty)
-        .map((str) => Cookie.fromSetCookieValue(str))
+        .map(Cookie.fromSetCookieValue)
         .toList();
     final statusCode = response.statusCode ?? 0;
     final locations = response.headers[HttpHeaders.locationHeader] ?? [];
diff --git a/lib/utils/accounts/cookie_jar_adapter.dart b/lib/utils/accounts/cookie_jar_adapter.dart
index 86fdfd4ab..b7d87c127 100644
--- a/lib/utils/accounts/cookie_jar_adapter.dart
+++ b/lib/utils/accounts/cookie_jar_adapter.dart
@@ -8,7 +8,7 @@ class BiliCookieJarAdapter extends TypeAdapter<DefaultCookieJar> {
 
   @override
   DefaultCookieJar read(BinaryReader reader) =>
-      BiliCookieJar.fromJson(reader.readMap().cast<String, String>());
+      BiliCookieJar.fromJson(reader.readMap());
 
   @override
   void write(BinaryWriter writer, DefaultCookieJar obj) {
diff --git a/lib/utils/app_scheme.dart b/lib/utils/app_scheme.dart
index 19abe1958..3c9c44b31 100644
--- a/lib/utils/app_scheme.dart
+++ b/lib/utils/app_scheme.dart
@@ -31,9 +31,7 @@ class PiliScheme {
     appLinks = AppLinks();
 
     listener?.cancel();
-    listener = appLinks.uriLinkStream.listen((uri) {
-      routePush(uri);
-    });
+    listener = appLinks.uriLinkStream.listen(routePush);
   }
 
   static Future<bool> routePushFromUrl(
diff --git a/lib/utils/date_util.dart b/lib/utils/date_util.dart
index b28173fd4..4d2c33f4c 100644
--- a/lib/utils/date_util.dart
+++ b/lib/utils/date_util.dart
@@ -1,7 +1,7 @@
 import 'package:intl/intl.dart' show DateFormat;
 
 class DateUtil {
-  static final _shortFormat = DateFormat('MM-dd');
+  static final shortFormat = DateFormat('MM-dd');
   static final longFormat = DateFormat('yyyy-MM-dd');
   static final _shortFormatD = DateFormat('MM-dd HH:mm');
   static final longFormatD = DateFormat('yyyy-MM-dd HH:mm');
@@ -9,8 +9,8 @@ class DateUtil {
 
   static String dateFormat(
     int? time, {
-    DateFormat? shortFormat,
-    DateFormat? longFormat,
+    DateFormat? short,
+    DateFormat? long,
   }) {
     if (time == null || time == 0) {
       return '';
@@ -37,8 +37,8 @@ class DateUtil {
       return '$dayDiff天前';
     }
     final DateFormat sdf = now.year == date.year
-        ? shortFormat ?? _shortFormat
-        : longFormat ?? DateUtil.longFormat;
+        ? short ?? shortFormat
+        : long ?? DateUtil.longFormat;
     return sdf.format(date);
   }
 
diff --git a/lib/utils/duration_util.dart b/lib/utils/duration_util.dart
index d68019af4..aa2719913 100644
--- a/lib/utils/duration_util.dart
+++ b/lib/utils/duration_util.dart
@@ -24,7 +24,7 @@ class DurationUtil {
     List<int> split = data
         .split(':')
         .reversed
-        .map((e) => int.parse(e))
+        .map(int.parse)
         .toList();
     int duration = 0;
     for (int i = 0; i < split.length; i++) {
diff --git a/lib/utils/extension.dart b/lib/utils/extension.dart
index 5568379d8..fdcb8e7e6 100644
--- a/lib/utils/extension.dart
+++ b/lib/utils/extension.dart
@@ -48,6 +48,18 @@ extension IterableExt<T> on Iterable<T>? {
   bool get isNullOrEmpty => this == null || this!.isEmpty;
 }
 
+extension MapExt<K, V> on Map<K, V> {
+  Map<RK, RV> fromCast<RK, RV>() {
+    return Map<RK, RV>.from(this);
+  }
+}
+
+extension NonNullListExt<T> on List<T> {
+  List<R> fromCast<R>() {
+    return List<R>.from(this);
+  }
+}
+
 extension ListExt<T> on List<T>? {
   T? getOrNull(int index) {
     if (isNullOrEmpty) {
diff --git a/lib/utils/storage_pref.dart b/lib/utils/storage_pref.dart
index 933396c72..4b5ee9d04 100644
--- a/lib/utils/storage_pref.dart
+++ b/lib/utils/storage_pref.dart
@@ -102,31 +102,30 @@ class Pref {
     ),
   );
 
-  static List<int>? get tabbarSort =>
-      (_setting.get(SettingBoxKey.tabBarSort) as List?)?.cast<int>();
-
   static List<Pair<SegmentType, SkipType>> get blockSettings {
-    List<int>? list = (_setting.get(SettingBoxKey.blockSettings) as List?)
-        ?.cast<int>();
+    final list = _setting.get(SettingBoxKey.blockSettings) as List?;
+    if (list == null) {
+      return SegmentType.values
+          .map((i) => Pair(first: i, second: SkipType.values[i.index]))
+          .toList();
+    }
     return SegmentType.values
         .map(
-          (item) => Pair<SegmentType, SkipType>(
-            first: item,
-            second: SkipType.values[list?[item.index] ?? 1],
-          ),
+          (item) =>
+              Pair(first: item, second: SkipType.values[list[item.index]]),
         )
         .toList();
   }
 
   static List<Color> get blockColor {
-    List<String>? list = (_setting.get(SettingBoxKey.blockColor) as List?)
-        ?.cast<String>();
+    final list = _setting.get(SettingBoxKey.blockColor) as List?;
+    if (list == null) {
+      return SegmentType.values.map((i) => i.color).toList();
+    }
     return SegmentType.values.map(
       (item) {
-        final e = list?[item.index];
-        final color = e != null && e.isNotEmpty
-            ? int.tryParse('FF$e', radix: 16)
-            : null;
+        final String e = list[item.index];
+        final color = e.isNotEmpty ? int.tryParse('FF$e', radix: 16) : null;
         return color != null ? Color(color) : item.color;
       },
     ).toList();
@@ -692,11 +691,9 @@ class Pref {
   static bool get enableHA =>
       _setting.get(SettingBoxKey.enableHA, defaultValue: true);
 
-  static Set<int> get danmakuBlockType =>
-      (_setting.get(SettingBoxKey.danmakuBlockType, defaultValue: <int>[])
-              as Iterable)
-          .cast<int>()
-          .toSet();
+  static Set<int> get danmakuBlockType => Set<int>.from(
+    _setting.get(SettingBoxKey.danmakuBlockType, defaultValue: const <int>{}),
+  );
 
   static int get danmakuWeight =>
       _setting.get(SettingBoxKey.danmakuWeight, defaultValue: 0);
diff --git a/pubspec.lock b/pubspec.lock
index 5f9b3487b..ac44d79eb 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -900,7 +900,7 @@ packages:
     source: hosted
     version: "1.5.0"
   http2:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: http2
       sha256: "382d3aefc5bd6dc68c6b892d7664f29b5beb3251611ae946a98d35158a82bbfa"
diff --git a/pubspec.yaml b/pubspec.yaml
index 34260e622..eed6cb815 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -215,6 +215,7 @@ dependencies:
   material_color_utilities: any
   flutter_cache_manager: any
 
+  http2: any
 dependency_overrides:
   screen_brightness: ^2.0.1
   path: ^1.9.1