更新控制跳转

lib/pages/mh_page/test/WebviewTestModel.dart

@@ -32,8 +32,8 @@ class WebviewTestController extends GetControllerEx<WebviewTestModel> {
   WebviewTestController() : super(WebviewTestModel()) {
     web = WebviewHelper(
       jsbridge: buildsdk(
-        // father: this,
-        // clientId: '494641114',
+        father: this,
+        clientId: '494641114',
         // dbgserverUrl: 'ws://192.168.1.2:9001',
       ),
       settings: buildsettings(),
@@ -61,10 +61,6 @@ class WebviewTestController extends GetControllerEx<WebviewTestModel> {
           return true;
         });
         bridge.sdk.selectDevice((args) async {
-<<<<<<< HEAD
-          ef.log('selectDevice: $args');
-          selectDevice = args[0];
-=======
           try {
             ef.log('selectDevice: $args');
             selectDevice = args[0];
@@ -82,7 +78,6 @@ class WebviewTestController extends GetControllerEx<WebviewTestModel> {
 
           //查询人员信息
 
->>>>>>> 13eb25e1c30dcd81c87aa85bcb5306ca0931ed21
           return true;
         });
         bridge.sdk.updateBlueToothStatus((args) async {