修改

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

@@ -268,7 +268,7 @@ static const char *kk_match_tsl_productCode(const char* modelId)
 			UTIL_LOG_INFO("match model id:%s\n",kk_product_code[i].modelId);
 			UTIL_LOG_INFO("tsl product code:%s\n",kk_product_code[i].code);
 			#ifdef KK_PRODUCT_CODE_STRING_ENABLE
-			UTIL_LOG_INFO("match product:%s",kk_product_code[i].name);
+			UTIL_LOG_INFO("match product:%s\n",kk_product_code[i].name);
 			#endif
 			
 			return kk_product_code[i].code;
@@ -375,6 +375,11 @@ void emberAfPluginDeviceTableNewDeviceCallback(EmberEUI64 nodeEui64)
 {
 	kk_device_joined(emberAfDeviceTableGetNodeIdFromEui64(nodeEui64));
 }
+void emberAfPluginDeviceTableRejoinDeviceCallback(EmberEUI64 nodeEui64)
+{
+	kk_device_joined(emberAfDeviceTableGetNodeIdFromEui64(nodeEui64));
+}
+
 void emberAfPluginDeviceTableDeviceLeftCallback(EmberEUI64 nodeEui64)
 {
 	uint16_t deviceTableIndex = emberAfDeviceTableGetFirstIndexFromEui64(nodeEui64);
@@ -469,20 +474,7 @@ void kk_add_device_to_table(EmberEUI64 mac,EmberNodeId nodeId,uint16_t deviceId)
 
 
 
-void emberAfPluginDeviceTableRejoinDeviceCallback(EmberEUI64 nodeEui64)
-{
-	kk_device_table_s *ptr = kk_device_find_by_mac(nodeEui64);
 
-	if(ptr == NULL){
-		UTIL_LOG_INFO("not in device table!!!");
-		emberAfPrintBigEndianEui64(nodeEui64);
-		emberAfDebugPrintln("");
-		return ;
-	}
-	if(ptr->productCode!=NULL){
-		kk_rpc_reportDevices(nodeEui64,ptr->productCode);
-	}
-}