Skip to content

K
k-sdk
Commit bdee3f61 authored by 陈伟灿's avatar 陈伟灿
Browse files
Options

Merge branch 'cwc' into 'master' 

【修改内容】修改版本为1.4.3

See merge request chenweican/k-sdk!176
parents b670d792 166c1c58
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
VERSION
View file @ bdee3f61
1.4.2 1.4.3
\ No newline at end of file \ No newline at end of file
midware/midware/midware.c
View file @ bdee3f61
...@@ -1200,8 +1200,6 @@ static int kk_subDevice_property_handle(cJSON *info,cJSON *payload,char *deviceC ...@@ -1200,8 +1200,6 @@ static int kk_subDevice_property_handle(cJSON *info,cJSON *payload,char *deviceC
free(infff); free(infff);
return 0; return 0;
} }
<<<<<<< midware/midware/midware.c
=======
static int _kk_subDevice_online_to_app(cJSON *info,cJSON *payload) static int _kk_subDevice_online_to_app(cJSON *info,cJSON *payload)
{ {
char ccuid[32] = {0}; char ccuid[32] = {0};
...@@ -1220,7 +1218,6 @@ static int _kk_subDevice_online_to_app(cJSON *info,cJSON *payload) ...@@ -1220,7 +1218,6 @@ static int _kk_subDevice_online_to_app(cJSON *info,cJSON *payload)
free(infff); free(infff);
return 0; return 0;
} }
>>>>>>> midware/midware/midware.c
static int kk_indoorAir_online_handle(dm_mgr_dev_node_t *node ,char *deviceCode,int epNum) static int kk_indoorAir_online_handle(dm_mgr_dev_node_t *node ,char *deviceCode,int epNum)
{ {
int idx = 0; int idx = 0;
......
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