From 4c4ac49b7654f614fb3487414bcbbe1d16cfb4d6 Mon Sep 17 00:00:00 2001
From: Chen Han <1433255094@qq.com>
Date: Tue, 21 Jun 2022 18:13:09 +0000
Subject: [PATCH] update demo mqtt to mqttclient

---
 board/Linux_Posix/mqtt_demo/CMakeLists.txt |  41 ++++++--
 board/Linux_Posix/mqtt_demo/src/main.c     | 116 ++++++++++-----------
 2 files changed, 88 insertions(+), 69 deletions(-)

diff --git a/board/Linux_Posix/mqtt_demo/CMakeLists.txt b/board/Linux_Posix/mqtt_demo/CMakeLists.txt
index 35c3b8b9..7c181711 100644
--- a/board/Linux_Posix/mqtt_demo/CMakeLists.txt
+++ b/board/Linux_Posix/mqtt_demo/CMakeLists.txt
@@ -8,6 +8,8 @@ set(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -O3 -Wall")
 
 set(TINY_ROOT ../../../)
 
+add_definitions(-DMQTT_NETWORK_TYPE_NO_TLS -DMQTT_NETSOCKET_USING_AT)
+
 ## kernel
 include_directories(${TINY_ROOT}/osal/cmsis_os)
 include_directories(${TINY_ROOT}/kernel/core/include)
@@ -23,15 +25,37 @@ aux_source_directory(${TINY_ROOT}/kernel/pm PM_SRCS)
 set(KERNEL_SRCS ${CMSIS_SRCS} ${EVTDRV_SRCS} ${PM_SRCS} ${CORE_SRCS})
 
 ## net
-include_directories(${TINY_ROOT}/components/connectivity/Eclipse-Paho-MQTT/3rdparty/include)
-include_directories(${TINY_ROOT}/components/connectivity/Eclipse-Paho-MQTT/wrapper/include)
 include_directories(${TINY_ROOT}/net/sal_module_wrapper)
+include_directories(${TINY_ROOT}/components/connectivity/mqttclient/mqttclient)
 
-aux_source_directory(${TINY_ROOT}/components/connectivity/Eclipse-Paho-MQTT/3rdparty/src MQTT_3RD_SRCS)
-aux_source_directory(${TINY_ROOT}/components/connectivity/Eclipse-Paho-MQTT/wrapper/src MQTT_SRCS)
 aux_source_directory(${TINY_ROOT}/net/sal_module_wrapper SAL_SRCS)
 
-set(NET_SRCS ${MQTT_3RD_SRCS} ${MQTT_SRCS} ${SAL_SRCS})
+set(MQTT_ROOT ${TINY_ROOT}/components/connectivity/mqttclient)
+include_directories(${MQTT_ROOT}/common)
+include_directories(${MQTT_ROOT}/common/log)
+include_directories(${MQTT_ROOT}/mqtt)
+include_directories(${MQTT_ROOT}/mqttclient)
+include_directories(${MQTT_ROOT}/network)
+include_directories(${MQTT_ROOT}/platform/TencentOS-tiny)
+
+aux_source_directory(${MQTT_ROOT}/common MQTT_COMMON)
+aux_source_directory(${MQTT_ROOT}/common/log MQTT_COMMON_LOG)
+aux_source_directory(${MQTT_ROOT}/mqttclient MQTT_CLIENT)
+aux_source_directory(${MQTT_ROOT}/mqtt MQTT_CORE)
+aux_source_directory(${MQTT_ROOT}/network MQTT_NETWORK)
+aux_source_directory(${MQTT_ROOT}/platform/TencentOS-tiny MQTT_PLATFORM)
+
+set(MQTT_SRCS 
+    ${MQTT_ROOT}/common/log/arch/tencentos-tiny/arch.c
+    ${MQTT_COMMON}
+    ${MQTT_COMMON_LOG}
+    ${MQTT_CLIENT}
+    ${MQTT_CORE}
+    ${MQTT_NETWORK}
+    ${MQTT_PLATFORM}
+)
+
+set(NET_SRCS ${MQTT_SRCS} ${SAL_SRCS})
 
 ## arch
 set(ARCH_ROOT ${TINY_ROOT}/arch/linux)
@@ -44,7 +68,12 @@ aux_source_directory(${ARCH_ROOT}/posix/gcc ARCH_POSIX_SRCS)
 
 set(ARCH_SRCS ${ARCH_COMMON_SRCS} ${ARCH_POSIX_SRCS})
 
-set(TINY_SRCS ${ARCH_SRCS} ${KERNEL_SRCS} ${NET_SRCS})
+
+include_directories(${TINY_ROOT}/components/utils/JSON/include)
+
+set(UTILS_SRCS ${TINY_ROOT}/components/utils/JSON/src/cJSON.c)
+
+set(TINY_SRCS ${ARCH_SRCS} ${KERNEL_SRCS} ${NET_SRCS} ${UTILS_SRCS})
 
 ## app
 include_directories(./)
diff --git a/board/Linux_Posix/mqtt_demo/src/main.c b/board/Linux_Posix/mqtt_demo/src/main.c
index b2c150cf..a2e55108 100644
--- a/board/Linux_Posix/mqtt_demo/src/main.c
+++ b/board/Linux_Posix/mqtt_demo/src/main.c
@@ -1,8 +1,9 @@
 #include "cmsis_os.h"
 #include "socket_wrapper.h"
 #include "sal_module_wrapper.h"
-#include "mqtt_wrapper.h"
+// #include "mqtt_wrapper.h"
 #include "mqtt_config.h"
+#include "mqttclient.h"
 
 #include <stdio.h>
 
@@ -13,84 +14,73 @@ int sock_id = 0;
 void mqtt_publisher(void *pdata);
 osThreadDef(mqtt_publisher, osPriorityNormal, 1, MQTT_PUBLISHER_STK_SIZE);
 
-//mqtt_reciever
-#define MQTT_RECIEVER_STK_SIZE 1024
-void mqtt_reciever(void *pdata);
-osThreadDef(mqtt_reciever, osPriorityNormal, 1, MQTT_RECIEVER_STK_SIZE);
+static void tos_topic_handler(void* client, message_data_t* msg)
+{
+   (void)client;
+   MQTT_LOG_I("-----------------------------------------------------------------------------------");
+   MQTT_LOG_I("%s:%d %s()...\ntopic: %s, qos: %d. \nmessage:\n\t%s\n", __FILE__, __LINE__, __FUNCTION__,
+              msg->topic_name, msg->message->qos, (char *)msg->message->payload);
+   MQTT_LOG_I("-----------------------------------------------------------------------------------\n");
+}
 
 void mqtt_publisher(void *pdata)
 {
-   mqtt_con_opt_t con_param;
-   con_param.keep_alive_interval = 2000;
-   con_param.cleansession = 1;
-   con_param.username = MQTT_USR_NAME;
-   con_param.password = MQTT_PASSWORD;
-   con_param.client_id = MQTT_CLIENT_ID;
+   int error;
+   char buf[100] = {0};
+   mqtt_client_t *client = NULL;
+   mqtt_message_t msg;
 
-   mqtt_pub_opt_t pub_param;
-   pub_param.dup = 0;
-   pub_param.qos = 0;
-   pub_param.retained = 0;
-   pub_param.id = 0;
-   pub_param.payload = "hello tencent cloud";
-   pub_param.payload_len = 20;
-   pub_param.topic = MQTT_PUBLISH_TOPIC;
+   memset(&msg, 0, sizeof(msg));
 
-   mqtt_sub_opt_t sub_param;
-   sub_param.count = 1;
-   sub_param.dup = 0;
-   sub_param.id = 0;
-   sub_param.req_qos = 0;
-   sub_param.topic = MQTT_SUBSCRIBE_TOPIC;
+   mqtt_log_init();
+   client = mqtt_lease();
 
-   printf("start connect\n");
-   tos_sal_module_register(get_socket_module());
-   tos_sal_module_init();
+   mqtt_set_port(client, MQTT_SERVER_PORT);
+   mqtt_set_host(client, MQTT_SERVER_IP);
+   mqtt_set_client_id(client, MQTT_CLIENT_ID);
+   mqtt_set_user_name(client, MQTT_USR_NAME);
+   mqtt_set_password(client, MQTT_PASSWORD);
+   mqtt_set_clean_session(client, 1);
 
-   sock_id = tos_mqtt_connect(MQTT_SERVER_IP, MQTT_SERVER_PORT, &con_param);
-   if (sock_id == -1)
-   {
-      printf("connect failed!!!\n");
-      return -1; //to exit thread
-   }
-   printf("connect success\n");
+   error = mqtt_connect(client);
 
-   if (tos_mqtt_subscribe(sock_id, &sub_param) != 0)
-   {
-      printf("subscribe failed!!!\n");
-   }else{
-      printf("subscribe success\n");
-   }
+   MQTT_LOG_D("mqtt connect error is %#x", error);
 
-   osThreadCreate(osThread(mqtt_reciever), NULL); // start receive
+   mqtt_subscribe(client, MQTT_SUBSCRIBE_TOPIC, QOS0, tos_topic_handler);
+
+   MQTT_LOG_D("mqtt subscribe error is %#x", error);
+
+   memset(&msg, 0, sizeof(msg));
 
    for (;;)
    {
-      printf("\n");
-      printf("publish topic-->%s| data-->%s| \n", pub_param.topic, pub_param.payload);
-      if (tos_mqtt_publish(sock_id, &pub_param) != 0) {
-         printf("publish failed!!!\n");
-      }
-      osDelay(2000);
+      sprintf(buf, "welcome to mqttclient, this is a publish test, a rand number: %d ...", random_number());
+
+      msg.qos = QOS0;
+      msg.payload = (void *)buf;
+
+      error = mqtt_publish(client, MQTT_PUBLISH_TOPIC, &msg);
+
+      osDelay(4000);
    }
 }
 
-void mqtt_reciever(void *pdata)
-{
-   uint8_t read_data[100];
-   int8_t topic[30];
-   uint32_t read_len;
+// void mqtt_reciever(void *pdata)
+// {
+//    uint8_t read_data[100];
+//    int8_t topic[30];
+//    uint32_t read_len;
 
-   for (;;)
-   {
-      read_len = tos_mqtt_receive(topic, sizeof(topic), read_data, sizeof(read_data));
-      if (read_len >= 0)
-      {
-         printf("receive topic-->%s| data-->%s| \n", topic, read_data);
-      }
-      osDelay(100);
-   }
-}
+//    for (;;)
+//    {
+//       read_len = tos_mqtt_receive(topic, sizeof(topic), read_data, sizeof(read_data));
+//       if (read_len >= 0)
+//       {
+//          printf("receive topic-->%s| data-->%s| \n", topic, read_data);
+//       }
+//       osDelay(100);
+//    }
+// }
 
 int main(void)
 {