更新

sdk/Arduino/Arduino-ESP32/Helper.cpp

@@ -461,7 +461,7 @@ String getTime()
     }
     delay(500);
   }
-  return "";
+  return "1672524366000";
 }
 
 //打印提示信息

sdk/Arduino/Arduino-ESP8266/Helper.cpp

@@ -450,7 +450,7 @@ String getTime()
     }
     delay(500);
   }
-  return "";
+  return "1672524366000"; 
 }
 
 //打印提示信息

sdk/Arduino/FastBeeArduino/Apconfig.cpp

@@ -8,7 +8,7 @@
 
 #include "ApConfig.h"
 
-String randomName = "wumei-device" + (String)random(1000);
+String randomName = "fastbee-device" + (String)random(1000);
 const char *ap_ssid = randomName.c_str();
 //开放式网络，不设置密码
 const char *ap_password = "";

sdk/Arduino/FastBeeArduino/Config.cpp

@@ -38,29 +38,29 @@ String pEventTopic = "/event/post";
 
 /********************************** begin 可配置的项 **********************************/
 // wifi信息
-char *wifiSsid = "MERCURY100";
-char *wifiPwd = "164770707";
+char *wifiSsid = "";
+char *wifiPwd = "";
 char *userId = "1";
 // 产品启用授权码，则授权码不能为空
 char *authCode = "";
 
 // 设备信息配置
-char *deviceNum = "D1H2584G22Q2";
-char *productId = "41";
+char *deviceNum = "D1FJTWOT3HIB";
+char *productId = "588";
 float firmwareVersion = 1.0;
 // 经度和纬度可选，如果产品使用设备定位，则必须传
 float latitude = 0;
 float longitude = 0;
 
 // Mqtt配置
-char *mqttHost = "43.143.82.218";
+char *mqttHost = "fastbee.cn";
 int mqttPort = 1883;
-char *mqttUserName = "wumei-smart";
-char *mqttPwd = "P47T6OD5IPFWHUM6";
-char mqttSecret[17] = "KX3TSH4Q4OS835DO";
+char *mqttUserName = "FastBee";
+char *mqttPwd = "P63653937TRQ8F27";
+char mqttSecret[17] = "KV52PPZ813EFCQD8";
 
 // NTP地址（用于获取时间,修改为自己部署项目的接口地址）
-String ntpServer = "http://wumei.live:8080/iot/tool/ntp?deviceSendTime=";
+String ntpServer = "http://fastbee.cn:8080/iot/tool/ntp?deviceSendTime=";
 
 /********************************** end 可配置的项 **********************************/
 

sdk/Arduino/FastBeeArduino/FastBeeArduino.ino

@@ -57,6 +57,7 @@ void loop() {
     // 发布模拟数据，测试用
     publishSimulateDataClient();
   }
+  ESP.wdtFeed(); // 喂软件看门狗，防止程序跑偏
 }
 
 /*

sdk/Arduino/FastBeeArduino/User.cpp

@@ -97,7 +97,7 @@ String randomPropertyData() {
   int randInt = 0;
   StaticJsonDocument<1024> doc;
   JsonObject objTmeperature = doc.createNestedObject();
-  objTmeperature["id"] = "temperature";
+  objTmeperature["id"] = "light_current";
   randFloat = random(1000, 3000);
   objTmeperature["value"] = (String)(randFloat / 100);
   objTmeperature["remark"] = (String)millis();
@@ -159,7 +159,7 @@ void processFunction(String msg) {
     // 匹配云端定义的功能
     const char *id = object["id"];
     const char *value = object["value"];
-    if (strcmp(id, "switch") == 0) {
+    if (strcmp(id, "light_switch") == 0) {
       printMsg("开关 switch：" + (String)value);
       if (strcmp(value, "1") == 0) {
         // 打开继电器

sdk/Arduino/FastBeeGateway/Config.cpp

@@ -38,29 +38,29 @@ String pEventTopic = "/event/post";
 
 /********************************** begin 可配置的项 **********************************/
 // wifi信息
-char *wifiSsid = "MERCURY100";
-char *wifiPwd = "FastBee";
-char *userId = "1";
+char *wifiSsid = (char*)"MERCURY100";
+char *wifiPwd = (char*)"FastBee";
+char *userId = (char*)"1";
 // 产品启用授权码，则授权码不能为空
-char *authCode = "";
+char *authCode = (char*)"";
 
 // 设备信息配置
-char *deviceNum = "D1PGLPG58KZ2";
-char *productId = "96";
+char *deviceNum = (char*)"D1PGLPG58K88";
+char *productId = (char*)"96";
 float firmwareVersion = 1.0;
 // 经度和纬度可选，如果产品使用设备定位，则必须传
 float latitude = 0;
 float longitude = 0;
 
 // Mqtt配置
-char *mqttHost = "43.143.82.218";
+char *mqttHost = (char*)"iot.fastbee.cn";
 int mqttPort = 1883;
-char *mqttUserName = "FastBee";
-char *mqttPwd = "P467433O1MT8MXS2";
+char *mqttUserName = (char*)"FastBee";
+char *mqttPwd = (char*)"P467433O1MT8MXS2";
 char mqttSecret[17] = "KWF32S3H95LH14LO";
 
 // NTP地址（用于获取时间,修改为自己部署项目的接口地址）
-String ntpServer = "http://wumei.live:8080/iot/tool/ntp?deviceSendTime=";
+String ntpServer = "http://fastbee.cn:8080/iot/tool/ntp?deviceSendTime=";
 
 /********************************** end 可配置的项 **********************************/
 

sdk/Arduino/FastBeeGateway/Mqtt.cpp

@@ -67,9 +67,9 @@ void publishProperty(String msg) {
 
 // 4.发布功能
 void publishFunction(String msg) {
-  printMsg("发布功能:" + prefix + pFunctionTopic);
+  printMsg("发布属性（功能）:" + prefix + pPropertyTopic);
   printMsg("消息:" + msg);
-  mqttClient.publish((prefix + pFunctionTopic).c_str(), msg.c_str());
+  mqttClient.publish((prefix + pPropertyTopic).c_str(), msg.c_str());
 }
 
 // 5.发布事件

sdk/Arduino/FastBeeGateway/User.cpp

@@ -72,7 +72,8 @@ void mqttCallback(char *topic, byte *payload, unsigned int length) {
     printMsg("当前时间：" + String(now, 0));
   } else if (strcmp(topic, (prefix + sPropertyTopic).c_str()) == 0 || strcmp(topic, (prefix + sPropertyOnline).c_str()) == 0) {
     printMsg("订阅到属性指令...");
-    processProperty(data);
+    printMsg("新版本属性和功能合并为功能主题...");
+    // processProperty(data);
   } else if (strcmp(topic, (prefix + sFunctionTopic).c_str()) == 0 || strcmp(topic, (prefix + sFunctionOnline).c_str()) == 0) {
     printMsg("订阅到功能指令...");
     processFunction(data);
@@ -437,6 +438,8 @@ void processFunction(String msg) {
         delay(1000);
       }
     }
+    // 处理子设备的数据上报
+    processSubDeviceReport(id, value);
   }
   // 最后发布功能,服务端订阅存储（重要）
   publishFunction(msg);