Merge branch 'yjq' into 'master'

【20210831】修复局越网地暖控制上报问题。优化配置表解析。

See merge request chenweican/k-sdk!117

application/kcloud/kk_info_report.c

@@ -44,7 +44,7 @@ static int kk_info_get(char *str)
 	if(str == NULL){
 		return -1;
 	}
-    HAL_GetVersion(version);
+	//HAL_GetVersion(version);
 
 	KK_Get_ccuid(ccuid);
 	cJSON *root = cJSON_CreateObject();

application/kcloud/kk_register.c

@@ -32,7 +32,6 @@ int kk_execel_cmd(char * cmd,char * buf,int buf_len,int* ret_len)
 	memset(buf,0,buf_len);
 
 	FILE *fp = NULL;
-     
 	fp = popen(cmd,"r");
 	while(fgets(buf,buf_len,fp)!=NULL){
 		INFO_PRINT("%s return %s",cmd,buf);  

application/klansdk/kk_data_handle.c

@@ -114,7 +114,7 @@ void kk_handle_sync_info(void)
 		return;
 	}
 
-	debug_log(LOG_INFO,"[sync] send.\n");
+	debug_log(LOG_INFO_LEVEL,"[sync] send.\n");
 
 	kk_ipc_send(IPC_APP2MID, send_data, strlen(send_data)+1);
 	free(send_data);
@@ -354,7 +354,6 @@ int kk_data_handle(cJSON *json,int sockfd)
 	cJSON *opcode = NULL;
 	cJSON *arg = NULL;
 
-	
 	opcode = cJSON_GetObjectItem(json, OPCODE_STRING);
 	if(opcode != NULL){
 		if(strcmp(opcode->valuestring,LOGIN_OPCODE) == 0){
@@ -712,18 +711,18 @@ static int kk_lan_scene_handle(cJSON *payload,int isAdd)
 	cJSON *sceneId = NULL;
 
 	if(payload == NULL){
-		debug_log(LOG_DEBUG,"[err] payload.\n");
+		debug_log(LOG_DEBUG_LEVEL,"[err] payload.\n");
 		return -1;
 	}
 
 	if((params = cJSON_GetObjectItem(payload, MSG_PARAMS_STR))==NULL||
 		params->type!=cJSON_Object){
-		debug_log(LOG_DEBUG,"[err] params err.\n");
+		debug_log(LOG_DEBUG_LEVEL,"[err] params err.\n");
 		return -1;
 	}
 	if((sceneId = cJSON_GetObjectItem(params, MSG_SCENE_SCENEID))==NULL ||
 		sceneId->type!=cJSON_String){
-		debug_log(LOG_DEBUG,"[err] sceneId err.\n");
+		debug_log(LOG_DEBUG_LEVEL,"[err] sceneId err.\n");
 		return -1;
 	}
 
@@ -745,7 +744,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,"[midware->lan] len=%d,data=%s\n",len,str);
+	debug_log(LOG_FOCUS_LEVEL,"[midware->lan] len=%d,data=%s\n",len,str);
 
 	if((json= cJSON_Parse(str)) == NULL) {
 		return;

application/klansdk/kk_lan_ctrl.c

@@ -69,34 +69,34 @@ 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,"not find\n");
+		debug_log(LOG_FOCUS_LEVEL,"not find\n");
 		return NULL;
 	}
-	debug_log(LOG_FOCUS,"1\n");
+	debug_log(LOG_FOCUS_LEVEL,"1\n");
 	newccuItem = cJSON_GetArrayItem(devNode->newccu,pos);
 	oldccuItem = cJSON_GetArrayItem(devNode->oldccu,pos);
-	debug_log(LOG_FOCUS,"2\n");
+	debug_log(LOG_FOCUS_LEVEL,"2\n");
 
 	o_dataType = cJSON_GetObjectItem(oldccuItem,"dataType");
 	o_valueRange = cJSON_GetObjectItem(oldccuItem,"valueRange");
-	debug_log(LOG_FOCUS,"3\n");
+	debug_log(LOG_FOCUS_LEVEL,"3\n");
 	n_dataType = cJSON_GetObjectItem(newccuItem,"dataType");
 	n_valueRange = cJSON_GetObjectItem(newccuItem,"valueRange");
 	n_identifier =  cJSON_GetObjectItem(newccuItem,"identifier");
 	epNum =  cJSON_GetObjectItem(newccuItem,"channel");
-	debug_log(LOG_FOCUS,"4\n");
+	debug_log(LOG_FOCUS_LEVEL,"4\n");
 
 	if(strcmp(o_dataType->valuestring,"map")==0){
-		debug_log(LOG_FOCUS,"5\n");
+		debug_log(LOG_FOCUS_LEVEL,"5\n");
 		val = map_type_convert(o_dataType,o_valueRange,arg,n_valueRange);
 	}else{
-		debug_log(LOG_FOCUS,"6\n");
-		val = msg_convert_value(o_dataType,n_dataType,arg);
+		debug_log(LOG_FOCUS_LEVEL,"6\n");
+		val = msg_convert_value(n_dataType,o_dataType,arg);
 	}
-	debug_log(LOG_FOCUS,"7\n");
+	debug_log(LOG_FOCUS_LEVEL,"7\n");
 
 	cJSON_AddStringToObject(params,"epNum",epNum->valuestring);
-	debug_log(LOG_FOCUS,"8\n");
+	debug_log(LOG_FOCUS_LEVEL,"8\n");
 
 	if(val->type==cJSON_False){
 		cJSON_AddFalseToObject(params,n_identifier->valuestring);
@@ -111,7 +111,7 @@ cJSON * kk_control_protocol_convert(kk_map_dev_node_t *devNode,int nodeId,cJSON
 	}else if(val->type==cJSON_Array){
 		printf("......................\n");
 	}
-	debug_log(LOG_FOCUS,"9\n");
+	debug_log(LOG_FOCUS_LEVEL,"9\n");
 
 	return params;
 }

application/klansdk/kk_lan_debug.h

@@ -4,13 +4,15 @@
 #include <stdio.h>
 #include <time.h>
 
-#define LOG_NORMAL				1 //亮白色
-#define LOG_DEBUG				2 //绿色
-#define LOG_INFO				3 //蓝色
-#define LOG_FOCUS				4 //黄色
-#define LOG_WARNING				5 //蓝绿色
-#define LOG_ERROR				6 //紫色
-#define LOG_CRITICAL			7 //红色
+
+
+#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_NORMAL_ACT			"\033[0;1;37m"
 #define LOG_DEBUG_ACT			"\033[0;1;32m"
@@ -23,7 +25,7 @@
 
 
 #define syslog_en 1
-#define LOG_LEVEL		LOG_NORMAL
+#define LOG_LEVEL		LOG_NORMAL_LEVEL
 
 
 #define LOG_LEVEL_1				LOG_NORMAL_ACT
@@ -48,7 +50,7 @@
 
 #if (syslog_en)
 	#define debug_log(level,format,...)	do { \
-		if( level >= LOG_LEVEL && level <= LOG_CRITICAL) { \
+		if( level >= LOG_LEVEL && level <= LOG_CRITICAL_LEVEL) { \
 			char buff[64] = {0};\
 			time_t curTime = time(NULL); \
 			struct tm *c = gmtime(&curTime);\

application/klansdk/kk_lan_main.c

@@ -66,15 +66,55 @@ static void kk_lan_ccuid_init(void)
     }
 }
 
+int prg_run_singleton(const char *prg)
+{
+	int fd;
+	int ret;
+	char pid_file[256] = {0};
+	char pid_data[32] = {0};
+	struct flock fl;
+	
+	if(prg==NULL){
+		return -1;
+	}
+	
+	memset(pid_file,0,sizeof(pid_file));
+	snprintf(pid_file, sizeof(pid_file), "/var/run/%s.pid",prg);
+
+	fd = open(pid_file, O_CREAT|O_WRONLY|O_TRUNC, 0644);
+	if(fd<0){
+		return -1;
+	}
+	
+	fl.l_type = F_WRLCK;
+	fl.l_start = 0;
+	fl.l_whence = SEEK_SET;
+	fl.l_len = 0;
+	ret = fcntl(fd,F_SETLK,&fl);
+	
+	if(ret < 0){
+		return -1;
+	}
+	
+	memset(pid_data,0,sizeof(pid_data));
+	snprintf(pid_data, sizeof(pid_data), "%d",getpid());
+	
+	return write(fd,pid_data,strlen(pid_data));
+}
 
 
 
 int main(int argc, char* argv[])
 {
-	int rc = 0;
-	char *ppp;
+	int ret = 0;
+
 	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;
+	}
+
 	kk_lan_ccuid_init();
 
 	/*set the callback to get the device date to cloud*/
@@ -82,7 +122,7 @@ int main(int argc, char* argv[])
 	kk_findccu_handle_init();
 	kk_map_dev_init();
 	kk_login_init();
-	kk_voice_panel_init(argc,argv);
+	//kk_voice_panel_init(argc,argv);
 
 	//lan_queue_init();
 	kk_lan_db_node_init();
@@ -91,6 +131,6 @@ int main(int argc, char* argv[])
 	while(1){
 		sleep(1);
 	}
-	return rc;
+	return 0;
 }
 

application/klansdk/kk_lan_sync.c

@@ -428,7 +428,7 @@ int kk_sync_devices_to_sdk(cJSON *root,cJSON *data)
 //
 cJSON *_kk_sync_devicestatus_arg_build(kk_map_dev_node_t *node)
 {
-	int i,num = 0;
+	int i,num=0,n_num = 0,o_num = 0;
 	cJSON *newccu,*oldccu;
 	cJSON *arg = cJSON_CreateObject();
 	
@@ -445,8 +445,11 @@ cJSON *_kk_sync_devicestatus_arg_build(kk_map_dev_node_t *node)
 		return arg;
 	}
 
+	n_num = cJSON_GetArraySize(newccu);
+	o_num = cJSON_GetArraySize(oldccu);
+	
+	num = (n_num>o_num)?n_num:o_num;
 
-	num = cJSON_GetArraySize(newccu);
 	for(i=0;i<num;i++){
 		cJSON * newccuItem = cJSON_GetArrayItem(newccu,i);
 		cJSON * oldccuItem = cJSON_GetArrayItem(oldccu,i);

application/klansdk/kk_lan_voice_panel.c

@@ -315,7 +315,7 @@ void *kk_vp_manage_thread(void *arg)
 				break;
 
 			case UPDATING_8009_CONFIG_FILE_INFO:
-				debug_log(LOG_INFO,"updating...\n");
+				debug_log(LOG_INFO_LEVEL,"updating...\n");
 				sleep(1);
 				//todo :超时取消
 				break;
@@ -357,7 +357,7 @@ void kk_voice_panel_uart_dev_chose(int argc, char* argv[])
 		{NULL,     0,                      NULL, 0},
 	};
 
-	debug_log(LOG_FOCUS,"kk_voice_panel_uart_dev_chose\n");
+	debug_log(LOG_FOCUS_LEVEL,"kk_voice_panel_uart_dev_chose\n");
 	while((opt =getopt_long_only(argc,argv,string,long_options,&option_index))!= -1)
 	{
 		if(opt==0xAA5555AA){
@@ -372,7 +372,7 @@ void kk_voice_panel_uart_dev_chose(int argc, char* argv[])
 		snprintf(serialDev,sizeof(serialDev),"%s",SERIAL_NAME);
 	}
 	
-	debug_log(LOG_FOCUS,"serialDev=%s\n",serialDev);
+	debug_log(LOG_FOCUS_LEVEL,"serialDev=%s\n",serialDev);
 }
 
 int kk_voice_panel_init(int argc, char* argv[])

application/klansdk/kk_lan_vp_ctrl.c

@@ -46,16 +46,18 @@ static KK_VP_CTRL vp_ctrl_table[]={
 	{is_outlet_dev,outlet_dev_handle}
 };
 
+
 static int light_dev_pid[]={
-	3023,3024
+	3001,3002,3003,3022,3023,3024
 };
 
+
 static int curtain_dev_pid[]={
-	3067
+	3005,3006,3007,3008,3009,3010,3011,3026,3027,3067
 };
 
 static int outlet_dev_pid[]={
-	3020
+	3019,3020,3037,3038
 };
 	
 

application/klansdk/kk_voice_panel_handle.h

@@ -6,9 +6,9 @@
 #include "kk_voice_panel_cfg.h"
 
 
-#define VP_CONFIG_FILE_MD5			"voice_data.MD5"
 #define VP_CONFIG_FILE				"/etc/smarthome/voice_data.json"
-#define VP_CONFIG_FILE_TAR_GZ		"voice_data.tar.gz"
+#define VP_CONFIG_FILE_MD5			"/data/kk/voice_data.MD5"
+#define VP_CONFIG_FILE_TAR_GZ		"/data/kk/voice_data.tar.gz"
 
 
 #define OPCODE_8009_SNAPSHOOT				0x1000

opcodeMapCfg/device_3029.json

@@ -47,13 +47,6 @@
 			"channel":"1",
 			"valueRange":[],
 			"value": 22
-		},{
-			"identifier":"time_off",
-			"opcodemap":"FLOOR_HEATING_DEV_STATUS",
-			"dataType":"dummy",
-			"channel":"1",
-			"valueRange":[],
-			"value": 0
 		}
 	],
 	"oldccu":[
@@ -76,7 +69,7 @@
 		},{
 			"opcode":"SET_WORK_TEMPERATURE",
 			"identifiermap":"Temperature",
-			"dataType":"double",
+			"dataType":"string_double",
 			"channel":"1",
 			"valueRange":[],
 			"syn":"work_temperature",
@@ -84,7 +77,7 @@
 		},{
 			"opcode":"FLOOR_HEATING_SET_TIME_OFF",
 			"identifiermap":"TimingOffTime",
-			"dataType":"double",
+			"dataType":"fit",
 			"channel":"1",
 			"valueRange":[],
 			"syn":"time_off",