Merge branch 'cwc' into 'master'

【修改内容】增加场景嵌套功能

See merge request chenweican/k-sdk!66

midware/midware/scene/kk_scene_db.h

+
+#ifndef __KK_SCENE_DB_H__
+#define __KK_SCENE_DB_H__
+
+typedef enum{
+	DB_SCENETYPE_SCENE = 0,
+	DB_SCENETYPE_IFTT,
+	DB_SCENETYPE_TIMING,
+	DB_SCENETYPE_MUTICONTROL,
+};
+
+typedef enum{
+	DB_SCENEINFO_NAME = 0,
+	DB_SCENEINFO_SCENETYPE,
+	DB_SCENEINFO_ENABLE,
+	DB_SCENEINFO_SCENEID,
+};
+	
+typedef enum{
+	DB_SCENETRIGGER_TYPE = 0,
+	DB_SCENETRIGGER_DEVICECODE,
+	DB_SCENETRIGGER_EPNUM,
+	DB_SCENETRIGGER_PROPERTYNAME,
+	DB_SCENETRIGGER_COMPARETYPE,
+	DB_SCENETRIGGER_COMPAREVALUE,
+	DB_SCENETRIGGER_SCENEID,
+	//DB_SCENETRIGGER_TRIGGERFLAG,
+};
+
+typedef enum{
+	DB_SCENECONDITION_TYPE = 0,
+	DB_SCENECONDITION_STARTTIME,
+	DB_SCENECONDITION_ENDTIME,
+	DB_SCENECONDITION_CROSSDAY,
+	DB_SCENECONDITION_REPEATDAY,
+	DB_SCENECONDITION_SCENEID,
+};
+
+typedef enum{
+	DB_SCENEACTION_TYPE = 0,
+	DB_SCENEACTION_DEVICECODE,
+	DB_SCENEACTION_EPNUM,	
+	DB_SCENEACTION_PROPERTYNAME,
+	DB_SCENEACTION_PROPERTYVALUE,
+	DB_SCENEACTION_DELAY,
+	DB_SCENEACTION_SCENEID,
+	DB_SCENEACTION_GWDEVICECODE,
+};
+
+typedef enum{
+	DB_SCENETIMER_WEEK = 0,
+	DB_SCENETIMER_TIME,
+	DB_SCENETIMER_SCENEID,
+
+};
+
+typedef enum{
+	DB_SCENEEMBED_WEEK = 0,
+	DB_SCENEEMBED_EXECUTESCENEID,
+	DB_SCENEMBED_SCENEID,
+
+};
+#endif

midware/midware/scene/kk_scene_handle.h

@@ -2,6 +2,8 @@
 #define __KK_SCENE_H__
 
 #include "kk_tsl_common.h"
+#include "sqlite3.h"
+#include "kk_log.h"
 
 typedef struct kk_scene_action_detail{
     char deviceCode[DEVICE_CODE_MAXLEN];
@@ -38,12 +40,24 @@ typedef struct kk_action_list{
 	struct kk_action_list *next;
 } kk_scene_action_delay_t;
 
+typedef struct kk_embedscene_list{	
+	time_t starttime;	
+	char  executeSceneId[32];
+	struct kk_embedscene_list *next;
+} kk_scene_embed_delay_t;
+
+
 typedef struct kk_scene_timer_list{	
 	time_t starttime;
 	char sceneId[32];
 	int repeatday;
 	struct kk_scene_timer_list *next;
 } kk_scene_timer_list_t;
+typedef struct {
+    void *mutex;
+    sqlite3 *pDb;
+	void *s_scene_thread;
+} kk_scene_ctx_t;
 
 
 int kk_scene_init(void);

tools/board/config.alios.mk3080

-CONFIG_ENV_CFLAGS   += \
-    -mcpu=cortex-m4 -march=armv7-m -mthumb \
-    -mthumb-interwork -mlittle-endian \
-    -fno-short-enums \
-    -DCONFIG_PLATFORM_8711B -DM3 -w \
-
-CONFIG_ENV_CFLAGS   += \
-    -Os \
-    -DCONFIG_HTTP_AUTH_TIMEOUT=500 \
-    -DCONFIG_MID_HTTP_TIMEOUT=500 \
-    -DCONFIG_GUIDER_AUTH_TIMEOUT=500 \
-    -DCONFIG_MQTT_TX_MAXLEN=640 \
-    -DCONFIG_MQTT_RX_MAXLEN=1200 \
-
-CONFIG_external_libs/mbedtls    :=
-CONFIG_tests                    :=
-
-CROSS_PREFIX        := arm-none-eabi-