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
1761e6e5
Commit
1761e6e5
authored
Aug 06, 2020
by
whmaizmy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【修改内容】1,修改set events失败的问题;2,过滤上报无效的event output 数据
parent
a4560da0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
4 deletions
+34
-4
midware/tsl/tsl_handle/kk_tsl_api.c
midware/tsl/tsl_handle/kk_tsl_api.c
+3
-3
midware/tsl/tsl_handle/kk_tsl_parse.c
midware/tsl/tsl_handle/kk_tsl_parse.c
+31
-1
No files found.
midware/tsl/tsl_handle/kk_tsl_api.c
View file @
1761e6e5
...
...
@@ -451,7 +451,7 @@ static int _kk_set_event_output_value(_IN_ int devid, _IN_ char *key, _IN_ int k
return
FAIL_RETURN
;
}
res
=
dm_tsl_get_event_output_data
(
node
->
dev_shadow
,
key
,
key_len
,
data
);
res
=
dm_tsl_get_event_output_data
(
node
->
dev_shadow
,
key
,
key_len
,
&
data
);
if
(
res
!=
SUCCESS_RETURN
)
{
return
FAIL_RETURN
;
}
...
...
@@ -746,7 +746,7 @@ static int _kk_tsl_get_event_output_value(_IN_ int devid, _IN_ char *key, _IN_ i
if
(
res
!=
SUCCESS_RETURN
)
{
return
FAIL_RETURN
;
}
res
=
kk_tsl_get_data_type
(
data
,
&
type
);
if
(
res
!=
SUCCESS_RETURN
)
{
return
FAIL_RETURN
;
...
...
@@ -1118,7 +1118,7 @@ int kk_tsl_set_value(kk_tsl_set_t set, int devId, const char *identifier,
strlen
(
value
));
}
break
;
case
kk_tsl_set_event_output_value
:
{
case
kk_tsl_set_event_output_value
:
{
res
=
_kk_set_event_output_value
(
devId
,
(
char
*
)
identifier
,
strlen
(
identifier
),
(
void
*
)
value
,
(
char
*
)
value_str
);
}
...
...
midware/tsl/tsl_handle/kk_tsl_parse.c
View file @
1761e6e5
...
...
@@ -1139,7 +1139,36 @@ static int _kk_tsl_string_insert_json_item(_IN_ kk_tsl_data_t *data, _IN_ lite_c
static
int
_kk_tsl_array_insert_json_item
(
_IN_
kk_tsl_data_t
*
data
,
_IN_
lite_cjson_item_t
*
lite
);
static
int
_kk_tsl_struct_insert_json_item
(
_IN_
kk_tsl_data_t
*
data
,
_IN_
lite_cjson_item_t
*
lite
);
static
int
_kk_tsl_data_insert_json_item
(
_IN_
kk_tsl_data_t
*
data
,
_IN_
lite_cjson_item_t
*
lite
);
static
int
_kk_check_data
(
_IN_
kk_tsl_data_t
*
data
)
{
int
index
=
0
;
kk_tsl_data_t
*
current_data
=
NULL
;
kk_tsl_data_value_complex_t
*
complex_struct
=
NULL
;
int
is_valid
=
0
;
if
(
data
==
NULL
){
return
INVALID_PARAMETER
;
}
complex_struct
=
data
->
data_value
.
value
;
for
(
index
=
0
;
index
<
complex_struct
->
size
;
index
++
)
{
current_data
=
(
kk_tsl_data_t
*
)
complex_struct
->
value
+
index
;
if
(
current_data
->
data_value
.
type
==
KK_TSL_DATA_TYPE_TEXT
)
{
if
(
current_data
->
data_value
.
value
!=
NULL
){
is_valid
=
1
;
}
}
else
{
is_valid
=
1
;
}
}
if
(
is_valid
){
return
SUCCESS_RETURN
;
}
return
FAIL_RETURN
;
}
static
int
_kk_tsl_array_insert_json_item
(
_IN_
kk_tsl_data_t
*
data
,
_IN_
lite_cjson_item_t
*
lite
)
{
...
...
@@ -1237,7 +1266,7 @@ static int _kk_tsl_array_insert_json_item(_IN_ kk_tsl_data_t *data, _IN_ lite_cj
kk_tsl_data_t
*
array_data
=
NULL
;
for
(
index
=
0
;
index
<
complex_array
->
size
;
index
++
)
{
array_data
=
(
kk_tsl_data_t
*
)(
complex_array
->
value
)
+
index
;
if
(
array_data
)
{
if
(
array_data
&&
(
_kk_check_data
(
array_data
)
==
0
)
)
{
_kk_tsl_struct_insert_json_item
(
array_data
,
array_item
);
}
}
...
...
@@ -1402,6 +1431,7 @@ static int _kk_tsl_data_insert_json_item(_IN_ kk_tsl_data_t *data, _IN_ lite_cjs
lite_cjson_add_item_to_array
(
lite
,
data_object
);
}
}
else
{
res
=
_kk_tsl_struct_insert_json_item
(
data
,
lite
);
lite_cjson_delete
(
data_object
);
}
...
...
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