Merge branch 'cwc' into 'master'

【修改内容】1，上传最新的网关程序；2，版本号更新为1.4.6

See merge request chenweican/k-sdk!206

VERSION

-1.4.5
+1.4.6
\ No newline at end of file

application/kcloud/kk_register.c

@@ -238,7 +238,6 @@ static char * kk_create_register_info()
 	cJSON *root;
 	char *out = NULL;
 	char *signSource,*base64Out = NULL;
-	char mac[16] = {0};
 	char ramdonId[16] = {0};
 	unsigned char sign_hex[32] = {0};
 	char sign_hex_str[65] = {0}; 
@@ -248,7 +247,6 @@ static char * kk_create_register_info()
 	int productSecret_len = 0;
 	char keyTmp[64] = {0};
 	root=cJSON_CreateObject();
-	HAL_Get_mac(mac);
 	HAL_GetTime_s(ramdonId);
 	KK_Get_ccuid(ccuid);
 	kk_cloud_get_pid(pid);

application/kcloud/mqtt_api.c

@@ -254,7 +254,6 @@ MQTTAsync KK_MQTT_Connect(void)
 	MQTTAsync_willOptions will_opts = MQTTAsync_willOptions_initializer;
 	MQTTAsync_setTraceCallback(mqttTraceCallback);
 	opts.MQTTVersion = MQTTVERSION_3_1_1;
-	char mac[16]={0};	
 	char token[512] = {0};
 	char usrname[128] = {0};
 	fp = fopen(KK_TOKEN_PATH, "r");
@@ -262,7 +261,6 @@ MQTTAsync KK_MQTT_Connect(void)
 		fread(token,1,sizeof(token),fp);
 		fclose(fp);
 	}	
-	HAL_Get_mac(mac);
 	char ccuid[32] = {0};
 	char pid[32] = {0};
 	KK_Get_ccuid(ccuid);	

application/klansdk/kk_data_handle.c

@@ -1033,11 +1033,12 @@ void KK_Data_FromMid(void* str,int len, char* chalMark)
 		INFO_PRINT("offline handle!!!");
 		kk_device_onoffline_handle(payload,0);
 	}else if(strstr(msgtype->valuestring,"/thing/service/addDeviceToRoom_reply")!= NULL){
-		sleep(3);
 		INFO_PRINT("addDeviceToRoom_reply handle!!!");
-		device_add_sync(payload);
+		kk_handle_sync_push_info();
+		kk_handle_sync_info();
 	}else if(strstr(msgtype->valuestring,"/thing/service/removeDeviceFromRoom_reply")!= NULL){
 		kk_handle_sync_push_info();
+		kk_handle_sync_info();		
 	}else if(strstr(msgtype->valuestring,"/thing/event/alarmNotify")!= NULL){
 		INFO_PRINT("alarmNotify handle!!!");
 		cJSON * msgId = cJSON_GetObjectItem(payload, "msgId"); 

application/klansdk/kk_data_handle.h

@@ -11,6 +11,5 @@ void KK_Data_FromMid(void* str,int len, char* chalMark);
 
 int kk_lan_property_syn_deal(const char *deviceCode,cJSON *properties);
 int send_msg_to_module(cJSON *root);
-void device_add_sync(cJSON *payload);
 void kk_handle_sync_push_info(void);
 #endif
\ No newline at end of file

application/klansdk/kk_lan_main.c

@@ -281,14 +281,11 @@ int main(int argc, char* argv[])
 
 			if(g_sync_flag&SYNC_INFO_FLAG){
 				DEBUG_PRINT("[SYNC INFO].\n");
-
 				send_data = _kk_data_create(SYNC_MSG_TYPE,s_pid,s_ccuid,"*");
 				g_sync_flag&=~SYNC_INFO_FLAG;
 			}else if(g_sync_flag&SYNC_INFO_PUSH_FLAG){
 				DEBUG_PRINT("[SYNC INFO PUSH].\n");
-
 				send_data  = _kk_data_create(SYNCPUSH_MSG_TYPE,s_pid,s_ccuid,"*");
-				kk_handle_sync_push_info();
 				g_sync_flag&=~SYNC_INFO_PUSH_FLAG;
 			}else{
 				g_sync_flag = 0;

application/klansdk/kk_lan_sync.c

@@ -168,32 +168,34 @@ int kk_sync_actions(cJSON *actions,SYN_SCENE_ACTION **act)
 	int i,num = cJSON_GetArraySize(actions);
 	int node = -1;
 	int get_flag = 0;
-
 	*act = (SYN_SCENE_ACTION *)malloc(sizeof(SYN_SCENE_ACTION)*num);
 	memset(*act,0,sizeof(SYN_SCENE_ACTION)*num);
-
 	SYN_SCENE_ACTION *ptr=*act;
-
 	for(i=0;i<num;i++,ptr++){
 
-
 		cJSON *item;
 		item = cJSON_GetArrayItem(actions,i);
-	
 		deviceCode = cJSON_GetObjectItem(item,"deviceCode");
+		if(deviceCode == NULL){
+			continue;
+		}		
 		delay = cJSON_GetObjectItem(item,"delay");
+		if(delay == NULL){
+			continue;
+		}
 		epNum = cJSON_GetObjectItem(item,"epNum");
+		if(epNum == NULL){
+			continue;
+		}		
 		propertyName= cJSON_GetObjectItem(item,"propertyName");
 		type= cJSON_GetObjectItem(item,"type");
 		propertyValue= cJSON_GetObjectItem(item,"propertyValue");
 
-
 		ptr->ui_area = NULL;
 		ptr->ui_name = NULL;
 		ptr->ui_room_id = NULL;
 		ptr->delay = delay->valuestring;
 		ptr->nodeid = kk_lan_db_node_get(deviceCode->valuestring,epNum->valueint);
-
 		ptr->operate_type ="*";//type->valuestring;//根据实际设备调整
 		ptr->operation = "*";//propertyValue->valuestring;//
 	}

application/klansdk/kk_oldccu_msg.c

@@ -460,6 +460,7 @@ void kk_lan_add_scene_notify(const char* scene_id)
 	debug_log(LOG_CRIT_LEVEL,"[notify] add scene(%s).\n",scene_id);
 
 	kk_handle_sync_push_info();
+	kk_handle_sync_info();
 }
 
 //删除场景通知
@@ -472,6 +473,7 @@ void kk_lan_delete_scene_notify(const char* scene_id)
 	cJSON_Delete(msg);
 	
 	kk_handle_sync_push_info();
+	kk_handle_sync_info();
 }
 
 //布防撤防状态通知(0-离家布防、1-撤防、2-在家布防、3-区域布防) 
@@ -546,6 +548,7 @@ static int _kk_lan_delete_device(const char *deviceCode)
 	
 	if(num){
 		kk_handle_sync_push_info();
+		kk_handle_sync_info();
 	}	
 	return 0;
 }
@@ -573,10 +576,4 @@ int kk_lan_device_delete_notify(cJSON *payload)
 	return 0;
 }
 
-void device_add_sync(cJSON *payload)
-{
-	//NEW_DEVICES
-	printf("[%s][%d]\n",__FUNCTION__,__LINE__);
-	kk_handle_sync_push_info();
-}