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>
text: btn1Name
onReleased: {
btn1.highlighted = false
text: btn1Name
onReleased: {
btn1.highlighted = false
- eventHandler.onScreenReply(btn1.text)
+ eventHandler.onScreenReply(title.text, btn1.text)
}
onPressed: {
btn1.highlighted = true
}
onPressed: {
btn1.highlighted = true
text: btn2Name
onReleased: {
btn2.highlighted = false
text: btn2Name
onReleased: {
btn2.highlighted = false
- eventHandler.onScreenReply(btn2.text)
+ eventHandler.onScreenReply(title.text, btn2.text)
}
onPressed: {
btn2.highlighted = true
}
onPressed: {
btn2.highlighted = true
text: btn3Name
onReleased: {
btn3.highlighted = false
text: btn3Name
onReleased: {
btn3.highlighted = false
- eventHandler.onScreenReply(btn3.text)
+ eventHandler.onScreenReply(title.text, btn3.text)
}
onPressed: {
btn3.highlighted = true
}
onPressed: {
btn3.highlighted = true
const char _myrole[] = "on_screen";
const char _parameter[] = "parameter";
const char _replyto[] = "replyto";
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";
const char _button_name[] = "buttonName";
const char _drawing_name[] = "drawing_name";
const char _application_id[] = "application_id";
-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();
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);
}
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);
}
static void onRep_static(struct json_object* reply_contents);
Q_INVOKABLE void deactivateWindow();
static void onRep_static(struct json_object* reply_contents);
Q_INVOKABLE void deactivateWindow();
- Q_INVOKABLE void onScreenReply(const QString &btn_name);
+ Q_INVOKABLE void onScreenReply(const QString &ons_title, const QString &btn_name);
signals:
void updateModel(QVariant data);
signals:
void updateModel(QVariant data);