Merge pull request 'Harmony 3.41.9' (#1) from harmony_3.41.9 into main

Reviewed-on: #1

.fvmrc

@@ -1,3 +1,3 @@
 {
-  "flutter": "flutter_ohos/oh-3.41.9-release"
-}
+  "flutter": "3.44.9"
+}

README.md

@@ -27,6 +27,25 @@ melos run gen
 cd app
 flutter run --flavor dev
 ```
+- 或者安装vscodeflutter插件并修改launch.json F5运行
+```
+{
+  "version": "0.0.1",
+  "configurations": [
+    {
+      "name": "Flutter Dev (Web)",
+      "request": "launch",
+      "type": "dart",
+      "program": "app/lib/main_dev.dart",
+      "flavor": "dev",
+      "deviceId": "chrome",
+      "toolArgs": [
+        "--dart-define-from-file=env/dev.json"
+      ]
+    }
+  ]
+}
+```
 
 项目只有一个 Dart 入口 `lib/main.dart`。`--flavor dev|uat|prod` 仍用于选择
 Android/iOS 的原生包变体，同时 Flutter 会通过 `appFlavor` 选择对应的内置环境

app/pubspec.yaml

@@ -33,6 +33,8 @@ dev_dependencies:
     sdk: flutter
   integration_test:
     sdk: flutter
+  # 只为测试拿 InMemorySharedPreferencesAsync，不在 lib/ 里出现。
+  shared_preferences_platform_interface: ^2.4.2
 
 flutter:
   uses-material-design: true

packages/core_webview/pubspec.yaml

@@ -16,14 +16,7 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_riverpod: 3.2.1
-  # Pub.dev 的 webview_flutter 不声明 OHOS 实现。固定到 CPF-Flutter 的 OHOS
-  # 适配版本（同 core_storage 里 shared_preferences 的处理方式）。
-  webview_flutter:
-    git:
-      url: https://gitcode.com/CPF-Flutter/flutter_packages.git
-      # 固定 commit（webview_flutter-v4.13.1-ohos-1.0.2 标签），不用分支名。
-      ref: 89476bb7432938a54e5b09b449d1d031e85f0e5c
-      path: packages/webview_flutter/webview_flutter
+  webview_flutter: ^4.14.1
 
 dev_dependencies:
   flutter_lints: ^6.0.0

pubspec.lock

@@ -69,18 +69,18 @@ packages:
     dependency: transitive
     description:
       name: build_config
-      sha256: d466ed2dc9c6cd1d169948879b84ee061eb5e22c64a7c6089879c6296d272a8d
+      sha256: "94eaf6708fe64408c632ef2689ca3777b112f9421306ccf4f8c84d7c5c9f83f8"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.3"
+    version: "1.3.2"
   build_daemon:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: e1d40ef3f7934986d5da2271b1ba07794921ce263e44d622fb6c406d76589e33
+      sha256: "79e05eaf15a48d7230b053a4363b8eaac0cc234bbd0134c3229455481f55cbc6"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.6"
+    version: "4.1.5"
   build_runner:
     dependency: transitive
     description:
@@ -101,10 +101,10 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: f87ea98192116f7093cb214551ce1929caae0681fdba282b3d8b4462adee7bb7
+      sha256: "31b24be6615ec7fcf70b3aa5a7469fe35826485e639a16dd7eb83ba30e4cc6a8"
       url: "https://pub.dev"
     source: hosted
-    version: "8.13.0"
+    version: "8.12.7"
   characters:
     dependency: transitive
     description:
@@ -173,10 +173,10 @@ packages:
     dependency: transitive
     description:
       name: code_builder
-      sha256: aa5932e94c6c39c2f9ec4e5e06dfdd11a9430a61f6c41b6ba75b28ce0c481baf
+      sha256: "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d"
       url: "https://pub.dev"
     source: hosted
-    version: "4.12.0"
+    version: "4.11.1"
   collection:
     dependency: transitive
     description:
@@ -229,18 +229,18 @@ packages:
     dependency: transitive
     description:
       name: dio
-      sha256: "852ec3b48cc431ac04fff978413c541502b67ffc3e26921e74e3d994694192c1"
+      sha256: "0df44ebba85e503958eb75d07eedd3c86275a58c1d3eda2f2ce8f0a2c3abbb3c"
       url: "https://pub.dev"
     source: hosted
-    version: "5.11.1"
+    version: "5.11.0"
   dio_web_adapter:
     dependency: transitive
     description:
       name: dio_web_adapter
-      sha256: "3a1b2cd7be71086f38504956e3ebcd2837288d231ff454bafa78021244102bfc"
+      sha256: "0786d0b7295a373de356fc0af4f6f1d0ab2844ed31b19dfc5e7556b70e24212c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.1"
   fake_async:
     dependency: transitive
     description:
@@ -395,10 +395,10 @@ packages:
     dependency: transitive
     description:
       name: glob
-      sha256: "218aeb56050c714f62a3182775320dfa04602b55074873e24e31bbd39bda96fb"
+      sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.1.3"
   go_router:
     dependency: transitive
     description:
@@ -464,34 +464,10 @@ packages:
     dependency: transitive
     description:
       name: io
-      sha256: "2635216ca6a737e60de577ffa1a48a0bec76ca8a62917cfc1bb88c14c570646f"
+      sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
-  jni:
-    dependency: transitive
-    description:
-      name: jni
-      sha256: f038e58b4dc2c9037f50e233175086337e0b305e356d28211bf55f21c504cbd3
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.3"
-  jni_flutter:
-    dependency: transitive
-    description:
-      name: jni_flutter
-      sha256: b2310cdd4c18c65c081ab141a41efa94aa26c65431803703ece51996f174f351
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.3"
-  jni_util:
-    dependency: transitive
-    description:
-      name: jni_util
-      sha256: "1ba86da04a5f2bf18fde2edb235587e70c5b0fc5bd4ba955f46b00942c3fc35f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
+    version: "1.0.5"
   json_annotation:
     dependency: transitive
     description:
@@ -568,10 +544,10 @@ packages:
     dependency: "direct dev"
     description:
       name: melos
-      sha256: f8f6110bdac663034301c56dec02381de08f81b593175fee4c5714874d3d6dcd
+      sha256: "7af6507486e19a0a79f1a21e722c0c4187680b914a41a09ddb3393cc6affecb1"
       url: "https://pub.dev"
     source: hosted
-    version: "8.6.0"
+    version: "8.3.0"
   meta:
     dependency: transitive
     description:
@@ -584,10 +560,10 @@ packages:
     dependency: transitive
     description:
       name: mime
-      sha256: bd47de35f07e27267e69c8c8b22edf9473bfee170a60d60fcc93730c5144b7f6
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.0.0"
   mockito:
     dependency: transitive
     description:
@@ -656,10 +632,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd"
+      sha256: "149441ca6e4f38193b2e004c0ca6376a3d11f51fa5a77552d8bd4d2b0c0912ba"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.2.23"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -728,18 +704,18 @@ packages:
     dependency: transitive
     description:
       name: pool
-      sha256: "4177f68c237ea2128d1bee66ac17b2ce05ba3dbaafcbdd54c5d40a39d0b6b11c"
+      sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.3"
+    version: "1.5.2"
   process:
     dependency: transitive
     description:
       name: process
-      sha256: "4242ba3508d37e01808bdf71ad1d5bb93a8d671bf2e7450e6b1b353fb0808891"
+      sha256: c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.6"
+    version: "5.0.5"
   prompts:
     dependency: transitive
     description:
@@ -752,10 +728,10 @@ packages:
     dependency: transitive
     description:
       name: pub_semver
-      sha256: "261236774e8b1d69cfc6b9eabbc96c40f25e7a2d6b171f3385d4f65d5734fb24"
+      sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.2.0"
   pub_updater:
     dependency: transitive
     description:
@@ -768,10 +744,10 @@ packages:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: c38b81cbf34450b67e0265d73433569d12e34782e30ed769c9cc99c9d5f2e796
+      sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082"
       url: "https://pub.dev"
     source: hosted
-    version: "1.6.0"
+    version: "1.5.0"
   record_use:
     dependency: transitive
     description:
@@ -833,10 +809,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: "2ec3934efa51e46117f23031cc141b8fc878e8525b94ec1ea4f7f586cf1b47ea"
+      sha256: "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.7"
+    version: "2.5.6"
   shared_preferences_linux:
     dependency: transitive
     description:
@@ -850,7 +826,7 @@ packages:
     description:
       path: "packages/shared_preferences/shared_preferences_ohos"
       ref: "br_shared_preferences-v2.5.4_ohos"
-      resolved-ref: "4a7a536bba8447c7d4eacde2fb1a2e0fbe2da044"
+      resolved-ref: "19bd50ff6d5eaa96f18c63796c51e1b4e78a7480"
       url: "https://gitcode.com/openharmony-tpc/flutter_packages.git"
     source: git
     version: "2.5.4"
@@ -935,10 +911,10 @@ packages:
     dependency: transitive
     description:
       name: source_maps
-      sha256: "14c2945847669b44089bb1222f66873d7ff7103c58911917f2a63c5a62327898"
+      sha256: "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812"
       url: "https://pub.dev"
     source: hosted
-    version: "0.10.14"
+    version: "0.10.13"
   source_span:
     dependency: transitive
     description:
@@ -975,10 +951,10 @@ packages:
     dependency: transitive
     description:
       name: stream_transform
-      sha256: a00e5f18bffc764f923e7dec1038527f7fe7a1791361a7117f0358193f13d53a
+      sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
@@ -1055,10 +1031,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "5f37239c4851efcef929cea7824e76df7f2f0970aef85d66bbc430afa40e72f0"
+      sha256: "0016aef94fc66495ac78af5859181e3f3bf2026bd8eecc72b9565601e19ab360"
       url: "https://pub.dev"
     source: hosted
-    version: "15.3.0"
+    version: "15.2.0"
   watcher:
     dependency: transitive
     description:
@@ -1110,12 +1086,11 @@ packages:
   webview_flutter:
     dependency: transitive
     description:
-      path: "packages/webview_flutter/webview_flutter"
-      ref: "89476bb7432938a54e5b09b449d1d031e85f0e5c"
-      resolved-ref: "89476bb7432938a54e5b09b449d1d031e85f0e5c"
-      url: "https://gitcode.com/CPF-Flutter/flutter_packages.git"
-    source: git
-    version: "4.13.1"
+      name: webview_flutter
+      sha256: d53e1ccf5516f25017e3c9d44c39034db352d20fa34fe200674270242c2c5111
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.14.1"
   webview_flutter_android:
     dependency: transitive
     description:
@@ -1124,15 +1099,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.12.0"
-  webview_flutter_ohos:
-    dependency: transitive
-    description:
-      path: "packages/webview_flutter/webview_flutter_ohos"
-      ref: "89476bb7432938a54e5b09b449d1d031e85f0e5c"
-      resolved-ref: "89476bb7432938a54e5b09b449d1d031e85f0e5c"
-      url: "https://gitcode.com/CPF-Flutter/flutter_packages.git"
-    source: git
-    version: "4.7.0"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
@@ -1177,10 +1143,10 @@ packages:
     dependency: transitive
     description:
       name: yaml
-      sha256: f67cdd8e07d3c6329146aaef1ba043542b3134c12489f553ca9a7435d1068aea
+      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.4"
+    version: "3.1.3"
   yaml_edit:
     dependency: transitive
     description: