From aaea27b4ba6888a922f3b3bf60346d709df7c33e Mon Sep 17 00:00:00 2001
From: strawmanbobi <strawmanbobi@163.com>
Date: Sat, 27 Aug 2022 08:59:45 +0800
Subject: [PATCH] fixed json payload parse issue

---
 platformio.ini     | 4 ++--
 src/IRbabyIRIS.cpp | 9 ++++-----
 src/IRbabyIRIS.h   | 1 +
 src/defines.h      | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 1586fc9..92940c0 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -18,8 +18,8 @@ platform = espressif8266
 framework = arduino
 monitor_speed = 115200
 upload_speed = 115200
-upload_port = COM6
-monitor_port = COM6
+upload_port = COM5
+monitor_port = COM5
 board_build.flash_mode = dout
 build_flags =
     -Wno-unused-function
diff --git a/src/IRbabyIRIS.cpp b/src/IRbabyIRIS.cpp
index 09132f4..9f78e93 100644
--- a/src/IRbabyIRIS.cpp
+++ b/src/IRbabyIRIS.cpp
@@ -142,7 +142,7 @@ int fetchIrisCredential(String credential_token,
             int resultCode = http_response_doc["status"]["code"];
             if (0 == resultCode) {
                 INFOLN("response valid, try getting entity");
-                device_secret = (String) http_response_doc["entity"]["deviceSecret"];
+                device_secret = (const char*) http_response_doc["entity"]["deviceSecret"];
                 app_id = (int) http_response_doc["entity"]["appId"];
                 INFOF("HTTP response deserialized, PK = %s, DN = %s, DS = %s\n",
                     product_key.c_str(), device_name.c_str(), device_secret.c_str());
@@ -169,12 +169,11 @@ void sendIrisKitHeartBeat() {
 void handleIrisKitMessage(const char* data, int length) {
     int ret = 0;
     char* payload = (char*) malloc(length + 1);
-    char* payload_json = payload;
     if (NULL != payload) {
         strncpy(payload, data, length);
         payload[length] = '\0';
         INFOF("--> %s\n", payload);
-        if (OK == deserializeJson(iris_ind_doc, payload_json)) {
+        if (OK == deserializeJson(iris_ind_doc, payload)) {
             String event_name = iris_ind_doc["eventName"];
             String product_key = iris_ind_doc["productKey"];
             String device_name = iris_ind_doc["deviceName"];
@@ -237,8 +236,8 @@ static int handleEmit(String product_key, String device_name, String content) {
     INFOF("received emit code : %s, %s, %s\n", product_key.c_str(), device_name.c_str(), content.c_str());
     emit_code_doc.clear();
     if (OK == deserializeJson(emit_code_doc, content)) {
-        int remote_id = emit_code_doc["content"]["remoteId"];
-        int key_number = emit_code_doc["content"]["keyNumber"];
+        int remote_id = emit_code_doc["remoteId"];
+        int key_number = emit_code_doc["keyNumber"];
         INFOF("will emit key : %d for remote %d\n", key_number, remote_id);
     }
     return 0;
diff --git a/src/IRbabyIRIS.h b/src/IRbabyIRIS.h
index 371ca8e..6a47e85 100644
--- a/src/IRbabyIRIS.h
+++ b/src/IRbabyIRIS.h
@@ -29,6 +29,7 @@
 // web http call URL list
 #define FETCH_CREDENTIAL_SUFFIX      "/irext-collect/credentials/fetch_credential"
 #define LOAD_ALIOT_ACCOUNT_SUFFIX    "/irext-collect/aliot/load_account"
+#define DOWNLOAD_BIN_SUFFIX          "/irext-collect/download"
 #define DOWNLOAD_PREFIX              "http://irext-debug.oss-cn-hangzhou.aliyuncs.com/irda_"
 #define DOWNLOAD_SUFFIX              ".bin"
 
diff --git a/src/defines.h b/src/defines.h
index 5be0c6f..145cf33 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -30,7 +30,7 @@ typedef unsigned short uint16_t;
 typedef short int16_t;
 typedef unsigned char uint8_t;
 
-#define FIRMWARE_VERSION "0.2.7" // version name
+#define FIRMWARE_VERSION "1.2.7" // version name
 #define VERSION_CODE 1          // version code
 
 /* log settings */