Merge pull request #588 from blinker-iot/dev_3.0

update codes, release verison 0.3.9
blinker-iot · Feb 15, 2022 · c43bb88 · c43bb88
2 parents e1c5aad + 10a518d
commit c43bb88
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 9 deletions.
diff --git a/library.json b/library.json
@@ -13,7 +13,7 @@
         "type": "git",
         "url": "https://github.com/blinker-iot/blinker-library.git"
     },
-    "version": "0.3.0.3.80211227",
+    "version": "0.3.9",
     "homepage": "https://diandeng.tech/home",
     "export": {
         "exclude": [

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Blinker
-version=0.3.0.3.80211227
+version=0.3.9
 author=i3water
 maintainer=i3wawter
 sentence=Build a easy way for your IoT project.

diff --git a/src/Adapters/BlinkerMQTT.h b/src/Adapters/BlinkerMQTT.h
@@ -2183,6 +2183,11 @@ int BlinkerMQTT::connectServer() {
     String _userID = root[BLINKER_CMD_DETAIL][BLINKER_CMD_DEVICENAME];
     String _userName = root[BLINKER_CMD_DETAIL][BLINKER_CMD_IOTID];
     String _key = root[BLINKER_CMD_DETAIL][BLINKER_CMD_IOTTOKEN];
+
+    if (_key == _userName) {
+        _key = STRING_find_string(payload, "iotToken", "\"", 4);
+    }
+
     String _productInfo = root[BLINKER_CMD_DETAIL][BLINKER_CMD_PRODUCTKEY];
     String _broker = root[BLINKER_CMD_DETAIL][BLINKER_CMD_BROKER];
     String _uuid = root[BLINKER_CMD_DETAIL][BLINKER_CMD_UUID];

diff --git a/src/Adapters/BlinkerPROESP.h b/src/Adapters/BlinkerPROESP.h
@@ -2466,6 +2466,11 @@ int BlinkerPROESP::connectServer() {
     String _userID = root[BLINKER_CMD_DETAIL][BLINKER_CMD_DEVICENAME];
     String _userName = root[BLINKER_CMD_DETAIL][BLINKER_CMD_IOTID];
     String _key = root[BLINKER_CMD_DETAIL][BLINKER_CMD_IOTTOKEN];
+
+    if (_key == _userName) {
+        _key = STRING_find_string(payload, "iotToken", "\"", 4);
+    }
+
     String _productInfo = root[BLINKER_CMD_DETAIL][BLINKER_CMD_PRODUCTKEY];
     String _broker = root[BLINKER_CMD_DETAIL][BLINKER_CMD_BROKER];
     String _uuid = root[BLINKER_CMD_DETAIL][BLINKER_CMD_UUID];

diff --git a/src/Blinker/BlinkerConfig.h b/src/Blinker/BlinkerConfig.h
@@ -5,7 +5,7 @@
 // #include "Blinker/BlinkerUtility.h"
 #include "../Server/BlinkerServer.h"
 
-#define BLINKER_VERSION                 "0.3.0.3.80211227"
+#define BLINKER_VERSION                 "0.3.9"
 
 #define BLINKER_CONNECT_TIMEOUT_MS      10000UL
 

diff --git a/src/Functions/BlinkerDuerOS.h b/src/Functions/BlinkerDuerOS.h
@@ -265,9 +265,9 @@ class BLINKERDUEROS
         {
             String payload = BLINKER_F("\"");
             payload += STRING_format(BLINKER_CMD_TEMP);
-            payload += BLINKER_F("\":[\"\",");
+            payload += BLINKER_F("\":\"");
             payload += STRING_format(_temp);
-            payload += BLINKER_F("]");
+            payload += BLINKER_F("\"");
 
             // Blinker.DuerOSPrint(payload);
 
@@ -285,9 +285,9 @@ class BLINKERDUEROS
         {
             String payload = BLINKER_F("\"");
             payload += STRING_format(BLINKER_CMD_TEMP);
-            payload += BLINKER_F("\":[\"\",");
+            payload += BLINKER_F("\":\"");
             payload += STRING_format(_temp);
-            payload += BLINKER_F("]");
+            payload += BLINKER_F("\"");
 
             // Blinker.DuerOSPrint(payload);
 
@@ -305,9 +305,9 @@ class BLINKERDUEROS
         {
             String payload = BLINKER_F("\"");
             payload += STRING_format(BLINKER_CMD_TEMP);
-            payload += BLINKER_F("\":[\"\",");
+            payload += BLINKER_F("\":\"");
             payload += STRING_format(_temp);
-            payload += BLINKER_F("]");
+            payload += BLINKER_F("\"");
 
             // Blinker.DuerOSPrint(payload);