use local library source instead to correct some black-box issue for aliyuniot

src/aliot_client.cpp

@@ -22,11 +22,12 @@
  */
 
 #include "defines.h"
+#include "global.h"
 #include "serials.h"
 #include "iot_hub.h"
 #include "iris_client.h"
 
-#include "aliyun_iot_sdk.h"
+#include "AliyunIoTSDK.h"
 
 #include "aliot_client.h"
 
@@ -35,6 +36,7 @@ extern String g_mqtt_server;
 extern String g_product_key;
 extern String g_device_name;
 extern String g_device_secret;
+extern String g_device_token;
 
 extern String g_mqtt_client_id;
 extern String g_mqtt_user_name;
@@ -53,11 +55,10 @@ static AliyunIoTSDK iot;
 
 
 // public function definitions
-int connectToAliot(PubSubClient &mqtt_client) {
+int connectToAliot() {
     String aliot_client_id = g_product_key + "." + g_device_name;
 
-    int res = iot.begin(mqtt_client, aliot_client_id.c_str(), g_product_key.c_str(), g_device_name.c_str(), g_device_secret.c_str(),
-                       g_aliot_instance_id.c_str(), g_aliot_region.c_str());
+    int res = iot.begin(wifi_client, g_product_key.c_str(), g_device_name.c_str(), g_device_token.c_str(), g_aliot_region.c_str());
     if (0 == res) {
         INFOLN("Aliyun IoT connected");
     } else {

src/aliot_client.h

@@ -23,12 +23,10 @@
 
 #include <Arduino.h>
 
-#include "aliyun_iot_sdk.h"
-
 #ifndef IRIS_KIT_ALIOT_CLIENT_H
 #define IRIS_KIT_ALIOT_CLIENT_H
 
-int connectToAliot(PubSubClient &mqtt_client);
+int connectToAliot();
 
 void aliotKeepAlive();
 

src/emq_client.cpp

@@ -56,7 +56,6 @@ static void irisIrextIoTCallback(char *topic, uint8_t *data, uint32_t length);
 int connectToEMQXBroker(PubSubClient &mqtt_client) {
     int retry_times = 0;
 
-    mqtt_client.setBufferSize(2048);
     mqtt_client.setServer(g_mqtt_server.c_str(), g_mqtt_port);
     mqtt_client.setCallback(irisIrextIoTCallback);
 
@@ -69,7 +68,7 @@ int connectToEMQXBroker(PubSubClient &mqtt_client) {
             mqtt_client.subscribe(g_downstream_topic.c_str());
         } else {
             ERRORF("Failed to connect to MQTT broker, rc = %d\n", mqtt_client.state());
-            INFOF(" try again in 5 seconds\n");
+            INFOF("Try again in 5 seconds\n");
             retry_times++;
             delay(MQTT_RETRY_DELAY);
         }

src/iot_hub.cpp

@@ -95,7 +95,7 @@ int connectToIrextIoT() {
 
     INFOF("Try connecting to AliyunIoT, product_key = %s, device_name = %s, device_secret = %s\n",
             g_product_key.c_str(), g_device_name.c_str(), g_device_token.c_str());
-    conn_ret = connectToAliot(mqtt_client);
+    conn_ret = connectToAliot();
 
     if (0 != conn_ret) {
         INFOF("Try connecting to IRext IoT %s:%d, client_id = %s, user_name = %s, password.size = %d\n",

src/iris_kit.cpp

@@ -93,7 +93,7 @@ void setup() {
     INFOLN("██║██╔══██╗██║╚════██║");
     INFOLN("██║██║  ██║██║███████║");
     INFOLN("╚═╝╚═╝  ╚═╝╚═╝╚══════╝");
-    INFOLN("== IRIS Kit [1.3.0_r1] Powered by IRBaby ==");
+    INFOLN("== IRIS Kit [1.3.0_r1] Powered by AliyunIoT ==");
 
     // try loading saved iriskit settings
     iriskit_settings.credential_token.clear();