diff --git a/lib/pages/danmaku/view.dart b/lib/pages/danmaku/view.dart index d2fc3fcb0..9c0a6bad4 100644 --- a/lib/pages/danmaku/view.dart +++ b/lib/pages/danmaku/view.dart @@ -120,7 +120,7 @@ class _PlDanmakuState extends State { _controller!.addDanmaku( DanmakuContentItem( e.content, - color: playerController.blockTypes.contains(6) + color: playerController.blockColorful ? Colors.white : DmUtils.decimalToColor(e.color), type: DmUtils.getPosition(e.mode), diff --git a/lib/pages/live_room/controller.dart b/lib/pages/live_room/controller.dart index 301a54512..07ccb2159 100644 --- a/lib/pages/live_room/controller.dart +++ b/lib/pages/live_room/controller.dart @@ -359,7 +359,9 @@ class LiveRoomController extends GetxController { plPlayerController.danmakuController?.addDanmaku( DanmakuContentItem( extra['content'], - color: DmUtils.decimalToColor(extra['color']), + color: plPlayerController.blockColorful + ? Colors.white + : DmUtils.decimalToColor(extra['color']), type: DmUtils.getPosition(extra['mode']), selfSend: extra['send_from_me'] ?? false, ), diff --git a/lib/pages/video/widgets/header_control.dart b/lib/pages/video/widgets/header_control.dart index 9c769ad84..bf5fbf97d 100644 --- a/lib/pages/video/widgets/header_control.dart +++ b/lib/pages/video/widgets/header_control.dart @@ -1537,6 +1537,7 @@ class HeaderControlState extends State { } plPlayerController ..blockTypes = blockTypes + ..blockColorful = blockTypes.contains(6) ..putDanmakuSettings(); setState(() {}); try { diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart index 7a99edf5b..3f3755ecc 100644 --- a/lib/plugin/pl_player/controller.dart +++ b/lib/plugin/pl_player/controller.dart @@ -322,6 +322,7 @@ class PlPlayerController { .toRadixString(16); // 弹幕相关配置 late Set blockTypes = Pref.danmakuBlockType; + late bool blockColorful = blockTypes.contains(6); late double showArea = Pref.danmakuShowArea; late RxDouble danmakuOpacity = Pref.danmakuOpacity.obs; late double danmakuFontScale = Pref.danmakuFontScale; diff --git a/pubspec.lock b/pubspec.lock index 3ff3a12c7..5c05ae5e9 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -255,7 +255,7 @@ packages: description: path: "." ref: main - resolved-ref: "8bc84fa5cb6d85c420e5694081fbe2d33ff8ad93" + resolved-ref: "6bc3f15b65c3f27abe3bb4da0e5175cc4983ac11" url: "https://github.com/bggRGjQaUbCoE/canvas_danmaku.git" source: git version: "0.2.6" @@ -912,26 +912,26 @@ packages: dependency: "direct main" description: name: image_cropper - sha256: d104cc1f90b0d38ac309f7ec240b8f55f2c6e76d1bfae05e23917bfea631e725 + sha256: "46c8f9aae51c8350b2a2982462f85a129e77b04675d35b09db5499437d7a996b" url: "https://pub.dev" source: hosted - version: "10.0.0+1" + version: "11.0.0" image_cropper_for_web: dependency: transitive description: name: image_cropper_for_web - sha256: fd81ebe36f636576094377aab32673c4e5d1609b32dec16fad98d2b71f1250a9 + sha256: e09749714bc24c4e3b31fbafa2e5b7229b0ff23e8b14d4ba44bd723b77611a0f url: "https://pub.dev" source: hosted - version: "6.1.0" + version: "7.0.0" image_cropper_platform_interface: dependency: transitive description: name: image_cropper_platform_interface - sha256: "2d8db8f4b638e448fa89a1e77cd8f053b4547472bd3ae073169e86626d03afef" + sha256: "886a30ec199362cdcc2fbb053b8e53347fbfb9dbbdaa94f9ff85622609f5e7ff" url: "https://pub.dev" source: hosted - version: "7.2.0" + version: "8.0.0" image_picker: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index c135e8fcb..d3466c45a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -187,7 +187,7 @@ dependencies: intl: ^0.20.2 archive: ^4.0.0 flutter_svg: ^2.0.14 - image_cropper: ^10.0.0+1 + image_cropper: ^11.0.0 #解压直播消息 brotli: ^0.6.0 expandable: ^5.0.1