From 44290c49e08fe52d6e3ed80720473577131090f4 Mon Sep 17 00:00:00 2001 From: wang_zhiqiang Date: Wed, 20 Feb 2019 13:42:43 +0800 Subject: Start app and get runnables list by homescreen 1.add getRunnables interface. 2.add Event_AppListChanged event. 3.delete area defination in libhomescreen.hpp Bug-AGL: SPEC-2188 Change-Id: I8344067ecadc09e917610eb0a6e191924106f012 Signed-off-by: wang_zhiqiang --- src/libhomescreen.cpp | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/libhomescreen.cpp b/src/libhomescreen.cpp index 121def7..ad18ca4 100644 --- a/src/libhomescreen.cpp +++ b/src/libhomescreen.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2017 TOYOTA MOTOR CORPORATION + * Copyright (c) 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. @@ -47,7 +48,8 @@ const std::vector LibHomeScreen::api_list { std::string("hideWindow"), std::string("replyShowWindow"), std::string("showNotification"), - std::string("showInformation") + std::string("showInformation"), + std::string("getRunnables") }; const std::vector LibHomeScreen::event_list { @@ -59,6 +61,7 @@ const std::vector LibHomeScreen::event_list { std::string("replyShowWindow"), std::string("showNotification"), std::string("showInformation"), + std::string("application-list-changed"), std::string("none") }; @@ -303,7 +306,7 @@ int LibHomeScreen::onScreenReply(const char* reply_message) */ void LibHomeScreen::set_event_handler(enum EventType et, handler_func f) { - if (et >= 1 && et <= 7) { + if (et > Event_Min && et < Event_Max) { switch (et) { case Event_ShowWindow: this->subscribe(LibHomeScreen::event_list[0]); @@ -326,6 +329,9 @@ void LibHomeScreen::set_event_handler(enum EventType et, handler_func f) case Event_ShowInformation: this->subscribe(LibHomeScreen::event_list[6]); break; + case Event_AppListChanged: + this->subscribe(LibHomeScreen::event_list[7]); + break; } this->handlers[et] = std::move(f); @@ -597,6 +603,23 @@ int LibHomeScreen::showInformation(json_object* json) return this->call("showInformation", json); } +/** + * get runnables list + * + * Call HomeScreen Service's getRunnables verb to get runnalbes list. + * + * #### Parameters + * - Nothing + * + * #### Return + * - Returns 0 on success or -1 in case of error. + * + */ +int LibHomeScreen::getRunnables(void) +{ + return this->call("getRunnables", nullptr); +} + /************* Callback Function *************/ @@ -692,6 +715,12 @@ void LibHomeScreen::on_event(void *closure, const char *event, struct afb_wsj1_m i->second(json_data); } } + else if (strcasecmp(event_type, LibHomeScreen::event_list[7].c_str()) == 0) { + auto i = this->handlers.find(Event_AppListChanged); + if ( i != this->handlers.end() ) { + i->second(json_data); + } + } } /** -- cgit 1.2.3-korg