From 59f49ec2538f22fbf752330f78413e445a3dc504 Mon Sep 17 00:00:00 2001 From: zheng_wenlong Date: Mon, 6 Aug 2018 12:16:42 +0900 Subject: Use appid between homescreen-service and apps Use appid between hss and apps, and check event destination in libhomescreen. So these is no need compare code when recived Event_TapShortcut Event. BUG-AGL: SPEC-1645 Change-Id: I875cc87a46b0c0d1f417e2dd979decc18fb40eb7 Signed-off-by: zheng_wenlong --- src/qlibhomescreen.cpp | 8 ++++---- src/qlibhomescreen.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qlibhomescreen.cpp b/src/qlibhomescreen.cpp index 13093c3..cfeb9c1 100644 --- a/src/qlibhomescreen.cpp +++ b/src/qlibhomescreen.cpp @@ -24,7 +24,7 @@ using namespace std; #define _REQ_POPUP_MESSAGE "on_screen_message" #define _TAPSHORTCUT "tap_shortcut" #define _KEY_DATA "data" -#define _KEY_APPLICATION_DATA "application_name" +#define _KEY_APPLICATION_DATA "application_id" #define _KEY_REPLY_MESSAGE "reply_message" #define _KEY_REQUEST_MESSAGE "display_message" @@ -175,8 +175,8 @@ void QLibHomeScreen::set_event_handler(enum QEventType et, handler_fun f) * - None. * */ -void QLibHomeScreen::tapShortcut(QString application_name) +void QLibHomeScreen::tapShortcut(QString application_id) { - HMI_DEBUG("qlibhomescreen","tapShortcut %s", application_name.toStdString().c_str()); - this->mp_hs->tapShortcut(application_name.toStdString().c_str()); + HMI_DEBUG("qlibhomescreen","tapShortcut %s", application_id.toStdString().c_str()); + this->mp_hs->tapShortcut(application_id.toStdString().c_str()); } \ No newline at end of file diff --git a/src/qlibhomescreen.h b/src/qlibhomescreen.h index cc0f12a..bf43963 100644 --- a/src/qlibhomescreen.h +++ b/src/qlibhomescreen.h @@ -43,7 +43,7 @@ public: Q_INVOKABLE int onScreenMessage(const QString &message); Q_INVOKABLE int subscribe(const QString &eventName); Q_INVOKABLE int unsubscribe(const QString &eventName); - Q_INVOKABLE void tapShortcut(QString application_name); + Q_INVOKABLE void tapShortcut(QString application_id); signals: -- cgit 1.2.3-korg