Merge branch 'cwc' into 'master'

【修改内容】修改设备控制不了的问题

See merge request chenweican/k-sdk!121

application/kcloud/kcloud_data_handle.c

@@ -197,6 +197,7 @@ char * g_filerToCloudTable[] =
 {
 	(char *){"/thing/service/historyAlarm_reply"},	
 	(char *){"/thing/service/delAlarm_reply"},
+	(char *){"/thing/service/syncinfo_reply"},
 };
 /************************************************************
 *功能描述：过滤不需要下发给网关的消息

application/klansdk/kk_lan_main.c

@@ -110,10 +110,10 @@ int main(int argc, char* argv[])
 
 	open("kk_lan",LOG_PID,LOG_USER);
 
-	if(prg_run_singleton(argv[0])<0){
-		debug_log(LOG_CRITICAL_LEVEL,"[%s]run singleton fail!\n",argv[0]);
-		return -1;
-	}
+	//if(prg_run_singleton(argv[0])<0){
+		//debug_log(LOG_CRITICAL_LEVEL,"[%s]run singleton fail!\n",argv[0]);
+		//return -1;
+	//}
 
 	kk_lan_ccuid_init();
 

application/klansdk/kk_oldccu_msg.c

@@ -126,7 +126,6 @@ static int _kk_lan_update_device_status(int nodeId,cJSON *opcode,cJSON *arg)
 	memset(nodeBuff,0,sizeof(nodeBuff));
 	snprintf(nodeBuff,32,"%d",nodeId);
 
-	memset(nodeBuff,0,sizeof(nodeBuff));
 	memset(valBuff,0,sizeof(valBuff));
 
 	if(arg->type==cJSON_String){
@@ -147,7 +146,7 @@ static int _kk_lan_update_device_status(int nodeId,cJSON *opcode,cJSON *arg)
 		snprintf(valBuff,sizeof(valBuff),"%s","false");
 	}
 
-	msg = old_ccu_msg_build(nodeBuff,opcode->valuestring,"success",arg->valuestring);
+	msg = old_ccu_msg_build(nodeBuff,opcode->valuestring,"success",valBuff);
 	send_msg_to_module(msg);
 	cJSON_Delete(msg);