Merge branch 'cwc' into 'master'

【修改内容】1，调整打印，增加超长字串打印丢失的问题；2，修改添加场景返回场景ID方式

See merge request chenweican/k-sdk!73

common/api/kk_log.h

@@ -3,19 +3,19 @@
 #include <syslog.h>
 
 #define DEBUG_PRINT(info,args...)  do { \
-					syslog(LOG_DEBUG, info, ##args); \
+					syslog(LOG_DEBUG, "[%s][%d]"info,__FUNCTION__,__LINE__ ,##args); \
 					printf("\n["__FILE__":%d] "info,__LINE__, ##args); \
  				}while(0)
 #define INFO_PRINT(info,args...)   do { \
-					syslog(LOG_INFO, info, ##args); \
+					syslog(LOG_INFO, "[%s][%d]"info,__FUNCTION__,__LINE__ , ##args); \
 					printf("\n["__FILE__":%d] "info,__LINE__, ##args); \
 				}while(0)
 #define ERROR_PRINT(info,args...)  do { \
-					syslog(LOG_ERR, info, ##args); \
+					syslog(LOG_ERR, "[%s][%d]"info,__FUNCTION__,__LINE__ , ##args); \
 					printf("\n["__FILE__":%d] "info,__LINE__, ##args); \
 				}while(0)
 #define WARNING_PRINT(info,args...) do { \
-					syslog(LOG_WARNING, info, ##args); \
+					syslog(LOG_WARNING, "[%s][%d]"info,__FUNCTION__,__LINE__ , ##args); \
 					printf("\n["__FILE__":%d] "info,__LINE__, ##args); \
 				}while(0)
 

midware/midware/dm/kk_linkkit.c

@@ -633,15 +633,8 @@ static int kk_service_addScene_handle(cJSON *param,cJSON *msgId)
 	if(param == NULL || msgId == NULL){
 		return INVALID_PARAMETER;
 	}
+	res = kk_scene_parse_addscene(param,sceneId,0,msgId->valuestring);
 
-	res = kk_scene_parse_addscene(param,sceneId,0);
-	if(res == SUCCESS_RETURN){
-		pSceneShadow = kk_scene_shadow();
-		if(pSceneShadow != NULL){
-			kk_tsl_set_value(kk_tsl_set_event_output_value,pSceneShadow,MSG_SCENE_ADDNOTIFICATION_SCENEID,NULL,sceneId);
-			dm_msg_scene_event_post(MSG_SCENE_ADDNOTIFICATION,pSceneShadow,msgId->valuestring);		
-		}
-	}
 	return res;
 }
 static int kk_service_updateScene_handle(cJSON *param,cJSON *msgId)
@@ -653,15 +646,12 @@ static int kk_service_updateScene_handle(cJSON *param,cJSON *msgId)
 	}	
 	cJSON *sceneId = cJSON_GetObjectItem(param,MSG_SCENE_SCENEID);
 	if(sceneId == NULL) return FAIL_RETURN;		
-	res = kk_scene_parse_updatescene(param,sceneId->valuestring);
-	if(res == SUCCESS_RETURN){
-		pSceneShadow = kk_scene_shadow();
-		if(pSceneShadow != NULL){
-			kk_tsl_set_value(kk_tsl_set_event_output_value,pSceneShadow,MSG_SCENE_UPDATENOTIFICATION_SCENEID,NULL,sceneId->valuestring);
-			dm_msg_scene_event_post(MSG_SCENE_UPDATENOTIFICATION,pSceneShadow,msgId->valuestring);		
-		}
+	pSceneShadow = kk_scene_shadow();
+	if(pSceneShadow != NULL){
+		kk_tsl_set_value(kk_tsl_set_event_output_value,pSceneShadow,MSG_SCENE_UPDATENOTIFICATION_SCENEID,NULL,sceneId->valuestring);
+		dm_msg_scene_event_post(MSG_SCENE_UPDATENOTIFICATION,pSceneShadow,msgId->valuestring);		
 	}
-
+	res = kk_scene_parse_updatescene(param,sceneId->valuestring);
 	return res;
 }
 

midware/midware/midware.c

@@ -76,7 +76,36 @@ static int _kk_filter_to_plat(const char* msgtype)
 	}
 	return 0;
 }
-
+#define KK_PRINTF_PER_LEN 1000
+void kk_print_long_data(char *data,int len)
+{
+	int lenTemp = len;
+	int count = 0;
+	char *pTmp = NULL;
+	pTmp = malloc(KK_PRINTF_PER_LEN+1);
+	if(pTmp == NULL){
+		return;
+	}	
+	while(1)
+	{
+		memset(pTmp,0x0,KK_PRINTF_PER_LEN+1);
+		if(lenTemp > KK_PRINTF_PER_LEN)
+		{
+			memcpy(pTmp,data + count,KK_PRINTF_PER_LEN);
+			INFO_PRINT("%s \n",pTmp);
+			lenTemp -= KK_PRINTF_PER_LEN;
+			count += KK_PRINTF_PER_LEN;
+		}else{
+			memcpy(pTmp,data + count,lenTemp);
+			INFO_PRINT("%s \n",pTmp);
+			break;
+		}
+	}
+	if(pTmp){
+		free(pTmp);
+		pTmp = NULL;
+	}
+}
 /************************************************************
 *功能描述：向网关发送信息
 *输入参数：data：消息内容
@@ -94,14 +123,14 @@ void kk_sendData2gw(void* data, int len, char* chalMark){
     }
 	cJSON_Minify((char*)data);
 	newLen = strlen(data);
-	INFO_PRINT("start to send data to gw:%s!!!\n",data);
-
     if (kk_is_tcp_channel(chalMark) > -1){
         kk_tcp_channel_ser_send(data, newLen, chalMark);
     }else{
         kk_ipc_send_ex(IPC_MID2PLAT, data, newLen + 1, chalMark);
     }
-         
+    INFO_PRINT("start to send data to gw srart\n");     
+	kk_print_long_data(data,newLen);
+	INFO_PRINT("start to send data to gw end\n");  
 }
 
 /************************************************************

midware/midware/scene/kk_scene_handle.c

@@ -195,7 +195,7 @@ void *kk_scene_yield(void *args)
 		/****系统起来15s后开始定时处理****/
 		if((HAL_Uptimes() - s_start_time) <= 15){
 			sleep(1);
-			INFO_PRINT("[%s][%d] HAL_Uptimes:%ld\n",__FUNCTION__,__LINE__,HAL_Uptimes());
+			INFO_PRINT("HAL_Uptimes:%ld\n",HAL_Uptimes());
 			continue;
 		}
 		
@@ -953,12 +953,13 @@ int kk_scene_parse_scene_muticontrol(const cJSON* str,const char *sceneId,int is
 *输入参数：sceneId：对应场景Id;
 		  args：场景的CJSON字串
 		  isUpdate：1，updateScene；0，addScene
+		  msgId:消息Id
 *输出参数：无
 *返 回 值：  0：成功；其他：失败
 *其他说明：
 *************************************************************/
 
-int kk_scene_parse_addscene(const cJSON* args,char *sceneId,int isUpdate)
+int kk_scene_parse_addscene(const cJSON* args,char *sceneId,int isUpdate,const char *msgId)
 {
 	int res = 0;
 
@@ -973,7 +974,13 @@ int kk_scene_parse_addscene(const cJSON* args,char *sceneId,int isUpdate)
 	cJSON *enable = cJSON_GetObjectItem(args,MSG_SCENE_ENABLE);
 	if(enable == NULL) return FAIL_RETURN;	
 	if(!isUpdate){
+		kk_tsl_t *pSceneShadow = NULL;
 		HAL_GetTime_s(sceneId);//use time to create the sceneId
+		pSceneShadow = kk_scene_shadow();
+		if(pSceneShadow != NULL){
+			kk_tsl_set_value(kk_tsl_set_event_output_value,pSceneShadow,MSG_SCENE_ADDNOTIFICATION_SCENEID,NULL,sceneId);
+			dm_msg_scene_event_post(MSG_SCENE_ADDNOTIFICATION,pSceneShadow,msgId);		
+		}		
 	}
 	/*多控直接下发给网关处理*/
 	if(enable->valueint == 1 && sceneType->valueint ==  DB_SCENETYPE_MUTICONTROL){
@@ -1025,7 +1032,7 @@ int kk_scene_parse_updatescene(const cJSON* arg,char *sceneId)
 		return INVALID_PARAMETER;
 	}
 	kk_scene_delete(sceneId,0);
-	return kk_scene_parse_addscene(arg,sceneId,1);
+	return kk_scene_parse_addscene(arg,sceneId,1,NULL);
 }
 
 /************************************************************