Merge branch 'master' of http://10.20.2.7:8080/r/~enchantedwyf/vbvs_app

# Conflicts: # assets/file.json # pubspec.lock
2025-07-07 14:10:55 +08:00
parent b59fd0a2f6 850d7eba5a
commit 62879acb05
17 changed files with 208 additions and 122 deletions
--- a/lib/pages/mh_page/test/WebviewTestModel.dart
+++ b/lib/pages/mh_page/test/WebviewTestModel.dart
@@ -32,10 +32,17 @@ class WebviewTestController extends GetControllerEx<WebviewTestModel> {
  WebviewTestController() : super(WebviewTestModel()) {
    web = WebviewHelper(
      jsbridge: buildsdk(
+<<<<<<< HEAD
+          // father: this,
+          // clientId: '494641114',
+          // dbgserverUrl: 'ws://192.168.1.2:9001',
+          ),
+=======
        father: this,
        clientId: '494641114',
        // dbgserverUrl: 'ws://192.168.1.2:9001',
      ),
+>>>>>>> 58b2bebe936bdd7239529662ef20b531f2143de4
      settings: buildsettings(),
      params: PlatformHeadlessInAppWebViewCreationParams(
        initialUrlRequest: URLRequest(