Merge branch 'main' into opt-danmu-and-autoplay

2025-12-06 09:13:48 +08:00 · 2024-01-07 23:33:50 +08:00
parent a98d8537c7 438b392cfc
commit 21259e260d
112 changed files with 1498 additions and 1331 deletions
--- a/lib/pages/about/index.dart
+++ b/lib/pages/about/index.dart
@@ -20,7 +20,7 @@ class _AboutPageState extends State<AboutPage> {

  @override
  Widget build(BuildContext context) {
-    Color outline = Theme.of(context).colorScheme.outline;
+    final Color outline = Theme.of(context).colorScheme.outline;
    TextStyle subTitleStyle =
        TextStyle(fontSize: 13, color: Theme.of(context).colorScheme.outline);
    return Scaffold(
@@ -29,7 +29,6 @@ class _AboutPageState extends State<AboutPage> {
      ),
      body: SingleChildScrollView(
        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.center,
          children: [
            Image.asset(
              'assets/images/logo/logo_android_2.png',
@@ -47,7 +46,7 @@ class _AboutPageState extends State<AboutPage> {
            const SizedBox(height: 20),
            Obx(
              () => ListTile(
-                title: const Text("当前版本"),
+                title: const Text('当前版本'),
                trailing: Text(_aboutController.currentVersion.value,
                    style: subTitleStyle),
              ),
--- a/lib/pages/bangumi/introduction/controller.dart
+++ b/lib/pages/bangumi/introduction/controller.dart
@@ -63,8 +63,8 @@ class BangumiIntroController extends GetxController {
  @override
  void onInit() {
    super.onInit();
-    if (Get.arguments.isNotEmpty) {
-      if (Get.arguments.containsKey('bangumiItem')) {
+    if (Get.arguments.isNotEmpty as bool) {
+      if (Get.arguments.containsKey('bangumiItem') as bool) {
        preRender = true;
        bangumiItem = Get.arguments['bangumiItem'];
        // bangumiItem!['pic'] = args.pic;
--- a/lib/pages/bangumi/introduction/view.dart
+++ b/lib/pages/bangumi/introduction/view.dart
@@ -51,12 +51,11 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
    cid = widget.cid!;
    bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag);
    videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
-    bangumiIntroController.bangumiDetail.listen((value) {
+    bangumiIntroController.bangumiDetail.listen((BangumiInfoModel value) {
      bangumiDetail = value;
    });
    _futureBuilderFuture = bangumiIntroController.queryBangumiIntro();
-    videoDetailCtr.cid.listen((p0) {
-      print('🐶🐶$p0');
+    videoDetailCtr.cid.listen((int p0) {
      cid = p0;
      setState(() {});
    });
@@ -67,7 +66,7 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
    super.build(context);
    return FutureBuilder(
      future: _futureBuilderFuture,
-      builder: (context, snapshot) {
+      builder: (BuildContext context, AsyncSnapshot snapshot) {
        if (snapshot.connectionState == ConnectionState.done) {
          if (snapshot.data['status']) {
            // 请求成功
@@ -83,7 +82,7 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
            //   errMsg: snapshot.data['msg'],
            //   fn: () => Get.back(),
            // );
-            return SizedBox();
+            return const SizedBox();
          }
        } else {
          return BangumiInfo(
@@ -98,16 +97,16 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
 }

 class BangumiInfo extends StatefulWidget {
-  final bool loadingStatus;
-  final BangumiInfoModel? bangumiDetail;
-  final int? cid;
-
  const BangumiInfo({
-    Key? key,
+    super.key,
    this.loadingStatus = false,
    this.bangumiDetail,
    this.cid,
-  }) : super(key: key);
+  });
+
+  final bool loadingStatus;
+  final BangumiInfoModel? bangumiDetail;
+  final int? cid;

  @override
  State<BangumiInfo> createState() => _BangumiInfoState();
@@ -123,12 +122,15 @@ class _BangumiInfoState extends State<BangumiInfo> {
  int? cid;
  bool isProcessing = false;
  void Function()? handleState(Future Function() action) {
-    return isProcessing ? null : () async {
-      setState(() => isProcessing = true);
-      await action();
-      setState(() => isProcessing = false);
-    };
+    return isProcessing
+        ? null
+        : () async {
+            setState(() => isProcessing = true);
+            await action();
+            setState(() => isProcessing = false);
+          };
  }
+
  @override
  void initState() {
    super.initState();
@@ -155,7 +157,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
      context: context,
      useRootNavigator: true,
      isScrollControlled: true,
-      builder: (context) {
+      builder: (BuildContext context) {
        return FavPanel(ctr: bangumiIntroController);
      },
    );
@@ -175,7 +177,7 @@ class _BangumiInfoState extends State<BangumiInfo> {

  @override
  Widget build(BuildContext context) {
-    ThemeData t = Theme.of(context);
+    final ThemeData t = Theme.of(context);
    return SliverPadding(
      padding: const EdgeInsets.only(
          left: StyleString.safeSpace, right: StyleString.safeSpace, top: 20),
@@ -185,7 +187,6 @@ class _BangumiInfoState extends State<BangumiInfo> {
                crossAxisAlignment: CrossAxisAlignment.start,
                children: [
                  Row(
-                    mainAxisAlignment: MainAxisAlignment.start,
                    crossAxisAlignment: CrossAxisAlignment.start,
                    children: [
                      Stack(
@@ -244,7 +245,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
                                              EdgeInsets.zero),
                                          backgroundColor:
                                              MaterialStateProperty.resolveWith(
-                                                  (states) {
+                                                  (Set<MaterialState> states) {
                                            return t
                                                .colorScheme.primaryContainer
                                                .withOpacity(0.7);
@@ -386,7 +387,8 @@ class _BangumiInfoState extends State<BangumiInfo> {
  }

  Widget actionGrid(BuildContext context, bangumiIntroController) {
-    return LayoutBuilder(builder: (context, constraints) {
+    return LayoutBuilder(
+        builder: (BuildContext context, BoxConstraints constraints) {
      return Material(
        child: Padding(
          padding: const EdgeInsets.only(top: 16, bottom: 8),
@@ -394,7 +396,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
            height: constraints.maxWidth / 5 * 0.8,
            child: GridView.count(
              primary: false,
-              padding: const EdgeInsets.all(0),
+              padding: EdgeInsets.zero,
              crossAxisCount: 5,
              childAspectRatio: 1.25,
              children: <Widget>[
@@ -402,7 +404,8 @@ class _BangumiInfoState extends State<BangumiInfo> {
                  () => ActionItem(
                      icon: const Icon(FontAwesomeIcons.thumbsUp),
                      selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp),
-                      onTap: handleState(bangumiIntroController.actionLikeVideo),
+                      onTap:
+                          handleState(bangumiIntroController.actionLikeVideo),
                      selectStatus: bangumiIntroController.hasLike.value,
                      loadingStatus: false,
                      text: !widget.loadingStatus
@@ -413,7 +416,8 @@ class _BangumiInfoState extends State<BangumiInfo> {
                  () => ActionItem(
                      icon: const Icon(FontAwesomeIcons.b),
                      selectIcon: const Icon(FontAwesomeIcons.b),
-                      onTap: handleState(bangumiIntroController.actionCoinVideo),
+                      onTap:
+                          handleState(bangumiIntroController.actionCoinVideo),
                      selectStatus: bangumiIntroController.hasCoin.value,
                      loadingStatus: false,
                      text: !widget.loadingStatus
--- a/lib/pages/bangumi/view.dart
+++ b/lib/pages/bangumi/view.dart
@@ -4,6 +4,7 @@ import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:get/get.dart';
+import 'package:nil/nil.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/pages/home/index.dart';
@@ -74,7 +75,7 @@ class _BangumiPageState extends State<BangumiPage>
    super.build(context);
    return RefreshIndicator(
      onRefresh: () async {
-        await _bangumidController.queryBangumiListFeed(type: 'init');
+        await _bangumidController.queryBangumiListFeed();
        return _bangumidController.queryBangumiFollow();
      },
      child: CustomScrollView(
@@ -112,10 +113,11 @@ class _BangumiPageState extends State<BangumiPage>
                      ),
                    ),
                    SizedBox(
-                      height: 258,
+                      height: 268,
                      child: FutureBuilder(
                        future: _futureBuilderFutureFollow,
-                        builder: (context, snapshot) {
+                        builder:
+                            (BuildContext context, AsyncSnapshot snapshot) {
                          if (snapshot.connectionState ==
                              ConnectionState.done) {
                            if (snapshot.data == null) {
@@ -156,10 +158,10 @@ class _BangumiPageState extends State<BangumiPage>
                                      ),
                              );
                            } else {
-                              return const SizedBox();
+                              return nil;
                            }
                          } else {
-                            return const SizedBox();
+                            return nil;
                          }
                        },
                      ),
@@ -188,7 +190,7 @@ class _BangumiPageState extends State<BangumiPage>
                StyleString.safeSpace, 0, StyleString.safeSpace, 0),
            sliver: FutureBuilder(
              future: _futureBuilderFuture,
-              builder: (context, snapshot) {
+              builder: (BuildContext context, AsyncSnapshot snapshot) {
                if (snapshot.connectionState == ConnectionState.done) {
                  Map data = snapshot.data as Map;
                  if (data['status']) {
@@ -206,7 +208,7 @@ class _BangumiPageState extends State<BangumiPage>
              },
            ),
          ),
-          LoadingMore()
+          const LoadingMore()
        ],
      ),
    );
@@ -228,7 +230,7 @@ class _BangumiPageState extends State<BangumiPage>
        (BuildContext context, int index) {
          return bangumiList!.isNotEmpty
              ? BangumiCardV(bangumiItem: bangumiList[index])
-              : const SizedBox();
+              : nil;
        },
        childCount: bangumiList!.isNotEmpty ? bangumiList!.length : 10,
      ),
--- a/lib/pages/bangumi/widgets/bangumi_panel.dart
+++ b/lib/pages/bangumi/widgets/bangumi_panel.dart
@@ -8,11 +8,6 @@ import 'package:pilipala/utils/storage.dart';
 import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';

 class BangumiPanel extends StatefulWidget {
-  final List<EpisodeItem> pages;
-  final int? cid;
-  final double? sheetHeight;
-  final Function? changeFuc;
-
  const BangumiPanel({
    super.key,
    required this.pages,
@@ -21,6 +16,11 @@ class BangumiPanel extends StatefulWidget {
    this.changeFuc,
  });

+  final List<EpisodeItem> pages;
+  final int? cid;
+  final double? sheetHeight;
+  final Function? changeFuc;
+
  @override
  State<BangumiPanel> createState() => _BangumiPanelState();
 }
@@ -50,10 +50,10 @@ class _BangumiPanelState extends State<BangumiPanel> {
    }
    videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);

-    videoDetailCtr.cid.listen((p0) {
+    videoDetailCtr.cid.listen((int p0) {
      cid = p0;
      setState(() {});
-      currentIndex = widget.pages.indexWhere((e) => e.cid == cid);
+      currentIndex = widget.pages.indexWhere((EpisodeItem e) => e.cid == cid);
      scrollToIndex();
    });
  }
@@ -106,7 +106,8 @@ class _BangumiPanelState extends State<BangumiPanel> {
                    child: Material(
                      child: ScrollablePositionedList.builder(
                        itemCount: widget.pages.length,
-                        itemBuilder: (context, index) => ListTile(
+                        itemBuilder: (BuildContext context, int index) =>
+                            ListTile(
                          onTap: () {
                            setState(() {
                              changeFucCall(widget.pages[index], index);
@@ -212,78 +213,74 @@ class _BangumiPanelState extends State<BangumiPanel> {
        SizedBox(
          height: 60,
          child: ListView.builder(
-              controller: listViewScrollCtr,
-              scrollDirection: Axis.horizontal,
-              itemCount: widget.pages.length,
-              itemExtent: 150,
-              itemBuilder: ((context, i) {
-                return Container(
-                  width: 150,
-                  margin: const EdgeInsets.only(right: 10),
-                  child: Material(
-                    color: Theme.of(context).colorScheme.onInverseSurface,
-                    borderRadius: BorderRadius.circular(6),
-                    clipBehavior: Clip.hardEdge,
-                    child: InkWell(
-                      onTap: () => changeFucCall(widget.pages[i], i),
-                      child: Padding(
-                        padding: const EdgeInsets.symmetric(
-                            vertical: 8, horizontal: 10),
-                        child: Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Row(
-                              children: [
-                                if (i == currentIndex) ...[
-                                  Image.asset(
-                                    'assets/images/live.png',
-                                    color:
-                                        Theme.of(context).colorScheme.primary,
-                                    height: 12,
-                                  ),
-                                  const SizedBox(width: 6)
-                                ],
-                                Text(
-                                  '第${i + 1}话',
-                                  style: TextStyle(
-                                      fontSize: 13,
-                                      color: i == currentIndex
-                                          ? Theme.of(context)
-                                              .colorScheme
-                                              .primary
-                                          : Theme.of(context)
-                                              .colorScheme
-                                              .onSurface),
+            controller: listViewScrollCtr,
+            scrollDirection: Axis.horizontal,
+            itemCount: widget.pages.length,
+            itemExtent: 150,
+            itemBuilder: (BuildContext context, int i) {
+              return Container(
+                width: 150,
+                margin: const EdgeInsets.only(right: 10),
+                child: Material(
+                  color: Theme.of(context).colorScheme.onInverseSurface,
+                  borderRadius: BorderRadius.circular(6),
+                  clipBehavior: Clip.hardEdge,
+                  child: InkWell(
+                    onTap: () => changeFucCall(widget.pages[i], i),
+                    child: Padding(
+                      padding: const EdgeInsets.symmetric(
+                          vertical: 8, horizontal: 10),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: <Widget>[
+                          Row(
+                            children: [
+                              if (i == currentIndex) ...<Widget>[
+                                Image.asset(
+                                  'assets/images/live.png',
+                                  color: Theme.of(context).colorScheme.primary,
+                                  height: 12,
                                ),
-                                const SizedBox(width: 2),
-                                if (widget.pages[i].badge != null) ...[
-                                  Image.asset(
-                                    'assets/images/big-vip.png',
-                                    height: 16,
-                                  ),
-                                ],
+                                const SizedBox(width: 6)
                              ],
-                            ),
-                            const SizedBox(height: 3),
-                            Text(
-                              widget.pages[i].longTitle!,
-                              maxLines: 1,
-                              style: TextStyle(
-                                  fontSize: 13,
-                                  color: i == currentIndex
-                                      ? Theme.of(context).colorScheme.primary
-                                      : Theme.of(context)
-                                          .colorScheme
-                                          .onSurface),
-                              overflow: TextOverflow.ellipsis,
-                            )
-                          ],
-                        ),
+                              Text(
+                                '第${i + 1}话',
+                                style: TextStyle(
+                                    fontSize: 13,
+                                    color: i == currentIndex
+                                        ? Theme.of(context).colorScheme.primary
+                                        : Theme.of(context)
+                                            .colorScheme
+                                            .onSurface),
+                              ),
+                              const SizedBox(width: 2),
+                              if (widget.pages[i].badge != null) ...[
+                                Image.asset(
+                                  'assets/images/big-vip.png',
+                                  height: 16,
+                                ),
+                              ],
+                            ],
+                          ),
+                          const SizedBox(height: 3),
+                          Text(
+                            widget.pages[i].longTitle!,
+                            maxLines: 1,
+                            style: TextStyle(
+                                fontSize: 13,
+                                color: i == currentIndex
+                                    ? Theme.of(context).colorScheme.primary
+                                    : Theme.of(context).colorScheme.onSurface),
+                            overflow: TextOverflow.ellipsis,
+                          )
+                        ],
                      ),
                    ),
                  ),
-                );
-              })),
+                ),
+              );
+            },
+          ),
        )
      ],
    );
--- a/lib/pages/bangumi/widgets/bangumu_card_v.dart
+++ b/lib/pages/bangumi/widgets/bangumu_card_v.dart
@@ -11,17 +11,16 @@ import 'package:pilipala/common/widgets/network_img_layer.dart';

 // 视频卡片 - 垂直布局
 class BangumiCardV extends StatelessWidget {
-  // ignore: prefer_typing_uninitialized_variables
-  final bangumiItem;
-  final Function()? longPress;
-  final Function()? longPressEnd;
-
  const BangumiCardV({
-    Key? key,
+    super.key,
    required this.bangumiItem,
    this.longPress,
    this.longPressEnd,
-  }) : super(key: key);
+  });
+
+  final bangumiItem;
+  final Function()? longPress;
+  final Function()? longPressEnd;

  @override
  Widget build(BuildContext context) {
@@ -43,9 +42,9 @@ class BangumiCardV extends StatelessWidget {
        // },
        child: InkWell(
          onTap: () async {
-            int seasonId = bangumiItem.seasonId;
+            final int seasonId = bangumiItem.seasonId;
            SmartDialog.showLoading(msg: '获取中...');
-            var res = await SearchHttp.bangumiInfo(seasonId: seasonId);
+            final res = await SearchHttp.bangumiInfo(seasonId: seasonId);
            SmartDialog.dismiss().then((value) {
              if (res['status']) {
                if (res['data'].episodes.isEmpty) {
@@ -81,8 +80,8 @@ class BangumiCardV extends StatelessWidget {
                child: AspectRatio(
                  aspectRatio: 0.65,
                  child: LayoutBuilder(builder: (context, boxConstraints) {
-                    double maxWidth = boxConstraints.maxWidth;
-                    double maxHeight = boxConstraints.maxHeight;
+                    final double maxWidth = boxConstraints.maxWidth;
+                    final double maxHeight = boxConstraints.maxHeight;
                    return Stack(
                      children: [
                        Hero(
@@ -124,9 +123,9 @@ class BangumiCardV extends StatelessWidget {
 }

 class BangumiContent extends StatelessWidget {
+  const BangumiContent({super.key, required this.bangumiItem});
  // ignore: prefer_typing_uninitialized_variables
  final bangumiItem;
-  const BangumiContent({Key? key, required this.bangumiItem}) : super(key: key);
  @override
  Widget build(BuildContext context) {
    return Expanded(
--- a/lib/pages/blacklist/index.dart
+++ b/lib/pages/blacklist/index.dart
@@ -70,7 +70,7 @@ class _BlackListPageState extends State<BlackListPage> {
        onRefresh: () async => await _blackListController.queryBlacklist(),
        child: FutureBuilder(
          future: _futureBuilderFuture,
-          builder: (context, snapshot) {
+          builder: (BuildContext context, AsyncSnapshot snapshot) {
            if (snapshot.connectionState == ConnectionState.done) {
              var data = snapshot.data;
              if (data['status']) {
--- a/lib/pages/danmaku/controller.dart
+++ b/lib/pages/danmaku/controller.dart
@@ -1,26 +1,23 @@
 import 'package:pilipala/http/danmaku.dart';
 import 'package:pilipala/models/danmaku/dm.pb.dart';
-import 'package:pilipala/plugin/pl_player/index.dart';

 class PlDanmakuController {
  PlDanmakuController(this.cid);
  final int cid;
-  Map<int,List<DanmakuElem>> dmSegMap = {};
+  Map<int, List<DanmakuElem>> dmSegMap = {};
  // 已请求的段落标记
  List<bool> requestedSeg = [];

  bool get initiated => requestedSeg.isNotEmpty;

-  static int SEGMENT_LENGTH = 60 * 6 * 1000;
+  static int segmentLength = 60 * 6 * 1000;

  void initiate(int videoDuration, int progress) {
    if (requestedSeg.isEmpty) {
-      int segCount = (videoDuration / SEGMENT_LENGTH).ceil();
+      int segCount = (videoDuration / segmentLength).ceil();
      requestedSeg = List<bool>.generate(segCount, (index) => false);
    }
-    queryDanmaku(
-        calcSegment(progress)
-    );
+    queryDanmaku(calcSegment(progress));
  }

  void dispose() {
@@ -29,17 +26,17 @@ class PlDanmakuController {
  }

  int calcSegment(int progress) {
-    return progress ~/ SEGMENT_LENGTH;
+    return progress ~/ segmentLength;
  }

  void queryDanmaku(int segmentIndex) async {
    assert(requestedSeg[segmentIndex] == false);
    requestedSeg[segmentIndex] = true;
-    DmSegMobileReply result =
-        await DanmakaHttp.queryDanmaku(cid: cid, segmentIndex: segmentIndex + 1);
+    final DmSegMobileReply result = await DanmakaHttp.queryDanmaku(
+        cid: cid, segmentIndex: segmentIndex + 1);
    if (result.elems.isNotEmpty) {
      for (var element in result.elems) {
-        int pos = element.progress ~/ 100;//每0.1秒存储一次
+        int pos = element.progress ~/ 100; //每0.1秒存储一次
        if (dmSegMap[pos] == null) {
          dmSegMap[pos] = [];
        }
--- a/lib/pages/danmaku/view.dart
+++ b/lib/pages/danmaku/view.dart
@@ -1,4 +1,3 @@
-import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
@@ -43,15 +42,13 @@ class _PlDanmakuState extends State<PlDanmaku> {
    super.initState();
    enableShowDanmaku =
        setting.get(SettingBoxKey.enableShowDanmaku, defaultValue: false);
-    _plDanmakuController =
-        PlDanmakuController(widget.cid);
+    _plDanmakuController = PlDanmakuController(widget.cid);
    if (mounted) {
      playerController = widget.playerController;
      if (enableShowDanmaku || playerController.isOpenDanmu.value) {
        _plDanmakuController.initiate(
            playerController.duration.value.inMilliseconds,
-            playerController.position.value.inMilliseconds
-        );
+            playerController.position.value.inMilliseconds);
      }
      playerController
        ..addStatusLister(playerListener)
@@ -61,8 +58,7 @@ class _PlDanmakuState extends State<PlDanmaku> {
      if (p0 && !_plDanmakuController.initiated) {
        _plDanmakuController.initiate(
            playerController.duration.value.inMilliseconds,
-            playerController.position.value.inMilliseconds
-        );
+            playerController.position.value.inMilliseconds);
      }
    });
    blockTypes = playerController.blockTypes;
@@ -87,7 +83,7 @@ class _PlDanmakuState extends State<PlDanmaku> {
      return;
    }
    int currentPosition = position.inMilliseconds;
-    currentPosition -= currentPosition % 100;//取整百的毫秒数
+    currentPosition -= currentPosition % 100; //取整百的毫秒数

    if (currentPosition == latestAddedPosition) {
      return;
@@ -98,17 +94,18 @@ class _PlDanmakuState extends State<PlDanmaku> {
        _plDanmakuController.getCurrentDanmaku(currentPosition);

    if (currentDanmakuList != null) {
-      Color? defaultColor = playerController.blockTypes.contains(6) ?
-        DmUtils.decimalToColor(16777215) : null;
+      Color? defaultColor = playerController.blockTypes.contains(6)
+          ? DmUtils.decimalToColor(16777215)
+          : null;

-      _controller!.addItems(
-        currentDanmakuList.map((e) => DanmakuItem(
-          e.content,
-          color: defaultColor ?? DmUtils.decimalToColor(e.color),
-          time: e.progress,
-          type: DmUtils.getPosition(e.mode),
-        )).toList()
-      );
+      _controller!.addItems(currentDanmakuList
+          .map((e) => DanmakuItem(
+                e.content,
+                color: defaultColor ?? DmUtils.decimalToColor(e.color),
+                time: e.progress,
+                type: DmUtils.getPosition(e.mode),
+              ))
+          .toList());
    }
  }

@@ -137,7 +134,8 @@ class _PlDanmakuState extends State<PlDanmaku> {
              hideTop: blockTypes.contains(5),
              hideScroll: blockTypes.contains(2),
              hideBottom: blockTypes.contains(4),
-              duration: danmakuDurationVal / widget.playerController.playbackSpeed,
+              duration:
+                  danmakuDurationVal / widget.playerController.playbackSpeed,
              // initDuration /
              //     (danmakuSpeedVal * widget.playerController.playbackSpeed),
            ),
--- a/lib/pages/dynamics/detail/controller.dart
+++ b/lib/pages/dynamics/detail/controller.dart
--- a/lib/pages/dynamics/detail/index.dart
+++ b/lib/pages/dynamics/detail/index.dart
--- a/lib/pages/dynamics/detail/view.dart
+++ b/lib/pages/dynamics/detail/view.dart
@@ -8,11 +8,11 @@ import 'package:pilipala/common/skeleton/video_reply.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/models/common/reply_type.dart';
 import 'package:pilipala/models/dynamics/result.dart';
-import 'package:pilipala/pages/dynamics/deatil/index.dart';
+import 'package:pilipala/pages/dynamics/detail/index.dart';
 import 'package:pilipala/pages/dynamics/widgets/author_panel.dart';
 import 'package:pilipala/pages/video/detail/reply/widgets/reply_item.dart';
-import 'package:pilipala/pages/video/detail/replyNew/index.dart';
-import 'package:pilipala/pages/video/detail/replyReply/index.dart';
+import 'package:pilipala/pages/video/detail/reply_new/index.dart';
+import 'package:pilipala/pages/video/detail/reply_reply/index.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/id_utils.dart';

--- a/lib/pages/dynamics/widgets/author_panel.dart
+++ b/lib/pages/dynamics/widgets/author_panel.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
-import 'package:pilipala/common/widgets/badge.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/http/user.dart';
 import 'package:pilipala/utils/feed_back.dart';
--- a/lib/pages/dynamics/widgets/up_panel.dart
+++ b/lib/pages/dynamics/widgets/up_panel.dart
@@ -139,7 +139,7 @@ class _UpPanelState extends State<UpPanel> {
          int liveLen = liveList.length;
          int upLen = upList.length;
          double itemWidth = contentWidth + itemPadding.horizontal;
-          double screenWidth = MediaQuery.of(context).size.width;
+          double screenWidth = MediaQuery.sizeOf(context).width;
          double moveDistance = 0.0;
          if (itemWidth * (upList.length + liveList.length) <= screenWidth) {
          } else if ((upLen - i - 0.5) * itemWidth > screenWidth / 2) {
--- a/lib/pages/fav_detail/controller.dart
+++ b/lib/pages/fav_detail/controller.dart
--- a/lib/pages/fav_detail/index.dart
+++ b/lib/pages/fav_detail/index.dart
--- a/lib/pages/fav_detail/view.dart
+++ b/lib/pages/fav_detail/view.dart
@@ -7,7 +7,7 @@ import 'package:pilipala/common/skeleton/video_card_h.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/common/widgets/no_data.dart';
-import 'package:pilipala/pages/favDetail/index.dart';
+import 'package:pilipala/pages/fav_detail/index.dart';

 import 'widget/fav_video_card.dart';

--- a/lib/pages/fav_detail/widget/fav_video_card.dart
+++ b/lib/pages/fav_detail/widget/fav_video_card.dart
--- a/lib/pages/fav_search/view.dart
+++ b/lib/pages/fav_search/view.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/skeleton/video_card_h.dart';
 import 'package:pilipala/common/widgets/no_data.dart';
-import 'package:pilipala/pages/favDetail/widget/fav_video_card.dart';
+import 'package:pilipala/pages/fav_detail/widget/fav_video_card.dart';

 import 'controller.dart';

--- a/lib/pages/home/controller.dart
+++ b/lib/pages/home/controller.dart
@@ -9,7 +9,7 @@ import 'package:pilipala/utils/storage.dart';
 class HomeController extends GetxController with GetTickerProviderStateMixin {
  bool flag = false;
  late List tabs;
-  int initialIndex = 1;
+  RxInt initialIndex = 1.obs;
  late TabController tabController;
  late List tabsCtrList;
  late List<Widget> tabsPageList;
@@ -35,7 +35,7 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
    tabsPageList = tabsConfig.map<Widget>((e) => e['page']).toList();

    tabController = TabController(
-      initialIndex: initialIndex,
+      initialIndex: initialIndex.value,
      length: tabs.length,
      vsync: this,
    );
--- a/lib/pages/home/view.dart
+++ b/lib/pages/home/view.dart
@@ -30,7 +30,7 @@ class _HomePageState extends State<HomePage>
    stream = _homeController.searchBarStream.stream;
  }

-  showUserBottonSheet() {
+  showUserBottomSheet() {
    feedBack();
    showModalBottomSheet(
      context: context,
@@ -49,47 +49,47 @@ class _HomePageState extends State<HomePage>
    return Scaffold(
      extendBody: true,
      extendBodyBehindAppBar: true,
-      appBar: AppBar(toolbarHeight: 0, elevation: 0),
-      body: Column(
+      body: Stack(
        children: [
-          CustomAppBar(
-            stream: _homeController.hideSearchBar
-                ? stream
-                : StreamController<bool>.broadcast().stream,
-            ctr: _homeController,
-            callback: showUserBottonSheet,
-          ),
-          const SizedBox(height: 8),
-          SizedBox(
-            width: double.infinity,
-            height: 42,
-            child: Align(
-              alignment: Alignment.center,
-              child: TabBar(
-                controller: _homeController.tabController,
-                tabs: [
-                  for (var i in _homeController.tabs) Tab(text: i['label'])
-                ],
-                isScrollable: true,
-                dividerColor: Colors.transparent,
-                enableFeedback: true,
-                splashBorderRadius: BorderRadius.circular(10),
-                tabAlignment: TabAlignment.center,
-                onTap: (value) {
-                  feedBack();
-                  if (_homeController.initialIndex == value) {
-                    _homeController.tabsCtrList[value]().animateToTop();
-                  }
-                  _homeController.initialIndex = value;
-                },
+          // gradient background
+          Align(
+            alignment: Alignment.topLeft,
+            child: Opacity(
+              opacity: 0.6,
+              child: Container(
+                width: MediaQuery.of(context).size.width,
+                height: MediaQuery.of(context).size.height,
+                decoration: BoxDecoration(
+                  gradient: LinearGradient(
+                      colors: [
+                        Theme.of(context).colorScheme.primary.withOpacity(0.9),
+                        Theme.of(context).colorScheme.primary.withOpacity(0.5),
+                        Theme.of(context).colorScheme.surface
+                      ],
+                      begin: Alignment.topLeft,
+                      end: Alignment.bottomRight,
+                      stops: const [0, 0.0034, 0.34]),
+                ),
              ),
            ),
          ),
-          Expanded(
-            child: TabBarView(
-              controller: _homeController.tabController,
-              children: _homeController.tabsPageList,
-            ),
+          Column(
+            children: [
+              CustomAppBar(
+                stream: _homeController.hideSearchBar
+                    ? stream
+                    : StreamController<bool>.broadcast().stream,
+                ctr: _homeController,
+                callback: showUserBottomSheet,
+              ),
+              const CustomTabs(),
+              Expanded(
+                child: TabBarView(
+                  controller: _homeController.tabController,
+                  children: _homeController.tabsPageList,
+                ),
+              ),
+            ],
          ),
        ],
      ),
@@ -119,87 +119,22 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
    return StreamBuilder(
      stream: stream,
      initialData: true,
-      builder: (context, AsyncSnapshot snapshot) {
+      builder: (BuildContext context, AsyncSnapshot snapshot) {
+        final RxBool isUserLoggedIn = ctr!.userLogin;
+        final double top = MediaQuery.of(context).padding.top;
        return AnimatedOpacity(
          opacity: snapshot.data ? 1 : 0,
          duration: const Duration(milliseconds: 300),
          child: AnimatedContainer(
            curve: Curves.easeInOutCubicEmphasized,
            duration: const Duration(milliseconds: 500),
-            height: snapshot.data
-                ? MediaQuery.of(context).padding.top + 52
-                : MediaQuery.of(context).padding.top - 10,
-            child: Container(
-              padding: EdgeInsets.only(
-                left: 20,
-                right: 20,
-                bottom: 0,
-                top: MediaQuery.of(context).padding.top + 4,
-              ),
-              child: Row(
-                children: [
-                  const Expanded(child: SearchPage()),
-                  if (ctr!.userLogin.value) ...[
-                    const SizedBox(width: 6),
-                    IconButton(
-                        onPressed: () => Get.toNamed('/whisper'),
-                        icon: const Icon(Icons.notifications_none))
-                  ],
-                  const SizedBox(width: 6),
-                  Obx(
-                    () => ctr!.userLogin.value
-                        ? Stack(
-                            children: [
-                              Obx(
-                                () => NetworkImgLayer(
-                                  type: 'avatar',
-                                  width: 34,
-                                  height: 34,
-                                  src: ctr!.userFace.value,
-                                ),
-                              ),
-                              Positioned.fill(
-                                child: Material(
-                                  color: Colors.transparent,
-                                  child: InkWell(
-                                    onTap: () => callback!(),
-                                    splashColor: Theme.of(context)
-                                        .colorScheme
-                                        .primaryContainer
-                                        .withOpacity(0.3),
-                                    borderRadius: const BorderRadius.all(
-                                      Radius.circular(50),
-                                    ),
-                                  ),
-                                ),
-                              )
-                            ],
-                          )
-                        : SizedBox(
-                            width: 38,
-                            height: 38,
-                            child: IconButton(
-                              style: ButtonStyle(
-                                padding:
-                                    MaterialStateProperty.all(EdgeInsets.zero),
-                                backgroundColor:
-                                    MaterialStateProperty.resolveWith((states) {
-                                  return Theme.of(context)
-                                      .colorScheme
-                                      .onInverseSurface;
-                                }),
-                              ),
-                              onPressed: () => callback!(),
-                              icon: Icon(
-                                Icons.person_rounded,
-                                size: 22,
-                                color: Theme.of(context).colorScheme.primary,
-                              ),
-                            ),
-                          ),
-                  ),
-                ],
-              ),
+            height: snapshot.data ? top + 52 : top,
+            padding: EdgeInsets.fromLTRB(14, top, 14, 0),
+            child: UserInfoWidget(
+              top: top,
+              userLogin: isUserLoggedIn,
+              userFace: ctr?.userFace.value,
+              callback: () => callback!(),
            ),
          ),
        );
@@ -207,3 +142,244 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
    );
  }
 }
+
+class UserInfoWidget extends StatelessWidget {
+  const UserInfoWidget({
+    Key? key,
+    required this.top,
+    required this.userLogin,
+    required this.userFace,
+    required this.callback,
+  }) : super(key: key);
+
+  final double top;
+  final RxBool userLogin;
+  final String? userFace;
+  final VoidCallback? callback;
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      children: [
+        const SearchBar(),
+        if (userLogin.value) ...[
+          const SizedBox(width: 4),
+          ClipRect(
+            child: IconButton(
+              onPressed: () => Get.toNamed('/whisper'),
+              icon: const Icon(Icons.notifications_none),
+            ),
+          )
+        ],
+        const SizedBox(width: 8),
+        Obx(
+          () => userLogin.value
+              ? Stack(
+                  children: [
+                    NetworkImgLayer(
+                      type: 'avatar',
+                      width: 34,
+                      height: 34,
+                      src: userFace,
+                    ),
+                    Positioned.fill(
+                      child: Material(
+                        color: Colors.transparent,
+                        child: InkWell(
+                          onTap: () => callback?.call(),
+                          splashColor: Theme.of(context)
+                              .colorScheme
+                              .primaryContainer
+                              .withOpacity(0.3),
+                          borderRadius: const BorderRadius.all(
+                            Radius.circular(50),
+                          ),
+                        ),
+                      ),
+                    )
+                  ],
+                )
+              : DefaultUser(callback: () => callback!()),
+        ),
+      ],
+    );
+  }
+}
+
+class DefaultUser extends StatelessWidget {
+  const DefaultUser({super.key, this.callback});
+  final Function? callback;
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      width: 38,
+      height: 38,
+      child: IconButton(
+        style: ButtonStyle(
+          padding: MaterialStateProperty.all(EdgeInsets.zero),
+          backgroundColor: MaterialStateProperty.resolveWith((states) {
+            return Theme.of(context).colorScheme.onInverseSurface;
+          }),
+        ),
+        onPressed: () => callback?.call(),
+        icon: Icon(
+          Icons.person_rounded,
+          size: 22,
+          color: Theme.of(context).colorScheme.primary,
+        ),
+      ),
+    );
+  }
+}
+
+class CustomTabs extends StatefulWidget {
+  const CustomTabs({super.key});
+
+  @override
+  State<CustomTabs> createState() => _CustomTabsState();
+}
+
+class _CustomTabsState extends State<CustomTabs> {
+  final HomeController _homeController = Get.put(HomeController());
+  int currentTabIndex = 1;
+
+  @override
+  void initState() {
+    super.initState();
+    _homeController.tabController.addListener(listen);
+  }
+
+  void listen() {
+    _homeController.initialIndex.value = _homeController.tabController.index;
+  }
+
+  void onTap(int index) {
+    feedBack();
+    if (_homeController.initialIndex.value == index) {
+      _homeController.tabsCtrList[index]().animateToTop();
+    }
+    _homeController.initialIndex.value = index;
+    _homeController.tabController.index = index;
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    _homeController.tabController.removeListener(listen);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      height: 44,
+      margin: const EdgeInsets.only(top: 4),
+      child: ListView.separated(
+        padding: const EdgeInsets.symmetric(horizontal: 14.0),
+        scrollDirection: Axis.horizontal,
+        itemCount: _homeController.tabs.length,
+        separatorBuilder: (BuildContext context, int index) {
+          return const SizedBox(width: 10);
+        },
+        itemBuilder: (BuildContext context, int index) {
+          String label = _homeController.tabs[index]['label'];
+          return Obx(
+            () => CustomChip(
+              onTap: () => onTap(index),
+              label: label,
+              selected: index == _homeController.initialIndex.value,
+            ),
+          );
+        },
+      ),
+    );
+  }
+}
+
+class CustomChip extends StatelessWidget {
+  final Function onTap;
+  final String label;
+  final bool selected;
+  const CustomChip({
+    super.key,
+    required this.onTap,
+    required this.label,
+    required this.selected,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final ColorScheme colorTheme = Theme.of(context).colorScheme;
+    final Color secondaryContainer = colorTheme.secondaryContainer;
+    final TextStyle chipTextStyle = selected
+        ? const TextStyle(fontWeight: FontWeight.bold, fontSize: 13)
+        : const TextStyle(fontSize: 13);
+    final ColorScheme colorScheme = Theme.of(context).colorScheme;
+    const VisualDensity visualDensity =
+        VisualDensity(horizontal: -4.0, vertical: -2.0);
+    return InputChip(
+      side: BorderSide(
+        color: selected
+            ? colorScheme.onSecondaryContainer.withOpacity(0.2)
+            : Colors.transparent,
+      ),
+      backgroundColor: secondaryContainer,
+      selectedColor: secondaryContainer,
+      color: MaterialStateProperty.resolveWith<Color>(
+          (Set<MaterialState> states) => secondaryContainer.withAlpha(200)),
+      padding: const EdgeInsets.fromLTRB(7, 1, 7, 1),
+      label: Text(label, style: chipTextStyle),
+      onPressed: () => onTap(),
+      selected: selected,
+      showCheckmark: false,
+      visualDensity: visualDensity,
+    );
+  }
+}
+
+class SearchBar extends StatelessWidget {
+  const SearchBar({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final SSearchController searchController = Get.put(SSearchController());
+    final ColorScheme colorScheme = Theme.of(context).colorScheme;
+    return Expanded(
+      child: Container(
+        width: 250,
+        height: 44,
+        clipBehavior: Clip.hardEdge,
+        decoration: BoxDecoration(
+          borderRadius: BorderRadius.circular(25),
+        ),
+        child: Material(
+          color: colorScheme.onSecondaryContainer.withOpacity(0.05),
+          child: InkWell(
+            splashColor: colorScheme.primaryContainer.withOpacity(0.3),
+            onTap: () => Get.toNamed('/search'),
+            child: Row(
+              children: [
+                const SizedBox(width: 14),
+                Icon(
+                  Icons.search_outlined,
+                  color: colorScheme.onSecondaryContainer,
+                ),
+                const SizedBox(width: 10),
+                Expanded(
+                  child: Obx(
+                    () => Text(
+                      searchController.defaultSearch.value,
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                      style: TextStyle(color: colorScheme.outline),
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
--- a/lib/pages/hot/view.dart
+++ b/lib/pages/hot/view.dart
@@ -70,68 +70,66 @@ class _HotPageState extends State<HotPage> with AutomaticKeepAliveClientMixin {
  @override
  Widget build(BuildContext context) {
    super.build(context);
-    return Scaffold(
-      body: RefreshIndicator(
-        onRefresh: () async {
-          return await _hotController.onRefresh();
-        },
-        child: CustomScrollView(
-          controller: _hotController.scrollController,
-          slivers: [
-            SliverPadding(
-              // 单列布局 EdgeInsets.zero
-              padding:
-                  const EdgeInsets.fromLTRB(0, StyleString.safeSpace - 5, 0, 0),
-              sliver: FutureBuilder(
-                future: _futureBuilderFuture,
-                builder: (context, snapshot) {
-                  if (snapshot.connectionState == ConnectionState.done) {
-                    Map data = snapshot.data as Map;
-                    if (data['status']) {
-                      return Obx(
-                        () => SliverList(
-                          delegate:
-                              SliverChildBuilderDelegate((context, index) {
-                            return VideoCardH(
-                              videoItem: _hotController.videoList[index],
-                              showPubdate: true,
-                              longPress: () {
-                                _hotController.popupDialog = _createPopupDialog(
-                                    _hotController.videoList[index]);
-                                Overlay.of(context)
-                                    .insert(_hotController.popupDialog!);
-                              },
-                              longPressEnd: () {
-                                _hotController.popupDialog?.remove();
-                              },
-                            );
-                          }, childCount: _hotController.videoList.length),
-                        ),
-                      );
-                    } else {
-                      return HttpError(
-                        errMsg: data['msg'],
-                        fn: () => setState(() {}),
-                      );
-                    }
+    return RefreshIndicator(
+      onRefresh: () async {
+        return await _hotController.onRefresh();
+      },
+      child: CustomScrollView(
+        controller: _hotController.scrollController,
+        slivers: [
+          SliverPadding(
+            // 单列布局 EdgeInsets.zero
+            padding:
+                const EdgeInsets.fromLTRB(0, StyleString.safeSpace - 5, 0, 0),
+            sliver: FutureBuilder(
+              future: _futureBuilderFuture,
+              builder: (context, snapshot) {
+                if (snapshot.connectionState == ConnectionState.done) {
+                  Map data = snapshot.data as Map;
+                  if (data['status']) {
+                    return Obx(
+                      () => SliverList(
+                        delegate:
+                            SliverChildBuilderDelegate((context, index) {
+                          return VideoCardH(
+                            videoItem: _hotController.videoList[index],
+                            showPubdate: true,
+                            longPress: () {
+                              _hotController.popupDialog = _createPopupDialog(
+                                  _hotController.videoList[index]);
+                              Overlay.of(context)
+                                  .insert(_hotController.popupDialog!);
+                            },
+                            longPressEnd: () {
+                              _hotController.popupDialog?.remove();
+                            },
+                          );
+                        }, childCount: _hotController.videoList.length),
+                      ),
+                    );
                  } else {
-                    // 骨架屏
-                    return SliverList(
-                      delegate: SliverChildBuilderDelegate((context, index) {
-                        return const VideoCardHSkeleton();
-                      }, childCount: 10),
+                    return HttpError(
+                      errMsg: data['msg'],
+                      fn: () => setState(() {}),
                    );
                  }
-                },
-              ),
+                } else {
+                  // 骨架屏
+                  return SliverList(
+                    delegate: SliverChildBuilderDelegate((context, index) {
+                      return const VideoCardHSkeleton();
+                    }, childCount: 10),
+                  );
+                }
+              },
            ),
-            SliverToBoxAdapter(
-              child: SizedBox(
-                height: MediaQuery.of(context).padding.bottom + 10,
-              ),
-            )
-          ],
-        ),
+          ),
+          SliverToBoxAdapter(
+            child: SizedBox(
+              height: MediaQuery.of(context).padding.bottom + 10,
+            ),
+          )
+        ],
      ),
    );
  }
--- a/lib/pages/html/view.dart
+++ b/lib/pages/html/view.dart
@@ -10,8 +10,8 @@ import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/models/common/reply_type.dart';
 import 'package:pilipala/pages/video/detail/reply/widgets/reply_item.dart';
-import 'package:pilipala/pages/video/detail/replyNew/index.dart';
-import 'package:pilipala/pages/video/detail/replyReply/index.dart';
+import 'package:pilipala/pages/video/detail/reply_new/index.dart';
+import 'package:pilipala/pages/video/detail/reply_reply/index.dart';
 import 'package:pilipala/utils/feed_back.dart';

 import 'controller.dart';
--- a/lib/pages/live_room/controller.dart
+++ b/lib/pages/live_room/controller.dart
--- a/lib/pages/live_room/index.dart
+++ b/lib/pages/live_room/index.dart
--- a/lib/pages/live_room/view.dart
+++ b/lib/pages/live_room/view.dart
--- a/lib/pages/live_room/widgets/bottom_control.dart
+++ b/lib/pages/live_room/widgets/bottom_control.dart
@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/models/video/play/url.dart';
-import 'package:pilipala/pages/liveRoom/index.dart';
+import 'package:pilipala/pages/live_room/index.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
 import 'package:pilipala/utils/storage.dart';

--- a/lib/pages/main/controller.dart
+++ b/lib/pages/main/controller.dart
@@ -19,11 +19,11 @@ class MainController extends GetxController {
  RxList navigationBars = [
    {
      'icon': const Icon(
-        Icons.favorite_outline,
+        Icons.home_outlined,
        size: 21,
      ),
      'selectIcon': const Icon(
-        Icons.favorite,
+        Icons.home,
        size: 21,
      ),
      'label': "首页",
@@ -41,11 +41,11 @@ class MainController extends GetxController {
    },
    {
      'icon': const Icon(
-        Icons.folder_outlined,
+        Icons.video_collection_outlined,
        size: 20,
      ),
      'selectIcon': const Icon(
-        Icons.folder,
+        Icons.video_collection,
        size: 21,
      ),
      'label': "媒体库",
--- a/lib/pages/main/view.dart
+++ b/lib/pages/main/view.dart
@@ -88,9 +88,9 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
  Widget build(BuildContext context) {
    Box localCache = GStrorage.localCache;
    double statusBarHeight = MediaQuery.of(context).padding.top;
-    double sheetHeight = MediaQuery.of(context).size.height -
+    double sheetHeight = MediaQuery.sizeOf(context).height -
        MediaQuery.of(context).padding.top -
-        MediaQuery.of(context).size.width * 9 / 16;
+        MediaQuery.sizeOf(context).width * 9 / 16;
    localCache.put('sheetHeight', sheetHeight);
    localCache.put('statusBarHeight', statusBarHeight);
    return PopScope(
--- a/lib/pages/member/view.dart
+++ b/lib/pages/member/view.dart
@@ -41,7 +41,7 @@ class _MemberPageState extends State<MemberPage>
    _memberCoinsFuture = _memberController.getRecentCoinVideo();
    _extendNestCtr.addListener(
      () {
-        double offset = _extendNestCtr.position.pixels;
+        final double offset = _extendNestCtr.position.pixels;
        if (offset > 100) {
          appbarStream.add(true);
        } else {
@@ -67,7 +67,7 @@ class _MemberPageState extends State<MemberPage>
            title: StreamBuilder(
              stream: appbarStream.stream,
              initialData: false,
-              builder: (context, AsyncSnapshot snapshot) {
+              builder: (BuildContext context, AsyncSnapshot snapshot) {
                return AnimatedOpacity(
                  opacity: snapshot.data ? 1 : 0,
                  curve: Curves.easeOut,
--- a/lib/pages/member_archive/view.dart
+++ b/lib/pages/member_archive/view.dart
@@ -87,7 +87,7 @@ class _MemberArchivePageState extends State<MemberArchivePage> {
        slivers: [
          FutureBuilder(
            future: _futureBuilderFuture,
-            builder: (context, snapshot) {
+            builder: (BuildContext context, snapshot) {
              if (snapshot.connectionState == ConnectionState.done) {
                if (snapshot.data != null) {
                  Map data = snapshot.data as Map;
@@ -97,7 +97,7 @@ class _MemberArchivePageState extends State<MemberArchivePage> {
                      () => list.isNotEmpty
                          ? SliverList(
                              delegate: SliverChildBuilderDelegate(
-                                (context, index) {
+                                (BuildContext context, index) {
                                  return VideoCardH(
                                    videoItem: list[index],
                                    showOwner: false,
--- a/lib/pages/search/controller.dart
+++ b/lib/pages/search/controller.dart
@@ -20,7 +20,7 @@ class SSearchController extends GetxController {
  final _debouncer =
      Debouncer(delay: const Duration(milliseconds: 200)); // 设置延迟时间
  String hintText = '搜索';
-  RxString defaultSearch = '输入关键词搜索'.obs;
+  RxString defaultSearch = ''.obs;
  Box setting = GStrorage.setting;
  bool enableHotKey = true;

--- a/lib/pages/search/view.dart
+++ b/lib/pages/search/view.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:animations/animations.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'controller.dart';
@@ -42,120 +41,62 @@ class _SearchPageState extends State<SearchPage> with RouteAware {

  @override
  Widget build(BuildContext context) {
-    return OpenContainer(
-      closedElevation: 0,
-      openElevation: 0,
-      onClosed: (_) => _searchController.onClear(),
-      openColor: Theme.of(context).colorScheme.background,
-      middleColor: Theme.of(context).colorScheme.background,
-      closedColor: Theme.of(context).colorScheme.background,
-      closedShape: const RoundedRectangleBorder(
-          borderRadius: BorderRadius.all(Radius.circular(30.0))),
-      openShape: const RoundedRectangleBorder(
-          borderRadius: BorderRadius.all(Radius.circular(30.0))),
-      closedBuilder: (BuildContext context, VoidCallback openContainer) {
-        return Container(
-          width: 250,
-          height: 44,
-          clipBehavior: Clip.hardEdge,
-          decoration: const BoxDecoration(
-            borderRadius: BorderRadius.all(Radius.circular(25)),
+    return Scaffold(
+      resizeToAvoidBottomInset: false,
+      appBar: AppBar(
+        shape: Border(
+          bottom: BorderSide(
+            color: Theme.of(context).dividerColor.withOpacity(0.08),
+            width: 1,
          ),
-          child: Material(
-            color:
-                Theme.of(context).colorScheme.secondaryContainer.withAlpha(115),
-            child: InkWell(
-              splashColor: Theme.of(context)
-                  .colorScheme
-                  .primaryContainer
-                  .withOpacity(0.3),
-              onTap: openContainer,
-              child: Row(
-                children: [
-                  const SizedBox(width: 14),
-                  Icon(
-                    Icons.search_outlined,
-                    color: Theme.of(context).colorScheme.onSecondaryContainer,
-                  ),
-                  const SizedBox(width: 10),
-                  Expanded(
-                    child: Obx(
-                      () => Text(
-                        _searchController.defaultSearch.value,
-                        maxLines: 1,
-                        overflow: TextOverflow.ellipsis,
-                        style: TextStyle(
-                          color: Theme.of(context).colorScheme.outline,
-                        ),
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
+        ),
+        titleSpacing: 0,
+        actions: [
+          IconButton(
+            onPressed: () => _searchController.submit(),
+            icon: const Icon(CupertinoIcons.search, size: 22),
          ),
-        );
-      },
-      openBuilder: (BuildContext context, VoidCallback _) {
-        return Scaffold(
-          resizeToAvoidBottomInset: false,
-          appBar: AppBar(
-            shape: Border(
-              bottom: BorderSide(
-                color: Theme.of(context).dividerColor.withOpacity(0.08),
-                width: 1,
-              ),
-            ),
-            titleSpacing: 0,
-            actions: [
-              Hero(
-                tag: 'searchTag',
-                child: IconButton(
-                    onPressed: () => _searchController.submit(),
-                    icon: const Icon(CupertinoIcons.search, size: 22)),
-              ),
-              const SizedBox(width: 10)
-            ],
-            title: Obx(
-              () => TextField(
-                autofocus: true,
-                focusNode: _searchController.searchFocusNode,
-                controller: _searchController.controller.value,
-                textInputAction: TextInputAction.search,
-                onChanged: (value) => _searchController.onChange(value),
-                decoration: InputDecoration(
-                  hintText: _searchController.hintText,
-                  border: InputBorder.none,
-                  suffixIcon: IconButton(
-                    icon: Icon(
-                      Icons.clear,
-                      size: 22,
-                      color: Theme.of(context).colorScheme.outline,
-                    ),
-                    onPressed: () => _searchController.onClear(),
-                  ),
+          const SizedBox(width: 10)
+        ],
+        title: Obx(
+          () => TextField(
+            autofocus: true,
+            focusNode: _searchController.searchFocusNode,
+            controller: _searchController.controller.value,
+            textInputAction: TextInputAction.search,
+            onChanged: (value) => _searchController.onChange(value),
+            decoration: InputDecoration(
+              hintText: _searchController.hintText,
+              border: InputBorder.none,
+              suffixIcon: IconButton(
+                icon: Icon(
+                  Icons.clear,
+                  size: 22,
+                  color: Theme.of(context).colorScheme.outline,
                ),
-                onSubmitted: (String value) => _searchController.submit(),
+                onPressed: () => _searchController.onClear(),
              ),
            ),
+            onSubmitted: (String value) => _searchController.submit(),
          ),
-          body: SingleChildScrollView(
-            child: Column(
-              children: [
-                const SizedBox(height: 12),
-                // 搜索建议
-                _searchSuggest(),
-                // 热搜
-                Visibility(
-                    visible: _searchController.enableHotKey,
-                    child: hotSearch(_searchController)),
-                // 搜索历史
-                _history()
-              ],
+        ),
+      ),
+      body: SingleChildScrollView(
+        child: Column(
+          children: [
+            const SizedBox(height: 12),
+            // 搜索建议
+            _searchSuggest(),
+            // 热搜
+            Visibility(
+              visible: _searchController.enableHotKey,
+              child: hotSearch(_searchController),
            ),
-          ),
-        );
-      },
+            // 搜索历史
+            _history()
+          ],
+        ),
+      ),
    );
  }

@@ -299,25 +240,24 @@ class _SearchPageState extends State<SearchPage> with RouteAware {
                  ],
                ),
              ),
-            // if (_searchController.historyList.isNotEmpty)
-            Obx(() => Wrap(
-                  spacing: 8,
-                  runSpacing: 8,
-                  direction: Axis.horizontal,
-                  textDirection: TextDirection.ltr,
-                  children: [
-                    for (int i = 0;
-                        i < _searchController.historyList.length;
-                        i++)
-                      SearchText(
-                        searchText: _searchController.historyList[i],
-                        searchTextIdx: i,
-                        onSelect: (value) => _searchController.onSelect(value),
-                        onLongSelect: (value) =>
-                            _searchController.onLongSelect(value),
-                      )
-                  ],
-                )),
+            Obx(
+              () => Wrap(
+                spacing: 8,
+                runSpacing: 8,
+                direction: Axis.horizontal,
+                textDirection: TextDirection.ltr,
+                children: [
+                  for (int i = 0; i < _searchController.historyList.length; i++)
+                    SearchText(
+                      searchText: _searchController.historyList[i],
+                      searchTextIdx: i,
+                      onSelect: (value) => _searchController.onSelect(value),
+                      onLongSelect: (value) =>
+                          _searchController.onLongSelect(value),
+                    )
+                ],
+              ),
+            ),
          ],
        ),
      ),
--- a/lib/pages/search_panel/controller.dart
+++ b/lib/pages/search_panel/controller.dart
--- a/lib/pages/search_panel/index.dart
+++ b/lib/pages/search_panel/index.dart
--- a/lib/pages/search_panel/view.dart
+++ b/lib/pages/search_panel/view.dart
--- a/lib/pages/search_panel/widgets/article_panel.dart
+++ b/lib/pages/search_panel/widgets/article_panel.dart
--- a/lib/pages/search_panel/widgets/live_panel.dart
+++ b/lib/pages/search_panel/widgets/live_panel.dart
@@ -16,7 +16,7 @@ Widget searchLivePanel(BuildContext context, ctr, list) {
          crossAxisSpacing: StyleString.cardSpace + 2,
          mainAxisSpacing: StyleString.cardSpace + 3,
          mainAxisExtent:
-              MediaQuery.of(context).size.width / 2 / StyleString.aspectRatio +
+              MediaQuery.sizeOf(context).width / 2 / StyleString.aspectRatio +
                  66 * MediaQuery.of(context).textScaleFactor),
      itemCount: list.length,
      itemBuilder: (context, index) {
--- a/lib/pages/search_panel/widgets/media_bangumi_panel.dart
+++ b/lib/pages/search_panel/widgets/media_bangumi_panel.dart
--- a/lib/pages/search_panel/widgets/user_panel.dart
+++ b/lib/pages/search_panel/widgets/user_panel.dart
--- a/lib/pages/search_panel/widgets/video_panel.dart
+++ b/lib/pages/search_panel/widgets/video_panel.dart
@@ -3,7 +3,7 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/video_card_h.dart';
 import 'package:pilipala/models/common/search_type.dart';
-import 'package:pilipala/pages/searchPanel/index.dart';
+import 'package:pilipala/pages/search_panel/index.dart';

 class SearchVideoPanel extends StatelessWidget {
  SearchVideoPanel({
--- a/lib/pages/search_result/controller.dart
+++ b/lib/pages/search_result/controller.dart
--- a/lib/pages/search_result/index.dart
+++ b/lib/pages/search_result/index.dart
--- a/lib/pages/search_result/view.dart
+++ b/lib/pages/search_result/view.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/models/common/search_type.dart';
-import 'package:pilipala/pages/searchPanel/index.dart';
+import 'package:pilipala/pages/search_panel/index.dart';
 import 'controller.dart';

 class SearchResultPage extends StatefulWidget {
--- a/lib/pages/video/detail/controller.dart
+++ b/lib/pages/video/detail/controller.dart
@@ -12,7 +12,7 @@ import 'package:pilipala/models/common/search_type.dart';
 import 'package:pilipala/models/video/play/quality.dart';
 import 'package:pilipala/models/video/play/url.dart';
 import 'package:pilipala/models/video/reply/item.dart';
-import 'package:pilipala/pages/video/detail/replyReply/index.dart';
+import 'package:pilipala/pages/video/detail/reply_reply/index.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
@@ -92,7 +92,7 @@ class VideoDetailController extends GetxController
  @override
  void onInit() {
    super.onInit();
-    Map argMap = Get.arguments;
+    final Map argMap = Get.arguments;
    userInfo = userInfoCache.get('userInfoCache');
    var keys = argMap.keys.toList();
    if (keys.isNotEmpty) {
@@ -188,8 +188,8 @@ class VideoDetailController extends GetxController

    /// 根据currentAudioQa 重新设置audioUrl
    if (currentAudioQa != null) {
-      AudioItem firstAudio = data.dash!.audio!.firstWhere(
-        (i) => i.id == currentAudioQa!.code,
+      final AudioItem firstAudio = data.dash!.audio!.firstWhere(
+        (AudioItem i) => i.id == currentAudioQa!.code,
        orElse: () => data.dash!.audio!.first,
      );
      audioUrl = firstAudio.baseUrl ?? '';
@@ -246,7 +246,7 @@ class VideoDetailController extends GetxController
    var result = await VideoHttp.videoUrl(cid: cid.value, bvid: bvid);
    if (result['status']) {
      data = result['data'];
-      List<VideoItem> allVideosList = data.dash!.video!;
+      final List<VideoItem> allVideosList = data.dash!.video!;
      try {
        // 当前可播放的最高质量视频
        int currentHighVideoQa = allVideosList.first.quality!.code;
@@ -255,7 +255,7 @@ class VideoDetailController extends GetxController
        int resVideoQa = currentHighVideoQa;
        if (cacheVideoQa! <= currentHighVideoQa) {
          // 如果预设的画质低于当前最高
-          List<int> numbers = data.acceptQuality!
+          final List<int> numbers = data.acceptQuality!
              .where((e) => e <= currentHighVideoQa)
              .toList();
          resVideoQa = Utils.findClosestNumber(cacheVideoQa!, numbers);
@@ -263,13 +263,13 @@ class VideoDetailController extends GetxController
        currentVideoQa = VideoQualityCode.fromCode(resVideoQa)!;

        /// 取出符合当前画质的videoList
-        List<VideoItem> videosList =
+        final List<VideoItem> videosList =
            allVideosList.where((e) => e.quality!.code == resVideoQa).toList();

        /// 优先顺序 设置中指定解码格式 -> 当前可选的首个解码格式
-        List<FormatItem> supportFormats = data.supportFormats!;
+        final List<FormatItem> supportFormats = data.supportFormats!;
        // 根据画质选编码格式
-        List supportDecodeFormats =
+        final List supportDecodeFormats =
            supportFormats.firstWhere((e) => e.quality == resVideoQa).codecs!;
        // 默认从设置中取AVC
        currentDecodeFormats = VideoDecodeFormatsCode.fromString(cacheDecode)!;
@@ -304,7 +304,7 @@ class VideoDetailController extends GetxController

      /// 优先顺序 设置中指定质量 -> 当前可选的最高质量
      late AudioItem? firstAudio;
-      List<AudioItem> audiosList = data.dash!.audio!;
+      final List<AudioItem> audiosList = data.dash!.audio!;

      try {
        if (data.dash!.dolby?.audio?.isNotEmpty == true) {
@@ -318,7 +318,7 @@ class VideoDetailController extends GetxController
        }

        if (audiosList.isNotEmpty) {
-          List<int> numbers = audiosList.map((map) => map.id!).toList();
+          final List<int> numbers = audiosList.map((map) => map.id!).toList();
          int closestNumber = Utils.findClosestNumber(cacheAudioQa, numbers);
          if (!numbers.contains(cacheAudioQa) &&
              numbers.any((e) => e > cacheAudioQa)) {
--- a/lib/pages/video/detail/introduction/controller.dart
+++ b/lib/pages/video/detail/introduction/controller.dart
@@ -389,7 +389,7 @@ class VideoIntroController extends GetxController {
      SmartDialog.showToast('账号未登录');
      return;
    }
-    int currentStatus = followStatus['attribute'];
+    final int currentStatus = followStatus['attribute'];
    int actionStatus = 0;
    switch (currentStatus) {
      case 0:
@@ -467,7 +467,7 @@ class VideoIntroController extends GetxController {
  // 修改分P或番剧分集
  Future changeSeasonOrbangu(bvid, cid, aid) async {
    // 重新获取视频资源
-    VideoDetailController videoDetailCtr =
+    final VideoDetailController videoDetailCtr =
        Get.find<VideoDetailController>(tag: heroTag);
    videoDetailCtr.bvid = bvid;
    videoDetailCtr.cid.value = cid;
@@ -476,7 +476,7 @@ class VideoIntroController extends GetxController {
    // 重新请求评论
    try {
      /// 未渲染回复组件时可能异常
-      VideoReplyController videoReplyCtr =
+      final VideoReplyController videoReplyCtr =
          Get.find<VideoReplyController>(tag: heroTag);
      videoReplyCtr.aid = aid;
      videoReplyCtr.queryReplyList(type: 'init');
@@ -517,29 +517,27 @@ class VideoIntroController extends GetxController {

  /// 列表循环或者顺序播放时，自动播放下一个
  void nextPlay() {
-    late List episodes;
+    final List episodes = [];
    bool isPages = false;
    if (videoDetail.value.ugcSeason != null) {
-      UgcSeason ugcSeason = videoDetail.value.ugcSeason!;
-      List<SectionItem> sections = ugcSeason.sections!;
-      episodes = [];
-
+      final UgcSeason ugcSeason = videoDetail.value.ugcSeason!;
+      final List<SectionItem> sections = ugcSeason.sections!;
      for (int i = 0; i < sections.length; i++) {
-        List<EpisodeItem> episodesList = sections[i].episodes!;
+        final List<EpisodeItem> episodesList = sections[i].episodes!;
        episodes.addAll(episodesList);
      }
    } else if (videoDetail.value.pages != null) {
      isPages = true;
-      List<Part> pages = videoDetail.value.pages!;
-      episodes = [];
+      final List<Part> pages = videoDetail.value.pages!;
      episodes.addAll(pages);
    }

-    int currentIndex = episodes.indexWhere((e) => e.cid == lastPlayCid.value);
+    final int currentIndex =
+        episodes.indexWhere((e) => e.cid == lastPlayCid.value);
    int nextIndex = currentIndex + 1;
-    VideoDetailController videoDetailCtr =
+    final VideoDetailController videoDetailCtr =
        Get.find<VideoDetailController>(tag: heroTag);
-    PlayRepeat platRepeat = videoDetailCtr.plPlayerController.playRepeat;
+    final PlayRepeat platRepeat = videoDetailCtr.plPlayerController.playRepeat;

    // 列表循环
    if (nextIndex >= episodes.length) {
@@ -550,9 +548,9 @@ class VideoIntroController extends GetxController {
        return;
      }
    }
-    int cid = episodes[nextIndex].cid!;
-    String rBvid = isPages ? bvid : episodes[nextIndex].bvid;
-    int rAid = isPages ? IdUtils.bv2av(bvid) : episodes[nextIndex].aid!;
+    final int cid = episodes[nextIndex].cid!;
+    final String rBvid = isPages ? bvid : episodes[nextIndex].bvid;
+    final int rAid = isPages ? IdUtils.bv2av(bvid) : episodes[nextIndex].aid!;
    changeSeasonOrbangu(rBvid, cid, rAid);
  }

@@ -567,7 +565,7 @@ class VideoIntroController extends GetxController {
  // ai总结
  Future aiConclusion() async {
    SmartDialog.showLoading(msg: '正在生产ai总结');
-    var res = await VideoHttp.aiConclusion(
+    final res = await VideoHttp.aiConclusion(
      bvid: bvid,
      cid: lastPlayCid.value,
      upMid: videoDetail.value.owner!.mid!,
--- a/lib/pages/video/detail/introduction/view.dart
+++ b/lib/pages/video/detail/introduction/view.dart
@@ -1,5 +1,3 @@
-import 'dart:io';
-
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
@@ -26,7 +24,7 @@ import 'widgets/page.dart';
 import 'widgets/season.dart';

 class VideoIntroPanel extends StatefulWidget {
-  const VideoIntroPanel({Key? key}) : super(key: key);
+  const VideoIntroPanel({super.key});

  @override
  State<VideoIntroPanel> createState() => _VideoIntroPanelState();
@@ -124,8 +122,8 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
  late final VideoDetailController videoDetailCtr;
  late final Map<dynamic, dynamic> videoItem;

-  Box localCache = GStrorage.localCache;
-  Box setting = GStrorage.setting;
+  final Box<dynamic> localCache = GStrorage.localCache;
+  final Box<dynamic> setting = GStrorage.setting;
  late double sheetHeight;

  late final bool loadingStatus; // 加载状态
@@ -138,12 +136,15 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
  late bool enableAi;
  bool isProcessing = false;
  void Function()? handleState(Future Function() action) {
-    return isProcessing ? null : () async {
-      setState(() => isProcessing = true);
-      await action();
-      setState(() => isProcessing = false);
-    };
+    return isProcessing
+        ? null
+        : () async {
+            setState(() => isProcessing = true);
+            await action();
+            setState(() => isProcessing = false);
+          };
  }
+
  @override
  void initState() {
    super.initState();
@@ -168,7 +169,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
      SmartDialog.showToast('账号未登录');
      return;
    }
-    bool enableDragQuickFav =
+    final bool enableDragQuickFav =
        setting.get(SettingBoxKey.enableQuickFav, defaultValue: false);
    // 快速收藏 &
    // 点按 收藏至默认文件夹
@@ -182,7 +183,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
            context: context,
            useRootNavigator: true,
            isScrollControlled: true,
-            builder: (context) {
+            builder: (BuildContext context) {
              return FavPanel(ctr: videoIntroController);
            },
          );
@@ -192,7 +193,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
          context: context,
          useRootNavigator: true,
          isScrollControlled: true,
-          builder: (context) {
+          builder: (BuildContext context) {
            return FavPanel(ctr: videoIntroController);
          },
        );
@@ -202,7 +203,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
        context: context,
        useRootNavigator: true,
        isScrollControlled: true,
-        builder: (context) {
+        builder: (BuildContext context) {
          return FavPanel(ctr: videoIntroController);
        },
      );
@@ -251,8 +252,8 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {

  @override
  Widget build(BuildContext context) {
-    ThemeData t = Theme.of(context);
-    Color outline = t.colorScheme.outline;
+    final ThemeData t = Theme.of(context);
+    final Color outline = t.colorScheme.outline;
    return SliverPadding(
      padding: const EdgeInsets.only(
          left: StyleString.safeSpace, right: StyleString.safeSpace, top: 10),
@@ -333,7 +334,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                          top: 6,
                          child: GestureDetector(
                            onTap: () async {
-                              var res =
+                              final res =
                                  await videoIntroController.aiConclusion();
                              if (res['status']) {
                                showAiBottomSheet();
@@ -472,13 +473,14 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
  }

  Widget actionGrid(BuildContext context, videoIntroController) {
-    return LayoutBuilder(builder: (context, constraints) {
+    return LayoutBuilder(
+        builder: (BuildContext context, BoxConstraints constraints) {
      return Container(
        margin: const EdgeInsets.only(top: 6, bottom: 4),
        height: constraints.maxWidth / 5 * 0.8,
        child: GridView.count(
          primary: false,
-          padding: const EdgeInsets.all(0),
+          padding: EdgeInsets.zero,
          crossAxisCount: 5,
          childAspectRatio: 1.25,
          children: <Widget>[
@@ -543,7 +545,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
  }

  Widget actionRow(BuildContext context, videoIntroController, videoDetailCtr) {
-    return Row(children: [
+    return Row(children: <Widget>[
      Obx(
        () => ActionRowItem(
          icon: const Icon(FontAwesomeIcons.thumbsUp),
--- a/lib/pages/video/detail/introduction/widgets/fav_panel.dart
+++ b/lib/pages/video/detail/introduction/widgets/fav_panel.dart
@@ -6,15 +6,15 @@ import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/storage.dart';

 class FavPanel extends StatefulWidget {
-  final dynamic ctr;
  const FavPanel({super.key, this.ctr});
+  final dynamic ctr;

  @override
  State<FavPanel> createState() => _FavPanelState();
 }

 class _FavPanelState extends State<FavPanel> {
-  Box localCache = GStrorage.localCache;
+  final Box<dynamic> localCache = GStrorage.localCache;
  late double sheetHeight;
  late Future _futureBuilderFuture;

@@ -45,7 +45,7 @@ class _FavPanelState extends State<FavPanel> {
            child: Material(
              child: FutureBuilder(
                future: _futureBuilderFuture,
-                builder: (context, snapshot) {
+                builder: (BuildContext context, AsyncSnapshot snapshot) {
                  if (snapshot.connectionState == ConnectionState.done) {
                    Map data = snapshot.data as Map;
                    if (data['status']) {
@@ -109,7 +109,7 @@ class _FavPanelState extends State<FavPanel> {
            ),
            child: Row(
              mainAxisAlignment: MainAxisAlignment.end,
-              children: [
+              children: <Widget>[
                TextButton(
                  onPressed: () => Get.back(),
                  style: TextButton.styleFrom(
--- a/lib/pages/video/detail/introduction/widgets/group_panel.dart
+++ b/lib/pages/video/detail/introduction/widgets/group_panel.dart
@@ -17,7 +17,7 @@ class GroupPanel extends StatefulWidget {
 }

 class _GroupPanelState extends State<GroupPanel> {
-  Box localCache = GStrorage.localCache;
+  final Box<dynamic> localCache = GStrorage.localCache;
  late double sheetHeight;
  late Future _futureBuilderFuture;
  late List<MemberTagItemModel> tagsList;
@@ -33,17 +33,20 @@ class _GroupPanelState extends State<GroupPanel> {
  void onSave() async {
    feedBack();
    // 是否有选中的 有选中的带id，没选使用默认0
-    bool anyHasChecked = tagsList.any((e) => e.checked == true);
+    final bool anyHasChecked =
+        tagsList.any((MemberTagItemModel e) => e.checked == true);
    late String tagids;
    if (anyHasChecked) {
-      List checkedList = tagsList.where((e) => e.checked == true).toList();
-      List<int> tagidList = checkedList.map<int>((e) => e.tagid).toList();
+      final List<MemberTagItemModel> checkedList =
+          tagsList.where((MemberTagItemModel e) => e.checked == true).toList();
+      final List<int> tagidList =
+          checkedList.map<int>((e) => e.tagid!).toList();
      tagids = tagidList.join(',');
    } else {
      tagids = '0';
    }
    // 保存
-    var res = await MemberHttp.addUsers(widget.mid, tagids);
+    final res = await MemberHttp.addUsers(widget.mid, tagids);
    SmartDialog.showToast(res['msg']);
    if (res['status']) {
      Get.back();
@@ -56,7 +59,7 @@ class _GroupPanelState extends State<GroupPanel> {
      height: sheetHeight,
      color: Theme.of(context).colorScheme.background,
      child: Column(
-        children: [
+        children: <Widget>[
          AppBar(
            centerTitle: false,
            elevation: 0,
@@ -70,7 +73,7 @@ class _GroupPanelState extends State<GroupPanel> {
            child: Material(
              child: FutureBuilder(
                future: _futureBuilderFuture,
-                builder: (context, snapshot) {
+                builder: (BuildContext context, AsyncSnapshot snapshot) {
                  if (snapshot.connectionState == ConnectionState.done) {
                    Map data = snapshot.data as Map;
                    if (data['status']) {
--- a/lib/pages/video/detail/introduction/widgets/intro_detail.dart
+++ b/lib/pages/video/detail/introduction/widgets/intro_detail.dart
@@ -12,12 +12,11 @@ Box localCache = GStrorage.localCache;
 late double sheetHeight;

 class IntroDetail extends StatelessWidget {
-  final dynamic videoDetail;
-
  const IntroDetail({
-    Key? key,
+    super.key,
    this.videoDetail,
-  }) : super(key: key);
+  });
+  final dynamic videoDetail;

  @override
  Widget build(BuildContext context) {
@@ -86,13 +85,11 @@ class IntroDetail extends StatelessWidget {
                    SizedBox(
                      width: double.infinity,
                      child: SelectableRegion(
-                        magnifierConfiguration:
-                            const TextMagnifierConfiguration(),
                        focusNode: FocusNode(),
                        selectionControls: MaterialTextSelectionControls(),
                        child: Column(
                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
+                          children: <Widget>[
                            Text(
                              videoDetail!.bvid!,
                              style: const TextStyle(fontSize: 13),
@@ -122,20 +119,21 @@ class IntroDetail extends StatelessWidget {
  }

  InlineSpan buildContent(BuildContext context, content) {
-    List descV2 = content.descV2;
+    final List descV2 = content.descV2;
    // type
    // 1 普通文本
    // 2 @用户
-    List<TextSpan> spanChilds = List.generate(descV2.length, (index) {
+    final List<TextSpan> spanChilds = List.generate(descV2.length, (index) {
      final currentDesc = descV2[index];
      switch (currentDesc.type) {
        case 1:
-          List<InlineSpan> spanChildren = [];
-          RegExp urlRegExp = RegExp(r'https?://\S+\b');
-          Iterable<Match> matches = urlRegExp.allMatches(currentDesc.rawText);
+          final List<InlineSpan> spanChildren = <InlineSpan>[];
+          final RegExp urlRegExp = RegExp(r'https?://\S+\b');
+          final Iterable<Match> matches =
+              urlRegExp.allMatches(currentDesc.rawText);

          int previousEndIndex = 0;
-          for (Match match in matches) {
+          for (final Match match in matches) {
            if (match.start > previousEndIndex) {
              spanChildren.add(TextSpan(
                  text: currentDesc.rawText
@@ -172,11 +170,12 @@ class IntroDetail extends StatelessWidget {
                text: currentDesc.rawText.substring(previousEndIndex)));
          }

-          TextSpan result = TextSpan(children: spanChildren);
+          final TextSpan result = TextSpan(children: spanChildren);
          return result;
        case 2:
-          final colorSchemePrimary = Theme.of(context).colorScheme.primary;
-          final heroTag = Utils.makeHeroTag(currentDesc.bizId);
+          final Color colorSchemePrimary =
+              Theme.of(context).colorScheme.primary;
+          final String heroTag = Utils.makeHeroTag(currentDesc.bizId);
          return TextSpan(
            text: '@${currentDesc.rawText}',
            style: TextStyle(color: colorSchemePrimary),
--- a/lib/pages/video/detail/introduction/widgets/menu_row.dart
+++ b/lib/pages/video/detail/introduction/widgets/menu_row.dart
@@ -2,11 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:pilipala/utils/feed_back.dart';

 class MenuRow extends StatelessWidget {
-  final bool? loadingStatus;
  const MenuRow({
-    Key? key,
+    super.key,
    this.loadingStatus,
-  }) : super(key: key);
+  });
+  final bool? loadingStatus;

  @override
  Widget build(BuildContext context) {
@@ -50,7 +50,7 @@ class MenuRow extends StatelessWidget {
  }

  Widget actionRowLineItem(
-      context, Function? onTap, bool? loadingStatus, String? text,
+      BuildContext context, Function? onTap, bool? loadingStatus, String? text,
      {bool selectStatus = false}) {
    return Material(
      color: selectStatus
@@ -97,18 +97,18 @@ class MenuRow extends StatelessWidget {
 }

 class ActionRowLineItem extends StatelessWidget {
+  const ActionRowLineItem({
+    super.key,
+    this.selectStatus,
+    this.onTap,
+    this.text,
+    this.loadingStatus = false,
+  });
  final bool? selectStatus;
  final Function? onTap;
  final bool? loadingStatus;
  final String? text;

-  const ActionRowLineItem(
-      {super.key,
-      this.selectStatus,
-      this.onTap,
-      this.text,
-      this.loadingStatus = false});
-
  @override
  Widget build(BuildContext context) {
    return Material(
--- a/lib/pages/video/detail/introduction/widgets/page.dart
+++ b/lib/pages/video/detail/introduction/widgets/page.dart
@@ -4,11 +4,6 @@ import 'package:pilipala/models/video_detail_res.dart';
 import 'package:pilipala/pages/video/detail/index.dart';

 class PagesPanel extends StatefulWidget {
-  final List<Part> pages;
-  final int? cid;
-  final double? sheetHeight;
-  final Function? changeFuc;
-
  const PagesPanel({
    super.key,
    required this.pages,
@@ -16,6 +11,10 @@ class PagesPanel extends StatefulWidget {
    this.sheetHeight,
    this.changeFuc,
  });
+  final List<Part> pages;
+  final int? cid;
+  final double? sheetHeight;
+  final Function? changeFuc;

  @override
  State<PagesPanel> createState() => _PagesPanelState();
@@ -25,7 +24,7 @@ class _PagesPanelState extends State<PagesPanel> {
  late List<Part> episodes;
  late int cid;
  late int currentIndex;
-  String heroTag = Get.arguments['heroTag'];
+  final String heroTag = Get.arguments['heroTag'];
  late VideoDetailController _videoDetailController;
  final ScrollController _scrollController = ScrollController();

@@ -35,11 +34,11 @@ class _PagesPanelState extends State<PagesPanel> {
    cid = widget.cid!;
    episodes = widget.pages;
    _videoDetailController = Get.find<VideoDetailController>(tag: heroTag);
-    currentIndex = episodes.indexWhere((e) => e.cid == cid);
-    _videoDetailController.cid.listen((p0) {
+    currentIndex = episodes.indexWhere((Part e) => e.cid == cid);
+    _videoDetailController.cid.listen((int p0) {
      cid = p0;
      setState(() {});
-      currentIndex = episodes.indexWhere((e) => e.cid == cid);
+      currentIndex = episodes.indexWhere((Part e) => e.cid == cid);
    });
  }

@@ -60,7 +59,7 @@ class _PagesPanelState extends State<PagesPanel> {
  @override
  Widget build(BuildContext context) {
    return Column(
-      children: [
+      children: <Widget>[
        Padding(
          padding: const EdgeInsets.only(top: 10, bottom: 2),
          child: Row(
@@ -133,7 +132,8 @@ class _PagesPanelState extends State<PagesPanel> {
                                    child: ListView.builder(
                                      controller: _scrollController,
                                      itemCount: episodes.length,
-                                      itemBuilder: (context, index) {
+                                      itemBuilder:
+                                          (BuildContext context, int index) {
                                        return ListTile(
                                          onTap: () {
                                            changeFucCall(
@@ -191,7 +191,7 @@ class _PagesPanelState extends State<PagesPanel> {
            scrollDirection: Axis.horizontal,
            itemCount: widget.pages.length,
            itemExtent: 150,
-            itemBuilder: ((context, i) {
+            itemBuilder: (BuildContext context, int i) {
              return Container(
                width: 150,
                margin: const EdgeInsets.only(right: 10),
@@ -205,8 +205,8 @@ class _PagesPanelState extends State<PagesPanel> {
                      padding: const EdgeInsets.symmetric(
                          vertical: 8, horizontal: 8),
                      child: Row(
-                        children: [
-                          if (i == currentIndex) ...[
+                        children: <Widget>[
+                          if (i == currentIndex) ...<Widget>[
                            Image.asset(
                              'assets/images/live.gif',
                              color: Theme.of(context).colorScheme.primary,
@@ -231,7 +231,7 @@ class _PagesPanelState extends State<PagesPanel> {
                  ),
                ),
              );
-            }),
+            },
          ),
        )
      ],
--- a/lib/pages/video/detail/introduction/widgets/season.dart
+++ b/lib/pages/video/detail/introduction/widgets/season.dart
@@ -6,11 +6,6 @@ import 'package:pilipala/utils/id_utils.dart';
 import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';

 class SeasonPanel extends StatefulWidget {
-  final UgcSeason ugcSeason;
-  final int? cid;
-  final double? sheetHeight;
-  final Function? changeFuc;
-
  const SeasonPanel({
    super.key,
    required this.ugcSeason,
@@ -18,6 +13,10 @@ class SeasonPanel extends StatefulWidget {
    this.sheetHeight,
    this.changeFuc,
  });
+  final UgcSeason ugcSeason;
+  final int? cid;
+  final double? sheetHeight;
+  final Function? changeFuc;

  @override
  State<SeasonPanel> createState() => _SeasonPanelState();
@@ -27,7 +26,7 @@ class _SeasonPanelState extends State<SeasonPanel> {
  late List<EpisodeItem> episodes;
  late int cid;
  late int currentIndex;
-  String heroTag = Get.arguments['heroTag'];
+  final String heroTag = Get.arguments['heroTag'];
  late VideoDetailController _videoDetailController;
  final ScrollController _scrollController = ScrollController();
  final ItemScrollController itemScrollController = ItemScrollController();
@@ -41,9 +40,9 @@ class _SeasonPanelState extends State<SeasonPanel> {
    /// 根据 cid 找到对应集，找到对应 episodes
    /// 有多个episodes时，只显示其中一个
    /// TODO 同时显示多个合集
-    List<SectionItem> sections = widget.ugcSeason.sections!;
+    final List<SectionItem> sections = widget.ugcSeason.sections!;
    for (int i = 0; i < sections.length; i++) {
-      List<EpisodeItem> episodesList = sections[i].episodes!;
+      final List<EpisodeItem> episodesList = sections[i].episodes!;
      for (int j = 0; j < episodesList.length; j++) {
        if (episodesList[j].cid == cid) {
          episodes = episodesList;
@@ -56,22 +55,21 @@ class _SeasonPanelState extends State<SeasonPanel> {
    // episodes = widget.ugcSeason.sections!
    //     .firstWhere((e) => e.seasonId == widget.ugcSeason.id)
    //     .episodes!;
-    currentIndex = episodes.indexWhere((e) => e.cid == cid);
-    _videoDetailController.cid.listen((p0) {
+    currentIndex = episodes.indexWhere((EpisodeItem e) => e.cid == cid);
+    _videoDetailController.cid.listen((int p0) {
      cid = p0;
      setState(() {});
-      currentIndex = episodes.indexWhere((e) => e.cid == cid);
+      currentIndex = episodes.indexWhere((EpisodeItem e) => e.cid == cid);
    });
  }

-  void changeFucCall(item, i) async {
+  void changeFucCall(item, int i) async {
    await widget.changeFuc!(
      IdUtils.av2bv(item.aid),
      item.cid,
      item.aid,
    );
    currentIndex = i;
-    setState(() {});
    Get.back();
    setState(() {});
  }
@@ -84,7 +82,7 @@ class _SeasonPanelState extends State<SeasonPanel> {

  @override
  Widget build(BuildContext context) {
-    return Builder(builder: (context) {
+    return Builder(builder: (BuildContext context) {
      return Container(
        margin: const EdgeInsets.only(
          top: 8,
@@ -136,7 +134,8 @@ class _SeasonPanelState extends State<SeasonPanel> {
                          child: Material(
                            child: ScrollablePositionedList.builder(
                              itemCount: episodes.length,
-                              itemBuilder: (context, index) => ListTile(
+                              itemBuilder: (BuildContext context, int index) =>
+                                  ListTile(
                                onTap: () =>
                                    changeFucCall(episodes[index], index),
                                dense: false,
@@ -174,7 +173,7 @@ class _SeasonPanelState extends State<SeasonPanel> {
            child: Padding(
              padding: const EdgeInsets.fromLTRB(8, 12, 8, 12),
              child: Row(
-                children: [
+                children: <Widget>[
                  Expanded(
                    child: Text(
                      '合集：${widget.ugcSeason.title!}',
--- a/lib/pages/video/detail/related/view.dart
+++ b/lib/pages/video/detail/related/view.dart
@@ -7,13 +7,7 @@ import 'package:pilipala/common/widgets/overlay_pop.dart';
 import 'package:pilipala/common/widgets/video_card_h.dart';
 import './controller.dart';

-class RelatedVideoPanel extends StatefulWidget {
-  const RelatedVideoPanel({super.key});
-  @override
-  State<RelatedVideoPanel> createState() => _RelatedVideoPanelState();
-}
-
-class _RelatedVideoPanelState extends State<RelatedVideoPanel> {
+class RelatedVideoPanel extends StatelessWidget {
  final ReleatedController _releatedController =
      Get.put(ReleatedController(), tag: Get.arguments['heroTag']);

@@ -21,7 +15,7 @@ class _RelatedVideoPanelState extends State<RelatedVideoPanel> {
  Widget build(BuildContext context) {
    return FutureBuilder(
      future: _releatedController.queryRelatedVideo(),
-      builder: (context, snapshot) {
+      builder: (BuildContext context, AsyncSnapshot snapshot) {
        if (snapshot.connectionState == ConnectionState.done) {
          if (snapshot.data == null) {
            return const SliverToBoxAdapter(child: SizedBox());
@@ -72,7 +66,7 @@ class _RelatedVideoPanelState extends State<RelatedVideoPanel> {

  OverlayEntry _createPopupDialog(videoItem) {
    return OverlayEntry(
-      builder: (context) => AnimatedDialog(
+      builder: (BuildContext context) => AnimatedDialog(
        closeFn: _releatedController.popupDialog?.remove,
        child: OverlayPop(
            videoItem: videoItem,
--- a/lib/pages/video/detail/reply/controller.dart
+++ b/lib/pages/video/detail/reply/controller.dart
@@ -41,8 +41,8 @@ class VideoReplyController extends GetxController {
  @override
  void onInit() {
    super.onInit();
-    int deaultReplySortIndex =
-        setting.get(SettingBoxKey.replySortType, defaultValue: 0);
+    final int deaultReplySortIndex =
+        setting.get(SettingBoxKey.replySortType, defaultValue: 0) as int;
    _sortType = ReplySortType.values[deaultReplySortIndex];
    sortTypeTitle.value = _sortType.titles;
    sortTypeLabel.value = _sortType.labels;
@@ -56,7 +56,7 @@ class VideoReplyController extends GetxController {
    if (noMore.value == '没有更多了') {
      return;
    }
-    var res = await ReplyHttp.replyList(
+    final res = await ReplyHttp.replyList(
      oid: aid!,
      pageNum: currentPage + 1,
      ps: ps,
@@ -64,7 +64,7 @@ class VideoReplyController extends GetxController {
      sort: _sortType.index,
    );
    if (res['status']) {
-      List<ReplyItemModel> replies = res['data'].replies;
+      final List<ReplyItemModel> replies = res['data'].replies;
      if (replies.isNotEmpty) {
        noMore.value = '加载中...';

@@ -84,9 +84,8 @@ class VideoReplyController extends GetxController {
      if (type == 'init') {
        // 添加置顶回复
        if (res['data'].upper.top != null) {
-          bool flag = res['data']
-              .topReplies
-              .any((reply) => reply.rpid == res['data'].upper.top.rpid);
+          final bool flag = res['data'].topReplies.any((ReplyItemModel reply) =>
+              reply.rpid == res['data'].upper.top.rpid) as bool;
          if (!flag) {
            replies.insert(0, res['data'].upper.top);
          }
--- a/lib/pages/video/detail/reply/view.dart
+++ b/lib/pages/video/detail/reply/view.dart
@@ -8,7 +8,7 @@ import 'package:pilipala/common/skeleton/video_reply.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/models/common/reply_type.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
-import 'package:pilipala/pages/video/detail/replyNew/index.dart';
+import 'package:pilipala/pages/video/detail/reply_new/index.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/id_utils.dart';
 import 'controller.dart';
@@ -107,7 +107,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>

  // 展示二级回复
  void replyReply(replyItem) {
-    VideoDetailController videoDetailCtr =
+    final VideoDetailController videoDetailCtr =
        Get.find<VideoDetailController>(tag: heroTag);
    if (replyItem != null) {
      videoDetailCtr.oid = replyItem.oid;
@@ -193,7 +193,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
              ),
              FutureBuilder(
                future: _futureBuilderFuture,
-                builder: (context, snapshot) {
+                builder: (BuildContext context, snapshot) {
                  if (snapshot.connectionState == ConnectionState.done) {
                    var data = snapshot.data;
                    if (data['status']) {
@@ -203,13 +203,13 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                                _videoReplyController.replyList.isEmpty
                            ? SliverList(
                                delegate: SliverChildBuilderDelegate(
-                                    (context, index) {
+                                    (BuildContext context, index) {
                                  return const VideoReplySkeleton();
                                }, childCount: 5),
                              )
                            : SliverList(
                                delegate: SliverChildBuilderDelegate(
-                                  (context, index) {
+                                  (BuildContext context, index) {
                                    double bottom =
                                        MediaQuery.of(context).padding.bottom;
                                    if (index ==
@@ -262,7 +262,8 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                  } else {
                    // 骨架屏
                    return SliverList(
-                      delegate: SliverChildBuilderDelegate((context, index) {
+                      delegate: SliverChildBuilderDelegate(
+                          (BuildContext context, index) {
                        return const VideoReplySkeleton();
                      }, childCount: 5),
                    );
@@ -318,12 +319,11 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
 }

 class _MySliverPersistentHeaderDelegate extends SliverPersistentHeaderDelegate {
+  _MySliverPersistentHeaderDelegate({required this.child});
  final double _minExtent = 45;
  final double _maxExtent = 45;
  final Widget child;

-  _MySliverPersistentHeaderDelegate({required this.child});
-
  @override
  Widget build(
      BuildContext context, double shrinkOffset, bool overlapsContent) {
--- a/lib/pages/video/detail/reply/widgets/reply_item.dart
+++ b/lib/pages/video/detail/reply/widgets/reply_item.dart
@@ -9,7 +9,7 @@ import 'package:pilipala/models/common/reply_type.dart';
 import 'package:pilipala/models/video/reply/item.dart';
 import 'package:pilipala/pages/preview/index.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
-import 'package:pilipala/pages/video/detail/replyNew/index.dart';
+import 'package:pilipala/pages/video/detail/reply_new/index.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/id_utils.dart';
 import 'package:pilipala/utils/storage.dart';
@@ -27,8 +27,8 @@ class ReplyItem extends StatelessWidget {
    this.showReplyRow = true,
    this.replyReply,
    this.replyType,
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
  final ReplyItemModel? replyItem;
  final Function? addReply;
  final String? replyLevel;
@@ -68,7 +68,7 @@ class ReplyItem extends StatelessWidget {
    );
  }

-  Widget lfAvtar(context, heroTag) {
+  Widget lfAvtar(BuildContext context, String heroTag) {
    return Stack(
      children: [
        Hero(
@@ -117,8 +117,8 @@ class ReplyItem extends StatelessWidget {
    );
  }

-  Widget content(context) {
-    String heroTag = Utils.makeHeroTag(replyItem!.mid);
+  Widget content(BuildContext context) {
+    final String heroTag = Utils.makeHeroTag(replyItem!.mid);
    return Column(
      crossAxisAlignment: CrossAxisAlignment.start,
      children: <Widget>[
@@ -260,7 +260,7 @@ class ReplyItem extends StatelessWidget {
                    ],
                  ),
                  Row(
-                    children: [
+                    children: <Widget>[
                      Text(
                        Utils.dateFormat(replyItem!.ctime),
                        style: TextStyle(
@@ -291,7 +291,6 @@ class ReplyItem extends StatelessWidget {
        Container(
          margin: const EdgeInsets.only(top: 10, left: 45, right: 6, bottom: 4),
          child: SelectableRegion(
-            magnifierConfiguration: const TextMagnifierConfiguration(),
            focusNode: FocusNode(),
            selectionControls: MaterialTextSelectionControls(),
            child: Text.rich(
@@ -340,9 +339,9 @@ class ReplyItem extends StatelessWidget {
  }

  // 感谢、回复、复制
-  Widget bottonAction(context, replyControl) {
+  Widget bottonAction(BuildContext context, replyControl) {
    return Row(
-      children: [
+      children: <Widget>[
        const SizedBox(width: 32),
        SizedBox(
          height: 32,
@@ -422,7 +421,7 @@ class ReplyItemRow extends StatelessWidget {
    this.replyItem,
    this.replyReply,
  });
-  List? replies;
+  final List? replies;
  ReplyControl? replyControl;
  // int? f_rpid;
  ReplyItemModel? replyItem;
@@ -430,8 +429,8 @@ class ReplyItemRow extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    bool isShow = replyControl!.isShow!;
-    int extraRow = replyControl != null && isShow ? 1 : 0;
+    final bool isShow = replyControl!.isShow!;
+    final int extraRow = replyControl != null && isShow ? 1 : 0;
    return Container(
      margin: const EdgeInsets.only(left: 42, right: 4, top: 0),
      child: Material(
@@ -443,7 +442,7 @@ class ReplyItemRow extends StatelessWidget {
          crossAxisAlignment: CrossAxisAlignment.start,
          children: [
            if (replies!.isNotEmpty)
-              for (var i = 0; i < replies!.length; i++) ...[
+              for (int i = 0; i < replies!.length; i++) ...[
                InkWell(
                  // 一楼点击评论展开评论详情
                  onTap: () => replyReply!(replyItem),
@@ -472,7 +471,7 @@ class ReplyItemRow extends StatelessWidget {
                            recognizer: TapGestureRecognizer()
                              ..onTap = () {
                                feedBack();
-                                String heroTag =
+                                final String heroTag =
                                    Utils.makeHeroTag(replies![i].member.mid);
                                Get.toNamed(
                                    '/member?mid=${replies![i].member.mid}',
@@ -539,7 +538,7 @@ InlineSpan buildContent(
  // replyItem 当前回复内容
  // replyReply 查看二楼回复（回复详情）回调
  // fReplyItem 父级回复内容，用作二楼回复（回复详情）展示
-  var content = replyItem.content;
+  final content = replyItem.content;
  if (content.emote.isEmpty &&
      content.atNameToMid.isEmpty &&
      content.jumpUrl.isEmpty &&
@@ -552,7 +551,7 @@ InlineSpan buildContent(
            () => replyReply(replyItem.root == 0 ? replyItem : fReplyItem),
    );
  }
-  List<InlineSpan> spanChilds = [];
+  final List<InlineSpan> spanChilds = <InlineSpan>[];
  bool hasMatchMember = true;

  // 投票
@@ -590,11 +589,11 @@ InlineSpan buildContent(
  content.message.splitMapJoin(
    RegExp(r"\[.*?\]"),
    onMatch: (Match match) {
-      String matchStr = match[0]!;
+      final String matchStr = match[0]!;
      if (content.emote.isNotEmpty &&
          matchStr.indexOf('[') == matchStr.lastIndexOf('[') &&
          matchStr.indexOf(']') == matchStr.lastIndexOf(']')) {
-        int size = content.emote[matchStr]['meta']['size'];
+        final int size = content.emote[matchStr]['meta']['size'];
        if (content.emote.keys.contains(matchStr)) {
          spanChilds.add(
            WidgetSpan(
@@ -628,7 +627,7 @@ InlineSpan buildContent(
      // 匹配@用户
      String matchMember = str;
      if (content.atNameToMid.isNotEmpty) {
-        List atNameToMidKeys = content.atNameToMid.keys.toList();
+        final List atNameToMidKeys = content.atNameToMid.keys.toList();
        RegExp reg = RegExp(atNameToMidKeys.map((key) => key).join('|'));
        // if (!content.message.contains(':')) {
        //   reg = RegExp(r"@.*( |:)");
@@ -667,7 +666,7 @@ InlineSpan buildContent(
                    ),
                    recognizer: TapGestureRecognizer()
                      ..onTap = () {
-                        String heroTag = Utils.makeHeroTag(value);
+                        final String heroTag = Utils.makeHeroTag(value);
                        Get.toNamed(
                          '/member?mid=$value',
                          arguments: {'face': '', 'heroTag': heroTag},
@@ -693,8 +692,8 @@ InlineSpan buildContent(
      // 匹配 jumpUrl
      String matchUrl = matchMember;
      if (content.jumpUrl.isNotEmpty && hasMatchMember) {
-        List urlKeys = content.jumpUrl.keys.toList().reversed.toList();
-        for (var index = 0; index < urlKeys.length; index++) {
+        final List urlKeys = content.jumpUrl.keys.toList().reversed.toList();
+        for (int index = 0; index < urlKeys.length; index++) {
          var i = urlKeys[index];
          if (i.contains('?')) {
            urlKeys[index] = i.replaceAll('?', '\\?');
@@ -711,14 +710,14 @@ InlineSpan buildContent(
          RegExp(urlKeys.map((key) => key).join("|")),
          // RegExp('What does the fox say\\?'),
          onMatch: (Match match) {
-            String matchStr = match[0]!;
+            final String matchStr = match[0]!;
            String appUrlSchema = '';
            if (content.jumpUrl[matchStr] != null) {
              appUrlSchema = content.jumpUrl[matchStr]['app_url_schema'];
            }
            // 默认不显示关键词
-            bool enableWordRe =
-                setting.get(SettingBoxKey.enableWordRe, defaultValue: false);
+            final bool enableWordRe = setting.get(SettingBoxKey.enableWordRe,
+                defaultValue: false) as bool;
            if (content.jumpUrl[matchStr] != null) {
              spanChilds.add(
                TextSpan(
@@ -731,9 +730,9 @@ InlineSpan buildContent(
                  recognizer: TapGestureRecognizer()
                    ..onTap = () {
                      if (appUrlSchema == '') {
-                        String str = Uri.parse(matchStr).pathSegments[0];
-                        Map matchRes = IdUtils.matchAvorBv(input: str);
-                        List matchKeys = matchRes.keys.toList();
+                        final String str = Uri.parse(matchStr).pathSegments[0];
+                        final Map matchRes = IdUtils.matchAvorBv(input: str);
+                        final List matchKeys = matchRes.keys.toList();
                        if (matchKeys.isNotEmpty) {
                          if (matchKeys.first == 'BV') {
                            Get.toNamed(
@@ -834,8 +833,8 @@ InlineSpan buildContent(

  // 图片渲染
  if (content.pictures.isNotEmpty) {
-    List<String> picList = [];
-    int len = content.pictures.length;
+    final List<String> picList = <String>[];
+    final int len = content.pictures.length;
    if (len == 1) {
      Map pictureItem = content.pictures.first;
      picList.add(pictureItem['img_src']);
@@ -843,13 +842,13 @@ InlineSpan buildContent(
      spanChilds.add(
        WidgetSpan(
          child: LayoutBuilder(
-            builder: (context, BoxConstraints box) {
+            builder: (BuildContext context, BoxConstraints box) {
              return GestureDetector(
                onTap: () {
                  showDialog(
                    useSafeArea: false,
                    context: context,
-                    builder: (context) {
+                    builder: (BuildContext context) {
                      return ImagePreview(initialPage: 0, imgList: picList);
                    },
                  );
--- a/lib/pages/video/detail/reply/widgets/zan.dart
+++ b/lib/pages/video/detail/reply/widgets/zan.dart
@@ -25,12 +25,12 @@ class _ZanButtonState extends State<ZanButton> {
  Future onLikeReply() async {
    feedBack();
    // SmartDialog.showLoading(msg: 'pilipala ...');
-    ReplyItemModel replyItem = widget.replyItem!;
-    int oid = replyItem.oid!;
-    int rpid = replyItem.rpid!;
+    final ReplyItemModel replyItem = widget.replyItem!;
+    final int oid = replyItem.oid!;
+    final int rpid = replyItem.rpid!;
    // 1 已点赞 2 不喜欢 0 未操作
-    int action = replyItem.action == 0 ? 1 : 0;
-    var res = await ReplyHttp.likeReply(
+    final int action = replyItem.action == 0 ? 1 : 0;
+    final res = await ReplyHttp.likeReply(
        type: widget.replyType!.index, oid: oid, rpid: rpid, action: action);
    // SmartDialog.dismiss();
    if (res['status']) {
@@ -47,19 +47,23 @@ class _ZanButtonState extends State<ZanButton> {
      SmartDialog.showToast(res['msg']);
    }
  }
+
  bool isProcessing = false;
  void Function()? handleState(Future Function() action) {
-    return isProcessing ? null : () async {
-      setState(() => isProcessing = true);
-      await action();
-      setState(() => isProcessing = false);
-    };
+    return isProcessing
+        ? null
+        : () async {
+            setState(() => isProcessing = true);
+            await action();
+            setState(() => isProcessing = false);
+          };
  }

  @override
  Widget build(BuildContext context) {
-    var color = Theme.of(context).colorScheme.outline;
-    var primary = Theme.of(context).colorScheme.primary;
+    final ThemeData t = Theme.of(context);
+    final Color color = t.colorScheme.outline;
+    final Color primary = t.colorScheme.primary;
    return SizedBox(
      height: 32,
      child: TextButton(
@@ -79,12 +83,14 @@ class _ZanButtonState extends State<ZanButton> {
              transitionBuilder: (Widget child, Animation<double> animation) {
                return ScaleTransition(scale: animation, child: child);
              },
-              child: Text(widget.replyItem!.like.toString(),
-                  key: ValueKey<int>(widget.replyItem!.like!),
-                  style: TextStyle(
-                      color: widget.replyItem!.action == 1 ? primary : color,
-                      fontSize:
-                          Theme.of(context).textTheme.labelSmall!.fontSize)),
+              child: Text(
+                widget.replyItem!.like.toString(),
+                key: ValueKey<int>(widget.replyItem!.like!),
+                style: TextStyle(
+                  color: widget.replyItem!.action == 1 ? primary : color,
+                  fontSize: t.textTheme.labelSmall!.fontSize,
+                ),
+              ),
            ),
          ],
        ),
--- a/lib/pages/video/detail/reply_new/index.dart
+++ b/lib/pages/video/detail/reply_new/index.dart
--- a/lib/pages/video/detail/reply_new/view.dart
+++ b/lib/pages/video/detail/reply_new/view.dart
--- a/lib/pages/video/detail/reply_reply/controller.dart
+++ b/lib/pages/video/detail/reply_reply/controller.dart
@@ -31,14 +31,14 @@ class VideoReplyReplyController extends GetxController {
      currentPage = 0;
    }
    isLoadingMore = true;
-    var res = await ReplyHttp.replyReplyList(
+    final res = await ReplyHttp.replyReplyList(
      oid: aid!,
      root: rpid!,
      pageNum: currentPage + 1,
      type: replyType.index,
    );
    if (res['status']) {
-      List<ReplyItemModel> replies = res['data'].replies;
+      final List<ReplyItemModel> replies = res['data'].replies;
      if (replies.isNotEmpty) {
        noMore.value = '加载中...';
        if (replyList.length == res['data'].page.count) {
--- a/lib/pages/video/detail/reply_reply/index.dart
+++ b/lib/pages/video/detail/reply_reply/index.dart
--- a/lib/pages/video/detail/reply_reply/view.dart
+++ b/lib/pages/video/detail/reply_reply/view.dart
@@ -12,13 +12,6 @@ import 'package:pilipala/utils/storage.dart';
 import 'controller.dart';

 class VideoReplyReplyPanel extends StatefulWidget {
-  final int? oid;
-  final int? rpid;
-  final Function? closePanel;
-  final ReplyItemModel? firstFloor;
-  final String? source;
-  final ReplyType? replyType;
-
  const VideoReplyReplyPanel({
    this.oid,
    this.rpid,
@@ -28,6 +21,12 @@ class VideoReplyReplyPanel extends StatefulWidget {
    this.replyType,
    super.key,
  });
+  final int? oid;
+  final int? rpid;
+  final Function? closePanel;
+  final ReplyItemModel? firstFloor;
+  final String? source;
+  final ReplyType? replyType;

  @override
  State<VideoReplyReplyPanel> createState() => _VideoReplyReplyPanelState();
@@ -36,7 +35,7 @@ class VideoReplyReplyPanel extends StatefulWidget {
 class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
  late VideoReplyReplyController _videoReplyReplyController;
  late AnimationController replyAnimationCtl;
-  Box localCache = GStrorage.localCache;
+  final Box<dynamic> localCache = GStrorage.localCache;
  late double sheetHeight;
  Future? _futureBuilderFuture;
  late ScrollController scrollController;
@@ -87,7 +86,7 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
              padding: const EdgeInsets.only(left: 12, right: 2),
              child: Row(
                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
+                children: <Widget>[
                  const Text('评论详情'),
                  IconButton(
                    icon: const Icon(Icons.close, size: 20),
@@ -138,15 +137,15 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
                  ],
                  FutureBuilder(
                    future: _futureBuilderFuture,
-                    builder: (context, snapshot) {
+                    builder: (BuildContext context, snapshot) {
                      if (snapshot.connectionState == ConnectionState.done) {
-                        Map data = snapshot.data as Map;
+                        final Map data = snapshot.data as Map;
                        if (data['status']) {
                          // 请求成功
                          return Obx(
                            () => SliverList(
                              delegate: SliverChildBuilderDelegate(
-                                (context, index) {
+                                (BuildContext context, int index) {
                                  if (index ==
                                      _videoReplyReplyController
                                          .replyList.length) {
@@ -204,8 +203,8 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
                      } else {
                        // 骨架屏
                        return SliverList(
-                          delegate:
-                              SliverChildBuilderDelegate((context, index) {
+                          delegate: SliverChildBuilderDelegate(
+                              (BuildContext context, int index) {
                            return const VideoReplySkeleton();
                          }, childCount: 8),
                        );
--- a/lib/pages/video/detail/view.dart
+++ b/lib/pages/video/detail/view.dart
@@ -8,6 +8,7 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
+import 'package:nil/nil.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/http/user.dart';
 import 'package:pilipala/models/common/search_type.dart';
@@ -47,16 +48,16 @@ class _VideoDetailPageState extends State<VideoDetailPage>
  PlayerStatus playerStatus = PlayerStatus.playing;
  double doubleOffset = 0;

-  Box localCache = GStrorage.localCache;
-  Box setting = GStrorage.setting;
+  final Box<dynamic> localCache = GStrorage.localCache;
+  final Box<dynamic> setting = GStrorage.setting;
  late double statusBarHeight;
-  final videoHeight = Get.size.width * 9 / 16;
+  final double videoHeight = Get.size.width * 9 / 16;
  late Future _futureBuilderFuture;
  // 自动退出全屏
  late bool autoExitFullcreen;
  late bool autoPlayEnable;
  late bool autoPiP;
-  final floating = Floating();
+  final Floating floating = Floating();
  // 生命周期监听
  late final AppLifecycleListener _lifecycleListener;

@@ -105,7 +106,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
    appbarStream = StreamController<double>();
    _extendNestCtr.addListener(
      () {
-        double offset = _extendNestCtr.position.pixels;
+        final double offset = _extendNestCtr.position.pixels;
        appbarStream.add(offset);
      },
    );
@@ -202,7 +203,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
  // 离开当前页面时
  void didPushNext() async {
    /// 开启
-    if (setting.get(SettingBoxKey.enableAutoBrightness, defaultValue: false)) {
+    if (setting.get(SettingBoxKey.enableAutoBrightness, defaultValue: false)
+        as bool) {
      videoDetailController.brightness = plPlayerController!.brightness.value;
    }
    if (plPlayerController != null) {
@@ -218,7 +220,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
  // 返回当前页面时
  void didPopNext() async {
    videoDetailController.isFirstTime = false;
-    bool autoplay = autoPlayEnable;
+    final bool autoplay = autoPlayEnable;
    videoDetailController.playerInit(autoplay: autoplay);

    /// 未开启自动播放时，未播放跳转下一页返回/播放后跳转下一页返回
@@ -238,7 +240,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
  void didChangeDependencies() {
    super.didChangeDependencies();
    VideoDetailPage.routeObserver
-        .subscribe(this, ModalRoute.of(context) as PageRoute);
+        .subscribe(this, ModalRoute.of(context)! as PageRoute);
  }

  void _handleTransition(String name) {
@@ -253,8 +255,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
  }

  void autoEnterPip() {
-    var routePath = Get.currentRoute;
-    bool isPortrait =
+    final String routePath = Get.currentRoute;
+    final bool isPortrait =
        MediaQuery.of(context).orientation == Orientation.portrait;

    /// TODO 横屏全屏状态下误触pip
@@ -269,7 +271,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>

  @override
  Widget build(BuildContext context) {
-    final videoHeight = MediaQuery.of(context).size.width * 9 / 16;
+    final double videoHeight = MediaQuery.sizeOf(context).width * 9 / 16;
    final double pinnedHeaderHeight =
        statusBarHeight + kToolbarHeight + videoHeight;
    if (MediaQuery.of(context).orientation == Orientation.landscape ||
@@ -303,7 +305,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
              headerSliverBuilder:
                  (BuildContext _context, bool innerBoxIsScrolled) {
                return <Widget>[
-                  Obx(() => SliverAppBar(
+                  Obx(
+                    () => SliverAppBar(
                      automaticallyImplyLeading: false,
                      // 假装使用一个非空变量，避免Obx检测不到而罢工
                      pinned: videoDetailController.autoPlay.value ^
@@ -315,7 +318,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                      expandedHeight: MediaQuery.of(context).orientation ==
                                  Orientation.landscape ||
                              plPlayerController?.isFullScreen.value == true
-                          ? MediaQuery.of(context).size.height -
+                          ? MediaQuery.sizeOf(context).height -
                              (MediaQuery.of(context).orientation ==
                                      Orientation.landscape
                                  ? 0
@@ -338,14 +341,17 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                              }
                            },
                            child: LayoutBuilder(
-                              builder: (context, boxConstraints) {
-                                double maxWidth = boxConstraints.maxWidth;
-                                double maxHeight = boxConstraints.maxHeight;
+                              builder: (BuildContext context,
+                                  BoxConstraints boxConstraints) {
+                                final double maxWidth = boxConstraints.maxWidth;
+                                final double maxHeight =
+                                    boxConstraints.maxHeight;
                                return Stack(
-                                  children: [
+                                  children: <Widget>[
                                    FutureBuilder(
                                      future: _futureBuilderFuture,
-                                      builder: ((context, snapshot) {
+                                      builder: (BuildContext context,
+                                          AsyncSnapshot snapshot) {
                                        if (snapshot.hasData &&
                                            snapshot.data['status']) {
                                          return Obx(
@@ -378,7 +384,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                        } else {
                                          return const SizedBox();
                                        }
-                                      }),
+                                      },
                                    ),

                                    Obx(
@@ -423,6 +429,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                                child: AppBar(
                                                  primary: false,
                                                  foregroundColor: Colors.white,
+                                                  elevation: 0,
+                                                  scrolledUnderElevation: 0,
                                                  backgroundColor:
                                                      Colors.transparent,
                                                  actions: [
@@ -484,7 +492,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                );
                              },
                            )),
-                      ))),
+                      ),
+                    ),
+                  ),
                ];
              },
              // pinnedHeaderSliverHeightBuilder: () {
@@ -495,11 +505,11 @@ class _VideoDetailPageState extends State<VideoDetailPage>
              /// 不收回
              pinnedHeaderSliverHeightBuilder: () {
                return plPlayerController?.isFullScreen.value == true
-                    ? MediaQuery.of(context).size.height
+                    ? MediaQuery.sizeOf(context).height
                    : pinnedHeaderHeight;
              },
              onlyOneScrollInBody: true,
-              body: Container(
+              body: ColoredBox(
                key: Key(heroTag),
                color: Theme.of(context).colorScheme.background,
                child: Column(
@@ -525,9 +535,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                    Expanded(
                      child: TabBarView(
                        controller: videoDetailController.tabCtr,
-                        children: [
+                        children: <Widget>[
                          Builder(
-                            builder: (context) {
+                            builder: (BuildContext context) {
                              return CustomScrollView(
                                key: const PageStorageKey<String>('简介'),
                                slivers: <Widget>[
@@ -560,7 +570,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                          .withOpacity(0.06),
                                    ),
                                  ),
-                                  const RelatedVideoPanel(),
+                                  RelatedVideoPanel(),
                                ],
                              );
                            },
@@ -597,7 +607,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
    Widget childWhenEnabled = FutureBuilder(
      key: Key(heroTag),
      future: _futureBuilderFuture,
-      builder: ((context, snapshot) {
+      builder: (BuildContext context, AsyncSnapshot snapshot) {
        if (snapshot.hasData && snapshot.data['status']) {
          return Obx(
            () => !videoDetailController.autoPlay.value
@@ -619,9 +629,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                  ),
          );
        } else {
-          return const SizedBox();
+          return nil;
        }
-      }),
+      },
    );
    if (Platform.isAndroid) {
      return PiPSwitcher(
--- a/lib/pages/video/detail/widgets/app_bar.dart
+++ b/lib/pages/video/detail/widgets/app_bar.dart
@@ -16,7 +16,7 @@ class ScrollAppBar extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    final double statusBarHeight = MediaQuery.of(context).padding.top;
-    final videoHeight = MediaQuery.of(context).size.width * 9 / 16;
+    final videoHeight = MediaQuery.sizeOf(context).width * 9 / 16;
    return Positioned(
      top: -videoHeight + scrollVal + kToolbarHeight + 0.5,
      left: 0,
--- a/lib/pages/video/detail/widgets/header_control.dart
+++ b/lib/pages/video/detail/widgets/header_control.dart
@@ -19,15 +19,15 @@ import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/http/danmaku.dart';

 class HeaderControl extends StatefulWidget implements PreferredSizeWidget {
-  final PlPlayerController? controller;
-  final VideoDetailController? videoDetailCtr;
-  final Floating? floating;
  const HeaderControl({
    this.controller,
    this.videoDetailCtr,
    this.floating,
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
+  final PlPlayerController? controller;
+  final VideoDetailController? videoDetailCtr;
+  final Floating? floating;

  @override
  State<HeaderControl> createState() => _HeaderControlState();
@@ -42,9 +42,9 @@ class _HeaderControlState extends State<HeaderControl> {
  TextStyle subTitleStyle = const TextStyle(fontSize: 12);
  TextStyle titleStyle = const TextStyle(fontSize: 14);
  Size get preferredSize => const Size(double.infinity, kToolbarHeight);
-  Box localCache = GStrorage.localCache;
-  Box videoStorage = GStrorage.video;
-  late List speedsList;
+  final Box<dynamic> localCache = GStrorage.localCache;
+  final Box<dynamic> videoStorage = GStrorage.video;
+  late List<double> speedsList;
  double buttonSpace = 8;

  @override
@@ -71,7 +71,7 @@ class _HeaderControlState extends State<HeaderControl> {
          ),
          margin: const EdgeInsets.all(12),
          child: Column(
-            children: [
+            children: <Widget>[
              SizedBox(
                height: 35,
                child: Center(
@@ -118,7 +118,7 @@ class _HeaderControlState extends State<HeaderControl> {
                    // ),
                    ListTile(
                      onTap: () async {
-                        var res = await UserHttp.toViewLater(
+                        final res = await UserHttp.toViewLater(
                            bvid: widget.videoDetailCtr!.bvid);
                        SmartDialog.showToast(res['msg']);
                        Get.back();
@@ -187,11 +187,12 @@ class _HeaderControlState extends State<HeaderControl> {
    bool isSending = false; // 追踪是否正在发送
    showDialog(
      context: Get.context!,
-      builder: (context) {
+      builder: (BuildContext context) {
        // TODO: 支持更多类型和颜色的弹幕
        return AlertDialog(
          title: const Text('发送弹幕（测试）'),
-          content: StatefulBuilder(builder: (context, StateSetter setState) {
+          content: StatefulBuilder(
+              builder: (BuildContext context, StateSetter setState) {
            return TextField(
              controller: textController,
            );
@@ -204,12 +205,13 @@ class _HeaderControlState extends State<HeaderControl> {
                style: TextStyle(color: Theme.of(context).colorScheme.outline),
              ),
            ),
-            StatefulBuilder(builder: (context, StateSetter setState) {
+            StatefulBuilder(
+                builder: (BuildContext context, StateSetter setState) {
              return TextButton(
                onPressed: isSending
                    ? null
                    : () async {
-                        String msg = textController.text;
+                        final String msg = textController.text;
                        if (msg.isEmpty) {
                          SmartDialog.showToast('弹幕内容不能为空');
                          return;
@@ -222,10 +224,10 @@ class _HeaderControlState extends State<HeaderControl> {
                        });
                        //修改按钮文字
                        // SmartDialog.showToast('弹幕发送中,\n$msg');
-                        dynamic res = await DanmakaHttp.shootDanmaku(
-                          oid: widget.videoDetailCtr!.cid!.value,
+                        final dynamic res = await DanmakaHttp.shootDanmaku(
+                          oid: widget.videoDetailCtr!.cid.value,
                          msg: textController.text,
-                          bvid: widget.videoDetailCtr!.bvid!,
+                          bvid: widget.videoDetailCtr!.bvid,
                          progress:
                              widget.controller!.position.value.inMilliseconds,
                          type: 1,
@@ -239,11 +241,12 @@ class _HeaderControlState extends State<HeaderControl> {
                          // TODO: 暂停状态下预览弹幕仍会移动与计时，可考虑添加到dmSegList或其他方式实现
                          widget.controller!.danmakuController!.addItems([
                            DanmakuItem(
-                              "☞$msg",
+                              msg,
                              color: Colors.white,
                              time: widget
                                  .controller!.position.value.inMilliseconds,
                              type: DanmakuItemType.scroll,
+                              isSend: true,
                            )
                          ]);
                          Get.back();
@@ -262,20 +265,20 @@ class _HeaderControlState extends State<HeaderControl> {

  /// 选择倍速
  void showSetSpeedSheet() {
-    double currentSpeed = widget.controller!.playbackSpeed;
+    final double currentSpeed = widget.controller!.playbackSpeed;
    showDialog(
      context: Get.context!,
-      builder: (context) {
+      builder: (BuildContext context) {
        return AlertDialog(
          title: const Text('播放速度'),
-          content: StatefulBuilder(builder: (context, StateSetter setState) {
+          content: StatefulBuilder(
+              builder: (BuildContext context, StateSetter setState) {
            return Wrap(
-              alignment: WrapAlignment.start,
              spacing: 8,
              runSpacing: 2,
              children: [
-                for (var i in speedsList) ...[
-                  if (i == currentSpeed) ...[
+                for (final double i in speedsList) ...<Widget>[
+                  if (i == currentSpeed) ...<Widget>[
                    FilledButton(
                      onPressed: () async {
                        // setState(() => currentSpeed = i),
@@ -298,7 +301,7 @@ class _HeaderControlState extends State<HeaderControl> {
              ],
            );
          }),
-          actions: [
+          actions: <Widget>[
            TextButton(
              onPressed: () => SmartDialog.dismiss(),
              child: Text(
@@ -321,18 +324,18 @@ class _HeaderControlState extends State<HeaderControl> {

  /// 选择画质
  void showSetVideoQa() {
-    List<FormatItem> videoFormat = videoInfo.supportFormats!;
-    VideoQuality currentVideoQa = widget.videoDetailCtr!.currentVideoQa;
+    final List<FormatItem> videoFormat = videoInfo.supportFormats!;
+    final VideoQuality currentVideoQa = widget.videoDetailCtr!.currentVideoQa;

    /// 总质量分类
-    int totalQaSam = videoFormat.length;
+    final int totalQaSam = videoFormat.length;

    /// 可用的质量分类
    int userfulQaSam = 0;
-    List<VideoItem> video = videoInfo.dash!.video!;
-    Set<int> idSet = {};
-    for (var item in video) {
-      int id = item.id!;
+    final List<VideoItem> video = videoInfo.dash!.video!;
+    final Set<int> idSet = {};
+    for (final VideoItem item in video) {
+      final int id = item.id!;
      if (!idSet.contains(id)) {
        idSet.add(id);
        userfulQaSam++;
@@ -354,7 +357,7 @@ class _HeaderControlState extends State<HeaderControl> {
          ),
          margin: const EdgeInsets.all(12),
          child: Column(
-            children: [
+            children: <Widget>[
              SizedBox(
                height: 45,
                child: GestureDetector(
@@ -380,7 +383,7 @@ class _HeaderControlState extends State<HeaderControl> {
                  child: Scrollbar(
                    child: ListView(
                      children: [
-                        for (var i = 0; i < totalQaSam; i++) ...[
+                        for (int i = 0; i < totalQaSam; i++) ...[
                          ListTile(
                            onTap: () {
                              if (currentVideoQa.code ==
@@ -427,9 +430,8 @@ class _HeaderControlState extends State<HeaderControl> {

  /// 选择音质
  void showSetAudioQa() {
-    AudioQuality currentAudioQa = widget.videoDetailCtr!.currentAudioQa!;
-
-    List<AudioItem> audio = videoInfo.dash!.audio!;
+    final AudioQuality currentAudioQa = widget.videoDetailCtr!.currentAudioQa!;
+    final List<AudioItem> audio = videoInfo.dash!.audio!;
    showModalBottomSheet(
      context: context,
      elevation: 0,
@@ -445,18 +447,20 @@ class _HeaderControlState extends State<HeaderControl> {
          ),
          margin: const EdgeInsets.all(12),
          child: Column(
-            children: [
+            children: <Widget>[
              SizedBox(
                  height: 45,
                  child: Center(child: Text('选择音质', style: titleStyle))),
              Expanded(
                child: Material(
                  child: ListView(
-                    children: [
-                      for (var i in audio) ...[
+                    children: <Widget>[
+                      for (final AudioItem i in audio) ...<Widget>[
                        ListTile(
                          onTap: () {
-                            if (currentAudioQa.code == i.id) return;
+                            if (currentAudioQa.code == i.id) {
+                              return;
+                            }
                            final int quality = i.id!;
                            widget.videoDetailCtr!.currentAudioQa =
                                AudioQualityCode.fromCode(quality)!;
@@ -493,13 +497,13 @@ class _HeaderControlState extends State<HeaderControl> {
  // 选择解码格式
  void showSetDecodeFormats() {
    // 当前选中的解码格式
-    VideoDecodeFormats currentDecodeFormats =
+    final VideoDecodeFormats currentDecodeFormats =
        widget.videoDetailCtr!.currentDecodeFormats;
-    VideoItem firstVideo = widget.videoDetailCtr!.firstVideo;
+    final VideoItem firstVideo = widget.videoDetailCtr!.firstVideo;
    // 当前视频可用的解码格式
-    List<FormatItem> videoFormat = videoInfo.supportFormats!;
-    List list = videoFormat
-        .firstWhere((e) => e.quality == firstVideo.quality!.code)
+    final List<FormatItem> videoFormat = videoInfo.supportFormats!;
+    final List list = videoFormat
+        .firstWhere((FormatItem e) => e.quality == firstVideo.quality!.code)
        .codecs!;

    showModalBottomSheet(
@@ -565,15 +569,15 @@ class _HeaderControlState extends State<HeaderControl> {
  /// 弹幕功能
  void showSetDanmaku() async {
    // 屏蔽类型
-    List<Map<String, dynamic>> blockTypesList = [
+    final List<Map<String, dynamic>> blockTypesList = [
      {'value': 5, 'label': '顶部'},
      {'value': 2, 'label': '滚动'},
      {'value': 4, 'label': '底部'},
      {'value': 6, 'label': '彩色'},
    ];
-    List blockTypes = widget.controller!.blockTypes;
+    final List blockTypes = widget.controller!.blockTypes;
    // 显示区域
-    List<Map<String, dynamic>> showAreas = [
+    final List<Map<String, dynamic>> showAreas = [
      {'value': 0.25, 'label': '1/4屏'},
      {'value': 0.5, 'label': '半屏'},
      {'value': 0.75, 'label': '3/4屏'},
@@ -587,13 +591,15 @@ class _HeaderControlState extends State<HeaderControl> {
    // 弹幕速度
    double danmakuDurationVal = widget.controller!.danmakuDurationVal;

-    DanmakuController danmakuController = widget.controller!.danmakuController!;
+    final DanmakuController danmakuController =
+        widget.controller!.danmakuController!;
    await showModalBottomSheet(
      context: context,
      elevation: 0,
      backgroundColor: Colors.transparent,
      builder: (BuildContext context) {
-        return StatefulBuilder(builder: (context, StateSetter setState) {
+        return StatefulBuilder(
+            builder: (BuildContext context, StateSetter setState) {
          return Container(
            width: double.infinity,
            height: 580,
@@ -617,11 +623,13 @@ class _HeaderControlState extends State<HeaderControl> {
                  Padding(
                    padding: const EdgeInsets.only(top: 12, bottom: 18),
                    child: Row(
-                      children: [
-                        for (var i in blockTypesList) ...[
+                      children: <Widget>[
+                        for (final Map<String, dynamic> i
+                            in blockTypesList) ...<Widget>[
                          ActionRowLineItem(
                            onTap: () async {
-                              bool isChoose = blockTypes.contains(i['value']);
+                              final bool isChoose =
+                                  blockTypes.contains(i['value']);
                              if (isChoose) {
                                blockTypes.remove(i['value']);
                              } else {
@@ -630,9 +638,9 @@ class _HeaderControlState extends State<HeaderControl> {
                              widget.controller!.blockTypes = blockTypes;
                              setState(() {});
                              try {
-                                DanmakuOption currentOption =
+                                final DanmakuOption currentOption =
                                    danmakuController.option;
-                                DanmakuOption updatedOption =
+                                final DanmakuOption updatedOption =
                                    currentOption.copyWith(
                                  hideTop: blockTypes.contains(5),
                                  hideBottom: blockTypes.contains(4),
@@ -655,16 +663,16 @@ class _HeaderControlState extends State<HeaderControl> {
                    padding: const EdgeInsets.only(top: 12, bottom: 18),
                    child: Row(
                      children: [
-                        for (var i in showAreas) ...[
+                        for (final Map<String, dynamic> i in showAreas) ...[
                          ActionRowLineItem(
                            onTap: () {
                              showArea = i['value'];
                              widget.controller!.showArea = showArea;
                              setState(() {});
                              try {
-                                DanmakuOption currentOption =
+                                final DanmakuOption currentOption =
                                    danmakuController.option;
-                                DanmakuOption updatedOption =
+                                final DanmakuOption updatedOption =
                                    currentOption.copyWith(area: i['value']);
                                danmakuController.updateOption(updatedOption);
                              } catch (_) {}
@@ -705,9 +713,9 @@ class _HeaderControlState extends State<HeaderControl> {
                          widget.controller!.opacityVal = opacityVal;
                          setState(() {});
                          try {
-                            DanmakuOption currentOption =
+                            final DanmakuOption currentOption =
                                danmakuController.option;
-                            DanmakuOption updatedOption =
+                            final DanmakuOption updatedOption =
                                currentOption.copyWith(opacity: val);
                            danmakuController.updateOption(updatedOption);
                          } catch (_) {}
@@ -743,9 +751,9 @@ class _HeaderControlState extends State<HeaderControl> {
                          widget.controller!.fontSizeVal = fontSizeVal;
                          setState(() {});
                          try {
-                            DanmakuOption currentOption =
+                            final DanmakuOption currentOption =
                                danmakuController.option;
-                            DanmakuOption updatedOption =
+                            final DanmakuOption updatedOption =
                                currentOption.copyWith(
                              fontSize: (15 * fontSizeVal).toDouble(),
                            );
@@ -784,10 +792,8 @@ class _HeaderControlState extends State<HeaderControl> {
                              danmakuDurationVal;
                          setState(() {});
                          try {
-                            DanmakuOption currentOption =
-                                danmakuController.option;
-                            DanmakuOption updatedOption =
-                                currentOption.copyWith(
+                            final DanmakuOption updatedOption 
+                                danmakuController.option.copyWith(
                                    duration:
                                        val / widget.controller!.playbackSpeed);
                            danmakuController.updateOption(updatedOption);
@@ -829,8 +835,8 @@ class _HeaderControlState extends State<HeaderControl> {
              Expanded(
                child: Material(
                  child: ListView(
-                    children: [
-                      for (var i in PlayRepeat.values) ...[
+                    children: <Widget>[
+                      for (final PlayRepeat i in PlayRepeat.values) ...[
                        ListTile(
                          onTap: () {
                            widget.controller!.setPlayRepeat(i);
@@ -862,7 +868,7 @@ class _HeaderControlState extends State<HeaderControl> {
  @override
  Widget build(BuildContext context) {
    final _ = widget.controller!;
-    const textStyle = TextStyle(
+    const TextStyle textStyle = TextStyle(
      color: Colors.white,
      fontSize: 12,
    );
@@ -883,11 +889,11 @@ class _HeaderControlState extends State<HeaderControl> {
              size: 15,
              color: Colors.white,
            ),
-            fuc: () => {
+            fuc: () => <Set<void>>{
              if (widget.controller!.isFullScreen.value)
-                {widget.controller!.triggerFullScreen(status: false)}
+                <void>{widget.controller!.triggerFullScreen(status: false)}
              else
-                {
+                <void>{
                  if (MediaQuery.of(context).orientation ==
                      Orientation.landscape)
                    {
@@ -910,7 +916,8 @@ class _HeaderControlState extends State<HeaderControl> {
              // 销毁播放器实例
              await widget.controller!.dispose(type: 'all');
              if (mounted) {
-                Navigator.popUntil(context, (route) => route.isFirst);
+                Navigator.popUntil(
+                    context, (Route<dynamic> route) => route.isFirst);
              }
            },
          ),
@@ -959,7 +966,7 @@ class _HeaderControlState extends State<HeaderControl> {
            ),
          ),
          SizedBox(width: buttonSpace),
-          if (Platform.isAndroid) ...[
+          if (Platform.isAndroid) ...<Widget>[
            SizedBox(
              width: 34,
              height: 34,
@@ -976,7 +983,7 @@ class _HeaderControlState extends State<HeaderControl> {
                    canUsePiP = false;
                  }
                  if (canUsePiP) {
-                    final aspectRatio = Rational(
+                    final Rational aspectRatio = Rational(
                      widget.videoDetailCtr!.data.dash!.video!.first.width!,
                      widget.videoDetailCtr!.data.dash!.video!.first.height!,
                    );
@@ -1002,7 +1009,7 @@ class _HeaderControlState extends State<HeaderControl> {
                ),
                onPressed: () => showSetSpeedSheet(),
                child: Text(
-                  '${_.playbackSpeed.toString()}X',
+                  '${_.playbackSpeed}X',
                  style: textStyle,
                ),
              ),
--- a/lib/pages/webview/controller.dart
+++ b/lib/pages/webview/controller.dart
@@ -6,7 +6,6 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/http/init.dart';
-import 'package:pilipala/http/member.dart';
 import 'package:pilipala/http/user.dart';
 import 'package:pilipala/pages/home/index.dart';
 import 'package:pilipala/pages/media/index.dart';
@@ -53,9 +52,9 @@ class WebviewController extends GetxController {
            loadProgress.value = progress;
          },
          onPageStarted: (String url) {
-            String str = Uri.parse(url).pathSegments[0];
-            Map matchRes = IdUtils.matchAvorBv(input: str);
-            List matchKeys = matchRes.keys.toList();
+            final String str = Uri.parse(url).pathSegments[0];
+            final Map matchRes = IdUtils.matchAvorBv(input: str);
+            final List matchKeys = matchRes.keys.toList();
            if (matchKeys.isNotEmpty) {
              if (matchKeys.first == 'BV') {
                Get.offAndToNamed(
@@ -102,21 +101,21 @@ class WebviewController extends GetxController {
    }
    try {
      await SetCookie.onSet();
-      var result = await UserHttp.userInfo();
+      final result = await UserHttp.userInfo();
      if (result['status'] && result['data'].isLogin) {
        SmartDialog.showToast('登录成功');
        try {
          Box userInfoCache = GStrorage.userInfo;
          await userInfoCache.put('userInfoCache', result['data']);

-          HomeController homeCtr = Get.find<HomeController>();
+          final HomeController homeCtr = Get.find<HomeController>();
          homeCtr.updateLoginStatus(true);
          homeCtr.userFace.value = result['data'].face;
-          MediaController mediaCtr = Get.find<MediaController>();
+          final MediaController mediaCtr = Get.find<MediaController>();
          mediaCtr.mid = result['data'].mid;
          await LoginUtils.refreshLoginStatus(true);
        } catch (err) {
-          SmartDialog.show(builder: (context) {
+          SmartDialog.show(builder: (BuildContext context) {
            return AlertDialog(
              title: const Text('登录遇到问题'),
              content: Text(err.toString()),
--- a/lib/pages/whisper_detail/controller.dart
+++ b/lib/pages/whisper_detail/controller.dart
--- a/lib/pages/whisper_detail/index.dart
+++ b/lib/pages/whisper_detail/index.dart
--- a/lib/pages/whisper_detail/view.dart
+++ b/lib/pages/whisper_detail/view.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
-import 'package:pilipala/pages/whisperDetail/controller.dart';
+import 'package:pilipala/pages/whisper_detail/controller.dart';
 import 'package:pilipala/utils/feed_back.dart';

 import 'widget/chat_item.dart';
@@ -41,8 +41,8 @@ class _WhisperDetailPageState extends State<WhisperDetailPage> {
                child: IconButton(
                  style: ButtonStyle(
                    padding: MaterialStateProperty.all(EdgeInsets.zero),
-                    backgroundColor:
-                        MaterialStateProperty.resolveWith((states) {
+                    backgroundColor: MaterialStateProperty.resolveWith(
+                        (Set<MaterialState> states) {
                      return Theme.of(context)
                          .colorScheme
                          .primaryContainer
@@ -69,7 +69,7 @@ class _WhisperDetailPageState extends State<WhisperDetailPage> {
                  );
                },
                child: Row(
-                  children: [
+                  children: <Widget>[
                    NetworkImgLayer(
                      width: 34,
                      height: 34,
@@ -91,12 +91,12 @@ class _WhisperDetailPageState extends State<WhisperDetailPage> {
      ),
      body: FutureBuilder(
        future: _futureBuilderFuture,
-        builder: (context, snapshot) {
+        builder: (BuildContext context, snapshot) {
          if (snapshot.connectionState == ConnectionState.done) {
            if (snapshot.data == null) {
              return const SizedBox();
            }
-            Map data = snapshot.data as Map;
+            final Map data = snapshot.data as Map;
            if (data['status']) {
              List messageList = _whisperDetailController.messageList;
              return Obx(
--- a/lib/pages/whisper_detail/widget/chat_item.dart
+++ b/lib/pages/whisper_detail/widget/chat_item.dart
@@ -15,11 +15,12 @@ class ChatItem extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    bool isOwner = item.senderUid == GStrorage.userInfo.get('userInfoCache').mid;
+    bool isOwner =
+        item.senderUid == GStrorage.userInfo.get('userInfoCache').mid;
    bool isPic = item.msgType == 2; // 图片
    bool isText = item.msgType == 1; // 文本
-    bool isAchive = item.msgType == 11; // 投稿
-    bool isArticle = item.msgType == 12; // 专栏
+    // bool isAchive = item.msgType == 11; // 投稿
+    // bool isArticle = item.msgType == 12; // 专栏
    bool isRevoke = item.msgType == 5; // 撤回消息

    bool isSystem =