日报周报月报

lib/pages/mh_page/test/WebviewTestModel.dart

@@ -32,17 +32,11 @@ 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(
@@ -120,7 +114,7 @@ class WebviewTestController extends GetControllerEx<WebviewTestModel> {
           ef.log('queryInstantData: $args');
           // bluetooth = args[0];
           return instantData;
-        });   
+        });
         bridge.sdk.startTimer((args) async {
           ef.log('queryInstantData: $args');
           MHTHomeController homeController = Get.find();