Skip to content

K
k-sdk
Commit 0efc40de authored by chen.weican's avatar chen.weican
Browse files
Options

【修改内容】1，修改面板系列属性上报采用逐一上报方式;2，修改内存泄漏点 

【提交人】陈伟灿
parent 2d0627b1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4286 additions and 4237 deletions
application/kcloud/kcloud_config.h
View file @ 0efc40de
#ifndef MQTT_CONF_H_ #ifndef MQTT_CONF_H_
#define MQTT_CONF_H_ #define MQTT_CONF_H_
#define ADDRESS "tcp://172.25.240.31:1983" #define ADDRESS "tcp://172.25.240.31:1983"
#define CLIENTID "kk_%s" #define CLIENTID "kk_%s"
#define TOPIC "/sys/a1OYuSBt23u/aIqEbWno8yDdsjCX15iq/thing/service/property/set" #define TOPIC "/sys/a1OYuSBt23u/aIqEbWno8yDdsjCX15iq/thing/service/property/set"
#define PAYLOAD "Hello cwc World!" #define PAYLOAD "Hello cwc World!"
#define QOS 2 #define QOS 2
#define TIMEOUT 10000L #define TIMEOUT 10000L
#define USRNAME "hangzhou_gateway " #define USRNAME "hangzhou_gateway "
#define PASSWORD "2ca1442865ff4cb99870f60f2c646190" #define PASSWORD "2ca1442865ff4cb99870f60f2c646190"
#define AUTO_CONN 1 #define AUTO_CONN 1
#define CONNECT_TIMEOUT 3 #define CONNECT_TIMEOUT 3
typedef enum {
RETURN_FAIL = -1,
#endif RETURN_SUCCESS = 0,
} kk_kcloud_error_code_t;
#endif
application/kcloud/kcloud_data_handle.c
View file @ 0efc40de
This diff is collapsed.
application/kcloud/mqtt_api.c
View file @ 0efc40de
This diff is collapsed.
common/hal/kk_product.h
View file @ 0efc40de
#ifndef __KK_PRODUCT_H__ #ifndef __KK_PRODUCT_H__
#define __KK_PRODUCT_H__ #define __KK_PRODUCT_H__
#include <stdio.h> #include <stdio.h>
#ifndef _IN_ #ifndef _IN_
#define _IN_ #define _IN_
#endif #endif
#ifndef _OU_ #ifndef _OU_
#define _OU_ #define _OU_
#endif #endif
#define PRODUCT_TYPE_LEN (32+1) #define PRODUCT_TYPE_LEN (32+1)
#define PRODUCT_CODE_LEN (32+1) #define PRODUCT_CODE_LEN (32+1)
#define DEVICE_CODE_LEN (32+1) #define DEVICE_CODE_LEN (32+1)
#define MAC_ADDR_LEN_MAX (10) #define MAC_ADDR_LEN_MAX (10)
#define PID_STRLEN_MAX (64) #define PID_STRLEN_MAX (64)
#define MID_STRLEN_MAX (64) #define MID_STRLEN_MAX (64)
#define IOTX_URI_MAX_LEN (135) /* IoTx CoAP/HTTP uri & MQTT topic maximal length */ #define IOTX_URI_MAX_LEN (135) /* IoTx CoAP/HTTP uri & MQTT topic maximal length */
#define PID_STR_MAXLEN (64) #define PID_STR_MAXLEN (64)
#define MID_STR_MAXLEN (64) #define MID_STR_MAXLEN (64)
#define PRODUCT_SECRET_MAXLEN (64 + 1) #define PRODUCT_SECRET_MAXLEN (64 + 1)
#define FIRMWARE_VERSION_MAXLEN (32 + 1) #define FIRMWARE_VERSION_MAXLEN (32 + 1)
#define VERSION_MAXLEN (32 + 1) #define VERSION_MAXLEN (32 + 1)
#define HAL_CID_LEN (64 + 1) #define HAL_CID_LEN (64 + 1)
#define NETWORK_ADDR_LEN (16) /* IPÍøÂçµØÖ·µÄ³¤¶È */ #define NETWORK_ADDR_LEN (16+1) /* IPÍøÂçµØÖ·µÄ³¤¶È */
#define MAC_ADDR_LEN (17+1) #define MAC_ADDR_LEN (17+1)
#define SN_ADDR_LEN (32+1) #define SN_ADDR_LEN (32+1)
#define PRODUCT_TPYE "kk" #define PRODUCT_TPYE "kk"
#define PRODUCT_CODE "15" #define PRODUCT_CODE "15"
int HAL_SetProduct_Type(_IN_ char *product_type); int HAL_SetProduct_Type(_IN_ char *product_type);
int HAL_SetProduct_Code(_IN_ char *product_code); int HAL_SetProduct_Code(_IN_ char *product_code);
int HAL_SetDevice_Code(_IN_ char *device_code); int HAL_SetDevice_Code(_IN_ char *device_code);
int HAL_GetProduct_Type(_OU_ char *product_type); int HAL_GetProduct_Type(_OU_ char *product_type);
int HAL_GetProduct_Code(_OU_ char *product_code); int HAL_GetProduct_Code(_OU_ char *product_code);
int HAL_GetDevice_Code(_OU_ char *device_code); int HAL_GetDevice_Code(_OU_ char *device_code);
#endif #endif
midware/midware/dm/kk_wlist_mng.c
View file @ 0efc40de
...@@ -311,16 +311,16 @@ int kk_get_wlist_num(void) ...@@ -311,16 +311,16 @@ int kk_get_wlist_num(void)
} }
int kk_getwlist_ByIdx(int idx,kk_wlist_dev_t* wlist_dev) int kk_getwlist_ByIdx(int idx,kk_wlist_dev_t* wlist_dev)
{ {
char *macs = NULL; char macs[DEVICE_MAC_MAXLEN] = {0};
char *PID = NULL; char PID[PRODUCT_CODE_MAXLEN] = {0};
char *DID = NULL; char DID[DEVICE_CODE_MAXLEN] = {0};
char *SN = NULL; char SN[PRODUCT_CODE_MAXLEN] = {0};
char identifier_name[64] = {0}; char identifier_name[64] = {0};
int res = 0; int res = 0;
_kk_wlist_lock(); _kk_wlist_lock();
sprintf(identifier_name,KK_TSL_GATAWAY_WHITELISTMAC_IDENTIFIER,idx); sprintf(identifier_name,KK_TSL_GATAWAY_WHITELISTMAC_IDENTIFIER,idx);
res = kk_tsl_get_value(kk_tsl_get_event_output_value,0,identifier_name,NULL,&macs); res = kk_tsl_get_value(kk_tsl_get_event_output_value,0,identifier_name,macs,NULL);
if(res != SUCCESS_RETURN){ if(res != SUCCESS_RETURN){
goto fail_return; goto fail_return;
} }
...@@ -328,7 +328,7 @@ int kk_getwlist_ByIdx(int idx,kk_wlist_dev_t* wlist_dev) ...@@ -328,7 +328,7 @@ int kk_getwlist_ByIdx(int idx,kk_wlist_dev_t* wlist_dev)
memset(identifier_name,0x0,sizeof(identifier_name)); memset(identifier_name,0x0,sizeof(identifier_name));
sprintf(identifier_name,KK_TSL_GATAWAY_WHITELISTPRODUCTID_IDENTIFIER,idx); sprintf(identifier_name,KK_TSL_GATAWAY_WHITELISTPRODUCTID_IDENTIFIER,idx);
res = kk_tsl_get_value(kk_tsl_get_event_output_value,0,identifier_name,NULL,&PID); res = kk_tsl_get_value(kk_tsl_get_event_output_value,0,identifier_name,PID,NULL);
if(res != SUCCESS_RETURN){ if(res != SUCCESS_RETURN){
goto fail_return; goto fail_return;
...@@ -337,7 +337,7 @@ int kk_getwlist_ByIdx(int idx,kk_wlist_dev_t* wlist_dev) ...@@ -337,7 +337,7 @@ int kk_getwlist_ByIdx(int idx,kk_wlist_dev_t* wlist_dev)
memset(identifier_name,0x0,sizeof(identifier_name)); memset(identifier_name,0x0,sizeof(identifier_name));
sprintf(identifier_name,KK_TSL_GATAWAY_WHITELISTSN_IDENTIFIER,idx); sprintf(identifier_name,KK_TSL_GATAWAY_WHITELISTSN_IDENTIFIER,idx);
res = kk_tsl_get_value(kk_tsl_get_event_output_value,0,identifier_name,NULL,&SN); res = kk_tsl_get_value(kk_tsl_get_event_output_value,0,identifier_name,SN,NULL);
if(res != SUCCESS_RETURN){ if(res != SUCCESS_RETURN){
goto fail_return; goto fail_return;
...@@ -346,7 +346,7 @@ int kk_getwlist_ByIdx(int idx,kk_wlist_dev_t* wlist_dev) ...@@ -346,7 +346,7 @@ int kk_getwlist_ByIdx(int idx,kk_wlist_dev_t* wlist_dev)
memset(identifier_name,0x0,sizeof(identifier_name)); memset(identifier_name,0x0,sizeof(identifier_name));
sprintf(identifier_name,KK_TSL_GATAWAY_WHITELISTDEVICEID_IDENTIFIER,idx); sprintf(identifier_name,KK_TSL_GATAWAY_WHITELISTDEVICEID_IDENTIFIER,idx);
res = kk_tsl_get_value(kk_tsl_get_event_output_value,0,identifier_name,NULL,&DID); res = kk_tsl_get_value(kk_tsl_get_event_output_value,0,identifier_name,DID,NULL);
if(res != SUCCESS_RETURN){ if(res != SUCCESS_RETURN){
goto fail_return; goto fail_return;
} }
...@@ -364,7 +364,7 @@ int kk_get_wlistIdx_byMac(const char* device_mac) ...@@ -364,7 +364,7 @@ int kk_get_wlistIdx_byMac(const char* device_mac)
{ {
kk_wlist_ctx_t *ctx = _kk_wlist_get_ctx(); kk_wlist_ctx_t *ctx = _kk_wlist_get_ctx();
int res = 0; int res = 0;
char *pmac = NULL; char pmac[DEVICE_MAC_MAXLEN] = {0};
char identifier_name[64] = {0}; char identifier_name[64] = {0};
int idx = 0,findIdx = 0; int idx = 0,findIdx = 0;
if(ctx->isOpened != 1) if(ctx->isOpened != 1)
...@@ -383,7 +383,7 @@ int kk_get_wlistIdx_byMac(const char* device_mac) ...@@ -383,7 +383,7 @@ int kk_get_wlistIdx_byMac(const char* device_mac)
{ {
memset(identifier_name,0x0,sizeof(identifier_name)); memset(identifier_name,0x0,sizeof(identifier_name));
sprintf(identifier_name,KK_TSL_GATAWAY_WHITELISTMAC_IDENTIFIER,idx); sprintf(identifier_name,KK_TSL_GATAWAY_WHITELISTMAC_IDENTIFIER,idx);
res = kk_tsl_get_value(kk_tsl_get_event_output_value,0,identifier_name,NULL,&pmac); res = kk_tsl_get_value(kk_tsl_get_event_output_value,0,identifier_name,pmac,NULL);
if(res != SUCCESS_RETURN){ if(res != SUCCESS_RETURN){
continue; continue;
} }
......
midware/midware/midware.c
View file @ 0efc40de
...@@ -574,7 +574,7 @@ void *ccu_property_monitor(void *args) ...@@ -574,7 +574,7 @@ void *ccu_property_monitor(void *args)
{ {
mid_ctx_t *mid_ctx = kk_mid_get_ctx(); mid_ctx_t *mid_ctx = kk_mid_get_ctx();
char s_IP[NETWORK_ADDR_LEN]; char s_IP[NETWORK_ADDR_LEN];
char *s_IP_TSL = NULL; char s_IP_TSL[NETWORK_ADDR_LEN] = {0};
int res = 0; int res = 0;
int needReport = 0; int needReport = 0;
int time_second = 60; int time_second = 60;
...@@ -587,7 +587,7 @@ void *ccu_property_monitor(void *args) ...@@ -587,7 +587,7 @@ void *ccu_property_monitor(void *args)
} }
//dm_ota_yield(MID_YIELD_TIMEOUT_MS); //dm_ota_yield(MID_YIELD_TIMEOUT_MS);
HAL_Get_IP(s_IP,NULL); HAL_Get_IP(s_IP,NULL);
res = kk_tsl_get_value(kk_tsl_get_property_value,0,KK_TSL_CCU_WANIP_IDENTIFIER,NULL,&s_IP_TSL); res = kk_tsl_get_value(kk_tsl_get_property_value,0,KK_TSL_CCU_WANIP_IDENTIFIER,s_IP_TSL,NULL);
if(res != SUCCESS_RETURN){ if(res != SUCCESS_RETURN){
ERROR_PRINT("kk_tsl_get_value Failed\n"); ERROR_PRINT("kk_tsl_get_value Failed\n");
} }
...@@ -599,6 +599,7 @@ void *ccu_property_monitor(void *args) ...@@ -599,6 +599,7 @@ void *ccu_property_monitor(void *args)
needReport = 1; needReport = 1;
} }
} }
if(needReport&&(kk_get_cloudstatus() == 1)){ if(needReport&&(kk_get_cloudstatus() == 1)){
needReport = 0; needReport = 0;
kk_tsl_post_property(KK_DM_DEVICE_CCU_DEVICEID,NULL,0); kk_tsl_post_property(KK_DM_DEVICE_CCU_DEVICEID,NULL,0);
......
midware/tsl/tsl_handle/kk_tsl_api.c
View file @ 0efc40de
This diff is collapsed.
midware/tsl/tsl_handle/kk_tsl_parse.c
View file @ 0efc40de
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment