【修改内容】调整数据库创建方式，调整为采用一个数据库建多张表的方式

【提交人】陈伟灿

midware/midware/area/kk_area_handle.c

@@ -5,7 +5,7 @@
 #include "kk_log.h"
 #include "kk_area_handle.h"
 
-#define KK_AREA_DB_FILE                                   "/usr/kk/kk_area.db"
+extern sqlite3 *g_kk_pDb;
 
 static kk_dev_list_t *s_device_list = NULL;
 
@@ -58,13 +58,8 @@ static int _kk_area_db_init(void)
 
     //eUtils_LockLock(&sLock);
     _kk_area_lock();
+    ctx->pDb = g_kk_pDb;
    
-    if (sqlite3_open_v2(KK_AREA_DB_FILE, &ctx->pDb, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_FULLMUTEX, NULL) != SQLITE_OK)
-    { 
-        ERROR_PRINT("Error initialising linkage database (%s)", sqlite3_errmsg(ctx->pDb));
-		_kk_area_unlock();
-        return FAIL_RETURN; 
-    }     
     INFO_PRINT("area db Database opened\n");
     
 	const char *pAreaTable = "CREATE TABLE IF NOT EXISTS AreaInfo( \

midware/midware/dm/kk_property_db.c

@@ -5,9 +5,7 @@
 #include "kk_dm_mng.h"
 #include "kk_property_db.h"
 
-
-#define KK_PROPERTIES_DB_FILE                                   "/usr/kk/kk_properties.db"
-
+extern sqlite3 *g_kk_pDb;
 typedef struct {
     void *mutex;
     sqlite3 *pDb;	
@@ -48,13 +46,8 @@ static int kk_property_db_Init(void)
 
     //eUtils_LockLock(&sLock);
     _kk_property_db_lock();
+    ctx->pDb = g_kk_pDb;
   
-    if (sqlite3_open_v2(KK_PROPERTIES_DB_FILE, &ctx->pDb, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_FULLMUTEX, NULL) != SQLITE_OK)
-    { 
-        ERROR_PRINT("Error initialising linkage database (%s)", sqlite3_errmsg(ctx->pDb));
-		_kk_property_db_unlock();
-        return FAIL_RETURN; 
-    }     
     INFO_PRINT("property db Database opened\n");
     {
 		const char *pPrpertyTable = "CREATE TABLE IF NOT EXISTS PropertiesInfo( \
@@ -354,11 +347,11 @@ int kk_property_sync_values(const char *deviceCode)
 			    res = kk_tsl_set_value(kk_tsl_set_property_value,node->dev_shadow,pIdentifier,&value_int,NULL);
 			}
 			else if(valueType == KK_TSL_DATA_TYPE_FLOAT){
-				float value_float = atoi(valueStr);
+				float value_float = atof(valueStr);
 				res = kk_tsl_set_value(kk_tsl_set_property_value,node->dev_shadow,pIdentifier,&value_float,NULL);
 			}
 			else if(valueType == KK_TSL_DATA_TYPE_DOUBLE){
-				double value_double = atoi(valueStr);
+				double value_double = atof(valueStr);
 				res = kk_tsl_set_value(kk_tsl_set_property_value,node->dev_shadow,pIdentifier,&value_double,NULL);
 			}
 			else{

midware/midware/dm/kk_sub_db.c

@@ -7,7 +7,7 @@
 #include "sqlite3.h"
 #include "kk_log.h"
 
-#define KK_SUB_DB_FILE                                   "/usr/kk/subDevice.db"
+extern sqlite3 *g_kk_pDb;
 
 typedef struct {
     void *mutex;
@@ -55,12 +55,8 @@ static int kk_subDev_db_Init(void)
     //eUtils_LockLock(&sLock);
     _kk_subDb_lock();
 	
-    if (sqlite3_open_v2(KK_SUB_DB_FILE, &ctx->pDb, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_FULLMUTEX, NULL) != SQLITE_OK)
-    { 
-        ERROR_PRINT("Error initialising linkage database (%s)", sqlite3_errmsg(ctx->pDb));
-		_kk_subDb_unlock();
-        return FAIL_RETURN; 
-    }     
+	ctx->pDb = g_kk_pDb;
+       
     INFO_PRINT("sub db Database opened\n");
     {
 		const char *pSubDevTable = "CREATE TABLE IF NOT EXISTS SubDeviceInfo( \

midware/midware/midware.c

@@ -20,6 +20,7 @@
 #include "kk_log.h"
 #include "kk_dm_queue.h"
 #include "kk_property_db.h"
+#include "sqlite3.h"
 
 
 char * g_filerToPlatTable[] = 
@@ -807,8 +808,18 @@ void *ccu_property_monitor(void *args)
     }
     return NULL;
 }
+sqlite3 *g_kk_pDb;
+#define KK_DB_FILE                                   "/usr/kk/kk_database.db"
 
-
+int kk_sqlite_init(void)
+{
+    if (sqlite3_open_v2(KK_DB_FILE, &g_kk_pDb, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_FULLMUTEX, NULL) != SQLITE_OK)
+    { 
+        ERROR_PRINT("Error initialising linkage database fail!!!\n");
+        return FAIL_RETURN; 
+    }   
+	return SUCCESS_RETURN; 
+}
 int main(const int argc, const char **argv)
 {
 
@@ -821,11 +832,13 @@ int main(const int argc, const char **argv)
 		open("midware",LOG_PID,LOG_USER);
         memset(mid_ctx, 0, sizeof(mid_ctx_t));
 
+		kk_sqlite_init();
         kk_tsl_api_init();
         kk_ipc_init(IPC_MID2APP, mid_cb, NULL, NULL);
         kk_ipc_init(IPC_MID2PLAT, mid2p_cb, NULL, "*");
 		
         kk_init_dmproc();
+		
 		kk_subDb_init();
 		kk_heartbeat_init();
 		kk_area_init();