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

@@ -18,7 +18,7 @@ enum{
 	DB_SCENEINFO_PRODUCTTYPE,
 	DB_SCENEINFO_ACTIONROOMID,
 };
-	
+
 enum{
 	DB_SCENETRIGGER_TYPE = 0,
 	DB_SCENETRIGGER_DEVICECODE,
@@ -42,7 +42,7 @@ enum{
 enum{
 	DB_SCENEACTION_TYPE = 0,
 	DB_SCENEACTION_DEVICECODE,
-	DB_SCENEACTION_EPNUM,	
+	DB_SCENEACTION_EPNUM,
 	DB_SCENEACTION_PROPERTYNAME,
 	DB_SCENEACTION_PROPERTYVALUE,
 	DB_SCENEACTION_DELAY,
@@ -90,18 +90,21 @@ int kk_scene_insert_scene_action(const char* type,const char* deviceCode,int epN
 												const char* propertyValue,int delay,const char* sceneId,const char *gwdeviceCode);
 int kk_scene_insert_scene_invokeService(const char* type,const char* identifier,const char* args,const char* sceneId);
 int kk_scene_insert_scene_embed(int delay,const char* executeSceneId,const char* sceneId);
-int kk_scene_insert_scene_timer(time_t startTime,char weekflag,const char* sceneId);	
+int kk_scene_insert_scene_timer(time_t startTime,char weekflag,const char* sceneId);
 int kk_scene_insert_scene_condition(const char* type,int startTime,int endTime,int crossDay,
 												char repeat_days,const char* sceneId);
 												int kk_scene_insert_scene_trigger(const char* type,const char* deviceCode,int epNum,const char* propertyName,
 												const char* compareType,const char* compareValue,const char* sceneId,int isAnd);
 int kk_scene_insert_scene_info(const char* roomId,const char* sceneName,int sceneType,int enable,const char* sceneId,char *productType,char *actionRoomId);
 int kk_scene_update_scene_enable(int enable,const char *sceneId);
-int kk_scene_db_init(void);					
+int kk_scene_db_init(void);
 int kk_scene_insert_panel_scene_info(int bindType,char *buttonId,char *deviceCode,const char* sceneId,const char* roomId,const char* productType);
 int kk_scene_delete_quickpanel_info(char *buttonId,char* deviceCode);
 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