Merge branch 'hzl' into 'master'

【修改内容】1. nonamsg传输是，数据加后缀'\0'，这样收到数据可以直接处理，不然会有乱码

See merge request chenweican/k-sdk!18

application/kcloud/kcloud_data_handle.c

@@ -382,7 +382,7 @@ int KK_Send_CloudState(int state)
     cJSON_AddItemToObject(root, MSG_INFO_STR, infoObj);
     cJSON_AddItemToObject(root, MSG_PAYLOAD_STR,payloadObj);			
 	out=cJSON_Print(root);	
-	kk_ipc_send(IPC_APP2MID, out, strlen(out));
+	kk_ipc_send(IPC_APP2MID, out, strlen(out)+1);
 	cJSON_Delete(root);
 	free(payloadStr);
 	free(infoStr);
@@ -401,6 +401,6 @@ void KK_Sendto_DevData(const char *topic,const char *data)
 	if(send_data == NULL){
 		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);
 }

common/api/com_api.c

@@ -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){
             
         }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;
@@ -453,7 +453,7 @@ int kk_ipc_isconnect(ipc_type type){
     {
         
         for(int i =0; i<20;i++){
-            kk_ipc_send(type, MAGIC, strlen(MAGIC));
+            kk_ipc_send(type, MAGIC, strlen(MAGIC)+1);
             usleep(500000);
             if (loop_ctrl->isconnect == 1){
                 break;

midware/midware/dm/kk_dm_api.c

@@ -200,7 +200,7 @@ void iotx_dm_dispatch(void)
             free(data);
             data = NULL;
         }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);
             data = NULL;
 		}

midware/midware/dm/kk_dm_msg.c

@@ -22,7 +22,7 @@ void kk_sendData2app(void *info, void *payload,int isAsync){
 		dm_queue_msg_insert4(buf);
 		
 	}else{
-    	kk_ipc_send(IPC_MID2APP, buf, strlen(buf) );
+    	kk_ipc_send(IPC_MID2APP, buf, strlen(buf)+1 );
 		free(buf);
 	}
     cJSON_Delete(root);

midware/midware/midware.c

@@ -54,7 +54,7 @@ void kk_sendData2gw(void* data, int len, char* chalMark){
     if (kk_is_tcp_channel(chalMark) > -1){
         kk_tcp_channel_ser_send(data, len, chalMark);
     }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){
         }else if(strstr(msgType->valuestring, KK_THING_TOPO_DELETE_MSG) != NULL){
 			INFO_PRINT("kk_platMsg_handle data: handle delete\n");
 			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);
 			
 		}else{

midware/midware/ota/iotx_ota.c

@@ -549,7 +549,7 @@ int OTA_publishProgress(void *handle, char* payload){
     cJSON_AddStringToObject(root, "info", topicBuf);
     cJSON_AddStringToObject(root, "payload", payload);
     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(topicBuf);
     free(buf);

platform/zigbee/app/builder/Z3GatewayHost/ZB/kk_msg_report.c

@@ -104,7 +104,7 @@ int kk_sendData2CCU(char* data, int len)
 	if (strcmp(GW2CCU_PROTOCOL,"tcp") == 0 ){
 		kk_tcp_client_send(data, len);
 	}else{
-		kk_ipc_send(IPC_PLAT2MID, data, len);
+		kk_ipc_send(IPC_PLAT2MID, data, len + 1);
 	}
 }