Merge branch 'update_demo' into 'master' (merge request !2)

feat: update config net and dual demo.

Author: esma

qcloud-llsync-config-net-esp32/components/qcloud_iot_c_sdk/CMakeLists.txt

@@ -44,7 +44,8 @@ if (CONFIG_QCLOUD_IOT_C_SDK)
             sdk_src/utils_sha1.c
             sdk_src/utils_timer.c
             sdk_src/utils_url_download.c
-            sdk_src/utils_url_upload.c)
+            sdk_src/utils_url_upload.c
+	    sdk_src/device_bind.c)
 
     list(APPEND srcs
             platform/HAL_Airkiss.c

qcloud-llsync-config-net-esp32/components/qcloud_iot_c_sdk/include/exports/qcloud_iot_export_asr.h

@@ -107,7 +107,7 @@ typedef struct _RealTimeAsrConf_ {
 
 typedef void (*OnAsrResultCB)(uint32_t request_id, char *res_text, int total_resutl_num, int resutl_seq);
 
-typedef int (*OnAsrResourceEventUsrCallback)(void *pContext, const char *msg, uint32_t msgLen, int event);
+typedef int (*OnAsrFileManageEventUsrCallback)(void *pContext, const char *msg, uint32_t msgLen, int event);
 
 /**
  * @brief Init asr client
@@ -121,7 +121,7 @@ typedef int (*OnAsrResourceEventUsrCallback)(void *pContext, const char *msg, ui
  * @return a valid asr client handle when success, or NULL otherwise
  */
 void *IOT_Asr_Init(const char *product_id, const char *device_name, void *pTemplate_client,
-                   OnAsrResourceEventUsrCallback usr_cb);
+                   OnAsrFileManageEventUsrCallback usr_cb);
 
 /**
  * @brief Destroy asr client

qcloud-llsync-config-net-esp32/components/qcloud_iot_c_sdk/include/exports/qcloud_iot_export_data_template.h

@@ -34,13 +34,15 @@ extern "C" {
  * @brief Data type of template
  */
 
-#define TYPE_TEMPLATE_INT     JINT32
-#define TYPE_TEMPLATE_ENUM    JINT32
-#define TYPE_TEMPLATE_FLOAT   JFLOAT
-#define TYPE_TEMPLATE_BOOL    JINT8
-#define TYPE_TEMPLATE_STRING  JSTRING
-#define TYPE_TEMPLATE_TIME    JUINT32
-#define TYPE_TEMPLATE_JOBJECT JOBJECT
+#define TYPE_TEMPLATE_INT        JINT32
+#define TYPE_TEMPLATE_ENUM       JINT32
+#define TYPE_TEMPLATE_FLOAT      JFLOAT
+#define TYPE_TEMPLATE_BOOL       JINT8
+#define TYPE_TEMPLATE_STRING     JSTRING
+#define TYPE_TEMPLATE_TIME       JUINT32
+#define TYPE_TEMPLATE_JOBJECT    JOBJECT
+#define TYPE_TEMPLATE_STRINGENUM JSTRING
+#define TYPE_TEMPLATE_ARRAY      JARRAY
 
 typedef int32_t  TYPE_DEF_TEMPLATE_INT;
 typedef int32_t  TYPE_DEF_TEMPLATE_ENUM;
@@ -49,6 +51,8 @@ typedef char     TYPE_DEF_TEMPLATE_BOOL;
 typedef char     TYPE_DEF_TEMPLATE_STRING;
 typedef uint32_t TYPE_DEF_TEMPLATE_TIME;
 typedef void *   TYPE_DEF_TEMPLATE_OBJECT;
+typedef char     TYPE_DEF_TEMPLATE_STRINGENUM;
+typedef char     TYPE_DEF_TEMPLATE_ARRAY;
 
 #ifdef EVENT_POST_ENABLED  // enable event function of data_template
 
@@ -82,10 +86,10 @@ typedef struct _sEvent_ {
 
 #endif
 
-typedef enum{
-	eGET_CTL,
-	eOPERATION_CTL,	
-}eControlType;
+typedef enum {
+    eGET_CTL,
+    eOPERATION_CTL,
+} eControlType;
 typedef void (*ControlMsgCb)(void *pClient, char *control_str, eControlType type);
 
 /* The structure of data_template init parameters */
@@ -111,8 +115,8 @@ typedef struct {
     uint8_t auto_connect_enable;  // flag of auto reconnection, 1 is enable and
     // recommended
 
-    MQTTEventHandler event_handle;   // event callback
-	ControlMsgCb	 usr_control_handle; // user can register cb to handle control msg instend of sdk's handle 
+    MQTTEventHandler event_handle;        // event callback
+    ControlMsgCb     usr_control_handle;  // user can register cb to handle control msg instend of sdk's handle
 } TemplateInitParams;
 
 #ifdef AUTH_MODE_CERT

qcloud-llsync-config-net-esp32/components/qcloud_iot_c_sdk/include/exports/qcloud_iot_export_device_bind.h

@@ -0,0 +1,57 @@
+/**
+ * Tencent is pleased to support the open source community by making IoT Hub available.
+ * Copyright(C) 2018 - 2021 THL A29 Limited, a Tencent company.All rights reserved.
+ *
+ * Licensed under the MIT License(the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://opensource.org/licenses/MIT
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef QLCOUD_IOT_EXPORT_DEVICE_BIND_H_
+#define QLCOUD_IOT_EXPORT_DEVICE_BIND_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "qcloud_iot_export.h"
+
+/**
+ * @brief Register a callback function to receive the device unbinding message
+ *        sent by the platform.
+ *        before use it you must call qcloud_service_mqtt_init() to sub service topic
+ *
+ * @param callback [in] a callback function
+ * @param context  [in] the program context
+ * @return QCLOUD_RET_SUCCESS for success, or err code for failure
+ */
+int IOT_Unbind_Device_Register(void *callback, void *context);
+/**
+ * @brief Register a callback function to receive the device unbinding message
+ *        sent by the platform
+ *
+ * @param mqtt_client the mqtt client
+ * @param callback [in] a callback function
+ * @param context  [in] the program context
+ * @return QCLOUD_RET_SUCCESS for success, or err code for failure
+ */
+int IOT_Unbind_Device_ByCloud(void *mqtt_client, void *callback, void *context);
+/**
+ * @brief Actively initiate a request to unbind the device to the platform
+ *
+ * @param mqtt_client the mqtt client
+ * @param timeout_ms timeout value (unit: ms) for this operation
+ * @return QCLOUD_RET_SUCCESS for success, or err code for failure
+ */
+int IOT_Unbind_Device_Request(void *mqtt_client, int timeout_ms);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // QLCOUD_IOT_EXPORT_DEVICE_BIND_H_

qcloud-llsync-config-net-esp32/components/qcloud_iot_c_sdk/include/exports/qcloud_iot_export_error.h

@@ -75,6 +75,7 @@ typedef enum {
     QCLOUD_ERR_BUF_TOO_SHORT                              = -119,  // MQTT recv buffer not enough
     QCLOUD_ERR_MQTT_QOS_NOT_SUPPORT                       = -120,  // MQTT QoS level not supported
     QCLOUD_ERR_MQTT_UNSUB_FAIL                            = -121,  // MQTT unsubscribe failed
+    QCLOUD_ERR_MQTT_RECONNECTING                          = -122,  // MQTT reconnecting
 
     QCLOUD_ERR_JSON_PARSE            = -132,  // JSON parsing error
     QCLOUD_ERR_JSON_BUFFER_TRUNCATED = -133,  // JSON buffer truncated