diff options
| author |   wang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com> | 2019-03-12 15:56:03 +0800 |
|---|---|---|
| committer | wang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com> | 2019-03-14 13:37:08 +0800 |
| commit | fa03906e589c570051a084fdb2bf4450b8d99e98 (patch) | |
| tree | 6fc8f7ecad908d8ee3b11e26cd54a824235bef38 /app/eventhandler.cpp | |
| parent | aee1b69e8e207081a3d8b2670980671a9fbc78b8 (diff) | |
Add onscreen title in replyShowWindowicefish_8.99.5icefish_8.99.4icefish_8.99.3icefish_8.99.2icefish_8.99.1icefish/8.99.5icefish/8.99.4icefish/8.99.3icefish/8.99.2icefish/8.99.1halibut_8.0.6halibut_8.0.5halibut_8.0.4halibut_8.0.3halibut_8.0.2halibut_8.0.1halibut_8.0.0halibut_7.99.3halibut_7.99.2halibut_7.99.1halibut/8.0.6halibut/8.0.5halibut/8.0.4halibut/8.0.3halibut/8.0.2halibut/8.0.1halibut/8.0.0halibut/7.99.3halibut/7.99.2halibut/7.99.18.99.58.99.48.99.38.99.28.99.18.0.68.0.58.0.48.0.38.0.28.0.18.0.07.99.37.99.27.99.1halibut
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 <wang_zhiqiang@dl.cn.nexty-ele.com>
Diffstat (limited to 'app/eventhandler.cpp')
| -rw-r--r-- | app/eventhandler.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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); } |