Merge branch 'yjq' into 'master'

添加syslog打印

See merge request chenweican/k-sdk!135

application/klansdk/kk_ccu_msg.c

@@ -329,7 +329,7 @@ cJSON * msg_convert_value(cJSON *d_type,cJSON *s_type,cJSON *value)
 
 
 	pVal = cJSON_Print(value);
-	debug_log(LOG_NORMAL_LEVEL,"[convert]type:%s->%s,val=%s.\n",s_type->valuestring,d_type->valuestring,pVal);
+	debug_log(LOG_DEBUG_LEVEL,"[convert]type:%s->%s,val=%s.\n",s_type->valuestring,d_type->valuestring,pVal);
 	free(pVal);
 	
 	
@@ -374,7 +374,7 @@ cJSON *map_type_convert(cJSON *s_dataType,cJSON *s_valueRange,cJSON *value,cJSON
 	sVrg = cJSON_Print(s_valueRange);
 	dVrg = cJSON_Print(d_valueRange);
 	pVal = cJSON_Print(value);
-	debug_log(LOG_NORMAL_LEVEL,"[convert] s_dataType:%s,val=%s\n",s_dataType->valuestring,pVal);
+	debug_log(LOG_DEBUG_LEVEL,"[convert] s_dataType:%s,val=%s\n",s_dataType->valuestring,pVal);
 	debug_log(LOG_INFO_LEVEL,"s_valueRange=%s\n",sVrg);
 	debug_log(LOG_INFO_LEVEL,"d_valueRange=%s\n",dVrg);
 	free(sVrg);
@@ -483,7 +483,7 @@ int kk_lan_add_val_to_obj(cJSON *obj,cJSON *val,const char *id)
 		return -1;
 	}
 	
-	debug_log(LOG_NORMAL_LEVEL,"[add] id(%s),type(%d).\n",id,val->type);
+	debug_log(LOG_DEBUG_LEVEL,"[add] id(%s),type(%d).\n",id,val->type);
 
 	if(val->type==cJSON_False){
 		cJSON_AddFalseToObject(obj,id);
@@ -512,7 +512,7 @@ int kk_lan_replace_val_to_obj(cJSON *obj,cJSON *val,const char *id)
 	}
 
 	pVal = cJSON_Print(val);
-	debug_log(LOG_NORMAL_LEVEL,"[replace] id=%s,type=%d,val=%s.\n",id,val->type,pVal);
+	debug_log(LOG_DEBUG_LEVEL,"[replace] id=%s,type=%d,val=%s.\n",id,val->type,pVal);
 	free(pVal);
 	
 	if(val->type==cJSON_False){

application/klansdk/kk_data_handle.c

@@ -751,7 +751,7 @@ void KK_Data_FromMid(void* str,int len)
 	cJSON *info = NULL,*payload = NULL;
 	cJSON *msgtype = NULL,*deviceCode = NULL,*productCode = NULL;
 
-	debug_log(LOG_FOCUS_LEVEL,"[midware->lan] len=%d,data=%s\n",len,(char *)str);
+	debug_log(LOG_CRIT_LEVEL,"[midware->lan] len=%d,data=%s\n",len,(char *)str);
 
 	if((json= cJSON_Parse(str)) == NULL) {
 		return;

application/klansdk/kk_data_mng.c

@@ -88,7 +88,7 @@ static kk_map_dev_node_t *kk_map_dev_node_create(const char *deviceCode,const ch
 	printf("kk_map_dev_node_create\n");
 	node = malloc(sizeof(kk_map_dev_node_t));
 	if (node == NULL) {
-		debug_log(LOG_CRITICAL_LEVEL,"[err].\n");
+		debug_log(LOG_ALERT_LEVEL,"[err].\n");
 		return NULL;
 	}
 	memset(node,0x0,sizeof(kk_map_dev_node_t));
@@ -98,7 +98,7 @@ static kk_map_dev_node_t *kk_map_dev_node_create(const char *deviceCode,const ch
 	json = cJSON_Parse(buf);
 	if(json == NULL){
 		free(buf);
-		debug_log(LOG_CRITICAL_LEVEL,"[err].\n");
+		debug_log(LOG_ALERT_LEVEL,"[err].\n");
 		return NULL;
 	}
 		
@@ -113,24 +113,24 @@ static kk_map_dev_node_t *kk_map_dev_node_create(const char *deviceCode,const ch
 
 	if(optype == NULL || optype->type!=cJSON_String ||
 		channel==NULL||channel->type!=cJSON_Number){
-		debug_log(LOG_CRITICAL_LEVEL,"[err].\n");
+		debug_log(LOG_ALERT_LEVEL,"[err].\n");
 		goto err;
 	}
 
 	if(newccu==NULL||newccu->type!=cJSON_Array||
 		oldccu==NULL||oldccu->type!=cJSON_Array){
-		debug_log(LOG_CRITICAL_LEVEL,"[err].\n");
+		debug_log(LOG_ALERT_LEVEL,"[err].\n");
 		goto err;
 	}
 		
 	if(syn_type!=NULL){
 		if(syn_type->type==cJSON_Number){
 			if(syn_opcode==NULL||syn_opcode->type!=cJSON_String){
-				debug_log(LOG_CRITICAL_LEVEL,"[err].\n");
+				debug_log(LOG_ALERT_LEVEL,"[err].\n");
 				goto err;
 			}
 		}else{
-			debug_log(LOG_CRITICAL_LEVEL,"[err].\n");
+			debug_log(LOG_ALERT_LEVEL,"[err].\n");
 			goto err;
 		}
 	}
@@ -140,7 +140,7 @@ static kk_map_dev_node_t *kk_map_dev_node_create(const char *deviceCode,const ch
 	memcpy(node->deviceCode,deviceCode,strlen(deviceCode));
 	memcpy(node->productCode,productCode,strlen(productCode));
 	node->online_status = (strcmp(onlineStatus,"1")==0)?1:0;
-	debug_log(LOG_CRITICAL_LEVEL,"[add node]node->deviceCode=%s\n",node->deviceCode);
+	debug_log(LOG_ALERT_LEVEL,"[add node]node->deviceCode=%s\n",node->deviceCode);
 
 	memcpy(node->opearteType,optype->valuestring,strlen(optype->valuestring));
 	node->channelNum = channel->valueint;
@@ -442,9 +442,7 @@ int kk_map_dev_search_by_deviceCode(const char *deviceCode, kk_map_dev_node_t **
 	//list_for_each_entry_safe
 
     list_for_each_entry(search_node, &ctx->dev_list, linked_list, kk_map_dev_node_t) {
-    	debug_log(LOG_CRITICAL_LEVEL,"search_node->deviceCode=%s,deviceCode=%s\n",search_node->deviceCode,deviceCode);
-		debug_log(LOG_CRITICAL_LEVEL,"%d,%d\n",strlen(search_node->deviceCode),strlen(deviceCode));
-				
+   	
 
 		if ( (strlen(search_node->deviceCode) == strlen(deviceCode)) &&
             (memcmp(search_node->deviceCode, deviceCode, strlen(deviceCode)) == 0)) {

application/klansdk/kk_lan_ctrl.c

@@ -117,11 +117,12 @@ cJSON * kk_control_protocol_convert(kk_map_dev_node_t *devNode,int nodeId,cJSON
 	pos = match_opcode_pos(devNode->oldccu,opcode->valuestring,channel);
 
 	if(pos==-1){
-		debug_log(LOG_FOCUS_LEVEL,"not find\n");
+		debug_log(LOG_CRIT_LEVEL,"not find\n");
 		return NULL;
 	}
 	newccuItem = cJSON_GetArrayItem(devNode->newccu,pos);
 	oldccuItem = cJSON_GetArrayItem(devNode->oldccu,pos);
+
 	o_dataType = cJSON_GetObjectItem(oldccuItem,"dataType");
 	o_valueRange = cJSON_GetObjectItem(oldccuItem,"valueRange");
 	n_dataType = cJSON_GetObjectItem(newccuItem,"dataType");
@@ -131,11 +132,14 @@ cJSON * kk_control_protocol_convert(kk_map_dev_node_t *devNode,int nodeId,cJSON
 
 	if(special_handling_for_compatibility(devNode,opcode,arg,&val)!=0){
 		if(strcmp(o_dataType->valuestring,"map")==0){
+		
 			val = map_type_convert(o_dataType,o_valueRange,arg,n_valueRange);
 		}else{
 			val = msg_convert_value(n_dataType,o_dataType,arg);
 		}
 	}
+	
+
 	cJSON_AddStringToObject(params,"epNum",epNum->valuestring);
 	debug_log(LOG_WARNING_LEVEL,"[err]val->type:%d\n",val->type);
 
@@ -152,6 +156,7 @@ cJSON * kk_control_protocol_convert(kk_map_dev_node_t *devNode,int nodeId,cJSON
 	}else if(val->type==cJSON_Array){
 		printf("......................\n");
 	}
+
 	return params;
 }
 static int kk_guard_ctrl_handle(int status)
@@ -161,11 +166,11 @@ static int kk_guard_ctrl_handle(int status)
 	cJSON *root = cJSON_CreateObject();
 	cJSON *params = cJSON_CreateObject();
 	cJSON_AddStringToObject(params,"epNum","1");
-	if(status == 0){ //���
+	if(status == 0){ //Àë¼Ò
 		cJSON_AddStringToObject(params,"ArmingState","0");
-	}else if(status == 2){ //�ڼ�
+	}else if(status == 2){ //ÔÚ¼Ò
 		cJSON_AddStringToObject(params,"ArmingState","2");
-	}else{ //����
+	}else{ //³··À
 		cJSON_AddStringToObject(params,"ArmingState","1");
 	}
 	cJSON *info = property_info_build("/thing/service/property/set",KK_CCU_PRODUCTID,ccuid);
@@ -344,8 +349,10 @@ int kk_ccu_opcode_handle(cJSON *root)
 	}
 
 	if(kk_map_dev_search_by_deviceCode(deviceCode, &dev)==0){
+		printf("[%s][%d]\n",__FUNCTION__,__LINE__);
 		kk_lan_ctrl_ack(nodeId,opcode,arg);
 		cJSON *params=kk_control_protocol_convert(dev,atoi(nodeId->valuestring),arg,opcode);
+	
 		msg=property_set(dev->productCode,dev->deviceCode,"*","*",params);
 		kk_ipc_send_json(msg);
 		debug_log(LOG_INFO_LEVEL,"MARK!\n");
@@ -356,6 +363,19 @@ int kk_ccu_opcode_handle(cJSON *root)
 	return 0;
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 char *node_string(int nodeId)
 {
 	char *node = (char *)malloc(33);

application/klansdk/kk_lan_debug.h

@@ -3,61 +3,103 @@
 
 #include <stdio.h>
 #include <time.h>
+#include <libgen.h>
 
-#define syslog_en 1
-#define LOG_LEVEL				LOG_NORMAL_LEVEL
+#define LOG_EN					1
+#define LOG_LEVEL				LOG_DEBUG_LEVEL
+static const int g_syslog		 = 1;
 
 
-#define LOG_NORMAL_LEVEL		1 //亮白色
-#define LOG_DEBUG_LEVEL			2 //绿色
-#define LOG_INFO_LEVEL			3 //蓝色
-#define LOG_FOCUS_LEVEL			4 //黄色
-#define LOG_WARNING_LEVEL		5 //蓝绿色
-#define LOG_ERROR_LEVEL			6 //紫色
-#define LOG_CRITICAL_LEVEL		7 //红色
 
+#define LOG_STRING(level)		((level == LOG_EMERG) ? "EMERG   " :            \
+								(level == LOG_ALERT) ? "ALERT   " :             \
+								(level == LOG_CRIT) ? "CRIT    " :              \
+								(level == LOG_ERR) ? "ERR     " :               \
+								(level == LOG_WARNING) ? "WARNING " :           \
+								(level == LOG_NOTICE) ? "NOTICE  " :            \
+								(level == LOG_INFO) ? "INFO    " :              \
+								(level == LOG_DEBUG) ? "DEBUG   " : "NONE    ")
 
 
 
 
+#define LOG_DEBUG_LEVEL			1 //亮白色
+#define LOG_INFO_LEVEL			2 //绿色
+#define LOG_NOTICE_LEVEL		3 //蓝色
+#define LOG_WARNING_LEVEL		4 //黄色
+#define LOG_ERROR_LEVEL			5 //蓝绿色
+#define LOG_CRIT_LEVEL			6 //紫色
+#define LOG_ALERT_LEVEL			7 //红色
+#define LOG_EMERG_LEVEL			8 //红色(下划线)
+
+#define SYSLOG_LEVEL_1			LOG_DEBUG
+#define SYSLOG_LEVEL_2			LOG_INFO
+#define SYSLOG_LEVEL_3			LOG_NOTICE
+#define SYSLOG_LEVEL_4			LOG_WARNING
+#define SYSLOG_LEVEL_5			LOG_ERR
+#define SYSLOG_LEVEL_6			LOG_CRIT
+#define SYSLOG_LEVEL_7			LOG_ALERT
+#define SYSLOG_LEVEL_8			LOG_EMERG
+
+
 #define LOG_LEVEL_(x)			LOG_LEVEL_##x
+#define LOG_LEVEL_1				LOG_DEBUG_ACT
+#define LOG_LEVEL_2				LOG_INFO_ACT
+#define LOG_LEVEL_3				LOG_NOTICE_ACT
+#define LOG_LEVEL_4				LOG_WARNING_ACT
+#define LOG_LEVEL_5				LOG_ERR_ACT
+#define LOG_LEVEL_6				LOG_CRIT_ACT
+#define LOG_LEVEL_7				LOG_ALERT_ACT
+#define LOG_LEVEL_8				LOG_EMERG_ACT
+
+
+#define SYSLOG_LEVEL_(x)		SYSLOG_LEVEL_##x
+#define SYSLOG_LEVEL_1			LOG_DEBUG
+#define SYSLOG_LEVEL_2			LOG_INFO
+#define SYSLOG_LEVEL_3			LOG_NOTICE
+#define SYSLOG_LEVEL_4			LOG_WARNING
+#define SYSLOG_LEVEL_5			LOG_ERR
+#define SYSLOG_LEVEL_6			LOG_CRIT
+#define SYSLOG_LEVEL_7			LOG_ALERT
+#define SYSLOG_LEVEL_8			LOG_EMERG
+
+
+
+
+
 
-#define LOG_LEVEL_1				LOG_NORMAL_ACT
-#define LOG_LEVEL_2				LOG_DEBUG_ACT
-#define LOG_LEVEL_3				LOG_INFO_ACT
-#define LOG_LEVEL_4				LOG_FOCUS_ACT
-#define LOG_LEVEL_5				LOG_WARNING_ACT
-#define LOG_LEVEL_6				LOG_ERROR_ACT
-#define LOG_LEVEL_7				LOG_CRITICAL_ACT
 
-#define LOG_NORMAL_ACT			"\033[0;1;37m"
-#define LOG_DEBUG_ACT			"\033[0;1;32m"
-#define LOG_INFO_ACT			"\033[0;1;34m"
-#define LOG_FOCUS_ACT			"\033[0;1;33m"
-#define LOG_WARNING_ACT			"\033[0;1;36m"
-#define LOG_ERROR_ACT			"\033[0;1;35m"
-#define LOG_CRITICAL_ACT		"\033[0;1;31m"
 
+#define LOG_DEBUG_ACT			"\033[0;1;37m"
+#define LOG_INFO_ACT			"\033[0;1;32m"
+#define LOG_NOTICE_ACT			"\033[0;1;34m"
+#define LOG_WARNING_ACT			"\033[0;1;33m"
+#define LOG_ERR_ACT				"\033[0;1;36m"
+#define LOG_CRIT_ACT			"\033[0;1;35m"
+#define LOG_ALERT_ACT			"\033[0;1;31m"
+#define LOG_EMERG_ACT			"\033[0;1;4;31m"
 
-#if (syslog_en)
+
+
+
+
+
+
+#if (LOG_EN)
 	#define debug_log(level,format,...)	do { \
-		if( level >= LOG_LEVEL && level <= LOG_CRITICAL_LEVEL) { \
-			char buff[64] = {0};\
+		if( level >= LOG_LEVEL && level <= LOG_EMERG_LEVEL) { \
+			char dateTime[64] = {0};\
 			time_t curTime = time(NULL); \
-			struct tm *c = localtime(&curTime);\
-			snprintf(buff,sizeof(buff),"%d-%d-%d %d:%d:%d",(c->tm_year+1900),(c->tm_mon+1),c->tm_mday,c->tm_hour,c->tm_min,c->tm_sec);\
-			printf("%s%s [%s:%d(%s)] "format"\033[m", LOG_LEVEL_(level),buff,__FILE__,__LINE__,__func__,##__VA_ARGS__); \
-		} \
-	}while(0)
-
-	#define _debug_log(level,format,...)	do { \
-		if( level >= LOG_LEVEL && level <= LOG_CRITICAL_LEVEL) { \
-			printf("%s"format"\033[m", LOG_LEVEL_(level),##__VA_ARGS__); \
+			struct tm *ptm = localtime(&curTime);\
+			snprintf(dateTime,sizeof(dateTime),"%d-%d-%d %d:%d:%d",(ptm->tm_year+1900),(ptm->tm_mon+1),ptm->tm_mday,ptm->tm_hour,ptm->tm_min,ptm->tm_sec);\
+			printf("%s%s %s(%d):%s::"format"\033[m", LOG_LEVEL_(level),dateTime,basename(__FILE__),__LINE__,__func__,##__VA_ARGS__); \
+			if (g_syslog!=0){ \
+				syslog(SYSLOG_LEVEL_(level),"%s %s %s(%d):%s::"format,LOG_STRING(level),dateTime,basename(__FILE__),__LINE__,__func__,##__VA_ARGS__); \
+			} \
 		} \
 	}while(0)
 #else
 	#define debug_log(level,format,...)
-	#define _debug_log(level,format,...)
 #endif
 
 

application/klansdk/kk_lan_main.c

@@ -111,14 +111,14 @@ static int g_sync_flag;
 void kk_sync_info(void)
 {
 	if(g_sync_flag&SYNC_INFO_FLAG){
-		debug_log(LOG_FOCUS_LEVEL,"[SYNC INFO] delay.\n");
+		debug_log(LOG_CRIT_LEVEL,"[SYNC INFO] delay.\n");
 	}
 	g_sync_flag|=SYNC_INFO_FLAG;
 }
 void kk_sync_info_push(void)
 {
 	if(g_sync_flag&SYNC_INFO_PUSH_FLAG){
-		debug_log(LOG_FOCUS_LEVEL,"[SYNC INFO PUSH] delay.\n");
+		debug_log(LOG_CRIT_LEVEL,"[SYNC INFO PUSH] delay.\n");
 	}
 	g_sync_flag|=SYNC_INFO_PUSH_FLAG;
 }
@@ -145,7 +145,7 @@ void kk_sync_timer_start(void)
 	timer.it_interval.tv_sec = 0;
 	timer.it_interval.tv_usec = 0;
 	if(setitimer(ITIMER_REAL, &timer, NULL)<0){
-		debug_log(LOG_CRITICAL_LEVEL,"err.\n");
+		debug_log(LOG_ALERT_LEVEL,"err.\n");
 	};
 }
 
@@ -181,7 +181,9 @@ int main(int argc, char* argv[])
 
 	
 
-	open("kk_lan",LOG_PID,LOG_USER);
+	openlog("kk_lan",LOG_CONS|LOG_PID,LOG_USER);
+
+
 
 	//if(prg_run_singleton(argv[0])<0){
 		//debug_log(LOG_CRITICAL_LEVEL,"[%s]run singleton fail!\n",argv[0]);
@@ -222,7 +224,7 @@ int main(int argc, char* argv[])
 				g_sync_flag&=~SYNC_INFO_PUSH_FLAG;
 			}else{
 				g_sync_flag = 0;
-				debug_log(LOG_CRITICAL_LEVEL,"err\n");
+				debug_log(LOG_ALERT_LEVEL,"err\n");
 			}
 
 			if(send_data != NULL){

application/klansdk/kk_lan_sync.c

@@ -853,14 +853,13 @@ static int kk_get_ac_indoor_info_by_deviceCode(cJSON *data,char *pdeviceCode,cha
 						cJSON *nameObj = cJSON_GetObjectItem(subitem,"name");
 						if(roomId!=NULL){
 							memcpy(roomId,roomIdJ->valuestring,strlen(roomIdJ->valuestring));
-							debug_log(LOG_CRITICAL_LEVEL,"roomId=%s\n",roomId);
 						}
 
 						if(name!=NULL){
 							memcpy(name,nameObj->valuestring,strlen(nameObj->valuestring));
 						}
 					
-						debug_log(LOG_CRITICAL_LEVEL,"name=%s\n",name);
+						
 						return 0;
 					}
 				
@@ -869,14 +868,14 @@ static int kk_get_ac_indoor_info_by_deviceCode(cJSON *data,char *pdeviceCode,cha
 					cJSON *nameObj = cJSON_GetObjectItem(item,"name");
 					if(roomId!=NULL){
 						memcpy(roomId,roomIdJ->valuestring,strlen(roomIdJ->valuestring));
-						debug_log(LOG_CRITICAL_LEVEL,"roomId=%s\n",roomId);
+						
 					}
 
 					if(name!=NULL){
 						memcpy(name,nameObj->valuestring,strlen(nameObj->valuestring));
 					}
 				
-					debug_log(LOG_CRITICAL_LEVEL,"name=%s\n",name);
+					
 					return 0;
 				}
 				
@@ -888,7 +887,7 @@ static int kk_get_ac_indoor_info_by_deviceCode(cJSON *data,char *pdeviceCode,cha
 		}
 		item = item->next;
 	}
-	debug_log(LOG_CRITICAL_LEVEL,"[err]\n");
+	debug_log(LOG_ALERT_LEVEL,"[err]\n");
 	return -1;
 }
 
@@ -976,6 +975,7 @@ int kk_send_indoorAir_status(cJSON *info,const char *deviceCode)
 	cJSON *WorkMode =  cJSON_GetObjectItem(info,"WorkMode");
 	cJSON_AddStringToObject(arg, "runModel", modeMap[WorkMode->valueint]);	
 	cJSON_AddItemToObject(root, "arg", arg);
+
 	send_msg_to_module(root);
 	cJSON_Delete(root);	
 	return 0;
@@ -1020,7 +1020,8 @@ cJSON *kk_sync_central_ac_to_sdk(cJSON *root,cJSON *data)
 				cJSON *indoorItem = cJSON_CreateObject();	
 
 				kk_get_ac_indoor_info_by_deviceCode(data,deviceCode->valuestring,roomId,NULL,1);
-				debug_log(LOG_CRITICAL_LEVEL,"deviceCode->valuestring=%s",deviceCode->valuestring);
+
+
 				cJSON_AddStringToObject(indoorItem, "bind_central_ac_gw_node_id",ac_gw_nodeid);
 				cJSON_AddStringToObject(indoorItem, "dev_name", "空调网关");
 				cJSON_AddStringToObject(indoorItem, "id", ac_gw_nodeid);
@@ -1048,7 +1049,8 @@ cJSON *kk_sync_central_ac_to_sdk(cJSON *root,cJSON *data)
 					memcpy(g_indoor_item[k].id,nodeid,strlen(nodeid));
 					sprintf(tmpIdx,"%d",k);
 					memcpy(g_indoor_item[k].indooruint_addr,tmpIdx,strlen(tmpIdx));
-					memcpy(g_indoor_item[k].nodeid,ac_gw_nodeid,strlen(ac_gw_nodeid));		
+					memcpy(g_indoor_item[k].nodeid,ac_gw_nodeid,strlen(ac_gw_nodeid));
+					
 					cJSON *PowerSwitch =  cJSON_GetObjectItem(infoItem,"PowerSwitch");
 					g_indoor_item[k].ac_gw_status.on = PowerSwitch->valueint == 1?true:false;
 					g_indoor_item[k].ac_gw_status.online = 1;
@@ -1099,9 +1101,9 @@ cJSON *_kk_sync_central_ac_indoorunits(int num,SYN_CENTRAL_AC_INDOOR *indoorunit
 	SYN_CENTRAL_AC_INDOOR *pIndoorunit = indoorunits;
 	
 	for(i=0;i<num;i++,pIndoorunit++) {
-		debug_log(LOG_CRITICAL_LEVEL,"mark[%d]...\n",i);
+	
 		cJSON *item =_kk_sync_central_ac_indoorunit_to_sdk(pIndoorunit);
-		debug_log(LOG_CRITICAL_LEVEL,"mark...\n");
+	
 		cJSON_AddItemToArray(central_ac_indoorunits,item);
 	}
 
@@ -1139,13 +1141,12 @@ cJSON *kk_sync_central_ac_indoorunits_to_sdk(cJSON *root,cJSON *data)
 		cJSON_AddStringToObject(status,"fanSpeed",g_indoor_item[i].ac_gw_status.speed);
 		cJSON_AddNumberToObject(status,"settingTemperature",g_indoor_item[i].ac_gw_status.settingTemperature);
 		cJSON_AddNumberToObject(status,"roomTemperature",g_indoor_item[i].ac_gw_status.roomTemperature);
-		debug_log(LOG_CRITICAL_LEVEL,"mark...\n");
 
 		pIndoorunit->indoorunit_state = status;
 	}
 	
 	central_ac_indoorunits = _kk_sync_central_ac_indoorunits(g_indoor_count,indoorunitAry);
-	debug_log(LOG_CRITICAL_LEVEL,"mark...\n");
+	debug_log(LOG_ALERT_LEVEL,"mark...\n");
 	cJSON_AddItemToObject(root, "central_ac_indoorunits", central_ac_indoorunits);	  
 
 	return root;

application/klansdk/kk_lan_voice_panel.c

@@ -368,7 +368,7 @@ void kk_voice_panel_uart_dev_chose(int argc, char* argv[])
 		{NULL,     0,                      NULL, 0},
 	};
 
-	debug_log(LOG_FOCUS_LEVEL,"kk_voice_panel_uart_dev_chose\n");
+	debug_log(LOG_CRIT_LEVEL,"kk_voice_panel_uart_dev_chose\n");
 	while((opt =getopt_long_only(argc,argv,string,long_options,&option_index))!= -1)
 	{
 		if(opt==0xAA5555AA){
@@ -383,7 +383,7 @@ void kk_voice_panel_uart_dev_chose(int argc, char* argv[])
 		snprintf(serialDev,sizeof(serialDev),"%s",SERIAL_NAME);
 	}
 	
-	debug_log(LOG_FOCUS_LEVEL,"serialDev=%s\n",serialDev);
+	debug_log(LOG_CRIT_LEVEL,"serialDev=%s\n",serialDev);
 }
 
 

application/klansdk/kk_lan_vp_ctrl.c

@@ -196,7 +196,7 @@ static cJSON *air_conditioner_dev_handle(int ep,uint8_t *arg,uint8_t arg_len)
 				return NULL;
 			}
 			uint8_t windspeed = arg[2];
-			debug_log(LOG_FOCUS_LEVEL,"[VP] set windspeed=%d\n",windspeed);
+			debug_log(LOG_CRIT_LEVEL,"[VP] set windspeed=%d\n",windspeed);
 			if(windspeed==VP_SKILLTYPE_12_WINDSPEED_LOW){
 				return windSpeed_msg_build(ep,2);
 			}else if(windspeed==VP_SKILLTYPE_12_WINDSPEED_MID){
@@ -212,7 +212,7 @@ static cJSON *air_conditioner_dev_handle(int ep,uint8_t *arg,uint8_t arg_len)
 				return NULL;
 			}
 			uint8_t mode = arg[2];
-			_debug_log(LOG_FOCUS_LEVEL,"[VP] set mode=%d\n",mode);
+			debug_log(LOG_CRIT_LEVEL,"[VP] set mode=%d\n",mode);
 			if(mode==VP_SKILLTYPE_1C_WORKMODE_COLD){
 				return workMode_msg_build(ep,1);
 			}else if(mode==VP_SKILLTYPE_1C_WORKMODE_HEATING){
@@ -232,7 +232,7 @@ static cJSON *air_conditioner_dev_handle(int ep,uint8_t *arg,uint8_t arg_len)
 				return NULL;
 			}
 			uint8_t tmp = arg[2];
-			_debug_log(LOG_FOCUS_LEVEL,"[VP] set tmp=%d\n",tmp);
+			debug_log(LOG_CRIT_LEVEL,"[VP] set tmp=%d\n",tmp);
 			return temperature_msg_build(ep,tmp);	
 
 		default:break;
@@ -277,7 +277,7 @@ static cJSON *curtain_dev_msg_build(int ep,int OperationMode)
 static cJSON *curtain_dev_handle(int ep,uint8_t *arg,uint8_t arg_len)
 {
 	uint8_t skill_type = arg[0];
-	debug_log(LOG_FOCUS_LEVEL,"skill_type=%d,ep=%d\n",skill_type,ep);
+	debug_log(LOG_CRIT_LEVEL,"skill_type=%d,ep=%d\n",skill_type,ep);
 	switch(skill_type){
 		case VP_CTRL_OPEN://
 			return curtain_dev_msg_build(ep,1);
@@ -300,7 +300,7 @@ static cJSON *outlet_msg_build(int ep,int onoff)
 static cJSON *outlet_dev_handle(int ep,uint8_t *arg,uint8_t arg_len)
 {
 	uint8_t skill_type = arg[0];
-	debug_log(LOG_FOCUS_LEVEL,"skill_type=%d,ep=%d\n",skill_type,ep);
+	debug_log(LOG_CRIT_LEVEL,"skill_type=%d,ep=%d\n",skill_type,ep);
 	switch(skill_type){
 		case VP_CTRL_OPEN://
 			return outlet_msg_build(ep,1);
@@ -364,7 +364,7 @@ static cJSON *freshAir_dev_handle(int ep,uint8_t *arg,uint8_t arg_len)
 				return NULL;
 			}
 			uint8_t windspeed = arg[2];
-			_debug_log(LOG_FOCUS_LEVEL,"[VP] set windspeed=%d\n",windspeed);
+			debug_log(LOG_CRIT_LEVEL,"[VP] set windspeed=%d\n",windspeed);
 			if(windspeed==VP_SKILLTYPE_12_WINDSPEED_LOW){
 				return freshAir_windspeed_msg_build(ep,1);
 			}else if(windspeed==VP_SKILLTYPE_12_WINDSPEED_MID){
@@ -381,7 +381,7 @@ static cJSON *freshAir_dev_handle(int ep,uint8_t *arg,uint8_t arg_len)
 				return NULL;
 			}
 			uint8_t mode = arg[2];
-			_debug_log(LOG_FOCUS_LEVEL,"[VP] set mode=%d\n",mode);
+			debug_log(LOG_CRIT_LEVEL,"[VP] set mode=%d\n",mode);
 			if(mode==VP_SKILLTYPE_1C_WORKMODE_AUTO){
 				return freshAir_workMode_msg_build(ep,0);
 			}else if(mode==VP_SKILLTYPE_1C_WORKMODE_MANUAL){
@@ -452,7 +452,7 @@ static cJSON *fanCoilSwitch_dev_handle(int ep,uint8_t *arg,uint8_t arg_len)
 				return NULL;
 			}
 			uint8_t windspeed = arg[2];
-			debug_log(LOG_FOCUS_LEVEL,"[VP] set windspeed=%d\n",windspeed);
+			debug_log(LOG_CRIT_LEVEL,"[VP] set windspeed=%d\n",windspeed);
 			if(windspeed==VP_SKILLTYPE_12_WINDSPEED_LOW){
 				return fanCoilSwitch_windspeed_msg_build(ep,2);
 			}else if(windspeed==VP_SKILLTYPE_12_WINDSPEED_MID){
@@ -470,7 +470,7 @@ static cJSON *fanCoilSwitch_dev_handle(int ep,uint8_t *arg,uint8_t arg_len)
 				return NULL;
 			}
 			uint8_t mode = arg[2];
-			_debug_log(LOG_FOCUS_LEVEL,"[VP] set mode=%d\n",mode);
+			debug_log(LOG_CRIT_LEVEL,"[VP] set mode=%d\n",mode);
 			if(mode==VP_SKILLTYPE_1C_WORKMODE_COLD){
 				return freshAir_workMode_msg_build(ep,1);
 			}else if(mode==VP_SKILLTYPE_1C_WORKMODE_HEATING){
@@ -488,7 +488,7 @@ static cJSON *fanCoilSwitch_dev_handle(int ep,uint8_t *arg,uint8_t arg_len)
 				return NULL;
 			}
 			uint8_t tmp = arg[2];
-			_debug_log(LOG_FOCUS_LEVEL,"[VP] set tmp=%d\n",tmp);
+			debug_log(LOG_CRIT_LEVEL,"[VP] set tmp=%d\n",tmp);
 			return fanCoilSwitch_Temperature_msg_build(ep,tmp);	
 
 		default:break;
@@ -511,7 +511,7 @@ static cJSON *underfloor_heating_dev_handle(int ep,uint8_t *arg,uint8_t arg_len)
 				return NULL;
 			}
 			uint8_t mode = arg[2];
-			_debug_log(LOG_FOCUS_LEVEL,"[VP] set mode=%d\n",mode);
+			debug_log(LOG_CRIT_LEVEL,"[VP] set mode=%d\n",mode);
 			if(mode==VP_SKILLTYPE_1C_WORKMODE_AUTO){
 				return workMode_msg_build(ep,0);
 			}else if(mode==VP_SKILLTYPE_1C_WORKMODE_MANUAL){
@@ -525,7 +525,7 @@ static cJSON *underfloor_heating_dev_handle(int ep,uint8_t *arg,uint8_t arg_len)
 				return NULL;
 			}
 			uint8_t tmp = arg[2];
-			_debug_log(LOG_FOCUS_LEVEL,"[VP] set tmp=%d\n",tmp);
+			debug_log(LOG_CRIT_LEVEL,"[VP] set tmp=%d\n",tmp);
 			return temperature_msg_build(ep,tmp);	
 
 		default:break;
@@ -548,7 +548,7 @@ static cJSON *dimming_light_dev_handle(int ep,uint8_t *arg,uint8_t arg_len)
 				return NULL;
 			}
 			uint8_t mode = arg[2];
-			_debug_log(LOG_FOCUS_LEVEL,"[VP] set mode=%d\n",mode);
+			debug_log(LOG_CRIT_LEVEL,"[VP] set mode=%d\n",mode);
 			if(mode==VP_SKILLTYPE_1C_WORKMODE_AUTO){
 				return workMode_msg_build(ep,0);
 			}else if(mode==VP_SKILLTYPE_1C_WORKMODE_MANUAL){
@@ -613,11 +613,11 @@ int kk_lan_vp_control(uint8_t num,uint32_t nodeIdAry[],uint8_t *arg,uint8_t arg_
 		params = NULL;
 
 		if(is_ac_gw_pid(pid)!=0){
-			debug_log(LOG_FOCUS_LEVEL,"air conditioner,pid=%d\n",pid);
+			debug_log(LOG_CRIT_LEVEL,"air conditioner,pid=%d\n",pid);
 			params = air_conditioner_dev_handle(ep,arg,arg_len);
 		}else{
 			if((func = dev_pid_dispatch(pid))!=NULL){
-				debug_log(LOG_FOCUS_LEVEL,"skill_type=%02x,ep=%d\n",skill_type,ep);
+				debug_log(LOG_CRIT_LEVEL,"skill_type=%02x,ep=%d\n",skill_type,ep);
 				params = func(ep,arg,arg_len);
 			}
 		}

application/klansdk/kk_newccu_msg.c

@@ -144,7 +144,7 @@ int kk_ipc_send_json(cJSON *root)
 	}
 	
 	msg=cJSON_Print(root);
-	debug_log(LOG_NORMAL_LEVEL,"[lan->midware]json:\n%s\n",msg);
+	debug_log(LOG_DEBUG_LEVEL,"[lan->midware]json:\n%s\n",msg);
 	cJSON_Minify(msg);
 	
 	pthread_mutex_lock(mutex);

application/klansdk/kk_oldccu_msg.c

@@ -130,15 +130,15 @@ static int _kk_lan_update_device_status(int nodeId,cJSON *opcode,cJSON *arg,cons
 	memset(valBuff,0,sizeof(valBuff));
 
 	if(arg->type==cJSON_String){
-		debug_log(LOG_FOCUS_LEVEL,"nodeId=%d,opcode=%s,arg=%s\n",nodeId,opcode->valuestring,arg->valuestring);
+		debug_log(LOG_CRIT_LEVEL,"nodeId=%d,opcode=%s,arg=%s\n",nodeId,opcode->valuestring,arg->valuestring);
 		snprintf(valBuff,sizeof(valBuff),"%s",arg->valuestring);
 	}else if(arg->type==cJSON_Number){
 
 		if(((int)(arg->valuedouble*10))%10==0){
-			debug_log(LOG_FOCUS_LEVEL,"nodeId=%d,opcode=%s,arg=%d\n",nodeId,opcode->valuestring,arg->valueint);
+			debug_log(LOG_CRIT_LEVEL,"nodeId=%d,opcode=%s,arg=%d\n",nodeId,opcode->valuestring,arg->valueint);
 			snprintf(valBuff,sizeof(valBuff),"%d",arg->valueint);
 		}else{
-			debug_log(LOG_FOCUS_LEVEL,"nodeId=%d,opcode=%s,arg=%f\n",nodeId,opcode->valuestring,arg->valuedouble);
+			debug_log(LOG_CRIT_LEVEL,"nodeId=%d,opcode=%s,arg=%f\n",nodeId,opcode->valuestring,arg->valuedouble);
 			snprintf(valBuff,sizeof(valBuff),"%f",arg->valuedouble);
 		}
 	}else if(arg->type==cJSON_True){
@@ -221,7 +221,7 @@ static int _kk_lan_sync_device_status(const char *deviceCode,kk_map_dev_node_t *
 			return -1;
 		} 
 	}
-	debug_log(LOG_FOCUS_LEVEL,"[sync] device status.\n");
+	debug_log(LOG_CRIT_LEVEL,"[sync] device status.\n");
 
 	memset(nodeBuff,0,sizeof(nodeBuff));
 	snprintf(nodeBuff,sizeof(nodeBuff),"%d",nodeId);
@@ -319,12 +319,12 @@ static int kk_lan_property_convert(const char *deviceCode,kk_map_dev_node_t *dev
 
 				epAryEpNumObj = cJSON_GetObjectItem(epAryItem,"epNum");
 				if(epAryEpNumObj==NULL||epAryEpNumObj->type!=cJSON_String ||channel!=atoi(epAryEpNumObj->valuestring)){
-					debug_log(LOG_NORMAL_LEVEL,"[epsAry match] next.\n");
+					debug_log(LOG_DEBUG_LEVEL,"[epsAry match] next.\n");
 					continue ;
 				}
 	
 				if((valObj=cJSON_GetObjectItem(epAryItem,n_id->valuestring))==NULL){
-					debug_log(LOG_NORMAL_LEVEL,"[epsAry match] next.\n");
+					debug_log(LOG_DEBUG_LEVEL,"[epsAry match] next.\n");
 					continue ;
 				}else{
 					mFlag = 1;
@@ -336,7 +336,7 @@ static int kk_lan_property_convert(const char *deviceCode,kk_map_dev_node_t *dev
 			}
 		}else{
 			if((valObj=cJSON_GetObjectItem(params,n_id->valuestring))==NULL){
-				debug_log(LOG_NORMAL_LEVEL,"[match] next.\n");
+				debug_log(LOG_DEBUG_LEVEL,"[match] next.\n");
 				continue ;
 			}
 		}
@@ -403,17 +403,14 @@ int kk_lan_property_post_deal(const char *deviceCode,cJSON *payload)
 	cJSON *params = NULL;
 	kk_map_dev_node_t *dev = NULL;
 
-	debug_log(LOG_FOCUS_LEVEL,"[property post] deviceCode(%s).\n",deviceCode);
+	debug_log(LOG_CRIT_LEVEL,"[property post] deviceCode(%s).\n",deviceCode);
 		
 	if(kk_map_dev_search_by_deviceCode(deviceCode, &dev)==0){
 		params = cJSON_GetObjectItem(payload,"params");
 
 		if(strcmp(dev->productCode,"3062") == 0){
-			debug_log(LOG_CRITICAL_LEVEL,"mark\n");
 			attr_indoorAir_report(params,deviceCode);
-			debug_log(LOG_CRITICAL_LEVEL,"mark\n");
 		}else{
-			debug_log(LOG_CRITICAL_LEVEL,"mark\n");
 			return kk_lan_property_convert(deviceCode,dev,params);
 		}
 	}else{
@@ -429,7 +426,7 @@ int kk_lan_property_syn_deal(const char *deviceCode,cJSON *properties)
 	cJSON *params = NULL;
 	kk_map_dev_node_t *dev = NULL;
 	
-	debug_log(LOG_FOCUS_LEVEL,"[property syn] deviceCode(%s).\n",deviceCode);
+	debug_log(LOG_CRIT_LEVEL,"[property syn] deviceCode(%s).\n",deviceCode);
 
 	if(kk_map_dev_search_by_deviceCode(deviceCode, &dev)==0){
 		return kk_lan_property_convert(deviceCode,dev,properties);
@@ -443,7 +440,7 @@ int kk_lan_property_syn_deal(const char *deviceCode,cJSON *properties)
 //添加场景通知
 void kk_lan_add_scene_notify(const char* scene_id)
 {
-	debug_log(LOG_FOCUS_LEVEL,"[notify] add scene(%s).\n",scene_id);
+	debug_log(LOG_CRIT_LEVEL,"[notify] add scene(%s).\n",scene_id);
 
 	kk_handle_sync_push_info();
 }
@@ -451,7 +448,7 @@ void kk_lan_add_scene_notify(const char* scene_id)
 //删除场景通知
 void kk_lan_delete_scene_notify(const char* scene_id)
 {
-	debug_log(LOG_FOCUS_LEVEL,"[notify] delete scene(%s).\n",scene_id);
+	debug_log(LOG_CRIT_LEVEL,"[notify] delete scene(%s).\n",scene_id);
 
 	cJSON *msg = old_ccu_msg_build(scene_id,"DELETE_SCENE",SUCCESS_STR,WILDCARD_CHARACTER_STR);
 	send_msg_to_module(msg);
@@ -465,7 +462,7 @@ int kk_lan_arming_status_notify(int type)
 {
 	cJSON *msg = NULL;
 	
-	debug_log(LOG_FOCUS_LEVEL,"[notify] arming status(%d).\n",type);
+	debug_log(LOG_CRIT_LEVEL,"[notify] arming status(%d).\n",type);
 
 	if(type==0){
 		msg = old_ccu_msg_build(WILDCARD_CHARACTER_STR,GUARD_STATUS_ARMING_LEAVE_HOME,SUCCESS_STR,WILDCARD_CHARACTER_STR);
@@ -498,7 +495,7 @@ static int _kk_lan_delete_node(const char *deviceCode,const char *nodeid)
 		return -1;
 	}
 
-	debug_log(LOG_FOCUS_LEVEL,"[del dev node] id(%s).\n",nodeid);
+	debug_log(LOG_CRIT_LEVEL,"[del dev node] id(%s).\n",nodeid);
 	
 	arg = cJSON_CreateObject();
 	_deviceCode_switchto_mac(deviceCode,mac);
@@ -519,7 +516,7 @@ static int _kk_lan_delete_device(const char *deviceCode)
 
 	num = kk_lan_db_node_get_all(deviceCode,list);
 
-	debug_log(LOG_FOCUS_LEVEL,"[del dev] deviceCode(%s)/node num(%d).\n",deviceCode,num);
+	debug_log(LOG_CRIT_LEVEL,"[del dev] deviceCode(%s)/node num(%d).\n",deviceCode,num);
 	
 	for(i=0;i<num;i++){
 		memset(nodeId,0,sizeof(nodeId));

application/klansdk/kk_voice_panel_cfg.c

@@ -313,7 +313,6 @@ static int kk_vp_get_device_info(_IN cJSON *rooms,_IN VP_ZB_DEV_ITEM *pDevs,_IN
 		}
 		
 		if(isFind!=0){
-			debug_log(LOG_CRITICAL_LEVEL,"roomId->valuestring=%s\n",roomId->valuestring);
 			snprintf(pDevs->room,sizeof(pDevs->room),"%s",roomId->valuestring);
 			//printf("[%s][%d]\n",__FUNCTION__,__LINE__);
 			return isFind;
@@ -391,15 +390,14 @@ static int kk_vp_sync_device_multi_eps(_IN cJSON *zbDevsAry,_IN cJSON *dev,_IN c
 
 
 		if(kk_map_dev_search_by_deviceCode(pDevs->mac,&node) == 0){
-			debug_log(LOG_CRITICAL_LEVEL,"--->mark\n");
 
 			snprintf(pDevs->operateType,sizeof(pDevs->operateType)-1,"%s",node->opearteType);
 		}else{
-			debug_log(LOG_CRITICAL_LEVEL,"--->mark\n");
+
 			if(is_ac_gw_pid(atoi(pDevs->pid))!=0){
 				snprintf(pDevs->operateType,sizeof(pDevs->operateType)-1,"%s","12008");
 			}else{
-				debug_log(LOG_CRITICAL_LEVEL,"--->mark\n");
+
 				snprintf(pDevs->operateType,sizeof(pDevs->operateType)-1,"%s","1");
 			}
 		}
@@ -466,15 +464,14 @@ static int kk_vp_sync_device_single_ep(_IN cJSON *zbDevsAry,_IN cJSON *dev,_IN c
 	
 	snprintf(pDevs->nodeId,sizeof(pDevs->nodeId)-1,"%d",nodeId);
 
-	debug_log(LOG_CRITICAL_LEVEL,"pDevs->mac=%s--->mark\n",pDevs->mac);
+
 	if(kk_map_dev_search_by_deviceCode(pDevs->mac,&node) == 0){
 		snprintf(pDevs->operateType,sizeof(pDevs->operateType)-1,"%s",node->opearteType);
 	}else{
 		if(is_ac_gw_pid(atoi(pDevs->pid))!=0){
-			debug_log(LOG_CRITICAL_LEVEL,"--->mark\n");
+
 			snprintf(pDevs->operateType,sizeof(pDevs->operateType)-1,"%s","12008");
 		}else{
-			debug_log(LOG_CRITICAL_LEVEL,"--->mark\n");
 			snprintf(pDevs->operateType,sizeof(pDevs->operateType)-1,"%s","1");
 		}
 	}
@@ -656,7 +653,6 @@ static _OUT cJSON *kk_vp_sync_device(_IN cJSON *data)
 					printf("[prase fail]roomsAry...\n");
 					continue ;
 				}
-				debug_log(LOG_CRITICAL_LEVEL,"~~~~~~~~~~~~~~~~~~~\n");
 				kk_vp_sync_device_single_ep(zbDevsAry,dev,roomsAry);
 			}else{
 				if((properties = cJSON_GetObjectItem(dev,"properties"))==NULL||
@@ -1220,11 +1216,9 @@ _OUT int kk_vp_syncinfo(_IN cJSON *payload,_IN int ver,_OUT cJSON **root)
 		return -1;
 	}
 
-	debug_log(LOG_CRITICAL_LEVEL,"mark\n");
 	pthread_mutex_lock(mutex);
 	ac_gw_table_init();
 	pthread_mutex_unlock(mutex);
-	debug_log(LOG_CRITICAL_LEVEL,"mark\n");
 
 	
 

application/klansdk/uart_proto.c

@@ -464,11 +464,11 @@ void dev_send_uart(uint8_t *data, uint16_t data_len)
 
 static void uart_protocol_print(pro_data_t *pro_data)
 {
-	_debug_log(LOG_DEBUG_LEVEL,"\n[VP->LAN]\n");
-	_debug_log(LOG_DEBUG_LEVEL,"seq:\t\t%02X\n", pro_data->seq);
-    _debug_log(LOG_DEBUG_LEVEL,"channel:\t%02X\n", pro_data->ch);
-    _debug_log(LOG_DEBUG_LEVEL,"opcode:\t\t%04X\n", pro_data->opcode);
-    _debug_log(LOG_DEBUG_LEVEL,"args_len:\t%d\n", pro_data->args_len);
+	debug_log(LOG_DEBUG_LEVEL,"\n[VP->LAN]\n");
+	debug_log(LOG_DEBUG_LEVEL,"seq:\t\t%02X\n", pro_data->seq);
+    debug_log(LOG_DEBUG_LEVEL,"channel:\t%02X\n", pro_data->ch);
+    debug_log(LOG_DEBUG_LEVEL,"opcode:\t\t%04X\n", pro_data->opcode);
+    debug_log(LOG_DEBUG_LEVEL,"args_len:\t%d\n", pro_data->args_len);
 
     char print_buf[512] = {0};
     int i = 0;
@@ -480,7 +480,7 @@ static void uart_protocol_print(pro_data_t *pro_data)
         snprintf(print_buf + strlen(print_buf), sizeof(print_buf), "%02X ", pro_data->arg[i]);
     }
 
-    _debug_log(LOG_DEBUG_LEVEL,"%s\n\n", print_buf);
+    debug_log(LOG_DEBUG_LEVEL,"%s\n\n", print_buf);
 }