From 68d109f3c891ed4177541102a70a74824141599b Mon Sep 17 00:00:00 2001 From: wang_zhiqiang Date: Wed, 23 Jan 2019 19:49:23 +0800 Subject: start app by homescreen-service Change-Id: I88b73825fb6c63a131235a3eb3cc54877da3cdb4 --- launcher/qml/Launcher.qml | 8 +------- launcher/src/applicationmodel.cpp | 17 ----------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/launcher/qml/Launcher.qml b/launcher/qml/Launcher.qml index ad15fe9..46e7219 100644 --- a/launcher/qml/Launcher.qml +++ b/launcher/qml/Launcher.qml @@ -88,13 +88,7 @@ ApplicationWindow { return } if (currentId === '') { - pid = launcher.launch(applicationModel.id(loc.index)) - if (1 < pid) { - homescreenHandler.tapShortcut(applicationModel.appid(loc.index)) - } - else { - console.warn("app cannot be launched!") - } + homescreenHandler.tapShortcut(applicationModel.appid(loc.index)) } else { currentId = '' } diff --git a/launcher/src/applicationmodel.cpp b/launcher/src/applicationmodel.cpp index c18291c..a148505 100644 --- a/launcher/src/applicationmodel.cpp +++ b/launcher/src/applicationmodel.cpp @@ -55,23 +55,6 @@ namespace { ApplicationModel::Private::Private() { -// QString apps = afm_user_daemon_proxy->runnables(QStringLiteral("")); -// QJsonDocument japps = QJsonDocument::fromJson(apps.toUtf8()); -// for (auto const &app : japps.array()) { -// QJsonObject const &jso = app.toObject(); -// auto const name = jso["name"].toString(); -// auto const id = jso["id"].toString(); -// auto const icon = get_icon_name(jso); - -// if ( name != "launcher" && -// name != "homescreen-2017" && -// name != "homescreen" && -// name != "OnScreenApp") { -// this->data.append(AppInfo(icon, name, id)); -// } - -// HMI_DEBUG("launcher","name: %s icon: %s id: %s.", name.toStdString().c_str(), icon.toStdString().c_str(), id.toStdString().c_str()); -// } } void ApplicationModel::Private::addApp(QString icon, QString name, QString id) -- cgit 1.2.3-korg