mod: 评论b23.tv链接匹配 issue

fix: 评论投票message重复
Merge branch 'main' into feature-replyJumpUrl
2024-04-01 23:55:35 +08:00 · 2024-03-24 10:59:00 +08:00 · 2024-03-24 10:49:36 +08:00 · 2024-03-23 19:44:37 +08:00
5 changed files with 110 additions and 78 deletions
--- a/lib/http/interceptor.dart
+++ b/lib/http/interceptor.dart
@ -46,7 +46,6 @@ class ApiInterceptor extends Interceptor {
    // 处理网络请求错误
    // handler.next(err);
    String url = err.requestOptions.uri.toString();
-    print('🌹🌹ApiInterceptor: $url');
    if (!url.contains('heartBeat')) {
      SmartDialog.showToast(
        await dioError(err),
@ -79,23 +78,24 @@ class ApiInterceptor extends Interceptor {
  }

  static Future<String> checkConnect() async {
-    final ConnectivityResult connectivityResult =
+    final List<ConnectivityResult> connectivityResult =
        await Connectivity().checkConnectivity();
-    switch (connectivityResult) {
-      case ConnectivityResult.mobile:
-        return '正在使用移动流量';
-      case ConnectivityResult.wifi:
-        return '正在使用wifi';
-      case ConnectivityResult.ethernet:
-        return '正在使用局域网';
-      case ConnectivityResult.vpn:
-        return '正在使用代理网络';
-      case ConnectivityResult.other:
-        return '正在使用其他网络';
-      case ConnectivityResult.none:
-        return '未连接到任何网络';
-      default:
-        return '';
+    if (connectivityResult.contains(ConnectivityResult.mobile)) {
+      return '正在使用移动流量';
+    } else if (connectivityResult.contains(ConnectivityResult.wifi)) {
+      return '正在使用wifi';
+    } else if (connectivityResult.contains(ConnectivityResult.ethernet)) {
+      return '正在使用局域网';
+    } else if (connectivityResult.contains(ConnectivityResult.vpn)) {
+      return '正在使用代理网络';
+    } else if (connectivityResult.contains(ConnectivityResult.bluetooth)) {
+      return '正在使用蓝牙网络';
+    } else if (connectivityResult.contains(ConnectivityResult.other)) {
+      return '正在使用其他网络';
+    } else if (connectivityResult.contains(ConnectivityResult.none)) {
+      return '未连接到任何网络';
+    } else {
+      return '';
    }
  }
 }
--- a/lib/pages/video/detail/reply/widgets/reply_item.dart
+++ b/lib/pages/video/detail/reply/widgets/reply_item.dart
@ -498,7 +498,7 @@ InlineSpan buildContent(
      return str;
    });
  }
-  // content.message = content.message.replaceAll(RegExp(r"\{vote:.*?\}"), ' ');
+  content.message = content.message.replaceAll(RegExp(r"\{vote:.*?\}"), ' ');
  content.message = content.message
      .replaceAll('&amp;', '&')
      .replaceAll('&lt;', '<')
@ -525,14 +525,18 @@ InlineSpan buildContent(
  if (jumpUrlKeysList.isNotEmpty) {
    patternStr += '|${jumpUrlKeysList.join('|')}';
  }
+  RegExp bv23Regex = RegExp(r'https://b23\.tv/[a-zA-Z0-9]{7}');
  final RegExp pattern = RegExp(patternStr);
  List<String> matchedStrs = [];
  void addPlainTextSpan(str) {
-    spanChilds.add(TextSpan(
+    spanChilds.add(
+      TextSpan(
        text: str,
        recognizer: TapGestureRecognizer()
          ..onTap = () =>
-              replyReply?.call(replyItem.root == 0 ? replyItem : fReplyItem)));
+              replyReply?.call(replyItem.root == 0 ? replyItem : fReplyItem),
+      ),
+    );
  }

  // 分割文本并处理每个部分
@ -734,8 +738,36 @@ InlineSpan buildContent(
      return '';
    },
    onNonMatch: (String nonMatchStr) {
-      addPlainTextSpan(nonMatchStr);
-      return nonMatchStr;
+      return nonMatchStr.splitMapJoin(
+        bv23Regex,
+        onMatch: (Match match) {
+          String matchStr = match[0]!;
+          spanChilds.add(
+            TextSpan(
+              text: ' $matchStr ',
+              style: isVideoPage
+                  ? TextStyle(
+                      color: Theme.of(context).colorScheme.primary,
+                    )
+                  : null,
+              recognizer: TapGestureRecognizer()
+                ..onTap = () => Get.toNamed(
+                      '/webview',
+                      parameters: {
+                        'url': matchStr,
+                        'type': 'url',
+                        'pageTitle': matchStr
+                      },
+                    ),
+            ),
+          );
+          return '';
+        },
+        onNonMatch: (String nonMatchOtherStr) {
+          addPlainTextSpan(nonMatchOtherStr);
+          return nonMatchOtherStr;
+        },
+      );
    },
  );

--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@ -24,7 +24,7 @@ import wakelock_plus
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
  AudioServicePlugin.register(with: registry.registrar(forPlugin: "AudioServicePlugin"))
  AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin"))
-  ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
+  ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
  DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
  DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin"))
  FlutterVolumeControllerPlugin.register(with: registry.registrar(forPlugin: "FlutterVolumeControllerPlugin"))
--- a/pubspec.lock
+++ b/pubspec.lock
@ -21,10 +21,10 @@ packages:
    dependency: "direct main"
    description:
      name: animations
-      sha256: "708e4b68c23228c264b038fe7003a2f5d01ce85fc64d8cae090e86b27fcea6c5"
+      sha256: d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.0.10"
+    version: "2.0.11"
  appscheme:
    dependency: "direct main"
    description:
@ -101,10 +101,10 @@ packages:
    dependency: "direct main"
    description:
      name: audio_video_progress_bar
-      sha256: "3384875247cdbea748bd9ae8330631cd06a6cabfcda4945d45c9b406da92bc66"
+      sha256: ccc7d7b83d2a16c52d4a7fb332faabd1baa053fb0e4c16815aefd3945ab33b81
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
  auto_orientation:
    dependency: "direct main"
    description:
@ -157,10 +157,10 @@ packages:
    dependency: "direct dev"
    description:
      name: build_runner
-      sha256: "67d591d602906ef9201caf93452495ad1812bea2074f04e25dbd7c133785821b"
+      sha256: "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.4.7"
+    version: "2.4.8"
  build_runner_core:
    dependency: transitive
    description:
@ -213,10 +213,10 @@ packages:
    dependency: "direct main"
    description:
      name: catcher_2
-      sha256: ca94d45ffb52bf4b16a425cdff6734ae8443d36d5f06c276f1c2a593120b11ed
+      sha256: "9cf33d2befd10058374e5fc6177577fdd938d73d9c06810de81cf91311a7ce98"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.1.0"
+    version: "1.2.3"
  characters:
    dependency: transitive
    description:
@ -269,18 +269,18 @@ packages:
    dependency: "direct main"
    description:
      name: connectivity_plus
-      sha256: "77a180d6938f78ca7d2382d2240eb626c0f6a735d0bfdce227d8ffb80f95c48b"
+      sha256: e9feae83b1849f61bad9f6f33ee00646e3410d54ce0821e02f262f9901dad3c9
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "4.0.2"
+    version: "6.0.1"
  connectivity_plus_platform_interface:
    dependency: transitive
    description:
      name: connectivity_plus_platform_interface
-      sha256: cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a
+      sha256: b6a56efe1e6675be240de39107281d4034b64ac23438026355b4234042a35adb
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.2.4"
+    version: "2.0.0"
  convert:
    dependency: transitive
    description:
@ -373,10 +373,10 @@ packages:
    dependency: "direct main"
    description:
      name: dio
-      sha256: "797e1e341c3dd2f69f2dad42564a6feff3bfb87187d05abb93b9609e6f1645c3"
+      sha256: "49af28382aefc53562459104f64d16b9dfd1e8ef68c862d5af436cc8356ce5a8"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "5.4.0"
+    version: "5.4.1"
  dio_cookie_manager:
    dependency: "direct main"
    description:
@ -413,10 +413,10 @@ packages:
    dependency: "direct main"
    description:
      name: dynamic_color
-      sha256: "8b8bd1d798bd393e11eddeaa8ae95b12ff028bf7d5998fc5d003488cd5f4ce2f"
+      sha256: eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.6.8"
+    version: "1.7.0"
  easy_debounce:
    dependency: "direct main"
    description:
@ -469,10 +469,10 @@ packages:
    dependency: "direct main"
    description:
      name: extended_nested_scroll_view
-      sha256: "444a6f883e6e07effc7639e69a309e1fb491b6c19b095e9281714a51ace2b384"
+      sha256: "835580d40c2c62b448bd14adecd316acba469ba61f1510ef559d17668a85e777"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "6.1.2"
+    version: "6.2.1"
  fake_async:
    dependency: transitive
    description:
@ -592,10 +592,10 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_svg
-      sha256: d39e7f95621fc84376bc0f7d504f05c3a41488c562f4a8ad410569127507402c
+      sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.0.9"
+    version: "2.0.10+1"
  flutter_test:
    dependency: "direct dev"
    description: flutter
@ -1067,50 +1067,50 @@ packages:
    dependency: "direct main"
    description:
      name: permission_handler
-      sha256: "860c6b871c94c78e202dc69546d4d8fd84bd59faeb36f8fb9888668a53ff4f78"
+      sha256: "74e962b7fad7ff75959161bb2c0ad8fe7f2568ee82621c9c2660b751146bfe44"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "11.1.0"
+    version: "11.3.0"
  permission_handler_android:
    dependency: transitive
    description:
      name: permission_handler_android
-      sha256: "2f1bec180ee2f5665c22faada971a8f024761f632e93ddc23310487df52dcfa6"
+      sha256: "1acac6bae58144b442f11e66621c062aead9c99841093c38f5bcdcc24c1c3474"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "12.0.1"
+    version: "12.0.5"
  permission_handler_apple:
    dependency: transitive
    description:
      name: permission_handler_apple
-      sha256: "1a816084338ada8d574b1cb48390e6e8b19305d5120fe3a37c98825bacc78306"
+      sha256: "92861b0f0c2443dd8898398c2baa4f1ae925109b5909ae4a17d0108a6a788932"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "9.2.0"
+    version: "9.4.2"
  permission_handler_html:
    dependency: transitive
    description:
      name: permission_handler_html
-      sha256: "11b762a8c123dced6461933a88ea1edbbe036078c3f9f41b08886e678e7864df"
+      sha256: "54bf176b90f6eddd4ece307e2c06cf977fb3973719c35a93b85cc7093eb6070d"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "0.1.0+2"
+    version: "0.1.1"
  permission_handler_platform_interface:
    dependency: transitive
    description:
      name: permission_handler_platform_interface
-      sha256: d87349312f7eaf6ce0adaf668daf700ac5b06af84338bd8b8574dfbd93ffe1a1
+      sha256: "23dfba8447c076ab5be3dee9ceb66aad345c4a648f0cac292c77b1eb0e800b78"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "4.0.2"
+    version: "4.2.0"
  permission_handler_windows:
    dependency: transitive
    description:
      name: permission_handler_windows
-      sha256: "1e8640c1e39121128da6b816d236e714d2cf17fac5a105dd6acdd3403a628004"
+      sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "0.2.0"
+    version: "0.2.1"
  petitparser:
    dependency: transitive
    description:
@ -1536,26 +1536,26 @@ packages:
    dependency: transitive
    description:
      name: vector_graphics
-      sha256: "0f0c746dd2d6254a0057218ff980fc7f5670fd0fcf5e4db38a490d31eed4ad43"
+      sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.1.9+1"
+    version: "1.1.11+1"
  vector_graphics_codec:
    dependency: transitive
    description:
      name: vector_graphics_codec
-      sha256: "0edf6d630d1bfd5589114138ed8fada3234deacc37966bec033d3047c29248b7"
+      sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.1.9+1"
+    version: "1.1.11+1"
  vector_graphics_compiler:
    dependency: transitive
    description:
      name: vector_graphics_compiler
-      sha256: d24333727332d9bd20990f1483af4e09abdb9b1fc7c3db940b56ab5c42790c26
+      sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.1.9+1"
+    version: "1.1.11+1"
  vector_math:
    dependency: transitive
    description:
@ -1640,10 +1640,10 @@ packages:
    dependency: "direct main"
    description:
      name: webview_flutter
-      sha256: "42393b4492e629aa3a88618530a4a00de8bb46e50e7b3993fedbfdc5352f0dbf"
+      sha256: d81b68e88cc353e546afb93fb38958e3717282c5ac6e5d3be4a4aef9fc3c1413
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "4.4.2"
+    version: "4.5.0"
  webview_flutter_android:
    dependency: transitive
    description:
@ -1664,10 +1664,10 @@ packages:
    dependency: transitive
    description:
      name: webview_flutter_wkwebview
-      sha256: accdaaa49a2aca2dc3c3230907988954cdd23fed0a19525d6c9789d380f4dc76
+      sha256: "4d062ad505390ecef1c4bfb6001cd857a51e00912cc9dfb66edb1886a9ebd80c"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "3.9.4"
+    version: "3.10.2"
  win32:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -19,7 +19,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 version: 1.0.21+1021

 environment:
-  sdk: ">=2.19.6 <3.0.0"
+  sdk: ">=3.0.0 <4.0.0"

 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions
@ -36,15 +36,15 @@ dependencies:
  # Use with the CupertinoIcons class for iOS style icons.
  cupertino_icons: ^1.0.5
  # 动态取色
-  dynamic_color: ^1.6.8
+  dynamic_color: ^1.7.0

  get: ^4.6.5

  # 网络
-  dio: ^5.3.3
+  dio: ^5.4.1
  cookie_jar: ^4.0.8
  dio_cookie_manager: ^3.1.1
-  connectivity_plus: ^4.0.1
+  connectivity_plus: ^6.0.1
  dio_http2_adapter: ^2.3.1+1

  # 图片
@ -58,17 +58,17 @@ dependencies:
  hive_flutter: ^1.1.0

  # 设备信息
-  device_info_plus: ^9.0.2
+  device_info_plus: ^9.0.0
  # 权限
-  permission_handler: ^11.0.1
+  permission_handler: ^11.3.0
  # 分享
  share_plus: ^7.0.2
  # cookie 管理
  webview_cookie_manager: ^2.0.6
  # 浏览器
-  webview_flutter: ^4.2.2
+  webview_flutter: ^4.5.0
  # 解决sliver滑动不同步
-  extended_nested_scroll_view: ^6.1.2
+  extended_nested_scroll_view: ^6.2.1
  # 上拉加载
  loading_more_list: ^6.0.0
  # 下拉刷新
@ -99,15 +99,15 @@ dependencies:
  wakelock_plus: ^1.1.1
  universal_platform: ^1.0.0+1
  # 进度条
-  audio_video_progress_bar: ^2.0.1
+  audio_video_progress_bar: ^2.0.2
  auto_orientation: ^2.3.1
  protobuf: ^3.0.0
-  animations: ^2.0.8
+  animations: ^2.0.11

  # 获取appx信息
  package_info_plus: ^4.1.0
  url_launcher: ^6.1.14
-  flutter_svg: ^2.0.7
+  flutter_svg: ^2.0.10+1
  # 防抖节流
  easy_debounce: ^2.0.3
  # 高帧率
@ -137,7 +137,7 @@ dependencies:
  uuid: ^3.0.7
  scrollable_positioned_list: ^0.3.8
  nil: ^1.1.1
-  catcher_2: ^1.1.0
+  catcher_2: ^1.2.3
  logger: ^2.0.2+1
  path: 1.8.3
  # 电池优化
@ -159,7 +159,7 @@ dev_dependencies:
  #     url: https://github.com/nvi9/flutter_launcher_icons.git
  #     ref: e045d40
  hive_generator: ^2.0.0
-  build_runner: ^2.3.3
+  build_runner: ^2.4.8

 flutter_launcher_icons:
  android: true
Author	SHA1	Message	Date
guozhigq	7ac04707cc	mod: 评论b23.tv链接匹配 issue	2024-04-01 23:55:35 +08:00
guozhigq	22e1163b28	fix: 评论投票message重复	2024-03-24 10:59:00 +08:00
guozhigq	ba78b20bfa	Merge branch 'main' into feature-replyJumpUrl	2024-03-24 10:49:36 +08:00
guozhigq	72f1a82650	bump: sdk&dependencies	2024-03-23 19:44:37 +08:00