Skip to content

K
k-sdk
Commit a4560da0 authored by whmaizmy's avatar whmaizmy
Browse files
Options

【修改内容】修改通过product type跟product code 来load tsl 

【提交人】陈伟灿
parent 72bd42c0
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 28 deletions
midware/midware/dm/kk_dm_mng.c
View file @ a4560da0
......@@ -181,16 +181,15 @@ int dm_mgr_init(void)
/* Init Device List */
INIT_LIST_HEAD(&ctx->dev_list);
/*----------to do************************ */
//HAL_GetProductKey(product_key);
//HAL_GetDeviceName(device_name);
memset(product_key,0x0,sizeof(product_key));
memset(device_name,0x0,sizeof(device_name));
memcpy(product_key,"a1OYuSBt23u",strlen("a1OYuSBt23u"));
memcpy(device_name,"aIqEbWno8yDdsjCX15iq",strlen("aIqEbWno8yDdsjCX15iq"));
kk_set_tsl_by_productKey("a1OYuSBt23u","ccu.json");
HAL_GetProduct_Type(product_key);
HAL_GetProduct_Code(device_name);
//memset(product_key,0x0,sizeof(product_key));
//memset(device_name,0x0,sizeof(device_name));
//memcpy(product_key,"a1OYuSBt23u",strlen("a1OYuSBt23u"));
//memcpy(device_name,"aIqEbWno8yDdsjCX15iq",strlen("aIqEbWno8yDdsjCX15iq"));
//_dm_mgr_legacy_thing_created(IOTX_DM_LOCAL_NODE_DEVID);
res = dm_mgr_device_create(KK_DM_DEVICE_SUBDEV,product_key,device_name,device_secret,&devId);
res = dm_mgr_device_create(KK_DM_DEVICE_GATEWAY,product_key,device_name,device_secret,&devId);
if (res != SUCCESS_RETURN) {
goto ERROR;
}
......
midware/midware/iot.mk
View file @ a4560da0
......@@ -11,4 +11,4 @@ CFLAGS += -I$(TOP_DIR)/src/tsl/tsl_handle
LDFLAGS += -lapi_com -liot_cjson -lkk_tsl
LDFLAGS += -lsqlite -ldl -lm
LDFLAGS += -L$(TOP_DIR)/common/nanomsg -static -lnanomsg -lanl
LDFLAGS += -L$(TOP_DIR)/common/ev -static -lev
\ No newline at end of file
LDFLAGS += -L$(TOP_DIR)/common/ev -static -lev -lkk_hal
\ No newline at end of file
midware/midware/midware.c
View file @ a4560da0
......@@ -12,6 +12,7 @@
#include <fcntl.h>
#include <sys/shm.h>
#include "cJSON.h"
#include "kk_product.h"
......@@ -93,11 +94,17 @@ time_t getSysTime(){
return t;
}
static int kk_set_product_info(void)
{
HAL_SetProduct_Type(PRODUCT_TPYE);
HAL_SetProduct_Code(PRODUCT_CODE);
kk_set_tsl_by_productKey(PRODUCT_TPYE,"gateway.json");
return 0;
}
int main(const int argc, const char **argv)
{
kk_set_product_info();
kk_tsl_api_init();
kk_ipc_init(IPC_MID2APP, mid_cb);
kk_ipc_init(IPC_MID2PLAT, mid2p_cb);
......
midware/tsl/tsl_handle/kk_tsl_common.h
View file @ a4560da0
......@@ -12,7 +12,7 @@
#define _OU_
#endif
#define PRODUCT_KEY_MAXLEN (20 + 1)
#define PRODUCT_KEY_MAXLEN (32 + 1)
#define DEVICE_NAME_MAXLEN (32 + 1)
#define DEVICE_SECRET_MAXLEN (64 + 1)
#define TSL_PATH_MAXLEN (64 + 1)
......
midware/tsl/tsl_handle/kk_tsl_load.c
View file @ a4560da0
......@@ -23,6 +23,8 @@ int kk_set_tsl_by_productKey(const char* key,const char* name)
printf("[%s][%d]length error!!!\n",__FUNCTION__,__LINE__);
return FAIL_RETURN;
}
memset(s_tsl_list[s_tsl_num].product_key,0x0,sizeof(s_tsl_list[s_tsl_num].product_key));
memset(s_tsl_list[s_tsl_num].name,0x0,sizeof(s_tsl_list[s_tsl_num].name));
memcpy(s_tsl_list[s_tsl_num].product_key,key,strlen(key));
memcpy(s_tsl_list[s_tsl_num].name,name,strlen(name));
s_tsl_num++;
......@@ -41,7 +43,7 @@ int kk_get_tsl_by_productKey(const char* key, char* name)
if((strlen(key) == strlen(s_tsl_list[index].product_key))&&
(memcmp(s_tsl_list[index].product_key,key,strlen(key)) == 0))
{
memcpy(name,s_tsl_list[index].name,strlen(s_tsl_list[index].product_key));
memcpy(name,s_tsl_list[index].name,strlen(s_tsl_list[index].name));
return SUCCESS_RETURN;
}
}
......@@ -74,7 +76,7 @@ char* kk_load_json(const char *tslFile)
memset(buf,0x0,filesize+1);
fseek(fp, 0L, SEEK_SET);
fread(buf, 1, filesize, fp);
printf("%s!!!\n",buf);
//printf("%s!!!\n",buf);
//free(buf);
return buf;
}
......
midware/tsl/tsl_handle/kk_tsl_parse.c
View file @ a4560da0
......@@ -329,7 +329,7 @@ static int _kk_tsl_array_struct_parse(_IN_ kk_tsl_data_value_t *data_value, _IN_
return INVALID_PARAMETER;
}
printf("Array Struct Size: %d", complex_array->size);
printf("Array Struct Size: %d\n", complex_array->size);
complex_array->value = malloc((complex_array->size) * (sizeof(kk_tsl_data_t)));
if (complex_array->value == NULL) {
return MEMORY_NOT_ENOUGH;
......@@ -366,7 +366,7 @@ static int _kk_tsl_data_parse(_IN_ kk_tsl_data_value_t *data_value, _IN_ lite_cj
if (res != SUCCESS_RETURN || !lite_cjson_is_string(&lite_item)) {
return JSON_PARSE_FAILED;
}
printf("TSL Data Type: %.*s", lite_item.value_length, lite_item.value);
// printf("TSL Data Type: %.*s\n", lite_item.value_length, lite_item.value);
res = _kk_tsl_get_type(lite_item.value, lite_item.value_length, &data_value->type);
if (res != SUCCESS_RETURN) {
return FAIL_RETURN;
......@@ -407,7 +407,7 @@ static int _kk_tsl_property_parse(_IN_ kk_tsl_data_t *property, _IN_ lite_cjson_
if (res != SUCCESS_RETURN) {
return FAIL_RETURN;
}
printf("Identifier: %s\n", property->identifier);
//printf("Identifier: %s\n", property->identifier);
//Parse DataType
memset(&lite_item, 0, sizeof(lite_cjson_t));
......@@ -485,7 +485,7 @@ static int _kk_tsl_event_outputdata_parse(_IN_ kk_tsl_t *shadow, _IN_ kk_tsl_dat
if (res != SUCCESS_RETURN) {
return FAIL_RETURN;
}
printf("Identifier: %s", event_data->identifier);
//printf("Identifier: %s\n", event_data->identifier);
//Parse DataType
memset(&lite_item, 0, sizeof(lite_cjson_t));
......@@ -508,7 +508,7 @@ static int _kk_tsl_event_outputdatas_parse(_IN_ kk_tsl_t *shadow, _IN_ kk_tsl_ev
lite_cjson_t lite_item;
kk_tsl_data_t *output_data = NULL;
printf("event outputdata Number: %d", event->output_data_number);
printf("event outputdata Number: %d\n", event->output_data_number);
if (event->output_data_number == 0) {
return SUCCESS_RETURN;
}
......@@ -529,7 +529,7 @@ static int _kk_tsl_event_outputdatas_parse(_IN_ kk_tsl_t *shadow, _IN_ kk_tsl_ev
return FAIL_RETURN;
}
printf("Index: %d", index);
printf("Index: %d\n", index);
_kk_tsl_event_outputdata_parse(shadow, output_data, &lite_item);
}
......@@ -551,7 +551,7 @@ static int _dm_shw_event_parse(_IN_ kk_tsl_t *shadow, _IN_ kk_tsl_event_t *event
if (res != SUCCESS_RETURN) {
return FAIL_RETURN;
}
printf("Identifier: %s", event->identifier);
//printf("Identifier: %s\n", event->identifier);
/* Check If Current Event Id Is Post */
if (((strlen(event->identifier) == strlen(KK_TSL_SPECIAL_EVENT_POST_IDENTIFIER)) &&
......@@ -610,7 +610,7 @@ static int _kk_tsl_events_parse(_IN_ kk_tsl_t *shadow, _IN_ lite_cjson_t *root)
return FAIL_RETURN;
}
printf("Index: %d", index);
//printf("Index: %d\n", index);
_dm_shw_event_parse(shadow, shadow->events + index, &lite_event);
}
return SUCCESS_RETURN;
......@@ -634,7 +634,7 @@ static int _kk_tsl_service_outputdata_parse(_IN_ kk_tsl_t *shadow, _IN_ kk_tsl_d
if (res != SUCCESS_RETURN) {
return FAIL_RETURN;
}
printf("Identifier: %s", service_data->identifier);
//printf("Identifier: %s", service_data->identifier);
//Parse DataType
memset(&lite_item, 0, sizeof(lite_cjson_t));
......@@ -679,7 +679,7 @@ static int _kk_tsl_service_outputdatas_parse(_IN_ kk_tsl_t *shadow, _IN_ kk_tsl_
return FAIL_RETURN;
}
printf("Index: %d", index);
//printf("Index: %d", index);
_kk_tsl_service_outputdata_parse(shadow, output_data, &lite_item);
}
......@@ -706,7 +706,7 @@ static int _kk_tsl_service_inputdata_parse(_IN_ kk_tsl_t *shadow, _IN_ kk_tsl_da
if (res != SUCCESS_RETURN) {
return FAIL_RETURN;
}
printf("Identifier: %s", input_data->identifier);
//printf("Identifier: %s", input_data->identifier);
//Parse DataType
memset(&lite_item, 0, sizeof(lite_cjson_t));
......@@ -751,7 +751,7 @@ static int _kk_tsl_service_inputdatas_parse(_IN_ kk_tsl_t *shadow, _IN_ kk_tsl_s
return FAIL_RETURN;
}
printf("Index: %d", index);
//printf("Index: %d", index);
_kk_tsl_service_inputdata_parse(shadow, input_data, &lite_item);
}
......@@ -774,7 +774,7 @@ static int _kk_tsl_service_parse(_IN_ kk_tsl_t *shadow, _IN_ kk_tsl_service_t *s
if (res != SUCCESS_RETURN) {
return FAIL_RETURN;
}
printf("Identifier: %s", service->identifier);
//printf("Identifier: %s", service->identifier);
/* Check If Current Service Id Is Set Or Get */
if (((strlen(service->identifier) == strlen(KK_TSL_SPECIAL_SERVICE_SET_IDENTIFIER)) &&
......@@ -1030,6 +1030,7 @@ int kk_tsl_get_property_data(_IN_ kk_tsl_t *shadow, _IN_ char *key, _IN_ int key
return SUCCESS_RETURN;
}
int kk_tsl_data_search(_IN_ kk_tsl_data_t *input, _IN_ char *key,
_IN_ int key_len, _OU_ kk_tsl_data_t **output, _OU_ int *index)
{
......
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