1

Drivers/CONFIG.h

@@ -13,8 +13,8 @@
 
 
 //#define EC800M 1 //4G¿ª¹Ø£¬²»ÄÜÊý×Ö¿ªÍ·
-//#define BC260Y 1  // NB
-#define ESP32 1		//WiFi
+#define BC260Y 1  // NB
+//#define ESP32 1		//WiFi
 //#define AIWB2	1	//WIFI_AIWB2-32S
 
 

Drivers/Modules/Tuoreniot.c

@@ -68,8 +68,8 @@ void TUORENIOT_PackRegistRequest(uint8_t * pack_data, uint16_t * pack_data_lengt
 	Log_Printf_Debug("mcu_id: %s\r\n", mcu_id);
 	byteToHexStr(mcu_id, registParams->deviceId, sizeof(mcu_id));
 
-	sprintf((char *)(pack_data + 2), "{\"version\":\"%d\",\"networkType\":\"%d\",\"networkProtocol\":\"%d\",\"productId\":\"%s\",\"deviceId\":\"%s\",\"userId\":\"%s\"}", 
-	registParams->version, registParams->networkType, registParams->networkProtocol, registParams->productId, registParams->deviceId, registParams->userId); // Æ´½ÓATÖ¸Áî
+	sprintf((char *)(pack_data + 2), "{\"version\":\"%d\",\"networkType\":\"%d\",\"networkProtocol\":\"%d\",\"productId\":\"%s\",\"deviceId\":\"%s\",\"userId\":\"%s\",\"sim\":\"%s\"}", 
+	registParams->version, registParams->networkType, registParams->networkProtocol, registParams->productId, registParams->deviceId, registParams->userId, registParams->sim); // Æ´½ÓATÖ¸Áî
 	Log_Printf_Debug("%s\r\n", (char *)(pack_data + 2));
 	
 	uint16_t datalen = utils_aes128_ECB_base64_enc_with_length(regist_key, (pack_data + 2));
@@ -412,6 +412,7 @@ void TUORENIOT_PrintfRegistRequestStruct(struct TUORENIOT_RegistRequestStruct *
 	Log_Printf("productId=%s\r\n", regist_params_struct->productId);
 	Log_Printf("deviceId=%s\r\n", regist_params_struct->deviceId);
 	Log_Printf("userId=%s\r\n", regist_params_struct->userId);
+	Log_Printf("sim=%s\r\n", regist_params_struct->sim);
 	Log_Printf("------print regist params end------\r\n");
 }
 

Drivers/Modules/Tuoreniot.h

@@ -21,6 +21,7 @@ struct TUORENIOT_RegistRequestStruct
 	char productId[20];
 	char deviceId[20];
 	char userId[20];
+	char sim[30];
 };
 
 struct Wifi_Struct

Drivers/Modules/bc260y/Bc260y_Initialize.c

@@ -9,6 +9,8 @@
 
 #include "PumpBusiness.h"
 #include "Log_Module.h"
+#include "Regist.h"
+#include "UDP_Client.h"
 #include "Initialize.h"
 
 #include "bc260y.h"

Drivers/Modules/bc260y/Bc260y_Regist.c

@@ -27,7 +27,8 @@ static struct TUORENIOT_RegistRequestStruct regist_request = {
 	.networkType = 1,
 	.networkProtocol = 1,
 	.deviceId = "3431228A1936013C",
-	.userId = "1000"
+	.userId = "1000",
+	.sim = "",
 };
 
 // dns

Drivers/Modules/bc260y/bc260y.c

@@ -1824,13 +1824,13 @@ enum Result bc260y_query_qccid(char * iccid)
 		char * split = "\r\n";
 		// 第一行
 		char * Line1 =strtok_r((char * )AT_result(), split, &saveptr);
-//		// 第二行
-//		char * Line2 = strtok_r(NULL, split, &saveptr);
+		// 第二行
+		char * Line2 = strtok_r(NULL, split, &saveptr);
 		// 拆解第二行
 		char * saveptr_inner = NULL;
 		char * split_inner = ": ,\"";
 		
-		strtok_r(Line1, split_inner, &saveptr_inner);
+		strtok_r(Line2, split_inner, &saveptr_inner);
 		// 字符串拷贝
 		strcpy(iccid, strtok_r(NULL, split_inner, &saveptr_inner));
 		

Drivers/Modules/ec800m/Ec800m_Initialize.c

@@ -9,6 +9,8 @@
 
 #include "PumpBusiness.h"
 #include "Log_Module.h"
+#include "Regist.h"
+#include "UDP_Client.h"
 #include "Initialize.h"
 
 #include "ec800m.h"

Drivers/Modules/ec800m/Ec800m_Regist.c

@@ -27,7 +27,8 @@ static struct TUORENIOT_RegistRequestStruct regist_request = {
 	.networkType = 2,
 	.networkProtocol = 1,
 	.deviceId = "3431228A1936013C",
-	.userId = "1000"
+	.userId = "1000",
+	.sim = "",
 };
 
 // º¯ÊýÉùÃ÷

Drivers/Modules/ec800m/ec800m.c

@@ -1520,7 +1520,7 @@ enum Result ec800m_query_qccid(char * iccid)
 		char * saveptr = NULL;
 		char * split = "\r\n";
 		// 第一行
-		strtok_r((char * )AT_result(), split, &saveptr);
+		char * Line1 = strtok_r((char * )AT_result(), split, &saveptr);
 		// 第二行
 		char * Line2 = strtok_r(NULL, split, &saveptr);
 		// 拆解第二行

Drivers/Modules/esp32/Esp32.Regist.c

@@ -43,7 +43,8 @@ static struct TUORENIOT_RegistRequestStruct regist_request = {
 	.networkProtocol = 1,
 	.productId = "1dbfd476b7nm2",
 	.deviceId = "3431228A1936013C",
-	.userId = "1000"
+	.userId = "1000",
+	.sim = "",
 };
 
 /******************************************* º¯ÊýÉùÃ÷ *******************************************/