Merge remote-tracking branch 'origin/master'

lib/pages/mh_page/device/controller/mht_bluetooth_controller.dart

@@ -306,6 +306,100 @@ class MHTBlueToothController extends GetControllerEx<MHTBlueToothModel> {
     return result; // 在 requestWithLog 完成之后返回 result
   }
 
+  saveJiYiData(sleepData) async {
+    String serviceAddress = ServiceConstant.service_address;
+    String serviceName = ServiceConstant.server_service;
+    String serviceApi = ServiceConstant.user_setting;
+    String type = "sleep_jiyi_${sleepData['mac']}";
+    String queryUrl = "${serviceAddress}${serviceName}${serviceApi}";
+    var data = {
+      "type": type,
+      "mac": sleepData['mac'],
+      "time": DateTime.now().millisecondsSinceEpoch,
+      "data": sleepData,
+    };
+    await requestWithLog(
+      logTitle: "更新睡眠记忆",
+      method: MyHttpMethod.put,
+      queryUrl: queryUrl,
+      data: data,
+    );
+  }
+
+  loadJiYiData(String mac, {int time = 3}) async {
+    String serviceAddress = ServiceConstant.service_address;
+    String serviceName = ServiceConstant.server_service;
+    String serviceApi = ServiceConstant.user_setting;
+    String type = "sleep_jiyi_${mac}";
+    String queryUrl =
+        "${serviceAddress}${serviceName}${serviceApi}?type=${type}";
+    // 使用 Future 来等待异步操作完成
+    Map<String, dynamic> result = {};
+    await requestWithLog(
+      logTitle: "更新记忆",
+      method: MyHttpMethod.get,
+      queryUrl: queryUrl,
+      onSuccess: (res) {
+        ef.log("加载记忆成功: ${res.data}");
+        result = res.data; // 将返回的数据存入 result
+      },
+      onFailure: (res) {
+        ef.log("加载记忆失败: ${res.msg}");
+        result = {}; // 如果失败，可以返回空的 Map
+      },
+    );
+
+    return result; // 在 requestWithLog 完成之后返回 result
+  }
+
+  saveMattressTimeData(sleepData) async {
+    String serviceAddress = ServiceConstant.service_address;
+    String serviceName = ServiceConstant.server_service;
+    String serviceApi = ServiceConstant.user_setting;
+    String type = "sleep_new_time_${sleepData['mac']}";
+    String queryUrl = "${serviceAddress}${serviceName}${serviceApi}";
+    var data = {
+      "type": type,
+      "mac": sleepData['mac'],
+      "time": DateTime.now().millisecondsSinceEpoch,
+      "data": sleepData,
+    };
+    await requestWithLog(
+      logTitle: "更新新版倒计时",
+      method: MyHttpMethod.put,
+      queryUrl: queryUrl,
+      data: data,
+    );
+  }
+
+  loadMattressTimeData(String mac,{int time = 3}) async {
+     String serviceAddress = ServiceConstant.service_address;
+    String serviceName = ServiceConstant.server_service;
+    String serviceApi = ServiceConstant.user_setting;
+    String type = "sleep_new_time_${mac}";
+    String queryUrl =
+        "${serviceAddress}${serviceName}${serviceApi}?type=${type}";
+
+    // 使用 Future 来等待异步操作完成
+    Map<String, dynamic> result = {};
+
+    await requestWithLog(
+      logTitle: "更新新版倒计时",
+      method: MyHttpMethod.get,
+      queryUrl: queryUrl,
+      onSuccess: (res) {
+        ef.log("更新新版倒计时成功: ${res.data}");
+        result = res.data; // 将返回的数据存入 result
+      },
+      onFailure: (res) {
+        ef.log("更新新版倒计时失败: ${res.msg}");
+        result = {}; // 如果失败，可以返回空的 Map
+      },
+    );
+
+    return result; // 在 requestWithLog 完成之后返回 result
+  }
+
   //todo 解绑的时候删除自己所拥有的所有设备的睡眠习惯
 }
 

lib/pages/mh_page/test/WebviewTestModel.dart

@@ -163,6 +163,50 @@ class WebviewTestController extends GetControllerEx<WebviewTestModel> {
           }
           return true;
         });
+        //--
+        bridge.sdk.saveMattressTimeData((args) async {
+          ef.log('更新睡眠习惯: $args[0]');
+          try {
+            MHTBlueToothController blueToothController = Get.find();
+            await blueToothController.saveMattressTimeData(args[0]);
+          } catch (e) {
+            ef.log("[更新睡眠习惯失败]:$e");
+          }
+          return true;
+        });
+        bridge.sdk.loadMattressTimeData((args) async {
+          ef.log('查询睡眠习惯: $args[0]');
+          try {
+            MHTBlueToothController blueToothController = Get.find();
+            var sleepData = await blueToothController.loadMattressTimeData(args[0]);
+            return sleepData['data'];
+          } catch (e) {
+            ef.log("[查询睡眠习惯失败]:$e");
+          }
+          return true;
+        });
+        bridge.sdk.saveMemory((args) async {
+          ef.log('更新记忆: $args[0]');
+          try {
+            MHTBlueToothController blueToothController = Get.find();
+            // await blueToothController.saveHabitData(args[0]);
+            await blueToothController.saveJiYiData(args[0]);
+          } catch (e) {
+            ef.log("[更新记忆失败]:$e");
+          }
+          return true;
+        });
+        bridge.sdk.loadMemory((args) async {
+          try {
+            ef.log('查询记忆: $args[0]');
+            MHTBlueToothController blueToothController = Get.find();
+            var sleepData = await blueToothController.loadJiYiData(args[0]);
+            return sleepData['data'];
+          } catch (e) {
+            ef.log("[查询记忆失败]:$e");
+          }
+          return true;
+        });
         bridge.sdk.webPageBuild((args) async {
           ef.log('网页加载完成: $args[0]');
           try {