diff --git a/assets/miniapp/mhtControl_1.0.0.zip b/assets/miniapp/mhtControl_1.0.0.zip index f214280..1c4afae 100644 Binary files a/assets/miniapp/mhtControl_1.0.0.zip and b/assets/miniapp/mhtControl_1.0.0.zip differ diff --git a/lib/pages/mh_page/bluetooth.dart b/lib/pages/mh_page/bluetooth.dart index 89a30dc..c57d3de 100644 --- a/lib/pages/mh_page/bluetooth.dart +++ b/lib/pages/mh_page/bluetooth.dart @@ -239,8 +239,8 @@ class _BluetoothPageState extends State { _buildMenuButton(context, '设备校准', ""), _buildMenuButton(context, '体征传感器', ""), _buildMenuButton(context, 'WIFI配置', ""), - _buildMenuButton( - context, '睡眠习惯', "/sleepHabitPage"), + // _buildMenuButton( + // context, '睡眠习惯', "/sleepHabitPage"), _buildMenuButton( context, '分享设备', "/deviceSharePage", arguments: obsData), @@ -404,6 +404,11 @@ class _BluetoothPageState extends State { if (onTap != null) { onTap(); // 自定义点击逻辑优先执行 } else if (path?.isNotEmpty == true) { + if (path == "/sleepHabitPage") { + WebviewTestController webviewTestController = Get.find(); + webviewTestController.web.jsbridge?.dart.toSleepHabit(); + return; + } final result = await Get.toNamed(path!, arguments: arguments); if (result != null && onResult != null) { onResult(result); // ✅ 有回调就处理返回值 diff --git a/lib/pages/mh_page/test/WebviewTestModel.dart b/lib/pages/mh_page/test/WebviewTestModel.dart index 3764d82..bee48fb 100644 --- a/lib/pages/mh_page/test/WebviewTestModel.dart +++ b/lib/pages/mh_page/test/WebviewTestModel.dart @@ -34,7 +34,7 @@ class WebviewTestController extends GetControllerEx { WebviewTestController() : super(WebviewTestModel()) { web = WebviewHelper( - isheadless: false, + isheadless: true, jsbridge: buildsdk( // father: this, // clientId: '494641114', @@ -44,9 +44,9 @@ class WebviewTestController extends GetControllerEx { params: PlatformHeadlessInAppWebViewCreationParams( onLoadStop: (controller, url) { setState(() => ready.value = true); - MHTHomeController deviceController = Get.find(); - web.jsbridge!.dart - .updateDeviceList(deviceController.deviceList.values); + // MHTHomeController deviceController = Get.find(); + // web.jsbridge!.dart + // .updateDeviceList(deviceController.deviceList.values); }, ), ); @@ -129,6 +129,7 @@ class WebviewTestController extends GetControllerEx { return true; }); bridge.sdk.restoreTimer((args) async { + ef.log('更新定时: $args[0]'); ef.log('queryInstantData: $args'); MHTHomeController homeController = Get.find(); var data = await homeController.restoreTimer(args); diff --git a/lib/pages/mh_page/user/page/mht_login_page.dart b/lib/pages/mh_page/user/page/mht_login_page.dart index 065225f..d632471 100644 --- a/lib/pages/mh_page/user/page/mht_login_page.dart +++ b/lib/pages/mh_page/user/page/mht_login_page.dart @@ -1272,6 +1272,8 @@ class MHTLoginPage extends GetView { .model.register_agree = false; Get.offAndToNamed( "/mianPageBottomChange"); + //登陆成功 + // } }, colors: [