合并修改

Administrator
Commit 0dbed2d1 authored 2025-11-04 09:43:17 +0800 by Administrator
Showing 5 changed files with 61 additions and 49 deletions
assets/dist.zip
lib/config/locator.dart
macos/Flutter/GeneratedPluginRegistrant.swift
macos/Podfile.lock
pubspec.lock
--- a/assets/dist.zip
View file @0dbed2d
+++ b/assets/dist.zip
View file @0dbed2d
--- a/lib/config/locator.dart
View file @0dbed2d
+++ b/lib/config/locator.dart
View file @0dbed2d
@@ -33,6 +33,7 @@ import 'package:appframe/services/dispatcher.dart';
 import 'package:fluwx/fluwx.dart';
 import 'package:get_it/get_it.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'dart:io' show Platform;
 final getIt = GetIt.instance;
@@ -41,7 +42,9 @@ Future<void> setupLocator() async {
  getIt.registerSingleton<Fluwx>(
    await (() async {
      Fluwx fluwx = Fluwx();
-      await fluwx.registerApi(appId: "wx8c32ea248f0c7765", universalLink: "https://dev.banxiaoer.net/path/to/wechat/");
+      if (Platform.isAndroid || Platform.isIOS) {
+        await fluwx.registerApi(appId: "wx8c32ea248f0c7765", universalLink: "https://dev.banxiaoer.net/path/to/wechat/");
+      }
      return fluwx;
    })(),
  );

--- a/macos/Flutter/GeneratedPluginRegistrant.swift
View file @0dbed2d
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
View file @0dbed2d
@@ -19,6 +19,7 @@ import package_info_plus
 import path_provider_foundation
 import photo_manager
 import shared_preferences_foundation
+import sqflite_darwin
 import url_launcher_macos
 import video_compress
 import video_player_avfoundation
@@ -39,6 +40,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
  PhotoManagerPlugin.register(with: registry.registrar(forPlugin: "PhotoManagerPlugin"))
  SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
+  SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
  UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
  VideoCompressPlugin.register(with: registry.registrar(forPlugin: "VideoCompressPlugin"))
  FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin"))

--- a/macos/Podfile.lock
View file @0dbed2d
+++ b/macos/Podfile.lock
View file @0dbed2d
@@ -36,6 +36,9 @@ PODS:
  - shared_preferences_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
+  - sqflite_darwin (0.0.4):
+    - Flutter
+    - FlutterMacOS
  - url_launcher_macos (0.0.1):
    - FlutterMacOS
  - video_compress (0.3.0):
@@ -63,6 +66,7 @@ DEPENDENCIES:
  - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
  - photo_manager (from `Flutter/ephemeral/.symlinks/plugins/photo_manager/macos`)
  - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`)
+  - sqflite_darwin (from `Flutter/ephemeral/.symlinks/plugins/sqflite_darwin/darwin`)
  - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
  - video_compress (from `Flutter/ephemeral/.symlinks/plugins/video_compress/macos`)
  - video_player_avfoundation (from `Flutter/ephemeral/.symlinks/plugins/video_player_avfoundation/darwin`)
@@ -99,6 +103,8 @@ EXTERNAL SOURCES:
    :path: Flutter/ephemeral/.symlinks/plugins/photo_manager/macos
  shared_preferences_foundation:
    :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin
+  sqflite_darwin:
+    :path: Flutter/ephemeral/.symlinks/plugins/sqflite_darwin/darwin
  url_launcher_macos:
    :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
  video_compress:
@@ -124,6 +130,7 @@ SPEC CHECKSUMS:
  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
  photo_manager: 1d80ae07a89a67dfbcae95953a1e5a24af7c3e62
  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
  url_launcher_macos: 0fba8ddabfc33ce0a9afe7c5fef5aab3d8d2d673
  video_compress: 752b161da855df2492dd1a8fa899743cc8fe9534
  video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b

--- a/pubspec.lock
View file @0dbed2d
+++ b/pubspec.lock
View file @0dbed2d
@@ -5,18 +5,18 @@ packages:
    dependency: transitive
    description:
      name: _fe_analyzer_shared
-      sha256: c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d
+      sha256: f0bb5d1648339c8308cc0b9838d8456b3cfe5c91f9dc1a735b4d003269e5da9a
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "91.0.0"
+    version: "88.0.0"
  analyzer:
    dependency: transitive
    description:
      name: analyzer
-      sha256: a40a0cee526a7e1f387c6847bd8a5ccbf510a75952ef8a28338e989558072cb0
+      sha256: "0b7b9c329d2879f8f05d6c05b32ee9ec025f39b077864bdb5ac9a7b63418a98f"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "8.4.0"
+    version: "8.1.1"
  archive:
    dependency: "direct main"
    description:
@@ -117,18 +117,18 @@ packages:
    dependency: transitive
    description:
      name: camera_android
-      sha256: "5c062fad7f65601ddb4d6a94ed1a61d3205e40b4cf0b4c8154720ee59360dc73"
+      sha256: "4db8a27da163130d913ab4360297549ead1c7f9a6a88e71c44e5f4d10081a3d4"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "0.10.10+10"
+    version: "0.10.10+6"
  camera_avfoundation:
    dependency: transitive
    description:
      name: camera_avfoundation
-      sha256: "397f44f8a63c8c0a474668d500f9739d4f2bc45ac2b21801194b7d29260f03ee"
+      sha256: "951ef122d01ebba68b7a54bfe294e8b25585635a90465c311b2f875ae72c412f"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "0.9.22+1"
+    version: "0.9.21+2"
  camera_platform_interface:
    dependency: transitive
    description:
@@ -471,10 +471,10 @@ packages:
    dependency: transitive
    description:
      name: flutter_plugin_android_lifecycle
-      sha256: "306f0596590e077338312f38837f595c04f28d6cdeeac392d3d74df2f0003687"
+      sha256: c2fe1001710127dfa7da89977a08d591398370d099aacdaa6d44da7eb14b8476
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.0.32"
+    version: "2.0.31"
  flutter_sound:
    dependency: "direct main"
    description:
@@ -737,26 +737,26 @@ packages:
    dependency: transitive
    description:
      name: leak_tracker
-      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
+      sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "11.0.2"
+    version: "10.0.9"
  leak_tracker_flutter_testing:
    dependency: transitive
    description:
      name: leak_tracker_flutter_testing
-      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
+      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "3.0.10"
+    version: "3.0.9"
  leak_tracker_testing:
    dependency: transitive
    description:
      name: leak_tracker_testing
-      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "3.0.2"
+    version: "3.0.1"
  lints:
    dependency: transitive
    description:
@@ -969,18 +969,18 @@ packages:
    dependency: transitive
    description:
      name: path_provider_android
-      sha256: e122c5ea805bb6773bb12ce667611265980940145be920cd09a4b0ec0285cb16
+      sha256: "3b4c1fc3aa55ddc9cd4aa6759984330d5c8e66aa7702a6223c61540dc6380c37"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.2.20"
+    version: "2.2.19"
  path_provider_foundation:
    dependency: transitive
    description:
      name: path_provider_foundation
-      sha256: efaec349ddfc181528345c56f8eda9d6cccd71c177511b132c6a0ddaefaa2738
+      sha256: "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.4.3"
+    version: "2.4.2"
  path_provider_linux:
    dependency: transitive
    description:
@@ -1161,18 +1161,18 @@ packages:
    dependency: transitive
    description:
      name: shared_preferences_android
-      sha256: "34266009473bf71d748912da4bf62d439185226c03e01e2d9687bc65bbfcb713"
+      sha256: bd14436108211b0d4ee5038689a56d4ae3620fd72fd6036e113bf1345bc74d9e
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.4.15"
+    version: "2.4.13"
  shared_preferences_foundation:
    dependency: transitive
    description:
      name: shared_preferences_foundation
-      sha256: "1c33a907142607c40a7542768ec9badfd16293bac51da3a4482623d15845f88b"
+      sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.5.5"
+    version: "2.5.4"
  shared_preferences_linux:
    dependency: transitive
    description:
@@ -1270,10 +1270,10 @@ packages:
    dependency: transitive
    description:
      name: sqflite_android
-      sha256: ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88
+      sha256: "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.4.2+2"
+    version: "2.4.1"
  sqflite_common:
    dependency: transitive
    description:
@@ -1350,10 +1350,10 @@ packages:
    dependency: transitive
    description:
      name: test_api
-      sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
+      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "0.7.6"
+    version: "0.7.4"
  typed_data:
    dependency: transitive
    description:
@@ -1382,18 +1382,18 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_android
-      sha256: "5c8b6c2d89a78f5a1cca70a73d9d5f86c701b36b42f9c9dac7bad592113c28e9"
+      sha256: "81777b08c498a292d93ff2feead633174c386291e35612f8da438d6e92c4447e"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "6.3.24"
+    version: "6.3.20"
  url_launcher_ios:
    dependency: transitive
    description:
      name: url_launcher_ios
-      sha256: "6b63f1441e4f653ae799166a72b50b1767321ecc263a57aadf825a7a2a5477d9"
+      sha256: d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "6.3.5"
+    version: "6.3.4"
  url_launcher_linux:
    dependency: transitive
    description:
@@ -1406,10 +1406,10 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_macos
-      sha256: "8262208506252a3ed4ff5c0dc1e973d2c0e0ef337d0a074d35634da5d44397c9"
+      sha256: c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "3.2.4"
+    version: "3.2.3"
  url_launcher_platform_interface:
    dependency: transitive
    description:
@@ -1446,10 +1446,10 @@ packages:
    dependency: transitive
    description:
      name: vector_math
-      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.2.0"
+    version: "2.1.4"
  vibration:
    dependency: "direct main"
    description:
@@ -1486,18 +1486,18 @@ packages:
    dependency: transitive
    description:
      name: video_player_android
-      sha256: cf768d02924b91e333e2bc1ff928528f57d686445874f383bafab12d0bdfc340
+      sha256: a8dc4324f67705de057678372bedb66cd08572fe7c495605ac68c5f503324a39
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.8.17"
+    version: "2.8.15"
  video_player_avfoundation:
    dependency: transitive
    description:
      name: video_player_avfoundation
-      sha256: "19ed1162a7a5520e7d7791e0b7b73ba03161b6a69428b82e4689e435b325432d"
+      sha256: f9a780aac57802b2892f93787e5ea53b5f43cc57dc107bee9436458365be71cd
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.8.5"
+    version: "2.8.4"
  video_player_platform_interface:
    dependency: transitive
    description:
@@ -1526,10 +1526,10 @@ packages:
    dependency: transitive
    description:
      name: vm_service
-      sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60"
+      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "15.0.2"
+    version: "15.0.0"
  watcher:
    dependency: transitive
    description:
@@ -1574,10 +1574,10 @@ packages:
    dependency: transitive
    description:
      name: webview_flutter_android
-      sha256: e5201c620eb2637dca88a756961fae4a7191bb30b4f2271e08b746405ffdf3fd
+      sha256: "9a25f6b4313978ba1c2cda03a242eea17848174912cfb4d2d8ee84a556f248e3"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "4.10.5"
+    version: "4.10.1"
  webview_flutter_platform_interface:
    dependency: transitive
    description:
@@ -1590,10 +1590,10 @@ packages:
    dependency: transitive
    description:
      name: webview_flutter_wkwebview
-      sha256: fea63576b3b7e02b2df8b78ba92b48ed66caec2bb041e9a0b1cbd586d5d80bfd
+      sha256: fb46db8216131a3e55bcf44040ca808423539bc6732e7ed34fb6d8044e3d512f
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "3.23.1"
+    version: "3.23.0"
  wechat_assets_picker:
    dependency: "direct main"
    description:
@@ -1659,5 +1659,5 @@ packages:
    source: hosted
    version: "3.1.3"
 sdks:
-  dart: ">=3.9.0 <4.0.0"
+  dart: ">=3.8.0 <4.0.0"
-  flutter: ">=3.35.0"
+  flutter: ">=3.29.0"