Merge branch 'cwc' into 'master'

【修改内容】1，修改语音面板版本号获取

See merge request chenweican/k-sdk!156

application/kcloud/kcloud_config.h

@@ -13,13 +13,14 @@
 #define AUTO_CONN   1
 #define CONNECT_TIMEOUT   3
 #define IPSTR "172.25.240.194"
-#define PORT 8092
+#define PORT 8092//10040//8092
 
 typedef enum {
 	RETURN_FAIL = -1,
 	RETURN_SUCCESS = 0,
 } kk_kcloud_error_code_t;
-#define  HOST_NAME       "dev.nj-ikonke.site"
+#define  MQTT_AUTH_HOST_NAME       "test.dev.nj-ikonke.site"
+
 int KK_Get_ccuid( char *device_code);
 #endif
 

application/kcloud/kk_register.c

@@ -339,7 +339,7 @@ int kk_start_ccu_register(void)
 	bzero(&servaddr, sizeof(servaddr));
 	servaddr.sin_family = AF_INET;
 	servaddr.sin_port = htons(PORT);
-	struct hostent *host = gethostbyname(HOST_NAME);
+	struct hostent *host = gethostbyname(MQTT_AUTH_HOST_NAME);
 	if(NULL == host)
 	{
 		INFO_PRINT("gethostbyname h_errno\n");

application/klansdk/kk_data_handle.c

@@ -374,22 +374,6 @@ int kk_data_handle(cJSON *json,int sockfd)
 			kk_zb_devs_hw_ack(sockfd,conditions);
 		}else if(strcmp(opcode->valuestring,GET_HISTORY_ALARM_LOG) == 0){
 			kk_handle_get_history_info();
-		}else if(strcmp(opcode->valuestring,"SOUND_VAL") == 0){
-			arg = cJSON_GetObjectItem(json, ARG_STRING);
-			int val = atoi(arg->valuestring);
-			if(val>100){
-				val = 100;
-			}else if(val<0){
-				val = 0;
-			}
-		}else if(strcmp(opcode->valuestring,"SOUND_SWITCH") == 0){
-			arg = cJSON_GetObjectItem(json, ARG_STRING);
-			
-			if(strcmp(arg->valuestring,"on")){
-				
-			}else if(strcmp(arg->valuestring,"off")){
-				
-			}
 		}else if(strcmp(opcode->valuestring,DEL_HISTORY_ALARM_LOG) == 0){
 			cJSON *key = cJSON_GetObjectItem(json, "arg");
 			if(key != NULL){

application/klansdk/kk_lan_voice_panel.c

@@ -246,7 +246,7 @@ void kk_vp_update_result_check(uint8_t status,uint32_t f_ver)
 		printf("[cfg ver]File Version=%08x\n",vp_mag.cfg_info.f_ver);
 	}else{
 		debug_log(LOG_EMERG_LEVEL,"-------------------->start update config file again<------------------\n");
-		kk_voice_update_config_file();
+		//kk_voice_update_config_file();
 	}
 }
 
@@ -316,7 +316,7 @@ void kk_vp_manage_init(void)
 void *kk_vp_manage_thread(void *arg)
 {
 	INFO_PRINT("[%s] start...\n",__FUNCTION__);
-	usleep(100*1000);
+
 	kk_vp_manage_init();
 
 	while (1)
@@ -337,7 +337,7 @@ static void *kk_voice_ctrl_status_thread(void *arg)
 {
 	debug_log(LOG_INFO_LEVEL,"[%s] start...\n",__FUNCTION__);
 
-
+	usleep(100*1000);
 	#define SET_8009_TIME						(60*60)
 
 

application/klansdk/kk_voice_panel_handle.c

@@ -709,6 +709,7 @@ static void kk_vp_get_8009_snapshoot_handle(pro_data_t *pro_data)
 
 		f_ver = MK_UINT32(&pro_data->arg[15]);
 			
+		kk_get_voice_version();
 		kk_vp_set_config_file_version(f_ver);
 		memset(s_voice_sw,0x0,sizeof(s_voice_sw));
 		//string version=std::to_string(pro_data->arg[1])+"."+std::to_string(pro_data->arg[2])+"."+std::to_string(pro_data->arg[3]);
@@ -1306,7 +1307,6 @@ void kk_vp_get_8009_snapshoot(void)
 	
 	debug_log(LOG_DEBUG_LEVEL,"get snapshoot\n");
 
-	kk_get_voice_version();
 	vp_send_data_build(OPCODE_8009_SNAPSHOOT,sizeof(res),res);
 }