Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
k-sdk
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
陈伟灿
k-sdk
Commits
7f464c41
Commit
7f464c41
authored
Feb 11, 2022
by
黄振令
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.nx5编译不过问题
parent
56e549ce
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
187 additions
and
184 deletions
+187
-184
common/hal/kk_product.h
common/hal/kk_product.h
+1
-1
midware/midware/scene/kk_scene_db.h
midware/midware/scene/kk_scene_db.h
+7
-4
midware/midware/scene/kk_scene_handle.c
midware/midware/scene/kk_scene_handle.c
+179
-179
No files found.
common/hal/kk_product.h
View file @
7f464c41
...
@@ -133,7 +133,7 @@
...
@@ -133,7 +133,7 @@
#define KK_CONFIG_FILE_PATH_SUB "kk/kk_cloud_conf.json"
#define KK_CONFIG_FILE_PATH_SUB "kk/kk_cloud_conf.json"
#ifdef CONFIG_NDK
#ifdef CONFIG_NDK
#define KK_DEFAULT_CONFIG_FILE_PATH_SUB "kk/cloud_default_config.json"
#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"
#define KK_DEFAULT_CONFIG_FILE_PATH_SUB "kk/etc/cloud_default_config.json"
#endif
#endif
#define KK_AUTH_CONFIG_FILE_PATH_SUB "kk/auth_conf.json"
#define KK_AUTH_CONFIG_FILE_PATH_SUB "kk/auth_conf.json"
...
...
midware/midware/scene/kk_scene_db.h
View file @
7f464c41
...
@@ -18,7 +18,7 @@ enum{
...
@@ -18,7 +18,7 @@ enum{
DB_SCENEINFO_PRODUCTTYPE
,
DB_SCENEINFO_PRODUCTTYPE
,
DB_SCENEINFO_ACTIONROOMID
,
DB_SCENEINFO_ACTIONROOMID
,
};
};
enum
{
enum
{
DB_SCENETRIGGER_TYPE
=
0
,
DB_SCENETRIGGER_TYPE
=
0
,
DB_SCENETRIGGER_DEVICECODE
,
DB_SCENETRIGGER_DEVICECODE
,
...
@@ -42,7 +42,7 @@ enum{
...
@@ -42,7 +42,7 @@ enum{
enum
{
enum
{
DB_SCENEACTION_TYPE
=
0
,
DB_SCENEACTION_TYPE
=
0
,
DB_SCENEACTION_DEVICECODE
,
DB_SCENEACTION_DEVICECODE
,
DB_SCENEACTION_EPNUM
,
DB_SCENEACTION_EPNUM
,
DB_SCENEACTION_PROPERTYNAME
,
DB_SCENEACTION_PROPERTYNAME
,
DB_SCENEACTION_PROPERTYVALUE
,
DB_SCENEACTION_PROPERTYVALUE
,
DB_SCENEACTION_DELAY
,
DB_SCENEACTION_DELAY
,
...
@@ -90,18 +90,21 @@ int kk_scene_insert_scene_action(const char* type,const char* deviceCode,int epN
...
@@ -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
);
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_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_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
,
int
kk_scene_insert_scene_condition
(
const
char
*
type
,
int
startTime
,
int
endTime
,
int
crossDay
,
char
repeat_days
,
const
char
*
sceneId
);
char
repeat_days
,
const
char
*
sceneId
);
int
kk_scene_insert_scene_trigger
(
const
char
*
type
,
const
char
*
deviceCode
,
int
epNum
,
const
char
*
propertyName
,
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
);
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_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_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_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_quickpanel_info
(
char
*
buttonId
,
char
*
deviceCode
);
int
kk_scene_delete_panel_scene_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_deleteall_panel_scene_info
(
char
*
deviceCode
);
int
kk_scene_update_productType
(
const
char
*
sceneId
,
char
*
productType
);
int
kk_scene_update_productType
(
const
char
*
sceneId
,
char
*
productType
);
int
kk_scene_update_actionRoomId
(
const
char
*
sceneId
,
char
*
roomId
);
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
#endif
midware/midware/scene/kk_scene_handle.c
View file @
7f464c41
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment