1.增加编译选项支持android ndk的库；2.android ndk 打包的库；3.修改中控配置文件路径可修改；4.ndk编译出来都是so库

application/kcloud/iot.mk

+ifeq ($(CONFIG_MODEL),a133_ndk)
+LIBSO_TARGET 		:= libiot_kcloud.so
+else	
 LIBA_TARGET 		:= libiot_kcloud.a
 
 $(call Append_Conditional, LIB_SRCS_EXCLUDE, kcloud_main.c)
 $(call Append_Conditional, SRCS_kk_cloud, kcloud_main.c)
 $(call Append_Conditional, TARGET, kk_cloud)
+endif	
 
 CFLAGS 			+= -I$(TOP_DIR)/common/api
 CFLAGS 			+= -I$(TOP_DIR)/common/json
@@ -25,6 +29,10 @@ 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 ifeq ($(CONFIG_MODEL),a133_ndk)
+	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_main.c

@@ -32,13 +32,13 @@ static char s_ccuid[DEVICE_CODE_LEN] = {0};
 int KK_Get_ccuid(char *device_code)
 {
 	strncpy(device_code, s_ccuid, strlen(s_ccuid));
-	printf("HAL_Get_ccuid:%s\n",s_ccuid);
+	INFO_PRINT("HAL_Get_ccuid:%s\n",s_ccuid);
 	return strlen(s_ccuid);
 }
 static int _setDevice_Code(_IN_ char *device_code,int len)
 {
 	memset(s_ccuid, 0x0, DEVICE_CODE_LEN);
-	printf("_setDevice_Code:%s\n",device_code);
+	INFO_PRINT("_setDevice_Code:%s\n",device_code);
 	strncpy(s_ccuid, device_code, len);
 	return len;
 }
@@ -47,13 +47,13 @@ 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 
+	#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);
+    INFO_PRINT("---GET_CCUID_CMD:%s\n",data);
     if(data_len > 0 && data_len <= 128){
 		pstart = data;
 		pEnd = strstr(data,"-");
@@ -70,7 +70,7 @@ static int KK_Ccuid_init(void)
         //_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);
@@ -110,16 +110,20 @@ static int kk_cloud_key_init(void)
 {
 	uint8_t key[128] = {0};
     int key_len = 0;
-	#ifdef CONFIG_A133_PLATFORM 
+	#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);
+    INFO_PRINT("---productSecret:%s\n",key);
     if(key_len > 0 && key_len <= 128){
 		pstart = key;
 		pEnd = strstr(key,"key_");
 		if(pEnd != NULL){
 			memcpy(s_key,pEnd+4,key_len-(pEnd-pstart+4));
+			if (s_key[key_len-(pEnd-pstart+4) -1] == '\n'){
+				s_key[key_len-(pEnd-pstart+4) -1] = '\0';
+				INFO_PRINT("kk_cloud_key_init remove entry\n");
+			}
 			INFO_PRINT("kk_cloud_key_init s_key:%s\n",s_key);
 		}else{
         	//_setDevice_Code(KK_CCU_ID,strlen(KK_CCU_ID));
@@ -130,7 +134,7 @@ static int kk_cloud_key_init(void)
         //_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){
@@ -234,10 +238,47 @@ extern int kk_info_report_start(void);
 extern int kk_dl_config();
 extern int kk_register_auth_get();
 
+static int setStoragePath(char* path){
+	if (path == NULL){
+		ERROR_PRINT("[%s] path is null !!!!!!!!!!!\n", __FUNCTION__);
+		return -1;
+	}
+
+	sprintf(KK_DEVICESECRET_PATH, "%s/%s", path, KK_DEVICESECRET_PATH_SUB);
+	sprintf(KK_TOKEN_PATH, "%s/%s", path, KK_TOKEN_PATH_SUB);
+	sprintf(KK_DEVICE_MAP_FILE_PATH, "%s/%s", path, KK_DEVICE_MAP_FILE_PATH_SUB);
+	sprintf(KK_DB_FILE, "%s/%s", path, KK_DB_FILE_SUB);
+	sprintf(KK_LAN_NODE_DB_FILE, "%s/%s", path, KK_LAN_NODE_DB_FILE_SUB);
+	sprintf(TSL_SUBDEVICE_PATH_FILE, "%s/%s", path, TSL_SUBDEVICE_PATH_FILE_SUB);
+	sprintf(TSL_GATEWAY_PATH_FILE, "%s/%s", path, TSL_GATEWAY_PATH_FILE_SUB);
+	sprintf(TSL_CCU_PATH_FILE, "%s/%s", path, TSL_CCU_PATH_FILE_SUB);
+	sprintf(TSL_SCENE_PATH_FILE, "%s/%s", path, TSL_SCENE_PATH_FILE_SUB);
+	sprintf(OTA_IMG_PATH, "%s/%s", path, OTA_IMG_PATH_SUB);
+	sprintf(OTA_IMG_FILE, "%s/%s", path, OTA_IMG_FILE_SUB);
+	sprintf(OTA_IMG_FILE_MD5, "%s/%s", path, OTA_IMG_FILE_MD5_SUB);
+
+	sprintf(KK_CONFIG_FILE_PATH, "%s/%s", path, KK_CONFIG_FILE_PATH_SUB);
+#ifdef CONFIG_A133_PLATFORM
+	sprintf(KK_DEFAULT_CONFIG_FILE_PATH, "%s/%s", path, KK_DEFAULT_CONFIG_FILE_PATH_SUB);
+	sprintf(KK_AUTH_CONFIG_FILE_PATH, "%s/%s", path, KK_AUTH_CONFIG_FILE_PATH_SUB);
+#endif
+
+	kk_set_storage_dir(path);
+	return 0;
+}
+
+
+#ifdef CONFIG_NDK
+int app_main(char* path)
+#else
 int main(int argc, char* argv[])
+#endif
 {
 	int rc = 0;
 	openlog("kcloud",LOG_PID,LOG_USER);
+#ifdef CONFIG_NDK
+	setStoragePath(path);
+#endif
 	/*set the callback to get the device date to cloud*/
 	rc = KK_Ccuid_init();
 	if(rc == -1){
@@ -247,7 +288,7 @@ int main(int argc, char* argv[])
 	kk_cloud_pid_init();
 	kk_cloud_key_init();
 	kk_ipc_init(IPC_APP2MID,(ipc_cb*)KK_Data_FromDev,NULL,NULL);
-#if 1	
+#if 1
 	kk_dl_config();
 again:
 	rc = kk_register_auth_get();
@@ -256,7 +297,7 @@ again:
 		if(rc < 0){
 			kk_write_disconnect_flag();
 			sleep(2);
-			goto again;	
+			goto again;
 		}
 	}
 	#if 0
@@ -265,7 +306,7 @@ again:
 		if(rc < 0){
 			kk_write_disconnect_flag();
 			sleep(2);
-			goto again;	
+			goto again;
 		}
 	}
 	#endif
@@ -282,13 +323,13 @@ again:
 		if(rc < 0){
 			kk_write_disconnect_flag();
 			sleep(2);
-			goto again;	
+			goto again;
 		}
 	}else{
 		kk_write_disconnect_flag();
 		sleep(2);
 		goto again;
 	}
-#endif	
+#endif
 	return rc;
 }

application/klansdk/iot.mk

+ifeq ($(CONFIG_MODEL),a133_ndk)
+LIBSO_TARGET 		:= libiot_lan.so
+else
 LIBA_TARGET 		:= libiot_lan.a
 
 $(call Append_Conditional, LIB_SRCS_EXCLUDE, kk_lan_main.c)
 $(call Append_Conditional, SRCS_kk_lan, kk_lan_main.c)
 $(call Append_Conditional, TARGET, kk_lan)
+endif
 
 CFLAGS 			+= -I$(TOP_DIR)/common/api
 CFLAGS 			+= -I$(TOP_DIR)/common/json
@@ -25,7 +29,9 @@ else ifeq ($(CONFIG_MODEL),8197)
 else ifeq ($(CONFIG_MODEL),a133)
 	LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -lnanomsg_a133
 	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev_a133
-	 
+else ifeq ($(CONFIG_MODEL),a133_ndk)
+	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_lan_main.c

@@ -106,7 +106,7 @@ static void kk_lan_ccuid_init(void)
     }else{
         //_setDevice_Code(KK_CCU_ID,strlen(KK_CCU_ID));
     }
-#endif	
+#endif
 }
 
 #define SYNC_INFO_FLAG				0x01
@@ -161,12 +161,42 @@ int kk_sync_timer_is_running(void)
 }
 
 
+#ifdef CONFIG_NDK
+static int setStoragePath(char* path){
+	if (path == NULL){
+		ERROR_PRINT("[%s] path is null !!!!!!!!!!!\n", __FUNCTION__);
+		return -1;
+	}
 
+	sprintf(KK_DEVICESECRET_PATH, "%s/%s", path, KK_DEVICESECRET_PATH_SUB);
+	sprintf(KK_TOKEN_PATH, "%s/%s", path, KK_TOKEN_PATH_SUB);
+	sprintf(KK_DEVICE_MAP_FILE_PATH, "%s/%s", path, KK_DEVICE_MAP_FILE_PATH_SUB);
+	sprintf(KK_DB_FILE, "%s/%s", path, KK_DB_FILE_SUB);
+	sprintf(KK_LAN_NODE_DB_FILE, "%s/%s", path, KK_LAN_NODE_DB_FILE_SUB);
+	sprintf(TSL_SUBDEVICE_PATH_FILE, "%s/%s", path, TSL_SUBDEVICE_PATH_FILE_SUB);
+	sprintf(TSL_GATEWAY_PATH_FILE, "%s/%s", path, TSL_GATEWAY_PATH_FILE_SUB);
+	sprintf(TSL_CCU_PATH_FILE, "%s/%s", path, TSL_CCU_PATH_FILE_SUB);
+	sprintf(TSL_SCENE_PATH_FILE, "%s/%s", path, TSL_SCENE_PATH_FILE_SUB);
+	sprintf(OTA_IMG_PATH, "%s/%s", path, OTA_IMG_PATH_SUB);
+	sprintf(OTA_IMG_FILE, "%s/%s", path, OTA_IMG_FILE_SUB);
+	sprintf(OTA_IMG_FILE_MD5, "%s/%s", path, OTA_IMG_FILE_MD5_SUB);
 
+	sprintf(KK_CONFIG_FILE_PATH, "%s/%s", path, KK_CONFIG_FILE_PATH_SUB);
+#ifdef CONFIG_A133_PLATFORM
+	sprintf(KK_DEFAULT_CONFIG_FILE_PATH, "%s/%s", path, KK_DEFAULT_CONFIG_FILE_PATH_SUB);
+	sprintf(KK_AUTH_CONFIG_FILE_PATH, "%s/%s", path, KK_AUTH_CONFIG_FILE_PATH_SUB);
+#endif
+	kk_set_storage_dir(path);
 
+	return 0;
+}
+#endif
 
-
+#ifdef CONFIG_NDK
+int lan_main(char* path)
+#else
 int main(int argc, char* argv[])
+#endif
 {
 	int ret = 0;
 
@@ -176,6 +206,9 @@ int main(int argc, char* argv[])
 	signal(SIGSTOP, SIG_IGN);
 
 	openlog("kk_lan",LOG_CONS|LOG_PID,LOG_USER);
+#ifdef CONFIG_NDK
+	setStoragePath(path);
+#endif
 	kk_lan_pid_init();
 	kk_lan_ccuid_init();
 
@@ -200,7 +233,7 @@ int main(int argc, char* argv[])
 
 			if(g_sync_flag&SYNC_INFO_FLAG){
 				DEBUG_PRINT("[SYNC INFO].\n");
-				
+
 				send_data = _kk_data_create(SYNC_MSG_TYPE,"*","*","*");
 				g_sync_flag&=~SYNC_INFO_FLAG;
 			}else if(g_sync_flag&SYNC_INFO_PUSH_FLAG){
@@ -221,7 +254,7 @@ int main(int argc, char* argv[])
 			}
 
 		}
-		
+
 		usleep(100*1000);
 	}
 	return 0;

application/klansdk/kk_lan_node_db.h

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

application/klansdk/uart_proto.c

@@ -89,13 +89,13 @@ 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){
-  		printf("%s return %s",cmd,buf);  
+  		printf("%s return %s",cmd,buf);
   	}
   	pclose (fp);
-    
+
     *ret_len = strlen(buf);
     return 0;
 }
@@ -157,7 +157,7 @@ uint8_t pro_check_uart_frame(uint8_t *data, uint16_t data_len)
 
         data[data_len - 2] = crc >> 8;
         data[data_len - 1] = crc;
-        
+
         GW_LOG_DBG("link ack\n");
 
         // dev_send_net(NET_SEND_NOT_BC, UDP_MSG_LOCAL, &g_ccu_net_addr, data, data_len);
@@ -361,7 +361,7 @@ int get_proto_frame(uint8_t *data, uint16_t data_len, pro_data_t *pro_data)
         pro_data->seq = (((uint16_t)(data[PRO_SEQ_INDEX])) << 8) + data[PRO_SEQ_INDEX + 1];
 
         pro_data->ch = data[PRO_DATA_INDEX+1];
-        
+
         pro_data->opcode = (((uint16_t)(data[PRO_DATA_INDEX + 2])) << 8) + data[PRO_DATA_INDEX + 3];
         //pro_data->args_len = data_len - PRO_APP_PACKET_MIN_SIZE + 1;
         pro_data->args_len = data[PRO_DATA_INDEX] -3 ;
@@ -395,7 +395,7 @@ uint16_t proto_frame_to_uart(pro_data_t *pro_data, uint8_t *uart_data)
 
     cf = cf_to_uint8_t(&(pro_data->cf));
     //cf = 0x20;
-    
+
     uart_data[i++] = cf;
 
     uart_data[i++] = pro_data->seq>>8;
@@ -437,7 +437,7 @@ void pro_send_link_ack(pro_data_t *pro_data)
     crc = make_crc16(buf, i);
     buf[i++] = crc >> 8;
     buf[i++] = crc;
-    
+
     dev_send_uart(buf,i);
 }
 
@@ -447,7 +447,7 @@ void dev_send_uart(uint8_t *data, uint16_t data_len)
     {
         static char data_print_buf[512] = {0};
         int i = 0;
-        
+
         memset(data_print_buf, 0, sizeof(data_print_buf));
 
         for (i = 0; i < data_len; i ++)
@@ -554,7 +554,7 @@ void read_mac_ack(pro_data_t pro_data)
     pro_data_tmp.args_len = 0;
     pro_data_tmp.arg[pro_data_tmp.args_len++] = 0;  // err status
     pro_data_tmp.arg[pro_data_tmp.args_len++] = 6; // mac len
-    
+
     pro_data_tmp.arg[pro_data_tmp.args_len++] = eth0_mac[0]&0xff; // mac
     pro_data_tmp.arg[pro_data_tmp.args_len++] = eth0_mac[1]&0xff; // mac
     pro_data_tmp.arg[pro_data_tmp.args_len++] = eth0_mac[2]&0xff; // mac
@@ -572,37 +572,37 @@ void read_mac_ack(pro_data_t pro_data)
 	#endif
 }
 
-int my_system(const char * cmd)                             
-{                                                          
-	FILE * fp;                                                 
-	int res; 
-	char buf[1024];                                   
-	if (cmd == NULL){                                                          
-		GW_LOG_DBG("my_system cmd is NULL!\n");                        
-		return -1;                                                
-	}                                                         
-	if ((fp = popen(cmd, "r") ) == NULL){                                                          
-		perror("popen");                                           
+int my_system(const char * cmd)
+{
+	FILE * fp;
+	int res;
+	char buf[1024];
+	if (cmd == NULL){
+		GW_LOG_DBG("my_system cmd is NULL!\n");
+		return -1;
+	}
+	if ((fp = popen(cmd, "r") ) == NULL){
+		perror("popen");
 	 	GW_LOG_DBG("popen error: %s/n", strerror(errno));
-	 	return -1;  
-	}                                                          
-	else{                                                         
-		while(fgets(buf, sizeof(buf), fp)){                                                          
-			GW_LOG_DBG("%s", buf);                                         
-		}                                                          
-		if ( (res = pclose(fp)) == -1){                                                          
-			GW_LOG_DBG("close popen file pointer fp error!\n"); 
+	 	return -1;
+	}
+	else{
+		while(fgets(buf, sizeof(buf), fp)){
+			GW_LOG_DBG("%s", buf);
+		}
+		if ( (res = pclose(fp)) == -1){
+			GW_LOG_DBG("close popen file pointer fp error!\n");
+			return res;
+		}
+		else if (res == 0){
+		 	return res;
+		}
+		else{
+			GW_LOG_DBG("popen res is :%d\n", res);
 			return res;
-		}                                                         
-		else if (res == 0){                                                          
-		 	return res;                                               
-		}                                                         
-		else{                                                          
-			GW_LOG_DBG("popen res is :%d\n", res); 
-			return res;             
-		}                                                          
-	}                                                          
-} 
+		}
+	}
+}
 
 int get_art_bin()
 {
@@ -627,7 +627,7 @@ int write_art_bin()
 long get_file_len(FILE * fp)
 {
 	long offset;
-	
+
 	fseek(fp,0,SEEK_END);  //�Ƶ��ļ���β
 	offset = ftell(fp);
 	fseek(fp,0,SEEK_SET);  //�Ƶ��ļ���ͷ
@@ -651,7 +651,7 @@ int mac_modify(unsigned char mac[6])
 
 	if(!(fp =  fopen("/tmp/art.bin","r"))){
 		GW_LOG_DBG("can't open the file: /tmp/art.bin\n");
-		return 0;		
+		return 0;
 	}
 
 	offset = get_file_len(fp);
@@ -679,7 +679,7 @@ int mac_modify(unsigned char mac[6])
 	if(!(fp =  fopen("/tmp/art-modify.bin","w+"))){
 		GW_LOG_DBG("can't open the file: /tmp/art-modify.bin\n");
 		free(file_content);
-		return 0;		
+		return 0;
 	}
 
 	fwrite(file_content,1,offset,fp);
@@ -701,7 +701,7 @@ int get_art_mac(unsigned char mac[6])
 
 	if(!(fp =  fopen("/tmp/art.bin","r"))){
 		GW_LOG_DBG("can't open the file: /tmp/wifi_scan\n");
-		return 0;		
+		return 0;
 	}
 
 	offset = get_file_len(fp);
@@ -732,7 +732,7 @@ void set_mac_ack(pro_data_t pro_data)
 
     pro_data_t pro_data_tmp;
     //uint8_t arg_buf[256];
-    
+
     memset((char*)&pro_data_tmp,0,sizeof(pro_data_t));
     memcpy(&pro_data_tmp,&pro_data,sizeof(pro_data_t));
 
@@ -757,7 +757,7 @@ void set_mac_ack(pro_data_t pro_data)
     // ack handle
     if(mac_modify(mac_iput) == 0)
     {
-         pro_data_tmp.arg[0] = E_Proto_ERROR; 
+         pro_data_tmp.arg[0] = E_Proto_ERROR;
     }
 
     write_art_bin();
@@ -768,7 +768,7 @@ void set_mac_ack(pro_data_t pro_data)
     memcpy(&pro_data_tmp.arg[1],&pro_data.arg[0],pro_data.args_len);
 
     pro_data_tmp.args_len++;
-    
+
     uint8_t data_buf[255] = {0};
     int data_len = 0;
 
@@ -788,13 +788,13 @@ void read_flash_mac_ack(pro_data_t pro_data)
     pro_data_tmp.cf.sof_flag = 0;
 
     //get mac
-   
+
     get_art_mac(eth0_mac);
 
     pro_data_tmp.args_len = 0;
     pro_data_tmp.arg[pro_data_tmp.args_len++] = 0;  // err status
     pro_data_tmp.arg[pro_data_tmp.args_len++] = 6; // mac len
-    
+
     pro_data_tmp.arg[pro_data_tmp.args_len++] = eth0_mac[0]&0xff; // mac
     pro_data_tmp.arg[pro_data_tmp.args_len++] = eth0_mac[1]&0xff; // mac
     pro_data_tmp.arg[pro_data_tmp.args_len++] = eth0_mac[2]&0xff; // mac
@@ -831,7 +831,7 @@ void read_version_ack(pro_data_t pro_data)
     memcpy(&pro_data_tmp.arg[pro_data_tmp.args_len],g_oled_config.version_str,version_len);
 
     pro_data_tmp.args_len += version_len;
-    
+
     uint8_t data_buf[255] = {0};
     uint8_t data_len = 0;
 	printf("---->%s\n",g_oled_config.version_str);
@@ -859,7 +859,7 @@ void exit_subboard_test_ack(pro_data_t pro_data)
 
     pro_data_tmp.args_len = 0;
     pro_data_tmp.arg[pro_data_tmp.args_len++] = 0;  // err status
-    
+
     uint8_t data_buf[255] = {0};
     uint8_t data_len = 0;
 
@@ -869,8 +869,9 @@ void exit_subboard_test_ack(pro_data_t pro_data)
 }
 
 /********************/
-
+#ifdef VOICE_SUPPORT
 extern void kk_vp_opcode_handle(pro_data_t *pro_data);
+#endif
 
 void uart_frame_handle()
 {
@@ -887,8 +888,9 @@ void uart_frame_handle()
     }
 
     uart_protocol_print(&pro_data);
+	#ifdef VOICE_SUPPORT
 	kk_vp_opcode_handle(&pro_data);
-	
+	#endif
 
     return;
 }

common/api/com_api.h

@@ -170,6 +170,8 @@ int kk_reset_retry_num();
 int kk_tcp_client_send(char* data, int len);
 int kk_tcp_client_init(char ip[MAX_IP_LEN], int port, ipc_cb cb);
 void kk_tcp_client_deinit(void);
+
+int kk_set_storage_dir(char* path);
 #if defined(__cplusplus)
 }
 #endif

common/curl/README.txt

@@ -6,3 +6,7 @@
 3. 交叉编译选项 9531： ./configure --disable-dict --disable-ftp --disable-imap	--disable-ldap --disable-file --disable-gopher --disable-imap --disable-ldaps --disable-pop3 --disable-proxy --disable-rtsp --disable-smtp --disable-telnet --disable-tftp --disable-zlib --without-ca-bundle --without-gnutls --without-libidn --without-librtmp --without-libssh2 --without-nss --without-zlib --host=mips-openwrt-linux CC=mips-openwrt-linux-gcc --prefix=$PWD/__install
 
 4. 编译example：gcc -o example_curl example_curl.c -L. -lcurl_ubuntu
+
+#########20220127 by allan###############################
+1. 由于android ndk中带版本后缀的无法使用，所以新增不带版本的库，在ndk中验证通过，但是对于其他工程没有验证
+   libcurl_a133_NoVersion.so，libcrypto_a133_NoVersion.so， libssl_a133_NoVersion.so

common/hal/kk_product.h

@@ -25,7 +25,7 @@
 #define VERSION_MAXLEN     (16 + 1)
 #define HAL_CID_LEN                 (64 + 1)
 #define NETWORK_ADDR_LEN        (16+1)        /* IP�����ַ�ij��� */
-#define MAC_ADDR_LEN        (17+1)        
+#define MAC_ADDR_LEN        (17+1)
 #define SN_ADDR_LEN        (32+1)
 
 #define PRODUCT_TPYE  "kk"
@@ -33,7 +33,7 @@
 #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"
@@ -90,6 +90,76 @@
 #define  KK_DEFAULT_CONFIG_FILE_PATH    "/app/ccuApps/config/cloud_default_config.json"
 #define  KK_AUTH_CONFIG_FILE_PATH    "/tmp/auth_conf.json"
 #endif
+*/
+
+#ifdef CONFIG_A133_PLATFORM
+#define STORSGE_DIR  "/data/local"
+#define GET_CCUID_CMD               "getprop app.ccuinfo"//"cat /mnt/private/ULI/factory/ccuinfo.txt"//"getprop ro.ccuinfo"//
+#define GET_KEY_CMD                 "getprop app.ccuinfo"//"cat /mnt/private/ULI/factory/ccuinfo.txt"
+#define GET_PRODUCTID_CMD           "getprop ro.product.ccu.pid"
+#elif CONFIG_8197_PLATFORM
+#define STORSGE_DIR  "/data"
+#define GET_CCUID_CMD               "eval `flash get CUSTOMER_HW_KK_OPTION0`; echo $CUSTOMER_HW_KK_OPTION0"
+#define GET_KEY_CMD                 "eval `flash get CUSTOMER_HW_KK_OPTION1`; echo $CUSTOMER_HW_KK_OPTION1"
+#define GET_PRODUCTID_CMD           "eval `flash get CUSTOMER_HW_KK_OPTION2`; echo $CUSTOMER_HW_KK_OPTION2"
+#else
+#define STORSGE_DIR  "/data"
+#define GET_CCUID_CMD               "fw_printenv uuid -n"
+#define GET_KEY_CMD                 "fw_printenv key -n"
+#define GET_PRODUCTID_CMD           "fw_printenv pid -n"
+#endif
+
+#define KK_DEVICESECRET_PATH_SUB      	"kk/kk_deviceSecret.txt"
+#define KK_TOKEN_PATH_SUB      			"kk/kk_token.txt"
+#define KK_DEVICE_MAP_FILE_PATH_SUB     "kk/map/device_%s.json"
+#ifdef CONFIG_NDK
+#define KK_DB_FILE_SUB                  "kk/kk_database.db"
+#define KK_LAN_NODE_DB_FILE_SUB 		"kk/kk_lan_node.db"
+#elif CONFIG_A133_PLATFORM
+#define KK_DB_FILE_SUB                  "kk/db/kk_database.db"
+#define KK_LAN_NODE_DB_FILE_SUB 		"kk/db/kk_lan_node.db"
+#else
+#define KK_DB_FILE_SUB                  "kk/kk_database.db"
+#define KK_LAN_NODE_DB_FILE_SUB 		"kk/kk_lan_node.db"
+#endif
+#define TSL_SUBDEVICE_PATH_FILE_SUB     "kk/tsl/product_%s.json"
+#define TSL_GATEWAY_PATH_FILE_SUB       "kk/tsl/gateway_%s.json"
+#define TSL_CCU_PATH_FILE_SUB           "kk/tsl/ccu_%s.json"
+#define TSL_SCENE_PATH_FILE_SUB         "kk/tsl/ccu_%s_scene.json"
+#define OTA_IMG_PATH_SUB                "OTA/"
+#define OTA_IMG_FILE_SUB                "OTA/app_squashfs.img"
+#define OTA_IMG_FILE_MD5_SUB            "OTA/app_squashfs.img.md5"
+
+#define KK_CONFIG_FILE_PATH_SUB 		"kk/kk_cloud_conf.json"
+#ifdef CONFIG_NDK
+#define KK_DEFAULT_CONFIG_FILE_PATH_SUB 	"kk/cloud_default_config.json"
+#elif
+#define KK_DEFAULT_CONFIG_FILE_PATH_SUB 	"kk/etc/cloud_default_config.json"
+#endif
+#define KK_AUTH_CONFIG_FILE_PATH_SUB 		"kk/auth_conf.json"
+
+
+
+__attribute__((weak)) char KK_DEVICESECRET_PATH[128]	= STORSGE_DIR"/"KK_DEVICESECRET_PATH_SUB;
+__attribute__((weak)) char KK_TOKEN_PATH[128]	= STORSGE_DIR"/"KK_TOKEN_PATH_SUB;
+__attribute__((weak)) char KK_DEVICE_MAP_FILE_PATH[128] = STORSGE_DIR"/"KK_DEVICE_MAP_FILE_PATH_SUB;
+__attribute__((weak)) char KK_DB_FILE[128] = STORSGE_DIR"/"KK_DB_FILE_SUB;
+__attribute__((weak)) char KK_LAN_NODE_DB_FILE[128]	= STORSGE_DIR"/"KK_LAN_NODE_DB_FILE_SUB;
+__attribute__((weak)) char TSL_SUBDEVICE_PATH_FILE[128] = STORSGE_DIR"/"TSL_SUBDEVICE_PATH_FILE_SUB;
+__attribute__((weak)) char TSL_GATEWAY_PATH_FILE[128] = STORSGE_DIR"/"TSL_GATEWAY_PATH_FILE_SUB;
+__attribute__((weak)) char TSL_CCU_PATH_FILE[128] = STORSGE_DIR"/"TSL_CCU_PATH_FILE_SUB;
+__attribute__((weak)) char TSL_SCENE_PATH_FILE[128] = STORSGE_DIR"/"TSL_SCENE_PATH_FILE_SUB;
+__attribute__((weak)) char OTA_IMG_PATH[128] = STORSGE_DIR"/"OTA_IMG_PATH_SUB;
+__attribute__((weak)) char OTA_IMG_FILE[128] = STORSGE_DIR"/"OTA_IMG_FILE_SUB;
+__attribute__((weak)) char OTA_IMG_FILE_MD5[128] = STORSGE_DIR"/"OTA_IMG_FILE_MD5_SUB;
+__attribute__((weak)) char KK_CONFIG_FILE_PATH[128]	= STORSGE_DIR"/"KK_CONFIG_FILE_PATH_SUB;
+#ifdef CONFIG_A133_PLATFORM
+__attribute__((weak)) char KK_DEFAULT_CONFIG_FILE_PATH[128]	= STORSGE_DIR"/"KK_DEFAULT_CONFIG_FILE_PATH_SUB;
+__attribute__((weak)) char KK_AUTH_CONFIG_FILE_PATH[128]	= STORSGE_DIR"/"KK_AUTH_CONFIG_FILE_PATH_SUB;
+#else
+__attribute__((weak)) char KK_DEFAULT_CONFIG_FILE_PATH[128]	= "/app/ccuApps/config/cloud_default_config.json";
+__attribute__((weak)) char KK_AUTH_CONFIG_FILE_PATH[128]	= "/tmp/auth_conf.json";
+#endif
 
 enum {
     DEVICE_OFFLINE = 0,

common/nanomsg/readme.txt

+##########20220127 by allan##################################
+1. 由于android ndk中带版本后缀的无法使用，所以新增不带版本的库，使用通用未验证
+   libnanomsg_a133_NoVersion.so
\ No newline at end of file

common/sqlite/iot.mk

-LIBA_TARGET 		:= libsqlite.a
\ No newline at end of file
+ifeq ($(CONFIG_MODEL),a133_ndk)
+LIBSO_TARGET 		:= libsqlite.so
+else
+LIBA_TARGET 		:= libsqlite.a
+endif
\ No newline at end of file

makefile

@@ -23,7 +23,7 @@ SUBDIRS                 += common/nanomsg
 SUBDIRS                 += common/ev
 SUBDIRS                 += common/sqlite
 SUBDIRS                 += common/hal
-#SUBDIRS                 += factory_test_src/src
+SUBDIRS                 += midware/tsl
 #SUBDIRS                 += common/zlog
 #SUBDIRS                 += platform/zigbee
 

midware/midware/iot.mk

+ifeq ($(CONFIG_MODEL),a133_ndk)
+LIBSO_TARGET 		:= libmid.so
+else
 LIBA_TARGET 		:= libmid.a
 
 $(call Append_Conditional, LIB_SRCS_EXCLUDE, midware.c)
 $(call Append_Conditional, SRCS_kk_midware, midware.c)
 $(call Append_Conditional, TARGET, kk_midware)
+endif
 
 CFLAGS 			+= -I$(TOP_DIR)/common/nanomsg/include
 CFLAGS 			+= -I$(TOP_DIR)/common/ev/include
@@ -27,6 +31,10 @@ 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 ifeq ($(CONFIG_MODEL),a133_ndk)
+	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/tsl/iot.mk

+ifeq ($(CONFIG_MODEL),a133_ndk)
+LIBSO_TARGET 		:= libtsl.so
+else
 LIBA_TARGET 		:= libtsl.a
-
+endif

tools/board/config.android-ndk.a133_ndk

+CONFIG_ENV_CFLAGS   += \
+    -Os -Wall\
+    -g3 --coverage \
+    -D_PLATFORM_IS_LINUX_ \
+
+CONFIG_ENV_CFLAGS   += \
+    -DWITH_MQTT_DYN_BUF=1 \
+    -DWITH_MEM_STATS=0 \
+    -DWITH_MEM_STATS_PER_MODULE=0 \
+    -DWITH_MQTT_JSON_FLOW=1 \
+    -DWITH_MQTT_ZIP_TOPIC=1 \
+    -DWITH_MQTT_SUB_SHORTCUT=1 \
+    -DSDK_TEAM_TEST \
+	-D_GNU_SOURCE \
+	
+CONFIG_ENV_CFLAGS   += \
+    -DCONFIG_HTTP_AUTH_TIMEOUT=500 \
+    -DCONFIG_MID_HTTP_TIMEOUT=500 \
+    -DCONFIG_GUIDER_AUTH_TIMEOUT=500 \
+    -DCONFIG_MQTT_RX_MAXLEN=5000 \
+    -DCONFIG_MBEDTLS_DEBUG_LEVEL=0 \
+    -DCONFIG_A133_PLATFORM \
+    -DCONFIG_NDK \
+
+CONFIG_ENV_CFLAGS   += -rdynamic
+CONFIG_ENV_CFLAGS   += -Wno-unused -std=c99 
+
+CONFIG_ENV_LDFLAGS  += -pthread
+
+OVERRIDE_CC = arm-linux-androideabi-gcc
+OVERRIDE_AR = arm-linux-androideabi-ar
+OVERRIDE_LD = arm-linux-androideabi-ld
+CROSS_PREFIX = arm-linux-androideabi-
+
+OVERRIDE_STRIP      := arm-linux-androideabi-strip
+

tools/build-rules/_rules-top.mk

@@ -271,6 +271,33 @@ package_a133:
 	cp -rf $(TOP_DIR)/nx5_soc_gw/smarthome_z3gw_a133 $(TOP_DIR)/kk_a133/bin/smarthome_z3gw
 	cp -rf $(TOP_DIR)/nx5_soc_gw/kk_device_def.json $(TOP_DIR)/kk_a133/etc/
 
+package_a133_ndk:
+	@echo "$(buildDate)"
+	echo "kk_a133_ndk"
+	rm -rf kk_a133_ndk
+
+	mkdir -p kk_a133_ndk/lib
+	mkdir -p kk_a133_ndk/assets/kk
+	mkdir -p kk_a133_ndk/assets/kk/map
+	mkdir -p kk_a133_ndk/assets/kk/etc
+
+	cp -rf $(TOP_DIR)/VERSION $(TOP_DIR)/kk_a133_ndk/assets/kk/etc
+
+	cp -rf $(TOP_DIR)/output/release/lib/*.so $(TOP_DIR)/kk_a133_ndk/lib
+	cp -rf $(TOP_DIR)/common/ev/libev_a133.so $(TOP_DIR)/kk_a133_ndk/lib/libev.so
+	cp -rf $(TOP_DIR)/common/nanomsg/libnanomsg_a133_NoVersion.so $(TOP_DIR)/kk_a133_ndk/lib/libnanomsg.so
+	cp -rf $(TOP_DIR)/common/curl/libcurl_a133_NoVersion.so $(TOP_DIR)/kk_a133_ndk/lib/libcurl.so
+	cp -rf $(TOP_DIR)/common/curl/libcrypto_a133_NoVersion.so $(TOP_DIR)/kk_a133_ndk/lib/libcrypto.so
+	cp -rf $(TOP_DIR)/common/curl/libssl_a133_NoVersion.so $(TOP_DIR)/kk_a133_ndk/lib/libssl.so
+	#zigbee gateway lib
+	cp -rf $(TOP_DIR)/nx5_soc_gw/smarthome_z3gw_a133_ndk_lib*.so $(TOP_DIR)/kk_a133_ndk/lib
+	
+	cp -rf $(TOP_DIR)/opcodeMapCfg/* $(TOP_DIR)/kk_a133_ndk/assets/kk/map
+	cp -rf $(TOP_DIR)/config/* $(TOP_DIR)/kk_a133_ndk/assets/kk/
+	cp -rf $(TOP_DIR)/tsl $(TOP_DIR)/kk_a133_ndk/assets/kk/
+	cp -rf $(TOP_DIR)/nx5_soc_gw/kk_device_def.json $(TOP_DIR)/kk_a133_ndk/assets/kk/
+
+
 squashfs: package
 	@echo "build squashfs"