X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=homescreen%2Fsrc%2Fhomescreenhandler.cpp;h=9111ebbf87b2cbb6af07ececd14a4e3f841ad3b3;hb=a920d9537132f3778c137edee8d6741102919787;hp=d3338bec33c59e05ef43e8ba1d2b32d6d0ba8dff;hpb=0cd9641e81636806e6a91466afe309a0e2065527;p=apps%2Fhomescreen.git diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp index d3338be..9111ebb 100644 --- a/homescreen/src/homescreenhandler.cpp +++ b/homescreen/src/homescreenhandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 TOYOTA MOTOR CORPORATION + * Copyright (c) 2017, 2018, 2019 TOYOTA MOTOR CORPORATION * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,108 +14,83 @@ * limitations under the License. */ +#include #include #include "homescreenhandler.h" #include #include "hmi-debug.h" +#include + +#define APPLAUNCH_DBUS_IFACE "org.automotivelinux.AppLaunch" +#define APPLAUNCH_DBUS_OBJECT "/org/automotivelinux/AppLaunch" + void* HomescreenHandler::myThis = 0; -HomescreenHandler::HomescreenHandler(QObject *parent) : +HomescreenHandler::HomescreenHandler(Shell *_aglShell, ApplicationLauncher *launcher, QObject *parent) : QObject(parent), - mp_hs(NULL) + aglShell(_aglShell) { - + mp_launcher = launcher; + applaunch_iface = new org::automotivelinux::AppLaunch(APPLAUNCH_DBUS_IFACE, APPLAUNCH_DBUS_OBJECT, + QDBusConnection::sessionBus(), this); } HomescreenHandler::~HomescreenHandler() { - if (mp_hs != NULL) { - delete mp_hs; - } } -void HomescreenHandler::init(int port, const char *token) +void HomescreenHandler::init(void) { - mp_hs = new LibHomeScreen(); - mp_hs->init(port, token); - myThis = this; - mp_hs->registerCallback(nullptr, HomescreenHandler::onRep_static); + /* + * The "started" signal is received any time a start request is made to applaunchd, + * and the application either starts successfully or is already running. This + * effectively acts as a "switch to app X" action. + */ + connect(applaunch_iface, SIGNAL(started(QString)), this, SLOT(appStarted(QString))); + connect(applaunch_iface, SIGNAL(terminated(QString)), this, SLOT(appTerminated(QString))); - mp_hs->set_event_handler(LibHomeScreen::Event_OnScreenMessage, [this](json_object *object){ - const char *display_message = json_object_get_string( - json_object_object_get(object, "display_message")); - HMI_DEBUG("HomeScreen","set_event_handler Event_OnScreenMessage display_message = %s", display_message); - }); - - mp_hs->set_event_handler(LibHomeScreen::Event_ShowNotification,[this](json_object *object){ - json_object *p_obj = json_object_object_get(object, "parameter"); - const char *icon = json_object_get_string( - json_object_object_get(p_obj, "icon")); - const char *text = json_object_get_string( - json_object_object_get(p_obj, "text")); - const char *app_id = json_object_get_string( - json_object_object_get(p_obj, "caller")); - HMI_DEBUG("HomeScreen","Event_ShowNotification icon=%s, text=%s, caller=%s", icon, text, app_id); - QFileInfo icon_file(icon); - QString icon_path; - if (icon_file.isFile() && icon_file.exists()) { - icon_path = QString(QLatin1String(icon)); - } else { - icon_path = "./images/Utility_Logo_Grey-01.svg"; - } - - emit showNotification(QString(QLatin1String(app_id)), icon_path, QString(QLatin1String(text))); - }); - - mp_hs->set_event_handler(LibHomeScreen::Event_ShowInformation,[this](json_object *object){ - json_object *p_obj = json_object_object_get(object, "parameter"); - const char *info = json_object_get_string( - json_object_object_get(p_obj, "info")); +} - emit showInformation(QString(QLatin1String(info))); - }); +static struct wl_output * +getWlOutput(QPlatformNativeInterface *native, QScreen *screen) +{ + void *output = native->nativeResourceForScreen("output", screen); + return static_cast(output); } void HomescreenHandler::tapShortcut(QString application_id) { HMI_DEBUG("HomeScreen","tapShortcut %s", application_id.toStdString().c_str()); - struct json_object* j_json = json_object_new_object(); - struct json_object* value; - value = json_object_new_string("normal"); - json_object_object_add(j_json, "area", value); - mp_hs->showWindow(application_id.toStdString().c_str(), j_json); + QDBusPendingReply<> reply = applaunch_iface->start(application_id); + reply.waitForFinished(); + if (reply.isError()) { + HMI_ERROR("HomeScreen","Unable to start application '%s': %s", + application_id.toStdString().c_str(), + reply.error().message().toStdString().c_str()); + } else { + if (mp_launcher) { + mp_launcher->setCurrent(application_id); + } + appStarted(application_id); + } } -void HomescreenHandler::onRep_static(struct json_object* reply_contents) +void HomescreenHandler::appStarted(const QString& application_id) { - static_cast(HomescreenHandler::myThis)->onRep(reply_contents); -} + struct agl_shell *agl_shell = aglShell->shell.get(); + QPlatformNativeInterface *native = qApp->platformNativeInterface(); + struct wl_output *output = getWlOutput(native, qApp->screens().first()); -void HomescreenHandler::onEv_static(const string& event, struct json_object* event_contents) -{ - static_cast(HomescreenHandler::myThis)->onEv(event, event_contents); + HMI_DEBUG("HomeScreen", "Activating application %s", application_id.toStdString().c_str()); + agl_shell_activate_app(agl_shell, application_id.toStdString().c_str(), output); } -void HomescreenHandler::onRep(struct json_object* reply_contents) +void HomescreenHandler::appTerminated(const QString& application_id) { - const char* str = json_object_to_json_string(reply_contents); - HMI_DEBUG("HomeScreen","HomeScreen onReply %s", str); -} - -void HomescreenHandler::onEv(const string& event, struct json_object* event_contents) -{ - const char* str = json_object_to_json_string(event_contents); - HMI_DEBUG("HomeScreen","HomeScreen onEv %s, contents: %s", event.c_str(), str); - - if (event.compare("homescreen/on_screen_message") == 0) { - struct json_object *json_data = json_object_object_get(event_contents, "data"); - struct json_object *json_display_message = json_object_object_get(json_data, "display_message"); - const char* display_message = json_object_get_string(json_display_message); - - HMI_DEBUG("HomeScreen","display_message = %s", display_message); - } + HMI_DEBUG("HomeScreen", "Application %s terminated, activating launcher", application_id.toStdString().c_str()); + appStarted("launcher"); }