【修改内容】1.解决设备上报格式错误

【提交人】huang.zhenling

platform/zigbee/app/builder/Z3GatewayHost/kk_test.c

@@ -7,13 +7,15 @@ extern kk_tsl_zigbee_map_t g_tsl_zigbee_map [];
 static void kk_rpc_send_message(cJSON *data,char *msgtype,char *method,EmberEUI64 mac)
 {
 	static uint16_t msgid;
-	char msgIdString[10];
+	char msgIdString[10]= {0};
+	char macString[19] = {0};
 
 	cJSON *info = rpc_cJSON_CreateObject();
 	if(info != NULL){
 		rpc_cJSON_AddStringToObject(info, "msgType",msgtype);
-		rpc_cJSON_AddStringToObject(info, "productCode","");
-		rpc_cJSON_AddStringToObject(info, "deviceCode","");	
+		rpc_cJSON_AddStringToObject(info, "productCode","24");
+		rpc_eui64ToString(mac,macString);
+		rpc_cJSON_AddStringToObject(info, "deviceCode",macString);	
 	}
 	cJSON *payload = rpc_cJSON_CreateObject();
 	if(payload != NULL){
@@ -64,8 +66,8 @@ void kk_rpc_reportDevices(kk_report_device_s device)
 	rpc_cJSON_AddAppVersionToObject(devicesJson,device.AppVersion); 
 	rpc_cJSON_AddStringToObject(devicesJson, "deviceType","1");
 	rpc_cJSON_AddStringToObject(devicesJson, "deviceCode","2");
-	rpc_cJSON_AddStringToObject(devicesJson, "productType",TEST_PRODUCT_CODE);
-	rpc_cJSON_AddStringToObject(devicesJson, "productCode","4");
+	rpc_cJSON_AddStringToObject(devicesJson, "productType","3");
+	rpc_cJSON_AddStringToObject(devicesJson, "productCode",TEST_PRODUCT_CODE);
 	kk_sub_tsl_add(device.mac,TEST_PRODUCT_CODE);
 	kk_rpc_report_devices(devicesJson,device.mac);
 }

platform/zigbee/app/builder/Z3GatewayHost/kk_test.h

@@ -6,12 +6,12 @@
 #include "RPC_API.h"
 
 #define KK_REPORT_DEVICE_JOINED_TYPE						"/thing/topo/add"
-#define KK_REPORT_ATTRIBUTE_TYPE						    "/thing/service/property/report"
+#define KK_REPORT_ATTRIBUTE_TYPE						    "/thing/event/property/post"
 
 #define KK_IPC_VERSION										"1.0"
 #define KK_REPORT_DEVICE_JOINED_METHOD						"thing.topo.add"
 #define KK_REPORT_DEVICE_LEAVE_METHOD						"thing.topo.leave"
-#define KK_REPORT_ATTRIBUTE_METHOD							"thing.service.property.report"
+#define KK_REPORT_ATTRIBUTE_METHOD							"thing.event.property.post"
 #define KK_READ_ATTRIBUTE_METHOD							"thing.service.property.get"
 
 #define TEST_PRODUCT_CODE "24"

platform/zigbee/app/builder/Z3GatewayHost/rpc_api/src/rpc_interface_parse.c

@@ -346,7 +346,7 @@ int addGW_and_getIP(char* ip){
         close(sk_recv);
         return -1;
     }
-    printf("addGW_and_getIP allan ==============\n");
+
     char info[] = "{\"msgtype\":\"/thing/topo/add\",\"productType\":\"gw\",\"productCode\":\"2\",\"deviceCode\":\"1122334455667788\"}";
     char payload[] = "{\"msgId\":\"1\",\"version\":\"1.0\",\"params\":{\"deviceCode\":\"1122334455667788\",\"productCode\":\"2\",\"mac\":\"1122334455667788\"}}";
     cJSON* root = cJSON_CreateObject();
@@ -356,7 +356,7 @@ int addGW_and_getIP(char* ip){
     cJSON_AddItemToObject(root, "payload",payloadObj);
     char* outbuf = cJSON_Print(root);
     cJSON_Delete(root);
-    printf("addGW_and_getIP allan ===========111111===\n");
+
     while (1)
     {
         if ((iSendbytes = sendto(sock, outbuf, strlen(outbuf)+1, 0, (struct sockaddr*)&Addrto, sizeof(struct sockaddr))) == -1)

platform/zigbee/protocol/zigbee/app/framework/plugin/device-table/device-table.c

@@ -25,6 +25,8 @@
 #include "app/framework/plugin/device-table/device-table-internal.h"
 #include "app/framework/util/util.h"
 #include <stdlib.h>
+#include <kk_test.h>
+
 
 void emAfDeviceTableSave(void);
 void emAfDeviceTableLoad(void);
@@ -484,7 +486,7 @@ void emAfDeviceTableLoad(void)
 			deviceTable[i].clusterOutStartPosition = (uint16_t) data;
 
 			deviceTable[i].state = EMBER_AF_PLUGIN_DEVICE_TABLE_STATE_JOINED;		
-			kk_sub_tsl_add(deviceTable[i].eui64,"3");
+			kk_sub_tsl_add(deviceTable[i].eui64,TEST_PRODUCT_CODE);
 		}
 
 		deviceTable[i].lastMsgTimestamp = halCommonGetInt32uMillisecondTick();