【修改内容】调整子设备的数据库元素

【提交人】陈伟灿

midware/midware/dm/kk_linkkit.c

@@ -1667,7 +1667,7 @@ int kk_mid_subdev_add(char product_key[PRODUCT_KEY_MAXLEN], char device_name[DEV
     }
     printf("subdev open susseed, devid = %d\n", devid);
 
-	res = kk_subDev_insert_db(0,device_mac,product_key,device_secret,device_name);
+	res = kk_subDev_insert_db(0,product_key,device_name,device_secret,device_mac);
     if (res != SUCCESS_RETURN) {
         return FAIL_RETURN;
     }	

midware/midware/dm/kk_sub_db.c

@@ -48,7 +48,7 @@ static int kk_subDev_db_Init(void)
     }     
     printf("sub db Database opened\n");
     {
-		const char *pSubDevTable = "CREATE TABLE IF NOT EXISTS SubDeviceInfo(idx INTEGER,isOnline INTEGER,deviceMac varchar(17),productId varchar(33), deviceSN varchar(33), deviceId varchar(33))";
+		const char *pSubDevTable = "CREATE TABLE IF NOT EXISTS SubDeviceInfo(idx INTEGER,isOnline INTEGER,product_type varchar(33), device_name varchar(33), device_secret varchar(33),device_mac varchar(17))";
 
 	    char *pcErr;
         
@@ -74,14 +74,16 @@ static int _kk_load_subDevice(void)
 	const char *searchCmd = "select * from SubDeviceInfo;";	
 	sqlite3_stmt *stmt;	
     kk_subDb_ctx_t *ctx = _kk_subDb_get_ctx();
-	int devId;
+	int devId = 0;
 	int res = 0;
 	_kk_subDb_lock();
 	sqlite3_prepare_v2(ctx->pDb, searchCmd, strlen(searchCmd), &stmt, NULL);
 	printf("_kk_load_subDevice total_column = %d\n", sqlite3_column_count(stmt));	
 	while(sqlite3_step(stmt) == SQLITE_ROW){
+		
 	   res = dm_mgr_subdev_create(sqlite3_column_text(stmt, 2),sqlite3_column_text(stmt, 3),sqlite3_column_text(stmt, 4),
 	   					sqlite3_column_text(stmt, 5),&devId);
+	
 	   if(res != SUCCESS_RETURN){
 		   printf("[%s][%d]dm_mgr_subdev_create FAIL!!!\n",__FUNCTION__,__LINE__);
 	   }
@@ -126,7 +128,7 @@ static int _kk_check_subDev_exist(const char* device_mac)
 	sqlite3_prepare_v2(ctx->pDb, searchCmd, strlen(searchCmd), &stmt, NULL);
 	printf("total_column = %d\n", sqlite3_column_count(stmt));
 	while(sqlite3_step(stmt) == SQLITE_ROW){
-	   pmac = sqlite3_column_text(stmt, 1);
+	   pmac = sqlite3_column_text(stmt, 5);
 	   if(!strcmp(device_mac,pmac))
 	   {
 		 isExist = 1;
@@ -142,10 +144,10 @@ static int _kk_check_subDev_exist(const char* device_mac)
 
 }
 
-int kk_subDev_insert_db(int isOnline,char device_mac[DEVICE_MAC_MAXLEN],char product_Id[PRODUCT_KEY_MAXLEN], \
-										char device_SN[DEVICE_SN_MAXLEN],char device_Id[DEVICE_NAME_MAXLEN])
+int kk_subDev_insert_db(int isOnline,char product_type[PRODUCT_KEY_MAXLEN],char device_name[DEVICE_NAME_MAXLEN], \
+										char device_secret[DEVICE_SECRET_MAXLEN],char device_mac[DEVICE_MAC_MAXLEN])
 {
-	const char *insertCmd = "insert into SubDeviceInfo (idx,isOnline, deviceMac, productId,deviceSN,deviceId) values ('%d','%d', '%s', '%s','%s','%s');";
+	const char *insertCmd = "insert into SubDeviceInfo (idx,isOnline, product_type, device_name,device_secret,device_mac) values ('%d','%d', '%s', '%s','%s','%s');";
 	char *sqlCmd = NULL;
 	int rc = 0;
 	char *zErrMsg = 0;
@@ -158,14 +160,14 @@ int kk_subDev_insert_db(int isOnline,char device_mac[DEVICE_MAC_MAXLEN],char pro
 		return SUCCESS_RETURN;
 	}
 	_kk_subDb_lock();
-	sqlCmd = sqlite3_mprintf(insertCmd,ctx->subDevNum,isOnline,device_mac,product_Id,device_SN,device_Id);	
+	sqlCmd = sqlite3_mprintf(insertCmd,ctx->subDevNum,isOnline,product_type,device_name,device_secret,device_mac);	
 
 	rc = sqlite3_exec(ctx->pDb, sqlCmd, NULL, NULL, &zErrMsg);
 	if( rc != SQLITE_OK ){
 	   printf("SQL error: %s\n", zErrMsg);
 	   sqlite3_free(zErrMsg);
 	}else{
-	   printf("Table insert data successfully\n");
+	   printf("sub device insert data successfully\n");
 	}
 	sqlite3_free(sqlCmd);
 	ctx->subDevNum++;

midware/tsl/tsl_handle/kk_tsl_load.c

@@ -61,7 +61,7 @@ char* kk_load_json(const char *tslFile)
 	if(!(fp =  fopen(tslFile,"a+")))
 	{
 		printf("can't open the file account.txt\n");
-		return -1;
+		return NULL;
 	}
     fseek(fp, 0L, SEEK_END);
     filesize = ftell(fp);	
@@ -70,7 +70,7 @@ char* kk_load_json(const char *tslFile)
 	if(buf == NULL)
 	{
 		printf("MALLOC FAIL!!!\n");
-		return -1;
+		return NULL;
 
 	}
 	memset(buf,0x0,filesize+1);