fix import

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
upgrade deps
2026-06-10 21:11:27 +08:00 · 2025-11-17 18:15:20 +08:00 · 2025-11-17 18:04:30 +08:00 · 2025-11-17 17:35:29 +08:00 · 2025-11-17 17:35:00 +08:00 · 2025-11-17 17:20:29 +08:00
161 changed files with 1037 additions and 642 deletions
--- a/.fvmrc
+++ b/.fvmrc
@@ -1,3 +1,3 @@
 {
-  "flutter": "3.35.7"
+  "flutter": "3.38.1"
 }
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -13,6 +13,7 @@ analyzer:
  exclude:
    - lib/grpc/bilibili/**
    - lib/grpc/google/**
+    - lib/common/widgets/flutter/**

 formatter:
  trailing_commas: preserve
--- a/lib/common/widgets/dialog/dialog.dart
+++ b/lib/common/widgets/dialog/dialog.dart
@@ -7,6 +7,7 @@ Future<void> showConfirmDialog({
  dynamic content,
  required VoidCallback onConfirm,
 }) {
+  assert(content is String? || content is Widget);
  return showDialog(
    context: context,
    builder: (context) {
--- a/lib/common/widgets/dialog/report.dart
+++ b/lib/common/widgets/dialog/report.dart
@@ -1,6 +1,6 @@
 import 'package:PiliPlus/common/widgets/radio_widget.dart';
 import 'package:PiliPlus/utils/extension.dart';
-import 'package:flutter/foundation.dart';
+import 'package:PiliPlus/utils/utils.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
@@ -127,10 +127,10 @@ Future<void> autoWrapReportDialog(
                } else {
                  SmartDialog.showToast(data['message'].toString());
                }
-              } catch (e) {
+              } catch (e, s) {
                SmartDialog.dismiss();
                SmartDialog.showToast('提交失败：$e');
-                if (kDebugMode) rethrow;
+                Utils.reportError(e, s);
              }
            },
            child: const Text('确定'),
--- a/lib/common/widgets/flutter/custom_layout.dart
+++ b/lib/common/widgets/flutter/custom_layout.dart
--- a/lib/common/widgets/flutter/draggable_sheet/draggable_scrollable_sheet_dyn.dart
+++ b/lib/common/widgets/flutter/draggable_sheet/draggable_scrollable_sheet_dyn.dart
--- a/lib/common/widgets/flutter/draggable_sheet/draggable_scrollable_sheet_topic.dart
+++ b/lib/common/widgets/flutter/draggable_sheet/draggable_scrollable_sheet_topic.dart
--- a/lib/common/widgets/flutter/dyn/button.dart
+++ b/lib/common/widgets/flutter/dyn/button.dart
@@ -13,7 +13,7 @@ library;

 import 'dart:math' as math;

-import 'package:PiliPlus/common/widgets/dyn/ink_well.dart';
+import 'package:PiliPlus/common/widgets/flutter/dyn/ink_well.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart' hide InkWell;
 import 'package:flutter/rendering.dart';
--- a/lib/common/widgets/flutter/dyn/ink_well.dart
+++ b/lib/common/widgets/flutter/dyn/ink_well.dart
--- a/lib/common/widgets/flutter/dyn/text_button.dart
+++ b/lib/common/widgets/flutter/dyn/text_button.dart
@@ -12,7 +12,7 @@ library;

 import 'dart:ui' show lerpDouble;

-import 'package:PiliPlus/common/widgets/dyn/button.dart';
+import 'package:PiliPlus/common/widgets/flutter/dyn/button.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart' hide InkWell, ButtonStyleButton;

--- a/lib/common/widgets/flutter/list_tile.dart
+++ b/lib/common/widgets/flutter/list_tile.dart
--- a/lib/common/widgets/flutter/page/page_view.dart
+++ b/lib/common/widgets/flutter/page/page_view.dart
@@ -10,7 +10,7 @@
 /// @docImport 'text.dart';
 library;

-import 'package:PiliPlus/common/widgets/page/scrollable.dart';
+import 'package:PiliPlus/common/widgets/flutter/page/scrollable.dart';
 import 'package:flutter/gestures.dart' show DragStartBehavior;
 import 'package:flutter/material.dart' hide Scrollable, ScrollableState;
 import 'package:flutter/rendering.dart';
--- a/lib/common/widgets/flutter/page/scrollable.dart
+++ b/lib/common/widgets/flutter/page/scrollable.dart
--- a/lib/common/widgets/flutter/page/tabs.dart
+++ b/lib/common/widgets/flutter/page/tabs.dart
@@ -4,7 +4,7 @@

 import 'dart:ui' show SemanticsRole;

-import 'package:PiliPlus/common/widgets/page/page_view.dart';
+import 'package:PiliPlus/common/widgets/flutter/page/page_view.dart';
 import 'package:flutter/foundation.dart' show clampDouble;
 import 'package:flutter/gestures.dart' show DragStartBehavior;
 import 'package:flutter/material.dart' hide TabBarView, PageView;
--- a/lib/common/widgets/flutter/text/paragraph.dart
+++ b/lib/common/widgets/flutter/text/paragraph.dart
--- a/lib/common/widgets/flutter/text/rich_text.dart
+++ b/lib/common/widgets/flutter/text/rich_text.dart
@@ -1,6 +1,6 @@
 import 'dart:ui' as ui;

-import 'package:PiliPlus/common/widgets/text/paragraph.dart';
+import 'package:PiliPlus/common/widgets/flutter/text/paragraph.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart' hide RenderParagraph;

--- a/lib/common/widgets/flutter/text/text.dart
+++ b/lib/common/widgets/flutter/text/text.dart
@@ -17,8 +17,8 @@ library;
 import 'dart:math';
 import 'dart:ui' as ui show TextHeightBehavior;

-import 'package:PiliPlus/common/widgets/text/paragraph.dart';
-import 'package:PiliPlus/common/widgets/text/rich_text.dart';
+import 'package:PiliPlus/common/widgets/flutter/text/paragraph.dart';
+import 'package:PiliPlus/common/widgets/flutter/text/rich_text.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart' hide RichText;
 import 'package:flutter/rendering.dart' hide RenderParagraph;
--- a/lib/common/widgets/flutter/text_field/adaptive_text_selection_toolbar.dart
+++ b/lib/common/widgets/flutter/text_field/adaptive_text_selection_toolbar.dart
@@ -9,7 +9,7 @@
 /// @docImport 'text_field.dart';
 library;

-import 'package:PiliPlus/common/widgets/text_field/editable_text.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/editable_text.dart';
 import 'package:flutter/cupertino.dart' hide EditableText, EditableTextState;
 import 'package:flutter/material.dart' hide EditableText, EditableTextState;
 import 'package:flutter/rendering.dart';
--- a/lib/common/widgets/flutter/text_field/controller.dart
+++ b/lib/common/widgets/flutter/text_field/controller.dart
--- a/lib/common/widgets/flutter/text_field/cupertino/cupertino_adaptive_text_selection_toolbar.dart
+++ b/lib/common/widgets/flutter/text_field/cupertino/cupertino_adaptive_text_selection_toolbar.dart
@@ -5,7 +5,7 @@
 /// @docImport 'package:flutter/material.dart';
 library;

-import 'package:PiliPlus/common/widgets/text_field/editable_text.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/editable_text.dart';
 import 'package:flutter/cupertino.dart' hide EditableText, EditableTextState;
 import 'package:flutter/foundation.dart' show defaultTargetPlatform;
 import 'package:flutter/rendering.dart';
--- a/lib/common/widgets/flutter/text_field/cupertino/cupertino_spell_check_suggestions_toolbar.dart
+++ b/lib/common/widgets/flutter/text_field/cupertino/cupertino_spell_check_suggestions_toolbar.dart
@@ -5,7 +5,7 @@
 /// @docImport 'package:flutter/material.dart';
 library;

-import 'package:PiliPlus/common/widgets/text_field/editable_text.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/editable_text.dart';
 import 'package:flutter/cupertino.dart' hide EditableText, EditableTextState;
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart'
--- a/lib/common/widgets/flutter/text_field/cupertino/cupertino_text_field.dart
+++ b/lib/common/widgets/flutter/text_field/cupertino/cupertino_text_field.dart
@@ -7,13 +7,13 @@ library;

 import 'dart:ui' as ui show BoxHeightStyle, BoxWidthStyle;

-import 'package:PiliPlus/common/widgets/text_field/controller.dart';
-import 'package:PiliPlus/common/widgets/text_field/cupertino/cupertino_adaptive_text_selection_toolbar.dart';
-import 'package:PiliPlus/common/widgets/text_field/cupertino/cupertino_spell_check_suggestions_toolbar.dart';
-import 'package:PiliPlus/common/widgets/text_field/editable_text.dart';
-import 'package:PiliPlus/common/widgets/text_field/spell_check.dart';
-import 'package:PiliPlus/common/widgets/text_field/system_context_menu.dart';
-import 'package:PiliPlus/common/widgets/text_field/text_selection.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/controller.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/cupertino/cupertino_adaptive_text_selection_toolbar.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/cupertino/cupertino_spell_check_suggestions_toolbar.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/editable_text.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/spell_check.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/system_context_menu.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/text_selection.dart';
 import 'package:flutter/cupertino.dart'
    hide
        SpellCheckConfiguration,
--- a/lib/common/widgets/flutter/text_field/editable.dart
+++ b/lib/common/widgets/flutter/text_field/editable.dart
@@ -16,7 +16,7 @@ import 'dart:ui'
        SemanticsInputType,
        TextBox;

-import 'package:PiliPlus/common/widgets/text_field/controller.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/controller.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
--- a/lib/common/widgets/flutter/text_field/editable_text.dart
+++ b/lib/common/widgets/flutter/text_field/editable_text.dart
@@ -22,10 +22,10 @@ import 'dart:math' as math;
 import 'dart:ui' as ui hide TextStyle;
 import 'dart:ui';

-import 'package:PiliPlus/common/widgets/text_field/controller.dart';
-import 'package:PiliPlus/common/widgets/text_field/editable.dart';
-import 'package:PiliPlus/common/widgets/text_field/spell_check.dart';
-import 'package:PiliPlus/common/widgets/text_field/text_selection.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/controller.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/editable.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/spell_check.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/text_selection.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart'
--- a/lib/common/widgets/flutter/text_field/spell_check.dart
+++ b/lib/common/widgets/flutter/text_field/spell_check.dart
@@ -12,7 +12,7 @@ import 'package:flutter/painting.dart';
 import 'package:flutter/services.dart'
    show SpellCheckResults, SpellCheckService, SuggestionSpan, TextEditingValue;

-import 'package:PiliPlus/common/widgets/text_field/editable_text.dart'
+import 'package:PiliPlus/common/widgets/flutter/text_field/editable_text.dart'
    show EditableTextContextMenuBuilder;

 /// Controls how spell check is performed for text input.
--- a/lib/common/widgets/flutter/text_field/spell_check_suggestions_toolbar.dart
+++ b/lib/common/widgets/flutter/text_field/spell_check_suggestions_toolbar.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.

-import 'package:PiliPlus/common/widgets/text_field/editable_text.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/editable_text.dart';
 import 'package:flutter/cupertino.dart' hide EditableText, EditableTextState;
 import 'package:flutter/material.dart' hide EditableText, EditableTextState;
 import 'package:flutter/scheduler.dart';
--- a/lib/common/widgets/flutter/text_field/system_context_menu.dart
+++ b/lib/common/widgets/flutter/text_field/system_context_menu.dart
@@ -5,7 +5,7 @@
 /// @docImport 'package:flutter/material.dart';
 library;

-import 'package:PiliPlus/common/widgets/text_field/editable_text.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/editable_text.dart';
 import 'package:flutter/material.dart' hide EditableText, EditableTextState;
 import 'package:flutter/services.dart';

--- a/lib/common/widgets/flutter/text_field/text_field.dart
+++ b/lib/common/widgets/flutter/text_field/text_field.dart
@@ -13,15 +13,15 @@ library;

 import 'dart:ui' as ui show BoxHeightStyle, BoxWidthStyle;

-import 'package:PiliPlus/common/widgets/text_field/adaptive_text_selection_toolbar.dart';
-import 'package:PiliPlus/common/widgets/text_field/controller.dart';
-import 'package:PiliPlus/common/widgets/text_field/cupertino/cupertino_spell_check_suggestions_toolbar.dart';
-import 'package:PiliPlus/common/widgets/text_field/cupertino/cupertino_text_field.dart';
-import 'package:PiliPlus/common/widgets/text_field/editable_text.dart';
-import 'package:PiliPlus/common/widgets/text_field/spell_check.dart';
-import 'package:PiliPlus/common/widgets/text_field/spell_check_suggestions_toolbar.dart';
-import 'package:PiliPlus/common/widgets/text_field/system_context_menu.dart';
-import 'package:PiliPlus/common/widgets/text_field/text_selection.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/adaptive_text_selection_toolbar.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/controller.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/cupertino/cupertino_spell_check_suggestions_toolbar.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/cupertino/cupertino_text_field.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/editable_text.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/spell_check.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/spell_check_suggestions_toolbar.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/system_context_menu.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/text_selection.dart';
 import 'package:flutter/cupertino.dart'
    hide
        EditableText,
--- a/lib/common/widgets/flutter/text_field/text_selection.dart
+++ b/lib/common/widgets/flutter/text_field/text_selection.dart
@@ -1,9 +1,9 @@
 import 'dart:math' as math;
 import 'dart:ui';

-import 'package:PiliPlus/common/widgets/text_field/controller.dart';
-import 'package:PiliPlus/common/widgets/text_field/editable.dart';
-import 'package:PiliPlus/common/widgets/text_field/editable_text.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/controller.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/editable.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/editable_text.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart' show kMinInteractiveDimension;
--- a/lib/common/widgets/image/custom_grid_view.dart
+++ b/lib/common/widgets/image/custom_grid_view.dart
@@ -19,7 +19,7 @@ import 'dart:math' show min;

 import 'package:PiliPlus/common/constants.dart';
 import 'package:PiliPlus/common/widgets/badge.dart';
-import 'package:PiliPlus/common/widgets/custom_layout.dart';
+import 'package:PiliPlus/common/widgets/flutter/custom_layout.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/models/common/badge_type.dart';
 import 'package:PiliPlus/models/common/image_preview_type.dart';
--- a/lib/common/widgets/refresh_indicator.dart
+++ b/lib/common/widgets/refresh_indicator.dart
@@ -403,15 +403,15 @@ class RefreshIndicatorState extends State<RefreshIndicator>
    _effectiveValueColor =
        widget.color ?? Theme.of(context).colorScheme.primary;
    final Color color = _effectiveValueColor;
-    if (color.alpha == 0x00) {
+    if (color.a == 0) {
      // Set an always stopped animation instead of a driven tween.
      _valueColor = AlwaysStoppedAnimation<Color>(color);
    } else {
      // Respect the alpha of the given color.
      _valueColor = _positionController.drive(
        ColorTween(
-          begin: color.withAlpha(0),
-          end: color.withAlpha(color.alpha),
+          begin: color.withValues(alpha: 0),
+          end: color,
        ).chain(
          CurveTween(curve: const Interval(0.0, 1.0 / _kDragSizeFactorLimit)),
        ),
@@ -555,7 +555,7 @@ class RefreshIndicatorState extends State<RefreshIndicator>
      1.0,
    ); // This triggers various rebuilds.
    if (_status == RefreshIndicatorStatus.drag &&
-        _valueColor.value!.alpha == _effectiveValueColor.alpha) {
+        _valueColor.value!.a == _effectiveValueColor.a) {
      _status = RefreshIndicatorStatus.armed;
      widget.onStatusChange?.call(_status);
    }
--- a/lib/http/api.dart
+++ b/lib/http/api.dart
@@ -972,4 +972,6 @@ class Api {
  static const String followedUp = '/x/relation/followings/followed_upper';

  static const String sameFollowing = '/x/relation/same/followings';
+
+  static const String seasonStatus = '/pgc/view/web/season/user/status';
 }
--- a/lib/http/danmaku_block.dart
+++ b/lib/http/danmaku_block.dart
@@ -1,26 +1,21 @@
 import 'package:PiliPlus/http/api.dart';
 import 'package:PiliPlus/http/init.dart';
+import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/models/user/danmaku_block.dart';
 import 'package:PiliPlus/utils/accounts.dart';
 import 'package:dio/dio.dart';

 class DanmakuFilterHttp {
-  static Future danmakuFilter() async {
+  static Future<LoadingState<DanmakuBlockDataModel>> danmakuFilter() async {
    var res = await Request().get(Api.danmakuFilter);
    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': DanmakuBlockDataModel.fromJson(res.data['data']),
-      };
+      return Success(DanmakuBlockDataModel.fromJson(res.data['data']));
    } else {
-      return {
-        'status': false,
-        'msg': res.data['message'],
-      };
+      return Error(res.data['message']);
    }
  }

-  static Future danmakuFilterDel({required int ids}) async {
+  static Future<LoadingState<Null>> danmakuFilterDel({required int ids}) async {
    var res = await Request().post(
      Api.danmakuFilterDel,
      data: {
@@ -30,16 +25,13 @@ class DanmakuFilterHttp {
      options: Options(contentType: Headers.formUrlEncodedContentType),
    );
    if (res.data['code'] == 0) {
-      return {'status': true};
+      return const Success(null);
    } else {
-      return {
-        'status': false,
-        'msg': res.data['message'],
-      };
+      return Error(res.data['message']);
    }
  }

-  static Future danmakuFilterAdd({
+  static Future<LoadingState<SimpleRule>> danmakuFilterAdd({
    required String filter,
    required int type,
  }) async {
@@ -53,15 +45,9 @@ class DanmakuFilterHttp {
      options: Options(contentType: Headers.formUrlEncodedContentType),
    );
    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': SimpleRule.fromJson(res.data['data']),
-      };
+      return Success(SimpleRule.fromJson(res.data['data']));
    } else {
-      return {
-        'status': false,
-        'msg': res.data['message'],
-      };
+      return Error(res.data['message']);
    }
  }
 }
--- a/lib/http/download.dart
+++ b/lib/http/download.dart
@@ -109,7 +109,7 @@ abstract final class DownloadHttp {
          orElse: () => videosList.first,
        );

-        final videoUrl = VideoUtils.getCdnUrl(videoDash);
+        final videoUrl = VideoUtils.getCdnUrl(videoDash.playUrls);

        final Type2File videoFile = Type2File(
          id: videoDash.id!,
@@ -143,7 +143,10 @@ abstract final class DownloadHttp {
            (e) => e.id == closestNumber,
            orElse: () => audioDashList.first,
          );
-          final audioUrl = VideoUtils.getCdnUrl(audioDash);
+          final audioUrl = VideoUtils.getCdnUrl(
+            audioDash.playUrls,
+            isAudio: true,
+          );
          audioFileList = [
            Type2File(
              id: audioDash.id!,
@@ -177,7 +180,7 @@ abstract final class DownloadHttp {
            md5: '',
            metaUrl: '',
            order: first.order!,
-            url: first.backupUrl?.lastOrNull ?? first.url!,
+            url: VideoUtils.getCdnUrl(first.playUrls),
          ),
        ];
        final FormatItem? formatItem = data.supportFormats?.firstWhereOrNull(
@@ -189,6 +192,7 @@ abstract final class DownloadHttp {
            formatItem?.quality ?? VideoQuality.clear480.code;

        entry
+          ..mediaType = 1
          ..typeTag = targetVideoQa.toString()
          ..videoQuality = targetVideoQa
          ..preferedVideoQuality = targetVideoQa
@@ -204,7 +208,7 @@ abstract final class DownloadHttp {
            useIjkMediaCodec: false,
          ),
        ];
-        entry.mediaType = 1;
+
        return Type1(
          from: pageData?.from ?? ep?.from,
          quality: entry.preferedVideoQuality,
--- a/lib/http/pgc.dart
+++ b/lib/http/pgc.dart
@@ -242,4 +242,18 @@ class PgcHttp {
      return {'status': false, 'msg': res.data['message']};
    }
  }
+
+  static Future seasonStatus(dynamic seasonId) async {
+    var res = await Request().get(
+      Api.seasonStatus,
+      queryParameters: {
+        'season_id': seasonId,
+      },
+    );
+    if (res.data['code'] == 0) {
+      return {'status': true, 'data': res.data['result']};
+    } else {
+      return {'status': false, 'msg': res.data['message']};
+    }
+  }
 }
--- a/lib/http/ua_type.dart
+++ b/lib/http/ua_type.dart
@@ -6,7 +6,8 @@ enum UaType {
  ),
  pc(
    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.2 Safari/605.1.15',
-  );
+  )
+  ;

  static UaType get platformUA => Utils.isMobile ? mob : pc;

--- a/lib/http/video.dart
+++ b/lib/http/video.dart
@@ -1068,11 +1068,10 @@ class VideoHttp {
    required int playurlType, // ugc 1, pgc 2
    int? qn,
  }) async {
-    final accessKey = Accounts.accountMode[AccountType.video.index].accessKey;
+    final accessKey = Accounts.get(AccountType.video).accessKey;
    final params = {
      'access_key': ?accessKey,
      'actionKey': 'appkey',
-      'appkey': Constants.appKey,
      'cid': cid,
      'fourk': 1,
      'is_proj': 1,
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -368,14 +368,12 @@ class MyApp extends StatelessWidget {
 }

 class _CustomHttpOverrides extends HttpOverrides {
-  final badCertificateCallback = kDebugMode || Pref.badCertificateCallback;
-
  @override
  HttpClient createHttpClient(SecurityContext? context) {
    final client = super.createHttpClient(context)
      // ..maxConnectionsPerHost = 32
      ..idleTimeout = const Duration(seconds: 15);
-    if (badCertificateCallback) {
+    if (kDebugMode || Pref.badCertificateCallback) {
      client.badCertificateCallback = (cert, host, port) => true;
    }
    return client;
--- a/lib/models/common/account_type.dart
+++ b/lib/models/common/account_type.dart
@@ -2,7 +2,8 @@ enum AccountType {
  main('主账号'),
  heartbeat('记录观看'),
  recommend('推荐'),
-  video('视频取流');
+  video('视频取流')
+  ;

  final String title;
  const AccountType(this.title);
--- a/lib/models/common/audio_normalization.dart
+++ b/lib/models/common/audio_normalization.dart
@@ -3,7 +3,8 @@ enum AudioNormalization {
  // ref https://github.com/KRTirtho/spotube/commit/da10ab2e291d4ba4d3082b9a6ae535639fb8f1b7
  dynaudnorm('预设 dynaudnorm', 'dynaudnorm=g=5:f=250:r=0.9:p=0.5'),
  loudnorm('预设 loudnorm', 'loudnorm=I=-16:LRA=11:TP=-1.5'),
-  custom('自定义参数');
+  custom('自定义参数')
+  ;

  final String title;
  final String param;
--- a/lib/models/common/avatar_badge_type.dart
+++ b/lib/models/common/avatar_badge_type.dart
@@ -4,7 +4,8 @@ enum BadgeType {
  none(),
  vip('大会员'),
  person('认证个人', Color(0xFFFFCC00)),
-  institution('认证机构', Colors.lightBlueAccent);
+  institution('认证机构', Colors.lightBlueAccent)
+  ;

  final String? desc;
  final Color? color;
--- a/lib/models/common/dm_block_type.dart
+++ b/lib/models/common/dm_block_type.dart
@@ -1,7 +1,8 @@
 enum DmBlockType {
  keyword('关键词'),
  regex('正则'),
-  uid('用户');
+  uid('用户')
+  ;

  final String label;
  const DmBlockType(this.label);
--- a/lib/models/common/dynamic/dynamic_badge_mode.dart
+++ b/lib/models/common/dynamic/dynamic_badge_mode.dart
@@ -1,7 +1,8 @@
 enum DynamicBadgeMode {
  hidden('隐藏'),
  point('红点'),
-  number('数字');
+  number('数字')
+  ;

  final String desc;
  const DynamicBadgeMode(this.desc);
--- a/lib/models/common/dynamic/dynamics_type.dart
+++ b/lib/models/common/dynamic/dynamics_type.dart
@@ -3,7 +3,8 @@ enum DynamicsTabType {
  video('投稿'),
  pgc('番剧'),
  article('专栏'),
-  up('UP');
+  up('UP')
+  ;

  final String label;
  const DynamicsTabType(this.label);
--- a/lib/models/common/dynamic/up_panel_position.dart
+++ b/lib/models/common/dynamic/up_panel_position.dart
@@ -3,7 +3,8 @@ enum UpPanelPosition {
  leftFixed('左侧常驻'),
  rightFixed('右侧常驻'),
  leftDrawer('左侧抽屉'),
-  rightDrawer('右侧抽屉');
+  rightDrawer('右侧抽屉')
+  ;

  final String label;
  const UpPanelPosition(this.label);
--- a/lib/models/common/episode_panel_type.dart
+++ b/lib/models/common/episode_panel_type.dart
@@ -1,7 +1,8 @@
 enum EpisodeType {
  part('分P'),
  season('合集'),
-  pgc('剧集');
+  pgc('剧集')
+  ;

  final String title;
  const EpisodeType(this.title);
--- a/lib/models/common/fav_order_type.dart
+++ b/lib/models/common/fav_order_type.dart
@@ -1,7 +1,8 @@
 enum FavOrderType {
  mtime('最近收藏'),
  view('最多播放'),
-  pubtime('最近投稿');
+  pubtime('最近投稿')
+  ;

  final String label;

--- a/lib/models/common/fav_type.dart
+++ b/lib/models/common/fav_type.dart
@@ -13,7 +13,8 @@ enum FavTabType {
  article('专栏', FavArticlePage()),
  note('笔记', FavNotePage()),
  topic('话题', FavTopicPage()),
-  cheese('课堂', FavCheesePage());
+  cheese('课堂', FavCheesePage())
+  ;

  final String title;
  final Widget page;
--- a/lib/models/common/follow_order_type.dart
+++ b/lib/models/common/follow_order_type.dart
@@ -1,6 +1,7 @@
 enum FollowOrderType {
  def('', '最近关注'),
-  attention('attention', '最常访问');
+  attention('attention', '最常访问')
+  ;

  final String type;
  final String title;
--- a/lib/models/common/home_tab_type.dart
+++ b/lib/models/common/home_tab_type.dart
@@ -19,7 +19,8 @@ enum HomeTabType implements EnumWithLabel {
  hot('热门'),
  rank('分区'),
  bangumi('番剧'),
-  cinema('影视');
+  cinema('影视')
+  ;

  @override
  final String label;
--- a/lib/models/common/member/tab_type.dart
+++ b/lib/models/common/member/tab_type.dart
@@ -8,7 +8,8 @@ enum MemberTabType {
  favorite('收藏'),
  bangumi('番剧'),
  cheese('课堂'),
-  shop('小店');
+  shop('小店')
+  ;

  static bool showMemberShop = Pref.showMemberShop;

--- a/lib/models/common/msg/msg_unread_type.dart
+++ b/lib/models/common/msg/msg_unread_type.dart
@@ -3,7 +3,8 @@ enum MsgUnReadType {
  reply('回复我的'),
  at('@我'),
  like('收到的赞'),
-  sysMsg('系统通知');
+  sysMsg('系统通知')
+  ;

  final String title;
  const MsgUnReadType(this.title);
--- a/lib/models/common/nav_bar_config.dart
+++ b/lib/models/common/nav_bar_config.dart
@@ -22,7 +22,8 @@ enum NavigationBarType implements EnumWithLabel {
    Icon(Icons.person_outline, size: 21),
    Icon(Icons.person, size: 21),
    MinePage(),
-  );
+  )
+  ;

  @override
  final String label;
--- a/lib/models/common/pgc_review_type.dart
+++ b/lib/models/common/pgc_review_type.dart
@@ -2,7 +2,8 @@ import 'package:PiliPlus/http/api.dart';

 enum PgcReviewType {
  long(label: '长评', api: Api.pgcReviewL),
-  short(label: '短评', api: Api.pgcReviewS);
+  short(label: '短评', api: Api.pgcReviewS)
+  ;

  final String label;
  final String api;
@@ -14,7 +15,8 @@ enum PgcReviewType {

 enum PgcReviewSortType {
  def('默认', 0),
-  latest('最新', 1);
+  latest('最新', 1)
+  ;

  final int sort;
  final String label;
--- a/lib/models/common/rank_type.dart
+++ b/lib/models/common/rank_type.dart
@@ -19,7 +19,8 @@ enum RankType {
  documentary('记录', seasonType: 3),
  movie('电影', seasonType: 2),
  tv('剧集', seasonType: 5),
-  variety('综艺', seasonType: 7);
+  variety('综艺', seasonType: 7)
+  ;

  final String label;
  final int? rid;
--- a/lib/models/common/reply/reply_option_type.dart
+++ b/lib/models/common/reply/reply_option_type.dart
@@ -4,7 +4,8 @@ import 'package:material_design_icons_flutter/material_design_icons_flutter.dart
 enum ReplyOptionType {
  allow('允许评论'),
  close('关闭评论'),
-  choose('精选评论');
+  choose('精选评论')
+  ;

  final String title;
  const ReplyOptionType(this.title);
--- a/lib/models/common/reply/reply_sort_type.dart
+++ b/lib/models/common/reply/reply_sort_type.dart
@@ -1,6 +1,7 @@
 enum ReplySortType {
  time('最新评论', '最新'),
-  hot('最热评论', '最热');
+  hot('最热评论', '最热')
+  ;

  final String title;
  final String label;
--- a/lib/models/common/search/article_search_type.dart
+++ b/lib/models/common/search/article_search_type.dart
@@ -3,7 +3,8 @@ enum ArticleOrderType {
  pubdate('最新发布'),
  click('最多点击'),
  attention('最多喜欢'),
-  scores('最多评论');
+  scores('最多评论')
+  ;

  String get order => name;
  final String label;
@@ -19,7 +20,8 @@ enum ArticleZoneType {
  interest('兴趣', 29),
  novel('轻小说', 16),
  tech('科技', 17),
-  note('笔记', 41);
+  note('笔记', 41)
+  ;

  final String label;
  final int categoryId;
--- a/lib/models/common/search/search_type.dart
+++ b/lib/models/common/search/search_type.dart
@@ -18,7 +18,8 @@ enum SearchType {
  // 用户：bili_user
  bili_user('用户'),
  // 专栏：article
-  article('专栏');
+  article('专栏')
+  ;
  // 相簿：photo
  // photo

--- a/lib/models/common/search/user_search_type.dart
+++ b/lib/models/common/search/user_search_type.dart
@@ -3,7 +3,8 @@ enum UserOrderType {
  fansDesc('粉丝数由高到低', 0, 'fans'),
  fansAsc('粉丝数由低到高', 1, 'fans'),
  levelDesc('Lv等级由高到低', 0, 'level'),
-  levelAsc('Lv等级由低到高', 1, 'level');
+  levelAsc('Lv等级由低到高', 1, 'level')
+  ;

  final String label;
  final int orderSort;
@@ -15,7 +16,8 @@ enum UserType {
  all('全部用户'),
  up('UP主'),
  common('普通用户'),
-  verified('认证用户');
+  verified('认证用户')
+  ;

  final String label;
  const UserType(this.label);
--- a/lib/models/common/search/video_search_type.dart
+++ b/lib/models/common/search/video_search_type.dart
@@ -2,7 +2,8 @@ enum VideoPubTimeType {
  all('不限'),
  day('最近一天'),
  week('最近一周'),
-  halfYear('最近半年');
+  halfYear('最近半年')
+  ;

  final String label;
  const VideoPubTimeType(this.label);
@@ -13,7 +14,8 @@ enum VideoDurationType {
  tenMins('0-10分钟'),
  halfHour('10-30分钟'),
  hour('30-60分钟'),
-  hourPlus('60分钟+');
+  hourPlus('60分钟+')
+  ;

  final String label;
  const VideoDurationType(this.label);
@@ -41,7 +43,8 @@ enum VideoZoneType {
  cinephile('影视', tids: 181),
  documentary('记录', tids: 177),
  movie('电影', tids: 23),
-  tv('电视', tids: 11);
+  tv('电视', tids: 11)
+  ;

  final String label;
  final int? tids;
@@ -55,7 +58,8 @@ enum ArchiveFilterType {
  pubdate('新发布'),
  dm('弹幕多'),
  stow('收藏多'),
-  scores('评论多');
+  scores('评论多')
+  ;
  // 专栏
  // attention('最多喜欢'),

--- a/lib/models/common/setting_type.dart
+++ b/lib/models/common/setting_type.dart
@@ -6,7 +6,8 @@ enum SettingType {
  styleSetting('外观设置'),
  extraSetting('其它设置'),
  webdavSetting('WebDAV 设置'),
-  about('关于');
+  about('关于')
+  ;

  final String title;
  const SettingType(this.title);
--- a/lib/models/common/sponsor_block/action_type.dart
+++ b/lib/models/common/sponsor_block/action_type.dart
@@ -2,7 +2,8 @@ enum ActionType {
  skip('跳过'),
  mute('静音'),
  full('整个视频'),
-  poi('精彩时刻');
+  poi('精彩时刻')
+  ;

  final String title;
  const ActionType(this.title);
--- a/lib/models/common/sponsor_block/segment_type.dart
+++ b/lib/models/common/sponsor_block/segment_type.dart
@@ -97,7 +97,8 @@ enum SegmentType {
    '仅用于对整个视频进行标记。适用于展示UP主免费或获得补贴后使用的产品、服务或场地的视频。',
    Color(0xFF008a5c),
    [ActionType.full],
-  );
+  )
+  ;

  /// from https://github.com/hanydd/BilibiliSponsorBlock/blob/master/public/_locales/zh_CN/messages.json
  final String title;
--- a/lib/models/common/sponsor_block/skip_type.dart
+++ b/lib/models/common/sponsor_block/skip_type.dart
@@ -3,7 +3,8 @@ enum SkipType {
  skipOnce('跳过一次'),
  skipManually('手动跳过'),
  showOnly('仅显示'),
-  disable('禁用');
+  disable('禁用')
+  ;

  final String title;
  const SkipType(this.title);
--- a/lib/models/common/stat_type.dart
+++ b/lib/models/common/stat_type.dart
@@ -7,7 +7,8 @@ enum StatType {
  reply(Icons.comment_outlined, '评论'),
  follow(Icons.favorite_border, '关注'),
  play(Icons.play_circle_outlined, '播放'),
-  listen(Icons.headset_outlined, '播放');
+  listen(Icons.headset_outlined, '播放')
+  ;

  final IconData iconData;
  final String label;
--- a/lib/models/common/super_resolution_type.dart
+++ b/lib/models/common/super_resolution_type.dart
@@ -1,7 +1,8 @@
 enum SuperResolutionType {
  disable('禁用'),
  efficiency('效率'),
-  quality('画质');
+  quality('画质')
+  ;

  final String title;
  const SuperResolutionType(this.title);
--- a/lib/models/common/theme/theme_type.dart
+++ b/lib/models/common/theme/theme_type.dart
@@ -4,7 +4,8 @@ import 'package:material_design_icons_flutter/material_design_icons_flutter.dart
 enum ThemeType {
  light('浅色'),
  dark('深色'),
-  system('跟随系统');
+  system('跟随系统')
+  ;

  final String desc;
  const ThemeType(this.desc);
--- a/lib/models/common/video/audio_quality.dart
+++ b/lib/models/common/video/audio_quality.dart
@@ -6,7 +6,8 @@ enum AudioQuality {
  dolby(30250, '杜比全景声'),
  k192(30280, '192K'),
  k132(30232, '132K'),
-  k64(30216, '64K');
+  k64(30216, '64K')
+  ;

  final int code;
  final String desc;
--- a/lib/models/common/video/cdn_type.dart
+++ b/lib/models/common/video/cdn_type.dart
@@ -24,13 +24,87 @@ enum CDNService {
  aliov('aliov（阿里云海外）', 'upos-sz-mirroraliov.bilivideo.com'),
  cosov('cosov（腾讯云海外）', 'upos-sz-mirrorcosov.bilivideo.com'),
  hwov('hwov（华为云海外）', 'upos-sz-mirrorhwov.bilivideo.com'),
-  hk_bcache('hk_bcache（Bilibili海外）', 'cn-hk-eq-bcache-01.bilivideo.com');
-
-  String get code => name;
-  static final fromCode = values.byName;
+  hk_bcache('hk_bcache（Bilibili海外）', 'cn-hk-eq-bcache-01.bilivideo.com')
+  ;

  final String desc;
-  final String host;
+  final String? host;

-  const CDNService(this.desc, [this.host = '']);
+  const CDNService(this.desc, [this.host]);
 }
+// from https://rec.danmuji.org/dev/cdn-info/
+// {
+//     'cn-ahwh-ct-': {'01': 16},
+//     'cn-cq-ct-': {'01': 35, '02': 2},
+//     'cn-gddg-ct-': {'01': 36},
+//     'cn-gdfs-ct-': {'01': 28},
+//     'cn-hblf-ct-': {'01': 21},
+//     'cn-hbyc-ct-': {'02': 35},
+//     'cn-hljheb-ct-': {'01': 12},
+//     'cn-hnld-ct-': {'01': 56},
+//     'cn-jsnt-ct-': {'01': 52},
+//     'cn-jsyz-ct-': {'03': 52},
+//     'cn-jxjj-ct-': {'01': 14},
+//     'cn-sccd-ct-': {'01': 32},
+//     'cn-sxxa-ct-': {'03': 14},
+//     'cn-xj-ct-': {'01': 6},
+//     'cn-zjjh-ct-': {'04': 37},
+//     'cn-gddg-cu-': {'01': 15},
+//     'cn-hncs-cu-': {'01': 14, 'v': 6},
+//     'cn-hnly-cu-': {'01': 35},
+//     'cn-jlcc-cu-': {'03': 16},
+//     'cn-jstz-cu-': {'01': 14},
+//     'cn-lnsy-cu-': {'01': 9, 'v': 4},
+//     'cn-nmghhht-cu-': {'01': 15, 'v': 11},
+//     'cn-sccd-cu-': {'01': 13},
+//     'cn-sdqd-cu-': {'01': 25},
+//     'cn-sxty-cu-': {'03': 10},
+//     'cn-sxxa-cu-': {'02': 8},
+//     'cn-zjhz-cu-': {'01': 8, 'v': 6},
+//     'cn-cq-cm-': {'01': 30},
+//     'cn-fjqz-cm-': {'01': 10},
+//     'cn-gddg-cm-': {'01': 14},
+//     'cn-gdst-cm-': {'01': 17},
+//     'cn-hbsjz-cm-': {'02': 16},
+//     'cn-hbwh-cm-': {'01': 23},
+//     'cn-hncs-cm-': {'03': 24},
+//     'cn-hnzz-cm-': {'01': 16},
+//     'cn-jssz-cm-': {'01': 24, '02': 62},
+//     'cn-jxnc-cm-': {'01': 20},
+//     'cn-lnsy-cm-': {'01': 11},
+//     'cn-nmghhht-cm-': {'01': 5},
+//     'cn-sccd-cm-': {'03': 26},
+//     'cn-sdjn-cm-': {'02': 14},
+//     'cn-sxxa-cm-': {'01': 14},
+//     'cn-tj-cm-': {'02': 16},
+//     'cn-xj-cm-': {'02': 6},
+//     'cn-zjhz-cm-': {'01': 29},
+//     'cn-cq-gd-': {'01': 20},
+//     'cn-gdgz-gd-': {'01': 20},
+//     'cn-gzgy-gd-': {'01': 6},
+//     'cn-hb-gd-': {'01': 4},
+//     'cn-hbwh-gd-': {'01': 6},
+//     'cn-hljheb-gd-': {'01': 2},
+//     'cn-hncs-gd-': {'01': 8},
+//     'cn-jlcc-gd-': {'01': 5},
+//     'cn-jsnj-gd-': {'01': 8},
+//     'cn-zjhz-gd-': {'02': 2},
+//     'cn-bj-fx-': {'01': 6},
+//     'cn-fjfz-fx-': {'01': 6},
+//     'cn-gdgz-fx-': {'01': 18},
+//     'cn-hbwh-fx-': {'01': 16},
+//     'cn-hncs-fx-': {'01': 6},
+//     'cn-hnzz-fx-': {'01': 8},
+//     'cn-jsnj-fx-': {'02': 6},
+//     'cn-sccd-fx-': {'01': 6},
+//     'cn-sdjn-fx-': {'01': 6},
+//     'cn-sh-fx-': {'01': 10},
+//     'cn-tj-fx-': {'01': 6},
+//     'cn-bj-se-': {'01': 8},
+//     'cn-bj-cc-': {'03': 18},
+//     'cn-gdfs-cc-': {'02': 21},
+//     'cn-sh-cc-': {'01': 15},
+//     'cn-zjhz-wasu-': {'03': 21, '04': 12},
+//     'cn-sh-ix-': {'01': 13},
+//     'cn-hk-eq-': {'01': 14}
+// }
--- a/lib/models/common/video/live_quality.dart
+++ b/lib/models/common/video/live_quality.dart
@@ -2,11 +2,13 @@ enum LiveQuality {
  dolby(30000, '杜比'),
  origin4K(25000, '4K 原画'),
  super4K(20000, '4K'),
+  super2K(15000, '2K'),
  origin(10000, '原画'),
  bluRay(400, '蓝光'),
  superHD(250, '超清'),
  smooth(150, '高清'),
-  flunt(80, '流畅');
+  flunt(80, '流畅')
+  ;

  final int code;
  final String desc;
--- a/lib/models/common/video/source_type.dart
+++ b/lib/models/common/video/source_type.dart
@@ -26,7 +26,8 @@ enum SourceType {
    extraId: 4,
    playlistSource: PlaylistSource.MEDIA_LIST,
  ),
-  file;
+  file
+  ;

  final int? mediaType;
  final int? extraId;
--- a/lib/models/common/video/subtitle_pref_type.dart
+++ b/lib/models/common/video/subtitle_pref_type.dart
@@ -2,7 +2,8 @@ enum SubtitlePrefType {
  off('默认不显示字幕'),
  on('优先选择非自动生成(ai)字幕'),
  withoutAi('跳过自动生成(ai)字幕，选择第一个可用字幕'),
-  auto('静音时等同第二项，非静音时等同第三项');
+  auto('静音时等同第二项，非静音时等同第三项')
+  ;

  final String desc;
  const SubtitlePrefType(this.desc);
--- a/lib/models/common/video/video_decode_type.dart
+++ b/lib/models/common/video/video_decode_type.dart
@@ -4,7 +4,8 @@ enum VideoDecodeFormatType {
  DVH1(['dvh1']),
  AV1(['av01']),
  HEVC(['hev1', 'hvc1']),
-  AVC(['avc1']);
+  AVC(['avc1'])
+  ;

  String get description => name;
  final List<String> codes;
--- a/lib/models/common/video/video_quality.dart
+++ b/lib/models/common/video/video_quality.dart
@@ -11,7 +11,8 @@ enum VideoQuality {
  high720(64, '720P 准高清', '720P'),
  clear480(32, '480P 标清', '480P'),
  fluent360(16, '360P 流畅', '360P'),
-  speed240(6, '240P 极速', '240P');
+  speed240(6, '240P 极速', '240P')
+  ;

  final int code;
  final String desc;
--- a/lib/models/common/video/video_type.dart
+++ b/lib/models/common/video/video_type.dart
@@ -13,7 +13,8 @@ enum VideoType {
    type: 10,
    replyType: 33,
    api: Api.pugvUrl,
-  );
+  )
+  ;

  final int type;
  final String api;
--- a/lib/models/common/webview_menu_type.dart
+++ b/lib/models/common/webview_menu_type.dart
@@ -4,7 +4,8 @@ enum WebviewMenuItem {
  openInBrowser('浏览器中打开'),
  clearCache('清除缓存'),
  resetCookie('重新设置Cookie'),
-  goBack('返回');
+  goBack('返回')
+  ;

  final String title;
  const WebviewMenuItem(this.title);
--- a/lib/models/video/play/url.dart
+++ b/lib/models/video/play/url.dart
@@ -196,20 +196,17 @@ class Durl {
      backupUrl: (json['backup_url'] as List?)?.fromCast<String>(),
    );
  }
-}

-final _ipRegExp = RegExp(r'^https?://\d{1,3}\.\d{1,3}');
-
-bool _isMCDNorPCDN(String url) {
-  return url.contains("szbdyd.com") ||
-      url.contains(".mcdn.bilivideo") ||
-      _ipRegExp.hasMatch(url);
+  Iterable<String> get playUrls sync* {
+    if (url?.isNotEmpty == true) yield url!;
+    if (backupUrl?.isNotEmpty == true) yield* backupUrl!;
+  }
 }

 abstract class BaseItem {
  int? id;
  String? baseUrl;
-  String? backupUrl;
+  List<String>? backupUrl;
  int? bandWidth;
  String? mimeType;
  String? codecs;
@@ -240,14 +237,8 @@ abstract class BaseItem {
  BaseItem.fromJson(Map<String, dynamic> json) {
    id = json['id'];
    baseUrl = json['baseUrl'] ?? json['base_url'];
-    final backupUrls = ((json['backupUrl'] ?? json['backup_url']) as List?)
+    backupUrl = ((json['backupUrl'] ?? json['backup_url']) as List?)
        ?.fromCast<String>();
-    backupUrl = backupUrls != null && backupUrls.isNotEmpty
-        ? backupUrls.firstWhere(
-            (i) => !_isMCDNorPCDN(i),
-            orElse: () => backupUrls.first,
-          )
-        : null;
    bandWidth = json['bandWidth'] ?? json['bandwidth'];
    mimeType = json['mime_type'];
    codecs = json['codecs'];
@@ -259,6 +250,11 @@ abstract class BaseItem {
    segmentBase = json['segmentBase'] ?? json['segment_base'];
    codecid = json['codecid'];
  }
+
+  Iterable<String> get playUrls sync* {
+    if (baseUrl?.isNotEmpty == true) yield baseUrl!;
+    if (backupUrl?.isNotEmpty == true) yield* backupUrl!;
+  }
 }

 class VideoItem extends BaseItem {
@@ -339,6 +335,7 @@ class Volume {
  final num targetOffset;
  final num targetI;
  final num targetTp;
+
  // final MultiSceneArgs? multiSceneArgs;

  factory Volume.fromJson(Map<String, dynamic> json) {
--- a/lib/models_new/download/bili_download_entry_info.dart
+++ b/lib/models_new/download/bili_download_entry_info.dart
@@ -465,7 +465,8 @@ enum DownloadStatus {
  failDanmaku('获取弹幕失败'),
  failPlayUrl('获取播放地址失败'),
  pause('暂停中'),
-  wait('等待中');
+  wait('等待中')
+  ;

  final String message;
  const DownloadStatus(this.message);
--- a/lib/pages/about/view.dart
+++ b/lib/pages/about/view.dart
@@ -5,7 +5,7 @@ import 'dart:io';
 import 'package:PiliPlus/build_config.dart';
 import 'package:PiliPlus/common/constants.dart';
 import 'package:PiliPlus/common/widgets/dialog/dialog.dart';
-import 'package:PiliPlus/common/widgets/list_tile.dart';
+import 'package:PiliPlus/common/widgets/flutter/list_tile.dart';
 import 'package:PiliPlus/pages/mine/controller.dart';
 import 'package:PiliPlus/services/logger.dart';
 import 'package:PiliPlus/utils/accounts.dart';
--- a/lib/pages/audio/controller.dart
+++ b/lib/pages/audio/controller.dart
@@ -10,7 +10,9 @@ import 'package:PiliPlus/grpc/bilibili/app/listener/v1.pb.dart'
        PlaylistSource,
        PlayInfo,
        ThumbUpReq_ThumbType,
-        ListOrder;
+        ListOrder,
+        DashItem,
+        ResponseUrl;
 import 'package:PiliPlus/http/constants.dart';
 import 'package:PiliPlus/http/ua_type.dart';
 import 'package:PiliPlus/pages/common/common_intro_controller.dart'
@@ -226,7 +228,7 @@ class AudioController extends GetxController
          (e) => e.id <= cacheAudioQa,
          (a, b) => a.id > b.id ? a : b,
        );
-        _onOpenMedia(VideoUtils.getCdnUrl(audio));
+        _onOpenMedia(VideoUtils.getCdnUrl(audio.playUrls));
      } else if (playInfo.hasPlayUrl()) {
        final playUrl = playInfo.playUrl;
        final durls = playUrl.durl;
@@ -235,7 +237,7 @@ class AudioController extends GetxController
        }
        final durl = durls.first;
        position.value = Duration.zero;
-        _onOpenMedia(VideoUtils.getDurlCdnUrl(durl));
+        _onOpenMedia(VideoUtils.getCdnUrl(durl.playUrls));
      }
    }
  }
@@ -708,3 +710,17 @@ class AudioController extends GetxController
    super.onClose();
  }
 }
+
+extension on DashItem {
+  Iterable<String> get playUrls sync* {
+    yield baseUrl;
+    yield* backupUrl;
+  }
+}
+
+extension on ResponseUrl {
+  Iterable<String> get playUrls sync* {
+    yield url;
+    yield* backupUrl;
+  }
+}
--- a/lib/pages/common/publish/common_rich_text_pub_page.dart
+++ b/lib/pages/common/publish/common_rich_text_pub_page.dart
@@ -2,8 +2,8 @@ import 'dart:io';

 import 'package:PiliPlus/common/widgets/button/icon_button.dart';
 import 'package:PiliPlus/common/widgets/button/toolbar_icon_button.dart';
-import 'package:PiliPlus/common/widgets/text_field/controller.dart';
-import 'package:PiliPlus/common/widgets/text_field/text_field.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/controller.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/text_field.dart';
 import 'package:PiliPlus/http/msg.dart';
 import 'package:PiliPlus/models/common/image_preview_type.dart';
 import 'package:PiliPlus/models/common/publish_panel_type.dart';
--- a/lib/pages/common/reply_controller.dart
+++ b/lib/pages/common/reply_controller.dart
@@ -1,4 +1,4 @@
-import 'package:PiliPlus/common/widgets/text_field/controller.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/controller.dart';
 import 'package:PiliPlus/grpc/bilibili/main/community/reply/v1.pb.dart'
    show MainListReply, ReplyInfo, SubjectControl, Mode, EditorIconState;
 import 'package:PiliPlus/grpc/bilibili/pagination.pb.dart';
--- a/lib/pages/danmaku/controller.dart
+++ b/lib/pages/danmaku/controller.dart
@@ -5,7 +5,7 @@ import 'package:PiliPlus/grpc/dm.dart';
 import 'package:PiliPlus/plugin/pl_player/controller.dart';
 import 'package:PiliPlus/utils/accounts.dart';
 import 'package:PiliPlus/utils/path_utils.dart';
-import 'package:flutter/foundation.dart' show kDebugMode;
+import 'package:PiliPlus/utils/utils.dart';
 import 'package:path/path.dart' as path;

 class PlDanmakuController {
@@ -121,6 +121,7 @@ class PlDanmakuController {
    _initFileDm();
  }

+  @pragma('vm:notify-debugger-on-exception')
  Future<void> _initFileDm() async {
    try {
      final file = File(
@@ -131,8 +132,8 @@ class PlDanmakuController {
      if (bytes.isEmpty) return;
      final elem = DmSegMobileReply.fromBuffer(bytes).elems;
      handleDanmaku(elem);
-    } catch (_) {
-      if (kDebugMode) rethrow;
+    } catch (e, s) {
+      Utils.reportError(e, s);
    }
  }
 }
--- a/lib/pages/danmaku_block/controller.dart
+++ b/lib/pages/danmaku_block/controller.dart
@@ -32,10 +32,10 @@ class DanmakuBlockController extends GetxController

  Future<void> queryDanmakuFilter() async {
    SmartDialog.showLoading(msg: '正在同步弹幕屏蔽规则……');
-    var result = await DanmakuFilterHttp.danmakuFilter();
+    final result = await DanmakuFilterHttp.danmakuFilter();
    SmartDialog.dismiss();
-    if (result['status']) {
-      DanmakuBlockDataModel data = result['data'];
+    if (result.isSuccess) {
+      final data = result.data;
      rules[0].addAll(data.rule);
      rules[1].addAll(data.rule1);
      rules[2].addAll(data.rule2);
@@ -43,19 +43,19 @@ class DanmakuBlockController extends GetxController
        SmartDialog.showToast(data.toast!);
      }
    } else {
-      SmartDialog.showToast(result['msg']);
+      result.toast();
    }
  }

  Future<void> danmakuFilterDel(int tabIndex, int itemIndex, int id) async {
    SmartDialog.showLoading(msg: '正在删除弹幕屏蔽规则……');
-    var result = await DanmakuFilterHttp.danmakuFilterDel(ids: id);
+    final result = await DanmakuFilterHttp.danmakuFilterDel(ids: id);
    SmartDialog.dismiss();
-    if (result['status']) {
+    if (result.isSuccess) {
      rules[tabIndex].removeAt(itemIndex);
      SmartDialog.showToast('删除成功');
    } else {
-      SmartDialog.showToast(result['msg']);
+      result.toast();
    }
  }

@@ -67,17 +67,16 @@ class DanmakuBlockController extends GetxController
      filter = Crc32Xz().convert(utf8.encode(filter)).toRadixString(16);
    }
    SmartDialog.showLoading(msg: '正在添加弹幕屏蔽规则……');
-    var result = await DanmakuFilterHttp.danmakuFilterAdd(
+    final result = await DanmakuFilterHttp.danmakuFilterAdd(
      filter: filter,
      type: type,
    );
    SmartDialog.dismiss();
-    if (result['status']) {
-      SimpleRule rule = result['data'];
-      rules[type].add(rule);
+    if (result.isSuccess) {
+      rules[type].add(result.data);
      SmartDialog.showToast('添加成功');
    } else {
-      SmartDialog.showToast(result['msg']);
+      result.toast();
    }
  }
 }
--- a/lib/pages/danmaku_block/view.dart
+++ b/lib/pages/danmaku_block/view.dart
@@ -1,3 +1,4 @@
+import 'package:PiliPlus/common/widgets/button/icon_button.dart';
 import 'package:PiliPlus/common/widgets/dialog/dialog.dart';
 import 'package:PiliPlus/common/widgets/keep_alive_wrapper.dart';
 import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart';
@@ -71,6 +72,7 @@ class _DanmakuBlockPageState extends State<DanmakuBlockPage> {
            .toList(),
      ),
      floatingActionButton: FloatingActionButton(
+        tooltip: '添加',
        onPressed: () =>
            _showAddDialog(DmBlockType.values[_controller.tabController.index]),
        child: const Icon(Icons.add),
@@ -78,7 +80,7 @@ class _DanmakuBlockPageState extends State<DanmakuBlockPage> {
    );
  }

-  Widget tabViewBuilder(int tabIndex, List<SimpleRule> list) {
+  Widget tabViewBuilder(final int tabIndex, List<SimpleRule> list) {
    if (list.isEmpty) {
      return scrollErrorWidget();
    }
@@ -89,31 +91,58 @@ class _DanmakuBlockPageState extends State<DanmakuBlockPage> {
      ),
      itemBuilder: (context, itemIndex) {
        final SimpleRule item = list[itemIndex];
+        final child = iconButton(
+          iconSize: 20,
+          tooltip: '删除',
+          icon: const Icon(Icons.delete_outlined),
+          onPressed: () => showConfirmDialog(
+            context: context,
+            title: '确定删除该规则？',
+            onConfirm: () => _controller.danmakuFilterDel(
+              tabIndex,
+              itemIndex,
+              item.id,
+            ),
+          ),
+        );
        return ListTile(
          title: Text(
            item.filter,
            style: Theme.of(context).textTheme.bodyMedium,
          ),
-          trailing: IconButton(
-            icon: const Icon(Icons.delete_outlined),
-            onPressed: () => showConfirmDialog(
-              context: context,
-              title: '确定删除该规则？',
-              onConfirm: () => _controller.danmakuFilterDel(
-                tabIndex,
-                itemIndex,
-                item.id,
-              ),
-            ),
-          ),
+          trailing: tabIndex == 2
+              ? child
+              : Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    iconButton(
+                      iconSize: 20,
+                      tooltip: '编辑',
+                      icon: const Icon(Icons.edit_outlined),
+                      onPressed: () => _showAddDialog(
+                        DmBlockType.values[_controller.tabController.index],
+                        initFilter: item.filter,
+                        itemIndex: itemIndex,
+                        itemId: item.id,
+                      ),
+                    ),
+                    child,
+                  ],
+                ),
        );
      },
    );
  }

-  void _showAddDialog(DmBlockType type) {
-    String filter = '';
-    String hintText = switch (type) {
+  void _showAddDialog(
+    DmBlockType type, {
+    String initFilter = '',
+    int? itemIndex,
+    int? itemId,
+  }) {
+    assert((itemIndex == null) == (itemId == null));
+    String filter = initFilter;
+    final hintText = switch (type) {
      DmBlockType.keyword => '输入过滤的关键词，其它类别请切换标签页后添加',
      DmBlockType.regex => '输入//之间的正则表达式，无需包含头尾的"/"',
      DmBlockType.uid => '输入用户UID',
@@ -123,7 +152,7 @@ class _DanmakuBlockPageState extends State<DanmakuBlockPage> {
      context: context,
      builder: (context) {
        return AlertDialog(
-          title: Text('添加新的${type.label}规则'),
+          title: Text('${itemId != null ? "编辑" : "添加新的"}${type.label}规则'),
          content: Column(
            mainAxisSize: MainAxisSize.min,
            crossAxisAlignment: CrossAxisAlignment.start,
@@ -149,16 +178,25 @@ class _DanmakuBlockPageState extends State<DanmakuBlockPage> {
              ),
            ),
            TextButton(
-              child: const Text('添加'),
-              onPressed: () {
-                if (filter.isNotEmpty) {
+              child: const Text('确定'),
+              onPressed: () async {
+                if (filter != initFilter) {
                  Get.back();
-                  _controller.danmakuFilterAdd(
+                  if (itemId != null) {
+                    await _controller.danmakuFilterDel(
+                      type.index,
+                      itemIndex!,
+                      itemId,
+                    );
+                  }
+                  await _controller.danmakuFilterAdd(
                    filter: filter,
                    type: type.index,
                  );
                } else {
-                  SmartDialog.showToast('输入内容不能为空');
+                  SmartDialog.showToast(
+                    '输入内容${filter.isEmpty ? "不能为空" : "与上次相同"}',
+                  );
                }
              },
            ),
--- a/lib/pages/dynamics/widgets/action_panel.dart
+++ b/lib/pages/dynamics/widgets/action_panel.dart
@@ -1,4 +1,4 @@
-import 'package:PiliPlus/common/widgets/dyn/text_button.dart';
+import 'package:PiliPlus/common/widgets/flutter/dyn/text_button.dart';
 import 'package:PiliPlus/models/dynamics/result.dart';
 import 'package:PiliPlus/pages/dynamics_repost/view.dart';
 import 'package:PiliPlus/utils/num_utils.dart';
--- a/lib/pages/dynamics/widgets/additional_panel.dart
+++ b/lib/pages/dynamics/widgets/additional_panel.dart
@@ -1,5 +1,5 @@
 import 'package:PiliPlus/common/constants.dart';
-import 'package:PiliPlus/common/widgets/dyn/ink_well.dart';
+import 'package:PiliPlus/common/widgets/flutter/dyn/ink_well.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/http/dynamics.dart';
 import 'package:PiliPlus/models/dynamics/result.dart';
--- a/lib/pages/dynamics/widgets/author_panel.dart
+++ b/lib/pages/dynamics/widgets/author_panel.dart
@@ -2,7 +2,7 @@ import 'dart:math';

 import 'package:PiliPlus/common/constants.dart';
 import 'package:PiliPlus/common/widgets/dialog/report.dart';
-import 'package:PiliPlus/common/widgets/dyn/ink_well.dart';
+import 'package:PiliPlus/common/widgets/flutter/dyn/ink_well.dart';
 import 'package:PiliPlus/common/widgets/pendant_avatar.dart';
 import 'package:PiliPlus/http/constants.dart';
 import 'package:PiliPlus/http/user.dart';
--- a/lib/pages/dynamics/widgets/content_panel.dart
+++ b/lib/pages/dynamics/widgets/content_panel.dart
@@ -1,7 +1,7 @@
 // 内容
 import 'package:PiliPlus/common/widgets/custom_icon.dart';
+import 'package:PiliPlus/common/widgets/flutter/text/text.dart' as custom_text;
 import 'package:PiliPlus/common/widgets/image/custom_grid_view.dart';
-import 'package:PiliPlus/common/widgets/text/text.dart' as custom_text;
 import 'package:PiliPlus/models/dynamics/result.dart';
 import 'package:PiliPlus/pages/dynamics/widgets/rich_node_panel.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
--- a/lib/pages/dynamics/widgets/dynamic_panel.dart
+++ b/lib/pages/dynamics/widgets/dynamic_panel.dart
@@ -1,4 +1,4 @@
-import 'package:PiliPlus/common/widgets/dyn/ink_well.dart';
+import 'package:PiliPlus/common/widgets/flutter/dyn/ink_well.dart';
 import 'package:PiliPlus/common/widgets/image/image_save.dart';
 import 'package:PiliPlus/models/dynamics/result.dart';
 import 'package:PiliPlus/pages/dynamics/widgets/action_panel.dart';
--- a/lib/pages/dynamics/widgets/forward_panel.dart
+++ b/lib/pages/dynamics/widgets/forward_panel.dart
@@ -1,4 +1,4 @@
-import 'package:PiliPlus/common/widgets/dyn/ink_well.dart';
+import 'package:PiliPlus/common/widgets/flutter/dyn/ink_well.dart';
 import 'package:PiliPlus/common/widgets/image/image_save.dart';
 import 'package:PiliPlus/models/dynamics/result.dart';
 import 'package:PiliPlus/pages/dynamics/widgets/dyn_content.dart';
--- a/lib/pages/dynamics/widgets/module_panel.dart
+++ b/lib/pages/dynamics/widgets/module_panel.dart
@@ -1,6 +1,6 @@
 import 'package:PiliPlus/common/constants.dart';
 import 'package:PiliPlus/common/widgets/badge.dart';
-import 'package:PiliPlus/common/widgets/dyn/ink_well.dart';
+import 'package:PiliPlus/common/widgets/flutter/dyn/ink_well.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/grpc/bilibili/app/listener/v1.pbenum.dart'
    show PlaylistSource;
--- a/lib/pages/dynamics/widgets/up_panel.dart
+++ b/lib/pages/dynamics/widgets/up_panel.dart
@@ -1,4 +1,4 @@
-import 'package:PiliPlus/common/widgets/dyn/ink_well.dart';
+import 'package:PiliPlus/common/widgets/flutter/dyn/ink_well.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/models/common/dynamic/up_panel_position.dart';
 import 'package:PiliPlus/models/common/image_type.dart';
--- a/lib/pages/dynamics_create/view.dart
+++ b/lib/pages/dynamics_create/view.dart
@@ -4,11 +4,11 @@ import 'package:PiliPlus/common/constants.dart';
 import 'package:PiliPlus/common/widgets/button/icon_button.dart';
 import 'package:PiliPlus/common/widgets/button/toolbar_icon_button.dart';
 import 'package:PiliPlus/common/widgets/custom_icon.dart';
-import 'package:PiliPlus/common/widgets/draggable_sheet/draggable_scrollable_sheet_dyn.dart'
+import 'package:PiliPlus/common/widgets/flutter/draggable_sheet/draggable_scrollable_sheet_dyn.dart'
    as dyn_sheet;
+import 'package:PiliPlus/common/widgets/flutter/text_field/controller.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/text_field.dart';
 import 'package:PiliPlus/common/widgets/pair.dart';
-import 'package:PiliPlus/common/widgets/text_field/controller.dart';
-import 'package:PiliPlus/common/widgets/text_field/text_field.dart';
 import 'package:PiliPlus/http/dynamics.dart';
 import 'package:PiliPlus/models/common/publish_panel_type.dart';
 import 'package:PiliPlus/models/common/reply/reply_option_type.dart';
--- a/lib/pages/dynamics_mention/view.dart
+++ b/lib/pages/dynamics_mention/view.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:math';

 import 'package:PiliPlus/common/widgets/custom_sliver_persistent_header_delegate.dart';
-import 'package:PiliPlus/common/widgets/draggable_sheet/draggable_scrollable_sheet_topic.dart'
+import 'package:PiliPlus/common/widgets/flutter/draggable_sheet/draggable_scrollable_sheet_topic.dart'
    as topic_sheet;
 import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart';
 import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart';
--- a/lib/pages/dynamics_repost/view.dart
+++ b/lib/pages/dynamics_repost/view.dart
@@ -1,7 +1,7 @@
-import 'package:PiliPlus/common/widgets/draggable_sheet/draggable_scrollable_sheet_dyn.dart'
+import 'package:PiliPlus/common/widgets/flutter/draggable_sheet/draggable_scrollable_sheet_dyn.dart'
    show DraggableScrollableSheet;
+import 'package:PiliPlus/common/widgets/flutter/text_field/text_field.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
-import 'package:PiliPlus/common/widgets/text_field/text_field.dart';
 import 'package:PiliPlus/http/dynamics.dart';
 import 'package:PiliPlus/models/common/publish_panel_type.dart';
 import 'package:PiliPlus/models/dynamics/result.dart';
--- a/lib/pages/dynamics_select_topic/view.dart
+++ b/lib/pages/dynamics_select_topic/view.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:math';

-import 'package:PiliPlus/common/widgets/draggable_sheet/draggable_scrollable_sheet_topic.dart'
+import 'package:PiliPlus/common/widgets/flutter/draggable_sheet/draggable_scrollable_sheet_topic.dart'
    as topic_sheet;
 import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart';
 import 'package:PiliPlus/http/loading_state.dart';
--- a/lib/pages/episode_panel/view.dart
+++ b/lib/pages/episode_panel/view.dart
@@ -3,10 +3,10 @@ import 'dart:math';
 import 'package:PiliPlus/common/constants.dart';
 import 'package:PiliPlus/common/widgets/badge.dart';
 import 'package:PiliPlus/common/widgets/button/icon_button.dart';
+import 'package:PiliPlus/common/widgets/flutter/page/tabs.dart';
 import 'package:PiliPlus/common/widgets/image/image_save.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/keep_alive_wrapper.dart';
-import 'package:PiliPlus/common/widgets/page/tabs.dart';
 import 'package:PiliPlus/common/widgets/scroll_physics.dart';
 import 'package:PiliPlus/common/widgets/stat/stat.dart';
 import 'package:PiliPlus/http/fav.dart';
@@ -123,6 +123,7 @@ class _EpisodePanelState extends State<EpisodePanel>
      return;
    }

+    @pragma('vm:notify-debugger-on-exception')
    void jumpToCurrent() {
      final newItemIndex = _findCurrentItemIndex;
      if (_currentItemIndex != newItemIndex) {
@@ -131,8 +132,8 @@ class _EpisodePanelState extends State<EpisodePanel>
          _itemScrollController[_currentTabIndex.value].jumpTo(
            _calcItemOffset(newItemIndex),
          );
-        } catch (_) {
-          if (kDebugMode) rethrow;
+        } catch (e, s) {
+          Utils.reportError(e, s);
        }
      }
    }
--- a/lib/pages/live_room/controller.dart
+++ b/lib/pages/live_room/controller.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:convert';

-import 'package:PiliPlus/common/widgets/text_field/controller.dart';
+import 'package:PiliPlus/common/widgets/flutter/text_field/controller.dart';
 import 'package:PiliPlus/http/constants.dart';
 import 'package:PiliPlus/http/live.dart';
 import 'package:PiliPlus/http/video.dart';
@@ -164,7 +164,7 @@ class LiveRoomController extends GetxController {
      }).toList();
      currentQnDesc.value =
          LiveQuality.fromCode(currentQn)?.desc ?? currentQn.toString();
-      videoUrl = VideoUtils.getCdnUrl(item);
+      videoUrl = VideoUtils.getLiveCdnUrl(item);
      await playerInit();
      isLoaded.value = true;
    } else {
@@ -333,83 +333,85 @@ class LiveRoomController extends GetxController {
                .map((host) => 'wss://${host.host}:${host.wssPort}/sub')
                .toList(),
          )
-          ..addEventListener((obj) {
-            try {
-              // logger.i(' 原始弹幕消息 ======> ${jsonEncode(obj)}');
-              switch (obj['cmd']) {
-                case 'DANMU_MSG':
-                  final info = obj['info'];
-                  final first = info[0];
-                  final content = first[15];
-                  final Map<String, dynamic> extra = jsonDecode(
-                    content['extra'],
-                  );
-                  final user = content['user'];
-                  // final midHash = first[7];
-                  final uid = user['uid'];
-                  final name = user['base']['name'];
-                  final msg = info[1];
-                  BaseEmote? uemote;
-                  if (first[13] case Map<String, dynamic> map) {
-                    uemote = BaseEmote.fromJson(map);
-                  }
-                  messages.add(
-                    DanmakuMsg(
-                      name: name,
-                      uid: uid,
-                      text: msg,
-                      emots: (extra['emots'] as Map<String, dynamic>?)?.map(
-                        (k, v) => MapEntry(k, BaseEmote.fromJson(v)),
-                      ),
-                      uemote: uemote,
-                    ),
-                  );
-
-                  if (plPlayerController.showDanmaku) {
-                    final checkInfo = info[9];
-                    danmakuController?.addDanmaku(
-                      DanmakuContentItem(
-                        msg,
-                        color: plPlayerController.blockColorful
-                            ? Colors.white
-                            : DmUtils.decimalToColor(extra['color']),
-                        type: DmUtils.getPosition(extra['mode']),
-                        selfSend: extra['send_from_me'] ?? false,
-                        extra: LiveDanmaku(
-                          id: extra['id_str'],
-                          mid: uid,
-                          dmType: extra['dm_type'],
-                          ts: checkInfo['ts'],
-                          ct: checkInfo['ct'],
-                        ),
-                      ),
-                    );
-                    if (!disableAutoScroll.value) {
-                      EasyThrottle.throttle(
-                        'liveDm',
-                        const Duration(milliseconds: 500),
-                        () => WidgetsBinding.instance.addPostFrameCallback(
-                          scrollToBottom,
-                        ),
-                      );
-                    }
-                  }
-                  break;
-                case 'SUPER_CHAT_MESSAGE' when showSuperChat:
-                  final item = SuperChatItem.fromJson(obj['data']);
-                  superChatMsg.insert(0, item);
-                  if (isFullScreen || plPlayerController.isDesktopPip) {
-                    fsSC.value = item;
-                  }
-                  break;
-              }
-            } catch (_) {
-              if (kDebugMode) rethrow;
-            }
-          })
+          ..addEventListener(_danmakuListener)
          ..init();
  }

+  void _danmakuListener(dynamic obj) {
+    try {
+      // logger.i(' 原始弹幕消息 ======> ${jsonEncode(obj)}');
+      switch (obj['cmd']) {
+        case 'DANMU_MSG':
+          final info = obj['info'];
+          final first = info[0];
+          final content = first[15];
+          final Map<String, dynamic> extra = jsonDecode(
+            content['extra'],
+          );
+          final user = content['user'];
+          // final midHash = first[7];
+          final uid = user['uid'];
+          final name = user['base']['name'];
+          final msg = info[1];
+          BaseEmote? uemote;
+          if (first[13] case Map<String, dynamic> map) {
+            uemote = BaseEmote.fromJson(map);
+          }
+          messages.add(
+            DanmakuMsg(
+              name: name,
+              uid: uid,
+              text: msg,
+              emots: (extra['emots'] as Map<String, dynamic>?)?.map(
+                (k, v) => MapEntry(k, BaseEmote.fromJson(v)),
+              ),
+              uemote: uemote,
+            ),
+          );
+
+          if (plPlayerController.showDanmaku) {
+            final checkInfo = info[9];
+            danmakuController?.addDanmaku(
+              DanmakuContentItem(
+                msg,
+                color: plPlayerController.blockColorful
+                    ? Colors.white
+                    : DmUtils.decimalToColor(extra['color']),
+                type: DmUtils.getPosition(extra['mode']),
+                selfSend: extra['send_from_me'] ?? false,
+                extra: LiveDanmaku(
+                  id: extra['id_str'],
+                  mid: uid,
+                  dmType: extra['dm_type'],
+                  ts: checkInfo['ts'],
+                  ct: checkInfo['ct'],
+                ),
+              ),
+            );
+            if (!disableAutoScroll.value) {
+              EasyThrottle.throttle(
+                'liveDm',
+                const Duration(milliseconds: 500),
+                () => WidgetsBinding.instance.addPostFrameCallback(
+                  scrollToBottom,
+                ),
+              );
+            }
+          }
+          break;
+        case 'SUPER_CHAT_MESSAGE' when showSuperChat:
+          final item = SuperChatItem.fromJson(obj['data']);
+          superChatMsg.insert(0, item);
+          if (isFullScreen || plPlayerController.isDesktopPip) {
+            fsSC.value = item;
+          }
+          break;
+      }
+    } catch (_) {
+      if (kDebugMode) rethrow;
+    }
+  }
+
  final RxInt likeClickTime = 0.obs;
  Timer? likeClickTimer;

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
bggRGjQaUbCoE	646888c06f	fix import Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>	2025-11-17 18:15:20 +08:00
bggRGjQaUbCoE	332f6f1bb4	upgrade deps Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>	2025-11-17 18:04:30 +08:00
bggRGjQaUbCoE	aaab5371b2	tweaks Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>	2025-11-17 17:35:29 +08:00
JianGuo Wang	ad931d7ea2	add media notification handling for offline videos (#1748 ) * feat: add media notification handling for offline videos * update Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me> * update Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me> --------- Co-authored-by: bggRGjQaUbCoE <githubaccount56556@proton.me>	2025-11-17 17:35:00 +08:00
My-Responsitories	377e430d74	refa: report error (#1747 ) * refa: report error * remove some reports [skip ci] Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me> --------- Co-authored-by: bggRGjQaUbCoE <githubaccount56556@proton.me>	2025-11-17 17:20:29 +08:00
My-Responsitories	a797467606	upgrade dep (#1746 )	2025-11-16 15:02:20 +00:00
My-Responsitories	5ee83d902d	opt: exclude analysis flutter widget (#1745 )	2025-11-16 14:33:40 +00:00
My-Responsitories	27ae296b28	refa: cdn (#1743 ) * refa: cdn * feat: live cdn (WIP) * tweaks Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me> * add live quality [skip ci] Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me> * mod: replace durl host * tweak [skip ci] Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me> --------- Co-authored-by: bggRGjQaUbCoE <githubaccount56556@proton.me>	2025-11-15 20:12:21 +08:00
My-Responsitories	e589f27195	fix; set subtitle before init (#1742 ) * tweka * fix; set subtitle before init	2025-11-15 07:34:23 +00:00
bggRGjQaUbCoE	c89d6a5a59	fix wakelock Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>	2025-11-15 11:50:17 +08:00
bggRGjQaUbCoE	861365930d	reformat Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>	2025-11-14 09:22:43 +08:00
bggRGjQaUbCoE	0d4d92a202	bump flutter Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>	2025-11-14 09:22:43 +08:00
bggRGjQaUbCoE	4c6ad0e385	increase webdav timeout Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>	2025-11-14 09:22:43 +08:00
iKirby	ad45e995e2	fix preferred cdn & Add more PCDN url patterns (#1739 ) * Fix preferred cdn not used after changing quality * Add more PCDN url patterns	2025-11-14 09:21:51 +08:00
bggRGjQaUbCoE	50a035a479	opt get season status Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>	2025-11-13 14:27:52 +08:00
bggRGjQaUbCoE	c0dbd6cbb2	migration Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>	2025-11-13 11:04:46 +08:00
bggRGjQaUbCoE	686af4a330	bump flutter Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>	2025-11-13 10:07:44 +08:00
bggRGjQaUbCoE	46aad06e34	tweaks Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>	2025-11-13 10:05:27 +08:00
bggRGjQaUbCoE	3921b2304d	opt download task Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>	2025-11-13 09:38:23 +08:00
My-Responsitories	bca5b0419c	tweaks (#1738 ) * feat: edit dm filter * opt: browser * feat: sb userInfo * mod: tvPlayUrl	2025-11-13 09:36:50 +08:00