diff options
author | dtrunov <dtrunov@luxoft.com> | 2016-09-15 14:14:11 +0300 |
---|---|---|
committer | dtrunov <dtrunov@luxoft.com> | 2016-09-29 11:36:10 +0300 |
commit | ff2bdeaf8a627fc698ff83f4987921b5773a3955 (patch) | |
tree | 7bb833bedf4af9bb8f8cdcaec7f686fbd147b7ca /src/components/application_manager/include/application_manager/commands/mobile/perform_interaction_request.h | |
parent | 85c71b25bde1eaca791e94ee3f16bb37d389efce (diff) | |
download | sdl_core-ff2bdeaf8a627fc698ff83f4987921b5773a3955.tar.gz |
UI interface: SDL behavior in case HMI does not respond to IsReady request or respond with "available" = false
Added logic for processing case when HMI does not respond to IsReady request or respond with "available"=false.
Added logic to UI command in order to process UNSUPPORTED_RESOURCE result code.
Change logic for processing response IsReady for UI, VR, TTS, VI interfaces.
CRQ [APPLINK-25087](https://adc.luxoft.com/jira/browse/APPLINK-25087)
Diffstat (limited to 'src/components/application_manager/include/application_manager/commands/mobile/perform_interaction_request.h')
-rw-r--r-- | src/components/application_manager/include/application_manager/commands/mobile/perform_interaction_request.h | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/src/components/application_manager/include/application_manager/commands/mobile/perform_interaction_request.h b/src/components/application_manager/include/application_manager/commands/mobile/perform_interaction_request.h index 70d51444de..3102785096 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/perform_interaction_request.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/perform_interaction_request.h @@ -33,6 +33,7 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_PERFORM_INTERACTION_REQUEST_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_PERFORM_INTERACTION_REQUEST_H_ +#include <string> #include "application_manager/commands/command_request_impl.h" #include "application_manager/application.h" @@ -87,23 +88,23 @@ class PerformInteractionRequest : public CommandRequestImpl { virtual void onTimeOut(); private: - /* + /** * @brief Function will be called when VR_OnCommand event * comes - * * @param message which should send to mobile side - * + * @return true if send response to mobile application otherwise + * return false. */ - void ProcessVRResponse(const smart_objects::SmartObject& message, + bool ProcessVRResponse(const smart_objects::SmartObject& message, smart_objects::SmartObject& msg_params); - /* + /** * @brief Sends PerformInteraction response to mobile side - * * @param message which should send to mobile side - * + * @return true if send response to mobile application otherwise + * return false. */ - void ProcessPerformInteractionResponse( + bool ProcessUIResponse( const smart_objects::SmartObject& message, smart_objects::SmartObject& msg_params); @@ -218,12 +219,6 @@ class PerformInteractionRequest : public CommandRequestImpl { const bool HasHMIResponsesToWait() const; /** - * @brief Check VR response result code, in case GENERIC_ERROR, REJECTED, - * send resultCode FALSE, in case WARNINGS send resultCode TRUE - */ - void CheckResponseResultCode(); - - /** * @brief Check UI & VR result codes, send response to mobile * @param msg_param Message params to send */ @@ -232,12 +227,12 @@ class PerformInteractionRequest : public CommandRequestImpl { mobile_apis::InteractionMode::eType interaction_mode_; bool ui_response_recived_; bool vr_response_recived_; - bool ui_result_; - bool vr_result_; bool app_pi_was_active_before_; static uint32_t pi_requests_count_; - mobile_apis::Result::eType vr_resultCode_; - mobile_apis::Result::eType ui_resultCode_; + hmi_apis::Common_Result::eType vr_result_code_; + hmi_apis::Common_Result::eType ui_result_code_; + std::string ui_info_; + std::string vr_info_; DISALLOW_COPY_AND_ASSIGN(PerformInteractionRequest); }; |