Skip to content

K
k-sdk
Commit cde60581 authored by chen.weican's avatar chen.weican
Browse files
Options

【修改内容】添加lansdk的相关代码 

【提交人】陈伟灿
parent 1a695b84
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1899 additions and 1426 deletions
application/kcloud/kcloud_data_handle.c
View file @ cde60581
......@@ -62,6 +62,28 @@ static char *s_split_product[] = {
"3023", //肖邦系列双路面板
"3024" //肖邦系列三路面板
};
static int kk_utils_memtok(_IN_ char *input, _IN_ int input_len, _IN_ char delimiter, _IN_ int index, _OU_ int *offset)
{
int item_index = 0;
int count = 0;
if (input == NULL || input_len <= 0 || offset == NULL) {
return -2;
}
for (item_index = 0; item_index < input_len; item_index++) {
if (input[item_index] == delimiter && (item_index + 1) < input_len) {
count++;
if (count == index) {
*offset = item_index;
return 0;
}
}
}
return -1;
}
/************************************************************
*功能描述：灯控面板需要分开上报属性
*输入参数： info：所上报数据
......@@ -249,15 +271,18 @@ void KK_Data_FromDev(void* str,int len)
ERROR_PRINT("[%s][%d] root is null \n",__FUNCTION__,__LINE__);
return;
}
ERROR_PRINT("[%s][%d]\n",__FUNCTION__,__LINE__);
cmd = cJSON_GetObjectItem(root, "cmd");
if(cmd == NULL){
_kk_sendto_cloud(root);
ERROR_PRINT("[%s][%d]\n",__FUNCTION__,__LINE__);
}
else{
KK_Subdev_Subscribe(root);
}
ERROR_PRINT("[%s][%d]\n",__FUNCTION__,__LINE__);
cJSON_Delete(root);
ERROR_PRINT("[%s][%d]\n",__FUNCTION__,__LINE__);
}
/************************************************************
*功能描述：无效主题过滤
......
application/kcloud/kcloud_main.c
View file @ cde60581
......@@ -52,6 +52,7 @@ static int mqtt_start(void)
return rc;
}
int kk_start_ccu_register(void);
extern int kk_info_report_start(void);
int main(int argc, char* argv[])
{
......@@ -59,7 +60,7 @@ int main(int argc, char* argv[])
open("kcloud",LOG_PID,LOG_USER);
/*set the callback to get the device date to cloud*/
kk_ipc_init(IPC_APP2MID,KK_Data_FromDev,NULL,NULL);
kk_ipc_init(IPC_APP2MID,(ipc_cb*)KK_Data_FromDev,NULL,NULL);
kk_info_report_start();
again:
rc = kk_start_ccu_register();
......
application/kcloud/kk_register.c
View file @ cde60581
......@@ -84,6 +84,7 @@ int kk_parse_token(char *info){
fp = fopen("/usr/kk/kk_token.txt", "w+");
if(fp != NULL){
fwrite(jwt->valuestring,strlen(jwt->valuestring),1,fp);
fsync(fp);
fclose(fp);
}
//cJSON *ccuid = cJSON_GetObjectItem(infoObj,"ccu_id");
......
application/kcloud/mqtt_api.c
View file @ cde60581
......@@ -276,7 +276,10 @@ int KK_MQTT_SendMsg(char *topicName,const char *payload)
//cJSON_Minify(payload);
INFO_PRINT("mqtt send payload :%s.\n",payload);
if(s_cloudStatus == DEVICE_OFFLINE){
ERROR_PRINT("Failed to start sendMessage, s_cloudStatus == DEVICE_OFFLINE\n");
return -1;
}
if ((rc = MQTTAsync_sendMessage(s_Client, topicName, &pubmsg, &opts)) != MQTTASYNC_SUCCESS)
{
ERROR_PRINT("Failed to start sendMessage, return code:%d.\n", rc);
......
application/klansdk/iot.mk 0 → 100644
View file @ cde60581
LIBA_TARGET := libiot_lan.a
$(call Append_Conditional, LIB_SRCS_EXCLUDE, kk_lan_main.c)
$(call Append_Conditional, SRCS_kk_lan, kk_lan_main.c)
$(call Append_Conditional, TARGET, kk_lan)
CFLAGS += -I$(TOP_DIR)/common/api
CFLAGS += -I$(TOP_DIR)/common/json
CFLAGS += -I$(TOP_DIR)/common/nanomsg/include
CFLAGS += -I$(TOP_DIR)/common/ev/include
LDFLAGS += -lkk_tsl
LDFLAGS += -lapi_com
ifeq ($(CONFIG_MODEL),x86)
LDFLAGS += -L$(TOP_DIR)/common/nanomsg -lnanomsg_ubuntu
LDFLAGS += -L$(TOP_DIR)/common/ev -lev_ubuntu
else ifeq ($(CONFIG_MODEL),nx5)
LDFLAGS += -L$(TOP_DIR)/common/nanomsg -lnanomsg_nx5
LDFLAGS += -L$(TOP_DIR)/common/ev -lev_nx5
else
LDFLAGS += -L$(TOP_DIR)/common/nanomsg -lnanomsg
LDFLAGS += -L$(TOP_DIR)/common/ev -lev
endif
LDFLAGS += -liot_cjson -ldl -lm -lanl -lkk_hal
application/klansdk/kk_data_handle.c 0 → 100644
View file @ cde60581
This diff is collapsed.
application/klansdk/kk_data_handle.h 0 → 100644
View file @ cde60581
#ifndef KK_DATA_HANDLE_H_
#define KK_DATA_HANDLE_H_
#include "kk_log.h"
#include "cJSON.h"
#include "kk_product.h"
int kk_data_handle(cJSON *json,int sockfd);
void KK_Data_FromMid(void* str,int len);
#endif
\ No newline at end of file
application/klansdk/kk_data_mng.c 0 → 100644
View file @ cde60581
This diff is collapsed.
application/klansdk/kk_data_mng.h 0 → 100644
View file @ cde60581
#ifndef KK_DATA_MNG_H_
#define KK_DATA_MNG_H_
#include "kk_log.h"
#include "cJSON.h"
#include "klist.h"
#include "kk_product.h"
#include "com_api.h"
#include "kk_opcode.h"
typedef struct {
cJSON *newccu;
cJSON *oldccu;
int channelNum;
char gwDeviceCode[DEVICE_CODE_LEN];
char productCode[PRODUCT_CODE_LEN];
char deviceCode[DEVICE_CODE_LEN];
char opearteType[8];
struct list_head linked_list;
} kk_map_dev_node_t;
typedef struct {
void *mutex;
struct list_head dev_list;
} kk_map_dev_ctx;
kk_map_dev_node_t *kk_map_dev_add(char *deviceCode,char *productCode,char *gwdeviceCode);
int kk_create_devicestatus_to_sdk(cJSON *root);
int kk_create_devices_to_sdk(cJSON *root);
#endif
\ No newline at end of file
application/klansdk/kk_findccu_handle.c 0 → 100644
View file @ cde60581
#include <stdio.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <time.h>
#include <errno.h>
#include <signal.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/wait.h>
#include <sys/time.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <pthread.h>
#include "kk_findccu_handle.h"
#include "kk_hal.h"
#include "cJSON.h"
static int kk_findccu_ack(int sockfd,struct sockaddr_in *addr){
cJSON *json = NULL,*args = NULL;
cJSON *ccu = NULL;
char *out = NULL;
char *tmpBuf = NULL;
char s_IP[NETWORK_ADDR_LEN] = {0};
if(addr == NULL || sockfd < 0){
return -1;
}
json=cJSON_CreateObject();
if(json){
args = cJSON_CreateObject();
if(args){
cJSON_AddItemToObject(json, "arg", args);
cJSON_AddStringToObject(args, "zkid", KK_CCU_ID);
cJSON_AddStringToObject(args, "zk", KK_CCU_NAME);
HAL_Get_IP(s_IP,NULL);
cJSON_AddStringToObject(args, "ip", s_IP);
cJSON_AddBoolToObject(args, "ssl", FALSE);
}
cJSON_AddStringToObject(json, "nodeid", "*");
cJSON_AddStringToObject(json, "opcode", FINDCCU_OPCODE);
cJSON_AddStringToObject(json, "status", "success");
out=cJSON_Print(json);
cJSON_Minify((char*)out);
tmpBuf = calloc(strlen(out) + 4,1);
if(tmpBuf == NULL){
cJSON_Delete(json);
free(out);
return -1;
}
strcat(tmpBuf,"!");
strcat(tmpBuf,out);
strcat(tmpBuf,"$");
printf("tmpBuf:%s\n",tmpBuf);
sendto(sockfd, tmpBuf, strlen(tmpBuf), 0, (struct sockaddr*)addr, sizeof(struct sockaddr_in));
cJSON_Delete(json);
free(out);
free(tmpBuf);
}
return 0;
}
void *kk_findccu_handle(void *data)
{
int sockfd;
struct sockaddr_in saddr;
int r;
char recvline[1025] = {0};
char recvline_tmp[1025] = {0};
struct sockaddr_in presaddr;
socklen_t len;
cJSON *json;
cJSON *opcode;
char *pStart = NULL,*pEnd = NULL;
sockfd = socket(AF_INET, SOCK_DGRAM, 0);
bzero(&saddr, sizeof(saddr));
saddr.sin_family = AF_INET;
saddr.sin_addr.s_addr = htonl(INADDR_ANY);
saddr.sin_port = htons(FINDCCU_LOCAL_PORT);
if(bind(sockfd, (struct sockaddr*)&saddr, sizeof(saddr)) == -1)
{
ERROR_PRINT("bind error...\n");
}
while (1)
{
r = recvfrom(sockfd, recvline, sizeof(recvline), 0 , (struct sockaddr*)&presaddr, &len);
if (r <= 0){
WARNING_PRINT("read error....\n");
}else{
DEBUG_PRINT("findccu recmsg: %s\n", recvline);
pStart = strstr(recvline, "!");
pEnd = strstr(recvline, "$");
if(pStart != NULL && pEnd != NULL){
memset(recvline_tmp,0x0,sizeof(recvline_tmp));
memcpy(recvline_tmp,pStart+1,(pEnd - pStart - 1));
json=cJSON_Parse(recvline_tmp);
if (!json) {
WARNING_PRINT("Error before: [%s]\n","cJSON_Parse");
}else{
opcode = cJSON_GetObjectItem(json, OPCODE_STRING);
if(opcode != NULL){
if(strcmp(opcode->valuestring,FINDCCU_OPCODE) == 0){
kk_findccu_ack(sockfd,&presaddr);
}
}
cJSON_Delete(json);
}
}else{
WARNING_PRINT("data error....\n");
}
}
}
return NULL;
}
int kk_findccu_handle_init(void)
{
int rc = 0;
size_t s = 1500;
pthread_t findccu_thread_handle;
pthread_attr_t findccu_thread_attr;
//pthread_mutex_init(&s_data_mutex, NULL);
/*创建线程*/
pthread_attr_init(&findccu_thread_attr);
pthread_attr_setstacksize(&findccu_thread_attr, s);
pthread_attr_setdetachstate(&findccu_thread_attr, PTHREAD_CREATE_DETACHED);
rc = pthread_create(&findccu_thread_handle, &findccu_thread_attr, kk_findccu_handle, (void *)NULL); //收数据
if (rc)
{
WARNING_PRINT("Error : unable to create thread udp_recv \r\n");
return -1;
}
pthread_attr_destroy(&findccu_thread_attr);
return 0;
}
\ No newline at end of file
application/klansdk/kk_findccu_handle.h 0 → 100644
View file @ cde60581
#ifndef KK_FINDCCU_HANDLE_H_
#define KK_FINDCCU_HANDLE_H_
#include "kk_product.h"
#include "kk_log.h"
#include "kk_opcode.h"
#ifndef FALSE
#define FALSE (0)
#endif
#ifndef TRUE
#define TRUE (!FALSE)
#endif
#define FINDCCU_LOCAL_PORT 8989
int kk_findccu_handle_init(void);
#endif
\ No newline at end of file
application/klansdk/kk_lan_main.c 0 → 100644
View file @ cde60581
/*******************************************************************************
* Copyright (c) 2012, 2020 IBM Corp.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* and Eclipse Distribution License v1.0 which accompany this distribution.
*
* The Eclipse Public License is available at
* https://www.eclipse.org/legal/epl-2.0/
* and the Eclipse Distribution License is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
*
* Contributors:
* Ian Craggs - initial contribution
*******************************************************************************/
#include <stdio.h>
#include <syslog.h>
#include <stdlib.h>
#include <string.h>
#include <pthread.h>
#include "com_api.h"
#include "kk_product.h"
#include "kk_findccu_handle.h"
#include "kk_login_handle.h"
#include "kk_data_handle.h"
//#include "kcloud_log.h"
int main(int argc, char* argv[])
{
int rc = 0;
open("kk_lan",LOG_PID,LOG_USER);
/*set the callback to get the device date to cloud*/
kk_ipc_init(IPC_APP2MID,(ipc_cb*)KK_Data_FromMid,NULL,NULL);
kk_findccu_handle_init();
kk_map_dev_init();
kk_login_init();
while(1){
//count++;
//if(count == 10){
//kk_ipc_send(IPC_APP2MID, "wooooooooooooooooooooooooooooooooooollllll!", strlen("wooooooooooooooooooooooooooooooooooollllll!")+1);
//}
sleep(1);
}
return rc;
}
application/klansdk/kk_login_handle.c 0 → 100644
View file @ cde60581
#include<stdio.h>
#include <string.h>
#include <sys/select.h>
#include <sys/time.h>
#include <sys/types.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <errno.h>
#include <stdlib.h>
#include <pthread.h>
#include <signal.h>
#include "kk_login_handle.h"
#include "kk_data_handle.h"
#define LISTEN_MAX 5
#define BUF_SIZE 1500
typedef struct {
int socketfd;
char ip[18];
} kk_clientInfo_t;
static kk_clientInfo_t s_ConnInfo[LISTEN_MAX] = {0};
static pthread_mutex_t data_mutex;
fd_set fds;
int kk_send_data_to_sdk(char *buf)
{
char *tmpBuf = NULL;
int i = 0;
tmpBuf = calloc(strlen(buf) + 4,1);
if(tmpBuf == NULL){
return -1;
}
strcat(tmpBuf,"!");
strcat(tmpBuf,buf);
strcat(tmpBuf,"$");
printf("tmpBuf:%s\n",tmpBuf);
for(i = 0; i < LISTEN_MAX; i++){
if(s_ConnInfo[i].socketfd != -1){
send(s_ConnInfo[i].socketfd, tmpBuf, strlen(tmpBuf), 0);
}
}
free(buf);
free(tmpBuf);
return 0;
}
static int _kk_handle_data(char *buf,int sockfd){
char *pStart = NULL,*pEnd = NULL;
char tmpBuf[BUF_SIZE] = {0};
cJSON *json;
if(buf == NULL){
return -1;
}
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
pStart = strstr(buf, "!");
pEnd = strstr(buf, "$");
if(pStart != NULL && pEnd != NULL){
memset(tmpBuf,0x0,sizeof(tmpBuf));
memcpy(tmpBuf,pStart+1,(pEnd - pStart - 1));
}
json=cJSON_Parse(tmpBuf);
if (!json) {
WARNING_PRINT("Error before: [%s]\n","cJSON_Parse");
}else{
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
kk_data_handle(json,sockfd);
cJSON_Delete(json);
}
}
static void PrintMesg(int i , char buf[])
{
printf("fd : %d, msg: %s\n", i , buf);
}
void *TCP_Analyzer(void *pPara)
{
char Buf[BUF_SIZE] = {0};
ssize_t Size = 0;
int index = 0;
unsigned char *pReceiveData = NULL;
int ReceiveLen = 0;
if (NULL == pPara)
{
ERROR_PRINT("TCP_Analyzer: TCP_Analyzer Failed!\n");
return NULL;
}
index = *(int *)pPara;
printf("index:%d\n",*(int *)pPara);
if(index < 0 || index >= LISTEN_MAX)
{
ERROR_PRINT("TCP_Analyzer:Get pConnfd Failed \n" );
return NULL;
}
while(1)
{
memset(Buf, '\0', sizeof(Buf));
Size = read(s_ConnInfo[index].socketfd, Buf,sizeof(Buf) );
if (Size <= 0) //没有接收到数据，关闭描述符，释放在TCPServer申请的空间
{
ERROR_PRINT("TCP_Analyzer:remote client close:%d\n",s_ConnInfo[index].socketfd );
pthread_mutex_lock(&data_mutex);
close(s_ConnInfo[index].socketfd);
s_ConnInfo[index].socketfd = -1;
memset(s_ConnInfo[index].ip,0x0,sizeof(s_ConnInfo[index].ip));
pthread_mutex_unlock(&data_mutex);
return NULL;
}
else
{
printf("TCP_Analyzer:%s,%d\n",Buf,(int)Size);
_kk_handle_data(Buf,s_ConnInfo[index].socketfd);
}
}
return NULL;
}
static int kk_check_is_connect(char *ip){
int i = 0;
if(ip == NULL){
return -1;
}
for(i = 0; i < LISTEN_MAX; i ++){
if(s_ConnInfo[i].socketfd != -1 && strcmp(s_ConnInfo[i].ip,ip) == 0){
return 1;
}
}
return 0;
}
void *TCPServer()
{
pthread_t threadID = 0;
struct sockaddr_in Server;
struct sockaddr_in Client;
int Listenfd = 0;
int i = 0;
int j = 0;
int yes = 1;
int index = 0;
int Connfd = 0;
int ret = 0;
char clientIp[18] = {0};
socklen_t len = 0;
//char logMessage[128] = {0};
pthread_attr_t attr;
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
Listenfd = socket(AF_INET, SOCK_STREAM, 0);
if (Listenfd < 0)
{
perror("socket");
pthread_attr_destroy(&attr);//线程属性销毁
return NULL;
}
DEBUG_PRINT("TCPServer:create socket success\n");
setsockopt(Listenfd, SOL_SOCKET, SO_REUSEADDR, &yes ,sizeof(int));// 允许IP地址复用
bzero(&Server, sizeof(Server));
Server.sin_family = AF_INET;
Server.sin_port = htons(SERVER_LISTEN_PORT);
Server.sin_addr.s_addr = htonl(INADDR_ANY);
if (bind(Listenfd, (struct sockaddr*)&Server, sizeof(Server)) < 0)
{
perror("bind");
close(Listenfd);
pthread_attr_destroy(&attr);//线程属性销毁
return NULL;
}
DEBUG_PRINT("TCPServer:bind socket success\n");
if (listen(Listenfd, LISTEN_MAX) < 0)
{
perror("listen");
close(Listenfd);
pthread_attr_destroy(&attr);//线程属性销毁
return NULL;
}
DEBUG_PRINT("TCPServer:listen socket success\n");
while (1)
{
//index = -1;
FD_ZERO(&fds);//描述符集合初始化
FD_SET(Listenfd,&fds);
struct timeval timeout = {1, 0};
ret = select(Listenfd + 1, &fds,NULL, NULL, &timeout );
if(ret <= 0){
DEBUG_PRINT("TCPServer:TCP receiving nothing......\n");
//break;
}else{
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
if (FD_ISSET(Listenfd, &fds))
{
len = sizeof(Client);
bzero(&Client, len);
Connfd = accept(Listenfd, (struct sockaddr*)&Client,&len );
printf("addr:%s\n",inet_ntoa(Client.sin_addr));
printf("[%s][%d]Connfd:%d\n",__FUNCTION__,__LINE__,Connfd);
//若有新的连接
if (Connfd != -1)
{
memset(clientIp,0x0,sizeof(clientIp));
strcpy(clientIp,inet_ntoa(Client.sin_addr));
if(kk_check_is_connect(clientIp) == 1){
DEBUG_PRINT("already connect!!!\n");
continue;
}
for(i = 0; i < LISTEN_MAX; i ++){
if(s_ConnInfo[i].socketfd != -1){
if(i == 4){
DEBUG_PRINT("more then max client!!!\n");
}
continue;
}else{
pthread_mutex_lock(&data_mutex);
s_ConnInfo[i].socketfd = Connfd;
memcpy(s_ConnInfo[i].ip,clientIp,strlen(clientIp));
index = i;
printf("index:%d\n",index);
pthread_mutex_unlock(&data_mutex);
break;
}
}
ret = pthread_create(&threadID, &attr, TCP_Analyzer, &index);
if(0 != ret)
{
DEBUG_PRINT("TCPServer: TCP_Analyzer build Fail!\n");
FD_CLR(Listenfd, &fds);// 清除 fds中相应的文件描述符
close(Listenfd);
pthread_attr_destroy(&attr);//线程属性销毁
return NULL;
}
}
}
}
}
FD_CLR(Listenfd, &fds);// 清除 fds中相应的文件描述符
close(Listenfd);
pthread_attr_destroy(&attr);//线程属性销毁
return NULL;
}
int kk_login_init()
{
int ret = 0;
int i = 0;
pthread_t threadID = 0;
DEBUG_PRINT("kk_login_init Init OK!\n");
for(i = 0; i < LISTEN_MAX; i ++){
s_ConnInfo[i].socketfd = -1;
memset(s_ConnInfo[i].ip,0x0,sizeof(s_ConnInfo[i].ip));
}
if (pthread_mutex_init(&data_mutex, NULL) != 0) {
ERROR_PRINT("pthread_mutex_init kk_login_init err\n");
return -1;
}
ret = pthread_create(&threadID, NULL, TCPServer, NULL);
if(0 != ret)
{
ERROR_PRINT("TCPServer: TCPServer build Fail!\n");
return -1;
}
return 0;
}
application/klansdk/kk_login_handle.h 0 → 100644
View file @ cde60581
#ifndef KK_LOGIN_HANDLE_H_
#define KK_LOGIN_HANDLE_H_
#include "kk_log.h"
#include "cJSON.h"
#define SERVER_LISTEN_PORT 5000
int kk_login_init();
#endif
\ No newline at end of file
application/klansdk/kk_opcode.h 0 → 100644
View file @ cde60581
#ifndef KK_OPCODE_H_
#define KK_OPCODE_H_
#define SYNC_MSG_TYPE "/thing/service/syncinfo"
#define SYNC_MSG_TYPE_REPLY "/thing/service/syncinfo_reply"
#define DATA_STRING "data"
#define VALUE_STRING "value"
#define OPCODEMAP_STRING "opcodemap"
#define CHANNEL_STRING "channel"
#define NODEID_STRING "nodeid"
#define DEVICES_STRING "devices"
#define DATATYPE_STRING "dataType"
#define OPCODE_STRING "opcode"
#define ARG_STRING "arg"
#define ZKID_STRING "zkid"
#define OPEARTETYPE_STRING "operateType"
#define NEWCCU_STRING "newccu"
#define OLDCCU_STRING "oldccu"
#define FINDCCU_OPCODE "FIND_CCU"
#define LOGIN_OPCODE "LOGIN"
#define HEARTBEAT_OPCODE "CCU_HB"
#define SYNC_OPCODE "SYNC_INFO"
#define VALUERANGE_STRING "valueRange"
#define DEVICE_FIELD_STRING "device_field"
#define DEVICE_FIELD_IDNDEX_STRING "device_field_index"
#define DEVICE_ICON_STRING "device_icon"
#define DEVICE_POS_STRING "device_pos"
#define GW_MAC_STRING "gw_mac"
#define MAC_STRING "mac"
#define NAME_STRING "name"
#define OPERATE_TYPE_STRING "operate_type"
#define ROOM_ID_STRING "room_id"
#define DEVICE_STATUS_STRING "device_status"
#endif
\ No newline at end of file
common/api/com_api.c
View file @ cde60581
......@@ -3,12 +3,12 @@
#include "kk_log.h"
#define APP2MID "ipc:///tmp/app2mid.ipc"
#define APP2MID_PUBSUB "ipc:///tmp/app2mid_pubsub.ipc"
#define PLAT2MID "ipc:///tmp/plat2mid.ipc"
#define GW2CCU_PIPE "tcp://%s:5555"
#define GW2CCU_PUBSUB "tcp://%s:5557"
#define GW2CCU_PIPE "tcp://%s:35567"
#define GW2CCU_PUBSUB "tcp://%s:35568"
#define MAGIC "magic12"
#define MAGIC_ACK "magic12ack"
#define FILTERSTR "|"
typedef struct {
......@@ -67,7 +67,7 @@ static void watcher_cb (struct ev_loop *loop ,struct ev_io *w, int revents)
uint32_t bytes =0;
uint32_t validLen =0;
char *dat_bak = NULL;
if (loop_ctrl->type == IPC_PLAT2MID){
if (loop_ctrl->type == IPC_PLAT2MID ||loop_ctrl->type == IPC_APP2MID){
bytes = nn_recv(loop_ctrl->ab.n, &dat, NN_MSG, NN_DONTWAIT);
}else{
bytes = nn_recv(loop_ctrl->ba.n, &dat, NN_MSG, NN_DONTWAIT);
......@@ -120,7 +120,8 @@ void __loop_init(Bloop_ctrl_t *loop_ctrl, struct ev_loop* loop)
{
loop_ctrl->watcher.data = loop_ctrl;
if (loop_ctrl->type == IPC_PLAT2MID){
if (loop_ctrl->type == IPC_PLAT2MID || loop_ctrl->type == IPC_APP2MID){
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
ev_io_init (&(loop_ctrl->watcher), watcher_cb, loop_ctrl->ab.s, EV_READ);
}else{
ev_io_init (&(loop_ctrl->watcher), watcher_cb, loop_ctrl->ba.s, EV_READ);
......@@ -146,27 +147,50 @@ int __nanomsg_init(Bloop_ctrl_t *loop_ctrl, ipc_type type,char* chlMark, char* i
}
memcpy(loop_ctrl->subscrStr, chlMark, strlen(chlMark));
}
switch (type) {
case IPC_APP2MID:{
loop_ctrl->ba.n = nn_socket(AF_SP, NN_PAIR);
loop_ctrl->ba.n = nn_socket(AF_SP, NN_PUSH);
if (loop_ctrl->ba.n < 0) {
ERROR_PRINT("__nanomsg_init loop_ctrl->ba.n=%d \r\n",loop_ctrl->ba.n);
return -1;
}
loop_ctrl->ab.n = nn_socket(AF_SP, NN_SUB);
if (loop_ctrl->ab.n < 0) {
ERROR_PRINT("loop_ctrl->ab.n =%d \r\n",loop_ctrl->ab.n);
return -1;
}
if (nn_connect(loop_ctrl->ba.n, APP2MID) < 0) {
return -1;
}
//订阅
if (nn_setsockopt(loop_ctrl->ab.n, NN_SUB, NN_SUB_SUBSCRIBE, "", 0) < 0) {
ERROR_PRINT("nn_setsockopt failed ");
return -1;
}
if (nn_connect(loop_ctrl->ab.n, APP2MID_PUBSUB) < 0) {//sub
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
return -1;
}
}
break;
case IPC_MID2APP: {
loop_ctrl->ba.n = nn_socket(AF_SP, NN_PAIR);
loop_ctrl->ba.n = nn_socket(AF_SP, NN_PULL);
if (loop_ctrl->ba.n < 0) {
ERROR_PRINT("__nanomsg_init loop_ctrl->ba.n=%d \r\n",loop_ctrl->ba.n);
return -1;
}
loop_ctrl->ab.n = nn_socket(AF_SP, NN_PUB);
if (loop_ctrl->ab.n < 0) {
ERROR_PRINT("__nanomsg_init loop_ctrl->ab.n =%d \r\n",loop_ctrl->ab.n);
return -1;
}
if (nn_bind(loop_ctrl->ba.n, APP2MID) < 0) {
ERROR_PRINT("__nanomsg_init loop_ctrl->ba.n nn_bind error \r\n");
return -1;
}
if (nn_bind(loop_ctrl->ab.n, APP2MID_PUBSUB) < 0) {//pub
ERROR_PRINT("__nanomsg_init loop_ctrl->ab.n nn_bind error \r\n");
return -1;
}
}
......@@ -174,7 +198,7 @@ int __nanomsg_init(Bloop_ctrl_t *loop_ctrl, ipc_type type,char* chlMark, char* i
case IPC_PLAT2MID: {
//创建2个通道 pipe和pub/sub
char addr[30] = {0};
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
loop_ctrl->ba.n = nn_socket(AF_SP, NN_PUSH);
if (loop_ctrl->ba.n < 0) {
ERROR_PRINT("loop_ctrl->ba.n =%d \r\n",loop_ctrl->ba.n);
......@@ -188,7 +212,9 @@ int __nanomsg_init(Bloop_ctrl_t *loop_ctrl, ipc_type type,char* chlMark, char* i
}
sprintf(addr, GW2CCU_PIPE, ip);
printf("---------addr:%s\n",addr);
if (nn_connect(loop_ctrl->ba.n, addr) < 0) {//pipe
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
return -1;
}
//订阅
......@@ -202,7 +228,9 @@ int __nanomsg_init(Bloop_ctrl_t *loop_ctrl, ipc_type type,char* chlMark, char* i
memset(addr,0, sizeof(addr));
sprintf(addr, GW2CCU_PUBSUB, ip);
printf("---------addr:%s\n",addr);
if (nn_connect(loop_ctrl->ab.n, addr) < 0) {//sub
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
return -1;
}
......@@ -243,7 +271,8 @@ int __nanomsg_init(Bloop_ctrl_t *loop_ctrl, ipc_type type,char* chlMark, char* i
}
size_t size = sizeof(size_t);
if (IPC_PLAT2MID == type){
if (IPC_PLAT2MID == type || IPC_APP2MID == type){
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
if (nn_getsockopt(loop_ctrl->ab.n, NN_SOL_SOCKET, NN_RCVFD, (char *)&loop_ctrl->ab.s, &size) < 0) {
ERROR_PRINT("nn_getsockopt IPC_PLAT2MID loop_ctrl->ab.s = %d \n", loop_ctrl->ab.s);
return -1;
......@@ -287,24 +316,24 @@ int kk_ipc_init(ipc_type type, ipc_cb cb, char* chlMark, char* ip)
}else {
loop_ctrl = &Bloop_ctrl;
}
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
if (type == IPC_PLAT2MID && (chlMark == NULL || ip == NULL)){
ERROR_PRINT("parameter is error \r\n");
return -1;
}
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
if(loop_ctrl->cb != NULL){
WARNING_PRINT("middleware to platform ipc has been inited!\r\n");
return -1;
}
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
if (__nanomsg_init(loop_ctrl, type, chlMark, ip) < 0) {
ERROR_PRINT("nanomsg init failed\r\n");
return -1;
}
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
if (gloop == NULL){
gloop = ev_loop_new(EVBACKEND_EPOLL);
if (NULL == gloop) {
......@@ -313,7 +342,7 @@ int kk_ipc_init(ipc_type type, ipc_cb cb, char* chlMark, char* ip)
}
}
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
loop_ctrl->type = type;
__loop_init(loop_ctrl, gloop);
......@@ -321,7 +350,7 @@ int kk_ipc_init(ipc_type type, ipc_cb cb, char* chlMark, char* ip)
ERROR_PRINT("create pthread failed\r\n");
return -1;
}
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
loop_ctrl->cb = cb;
loop_ctrl->type = type;
return 0;
......@@ -374,7 +403,7 @@ int kk_ipc_send(ipc_type type, void* data, int len)
chalMark = Bloop_ctrl.subscrStr;
}
}
printf("kk_ipc_send data:%s\n",data);
return kk_ipc_send_ex(type, data, len, chalMark);
}
......@@ -403,10 +432,14 @@ int kk_ipc_send_ex(ipc_type type, void* data, int len, char* chalMark)
}
memcpy(buf + filterlen, data, len);
if (type == IPC_MID2PLAT){
if (type == IPC_MID2PLAT ){
loop_ctrl = &Mloop_ctrl;
ret =nn_send(Mloop_ctrl.ab.n, &buf, NN_MSG, NN_DONTWAIT);//NN_DONTWAIT
}else{
}else if(type == IPC_MID2APP){
loop_ctrl = &Bloop_ctrl;
ret = nn_send(Bloop_ctrl.ab.n, &buf, NN_MSG, NN_DONTWAIT);
}
else{
loop_ctrl = &Bloop_ctrl;
ret = nn_send(Bloop_ctrl.ba.n, &buf, NN_MSG, NN_DONTWAIT);
}
......
common/api/com_api.h
View file @ cde60581
......@@ -17,7 +17,7 @@ extern "C" {
#include "pair.h"
#include "pubsub.h"
#include "pipeline.h"
#include "kk_product.h"
//=====kk======================
typedef enum {
......@@ -62,7 +62,7 @@ typedef enum {
#define MSG_TIMER_SETCOUNTDOWN_CURRENTTIME "CurrentTime"
#define MSG_TIMER_SETCOUNTDOWN_GETCOUNTDOWN "getCountDown"
#define MSG_PROPERTY_STR "property"
#define MSG_PROPERTIES_STR "properties"
/************************LOCK KEY*************************/
#define MSG_KEYDELETE_NOTIFICATION_KEYID "KeyDeletedNotification.KeyID"
#define MSG_KEYDELETE_NOTIFICATION_KEYTYPE "KeyDeletedNotification.KeyType"
......@@ -129,12 +129,29 @@ typedef enum {
#define MSG_SCENE_EXECUTENOTIFICATION_SCENEID "executeSceneNotification.sceneId"
#define MSG_SCENE_EXECUTENOTIFICATION "executeSceneNotification"
#define CCU_TCP_PORT 16565
#define BUFFER_SIZE 1024
#define MAX_LISTEN_NUM 10
#define MAX_IP_LEN 16
//#ifndef DEVICE_CODE_LEN
//#define DEVICE_CODE_LEN 33
//#endif
typedef void ipc_cb(void* data, int len, char* chalMark);
int kk_ipc_init(ipc_type type, ipc_cb cb, char* chalMark, char* ip);
int kk_ipc_deinit(ipc_type type);
int kk_ipc_send(ipc_type type, void* data, int len);
int kk_ipc_send_ex(ipc_type type, void* data, int len, char* chalMark);
int kk_tcp_channel_ser_send(char* data, int len, char chalMark[DEVICE_CODE_LEN]);
int kk_TCP_channel_init(ipc_cb cb);
int kk_TCP_channel_deinit(ipc_type type);
int kk_is_tcp_channel(char devCode[DEVICE_CODE_LEN]);
int kk_set_tcp_channel_by_idx(int idx, char devCode[DEVICE_CODE_LEN], char ip[MAX_IP_LEN]);
int kk_set_tcp_channel(char devCode[DEVICE_CODE_LEN], char ip[MAX_IP_LEN]);
int kk_get_retry_num();
int kk_reset_retry_num();
int kk_tcp_client_send(char* data, int len);
int kk_tcp_client_init(char ip[MAX_IP_LEN], int port, ipc_cb cb);
void kk_tcp_client_deinit(void);
#if defined(__cplusplus)
}
#endif
......
common/api/tcp_channel.c
View file @ cde60581
#include <stdio.h>
#include <pthread.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <stdlib.h>
......@@ -13,12 +14,6 @@
#include "com_api.h"
#include "kk_log.h"
#define CCU_TCP_PORT 16565
#define BUFFER_SIZE 1024
#define MAX_LISTEN_NUM 10
#define MAX_IP_LEN 16
#define DEVICE_CODE_LEN 33
typedef struct{
......@@ -86,13 +81,14 @@ static void _MutexUnlock(void *mutex)
static char *_next_json(char *str, int* hasFloor)
{
if(str == NULL) {
return NULL;
}
char *ptr = str;
int floor = 0;
// judge if inside the "..."
int quotes = 0;
if(str == NULL) {
return NULL;
}
while(*ptr) {
if(*ptr++ == '{') {
++floor;
......@@ -149,7 +145,7 @@ static char* __do_data(char* buf, int buflen,ipc_cb* cb, char* deviceCode){
char* startIdx = buf;
int hasfloor = 0;
char buf2[1024] = {0};
int cplen = 0;
while(startIdx < buf + buflen){
hasfloor = 0;
endIdx = _next_json(startIdx,&hasfloor);
......@@ -163,7 +159,7 @@ static char* __do_data(char* buf, int buflen,ipc_cb* cb, char* deviceCode){
return startIdx;
}
int cplen = endIdx - startIdx;
cplen = endIdx - startIdx;
memset(buf2,0, sizeof(buf2));
memcpy(buf2,startIdx, cplen);
......@@ -220,13 +216,13 @@ static void kk_gw_list_load(void)
FILE *fp;
int readLen = MAX_LISTEN_NUM * sizeof(kk_tcp_ctrl_t);
int retLen = 0;
char buf[1024] = {0};
fp = fopen("gwlist.txt", "r");
if (!fp) {
INFO_PRINT("open gatewaylist.txt failed! \n");
goto error1;
}
char buf[1024] = {0};
retLen = fread(g_tcp_ctrl, readLen, 1, fp);
INFO_PRINT("read gatewaylist.txt retLen= %d, readLen=%d ! \n", retLen,readLen);
if (retLen != readLen ){
......@@ -1012,7 +1008,7 @@ int kk_tcp_client_init(char ip[MAX_IP_LEN], int port, ipc_cb cb)
g_client_ctrl.cb = cb;
}
kk_tcp_client_deinit(){
void kk_tcp_client_deinit(void){
if (g_client_ctrl.sd > -1){
close(g_client_ctrl.sd);
g_client_ctrl.sd = -1;
......
common/hal/HAL_OS_linux.c
View file @ cde60581
......@@ -267,39 +267,26 @@ int HAL_SetDevice_Code(_IN_ char *device_code)
return len;
}
int HAL_GetProduct_Type(_OU_ char *product_type)
{
int len = strlen(g_product_type);
memset(product_type, 0x0, PRODUCT_TYPE_LEN);
strncpy(product_type, g_product_type, len);
return len;
}
int HAL_GetProduct_Code(_OU_ char *product_code)
{
int len = strlen(g_product_code);
memset(product_code, 0x0, PRODUCT_CODE_LEN);
//strncpy(product_code, g_product_code, len);
strncpy(product_code, KK_CCU_PRODUCTID, strlen(KK_CCU_PRODUCTID));
return len;
product_code[strlen(KK_CCU_PRODUCTID)] = '\0';
return strlen(KK_CCU_PRODUCTID);
}
int HAL_GetDevice_Code(_OU_ char *device_code)
{
int len = strlen(g_device_code);
memset(device_code, 0x0, DEVICE_CODE_LEN);
//strncpy(device_code, g_device_code, len);
strncpy(device_code, KK_CCU_ID, strlen(KK_CCU_ID));
return len;
device_code[strlen(KK_CCU_ID)] = '\0';
return strlen(KK_CCU_ID);
}
int HAL_GetVersion(_OU_ char *version)
{
int len = strlen(KK_CCU_VERSION);
memset(version, 0x0, VERSION_MAXLEN);
strncpy(version, KK_CCU_VERSION, len);
version[len] = '\0';
return strlen(version);
strncpy(version, KK_CCU_VERSION, strlen(KK_CCU_VERSION));
version[strlen(KK_CCU_VERSION)] = '\0';
return strlen(KK_CCU_VERSION);
}
......
common/hal/kk_product.h
View file @ cde60581
......@@ -35,6 +35,8 @@
#define KK_CCU_PRODUCTID "ccu_n12"
#define KK_GW_PRODUCTID "gateway_2"
#define KK_CCU_RANDOM "0000000000"
#define KK_CCU_NAME "NEW_CCU"
#define KK_DEVICE_MAP_FILE_PATH "/usr/kk/map/device_%s.json"
enum {
DEVICE_OFFLINE = 0,
DEVICE_ONLINE,
......@@ -44,7 +46,6 @@ enum {
int HAL_SetProduct_Type(_IN_ char *product_type);
int HAL_SetProduct_Code(_IN_ char *product_code);
int HAL_SetDevice_Code(_IN_ char *device_code);
int HAL_GetProduct_Type(_OU_ char *product_type);
int HAL_GetProduct_Code(_OU_ char *product_code);
int HAL_GetDevice_Code(_OU_ char *device_code);
......
common/json/cson.c deleted 100644 → 0
View file @ 1a695b84
This diff is collapsed.
common/json/cson.h deleted 100644 → 0
View file @ 1a695b84
/**
* @file cson.h
* @author Letter (NevermindZZT@gmail.com)
* @brief cson
* @version 0.1
* @date 2019-08-26
*
* @copyright (c) 2019 Letter
*
*/
#ifndef __CSON_H__
#define __CSON_H__
#include "stddef.h"
#include "cJSON.h"
#define CSON_VERSION "1.0.3" /**< CSON版本 */
/**
* @defgroup CSON cson
* @brief json tools for C
* @addtogroup CSON
* @{
*/
/**
* @brief CSON数据类型定义
*
*/
typedef enum
{
CSON_TYPE_OBJ = 0,
CSON_TYPE_CHAR,
CSON_TYPE_SHORT,
CSON_TYPE_INT,
CSON_TYPE_LONG,
CSON_TYPE_FLOAT,
CSON_TYPE_DOUBLE,
CSON_TYPE_BOOL,
CSON_TYPE_STRING,
CSON_TYPE_STRUCT,
CSON_TYPE_LIST,
CSON_TYPE_ARRAY,
CSON_TYPE_JSON,
} CsonType;
/**
* @brief CSON数据模型定义
*
*/
typedef struct cson_model
{
CsonType type; /**< 数据类型 */
char *key; /**< 元素键值 */
short offset; /**< 元素偏移 */
union
{
struct
{
struct cson_model *model; /**< 子结构体模型 */
short size; /**< 子结构体模型大小 */
} sub; /**< 子结构体 */
struct
{
CsonType eleType; /**< 数组元素类型 */
short size; /**< 数组大小 */
} array; /**< 数组 */
int objSize; /**< 对象大小 */
CsonType basicListType; /**< 基础数据链表类型 */
} param;
} CsonModel;
/**
* @brief Cson链表
*
*/
typedef struct cson_list
{
struct cson_list *next; /**< 下一个元素 */
void *obj; /**< 对象 */
} CsonList;
extern CsonModel csonBasicListModel[]; /**< 基础类型链表数据模型 */
#define CSON_MODEL_CHAR_LIST &csonBasicListModel[0] /**< char型链表数据模型 */
#define CSON_MODEL_SHORT_LIST &csonBasicListModel[2] /**< short型链表数据模型 */
#define CSON_MODEL_INT_LIST &csonBasicListModel[4] /**< int型链表数据模型 */
#define CSON_MODEL_LONG_LIST &csonBasicListModel[6] /**< long型链表数据模型 */
#define CSON_MODEL_FLOAT_LIST &csonBasicListModel[8] /**< float型链表数据模型 */
#define CSON_MODEL_DOUBLE_LIST &csonBasicListModel[10] /**< double型链表数据模型 */
#define CSON_MODEL_STRING_LIST &csonBasicListModel[12] /**< string型链表数据模型 */
#define CSON_BASIC_LIST_MODEL_SIZE 2 /**< 基础类型链表数据模型大小 */
/**
* @brief 对象数据模型
*
* @param type 对象类型
*/
#define CSON_MODEL_OBJ(type) \
{CSON_TYPE_OBJ, NULL, 0, .param.objSize=sizeof(type)}
/**
* @brief char型数据模型
*
* @param type 对象模型
* @param key 数据键值
*/
#define CSON_MODEL_CHAR(type, key) \
{CSON_TYPE_CHAR, #key, offsetof(type, key)}
/**
* @brief short型数据模型
*
* @param type 对象模型
* @param key 数据键值
*/
#define CSON_MODEL_SHORT(type, key) \
{CSON_TYPE_SHORT, #key, offsetof(type, key)}
/**
* @brief int型数据模型
*
* @param type 对象模型
* @param key 数据键值
*/
#define CSON_MODEL_INT(type, key) \
{CSON_TYPE_INT, #key, offsetof(type, key)}
/**
* @brief long型数据模型
*
* @param type 对象模型
* @param key 数据键值
*/
#define CSON_MODEL_LONG(type, key) \
{CSON_TYPE_LONG, #key, offsetof(type, key)}
/**
* @brief float型数据模型
*
* @param type 对象模型
* @param key 数据键值
*/
#define CSON_MODEL_FLOAT(type, key) \
{CSON_TYPE_FLOAT, #key, offsetof(type, key)}
/**
* @brief double型数据模型
*
* @param type 对象模型
* @param key 数据键值
*/
#define CSON_MODEL_DOUBLE(type, key) \
{CSON_TYPE_DOUBLE, #key, offsetof(type, key)}
/**
* @brief bool型数据模型
*
* @param type 对象模型
* @param key 数据键值
*/
#define CSON_MODEL_BOOL(type, key) \
{CSON_TYPE_BOOL, #key, offsetof(type, key)}
/**
* @brief 字符串型数据模型
*
* @param type 对象模型
* @param key 数据键值
*/
#define CSON_MODEL_STRING(type, key) \
{CSON_TYPE_STRING, #key, offsetof(type, key)}
/**
* @brief 结构体型数据模型
*
* @param type 对象模型
* @param key 数据键值
* @param submodel 子结构体模型
* @param subsize 子结构体模型大小
*/
#define CSON_MODEL_STRUCT(type, key, submodel, subsize) \
{CSON_TYPE_STRUCT, #key, offsetof(type, key), .param.sub.model=submodel, .param.sub.size=subsize}
/**
* @brief list型数据模型
*
* @param type 对象模型
* @param key 数据键值
* @param submodel 子结构体模型
* @param subsize 子结构体模型大小
*/
#define CSON_MODEL_LIST(type, key, submodel, subsize) \
{CSON_TYPE_LIST, #key, offsetof(type, key), .param.sub.model=submodel, .param.sub.size=subsize}
/**
* @brief list型数据模型
*
* @param type 对象模型
* @param key 数据键值
* @param elementType 数组元素类型
* @param arraySize 数组大小
*/
#define CSON_MODEL_ARRAY(type, key, elementType, arraySize) \
{CSON_TYPE_ARRAY, #key, offsetof(type, key), .param.array.eleType=elementType, .param.array.size=arraySize}
/**
* @brief 子json数据模型
*
* @param type 对象模型
* @param key 数据键值
*/
#define CSON_MODEL_JSON(type, key) \
{CSON_TYPE_JSON, #key, offsetof(type, key)}
/**
* @brief CSON断言
*
* @param expr 表达式
* @param action 断言失败执行动作
*/
#define CSON_ASSERT(expr, action) \
if (!(expr)) { \
printf(#expr " assert failed at file: %s, line: %d\r\n", __FILE__, __LINE__); \
action; \
}
/**
* @brief CSON初始化
*
* @param malloc 内存分配函数
* @param free 内存释放函数
*/
void csonInit(void *malloc, void *free);
/**
* @brief 解析JSON对象
*
* @param json JSON对象
* @param model 数据模型
* @param modelSize 数据模型数量
* @return void* 解析得到的对象
*/
void *csonDecodeObject(cJSON *json, CsonModel *model, int modelSize);
/**
* @brief 解析JSON对象
*
* @param json JSON对象
* @param model 数据模型
* @return void* 解析得到的对象
*/
#define csonDecodeObjectEx(json, model) \
csonDecodeObject(json, model, sizeof(model) / sizeof(CsonModel))
/**
* @brief 解析JSON字符串
*
* @param jsonStr json字符串
* @param model 数据模型
* @param modelSize 数据模型数量
* @return void* 解析得到的对象
*/
void *csonDecode(const char *jsonStr, CsonModel *model, int modelSize);
/**
* @brief 解析JSON字符串
*
* @param jsonStr json字符串
* @param model 数据模型
* @return void* 解析得到的对象
*/
#define csonDecodeEx(jsonStr, model) \
csonDecode(jsonStr, model, sizeof(model) / sizeof(CsonModel));
/**
* @brief 编码成json字符串
*
* @param obj 对象
* @param model 数据模型
* @param modelSize 数据模型数量
* @return char* 编码得到的json字符串
*/
cJSON* csonEncodeObject(void *obj, CsonModel *model, int modelSize);
/**
* @brief 编码成json字符串
*
* @param obj 对象
* @param model 数据模型
* @param modelSize 数据模型数量
* @param bufferSize 分配给json字符串的空间大小
* @param fmt 是否格式化json字符串
* @return char* 编码得到的json字符串
*/
char* csonEncode(void *obj, CsonModel *model, int modelSize, int bufferSize, int fmt);
/**
* @brief 编码成json字符串
*
* @param obj 对象
* @param model 数据模型
* @param bufferSize 分配给json字符串的空间大小
* @param fmt 是否格式化json字符串
* @return char* 编码得到的json字符串
*/
#define csonEncodeEx(obj, model, bufferSize, fmt) \
csonEncode(obj, model, sizeof(model)/sizeof(CsonModel), bufferSize, fmt)
/**
* @brief 编码成json字符串
*
* @param obj 对象
* @param model 数据模型
* @param modelSize 数据模型数量
* @return char* 编码得到的json字符串
*/
char* csonEncodeUnformatted(void *obj, CsonModel *model, int modelSize);
/**
* @brief 编码成json字符串
*
* @param obj 对象
* @param model 数据模型
* @return char* 编码得到的json字符串
*/
#define csonEncodeUnformattedEx(obj, model) \
csonEncodeUnformatted(obj, model, sizeof(model) / sizeof(CsonModel))
/**
* @brief 释放CSON解析出的对象
*
* @param obj 对象
* @param model 对象模型
* @param modelSize 对象模型数量
*/
void csonFree(void *obj, CsonModel *model, int modelSize);
/**
* @brief 释放CSON解析出的对象
*
* @param obj 对象
* @param model 对象模型
*/
#define csonFreeEx(obj, model) \
csonFree(obj, model, sizeof(model) / sizeof(CsonModel))
/**
* @brief 释放cson编码生成的json字符串
*
* @param jsonStr json字符串
*/
void csonFreeJson(const char *jsonStr);
/**
* @brief CSON链表添加节点
*
* @param list 链表
* @param obj 节点对象
* @return CsonList 链表
*/
CsonList* csonListAdd(CsonList *list, void *obj);
/**
* @brief CSON链表删除节点
*
* @param list 链表
* @param obj 节点对象
* @param freeMem 释放内存
* @return CsonList 链表
*/
CsonList *csonListDelete(CsonList *list, void *obj, char freeMem);
/**
* @brief CSON新字符串
*
* @param src 源字符串
* @return char* 新字符串
* @note 此函数用于复制字符串，建议对结构体中字符串成员赋值时，使用此函数，
* 方便使用`csonFree`进行内存释放
*/
char* csonNewString(const char *src);
/**
* @}
*/
#endif
makefile
View file @ cde60581
......@@ -14,6 +14,7 @@ COMP_LIB_COMPONENTS := \
$(call Append_Conditional, SUBDIRS, application/kcloud, KCLOUD_PLATFORM_SUPPORT)
$(call Append_Conditional, SUBDIRS, application/kk_luoma, LUOMA_PLATFORM_SUPPORT)
SUBDIRS += application/oled
SUBDIRS += application/klansdk
SUBDIRS += midware/midware
SUBDIRS += common/mqtt
SUBDIRS += common/json
......
midware/midware/dm/dm_ota.h
View file @ cde60581
......@@ -20,4 +20,5 @@ int dm_ota_sub(void);
int dm_ota_deinit(void);
int dm_ota_get_ota_handle(void **handle);
int dm_ota_switch_device(int devid);
int dm_ota_yield(int timeout_ms);
#endif
midware/midware/dm/kk_dm_api.c
View file @ cde60581
......@@ -117,11 +117,9 @@ int iotx_dm_ccu_cloud_check(void)
int iotx_dm_dev_online(_IN_ int devid)
{
int res = 0;
if (devid < 0) {
return INVALID_PARAMETER;
}
_dm_api_lock();
res = dm_mgr_upstream_status_online(devid);
......
midware/midware/dm/kk_dm_api.h
View file @ cde60581
......@@ -25,5 +25,22 @@ typedef struct {
lite_cjson_item_t *lite;
} dm_api_property_t;
#endif
int iotx_dm_ccu_cloud_check(void);
int iotx_dm_subdev_topo_del(_IN_ int devid);
int kk_dm_subdev_register(_IN_ int devid);
int kk_dm_subdev_unregister(_IN_ int devid);
int kk_dm_subdev_topo_add(_IN_ int devid);
int iotx_dm_subdev_topo_del(_IN_ int devid);
int iotx_dm_ccu_cloud_check(void);
int iotx_dm_dev_online(_IN_ int devid);
int iotx_dm_dev_offline(_IN_ int devid);
int iotx_dm_subdev_login(_IN_ int devid);
int iotx_dm_subdev_logout(_IN_ int devid);
void iotx_dm_dispatch(void);
int iotx_dm_connect(_IN_ iotx_dm_event_callback cb);
int iotx_dm_open(void);
int iotx_dm_subscribe(_IN_ int devid);
void kk_dm_ota_report_version(_IN_ int devid, char *version);
void kk_dm_ota_send(void *data, int len);
int kk_dm_get_property_type(const char* deviceCode,const char *key);
#endif
midware/midware/dm/kk_dm_heartbeat.c
View file @ cde60581
......@@ -19,7 +19,6 @@
#include "kk_tsl_common.h"
#include "kk_dm_mng.h"
/*************************************************************
全局变量定义
*************************************************************/
......
midware/midware/dm/kk_dm_mng.c
View file @ cde60581
......@@ -270,6 +270,7 @@ int dm_mgr_device_create(_IN_ int dev_type,_IN_ char productCode[PRODUCT_CODE_MA
if(res != 0){
return FAIL_RETURN;
}
printf("--------------------------------------------------------->heartbeat:%d\n",heartbeat);
node->hb_timeout = heartbeat;
}
else{
......@@ -1349,7 +1350,6 @@ int dm_mgr_upstream_status_offline(_IN_ int devid)
return res;
}
const char DM_URI_COMBINE_LOGIN[] = "/thing/combine/login";
int dm_mgr_upstream_combine_login(_IN_ int devid)
{
......
midware/midware/dm/kk_dm_mng.h
View file @ cde60581
......@@ -62,5 +62,45 @@ typedef struct {
iotx_dm_error_code_t code;
} kk_msg_response_t;
int dm_mgr_search_dev_by_devid(_IN_ int devid, _OU_ dm_mgr_dev_node_t **node);
int dm_mgr_properities_db_create(kk_tsl_t* dev_shadow,char *deviceCode,int devType );
int dm_mgr_get_device_by_devicecode(_IN_ char deviceCode[DEVICE_CODE_MAXLEN], _OU_ dm_mgr_dev_node_t **node);
int dm_mgr_device_create(_IN_ int dev_type,_IN_ char productCode[PRODUCT_CODE_MAXLEN], _IN_ char deviceCode[DEVICE_CODE_MAXLEN],
_IN_ char mac[DEVICE_MAC_MAXLEN],_IN_ char fatherDeviceCode[DEVICE_CODE_MAXLEN],_IN_ int isOffline, _OU_ int *devid,_OU_ int *heartbeat);
int dm_mgr_search_device_by_pkdn( _IN_ char deviceCode[DEVICE_CODE_MAXLEN],_OU_ int *devid);
int dm_mgr_get_devicetype_by_devicecode(_IN_ char deviceCode[DEVICE_CODE_MAXLEN], _OU_ int* deviceType);
int dm_mgr_get_device_shadow_by_devicecode(_IN_ char deviceCode[DEVICE_CODE_MAXLEN], _OU_ kk_tsl_t **shadow);
int dm_mgr_get_device_by_devicecode(_IN_ char deviceCode[DEVICE_CODE_MAXLEN], _OU_ dm_mgr_dev_node_t **node);
int dm_mgr_get_device_by_productType(_IN_ char *productType, _OU_ dm_mgr_dev_node_t **node);
int dm_mgr_update_timestamp_by_devicecode(_IN_ char deviceCode[DEVICE_CODE_MAXLEN],time_t timestamp);
int dm_mgr_set_dev_onoffline(dm_mgr_dev_node_t *node,int isOffline);
int dm_mgr_check_heartbeat_timeout(time_t timestamp);
int dm_mgr_get_devId_by_devicecode(_IN_ char deviceCode[DEVICE_CODE_MAXLEN],_OU_ int *devid);
int dm_mgr_init(void);
int dm_mgr_deinit(void);
int iotx_report_id(void);
int dm_mgr_upstream_thing_property_post(_IN_ int devid, _IN_ char *payload, _IN_ int payload_len,_IN_ int isAsync);
int dm_mgr_upstream_thing_event_post(_IN_ int devid, _IN_ char *identifier, _IN_ int identifier_len, _IN_ char *method,
_IN_ char *payload, _IN_ int payload_len);
int dm_mgr_upstream_thing_event_post_ex(_IN_ int devid, _IN_ char *identifier, _IN_ int identifier_len, _IN_ char *method,
_IN_ char *payload, _IN_ int payload_len,const char *msgId);
int dm_mgr_upstream_thing_service_post(_IN_ int devid, _IN_ char *identifier, _IN_ int identifier_len, _IN_ char *method,
_IN_ char *payload, _IN_ int payload_len);
int dm_mgr_deprecated_upstream_thing_service_response(_IN_ int devid, _IN_ int msgid, _IN_ iotx_dm_error_code_t code,
_IN_ char *identifier, _IN_ int identifier_len, _IN_ char *payload, _IN_ int payload_len);
int dm_mgr_upstream_thing_sub_register(_IN_ int devid);
int dm_mgr_upstream_thing_sub_unregister(_IN_ int devid);
int dm_mgr_upstream_thing_topo_add(_IN_ int devid);
int dm_mgr_upstream_thing_topo_delete(_IN_ int devid);
int dm_mgr_upstream_thing_topo_get(void);
int dm_mgr_upstream_thing_list_found(_IN_ int devid);
int dm_mgr_ccu_status_cloud(_IN_ int devid);
int dm_mgr_upstream_status_online(_IN_ int devid);
int dm_mgr_upstream_status_offline(_IN_ int devid);
int dm_mgr_upstream_combine_login(_IN_ int devid);
int dm_mgr_upstream_combine_logout(_IN_ int devid);
int dm_mgr_ota_report_version(_IN_ int devid, char *version);
int dm_mgr_subdev_create(int devtype,_IN_ char productCode[PRODUCT_CODE_MAXLEN], _IN_ char deviceCode[DEVICE_CODE_MAXLEN],
_IN_ char mac[DEVICE_MAC_MAXLEN],_IN_ char fatherDeviceCode[DEVICE_CODE_MAXLEN],_IN_ int isOffline, _OU_ int *devid,_OU_ int *heartbeat);
int dm_mgr_subdev_delete(_IN_ char deviceCode[DEVICE_CODE_MAXLEN]);
#endif
midware/midware/dm/kk_dm_msg.c
View file @ cde60581
#include "kk_dm_msg.h"
#include "kk_dm_mng.h"
#include "kk_tsl_api.h"
#include "kk_dm_queue.h"
#include "lite-cjson.h"
#include "cJSON.h"
#include "kk_hal.h"
#include "com_api.h"
#include "kk_log.h"
......@@ -12,12 +11,13 @@ const char DM_MSG_REQUEST[] DM_READ_ONLY = "{\"msgId\":\"%s\",\"version\":\"%s\"
const char DM_MSG_INFO[] DM_READ_ONLY = "{\"msgtype\":\"%s\",\"productCode\":\"%s\",\"deviceCode\":\"%s\"}";
void kk_sendData2app(void *info, void *payload,int isAsync){
void *buf = NULL;
cJSON *root=cJSON_CreateObject();
cJSON* infoObj = cJSON_Parse(info);
cJSON* payloadObj = cJSON_Parse(payload);
cJSON_AddItemToObject(root, "info", infoObj);
cJSON_AddItemToObject(root, "payload",payloadObj);
void *buf = cJSON_Print(root);
buf = cJSON_Print(root);
if(isAsync){
dm_queue_msg_insert4(buf);
......@@ -706,6 +706,40 @@ static int dm_msg_request_parse(_IN_ char *payload, _IN_ int payload_len, _OU_ k
return SUCCESS_RETURN;
}
int dm_msg_thing_syncinfo_reply(void){
kk_msg_request_payload_t request;
kk_msg_response_t response;
dm_mgr_dev_node_t *node = NULL;
char *info = NULL;
int res = 0, devid = 0;
memset(&request, 0, sizeof(kk_msg_request_payload_t));
memset(&response, 0, sizeof(kk_msg_response_t));
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
res = dm_mgr_search_dev_by_devid(KK_DM_DEVICE_CCU_DEVICEID, &node);
if (res != SUCCESS_RETURN) {
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
return FAIL_RETURN;
}
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
//res = dm_msg_request_parse((char *)payload, payload_len, &request);
//if (res < SUCCESS_RETURN) {
//ERROR_PRINT("dm_msg_request_parse failed");
//return res ;
//}
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
response.msgTypeStr = KK_THING_SERVICE_SYNCINFO_REPLY;
memcpy(response.productCode, node->productCode, strlen( node->productCode));
memcpy(response.deviceCode, node->deviceCode, strlen(node->deviceCode));
response.code = (res == SUCCESS_RETURN) ? (IOTX_DM_ERR_CODE_SUCCESS) : (IOTX_DM_ERR_CODE_REQUEST_ERROR);
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
info = kk_sync_get_info();
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
dm_msg_response(&request, &response, info, strlen(info), NULL);
free(info);
return SUCCESS_RETURN;
}
const char DM_URI_THING_SERVICE_PROPERTY_SET_REPLY[] = "/thing/service/property/set_reply";
int dm_msg_thing_property_set_reply(char deviceCode[DEVICE_CODE_MAXLEN],char *payload, unsigned int payload_len,
......
midware/midware/dm/kk_dm_msg.h
View file @ cde60581
#ifndef __KK_DM_MSG__
#define __KK_DM_MSG__
#include "kk_tsl_common.h"
#include "cJSON.h"
#include "../tsl_handle/lite-cjson.h"
#include "kk_dm_mng.h"
#include "kk_tsl_api.h"
#define DM_MSG_KEY_ID "id"
#define DM_MSG_KEY_VERSION "version"
......@@ -79,14 +80,55 @@ const char DM_MSG_INFO[] DM_READ_ONLY;
#define KK_THING_METHOD_UPDATESCENC "thing.service.updateScene"
#define KK_THING_METHOD_EXECUTESCENE "thing.service.executeScene"
#define KK_THING_METHOD_ADDSCENC "thing.service.addScene"
#define KK_THING_SERVICE_SYNCINFO "/thing/service/syncinfo"
#define KK_THING_SERVICE_SYNCINFO_REPLY "/thing/service/syncinfo_reply"
#define KK_THING_EVENT_MESSAGE "/thing/event/"
#define KK_THING_EVENT_POST "/post"
void kk_sendData2app(void *info, void *payload,int isAsync);
int dm_msg_thing_sub_register(_IN_ char productCode[DEVICE_CODE_MAXLEN], _IN_ char deviceCode[DEVICE_CODE_MAXLEN],
_OU_ dm_msg_request_t *request);
int dm_msg_thing_sub_unregister(_IN_ char deviceCode[DEVICE_CODE_MAXLEN],_OU_ dm_msg_request_t *request);
int dm_msg_thing_topo_add(_IN_ char productCode[PRODUCT_CODE_MAXLEN],
_IN_ char deviceCode[DEVICE_CODE_MAXLEN], _IN_ char mac[DEVICE_MAC_MAXLEN],
_OU_ dm_msg_request_t *request);
int dm_msg_ccu_property_post(dm_mgr_dev_node_t *node);
int dm_msg_thing_property_post_by_identify(char *deviceCode,cJSON *params);
int dm_msg_thing_topo_delete(_IN_ char deviceCode[DEVICE_CODE_MAXLEN],_OU_ dm_msg_request_t *request);
int dm_msg_thing_topo_get(_OU_ dm_msg_request_t *request);
int dm_msg_thing_list_found(_IN_ char deviceCode[DEVICE_CODE_MAXLEN],
_OU_ dm_msg_request_t *request);
int dm_msg_status_cloud(_IN_ char productCode[PRODUCT_CODE_MAXLEN],
_IN_ char deviceCode[DEVICE_CODE_MAXLEN], _OU_ dm_msg_request_t *request);
int dm_msg_status_online(_IN_ char productCode[PRODUCT_CODE_MAXLEN],
_IN_ char deviceCode[DEVICE_CODE_MAXLEN], _OU_ dm_msg_request_t *request);
int dm_msg_status_offline(_IN_ char productCode[PRODUCT_CODE_MAXLEN],
_IN_ char deviceCode[DEVICE_CODE_MAXLEN], _OU_ dm_msg_request_t *request);
int dm_msg_combine_login(_IN_ char productCode[PRODUCT_CODE_MAXLEN],
_IN_ char deviceCode[DEVICE_CODE_MAXLEN], _OU_ dm_msg_request_t *request);
int dm_msg_combine_logout(_IN_ char deviceCode[DEVICE_CODE_MAXLEN],_OU_ dm_msg_request_t *request);
int dm_msg_ota_report_version(_IN_ char *version,
_OU_ dm_msg_request_t *request);
int dm_msg_request (_IN_ dm_msg_request_t *request,_IN_ int isAsync);
int dm_msg_response(_IN_ kk_msg_request_payload_t *request, _IN_ kk_msg_response_t *response,
_IN_ char *data, _IN_ int data_len, _IN_ void *user_data);
int dm_msg_response_parse(_IN_ char *payload, _IN_ int payload_len, _OU_ dm_msg_response_payload_t *response);
int dm_msg_thing_property_set_reply(char deviceCode[DEVICE_CODE_MAXLEN],char *payload, unsigned int payload_len,
void *context);
int dm_msg_thing_event_post(const char *deviceCode, const char *identifier,const char *msgId);
int dm_msg_scene_event_post(const char *identifier,kk_tsl_t *dev_shadow,const char *msgId);
int dm_msg_thing_service_post(const char *deviceCode, const char *identifier);
int dm_msg_thing_property_post_all(char *deviceCode);
int dm_msg_ccu_property_post(dm_mgr_dev_node_t *node);
int dm_msg_thing_property_post_by_identify(char *deviceCode,cJSON *params);
int kk_msg_execute_property_set(const char *productCode,const char *deviceCode,const char* params,const char *fatherDeviceCode);
int kk_msg_execute_property_get(dm_mgr_dev_node_t *node);
int kk_msg_parse_productType(char *str,char *productType);
int kk_msg_execute_scene_set(const char* params,const char *fatherDeviceCode,int isUpdate);
int kk_msg_execute_scene_action(const char* params,const char *fatherDeviceCode);
int kk_msg_execute_scene_delete(const char* params,const char *fatherDeviceCode);
int dm_msg_thing_syncinfo_reply(void);
//const char DM_URI_SYS_PREFIX[] DM_READ_ONLY = "/sys/%s/%s/";
......
midware/midware/dm/kk_dm_queue.h
View file @ cde60581
......@@ -42,5 +42,10 @@ int dm_queue_init(int max_size);
void dm_queue_deinit(void);
int dm_queue_msg_insert(void *data);
int dm_queue_msg_next(void **data);
int dm_queue_msg_insert2(void *data);
int dm_queue_msg_next2(void **data);
int dm_queue_msg_insert3(void *data);
int dm_queue_msg_next3(void **data);
int dm_queue_msg_insert4(void *data);
int dm_queue_msg_next4(void **data);
#endif
midware/midware/dm/kk_linkkit.c
View file @ cde60581
......@@ -991,49 +991,6 @@ static void _iotx_linkkit_event_callback(iotx_dm_event_types_t type, char *data)
kk_service_executeRoom_handle(paramStr);
}
#if 0
else if(strcmp(typeJson->valuestring,KK_THING_SERVICE_SETLOCALTIMER) == 0){
INFO_PRINT(" setlocaltimer \n");
cJSON *paramStr = cJSON_GetObjectItem(payload, MSG_PARAMS_STR);
kk_service_setLocalTimer_handle(paramStr,deviceCode->valuestring);
}
else if(strcmp(typeJson->valuestring,KK_THING_SERVICE_GETLOCALTIMER) == 0){
INFO_PRINT(" getlocaltimer \n");
kk_service_getLocalTimer_handle(deviceCode->valuestring);
}
else if(strcmp(typeJson->valuestring,KK_THING_SERVICE_SETCOUNTDOWN) == 0){
INFO_PRINT(" set count down \n");
cJSON *paramStr = cJSON_GetObjectItem(payload, MSG_PARAMS_STR);
kk_service_setCountDown_handle(paramStr,deviceCode->valuestring);
}
else if(strcmp(typeJson->valuestring,KK_THING_SERVICE_GETCOUNTDOWN) == 0){
INFO_PRINT(" get count down \n");
kk_service_getCountDown_handle(deviceCode->valuestring);
}
else if(strcmp(typeJson->valuestring,KK_THING_SERVICE_GETKEYLIST) == 0){
INFO_PRINT(" get key list \n");
kk_service_getLockKeylist_handle(deviceCode->valuestring);
}
else if(strcmp(typeJson->valuestring,KK_THING_SERVICE_ADDKEY) == 0){
INFO_PRINT(" add key \n");
cJSON *paramStr = cJSON_GetObjectItem(payload, MSG_PARAMS_STR);
kk_service_addKey_handle(deviceCode->valuestring,paramStr);
}
else if(strcmp(typeJson->valuestring,KK_THING_SERVICE_MODIFYKEY) == 0){
INFO_PRINT(" modify key \n");
cJSON *paramStr = cJSON_GetObjectItem(payload, MSG_PARAMS_STR);
kk_service_modifyKey_handle(deviceCode->valuestring,paramStr);
}
else if(strcmp(typeJson->valuestring,KK_THING_SERVICE_DELETEKEY) == 0){
INFO_PRINT(" delete key \n");
cJSON *paramStr = cJSON_GetObjectItem(payload, MSG_PARAMS_STR);
kk_service_deleteKey_handle(deviceCode->valuestring,paramStr);
}
#endif
else if(strcmp(typeJson->valuestring,KK_THING_SERVICE_ADDSCENC) == 0){
INFO_PRINT(" add scene \n");
cJSON *paramStr = cJSON_GetObjectItem(payload, MSG_PARAMS_STR);
......@@ -1082,6 +1039,10 @@ static void _iotx_linkkit_event_callback(iotx_dm_event_types_t type, char *data)
}
}
else if(strcmp(typeJson->valuestring,KK_THING_SERVICE_SYNCINFO) == 0){
INFO_PRINT("SYNCINFO service \n");
dm_msg_thing_syncinfo_reply();
}
else{
INFO_PRINT("Error msgtype!!! \n");
......
midware/midware/dm/kk_property_db.c
View file @ cde60581
......@@ -14,7 +14,7 @@
#include <stdio.h>
#include "kk_tsl_api.h"
#include "sqlite3.h"
#include "kk_log.h"
#include "kk_dm_mng.h"
#include "kk_property_db.h"
......@@ -24,25 +24,6 @@
全局变量定义
*************************************************************/
extern sqlite3 *g_kk_pDb;
typedef struct {
void *mutex;
sqlite3 *pDb;
} kk_property_db_ctx_t;
typedef enum{
DB_LOCKKEY_IDX = 0,
DB_LOCKKEY_DEVICECODE,
DB_LOCKKEY_KEYID,
DB_LOCKKEY_KEYTYPE,
DB_LOCKKEY_KEYROLE,
DB_LOCKKEY_ISVALID,
DB_LOCKKEY_KEYNAME,
DB_LOCKKEY_KEYEFFECTIVE,
DB_LOCKKEY_KEYEXPIRE
};
static kk_property_db_ctx_t s_kk_property_db_ctx = {0};
static kk_property_db_ctx_t *_kk_property_db_get_ctx(void)
{
......@@ -71,7 +52,7 @@ static void _kk_property_db_unlock(void)
*返 回 值： 0：成功；其他：失败
*其他说明：
*************************************************************/
static int kk_property_db_Init(void)
static int _kk_property_db_Init(void)
{
kk_property_db_ctx_t *ctx = _kk_property_db_get_ctx();
......@@ -145,7 +126,7 @@ int kk_property_db_init(void)
return FAIL_RETURN;
}
res = kk_property_db_Init();
res = _kk_property_db_Init();
if(res != SUCCESS_RETURN){
ERROR_PRINT("[%s][%d]kk_wlist_db_Init FAIL!!!\n",__FUNCTION__,__LINE__);
......
midware/midware/dm/kk_property_db.h
View file @ cde60581
#ifndef _KK_PROPERTY_DB_H_
#define _KK_PROPERTY_DB_H_
#include "kk_tsl_common.h"
#include "sqlite3.h"
enum{
DB_LOCKKEY_IDX = 0,
DB_LOCKKEY_DEVICECODE,
DB_LOCKKEY_KEYID,
DB_LOCKKEY_KEYTYPE,
DB_LOCKKEY_KEYROLE,
DB_LOCKKEY_ISVALID,
DB_LOCKKEY_KEYNAME,
DB_LOCKKEY_KEYEFFECTIVE,
DB_LOCKKEY_KEYEXPIRE
};
typedef struct {
void *mutex;
sqlite3 *pDb;
} kk_property_db_ctx_t;
typedef struct{
int type;
char deviceCode[DEVICE_CODE_MAXLEN];
char raw[60];
}kk_prop_raw_struct_t;
typedef enum{
enum{
DB_IDX = 0,
DB_DEVICECODE,
DB_IDENTIFITER,
......@@ -16,7 +32,19 @@ typedef enum{
DB_VALUETYPE,
DB_DEVTYPE
};
int kk_property_db_init(void);
int kk_property_db_init(void);
int kk_property_db_get_rawdata(const char *identifier,const int dev_type, kk_prop_raw_struct_t* raw, int count);
int kk_property_db_update_value(const char *deviceCode,const char *identifier,const char* value);
int kk_property_db_insert(const char *deviceCode,const char *identifier,kk_tsl_data_type_e valuetype,int devtype);
int kk_property_db_update_value(const char *deviceCode,const char *identifier,const char* value);
int kk_property_db_get_value_directly(const char *deviceCode,const char *identifier,char* value);
int kk_property_db_get_value(const char *deviceCode,const char *identifier,void* value);
int kk_property_db_update(const char *deviceCode);
int kk_property_sync_values(const char *deviceCode);
int kk_property_delete_by_dcode(char deviceCode[DEVICE_CODE_MAXLEN]);
int kk_property_update_lockkeys(char deviceCode[DEVICE_CODE_MAXLEN],char *keyId,int KeyType, int KeyRole, \
int IsValid,char *KeyName,int KeyEffectiveTime,int KeyExpiryTime);
int kk_property_delete_lockkeys(char deviceCode[DEVICE_CODE_MAXLEN],char *keyId);
#endif
midware/midware/dm/kk_sub_db.h
View file @ cde60581
......@@ -10,7 +10,17 @@ int kk_subDev_delete_byMac(char device_mac[DEVICE_MAC_MAXLEN]);
int kk_subDev_update_offline(int isOnline,const char *device_mac);
int kk_subDev_update_auth(int isAuth,const char *deviceCode);
typedef enum{
int kk_subDev_update_sceneSupport(int sceneSupport,const char *deviceCode);
int kk_subDev_delete_by_dcode(char deviceCode[DEVICE_CODE_MAXLEN]);
int kk_subDev_update_productType(char *productType,const char *deviceCode);
int kk_subDev_update_auth(int isAuth,const char *deviceCode);
int kk_subDev_send_property_get_from_db(void);
int kk_subDev_send_property_get(const char *fatherDeviceCode);
int kk_subDev_check_scene_support(const char *deviceCode);
int kk_subDev_set_action_by_productType(const char *productType,const char *sceneId,const char *propertyName,const char *propertyValue,const char *type);
enum{
DB_SUB_IDX = 0,
DB_SUB_ONLINE,
DB_SUB_PRODUCTCODE,
......
midware/midware/dm/kk_sync_data.c
View file @ cde60581
......@@ -146,6 +146,7 @@ static int kk_get_properties_info(char *deviceCode,cJSON *obj)
propertyStr = sqlite3_column_text(stmt, DB_IDENTIFITER);
valueType = sqlite3_column_int(stmt, DB_VALUETYPE);
valueStr = sqlite3_column_text(stmt, DB_VALUE);
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
if(valueType == KK_TSL_DATA_TYPE_TEXT){
cJSON_AddStringToObject(propertyItem, propertyStr, valueStr);
}else if(valueType == KK_TSL_DATA_TYPE_INT||
......@@ -174,6 +175,7 @@ static int kk_get_sub_devices_info(cJSON *gwdevicesItem,char *deviceCode)
return FAIL_RETURN;
}
cJSON *subDevices = cJSON_CreateArray();
#if 1
sqlCmd = sqlite3_mprintf("select * from SubDeviceInfo WHERE fatherDeviceCode = '%s' ",deviceCode);
sqlite3_prepare_v2(ctx->pDb, sqlCmd, strlen(sqlCmd), &stmt, NULL);
while(sqlite3_step(stmt) == SQLITE_ROW){
......@@ -191,8 +193,9 @@ static int kk_get_sub_devices_info(cJSON *gwdevicesItem,char *deviceCode)
cJSON_AddStringToObject(subdevicesItem, KK_SYNC_SN_STR, "");
cJSON_AddStringToObject(subdevicesItem, KK_SYNC_STATUS_STR, "启动");
kk_get_properties_info(subDeviceCode,subdevicesItem);
cJSON_AddItemToArray(subDevices, gwdevicesItem);
cJSON_AddItemToArray(subDevices, subdevicesItem);
}
#endif
cJSON_AddItemToObject(gwdevicesItem, KK_SYNC_DEVICES_STR, subDevices);
sqlite3_free(sqlCmd);
sqlite3_finalize(stmt);
......@@ -224,6 +227,8 @@ static int kk_get_gw_devices_info(cJSON *gwdevices)
gw_productCode = sqlite3_column_text(stmt, DB_SUB_PRODUCTCODE);
gw_version = sqlite3_column_text(stmt, DB_SUB_VERSION);
gw_isline = sqlite3_column_text(stmt, DB_SUB_ONLINE);
printf("gw_deviceCode:%s\n",gw_deviceCode);
printf("gw_productCode:%s\n",gw_productCode);
cJSON_AddStringToObject(gwdevicesItem, KK_SYNC_DEVICECODE_STR, gw_deviceCode);
cJSON_AddStringToObject(gwdevicesItem, KK_SYNC_VERSION_STR, gw_version);
cJSON_AddStringToObject(gwdevicesItem, KK_SYNC_MAC_STR, gw_deviceCode);
......@@ -293,11 +298,11 @@ static int kk_get_scenes_trigger_info(char *triggerArray,char *sceneId)
char *sqlCmd = NULL;
char *zErrMsg = 0;
sqlite3_stmt *stmt;
char *deviceCode = NULL;
char *propertyName = NULL;
char *compareType = NULL;
char *compareValue = NULL;
char *type = NULL;
const unsigned char *deviceCode = NULL;
const unsigned char *propertyName = NULL;
const unsigned char *compareType = NULL;
const unsigned char *compareValue = NULL;
const unsigned char *type = NULL;
int delay = 0,epNum = 0;
kk_sync_ctx_t *ctx = _kk_sync_get_ctx();
if(triggerArray == NULL || sceneId == NULL){
......@@ -313,11 +318,11 @@ static int kk_get_scenes_trigger_info(char *triggerArray,char *sceneId)
compareType = sqlite3_column_text(stmt, DB_SCENETRIGGER_COMPARETYPE);
compareValue = sqlite3_column_text(stmt, DB_SCENETRIGGER_COMPAREVALUE);
type = sqlite3_column_text(stmt, DB_SCENETRIGGER_TYPE);
cJSON_AddStringToObject(triggerItem, KK_SYNC_DEVICECODE_STR, deviceCode);
cJSON_AddStringToObject(triggerItem, KK_SYNC_DEVICECODE_STR, (char*)deviceCode);
cJSON_AddNumberToObject(triggerItem, KK_SYNC_SCENE_EPNUM_STR, epNum);
cJSON_AddStringToObject(triggerItem, KK_SYNC_SCENE_PROPERTYNAME_STR, propertyName);
cJSON_AddStringToObject(triggerItem, KK_SYNC_SCENE_COMPARETYPE_STR, compareType);
cJSON_AddStringToObject(triggerItem, KK_SYNC_SCENE_COMPAREValue_STR, compareValue);
cJSON_AddStringToObject(triggerItem, KK_SYNC_SCENE_PROPERTYNAME_STR, (char*)propertyName);
cJSON_AddStringToObject(triggerItem, KK_SYNC_SCENE_COMPARETYPE_STR, (char*)compareType);
cJSON_AddStringToObject(triggerItem, KK_SYNC_SCENE_COMPAREValue_STR, (char*)compareValue);
cJSON_AddItemToArray(triggerArray, triggerItem);
}
sqlite3_free(sqlCmd);
......@@ -445,6 +450,8 @@ static int kk_get_ccu_properties(cJSON *property)
*************************************************************/
char *kk_sync_get_info()
{
char *out = NULL;
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
char ccu_deviceCode[DEVICE_CODE_MAXLEN] = {0};
char ccu_productCode[PRODUCT_CODE_MAXLEN] = {0};
char version[32] = {0};
......@@ -453,13 +460,17 @@ char *kk_sync_get_info()
cJSON_AddStringToObject(root,KK_SYNC_CODE_STR,"0");
cJSON *data = cJSON_CreateObject();
cJSON_AddItemToObject(root, KK_SYNC_DATA_STR, data);
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
kk_get_rooms_info(data);
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
kk_get_devices_info(data);
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
kk_get_scenes_info(data);
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
HAL_GetDevice_Code(ccu_deviceCode);
HAL_GetProduct_Code(ccu_productCode);
HAL_GetVersion(version);
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
cJSON_AddStringToObject(data, KK_SYNC_DEVICECODE_STR,ccu_deviceCode);
cJSON_AddStringToObject(data, KK_SYNC_NANE_STR, "newccu");
sprintf(cloudstatus_str, "%d", kk_get_cloudstatus());
......@@ -467,12 +478,14 @@ char *kk_sync_get_info()
cJSON_AddStringToObject(data, KK_SYNC_PRODUCTCODE_STR, ccu_productCode);
cJSON_AddStringToObject(data, KK_SYNC_VERSION_STR, version);
cJSON *property = cJSON_CreateObject();
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
kk_get_ccu_properties(property);
cJSON_AddItemToObject(data, KK_SYNC_PROPERTY_STR, property);
char *out=cJSON_Print(root);
printf("[%s][%d]\n",__FUNCTION__,__LINE__);
out=cJSON_Print(root);
printf("kk_sync_get_info:%s\n",out);
cJSON_Delete(root);
free(out);
return NULL;
//free(out);
return out;
}
midware/midware/history/kk_history_db.h
View file @ cde60581
......@@ -2,17 +2,21 @@
#ifndef __KK_HISTORY_DB_H__
#define __KK_HISTORY_DB_H__
typedef enum{
enum{
DB_SENSOR_DEVICECODE = 0,
DB_SENSOR_IDENTIFIER,
DB_SENSOR_VALUE,
DB_SENSOR_RECORDTIME,
};
typedef enum{
enum{
DB_OUTLET_DEVICECODE = 0,
DB_OUTLET_POWER,
DB_OUTLET_METERING,
DB_OUTLET_RECORDTIME,
};
int kk_history_db_init(void);
int kk_history_delete_by_recordtime(const char *table,time_t time);
int kk_history_insert_sensor_info(const char* deviceCode,const char* identifier,const char* valueStr,time_t time);
int kk_history_insert_Outlet_info(const char* deviceCode,const char* power,const char* metering,time_t time);
#endif
midware/midware/midware.c
View file @ cde60581
......@@ -32,15 +32,21 @@
#include "kk_dm_queue.h"
#include "kk_property_db.h"
#include "sqlite3.h"
#include "kk_linkkit.h"
#include "kk_dm_heartbeat.h"
#include "kk_sub_db.h"
#include "kk_hal.h"
#include "kk_history_db.h"
#include "kk_scene_handle.h"
#include "dm_ota.h"
int g_timezone = 8;
char * g_filerToPlatTable[] =
{
{KK_REGISTER_TOPIC_REPLY},
{KK_ADD_TOPIC_REPLY},
{KK_LOGIN_TOPIC_REPLY},
{KK_THING_SERVICE_PROPERTY_GET},
{KK_THING_CLOUDSTATE_MSG},
(char *){KK_REGISTER_TOPIC_REPLY},
(char *){KK_ADD_TOPIC_REPLY},
(char *){KK_LOGIN_TOPIC_REPLY},
(char *){KK_THING_SERVICE_PROPERTY_GET},
(char *){KK_THING_CLOUDSTATE_MSG},
#if 0
{KK_THING_SERVICE_SETLOCALTIMER},
{KK_THING_SERVICE_GETLOCALTIMER},
......@@ -50,10 +56,11 @@ char * g_filerToPlatTable[] =
{KK_THING_SERVICE_DELETEKEY},
{KK_THING_SERVICE_MODIFYKEY},
#endif
{KK_THING_SERVICE_ADDSCENC},
{KK_THING_SERVICE_UPDATESCENC},
{KK_THING_SERVICE_DELETESCENC},
{KK_THING_SERVICE_NEGATIVE},
(char *){KK_THING_SERVICE_ADDSCENC},
(char *){KK_THING_SERVICE_UPDATESCENC},
(char *){KK_THING_SERVICE_DELETESCENC},
(char *){KK_THING_SERVICE_NEGATIVE},
(char *){KK_THING_SERVICE_SYNCINFO},
};
/************************************************************
*功能描述：过滤不需要下发给网关的消息
......@@ -149,7 +156,7 @@ static int kk_property_set_data_check(cJSON * payload,const char *deviceCode){
int res = 0;
int idx = 0;
int value = 0;
res = dm_mgr_get_device_by_devicecode(deviceCode,&node);
res = dm_mgr_get_device_by_devicecode((char*)deviceCode,&node);
if (res != SUCCESS_RETURN) {
ERROR_PRINT("ERROR [%s][%d] res:%d\n",__FUNCTION__,__LINE__,res);
return FAIL_RETURN;
......@@ -394,7 +401,7 @@ void mid2p_cb(void* data, int len, char* chalMark){
*************************************************************/
void gw2mid_cb(void* data, int len, char* chalMark){
if (data != NULL){
printf("gw2mid_cb chalMark=%s, data: %s [%d]RECEIVED \r\n", chalMark, data,len);
printf("gw2mid_cb chalMark=%s, data: %s [%d]RECEIVED \r\n", chalMark, (char*)data,len);
mid2p_cb(data,len,chalMark);
}
}
......@@ -692,9 +699,7 @@ void kk_platMsg_dispatch(void)
if (dm_queue_msg_next2(&data) == SUCCESS_RETURN) {
dm_queue_msg_t *msg = (dm_queue_msg_t *)data;
//INFO_PRINT("kk_handle_platMsg_dispatch get call \n");
if (kk_platMsg_handle) {
kk_platMsg_handle(msg->data,msg->chalMark);
}
kk_platMsg_handle(msg->data,(char*)msg->chalMark);
if (msg->data != NULL){
free(msg->data);
......
midware/midware/scene/kk_scene_db.h
View file @ cde60581
......@@ -2,21 +2,21 @@
#ifndef __KK_SCENE_DB_H__
#define __KK_SCENE_DB_H__
typedef enum{
enum{
DB_SCENETYPE_SCENE = 0,
DB_SCENETYPE_IFTT,
DB_SCENETYPE_TIMING,
DB_SCENETYPE_MUTICONTROL,
};
typedef enum{
enum{
DB_SCENEINFO_NAME = 0,
DB_SCENEINFO_SCENETYPE,
DB_SCENEINFO_ENABLE,
DB_SCENEINFO_SCENEID,
};
typedef enum{
enum{
DB_SCENETRIGGER_TYPE = 0,
DB_SCENETRIGGER_DEVICECODE,
DB_SCENETRIGGER_EPNUM,
......@@ -27,7 +27,7 @@ typedef enum{
DB_SCENETRIGGER_ISAND,
};
typedef enum{
enum{
DB_SCENECONDITION_TYPE = 0,
DB_SCENECONDITION_STARTTIME,
DB_SCENECONDITION_ENDTIME,
......@@ -36,7 +36,7 @@ typedef enum{
DB_SCENECONDITION_SCENEID,
};
typedef enum{
enum{
DB_SCENEACTION_TYPE = 0,
DB_SCENEACTION_DEVICECODE,
DB_SCENEACTION_EPNUM,
......@@ -47,21 +47,21 @@ typedef enum{
DB_SCENEACTION_GWDEVICECODE,
};
typedef enum{
enum{
DB_SCENETIMER_WEEK = 0,
DB_SCENETIMER_TIME,
DB_SCENETIMER_SCENEID,
};
typedef enum{
enum{
DB_SCENEEMBED_WEEK = 0,
DB_SCENEEMBED_EXECUTESCENEID,
DB_SCENEMBED_SCENEID,
};
typedef enum{
enum{
DB_SCENEINVOKESERVICE_TYPE = 0,
DB_SCENEINVOKESERVICE_IDENTIFIER,
DB_SCENEINVOKESERVICE_SCENEID,
......
midware/midware/scene/kk_scene_handle.c
View file @ cde60581
......@@ -12,11 +12,9 @@
*************************************************************/
#include <stdio.h>
#include "kk_tsl_api.h"
#include "kk_dm_mng.h"
#include "kk_scene_handle.h"
#include "kk_scene_db.h"
#include "cJSON.h"
#include <time.h>
......
midware/midware/scene/kk_scene_handle.h
View file @ cde60581
......@@ -4,7 +4,10 @@
#include "kk_tsl_common.h"
#include "sqlite3.h"
#include "kk_log.h"
#include "kk_scene_db.h"
#include "cJSON.h"
#include "kk_tsl_api.h"
#include "kk_dm_mng.h"
typedef struct kk_scene_action_detail{
char deviceCode[DEVICE_CODE_MAXLEN];
char propertyName[DEVICE_PROPERTY_NAME_MAX];
......@@ -61,6 +64,13 @@ typedef struct {
int kk_scene_init(void);
int kk_scene_iftt_check(const char*deviceCode,cJSON *param);
int kk_scene_execute_scene(const char *sceneId,const char *msgId);
void kk_scene_execute_event_post(const char* sceneId,const char *msgId);
int kk_scene_query_trigger_info(const char *deviceCode,cJSON *param);
int kk_scene_execute_action(const char* sceneId,char *msgId);
int kk_scene_check_condition(const char *sceneId);
int kk_scene_check_trigger_condition(const char *sceneId);
int kk_scene_get_scene_info(const char* sceneId,int *sceneType,int *enable);
#endif
midware/tsl/tsl_handle/kk_tsl_api.c
View file @ cde60581
......@@ -4,6 +4,8 @@
#include "kk_dm_mng.h"
#include "kk_dm_msg.h"
#include "kk_log.h"
#include "kk_utils.h"
#include "kk_tsl_parse.h"
typedef enum {
KK_MSG_PROPERTY_SET,
......@@ -1064,7 +1066,8 @@ int kk_tsl_set_value(kk_tsl_set_t set, kk_tsl_t * dev_shadow, const char *identi
for (index = 0; index < dev_shadow->event_number; index++) {
property = dev_shadow->events + index;
if(strcmp(property->identifier,"property") == 0 ||
strcmp(property->identifier,"post") == 0){
strcmp(property->identifier,"post") == 0)
{
e_identifier = property->identifier;
break;
}
......@@ -1136,7 +1139,7 @@ int kk_msg_uri_parse_pkdn(_IN_ char *uri, _IN_ int uri_len, _IN_ int start_deli,
return SUCCESS_RETURN;
}
int kk_tsl_property_set_by_shadow(kk_tsl_t * dev_shadow, const char *payload, unsigned int payload_len)
int kk_tsl_property_set_by_shadow(kk_tsl_t* dev_shadow, const char *payload, unsigned int payload_len)
{
kk_msg_request_payload_t request;
int res = 0, devid = 0;
......@@ -1233,7 +1236,8 @@ int kk_tsl_get_property_number(_IN_ kk_tsl_t *shadow, _OU_ int *number)
for (index = 0; index < shadow->event_number; index++) {
property = shadow->events + index;
if(strcmp(property->identifier,"property") == 0 ||
strcmp(property->identifier,"post") == 0){
strcmp(property->identifier,"post") == 0)
{
*number = property->output_data_number;
return SUCCESS_RETURN;
}
......@@ -1288,7 +1292,8 @@ int kk_tsl_post_property_add(_IN_ void *handle, _IN_ char *identifier, _IN_ int
for (index = 0; index < dapi_property->shadow->event_number; index++) {
event = dapi_property->shadow->events + index;
if(strcmp(event->identifier,"property") == 0 ||
strcmp(event->identifier,"post") == 0){
strcmp(event->identifier,"post") == 0)
{
pEventoutput = (kk_tsl_data_t *)(event->output_datas);
number = event->output_data_number;
break;
......
midware/tsl/tsl_handle/kk_tsl_api.h
View file @ cde60581
......@@ -83,5 +83,16 @@ extern int kk_msg_uri_parse_pkdn(_IN_ char *uri, _IN_ int uri_len, _IN_ int star
extern char* kk_tsl_get_post_property_str(kk_tsl_t *dev_shadow, const char *property_identifier);
extern char* kk_tsl_get_post_event_str(_IN_ kk_tsl_t *dev_shadow, _IN_ char *identifier, _IN_ int identifier_len);
extern char * kk_tsl_get_post_service_str(kk_tsl_t *dev_shadow, const char *service_identifier);
int kk_tsl_property_set_by_shadow(kk_tsl_t* dev_shadow, const char *payload, unsigned int payload_len);
int kk_tsl_get_property_data(_IN_ kk_tsl_t *shadow, _IN_ char *key, _IN_ int key_len, _OU_ void **data);
int dm_tsl_get_event_output_data(_IN_ kk_tsl_t *shadow, _IN_ char *key, _IN_ int key_len, _OU_ void **data);
int dm_tls_set_event_output_value(_IN_ kk_tsl_t *shadow, _IN_ char *key, _IN_ int key_len, _IN_ void *value,
_IN_ int value_len);
int dm_tsl_get_service_input_output_data(_IN_ kk_tsl_data_target_e type, _IN_ kk_tsl_t *shadow, _IN_ char *key,
_IN_ int key_len, _OU_ void **data);
int dm_tsl_set_service_input_output_value(_IN_ kk_tsl_data_target_e type, _IN_ kk_tsl_t *shadow, _IN_ char *key,
_IN_ int key_len, _IN_ void *value, _IN_ int value_len);
int dm_tsl_set_property_value(_IN_ kk_tsl_t *shadow, _IN_ char *key, _IN_ int key_len, _IN_ void *value,
_IN_ int value_len);
int kk_tsl_get_data_type(_IN_ void *data, _OU_ kk_tsl_data_type_e *type);
#endif
midware/tsl/tsl_handle/kk_tsl_func.c
View file @ cde60581
#include "kk_tsl_common.h"
#include "kk_utils.h"
#include "kk_tsl_parse.h"
typedef int (*kk_tsl_data_set)(_IN_ kk_tsl_data_value_t *data_value, _IN_ void *value, _IN_ int value_len);
typedef int (*kk_tsl_array_set)(_IN_ kk_tsl_data_value_t *data_value, _IN_ void *value, _IN_ int value_len,
......
midware/tsl/tsl_handle/kk_tsl_load.c
View file @ cde60581
......@@ -4,6 +4,8 @@
#include "kk_tsl_common.h"
#include "kk_dm_mng.h"
#include "kk_log.h"
#include "kk_tsl_parse.h"
#define TSL_SUBDEVICE_PATH_FILE "/usr/kk/tsl/product_%s.json"
#define TSL_GATEWAY_PATH_FILE "/usr/kk/tsl/gateway_%s.json"
#define TSL_CCU_PATH_FILE "/usr/kk/tsl/ccu_%s.json"
......
midware/tsl/tsl_handle/kk_tsl_parse.c
View file @ cde60581
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "lite-cjson.h"
#include "kk_tsl_common.h"
#include "kk_log.h"
#include "kk_log.h"
#include "kk_tsl_parse.h"
typedef int (*kk_tsl_data_parse)(_IN_ kk_tsl_data_value_t *data_value, _IN_ lite_cjson_t *root);
typedef int (*kk_tsl_array_parse)(_IN_ kk_tsl_data_value_t *data_value, _IN_ lite_cjson_t *root);
......
midware/tsl/tsl_handle/lite-cjson.c
View file @ cde60581
......@@ -472,11 +472,12 @@ static int parse_value(_IN_ lite_cjson_t *const lite, _IN_ parse_buffer *const i
int lite_cjson_parse(_IN_ const char *src, _IN_ int src_len, _OU_ lite_cjson_t *lite)
{
parse_buffer buffer;
if (!lite || !src || !lite || src_len <= 0) {
return -1;
}
parse_buffer buffer;
memset(&buffer, 0, sizeof(parse_buffer));
buffer.content = (const unsigned char *)src;
......@@ -560,22 +561,25 @@ int lite_cjson_is_object(_IN_ lite_cjson_t *lite)
int lite_cjson_array_item(_IN_ lite_cjson_t *lite, _IN_ int index, _OU_ lite_cjson_t *lite_item)
{
parse_buffer buffer;
parse_buffer *p_buffer = &buffer;
lite_cjson_t current_item;
int iter_index = 0;
if (!lite || lite->type != cJSON_Array || !lite->value ||
index < 0 || index >= lite->size || !lite_item) {
return -1;
}
parse_buffer buffer;
parse_buffer *p_buffer = &buffer;
memset(&buffer, 0, sizeof(parse_buffer));
buffer.content = (const unsigned char *)lite->value;
buffer.length = lite->value_length;
buffer.offset = 0;
lite_cjson_t current_item;
//int start_pos = p_buffer->offset;
int iter_index = 0;
if (buffer_at_offset(p_buffer)[0] != '[') {
/* not an array */
......@@ -626,22 +630,24 @@ int lite_cjson_array_item(_IN_ lite_cjson_t *lite, _IN_ int index, _OU_ lite_cjs
static int _lite_cjson_object_item(_IN_ lite_cjson_t *lite, _IN_ const char *key, _IN_ int key_len,
_OU_ lite_cjson_t *lite_item)
{
parse_buffer buffer;
parse_buffer *p_buffer = &buffer;
lite_cjson_t current_item_key;
lite_cjson_t current_item_value;
int index = 0;
if (!lite || lite->type != cJSON_Object || !lite->value || lite->size == 0 || !key || key_len <= 0 || !lite_item) {
return -1;
};
parse_buffer buffer;
parse_buffer *p_buffer = &buffer;
memset(&buffer, 0, sizeof(parse_buffer));
buffer.content = (const unsigned char *)lite->value;
buffer.length = lite->value_length;
buffer.offset = 0;
lite_cjson_t current_item_key;
lite_cjson_t current_item_value;
//int start_pos = p_buffer->offset;
int index = 0;
if (cannot_access_at_index(p_buffer, 0) || (buffer_at_offset(p_buffer)[0] != '{')) {
return -1; /* not an object */
......@@ -705,16 +711,16 @@ static int _lite_cjson_object_item(_IN_ lite_cjson_t *lite, _IN_ const char *key
static int _lite_cjson_key_array_index(_IN_ const char *key, _IN_ int key_len,
_OU_ int *partial_key_len, _OU_ int *array_key_len, _OU_ int *array_index)
{
if (!key || !partial_key_len || !array_key_len || !array_index) {
return -1;
}
char *bracket_pre = NULL;
char *bracket_suf = NULL;
int index = 0;
int deep = 0;
char array_index_str[10] = {0};
if (!key || !partial_key_len || !array_key_len || !array_index) {
return -1;
}
for (index = 0; index < key_len; index++) {
switch (key[index]) {
case '[': {
......@@ -762,9 +768,7 @@ static int _lite_cjson_key_array_index(_IN_ const char *key, _IN_ int key_len,
int lite_cjson_object_item(_IN_ lite_cjson_t *lite, _IN_ const char *key, _IN_ int key_len,
_OU_ lite_cjson_t *lite_item)
{
if (!lite || lite->type != cJSON_Object || !lite->value || lite->size == 0 || !key || key_len <= 0 || !lite_item) {
return -1;
};
int res = 0;
char *delim = NULL;
......@@ -778,6 +782,9 @@ int lite_cjson_object_item(_IN_ lite_cjson_t *lite, _IN_ const char *key, _IN_ i
int array_key_len = 0;
int array_index = 0;
if (!lite || lite->type != cJSON_Object || !lite->value || lite->size == 0 || !key || key_len <= 0 || !lite_item) {
return -1;
};
memcpy(&lite_iter, lite, sizeof(lite_cjson_t));
memset(&lite_prev, 0, sizeof(lite_cjson_t));
......@@ -833,22 +840,25 @@ int lite_cjson_object_item(_IN_ lite_cjson_t *lite, _IN_ const char *key, _IN_ i
int lite_cjson_object_item_by_index(_IN_ lite_cjson_t *lite, _IN_ int index, _OU_ lite_cjson_t *lite_item_key,
_OU_ lite_cjson_t *lite_item_value)
{
parse_buffer buffer;
parse_buffer *p_buffer = &buffer;
int item_index = 0;
lite_cjson_t current_item_key;
lite_cjson_t current_item_value;
if (!lite || lite->type != cJSON_Object || !lite->value || lite->size == 0 || index < 0 || index >= lite->size) {
return -1;
};
parse_buffer buffer;
parse_buffer *p_buffer = &buffer;
memset(&buffer, 0, sizeof(parse_buffer));
buffer.content = (const unsigned char *)lite->value;
buffer.length = lite->value_length;
buffer.offset = 0;
lite_cjson_t current_item_key;
lite_cjson_t current_item_value;
//int start_pos = p_buffer->offset;
int item_index = 0;
if (cannot_access_at_index(p_buffer, 0) || (buffer_at_offset(p_buffer)[0] != '{')) {
return -1; /* not an object */
......
opcodeMapCfg/device_3023.json 0 → 100644
View file @ cde60581
{
"productCode":"3023",
"operateType":"3",
"channel":2,
"newccu":[
{
"identifier":"PowerSwitch_1",
"opcodemap":"SWITCH",
"dataType":"int",
"channel":"1",
"valueRange":[0,1],
"value": 0
},
{
"identifier":"PowerSwitch_2",
"opcodemap":"SWITCH",
"dataType":"int",
"channel":"2",
"valueRange":[0,1],
"value": 0
}
],
"oldccu":[
{
"opcode":"SWITCH",
"identifiermap":"PowerSwitch_1",
"dataType":"string",
"channel":"1",
"valueRange":["OFF","ON"]
},
{
"opcode":"SWITCH",
"identifiermap":"PowerSwitch_2",
"dataType":"string",
"channel":"2",
"valueRange":["OFF","ON"]
}
]
}
\ No newline at end of file
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