Commit 794c20f6 authored by 陈伟灿's avatar 陈伟灿

Merge branch 'cwc' into 'master'

【修改内容】修改手机主动删除设备主机无法收到topo change的bug

See merge request chenweican/k-sdk!63
parents 5ff08f02 841e29aa
...@@ -218,7 +218,8 @@ void KK_Data_FromDev(void* str,int len) ...@@ -218,7 +218,8 @@ void KK_Data_FromDev(void* str,int len)
static int _check_invalid_topic(const char* topic) static int _check_invalid_topic(const char* topic)
{ {
if(strstr(topic, KK_FILTER_TOPO_TOPIC) != NULL && \ if(strstr(topic, KK_FILTER_TOPO_TOPIC) != NULL && \
strstr(topic,KK_FILTER_TOPO_REPLY) == NULL){ strstr(topic,KK_FILTER_TOPO_REPLY) == NULL && \
strstr(topic,KK_TOPO_CHANGE_MSG_STR) == NULL){
return 1; return 1;
} }
else if(strstr(topic, KK_FILTER_REGISTER_TOPIC) != NULL && \ else if(strstr(topic, KK_FILTER_REGISTER_TOPIC) != NULL && \
...@@ -419,6 +420,7 @@ void KK_Sendto_DevData(const char *topic,const char *data) ...@@ -419,6 +420,7 @@ void KK_Sendto_DevData(const char *topic,const char *data)
{ {
if(_check_invalid_topic(topic)) if(_check_invalid_topic(topic))
{ {
INFO_PRINT("[%s][%d]ingore the topic:%s\n",__FUNCTION__,__LINE__,topic);
return;//ingore the message return;//ingore the message
} }
INFO_PRINT("[%s][%d]receive from cloud,topic:%s\n",__FUNCTION__,__LINE__,topic); INFO_PRINT("[%s][%d]receive from cloud,topic:%s\n",__FUNCTION__,__LINE__,topic);
......
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