Commit 1761e6e5 authored by whmaizmy's avatar whmaizmy

【修改内容】1,修改set events失败的问题;2,过滤上报无效的event output 数据

parent a4560da0
...@@ -451,7 +451,7 @@ static int _kk_set_event_output_value(_IN_ int devid, _IN_ char *key, _IN_ int k ...@@ -451,7 +451,7 @@ static int _kk_set_event_output_value(_IN_ int devid, _IN_ char *key, _IN_ int k
return FAIL_RETURN; 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) { if (res != SUCCESS_RETURN) {
return FAIL_RETURN; return FAIL_RETURN;
} }
...@@ -746,7 +746,7 @@ static int _kk_tsl_get_event_output_value(_IN_ int devid, _IN_ char *key, _IN_ i ...@@ -746,7 +746,7 @@ static int _kk_tsl_get_event_output_value(_IN_ int devid, _IN_ char *key, _IN_ i
if (res != SUCCESS_RETURN) { if (res != SUCCESS_RETURN) {
return FAIL_RETURN; return FAIL_RETURN;
} }
res = kk_tsl_get_data_type(data, &type); res = kk_tsl_get_data_type(data, &type);
if (res != SUCCESS_RETURN) { if (res != SUCCESS_RETURN) {
return FAIL_RETURN; return FAIL_RETURN;
...@@ -1118,7 +1118,7 @@ int kk_tsl_set_value(kk_tsl_set_t set, int devId, const char *identifier, ...@@ -1118,7 +1118,7 @@ int kk_tsl_set_value(kk_tsl_set_t set, int devId, const char *identifier,
strlen(value)); strlen(value));
} }
break; 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, res = _kk_set_event_output_value(devId, (char *)identifier, strlen(identifier), (void *)value,
(char *)value_str); (char *)value_str);
} }
......
...@@ -1139,7 +1139,36 @@ static int _kk_tsl_string_insert_json_item(_IN_ kk_tsl_data_t *data, _IN_ lite_c ...@@ -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_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_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_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) 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 ...@@ -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; kk_tsl_data_t *array_data = NULL;
for (index = 0; index < complex_array->size; index++) { for (index = 0; index < complex_array->size; index++) {
array_data = (kk_tsl_data_t *)(complex_array->value) + 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); _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 ...@@ -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); lite_cjson_add_item_to_array(lite, data_object);
} }
} else { } else {
res = _kk_tsl_struct_insert_json_item(data, lite); res = _kk_tsl_struct_insert_json_item(data, lite);
lite_cjson_delete(data_object); lite_cjson_delete(data_object);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment