From 1a41996c228c5828c4b1189cbed21a5d82b1f1aa Mon Sep 17 00:00:00 2001 From: wang_zhiqiang Date: Thu, 27 Sep 2018 13:41:13 +0800 Subject: use appid between launcher and hss --- launcher/qml/Launcher.qml | 3 ++- launcher/src/applicationmodel.cpp | 6 ++++++ launcher/src/applicationmodel.h | 1 + launcher/src/main.cpp | 19 ++++++++++--------- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/launcher/qml/Launcher.qml b/launcher/qml/Launcher.qml index 31b1f3d..fea30bd 100644 --- a/launcher/qml/Launcher.qml +++ b/launcher/qml/Launcher.qml @@ -79,7 +79,8 @@ ApplicationWindow { } else { currentId = '' } - homescreenHandler.tapShortcut(applicationModel.name(loc.index)) +// homescreenHandler.tapShortcut(applicationModel.name(loc.index)) + homescreenHandler.tapShortcut(applicationModel.appid(loc.index)) } onPositionChanged: { if (loc.currentId === '') return diff --git a/launcher/src/applicationmodel.cpp b/launcher/src/applicationmodel.cpp index 17e38fb..14e2ea1 100644 --- a/launcher/src/applicationmodel.cpp +++ b/launcher/src/applicationmodel.cpp @@ -127,6 +127,12 @@ QString ApplicationModel::id(int i) const return data(index(i), Qt::UserRole).toString(); } +QString ApplicationModel::appid(int i) const +{ + QString id = data(index(i), Qt::UserRole).toString(); + return id.split("@")[0]; +} + QString ApplicationModel::name(int i) const { return data(index(i), Qt::DisplayRole).toString(); diff --git a/launcher/src/applicationmodel.h b/launcher/src/applicationmodel.h index 8398b62..71c79fc 100644 --- a/launcher/src/applicationmodel.h +++ b/launcher/src/applicationmodel.h @@ -31,6 +31,7 @@ public: QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; QHash roleNames() const override; + Q_INVOKABLE QString appid(int index) const; Q_INVOKABLE QString id(int index) const; Q_INVOKABLE QString name(int index) const; Q_INVOKABLE void move(int from, int to); diff --git a/launcher/src/main.cpp b/launcher/src/main.cpp index 91a1d80..ab9660b 100644 --- a/launcher/src/main.cpp +++ b/launcher/src/main.cpp @@ -124,16 +124,17 @@ int main(int argc, char *argv[]) homescreenHandler->init(port, token.toStdString().c_str()); homescreenHandler->set_event_handler(QLibHomeScreen::Event_TapShortcut, [layoutHandler, myname](json_object *object){ - json_object *appnameJ = nullptr; - if(json_object_object_get_ex(object, "application_name", &appnameJ)) - { - const char *appname = json_object_get_string(appnameJ); - if(myname == appname) - { - qDebug("Surface %s got tapShortcut\n", appname); +// json_object *appnameJ = nullptr; +// if(json_object_object_get_ex(object, "application_name", &appnameJ)) +// { +// const char *appname = json_object_get_string(appnameJ); +// if(myname == appname) +// { +// qDebug("Surface %s got tapShortcut\n", appname); + qDebug("Surface %s got tapShortcut\n", myname); layoutHandler->activateSurface(myname); - } - } +// } +// } }); QUrl bindingAddress; -- cgit 1.2.3-korg