From fa03906e589c570051a084fdb2bf4450b8d99e98 Mon Sep 17 00:00:00 2001 From: wang_zhiqiang Date: Tue, 12 Mar 2019 15:56:03 +0800 Subject: Add onscreen title in replyShowWindow Only set buttonName information in replyShowWindow isn't enough for application who have two onscreens with same button name. So add onscreen title into replayShowWindow. Bug-AGL: SPEC-1967 Change-Id: Ia695ed6d14ee49e6342f7600fdb2800da8b518c6 Signed-off-by: wang_zhiqiang --- app/eventhandler.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'app/eventhandler.cpp') diff --git a/app/eventhandler.cpp b/app/eventhandler.cpp index c33022a..ff8617d 100644 --- a/app/eventhandler.cpp +++ b/app/eventhandler.cpp @@ -29,6 +29,7 @@ const char _myrole[] = "on_screen"; const char _parameter[] = "parameter"; const char _replyto[] = "replyto"; +const char _onscreen_title[] = "onscreenTitle"; const char _button_name[] = "buttonName"; const char _drawing_name[] = "drawing_name"; const char _application_id[] = "application_id"; @@ -180,12 +181,13 @@ void EventHandler::deactivateWindow() } } -void EventHandler::onScreenReply(const QString &btn_name) +void EventHandler::onScreenReply(const QString &ons_title, const QString &btn_name) { - HMI_DEBUG(APP_ID, "EventHandler::onScreenReply(),btn_name=%s", btn_name.toStdString().c_str()); + HMI_DEBUG(APP_ID, "ons_title=%s btn_name=%s", ons_title.toStdString().c_str(), btn_name.toStdString().c_str()); emit this->hideOnScreen(); struct json_object* j_param = json_object_new_object(); + json_object_object_add(j_param, _onscreen_title, json_object_new_string(ons_title.toStdString().c_str())); json_object_object_add(j_param, _button_name, json_object_new_string(btn_name.toStdString().c_str())); mp_hs->replyShowWindow(m_dsp.first.toStdString().c_str(), j_param); } -- cgit 1.2.3-korg