Merge branch 'master' of http://172.17.3.10:17001/chenweican/k-sdk

common/hal/iot.mk

-LIBA_TARGET 		:= libkk_hal.a
+LIBSO_TARGET 		:= libkk_hal.so
\ No newline at end of file

midware/midware/dm/kk_property_db.c

@@ -3,6 +3,7 @@
 #include "sqlite3.h"
 #include "kk_log.h"
 #include "kk_dm_mng.h"
+#include "kk_property_db.h"
 
 
 #define KK_PROPERTIES_DB_FILE                                   "kk_properties.db"
@@ -185,6 +186,93 @@ int kk_property_db_update_value(const char *deviceCode,const char *identifier,co
 	return SUCCESS_RETURN;
 }
 
+int kk_property_db_get_value(const char *deviceCode,const char *identifier,void* value)
+{
+	char *sqlCmd = NULL;
+	int rc = 0;
+	char *zErrMsg = 0;
+	sqlite3_stmt *stmt;
+	char *valueStr = NULL;
+	int valueType = 0;
+    kk_property_db_ctx_t *ctx = _kk_property_db_get_ctx();
+
+	_kk_property_db_lock();
+
+	sqlCmd = sqlite3_mprintf("select * from PropertiesInfo WHERE deviceCode= '%s' and identifier = '%s'",deviceCode,identifier);	
+	DEBUG_PRINT("kk_property_db_get_value sqlCmd:%s\n",sqlCmd);
+
+	sqlite3_prepare_v2(ctx->pDb, sqlCmd, strlen(sqlCmd), &stmt, NULL);
+	
+
+	while(sqlite3_step(stmt) == SQLITE_ROW){
+        valueStr = sqlite3_column_text(stmt, DB_VALUE);
+        valueType = sqlite3_column_int(stmt, DB_VALUETYPE);
+        if(valueType == KK_TSL_DATA_TYPE_INT||
+            valueType == KK_TSL_DATA_TYPE_ENUM||
+            valueType == KK_TSL_DATA_TYPE_BOOL){
+            int value_int = atoi(valueStr);
+            *(int*)value = value_int;
+
+        }
+		else if(valueType == KK_TSL_DATA_TYPE_FLOAT){
+			float value_float = atoi(valueStr);
+			*(float*)value = value_float;
+		}
+		else if(valueType == KK_TSL_DATA_TYPE_DOUBLE){
+			double value_double = atoi(valueStr);
+			*(double*)value = value_double;
+		}
+		else{
+			memcpy(value,valueStr, strlen(valueStr));
+		}
+	}
+	sqlite3_free(sqlCmd);
+	_kk_property_db_unlock();
+    sqlite3_finalize(stmt);
+
+	return SUCCESS_RETURN;
+}
+
+int kk_property_db_get_rawdata(const char *identifier,const int dev_type, kk_prop_raw_struct_t* raw, int count)
+{
+	char *sqlCmd = NULL;
+	int rc = 0;
+	char *zErrMsg = 0;
+	sqlite3_stmt *stmt;
+	char *valueStr = NULL;
+	char *devcode = NULL;
+	int valueType = 0;
+	int idx = 0;
+	kk_prop_raw_struct_t *curData = NULL;
+    kk_property_db_ctx_t *ctx = _kk_property_db_get_ctx();
+
+	_kk_property_db_lock();
+
+	sqlCmd = sqlite3_mprintf("select * from PropertiesInfo WHERE devType= '%d' and identifier = '%s'",dev_type,identifier);	
+	DEBUG_PRINT("kk_property_db_get_gw_value sqlCmd:%s\n",sqlCmd);
+
+	sqlite3_prepare_v2(ctx->pDb, sqlCmd, strlen(sqlCmd), &stmt, NULL);
+	
+    curData = raw;
+	while(sqlite3_step(stmt) == SQLITE_ROW && idx < count){
+	    devcode = sqlite3_column_text(stmt, DB_DEVICECODE);
+        valueStr = sqlite3_column_text(stmt, DB_VALUE);
+        valueType = sqlite3_column_int(stmt, DB_VALUETYPE);
+        memcpy(curData->deviceCode,devcode, strlen(devcode));
+        memcpy(curData->raw,valueStr, strlen(valueStr));
+        curData->type = valueType;
+        
+		curData++;
+		idx++;
+	}
+	sqlite3_free(sqlCmd);
+	_kk_property_db_unlock();
+    sqlite3_finalize(stmt);
+
+	return SUCCESS_RETURN;
+}
+
+
 int kk_property_db_update(const char *deviceCode)
 {
     int res = 0;
@@ -285,6 +373,7 @@ int kk_property_sync_values(const char *deviceCode)
 
 
 	}
+	sqlite3_free(sqlCmd);
 	_kk_property_db_unlock();
 	sqlite3_finalize(stmt);
 

midware/midware/dm/kk_property_db.h

-#ifndef _KK_PROPERTY_DB_H_
-#define _KK_PROPERTY_DB_H_
-#include "kk_tsl_common.h"
-
-int kk_property_db_init(void);
-
-#endif
-
+#ifndef _KK_PROPERTY_DB_H_
+#define _KK_PROPERTY_DB_H_
+#include "kk_tsl_common.h"
+
+typedef struct{
+    int type;
+	char deviceCode[DEVICE_CODE_MAXLEN];
+	char raw[60];
+}kk_prop_raw_struct_t;
+
+int kk_property_db_init(void);
+
+#endif
+