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
79a8318d
Commit
79a8318d
authored
Sep 21, 2020
by
黄振令
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【修改内容】1. nonamsg传输是,数据加后缀'\0',这样收到数据可以直接处理,不然会有乱码
parent
47e91b73
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
10 deletions
+10
-10
application/kcloud/kcloud_data_handle.c
application/kcloud/kcloud_data_handle.c
+2
-2
common/api/com_api.c
common/api/com_api.c
+2
-2
midware/midware/dm/kk_dm_api.c
midware/midware/dm/kk_dm_api.c
+1
-1
midware/midware/dm/kk_dm_msg.c
midware/midware/dm/kk_dm_msg.c
+1
-1
midware/midware/midware.c
midware/midware/midware.c
+2
-2
midware/midware/ota/iotx_ota.c
midware/midware/ota/iotx_ota.c
+1
-1
platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_msg_report.c
platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_msg_report.c
+1
-1
No files found.
application/kcloud/kcloud_data_handle.c
View file @
79a8318d
...
@@ -382,7 +382,7 @@ int KK_Send_CloudState(int state)
...
@@ -382,7 +382,7 @@ int KK_Send_CloudState(int state)
cJSON_AddItemToObject
(
root
,
MSG_INFO_STR
,
infoObj
);
cJSON_AddItemToObject
(
root
,
MSG_INFO_STR
,
infoObj
);
cJSON_AddItemToObject
(
root
,
MSG_PAYLOAD_STR
,
payloadObj
);
cJSON_AddItemToObject
(
root
,
MSG_PAYLOAD_STR
,
payloadObj
);
out
=
cJSON_Print
(
root
);
out
=
cJSON_Print
(
root
);
kk_ipc_send
(
IPC_APP2MID
,
out
,
strlen
(
out
));
kk_ipc_send
(
IPC_APP2MID
,
out
,
strlen
(
out
)
+
1
);
cJSON_Delete
(
root
);
cJSON_Delete
(
root
);
free
(
payloadStr
);
free
(
payloadStr
);
free
(
infoStr
);
free
(
infoStr
);
...
@@ -401,6 +401,6 @@ void KK_Sendto_DevData(const char *topic,const char *data)
...
@@ -401,6 +401,6 @@ void KK_Sendto_DevData(const char *topic,const char *data)
if
(
send_data
==
NULL
){
if
(
send_data
==
NULL
){
return
;
return
;
}
}
kk_ipc_send
(
IPC_APP2MID
,
send_data
,
strlen
(
send_data
));
kk_ipc_send
(
IPC_APP2MID
,
send_data
,
strlen
(
send_data
)
+
1
);
free
(
send_data
);
free
(
send_data
);
}
}
common/api/com_api.c
View file @
79a8318d
...
@@ -100,7 +100,7 @@ static void watcher_cb (struct ev_loop *loop ,struct ev_io *w, int revents)
...
@@ -100,7 +100,7 @@ static void watcher_cb (struct ev_loop *loop ,struct ev_io *w, int revents)
if
(
strncmp
(
validDat
,
MAGIC_ACK
,
strlen
(
MAGIC_ACK
))
==
0
){
if
(
strncmp
(
validDat
,
MAGIC_ACK
,
strlen
(
MAGIC_ACK
))
==
0
){
}
else
{
}
else
{
kk_ipc_send_ex
(
loop_ctrl
->
type
,
MAGIC_ACK
,
strlen
(
MAGIC_ACK
),
chlMark
);
kk_ipc_send_ex
(
loop_ctrl
->
type
,
MAGIC_ACK
,
strlen
(
MAGIC_ACK
)
+
1
,
chlMark
);
}
}
loop_ctrl
->
isconnect
=
1
;
loop_ctrl
->
isconnect
=
1
;
...
@@ -453,7 +453,7 @@ int kk_ipc_isconnect(ipc_type type){
...
@@ -453,7 +453,7 @@ int kk_ipc_isconnect(ipc_type type){
{
{
for
(
int
i
=
0
;
i
<
20
;
i
++
){
for
(
int
i
=
0
;
i
<
20
;
i
++
){
kk_ipc_send
(
type
,
MAGIC
,
strlen
(
MAGIC
));
kk_ipc_send
(
type
,
MAGIC
,
strlen
(
MAGIC
)
+
1
);
usleep
(
500000
);
usleep
(
500000
);
if
(
loop_ctrl
->
isconnect
==
1
){
if
(
loop_ctrl
->
isconnect
==
1
){
break
;
break
;
...
...
midware/midware/dm/kk_dm_api.c
View file @
79a8318d
...
@@ -200,7 +200,7 @@ void iotx_dm_dispatch(void)
...
@@ -200,7 +200,7 @@ void iotx_dm_dispatch(void)
free
(
data
);
free
(
data
);
data
=
NULL
;
data
=
NULL
;
}
else
if
(
kk_get_cloudstatus
()
&&
dm_queue_msg_next4
(
&
data
)
==
SUCCESS_RETURN
){
}
else
if
(
kk_get_cloudstatus
()
&&
dm_queue_msg_next4
(
&
data
)
==
SUCCESS_RETURN
){
kk_ipc_send
(
IPC_MID2APP
,
data
,
strlen
(
data
));
kk_ipc_send
(
IPC_MID2APP
,
data
,
strlen
(
data
)
+
1
);
free
(
data
);
free
(
data
);
data
=
NULL
;
data
=
NULL
;
}
}
...
...
midware/midware/dm/kk_dm_msg.c
View file @
79a8318d
...
@@ -22,7 +22,7 @@ void kk_sendData2app(void *info, void *payload,int isAsync){
...
@@ -22,7 +22,7 @@ void kk_sendData2app(void *info, void *payload,int isAsync){
dm_queue_msg_insert4
(
buf
);
dm_queue_msg_insert4
(
buf
);
}
else
{
}
else
{
kk_ipc_send
(
IPC_MID2APP
,
buf
,
strlen
(
buf
)
);
kk_ipc_send
(
IPC_MID2APP
,
buf
,
strlen
(
buf
)
+
1
);
free
(
buf
);
free
(
buf
);
}
}
cJSON_Delete
(
root
);
cJSON_Delete
(
root
);
...
...
midware/midware/midware.c
View file @
79a8318d
...
@@ -54,7 +54,7 @@ void kk_sendData2gw(void* data, int len, char* chalMark){
...
@@ -54,7 +54,7 @@ void kk_sendData2gw(void* data, int len, char* chalMark){
if
(
kk_is_tcp_channel
(
chalMark
)
>
-
1
){
if
(
kk_is_tcp_channel
(
chalMark
)
>
-
1
){
kk_tcp_channel_ser_send
(
data
,
len
,
chalMark
);
kk_tcp_channel_ser_send
(
data
,
len
,
chalMark
);
}
else
{
}
else
{
kk_ipc_send_ex
(
IPC_MID2PLAT
,
data
,
len
,
chalMark
);
kk_ipc_send_ex
(
IPC_MID2PLAT
,
data
,
len
+
1
,
chalMark
);
}
}
}
}
...
@@ -232,7 +232,7 @@ void kk_platMsg_handle(void* data, char* chalMark){
...
@@ -232,7 +232,7 @@ void kk_platMsg_handle(void* data, char* chalMark){
}
else
if
(
strstr
(
msgType
->
valuestring
,
KK_THING_TOPO_DELETE_MSG
)
!=
NULL
){
}
else
if
(
strstr
(
msgType
->
valuestring
,
KK_THING_TOPO_DELETE_MSG
)
!=
NULL
){
INFO_PRINT
(
"kk_platMsg_handle data: handle delete
\n
"
);
INFO_PRINT
(
"kk_platMsg_handle data: handle delete
\n
"
);
devCode
=
cJSON_GetObjectItem
(
jsonPay
,
MSG_DEVICE_CODE_STR
);
devCode
=
cJSON_GetObjectItem
(
jsonPay
,
MSG_DEVICE_CODE_STR
);
kk_ipc_send
(
IPC_MID2APP
,
data
,
strlen
(
data
));
kk_ipc_send
(
IPC_MID2APP
,
data
,
strlen
(
data
)
+
1
);
dm_mgr_subdev_delete
(
devCode
->
valuestring
);
dm_mgr_subdev_delete
(
devCode
->
valuestring
);
}
else
{
}
else
{
...
...
midware/midware/ota/iotx_ota.c
View file @
79a8318d
...
@@ -549,7 +549,7 @@ int OTA_publishProgress(void *handle, char* payload){
...
@@ -549,7 +549,7 @@ int OTA_publishProgress(void *handle, char* payload){
cJSON_AddStringToObject
(
root
,
"info"
,
topicBuf
);
cJSON_AddStringToObject
(
root
,
"info"
,
topicBuf
);
cJSON_AddStringToObject
(
root
,
"payload"
,
payload
);
cJSON_AddStringToObject
(
root
,
"payload"
,
payload
);
void
*
buf
=
cJSON_Print
(
root
);
void
*
buf
=
cJSON_Print
(
root
);
kk_ipc_send
(
IPC_MID2APP
,
buf
,
strlen
(
buf
));
kk_ipc_send
(
IPC_MID2APP
,
buf
,
strlen
(
buf
)
+
1
);
free
(
msgTypeStr
);
free
(
msgTypeStr
);
free
(
topicBuf
);
free
(
topicBuf
);
free
(
buf
);
free
(
buf
);
...
...
platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_msg_report.c
View file @
79a8318d
...
@@ -104,7 +104,7 @@ int kk_sendData2CCU(char* data, int len)
...
@@ -104,7 +104,7 @@ int kk_sendData2CCU(char* data, int len)
if
(
strcmp
(
GW2CCU_PROTOCOL
,
"tcp"
)
==
0
){
if
(
strcmp
(
GW2CCU_PROTOCOL
,
"tcp"
)
==
0
){
kk_tcp_client_send
(
data
,
len
);
kk_tcp_client_send
(
data
,
len
);
}
else
{
}
else
{
kk_ipc_send
(
IPC_PLAT2MID
,
data
,
len
);
kk_ipc_send
(
IPC_PLAT2MID
,
data
,
len
+
1
);
}
}
}
}
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