-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix Android build failure no member named 'StatusName' in namespace '…
…chip::Protocols::InteractionModel' (#24610)
- Loading branch information
1 parent
ae00dbd
commit 1178784
Showing
12 changed files
with
213 additions
and
144 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
155 changes: 155 additions & 0 deletions
155
examples/chip-tool/commands/common/RemoteDataModelLogger.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,155 @@ | ||
| /* | ||
| * Copyright (c) 2023 Project CHIP Authors | ||
| * All rights reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| #include "RemoteDataModelLogger.h" | ||
|
|
||
| #include <lib/support/jsontlv/TlvJson.h> | ||
|
|
||
| constexpr const char * kClusterIdKey = "clusterId"; | ||
| constexpr const char * kEndpointIdKey = "endpointId"; | ||
| constexpr const char * kAttributeIdKey = "attributeId"; | ||
| constexpr const char * kEventIdKey = "eventId"; | ||
| constexpr const char * kCommandIdKey = "commandId"; | ||
| constexpr const char * kErrorIdKey = "error"; | ||
| constexpr const char * kClusterErrorIdKey = "clusterError"; | ||
|
|
||
| namespace { | ||
| RemoteDataModelLoggerDelegate * gDelegate; | ||
|
|
||
| CHIP_ERROR LogError(Json::Value & value, const chip::app::StatusIB & status) | ||
| { | ||
| if (status.mClusterStatus.HasValue()) | ||
| { | ||
| auto statusValue = status.mClusterStatus.Value(); | ||
| value[kClusterErrorIdKey] = statusValue; | ||
| } | ||
|
|
||
| #if CHIP_CONFIG_IM_STATUS_CODE_VERBOSE_FORMAT | ||
| auto statusName = chip::Protocols::InteractionModel::StatusName(status.mStatus); | ||
| value[kErrorIdKey] = statusName; | ||
| #else | ||
| auto statusName = status.mStatus; | ||
| value[kErrorIdKey] = chip::to_underlying(statusName); | ||
| #endif // CHIP_CONFIG_IM_STATUS_CODE_VERBOSE_FORMAT | ||
|
|
||
| auto valueStr = chip::JsonToString(value); | ||
| return gDelegate->LogJSON(valueStr.c_str()); | ||
| } | ||
| } // namespace | ||
|
|
||
| namespace RemoteDataModelLogger { | ||
| CHIP_ERROR LogAttributeAsJSON(const chip::app::ConcreteDataAttributePath & path, chip::TLV::TLVReader * data) | ||
| { | ||
| VerifyOrReturnError(gDelegate != nullptr, CHIP_NO_ERROR); | ||
|
|
||
| Json::Value value; | ||
| value[kClusterIdKey] = path.mClusterId; | ||
| value[kEndpointIdKey] = path.mEndpointId; | ||
| value[kAttributeIdKey] = path.mAttributeId; | ||
|
|
||
| chip::TLV::TLVReader reader; | ||
| reader.Init(*data); | ||
| ReturnErrorOnFailure(chip::TlvToJson(reader, value)); | ||
|
|
||
| auto valueStr = chip::JsonToString(value); | ||
| return gDelegate->LogJSON(valueStr.c_str()); | ||
| } | ||
|
|
||
| CHIP_ERROR LogErrorAsJSON(const chip::app::ConcreteDataAttributePath & path, const chip::app::StatusIB & status) | ||
| { | ||
| VerifyOrReturnError(gDelegate != nullptr, CHIP_NO_ERROR); | ||
|
|
||
| Json::Value value; | ||
| value[kClusterIdKey] = path.mClusterId; | ||
| value[kEndpointIdKey] = path.mEndpointId; | ||
| value[kAttributeIdKey] = path.mAttributeId; | ||
|
|
||
| return LogError(value, status); | ||
| } | ||
|
|
||
| CHIP_ERROR LogCommandAsJSON(const chip::app::ConcreteCommandPath & path, chip::TLV::TLVReader * data) | ||
| { | ||
| VerifyOrReturnError(gDelegate != nullptr, CHIP_NO_ERROR); | ||
|
|
||
| Json::Value value; | ||
| value[kClusterIdKey] = path.mClusterId; | ||
| value[kEndpointIdKey] = path.mEndpointId; | ||
| value[kCommandIdKey] = path.mCommandId; | ||
|
|
||
| chip::TLV::TLVReader reader; | ||
| reader.Init(*data); | ||
| ReturnErrorOnFailure(chip::TlvToJson(reader, value)); | ||
|
|
||
| auto valueStr = chip::JsonToString(value); | ||
| return gDelegate->LogJSON(valueStr.c_str()); | ||
| } | ||
|
|
||
| CHIP_ERROR LogErrorAsJSON(const chip::app::ConcreteCommandPath & path, const chip::app::StatusIB & status) | ||
| { | ||
| VerifyOrReturnError(gDelegate != nullptr, CHIP_NO_ERROR); | ||
|
|
||
| Json::Value value; | ||
| value[kClusterIdKey] = path.mClusterId; | ||
| value[kEndpointIdKey] = path.mEndpointId; | ||
| value[kCommandIdKey] = path.mCommandId; | ||
|
|
||
| return LogError(value, status); | ||
| } | ||
|
|
||
| CHIP_ERROR LogEventAsJSON(const chip::app::EventHeader & header, chip::TLV::TLVReader * data) | ||
| { | ||
| VerifyOrReturnError(gDelegate != nullptr, CHIP_NO_ERROR); | ||
|
|
||
| Json::Value value; | ||
| value[kClusterIdKey] = header.mPath.mClusterId; | ||
| value[kEndpointIdKey] = header.mPath.mEndpointId; | ||
| value[kEventIdKey] = header.mPath.mEventId; | ||
|
|
||
| chip::TLV::TLVReader reader; | ||
| reader.Init(*data); | ||
| ReturnErrorOnFailure(chip::TlvToJson(reader, value)); | ||
|
|
||
| auto valueStr = chip::JsonToString(value); | ||
| return gDelegate->LogJSON(valueStr.c_str()); | ||
| } | ||
|
|
||
| CHIP_ERROR LogErrorAsJSON(const chip::app::EventHeader & header, const chip::app::StatusIB & status) | ||
| { | ||
| VerifyOrReturnError(gDelegate != nullptr, CHIP_NO_ERROR); | ||
|
|
||
| Json::Value value; | ||
| value[kClusterIdKey] = header.mPath.mClusterId; | ||
| value[kEndpointIdKey] = header.mPath.mEndpointId; | ||
| value[kEventIdKey] = header.mPath.mEventId; | ||
|
|
||
| return LogError(value, status); | ||
| } | ||
|
|
||
| CHIP_ERROR LogErrorAsJSON(const CHIP_ERROR & error) | ||
| { | ||
| Json::Value value; | ||
| chip::app::StatusIB status; | ||
| status.InitFromChipError(error); | ||
| return LogError(value, status); | ||
| } | ||
|
|
||
| void SetDelegate(RemoteDataModelLoggerDelegate * delegate) | ||
| { | ||
| gDelegate = delegate; | ||
| } | ||
| }; // namespace RemoteDataModelLogger |
Oops, something went wrong.