diff --git a/examples/tv-app/android/include/keypad-input/AppKeypadInputManager.cpp b/examples/tv-app/android/include/keypad-input/AppKeypadInputManager.cpp index 0f5e7d052699d0..168ddffba33365 100644 --- a/examples/tv-app/android/include/keypad-input/AppKeypadInputManager.cpp +++ b/examples/tv-app/android/include/keypad-input/AppKeypadInputManager.cpp @@ -24,7 +24,6 @@ using namespace chip; using namespace chip::app::Clusters::KeypadInput; - void AppKeypadInputManager::HandleSendKey(CommandResponseHelper & helper, const CecKeyCode & keyCode) { Commands::SendKeyResponse::Type response; diff --git a/examples/tv-app/android/include/keypad-input/AppKeypadInputManager.h b/examples/tv-app/android/include/keypad-input/AppKeypadInputManager.h index 74eb1945f6ec06..810731f81a2146 100644 --- a/examples/tv-app/android/include/keypad-input/AppKeypadInputManager.h +++ b/examples/tv-app/android/include/keypad-input/AppKeypadInputManager.h @@ -27,7 +27,6 @@ using SendKeyResponseType = chip::app::Clusters::KeypadInput::Commands::SendKeyR class AppKeypadInputManager : public KeypadInputDelegate { public: - void HandleSendKey(CommandResponseHelper & helper, const chip::app::Clusters::KeypadInput::CecKeyCode & keyCode) override; diff --git a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp index e1b62fe2f0ab6f..5bb39495b0a703 100644 --- a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp +++ b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.cpp @@ -18,13 +18,14 @@ #include "TargetNavigatorManager.h" #include - using namespace std; using namespace chip::app; using namespace chip::app::Clusters::TargetNavigator; using ContentAppAttributeDelegate = chip::AppPlatform::ContentAppAttributeDelegate; -TargetNavigatorManager::TargetNavigatorManager(ContentAppAttributeDelegate * attributeDelegate, std::list targets, uint8_t currentTarget) : mAttributeDelegate(attributeDelegate) +TargetNavigatorManager::TargetNavigatorManager(ContentAppAttributeDelegate * attributeDelegate, std::list targets, + uint8_t currentTarget) : + mAttributeDelegate(attributeDelegate) { mTargets = targets; mCurrentTarget = currentTarget; @@ -34,9 +35,10 @@ CHIP_ERROR TargetNavigatorManager::HandleGetTargetList(AttributeValueEncoder & a { ChipLogProgress(Zcl, "TargetNavigatorManager::HandleNavigateTarget"); - if (mAttributeDelegate != nullptr) { + if (mAttributeDelegate != nullptr) + { chip::app::ConcreteReadAttributePath aPath(mEndpointId, chip::app::Clusters::TargetNavigator::Id, - chip::app::Clusters::TargetNavigator::Attributes::TargetList::Id); + chip::app::Clusters::TargetNavigator::Attributes::TargetList::Id); const char * resStr = mAttributeDelegate->Read(aPath); ChipLogProgress(Zcl, "TargetNavigatorManager::HandleNavigateTarget response %s", resStr); @@ -47,21 +49,22 @@ CHIP_ERROR TargetNavigatorManager::HandleGetTargetList(AttributeValueEncoder & a if (reader.parse(resStr, value)) { std::string attrId = to_string(chip::app::Clusters::TargetNavigator::Attributes::TargetList::Id); - ChipLogProgress( - Zcl, "TargetNavigatorManager::HandleNavigateTarget response parsing done. reading attr %s", - attrId.c_str()); + ChipLogProgress(Zcl, "TargetNavigatorManager::HandleNavigateTarget response parsing done. reading attr %s", + attrId.c_str()); if (value[attrId].isArray()) { return aEncoder.EncodeList([&](const auto & encoder) -> CHIP_ERROR { - int i = 0; - std::string targetId = to_string(static_cast(chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Fields::kIdentifier)); - std::string targetName = to_string(static_cast(chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Fields::kName)); + int i = 0; + std::string targetId = to_string( + static_cast(chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Fields::kIdentifier)); + std::string targetName = to_string( + static_cast(chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Fields::kName)); for (Json::Value & entry : value[attrId]) { - if (!entry[targetId].isUInt() || !entry[targetName].isString() || entry[targetId].asUInt() > 255) { + if (!entry[targetId].isUInt() || !entry[targetName].isString() || entry[targetId].asUInt() > 255) + { // invalid target ID. Ignore. - ChipLogError( - Zcl, "TargetNavigatorManager::HandleNavigateTarget invalid target ignored"); + ChipLogError(Zcl, "TargetNavigatorManager::HandleNavigateTarget invalid target ignored"); i++; continue; } @@ -74,10 +77,8 @@ CHIP_ERROR TargetNavigatorManager::HandleGetTargetList(AttributeValueEncoder & a return CHIP_NO_ERROR; }); } - } } - } // NOTE: the ids for each target start at 1 so that we can reserve 0 as "no current target" @@ -99,9 +100,10 @@ uint8_t TargetNavigatorManager::HandleGetCurrentTarget() { ChipLogProgress(Zcl, "TargetNavigatorManager::HandleGetCurrentTarget"); - if (mAttributeDelegate != nullptr) { + if (mAttributeDelegate != nullptr) + { chip::app::ConcreteReadAttributePath aPath(mEndpointId, chip::app::Clusters::TargetNavigator::Id, - chip::app::Clusters::TargetNavigator::Attributes::TargetList::Id); + chip::app::Clusters::TargetNavigator::Attributes::TargetList::Id); const char * resStr = mAttributeDelegate->Read(aPath); ChipLogProgress(Zcl, "TargetNavigatorManager::HandleGetCurrentTarget response %s", resStr); @@ -112,17 +114,14 @@ uint8_t TargetNavigatorManager::HandleGetCurrentTarget() if (reader.parse(resStr, value)) { std::string attrId = to_string(chip::app::Clusters::TargetNavigator::Attributes::CurrentTarget::Id); - ChipLogProgress( - Zcl, "TargetNavigatorManager::HandleGetCurrentTarget response parsing done. reading attr %s", - attrId.c_str()); + ChipLogProgress(Zcl, "TargetNavigatorManager::HandleGetCurrentTarget response parsing done. reading attr %s", + attrId.c_str()); if (value[attrId].isUInt() && value[attrId].asUInt() < 256) { return static_cast(value[attrId].asUInt()); } - } } - } return mCurrentTarget; diff --git a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.h b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.h index beec273a025c75..8e0825c24c93ce 100644 --- a/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.h +++ b/examples/tv-app/android/include/target-navigator/TargetNavigatorManager.h @@ -20,13 +20,13 @@ #include "../../java/ContentAppAttributeDelegate.h" #include -using chip::app::AttributeValueEncoder; -using chip::app::CommandResponseHelper; using chip::CharSpan; using chip::EndpointId; -using TargetNavigatorDelegate = chip::app::Clusters::TargetNavigator::Delegate; -using TargetInfoType = chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Type; -using NavigateTargetResponseType = chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Type; +using chip::app::AttributeValueEncoder; +using chip::app::CommandResponseHelper; +using TargetNavigatorDelegate = chip::app::Clusters::TargetNavigator::Delegate; +using TargetInfoType = chip::app::Clusters::TargetNavigator::Structs::TargetInfo::Type; +using NavigateTargetResponseType = chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Type; using ContentAppAttributeDelegate = chip::AppPlatform::ContentAppAttributeDelegate; class TargetNavigatorManager : public TargetNavigatorDelegate @@ -51,5 +51,4 @@ class TargetNavigatorManager : public TargetNavigatorDelegate EndpointId mEndpointId; ContentAppAttributeDelegate * mAttributeDelegate; - }; diff --git a/examples/tv-app/android/java/ContentAppCommandDelegate.cpp b/examples/tv-app/android/java/ContentAppCommandDelegate.cpp index 390f7fc5752acd..0b406ab4237794 100644 --- a/examples/tv-app/android/java/ContentAppCommandDelegate.cpp +++ b/examples/tv-app/android/java/ContentAppCommandDelegate.cpp @@ -34,12 +34,12 @@ namespace chip { namespace AppPlatform { -using CommandHandlerInterface = chip::app::CommandHandlerInterface; -using LaunchResponseType = chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::Type; -using PlaybackResponseType = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Type; -using NavigateTargetResponseType = chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Type; +using CommandHandlerInterface = chip::app::CommandHandlerInterface; +using LaunchResponseType = chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::Type; +using PlaybackResponseType = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Type; +using NavigateTargetResponseType = chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Type; -const std::string FAILURE_KEY = "PlatformError"; +const std::string FAILURE_KEY = "PlatformError"; const std::string FAILURE_STATUS_KEY = "Status"; void ContentAppCommandDelegate::InvokeCommand(CommandHandlerInterface::HandlerContext & handlerContext) @@ -55,7 +55,8 @@ void ContentAppCommandDelegate::InvokeCommand(CommandHandlerInterface::HandlerCo if (err != CHIP_NO_ERROR) { handlerContext.SetCommandHandled(); - handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, Protocols::InteractionModel::Status::InvalidCommand); + handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, + Protocols::InteractionModel::Status::InvalidCommand); return; } @@ -99,11 +100,13 @@ void ContentAppCommandDelegate::FormatResponseData(CommandHandlerInterface::Hand } // handle errors from platform-app - if (!value[FAILURE_KEY].empty()) { + if (!value[FAILURE_KEY].empty()) + { value = value[FAILURE_KEY]; if (!value[FAILURE_STATUS_KEY].empty() && value[FAILURE_STATUS_KEY].isUInt()) { - handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, static_cast(value[FAILURE_STATUS_KEY].asUInt())); + handlerContext.mCommandHandler.AddStatus( + handlerContext.mRequestPath, static_cast(value[FAILURE_STATUS_KEY].asUInt())); return; } handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, Protocols::InteractionModel::Status::Failure); @@ -114,7 +117,8 @@ void ContentAppCommandDelegate::FormatResponseData(CommandHandlerInterface::Hand { case app::Clusters::ContentLauncher::Id: { LaunchResponseType launchResponse; - std::string statusFieldId = std::to_string(to_underlying(app::Clusters::ContentLauncher::Commands::LaunchResponse::Fields::kStatus)); + std::string statusFieldId = + std::to_string(to_underlying(app::Clusters::ContentLauncher::Commands::LaunchResponse::Fields::kStatus)); if (value[statusFieldId].empty()) { handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, Protocols::InteractionModel::Status::Failure); @@ -122,8 +126,10 @@ void ContentAppCommandDelegate::FormatResponseData(CommandHandlerInterface::Hand } else { - launchResponse.status = static_cast(value[statusFieldId].asInt()); - std::string dataFieldId = std::to_string(to_underlying(app::Clusters::ContentLauncher::Commands::LaunchResponse::Fields::kData)); + launchResponse.status = + static_cast(value[statusFieldId].asInt()); + std::string dataFieldId = + std::to_string(to_underlying(app::Clusters::ContentLauncher::Commands::LaunchResponse::Fields::kData)); if (!value[dataFieldId].empty()) { launchResponse.data = chip::MakeOptional(CharSpan::fromCharString(value[dataFieldId].asCString())); @@ -135,7 +141,8 @@ void ContentAppCommandDelegate::FormatResponseData(CommandHandlerInterface::Hand case app::Clusters::TargetNavigator::Id: { NavigateTargetResponseType navigateTargetResponse; - std::string statusFieldId = std::to_string(to_underlying(app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Fields::kStatus)); + std::string statusFieldId = + std::to_string(to_underlying(app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Fields::kStatus)); if (value[statusFieldId].empty()) { handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, Protocols::InteractionModel::Status::Failure); @@ -143,8 +150,10 @@ void ContentAppCommandDelegate::FormatResponseData(CommandHandlerInterface::Hand } else { - navigateTargetResponse.status = static_cast(value[statusFieldId].asInt()); - std::string dataFieldId = std::to_string(to_underlying(app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Fields::kData)); + navigateTargetResponse.status = + static_cast(value[statusFieldId].asInt()); + std::string dataFieldId = + std::to_string(to_underlying(app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Fields::kData)); if (!value[dataFieldId].empty()) { navigateTargetResponse.data = chip::MakeOptional(CharSpan::fromCharString(value[dataFieldId].asCString())); @@ -156,7 +165,8 @@ void ContentAppCommandDelegate::FormatResponseData(CommandHandlerInterface::Hand case app::Clusters::MediaPlayback::Id: { PlaybackResponseType playbackResponse; - std::string statusFieldId = std::to_string(to_underlying(app::Clusters::MediaPlayback::Commands::PlaybackResponse::Fields::kStatus)); + std::string statusFieldId = + std::to_string(to_underlying(app::Clusters::MediaPlayback::Commands::PlaybackResponse::Fields::kStatus)); if (value[statusFieldId].empty()) { handlerContext.mCommandHandler.AddStatus(handlerContext.mRequestPath, Protocols::InteractionModel::Status::Failure); @@ -164,8 +174,10 @@ void ContentAppCommandDelegate::FormatResponseData(CommandHandlerInterface::Hand } else { - playbackResponse.status = static_cast(value[statusFieldId].asInt()); - std::string dataFieldId = std::to_string(to_underlying(app::Clusters::MediaPlayback::Commands::PlaybackResponse::Fields::kData)); + playbackResponse.status = + static_cast(value[statusFieldId].asInt()); + std::string dataFieldId = + std::to_string(to_underlying(app::Clusters::MediaPlayback::Commands::PlaybackResponse::Fields::kData)); if (!value[dataFieldId].empty()) { playbackResponse.data = chip::MakeOptional(CharSpan::fromCharString(value[dataFieldId].asCString()));