Merge branch 'yjq' of http://172.17.3.10:17001/chenweican/k-sdk

midware/midware/dm/kk_dm_msg.c

@@ -19,6 +19,7 @@ void kk_sendData2app(void *info, void *payload,int isAsync){
 	cJSON_AddItemToObject(root, "info", infoObj);
 	cJSON_AddItemToObject(root, "payload",payloadObj);	
 	buf = cJSON_Print(root);
+	cJSON_Minify(buf);
 	if(isAsync){
 		dm_queue_msg_insert4(buf);
 		

midware/midware/midware.c

@@ -653,7 +653,10 @@ void kk_platMsg_handle(void* data, char* chalMark){
 			if(jsonPay == NULL) goto error;
 			proCode = cJSON_GetObjectItem(jsonPay, MSG_PRODUCT_CODE_STR);
 			devCode = cJSON_GetObjectItem(jsonPay, MSG_DEVICE_CODE_STR);
-			mac = cJSON_GetObjectItem(jsonPay, "mac");
+			//mac = cJSON_GetObjectItem(jsonPay, "mac");
+			mac = cJSON_GetObjectItem(jsonPay, MSG_DEVICE_CODE_STR);
+
+			
 			if (proCode == NULL || devCode == NULL || mac == NULL){
 				ERROR_PRINT("productCode, deviceCode mac params are error\n");
 				goto error;