【修改内容】修改区域相关

【提交人】陈伟灿

application/kcloud/iot.mk

@@ -8,6 +8,7 @@ CFLAGS 			+= -I$(TOP_DIR)/common/api
 CFLAGS 			+= -I$(TOP_DIR)/common/json
 CFLAGS 			+= -I$(TOP_DIR)/common/nanomsg/include
 CFLAGS 			+= -I$(TOP_DIR)/common/ev/include
+CFLAGS 			+= -I$(TOP_DIR)/common/curl/include
 LDFLAGS         += -lkk_tsl 
 LDFLAGS         += -lapi_com
 ifeq ($(CONFIG_MODEL),x86)
@@ -19,6 +20,10 @@ else ifeq ($(CONFIG_MODEL),nx5)
 else ifeq ($(CONFIG_MODEL),8197)
 	LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -lnanomsg_8197 -lubacktrace
 	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev_8197  	
+else ifeq ($(CONFIG_MODEL),a133)
+	LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -lnanomsg_a133 
+	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev_a133	
+	LDFLAGS         += -L$(TOP_DIR)/common/curl  -lcurl_a133
 else
 	LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -lnanomsg
 	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev	

application/kcloud/kcloud_config.h

@@ -24,5 +24,6 @@ typedef enum {
 int KK_Get_ccuid( char *device_code);
 int kk_check_config_file(char* path,char **config);
 int kk_cloud_get_pid(char *productId);
+int kk_cloud_get_key(char *key);
 #endif
 

application/kcloud/kcloud_main.c

@@ -47,6 +47,31 @@ static int KK_Ccuid_init(void)
 	char ccuid[DEVICE_CODE_LEN] = {0};
 	char ccuidTmp[DEVICE_CODE_LEN] = {0};
 	int ccuid_len = 0;
+	#ifdef CONFIG_A133_PLATFORM 
+    uint8_t data[128] = {0};
+    int data_len = 0;
+	char *pstart = NULL;
+	char *pEnd = NULL;
+    HAL_Execel_cmd(GET_CCUID_CMD,(char *)data,sizeof(data),&data_len);
+    printf("---GET_CCUID_CMD:%s\n",data);
+    if(data_len > 0 && data_len <= 128){
+		pstart = data;
+		pEnd = strstr(data,"-");
+		if(pstart != NULL && pEnd != NULL){
+			printf("-------123---------------------\n");
+			memcpy(ccuidTmp,pstart,pEnd-pstart);
+			_setDevice_Code(ccuidTmp,pEnd-pstart);
+		}else{
+        	//_setDevice_Code(KK_CCU_ID,strlen(KK_CCU_ID));
+			INFO_PRINT("KK_Ccuid_init get ccuid error\n");
+			return -1;
+		}
+    }else{
+        //_setDevice_Code(KK_CCU_ID,strlen(KK_CCU_ID));
+		INFO_PRINT("KK_Ccuid_init get ccuid error\n");
+		return -1;
+    }	
+	#else
 	HAL_Execel_cmd(GET_CCUID_CMD,(char *)ccuid,sizeof(ccuid),&ccuid_len);
 	printf("GET_CCUID_CMD:%s\n",ccuid);
 	if(ccuid_len > 0 && ccuid_len <= DEVICE_CODE_LEN){
@@ -54,14 +79,41 @@ static int KK_Ccuid_init(void)
 		_setDevice_Code(ccuidTmp,strlen(ccuidTmp)-1);//减一是因为最后有一个换行
 	}else{
 		//_setDevice_Code(KK_CCU_ID,strlen(KK_CCU_ID));
+		INFO_PRINT("KK_Ccuid_init get ccuid error\n");
 		return -1;
 	}
+	#endif
 	return 0;
 }
 char s_pid[PRODUCT_CODE_LEN] = {0};
 static int kk_cloud_pid_init(void)
 {
-    char pid[PRODUCT_CODE_LEN] = {0};
+	
+	#ifdef CONFIG_A133_PLATFORM 
+    uint8_t data[128] = {0};
+    int data_len = 0;
+	char *pstart = NULL;
+	char *pEnd = NULL;
+    HAL_Execel_cmd(GET_CCUID_CMD,(char *)data,sizeof(data),&data_len);
+    printf("---GET_CCUID_CMD:%s\n",data);
+    if(data_len > 0 && data_len <= 128){
+		pstart = data;
+		pEnd = strstr(data,"pid_");
+		if(pstart != NULL && pEnd != NULL){
+			memcpy(s_pid,pEnd+4,data_len-1-(pEnd-pstart+4));
+			INFO_PRINT("kk_cloud_pid_init s_pid:%s\n",s_pid);
+		}else{
+        	//_setDevice_Code(KK_CCU_ID,strlen(KK_CCU_ID));
+			INFO_PRINT("KK_Ccuid_init get ccuid error\n");
+			return -1;
+		}
+    }else{
+        //_setDevice_Code(KK_CCU_ID,strlen(KK_CCU_ID));
+		INFO_PRINT("KK_Ccuid_init get ccuid error\n");
+		return -1;
+    }	
+	#else
+	char pid[PRODUCT_CODE_LEN] = {0};
     int pid_len = 0;
     HAL_Execel_cmd(GET_PRODUCTID_CMD,(char *)pid,sizeof(pid),&pid_len);
     if(pid_len > 0 && pid_len <= PRODUCT_CODE_LEN){
@@ -70,6 +122,7 @@ static int kk_cloud_pid_init(void)
     }else{
 		return -1;
     }
+	#endif
 	return 0;
 }
 int kk_cloud_get_pid(char *productId)
@@ -78,7 +131,49 @@ int kk_cloud_get_pid(char *productId)
 	printf("kk_cloud_get_pid:%s\n",s_pid);
 	return strlen(s_pid);
 }
-
+char s_key[128] = {0};
+static int kk_cloud_key_init(void)
+{
+	uint8_t key[128] = {0};
+    int key_len = 0;
+	#ifdef CONFIG_A133_PLATFORM 
+	char *pstart = NULL;
+	char *pEnd = NULL;
+    HAL_Execel_cmd(GET_CCUID_CMD,(char *)key,sizeof(key),&key_len);
+    printf("---productSecret:%s\n",key);
+    if(key_len > 0 && key_len <= 128){
+		pstart = strstr(key,"key_");;
+		pEnd = strstr(key,"-pid_");
+		if(pstart != NULL && pEnd != NULL){
+			memcpy(s_key,pstart+4,pEnd-pstart+4);
+			INFO_PRINT("kk_cloud_key_init s_key:%s\n",s_key);
+		}else{
+        	//_setDevice_Code(KK_CCU_ID,strlen(KK_CCU_ID));
+			INFO_PRINT("kk_cloud_key_init error\n");
+			return -1;
+		}
+    }else{
+        //_setDevice_Code(KK_CCU_ID,strlen(KK_CCU_ID));
+		INFO_PRINT("kk_cloud_key_init error\n");
+		return -1;
+    }	
+	#else
+    HAL_Execel_cmd(GET_KEY_CMD,(char *)key,sizeof(key),&key_len);
+    if(key_len > 0 && key_len <= 128){
+		memcpy(s_key,key,key_len-1);
+		INFO_PRINT("s_key:%s\n",s_key);
+    }else{
+		return -1;
+    }
+	#endif
+	return 0;
+}
+int kk_cloud_get_key(char *key)
+{
+	strncpy(key, s_key, strlen(s_key));
+	printf("kk_cloud_get_key:%s\n",s_key);
+	return strlen(s_key);
+}
 
 static int mqtt_start(void)
 {
@@ -176,9 +271,13 @@ int main(int argc, char* argv[])
 		return 0;
 	}
 	kk_cloud_pid_init();
+	kk_cloud_key_init();
 	kk_ipc_init(IPC_APP2MID,(ipc_cb*)KK_Data_FromDev,NULL,NULL);
 	//kk_info_report_start();
 	//
+	#ifdef CONFIG_NX5_PLATFORM	
+	//adlakdlkf
+	#endif
 #if 1	
 	kk_dl_config();
 again:

application/kcloud/kk_info_report.c

@@ -89,7 +89,7 @@ static int kk_info_get(char *str)
 				char s_IP[NETWORK_ADDR_LEN] = {0};
 				HAL_Get_IP(s_IP,NULL);
 				cJSON_AddItemToObject(args, "net", net);
-				cJSON_AddStringToObject(net, "interface", CCU_LAN);
+				cJSON_AddStringToObject(net, "interface", "eth0");
 				cJSON_AddStringToObject(net, "ip", s_IP);
 			}
 			cJSON *lsc_status = cJSON_CreateObject();

application/kcloud/kk_register.c

@@ -22,7 +22,8 @@
 #include <netinet/tcp.h>
 #include <sys/stat.h>
 #include "kk_log.h"
-#include <curl/curl.h>
+//#include <curl/curl.h>
+#include "../../common/curl/include/curl/curl.h"
 #include "MQTTAsync.h"
 #include "mqtt_api.h"
 #define BUFSIZE 1024
@@ -115,11 +116,16 @@ int kk_parse_token(char *info){
 	cJSON *jwt = cJSON_GetObjectItem(data,"jwt");
 	if(jwt == NULL) return -1;
 	fp = fopen(KK_TOKEN_PATH, "w+");
-	if(fp != NULL){
-		fwrite(jwt->valuestring,strlen(jwt->valuestring),1,fp);
+    if(fp != NULL){
+        fwrite(jwt->valuestring,strlen(jwt->valuestring),1,fp);
+		#ifdef CONFIG_A133_PLATFORM
+        fsync(fp);
+	    fclose(fp);
+		#else
 		fclose(fp);
-		system("sync");
-	}
+		system("sync;sync;sync");
+		#endif
+    }  
 	//cJSON *ccuid = cJSON_GetObjectItem(infoObj,"ccu_id");
 	//if(ccuid == NULL) return -1;	
 	//fp = fopen("/usr/kk/kk_ccuid.txt", "w+");
@@ -246,17 +252,11 @@ static char * kk_create_register_info()
 	HAL_GetTime_s(ramdonId);
 	KK_Get_ccuid(ccuid);
 	kk_cloud_get_pid(pid);
+	kk_cloud_get_key(keyTmp);
 	cJSON_AddStringToObject(root, "deviceCode", ccuid);
 	cJSON_AddStringToObject(root, "productCode",pid);
 	signSource = kk_dictionary_order(ccuid,pid,KK_CCU_RANDOM);
-	HAL_Execel_cmd(GET_KEY_CMD,(char *)productSecret,sizeof(productSecret),&productSecret_len);
-	if(productSecret_len == 0){
-		utils_hmac_sha256((const uint8_t *)signSource, strlen(signSource), (const uint8_t *)PRODUCTSECRET, strlen(PRODUCTSECRET), sign_hex);
-	}else{
-		memcpy(keyTmp,productSecret,productSecret_len-1);
-		utils_hmac_sha256((const uint8_t *)signSource, strlen(signSource), (const uint8_t *)keyTmp, strlen((const char*)keyTmp), sign_hex);
-	}
-
+	utils_hmac_sha256((const uint8_t *)signSource, strlen(signSource), (const uint8_t *)keyTmp, strlen((const char*)keyTmp), sign_hex);
 	arrayToStr(sign_hex,32,sign_hex_str);
 
 	base64Out = malloc(128);
@@ -510,10 +510,8 @@ static int _kk_auth_param_get(char *param){
 		return -1;
 	}
 	KK_Get_ccuid(ccuid);
-	HAL_Execel_cmd(GET_PRODUCTID_CMD,(char *)productId,sizeof(productId),&productid_len);
-	productId[productid_len-1] = '\0';
-	HAL_Execel_cmd(GET_KEY_CMD,(char *)key,sizeof(key),&key_len);
-	key[key_len-1] = '\0';	
+	kk_cloud_get_pid(productId);
+	kk_cloud_get_key(key);
     sprintf(param, "{\"username\":\"%s\",\"password\":\"%s\",\"productid\":\"%s\"}", 
                 ccuid, key, productId); 
 				

application/klansdk/iot.mk

@@ -22,6 +22,10 @@ else ifeq ($(CONFIG_MODEL),nx5)
 else ifeq ($(CONFIG_MODEL),8197)
 	LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -lnanomsg_8197 -lubacktrace
 	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev_8197	
+else ifeq ($(CONFIG_MODEL),a133)
+	LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -lnanomsg_a133
+	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev_a133
+	 
 else
 	LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -lnanomsg
 	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev	

application/klansdk/kk_data_handle.c

@@ -379,13 +379,14 @@ int kk_data_handle(cJSON *json,int sockfd)
 			if(key != NULL){
 				kk_handle_del_history_info(key->valuestring);
 			}
-		}else if(strcmp(opcode->valuestring,VOICE_VOLUME_CTRL) == 0){
+		}
+		#ifdef VOICE_SUPPORT
+		else if(strcmp(opcode->valuestring,VOICE_VOLUME_CTRL) == 0){
 			cJSON *vol = cJSON_GetObjectItem(json, "arg");
 			if(vol != NULL){
 				kk_voice_control(atoi(vol->valuestring));
 			}
-		}
-		else if(strcmp(opcode->valuestring,VOICE_SWITCH_CTRL) == 0){
+		}else if(strcmp(opcode->valuestring,VOICE_SWITCH_CTRL) == 0){
 			cJSON *onff = cJSON_GetObjectItem(json, "arg");
 			int value = 0;
 			if(onff != NULL){
@@ -414,7 +415,9 @@ int kk_data_handle(cJSON *json,int sockfd)
 			}
 		}else if(strcmp(opcode->valuestring,EXIT_VOICE_FACTORY) == 0){
 			kk_voice_exit_factory_mode();
-		}else{
+		}
+		#endif
+		else{
 			kk_ccu_opcode_handle(json);
 		}
 	}
@@ -896,13 +899,17 @@ void KK_Data_FromMid(void* str,int len)
 		INFO_PRINT("syncinfo_reply handle!!!");
 		kk_parse_syncinfo(payload);
 		kk_create_syncinfo_to_sdk(payload,0);
+		#ifdef VOICE_SUPPORT
 		kk_vp_syncinfo_handle(payload);
+		#endif
 		
 	}else if (strstr(msgtype->valuestring,SYNCPUSH_MSG_TYPE_REPLY) != NULL){
 		INFO_PRINT("syncinfopush_reply handle!!!");
 		kk_parse_syncinfo(payload);
 		kk_create_syncinfo_to_sdk(payload,1);
+		#ifdef VOICE_SUPPORT
 		kk_vp_syncinfo_handle(payload);
+		#endif
 	}
 	else if(strstr(msgtype->valuestring,"/thing/event/property/post")!= NULL){
 		INFO_PRINT("property post handle!!!");

application/klansdk/kk_findccu_handle.c

@@ -34,9 +34,15 @@ static int kk_findccu_ack(int sockfd,struct sockaddr_in *addr){
 		args = cJSON_CreateObject();
 		if(args){
 			cJSON_AddItemToObject(json, "arg", args);
+			#ifdef CONFIG_A133_PLATFORM
+			cJSON_AddStringToObject(args, "zkid", ccuid);
+			cJSON_AddStringToObject(args, "zk", KK_CCU_NAME);
+			HAL_Get_IP(s_IP,"eth0");
+			#else
 			cJSON_AddStringToObject(args, "zkid", &ccuid[4]);
 			cJSON_AddStringToObject(args, "zk", KK_CCU_NAME);
 			HAL_Get_IP(s_IP,NULL);
+			#endif
 			cJSON_AddStringToObject(args, "ip", s_IP); 
 			cJSON_AddBoolToObject(args, "ssl", FALSE);
 		}

application/klansdk/kk_lan_ctrl.h

@@ -4,13 +4,6 @@
 
 
 
-
-
-
-
-
-
-
 int kk_ccu_opcode_handle(cJSON *root);
 
 void property_post_deal(const char *deviceCode,cJSON *payload);

application/klansdk/kk_lan_debug.h

@@ -104,7 +104,7 @@ static const int g_syslog		 = 1;
 
 
 
-
+//#define VOICE_SUPPORT 
 
 
 

application/klansdk/kk_lan_main.c

@@ -54,6 +54,28 @@ static int _setDevice_Code(_IN_ char *device_code,int len)
 char s_pid[PRODUCT_CODE_LEN] = {0};
 static int kk_lan_pid_init(void)
 {
+	#ifdef CONFIG_A133_PLATFORM
+    uint8_t data[128] = {0};
+    int data_len = 0;
+	uint8_t uuid[32] = {0};
+	char *pstart = NULL;
+	char *pEnd = NULL;
+    HAL_Execel_cmd(GET_CCUID_CMD,(char *)data,sizeof(data),&data_len);
+    printf("GET_CCUID_CMD:%s\n",data);
+
+    if(data_len > 0 && data_len <= 128){
+		pstart = data;
+		pEnd = strstr(data,"pid_");
+		if(pstart != NULL && pEnd != NULL){
+			memcpy(s_pid,pEnd+4,data_len-1-(pEnd-pstart+4));
+			INFO_PRINT("s_pid:%s\n",s_pid);
+		}else{
+        	return -1;
+		}
+    }else{
+        return -1;
+    }	
+	#else
     char pid[PRODUCT_CODE_LEN] = {0};
     int pid_len = 0;
     HAL_Execel_cmd(GET_PRODUCTID_CMD,(char *)pid,sizeof(pid),&pid_len);
@@ -63,6 +85,7 @@ static int kk_lan_pid_init(void)
     }else{
 		return -1;
     }
+	#endif
 	return 0;
 }
 int kk_lan_get_pid(_OU_ char *productId)
@@ -188,11 +211,11 @@ int main(int argc, char* argv[])
 	struct sigaction sa;
 	
 	/* setup alarm signal handler */
-
+	#ifdef CONFIG_NX5_PLATFORM
 	for(int i=1;i<32;i++){
 		signal(i, handler);
 	}
-
+	#endif
 
 	//signal(SIGPIPE, SIG_IGN);
 
@@ -217,8 +240,9 @@ int main(int argc, char* argv[])
 	kk_map_dev_init();
 	kk_login_init();
 
-	
+	#ifdef VOICE_SUPPORT
 	kk_voice_panel_init(argc,argv);
+	#endif
 
 	//lan_queue_init();
 	kk_lan_db_node_init();

application/klansdk/kk_lan_node_db.h

@@ -3,7 +3,11 @@
 
 #include "sqlite3.h"
 
+#ifdef CONFIG_A133_PLATFORM
+#define KK_LAN_NODE_DB_FILE					"/data/local/kk/kk_lan_node.db"
+#else
 #define KK_LAN_NODE_DB_FILE					"/data/kk/kk_lan_node.db"
+#endif
 
 typedef struct {
 	void *mutex;

application/klansdk/kk_lan_voice_panel.c

@@ -13,7 +13,7 @@
 #include "Serial.h"
 #include "uart_proto.h"
 
-
+#ifdef VOICE_SUPPORT
 static pthread_mutex_t v_mux;
 
 
@@ -503,7 +503,7 @@ int kk_voice_panel_init(int argc, char* argv[])
 	
 	return 0;
 }
-
+#endif
 
 
 

application/klansdk/kk_lan_vp_ctrl.c

@@ -4,7 +4,7 @@
 #include "cJSON.h"
 #include "kk_voice_panel_cfg.h"
 #include "kk_lan_sync.h"
-
+#ifdef VOICE_SUPPORT
 typedef cJSON *(*dev_handle_func)(int ep,uint8_t *arg,uint8_t arg_len,kk_map_dev_node_t *node);
 
 typedef struct {
@@ -1251,7 +1251,7 @@ int kk_lan_vp_control(uint8_t num,uint32_t nodeIdAry[],uint8_t *arg,uint8_t arg_
 
 	return err;
 }
-
+#endif
 
 
 

application/klansdk/kk_voice_panel_cfg.c

@@ -3,15 +3,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <pthread.h>
-
- 
-
-
 #include "kk_voice_panel_cfg.h"
 #include "kk_ccu_msg.h"
 #include "kk_lan_node_db.h"
 #include "kk_voice_panel_handle.h"
-
+#ifdef VOICE_SUPPORT
 static _OUT int node_id_check(_IN cJSON *zbDevsAry,_IN const char *id);
 
 
@@ -1250,7 +1246,7 @@ _OUT int kk_vp_syncinfo(_IN cJSON *payload,_IN int ver,_OUT cJSON **root)
 
 	return -1;
 }
-
+#endif
 
 
 

application/klansdk/kk_voice_panel_handle.c

@@ -12,6 +12,7 @@
 #include "Serial.h"
 #include "kk_oldccu_msg.h"
 #include <ctype.h>
+#ifdef VOICE_SUPPORT
 #define MK_VERSION(x)			((*x<<24) | (*(x+1)<<16) | (*(x+2)<<8) | *(x+3))
 
 #define MK_UINT32(x)			((*x<<24) | (*(x+1)<<16) | (*(x+2)<<8) | *(x+3))
@@ -1930,7 +1931,7 @@ static void kk_voice_volume_handle(pro_data_t *pro_data)
 	int ver;
 	unsigned char status;
 	char vol[8] = {0};
-	
+
 	if((err = pro_data->arg[0])==0) {
 		debug_log(LOG_DEBUG_LEVEL,"volume=%d\n",pro_data->arg[1]);
 		sprintf(vol,"%d",pro_data->arg[1]);
@@ -1943,6 +1944,6 @@ static void kk_voice_volume_handle(pro_data_t *pro_data)
 		cJSON_Delete(root);
 	}
 }
-
+#endif
 
 

common/api/com_api.c

@@ -2,10 +2,15 @@
 #include <pthread.h>
 #include "com_api.h"
 #include "kk_log.h"
-
+#ifdef CONFIG_A133_PLATFORM
+#define APP2MID         "ipc:///data/local/kk/etc/app2mid.ipc"
+#define APP2MID_PUBSUB  "ipc:///data/local/kk/etc/app2mid_pubsub.ipc"
+#define PLAT2MID        "ipc:///data/local/kk/etc/plat2mid.ipc"
+#else
 #define APP2MID         "ipc:///tmp/app2mid.ipc"
 #define APP2MID_PUBSUB  "ipc:///tmp/app2mid_pubsub.ipc"
 #define PLAT2MID        "ipc:///tmp/plat2mid.ipc"
+#endif
 //#define GW2CCU_PIPE     "tcp://%s:5555"
 //#define GW2CCU_PUBSUB   "tcp://%s:5557"
 #define GW2CCU_PIPE     "tcp://%s:35567"

common/api/com_api.h

@@ -115,6 +115,7 @@ typedef enum {
 #define MSG_SCENE_SUPPORT               			"sceneSupport"
 #define MSG_SCENE_MSGID               				"msgId"
 #define MSG_SCENE_SCENE_NAME               			"name"
+#define MSG_SCENE_ROOM_ID               			"roomId"
 #define MSG_SCENE_ROOM_NAME               			"roomName"
 #define MSG_SCENE_SCENCTYPE              		    "sceneType"
 #define MSG_SCENE_ENABLE              		    	"enable"

common/api/iot.mk

@@ -8,6 +8,9 @@ ifeq ($(CONFIG_MODEL),x86)
 else ifeq ($(CONFIG_MODEL),nx5)
 	LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -lnanomsg_nx5
 	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev_nx5 
+else ifeq ($(CONFIG_MODEL),a133)
+	LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -lnanomsg_a133
+	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev_a133
 else
 	LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -lnanomsg
 	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev	

common/curl/include/curlver.h

-#ifndef CURLINC_CURLVER_H
-#define CURLINC_CURLVER_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at https://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-/* This header file contains nothing but libcurl version info, generated by
-   a script at release-time. This was made its own header file in 7.11.2 */
-
-/* This is the global package copyright */
-#define LIBCURL_COPYRIGHT "1996 - 2020 Daniel Stenberg, <daniel@haxx.se>."
-
-/* This is the version number of the libcurl package from which this header
-   file origins: */
-#define LIBCURL_VERSION "7.72.0"
-
-/* The numeric version number is also available "in parts" by using these
-   defines: */
-#define LIBCURL_VERSION_MAJOR 7
-#define LIBCURL_VERSION_MINOR 72
-#define LIBCURL_VERSION_PATCH 0
-
-/* This is the numeric version of the libcurl version number, meant for easier
-   parsing and comparisons by programs. The LIBCURL_VERSION_NUM define will
-   always follow this syntax:
-
-         0xXXYYZZ
-
-   Where XX, YY and ZZ are the main version, release and patch numbers in
-   hexadecimal (using 8 bits each). All three numbers are always represented
-   using two digits.  1.2 would appear as "0x010200" while version 9.11.7
-   appears as "0x090b07".
-
-   This 6-digit (24 bits) hexadecimal number does not show pre-release number,
-   and it is always a greater number in a more recent release. It makes
-   comparisons with greater than and less than work.
-
-   Note: This define is the full hex number and _does not_ use the
-   CURL_VERSION_BITS() macro since curl's own configure script greps for it
-   and needs it to contain the full number.
-*/
-#define LIBCURL_VERSION_NUM 0x074800
-
-/*
- * This is the date and time when the full source package was created. The
- * timestamp is not stored in git, as the timestamp is properly set in the
- * tarballs by the maketgz script.
- *
- * The format of the date follows this template:
- *
- * "2007-11-23"
- */
-#define LIBCURL_TIMESTAMP "2020-08-27"
-
-#define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|(z))
-#define CURL_AT_LEAST_VERSION(x,y,z) \
-  (LIBCURL_VERSION_NUM >= CURL_VERSION_BITS(x, y, z))
-
-#endif /* CURLINC_CURLVER_H */

common/curl/include/easy.h

-#ifndef CURLINC_EASY_H
-#define CURLINC_EASY_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at https://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Flag bits in the curl_blob struct: */
-#define CURL_BLOB_COPY   1 /* tell libcurl to copy the data */
-#define CURL_BLOB_NOCOPY 0 /* tell libcurl to NOT copy the data */
-
-struct curl_blob {
-  void *data;
-  size_t len;
-  unsigned int flags; /* bit 0 is defined, the rest are reserved and should be
-                         left zeroes */
-};
-
-CURL_EXTERN CURL *curl_easy_init(void);
-CURL_EXTERN CURLcode curl_easy_setopt(CURL *curl, CURLoption option, ...);
-CURL_EXTERN CURLcode curl_easy_perform(CURL *curl);
-CURL_EXTERN void curl_easy_cleanup(CURL *curl);
-
-/*
- * NAME curl_easy_getinfo()
- *
- * DESCRIPTION
- *
- * Request internal information from the curl session with this function.  The
- * third argument MUST be a pointer to a long, a pointer to a char * or a
- * pointer to a double (as the documentation describes elsewhere).  The data
- * pointed to will be filled in accordingly and can be relied upon only if the
- * function returns CURLE_OK.  This function is intended to get used *AFTER* a
- * performed transfer, all results from this function are undefined until the
- * transfer is completed.
- */
-CURL_EXTERN CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ...);
-
-
-/*
- * NAME curl_easy_duphandle()
- *
- * DESCRIPTION
- *
- * Creates a new curl session handle with the same options set for the handle
- * passed in. Duplicating a handle could only be a matter of cloning data and
- * options, internal state info and things like persistent connections cannot
- * be transferred. It is useful in multithreaded applications when you can run
- * curl_easy_duphandle() for each new thread to avoid a series of identical
- * curl_easy_setopt() invokes in every thread.
- */
-CURL_EXTERN CURL *curl_easy_duphandle(CURL *curl);
-
-/*
- * NAME curl_easy_reset()
- *
- * DESCRIPTION
- *
- * Re-initializes a CURL handle to the default values. This puts back the
- * handle to the same state as it was in when it was just created.
- *
- * It does keep: live connections, the Session ID cache, the DNS cache and the
- * cookies.
- */
-CURL_EXTERN void curl_easy_reset(CURL *curl);
-
-/*
- * NAME curl_easy_recv()
- *
- * DESCRIPTION
- *
- * Receives data from the connected socket. Use after successful
- * curl_easy_perform() with CURLOPT_CONNECT_ONLY option.
- */
-CURL_EXTERN CURLcode curl_easy_recv(CURL *curl, void *buffer, size_t buflen,
-                                    size_t *n);
-
-/*
- * NAME curl_easy_send()
- *
- * DESCRIPTION
- *
- * Sends data over the connected socket. Use after successful
- * curl_easy_perform() with CURLOPT_CONNECT_ONLY option.
- */
-CURL_EXTERN CURLcode curl_easy_send(CURL *curl, const void *buffer,
-                                    size_t buflen, size_t *n);
-
-
-/*
- * NAME curl_easy_upkeep()
- *
- * DESCRIPTION
- *
- * Performs connection upkeep for the given session handle.
- */
-CURL_EXTERN CURLcode curl_easy_upkeep(CURL *curl);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif

common/curl/include/mprintf.h

-#ifndef CURLINC_MPRINTF_H
-#define CURLINC_MPRINTF_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at https://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-#include <stdarg.h>
-#include <stdio.h> /* needed for FILE */
-#include "curl.h"  /* for CURL_EXTERN */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-CURL_EXTERN int curl_mprintf(const char *format, ...);
-CURL_EXTERN int curl_mfprintf(FILE *fd, const char *format, ...);
-CURL_EXTERN int curl_msprintf(char *buffer, const char *format, ...);
-CURL_EXTERN int curl_msnprintf(char *buffer, size_t maxlength,
-                               const char *format, ...);
-CURL_EXTERN int curl_mvprintf(const char *format, va_list args);
-CURL_EXTERN int curl_mvfprintf(FILE *fd, const char *format, va_list args);
-CURL_EXTERN int curl_mvsprintf(char *buffer, const char *format, va_list args);
-CURL_EXTERN int curl_mvsnprintf(char *buffer, size_t maxlength,
-                                const char *format, va_list args);
-CURL_EXTERN char *curl_maprintf(const char *format, ...);
-CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif /* CURLINC_MPRINTF_H */

common/curl/include/stdcheaders.h

-#ifndef CURLINC_STDCHEADERS_H
-#define CURLINC_STDCHEADERS_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at https://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-#include <sys/types.h>
-
-size_t fread(void *, size_t, size_t, FILE *);
-size_t fwrite(const void *, size_t, size_t, FILE *);
-
-int strcasecmp(const char *, const char *);
-int strncasecmp(const char *, const char *, size_t);
-
-#endif /* CURLINC_STDCHEADERS_H */

common/curl/include/urlapi.h

-#ifndef CURLINC_URLAPI_H
-#define CURLINC_URLAPI_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 2018 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at https://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-#include "curl.h"
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* the error codes for the URL API */
-typedef enum {
-  CURLUE_OK,
-  CURLUE_BAD_HANDLE,          /* 1 */
-  CURLUE_BAD_PARTPOINTER,     /* 2 */
-  CURLUE_MALFORMED_INPUT,     /* 3 */
-  CURLUE_BAD_PORT_NUMBER,     /* 4 */
-  CURLUE_UNSUPPORTED_SCHEME,  /* 5 */
-  CURLUE_URLDECODE,           /* 6 */
-  CURLUE_OUT_OF_MEMORY,       /* 7 */
-  CURLUE_USER_NOT_ALLOWED,    /* 8 */
-  CURLUE_UNKNOWN_PART,        /* 9 */
-  CURLUE_NO_SCHEME,           /* 10 */
-  CURLUE_NO_USER,             /* 11 */
-  CURLUE_NO_PASSWORD,         /* 12 */
-  CURLUE_NO_OPTIONS,          /* 13 */
-  CURLUE_NO_HOST,             /* 14 */
-  CURLUE_NO_PORT,             /* 15 */
-  CURLUE_NO_QUERY,            /* 16 */
-  CURLUE_NO_FRAGMENT          /* 17 */
-} CURLUcode;
-
-typedef enum {
-  CURLUPART_URL,
-  CURLUPART_SCHEME,
-  CURLUPART_USER,
-  CURLUPART_PASSWORD,
-  CURLUPART_OPTIONS,
-  CURLUPART_HOST,
-  CURLUPART_PORT,
-  CURLUPART_PATH,
-  CURLUPART_QUERY,
-  CURLUPART_FRAGMENT,
-  CURLUPART_ZONEID /* added in 7.65.0 */
-} CURLUPart;
-
-#define CURLU_DEFAULT_PORT (1<<0)       /* return default port number */
-#define CURLU_NO_DEFAULT_PORT (1<<1)    /* act as if no port number was set,
-                                           if the port number matches the
-                                           default for the scheme */
-#define CURLU_DEFAULT_SCHEME (1<<2)     /* return default scheme if
-                                           missing */
-#define CURLU_NON_SUPPORT_SCHEME (1<<3) /* allow non-supported scheme */
-#define CURLU_PATH_AS_IS (1<<4)         /* leave dot sequences */
-#define CURLU_DISALLOW_USER (1<<5)      /* no user+password allowed */
-#define CURLU_URLDECODE (1<<6)          /* URL decode on get */
-#define CURLU_URLENCODE (1<<7)          /* URL encode on set */
-#define CURLU_APPENDQUERY (1<<8)        /* append a form style part */
-#define CURLU_GUESS_SCHEME (1<<9)       /* legacy curl-style guessing */
-#define CURLU_NO_AUTHORITY (1<<10)      /* Allow empty authority when the
-                                           scheme is unknown. */
-
-typedef struct Curl_URL CURLU;
-
-/*
- * curl_url() creates a new CURLU handle and returns a pointer to it.
- * Must be freed with curl_url_cleanup().
- */
-CURL_EXTERN CURLU *curl_url(void);
-
-/*
- * curl_url_cleanup() frees the CURLU handle and related resources used for
- * the URL parsing. It will not free strings previously returned with the URL
- * API.
- */
-CURL_EXTERN void curl_url_cleanup(CURLU *handle);
-
-/*
- * curl_url_dup() duplicates a CURLU handle and returns a new copy. The new
- * handle must also be freed with curl_url_cleanup().
- */
-CURL_EXTERN CURLU *curl_url_dup(CURLU *in);
-
-/*
- * curl_url_get() extracts a specific part of the URL from a CURLU
- * handle. Returns error code. The returned pointer MUST be freed with
- * curl_free() afterwards.
- */
-CURL_EXTERN CURLUcode curl_url_get(CURLU *handle, CURLUPart what,
-                                   char **part, unsigned int flags);
-
-/*
- * curl_url_set() sets a specific part of the URL in a CURLU handle. Returns
- * error code. The passed in string will be copied. Passing a NULL instead of
- * a part string, clears that part.
- */
-CURL_EXTERN CURLUcode curl_url_set(CURLU *handle, CURLUPart what,
-                                   const char *part, unsigned int flags);
-
-
-#ifdef __cplusplus
-} /* end of extern "C" */
-#endif
-
-#endif /* CURLINC_URLAPI_H */

common/hal/HAL_OS_linux.c

@@ -371,7 +371,11 @@ void HAL_ThreadDelete(_IN_ void *thread_handle)
         pthread_exit(0);
     } else {
         /*main thread delete child thread*/
+		#ifdef CONFIG_A133_PLATFORM
+		pthread_kill((pthread_t)thread_handle,SIGALRM);
+		#else
         pthread_cancel((pthread_t)thread_handle);
+		#endif
         pthread_join((pthread_t)thread_handle, 0);
     }
 }

common/hal/HAL_TCP_linux.c

@@ -55,7 +55,11 @@ uintptr_t HAL_TCP_Establish(const char *host, uint16_t port)
 
     hints.ai_family = AF_INET; /* only IPv4 */
     hints.ai_socktype = SOCK_STREAM;
+	#ifdef CONFIG_A133_PLATFORM
+	hints.ai_protocol = 0;
+	#else
     hints.ai_protocol = IPPROTO_TCP;
+	#endif
     sprintf(service, "%u", port);
 
     while(dns_retry++ < 8) {

common/hal/kk_product.h

@@ -29,11 +29,31 @@
 #define SN_ADDR_LEN        (32+1)
 
 #define PRODUCT_TPYE  "kk"
-#define CCU_LAN  "eth0"
-#define KK_CCU_ID    "CCU_77771"
+
 #define KK_GW_PRODUCTID    "gateway_2"
 #define KK_CCU_RANDOM    "0000000000"
 #define KK_CCU_NAME      "NEW_CCU"
+
+#ifdef CONFIG_A133_PLATFORM
+#define  KK_DEVICESECRET_PATH   "/data/local/kk/kk_deviceSecret.txt"
+#define  KK_TOKEN_PATH   "/data/local/kk/kk_token.txt"
+#define KK_DEVICE_MAP_FILE_PATH      "/data/local/kk/map/device_%s.json"
+#define GET_CCUID_CMD               "getprop ro.ccuinfo"
+#define GET_KEY_CMD                 "getprop ro.ccuinfo"
+#define KK_DB_FILE                  "/data/local/kk/etc/kk_database.db"
+#define TSL_SUBDEVICE_PATH_FILE     "/data/local/kk/tsl/product_%s.json"
+#define TSL_GATEWAY_PATH_FILE       "/data/local/kk/tsl/gateway_%s.json"
+#define TSL_CCU_PATH_FILE           "/data/local/kk/tsl/ccu_%s.json"
+#define TSL_SCENE_PATH_FILE         "/data/local/kk/tsl/ccu_%s_scene.json"
+#define OTA_IMG_PATH                "/data/local/OTA/"
+#define OTA_IMG_FILE                "/data/local/OTA/app_squashfs.img"
+#define OTA_IMG_FILE_MD5            "/data/local/OTA/app_squashfs.img.md5"
+#define  KK_CONFIG_FILE_PATH        "/data/local/kk/kk_cloud_conf.json"
+#define  KK_DEFAULT_CONFIG_FILE_PATH    "/data/local/kk/cloud_default_config.json"
+#define  KK_AUTH_CONFIG_FILE_PATH    "/data/local/kk/auth_conf.json"
+#else
+#define  KK_DEVICESECRET_PATH       "/data/kk/kk_deviceSecret.txt"
+#define  KK_TOKEN_PATH              "/data/kk/kk_token.txt"
 #define KK_DEVICE_MAP_FILE_PATH      "/data/kk/map/device_%s.json"
 #define GET_CCUID_CMD               "fw_printenv uuid -n"
 #define GET_KEY_CMD                 "fw_printenv key -n"
@@ -46,11 +66,11 @@
 #define OTA_IMG_PATH                "/data/OTA/"
 #define OTA_IMG_FILE                "/data/OTA/app_squashfs.img"
 #define OTA_IMG_FILE_MD5            "/data/OTA/app_squashfs.img.md5"
-#define  KK_DEVICESECRET_PATH       "/data/kk/kk_deviceSecret.txt"
-#define  KK_TOKEN_PATH              "/data/kk/kk_token.txt"
 #define  KK_CONFIG_FILE_PATH        "/data/kk/kk_cloud_conf.json"
 #define  KK_DEFAULT_CONFIG_FILE_PATH    "/app/ccuApps/config/cloud_default_config.json"
 #define  KK_AUTH_CONFIG_FILE_PATH    "/tmp/auth_conf.json"
+#endif
+
 enum {
     DEVICE_OFFLINE = 0,
     DEVICE_ONLINE,

midware/midware/dm/dm_ota.c

@@ -6,7 +6,7 @@
 #include "cJSON.h"
 #include "kk_dm_api.h"
 #include "kk_dm_msg.h"
-#include <curl/curl.h>
+#include "../../common/curl/include/curl/curl.h"
 #include "com_api.h"
 #include "kk_log.h"
 #include "kk_hal.h"

midware/midware/dm/kk_dm_mng.c

@@ -597,6 +597,30 @@ static void _dm_mgr_destroy_devlist(void)
 char s_pid[PRODUCT_CODE_LEN] = {0};
 static int kk_pid_init(void)
 {
+	#ifdef CONFIG_A133_PLATFORM
+    uint8_t data[128] = {0};
+    int data_len = 0;
+	char *pstart = NULL;
+	char *pEnd = NULL;
+    HAL_Execel_cmd(GET_CCUID_CMD,(char *)data,sizeof(data),&data_len);
+    printf("---GET_CCUID_CMD:%s\n",data);
+    if(data_len > 0 && data_len <= 128){
+		pstart = data;
+		pEnd = strstr(data,"pid_");
+		if(pstart != NULL && pEnd != NULL){
+			memcpy(s_pid,pEnd+4,data_len-1-(pEnd-pstart+4));
+			INFO_PRINT("kk_cloud_pid_init s_pid:%s\n",s_pid);
+		}else{
+        	//_setDevice_Code(KK_CCU_ID,strlen(KK_CCU_ID));
+			INFO_PRINT("KK_Ccuid_init get ccuid error\n");
+			return -1;
+		}
+    }else{
+        //_setDevice_Code(KK_CCU_ID,strlen(KK_CCU_ID));
+		INFO_PRINT("KK_Ccuid_init get ccuid error\n");
+		return -1;
+    }	
+	#else
     char pid[PRODUCT_CODE_LEN] = {0};
     int pid_len = 0;
     HAL_Execel_cmd(GET_PRODUCTID_CMD,(char *)pid,sizeof(pid),&pid_len);
@@ -606,6 +630,7 @@ static int kk_pid_init(void)
     }else{
 		return -1;
     }
+	#endif
 	return 0;
 }
 int kk_get_pid(char *productId)

midware/midware/dm/kk_dm_msg.h

@@ -60,15 +60,15 @@ typedef struct {
 #define KK_THING_SERVICE_REBOOT                   "/thing/service/reboot"
 #define KK_THING_SERVICE_ADDROOM                  "/thing/service/addRoom"
 #define KK_THING_SERVICE_ADDROOM_REPLY            "/thing/service/addRoom_reply"
-#define KK_THING_SERVICE_UPDATEROOM               "/thing/service/updateRoom"
-#define KK_THING_SERVICE_UPDATEROOM_REPLY         "/thing/service/updateRoom_reply"
+#define KK_THING_SERVICE_UPDATEROOM               "/thing/service/updateRoomName"
+#define KK_THING_SERVICE_UPDATEROOM_REPLY         "/thing/service/updateRoomName_reply"
 #define KK_THING_SERVICE_DELETEROOM               "/thing/service/deleteRoom"
 #define KK_THING_SERVICE_DELETEROOM_REPLY         "/thing/service/deleteRoom_reply"
 #define KK_THING_SERVICE_ADDDEVICETOROOM          "/thing/service/addDeviceToRoom"
 #define KK_THING_SERVICE_ADDDEVICETOROOM_REPLY    "/thing/service/addDeviceToRoom_reply"
 #define KK_THING_SERVICE_REMOVEDEVICEFROMROOM     "/thing/service/removeDeviceFromRoom"
 #define KK_THING_SERVICE_REMOVEDEVICEFROMROOM_REPLY     "/thing/service/removeDeviceFromRoom_reply"
-#define KK_THING_SERVICE_EXECUTEROOM              "/thing/service/executeRoom"
+
 #define KK_THING_SERVICE_SETLOCALTIMER            "/thing/service/setLocalTimer"
 #define KK_THING_SERVICE_GETLOCALTIMER            "/thing/service/getLocalTimer"
 #define KK_THING_SERVICE_SETCOUNTDOWN             "/thing/service/setCountDown"
@@ -103,8 +103,8 @@ typedef struct {
 #define KK_THING_SERVICE_GETFLOOR_REPLY           "/thing/service/getAllFloors_reply"
 #define KK_THING_SERVICE_SYNCINFO_REPLY           "/thing/service/syncinfo_reply"
 #define KK_THING_SERVICE_SYNCINFOPUSH_REPLY       "/thing/service/syncinfopush_reply"
-#define KK_THING_SERVICE_ADDFLOORS                "/thing/service/addFloors"
-#define KK_THING_SERVICE_ADDFLOORS_REPLY          "/thing/service/addFloors_reply"
+#define KK_THING_SERVICE_ADDFLOORS                "/thing/service/addFloor"
+#define KK_THING_SERVICE_ADDFLOORS_REPLY          "/thing/service/addFloor_reply"
 #define KK_THING_EVENT_MESSAGE                    "/thing/event/"
 #define KK_THING_SERVICE_GETGUARDSENSORS          "/thing/service/getGuardSensors"
 #define KK_THING_EVENT_POST                       "/post"
@@ -116,10 +116,10 @@ typedef struct {
 #define KK_THING_SERVICE_HISTORYALARM_REPLY       "/thing/service/historyAlarm_reply"
 #define KK_THING_SERVICE_DEL_HISTORYALARM         "/thing/service/delAlarm"
 #define KK_THING_SERVICE_DEL_HISTORYALARM_REPLY   "/thing/service/delAlarm_reply"
-#define KK_THING_SERVICE_DELETEFLOORS             "/thing/service/deleteFloors"
-#define KK_THING_SERVICE_DELETEFLOORS_REPLY       "/thing/service/deleteFloors_reply"
-#define KK_THING_SERVICE_UPDATEFLOORS             "/thing/service/updateFloors"
-#define KK_THING_SERVICE_UPDATEFLOORS_REPLY       "/thing/service/updateFloors_reply"
+#define KK_THING_SERVICE_DELETEFLOORS             "/thing/service/deleteFloor"
+#define KK_THING_SERVICE_DELETEFLOORS_REPLY       "/thing/service/deleteFloor_reply"
+#define KK_THING_SERVICE_UPDATEFLOORS             "/thing/service/modifyFloor"
+#define KK_THING_SERVICE_UPDATEFLOORS_REPLY       "/thing/service/modifyFloor_reply"
 #define KK_THING_SERVICE_CLIENTREPORT             "/thing/service/clientReport"
 #define KK_THING_SERVICE_CLIENTREPORT_REPLY       "/thing/service/clientReport_reply"
 #define KK_THING_SERVICE_SPECIALDEVTOROOM         "/thing/service/addSpecialDeviceToRoom"

midware/midware/dm/kk_linkkit.c

@@ -744,8 +744,8 @@ static int kk_service_executeDNDMode_handle(cJSON *params)
 		return INVALID_PARAMETER;
 	}
 	cJSON *roomId = cJSON_GetObjectItem(params, MSG_AREA_ROOM_CCUROOMID);	
-	if(roomId == NULL || roomId->type != cJSON_Number){
-		ERROR_PRINT("DATA ERROR!!!\n");
+	if(roomId == NULL){
+		ERROR_PRINT(" DND DATA ERROR !!!\n");
 		return INVALID_PARAMETER;
 	}	
 	if(roomId->type == cJSON_Number){
@@ -873,14 +873,8 @@ static int kk_service_addFloor_reply(cJSON *root,cJSON *msgId,char *floorId,char
 	cJSON_AddStringToObject(payload, "code", "0");
 	cJSON_AddStringToObject(payload, "msgId", msgId->valuestring);
 	cJSON *paramInfo = cJSON_CreateObject();
-	cJSON *floorIdsAry = cJSON_CreateArray();
-	
-	cJSON *Item = cJSON_CreateObject();
-	cJSON_AddStringToObject(Item, "floorId", floorId);
-	cJSON_AddStringToObject(Item, "name", name);
-	cJSON_AddItemToObject(Item, "rooms", kk_get_roomids_by_floorId(floorId));
-	cJSON_AddItemToArray(floorIdsAry,Item);
-	cJSON_AddItemToObject(paramInfo, "floors", floorIdsAry);
+	cJSON_AddStringToObject(paramInfo, "floorId", floorId);
+	cJSON_AddStringToObject(paramInfo, "name", name);
 	cJSON_AddItemToObject(payload, "params", paramInfo);
 	char *payload11=cJSON_Print(payload);
 	printf("------------------------------>payload11:%s\n",payload11);
@@ -1306,53 +1300,6 @@ static int kk_service_getScreenInfo_handle(cJSON *inforoot,cJSON *param,cJSON *m
 	cJSON_Delete(info);
 	return res;
 }
-/************************************************************
-*功能描述：批量执行房间设备处理
-*输入参数：params：云端下发数据，包含房间号，productCode等
-*输出参数：无
-*返 回 值： 0：成功；其他：失败
-*其他说明：
-*************************************************************/
-static int kk_service_executeRoom_handle(cJSON *params)
-{
-	int res = 0;
-	kk_dev_list_t *pList = NULL;
-	dm_mgr_dev_node_t *search_node = NULL;	
-
-	if(params == NULL){
-		return INVALID_PARAMETER;
-	}
-	cJSON *roomId = cJSON_GetObjectItem(params, MSG_AREA_ROOM_CCUROOMID);	
-	if(roomId == NULL){
-		return FAIL_RETURN;
-	}
-
-	cJSON *productCodeStr = cJSON_GetObjectItem(params, MSG_PRODUCT_TYPE_STR);	
-	if(productCodeStr == NULL){
-		return FAIL_RETURN;
-	}	
-
-	pList = kk_get_room_deviceCode(roomId->valuestring);
-	if(pList != NULL){
-		while(pList != NULL){
-			res = dm_mgr_get_device_by_devicecode(pList->deviceCode,&search_node);
-			if (res != SUCCESS_RETURN) {
-				pList = pList->next;
-				continue;
-			}
-			if(strcmp(search_node->productCode,productCodeStr->valuestring) == 0){
-				cJSON *action = cJSON_GetObjectItem(params, MSG_AREA_ROOM_ACTION);
-				if(action != NULL){
-					kk_service_execute_action(action,search_node);
-				}
-			}
-			pList = pList->next;
-		}
-	}
-	kk_free_room_dev_list();
-	return SUCCESS_RETURN;
-}
-
 /************************************************************
 *功能描述：添加场景处理
 *输入参数：params：云端下发数据，包含场景名称，场景类型，场景使能等
@@ -2019,11 +1966,6 @@ static void _iotx_linkkit_event_callback(iotx_dm_event_types_t type, char *data)
 		//kk_service_addDeviceToRoom_reply(info_root,msgId,1);
 		kk_service_common_reply(info_root,msgId,KK_THING_SERVICE_REMOVEDEVICEFROMROOM_REPLY);
 	}
-	else if(strcmp(typeJson->valuestring,KK_THING_SERVICE_EXECUTEROOM) == 0){
-		INFO_PRINT(" executeroom  \n");
-		cJSON *paramStr = cJSON_GetObjectItem(payload, MSG_PARAMS_STR);
-		kk_service_executeRoom_handle(paramStr);
-	}
 	else if(strcmp(typeJson->valuestring,KK_THING_SERVICE_ADDSCENC) == 0){
 		INFO_PRINT(" add scene \n");
 		cJSON *paramStr = cJSON_GetObjectItem(payload, MSG_PARAMS_STR);

midware/midware/iot.mk

@@ -22,6 +22,10 @@ else ifeq ($(CONFIG_MODEL),nx5)
 else ifeq ($(CONFIG_MODEL),8197)
 	LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -lnanomsg_8197 -lubacktrace
 	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev_8197  
+else ifeq ($(CONFIG_MODEL),a133)
+	LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -lnanomsg_a133 
+	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev_a133
+	LDFLAGS         += -L$(TOP_DIR)/common/curl  -lcurl_a133	
 else
 	LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -lnanomsg -lanl
 	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev  	

midware/midware/midware.c

@@ -102,6 +102,29 @@ static int _setDevice_Code(_IN_ char *device_code,int len)
 }
 static int HAL_Ccuid_init(void)
 {
+	#ifdef CONFIG_A133_PLATFORM
+    uint8_t data[128] = {0};
+    int data_len = 0;
+	uint8_t uuid[32] = {0};
+	char *pstart = NULL;
+	char *pEnd = NULL;
+    HAL_Execel_cmd(GET_CCUID_CMD,(char *)data,sizeof(data),&data_len);
+    printf("GET_CCUID_CMD:%s\n",data);
+
+    if(data_len > 0 && data_len <= 128){
+		pstart = data;
+		pEnd = strstr(data,"-");
+		if(pstart != NULL && pEnd != NULL){
+			printf("-------123---------------------\n");
+			memcpy(uuid,pstart,pEnd-pstart);
+			_setDevice_Code(uuid,pEnd-pstart);
+		}else{
+        	return -1;
+		}
+    }else{
+        return -1;
+    }
+	#else
     char ccuid[DEVICE_CODE_LEN] = {0};
 	char ccuidTmp[DEVICE_CODE_LEN] = {0};
     int ccuid_len = 0;
@@ -114,6 +137,7 @@ static int HAL_Ccuid_init(void)
         //_setDevice_Code(KK_CCU_ID,strlen(KK_CCU_ID));
 		return -1;
     }
+	#endif
 	return 0;
 }
 /************************************************************
@@ -1334,7 +1358,11 @@ void *udp_dispatch_yield(void *args){
 				memset(host_ip, 0, sizeof(host_ip));
 				memset(mac, 0, sizeof(mac));
 				memset(szOut, 0, sizeof(szOut));
+				#ifdef CONFIG_A133_PLATFORM
+				HAL_Get_IP(host_ip,"eth0");
+				#else
 				HAL_Get_IP(host_ip,NULL);
+				#endif
 				HAL_Get_ccuid(device_code);
 			//	printf("[%s][%d]inet_ntoa(from.sin_addr):%s\n",__FUNCTION__,__LINE__,inet_ntoa(from.sin_addr));
 			//	printf("[%s][%d]host_ip:%s\n",__FUNCTION__,__LINE__,host_ip);
@@ -1398,7 +1426,11 @@ void *ccu_property_monitor(void *args)
 		dm_mgr_search_dev_by_devid(KK_DM_DEVICE_CCU_DEVICEID,&node);
 		//dm_mgr_update_timestamp_by_devicecode(node->deviceCode,HAL_GetTime());
 		node->timestamp = HAL_Uptimes();
+		#ifdef CONFIG_A133_PLATFORM
+		HAL_Get_IP(s_IP,"eth0");
+		#else
 		HAL_Get_IP(s_IP,NULL);
+		#endif
 		res = kk_tsl_get_value(kk_tsl_get_property_value,node->dev_shadow,KK_TSL_CCU_WANIP_IDENTIFIER,s_IP_TSL,NULL);
 		if(res != SUCCESS_RETURN){
 			ERROR_PRINT("kk_tsl_get_value Failed\n");

midware/midware/scene/kk_scene_handle.c

@@ -1372,9 +1372,9 @@ int kk_scene_parse_addscene(const cJSON* args,char *sceneId,int isUpdate,const c
 
 	//多合一面板绑定的时候可能不带roomid
 	if(room_id != NULL){
-		char roomIdStr[32] = {0};
-		snprintf(roomIdStr,32,"%d",room_id->valueint);
-		res = kk_scene_insert_scene_info(roomIdStr,name->valuestring,sceneType->valueint,enable->valueint,sceneId);
+		//char roomIdStr[32] = {0};
+		//snprintf(roomIdStr,32,"%d",room_id->valuestring);
+		res = kk_scene_insert_scene_info(room_id->valuestring,name->valuestring,sceneType->valueint,enable->valueint,sceneId);
 	}else{
 		res = kk_scene_insert_scene_info("-1",name->valuestring,sceneType->valueint,enable->valueint,sceneId);
 	}

tools/board/config.linux.nx5

@@ -19,6 +19,7 @@ CONFIG_ENV_CFLAGS   += \
     -DCONFIG_GUIDER_AUTH_TIMEOUT=500 \
     -DCONFIG_MQTT_RX_MAXLEN=5000 \
     -DCONFIG_MBEDTLS_DEBUG_LEVEL=0 \
+    -DCONFIG_NX5_PLATFORM \
 
 
 CONFIG_ENV_CFLAGS   += -rdynamic