Merge branch 'hzl' into 'master'

1.nx5编译不过问题

See merge request chenweican/k-sdk!183

common/hal/kk_product.h

@@ -133,7 +133,7 @@
 #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
+#elif CONFIG_A133_PLATFORM
 #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"

midware/midware/scene/kk_scene_db.h

@@ -104,4 +104,7 @@ int kk_scene_delete_panel_scene_info(char *buttonId,char *deviceCode);
 int kk_scene_deleteall_panel_scene_info(char *deviceCode);
 int kk_scene_update_productType(const char *sceneId,char *productType);
 int kk_scene_update_actionRoomId(const char *sceneId,char *roomId);
+int kk_scene_update_device_active(char *deviceCode,int epNum,int value);
+int kk_scene_rebuild_device_active(char *deviceCode,int epNum);
+
 #endif

midware/midware/scene/kk_scene_handle.c

@@ -2662,21 +2662,21 @@ static int _kk_rebuild_device_active(char *sceneid)
 	cJSON *array = cJSON_CreateArray();
 	while(sqlite3_step(stmt) == SQLITE_ROW){
 		count++;
-		pSceneType = sqlite3_column_text(stmt, DB_SCENEACTION_TYPE);
-		pDeviceCode = sqlite3_column_text(stmt, DB_SCENEACTION_DEVICECODE);
+		pSceneType = (char *)sqlite3_column_text(stmt, DB_SCENEACTION_TYPE);
+		pDeviceCode = (char *)sqlite3_column_text(stmt, DB_SCENEACTION_DEVICECODE);
 		epNum = sqlite3_column_int(stmt, DB_SCENEACTION_EPNUM);
-		gwDeviceCode = sqlite3_column_text(stmt, DB_SCENEACTION_GWDEVICECODE);
+		gwDeviceCode = (char *)sqlite3_column_text(stmt, DB_SCENEACTION_GWDEVICECODE);
 		if(strcmp(pSceneType,"action/thing/group") == 0){
 			cJSON *arrayParam = cJSON_CreateObject();
 			cJSON_AddStringToObject(arrayParam,MSG_SCENE_TYPE,pSceneType);
 			cJSON_AddStringToObject(arrayParam,MSG_DEVICE_CODE_STR,pDeviceCode);
-			cJSON_AddStringToObject(arrayParam,MSG_SCENE_EPNUM,epNum);
+			cJSON_AddNumberToObject(arrayParam,MSG_SCENE_EPNUM,epNum);
 			isMuti = 1;
 			cJSON_AddItemToArray(array,arrayParam);
 		}else{
 			kk_scene_action_detail_t info = {0};
-			char *propertyName = sqlite3_column_text(stmt, DB_SCENEACTION_PROPERTYNAME);
-			char *propertyValueStr = sqlite3_column_text(stmt, DB_SCENEACTION_PROPERTYVALUE);
+			char *propertyName = (char *)sqlite3_column_text(stmt, DB_SCENEACTION_PROPERTYNAME);
+			char *propertyValueStr = (char *)sqlite3_column_text(stmt, DB_SCENEACTION_PROPERTYVALUE);
 			int idelay = sqlite3_column_int(stmt, DB_SCENEACTION_DELAY);
 			memcpy(info.deviceCode,pDeviceCode,strlen(pDeviceCode));
 			memcpy(info.propertyName,propertyName,strlen(propertyName));