diff options
author | wang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com> | 2018-11-14 11:17:48 +0800 |
---|---|---|
committer | wang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com> | 2018-11-27 09:39:51 +0800 |
commit | 4667d93a852d66a57a2d7d26957c3aab6845756e (patch) | |
tree | 79ec39160f3a8c5a7f5787f7b32e3dae88585be6 /homescreen/src/homescreenhandler.cpp | |
parent | 42fe4411428f81427ce8993886e28504012219d2 (diff) |
add new features in homescreen-service and homescreen
homescreen-service: add five verbs.
1.showWindow: instead of tap_shortcut and show onscreen.
2.hideWindow: used when want to hide onscreen.
3.replyShowWindow: used when post onscreen reply information to application.
4.showNotification: used by application who want to display notification on homescreen top area.
5.showInformation: used by application who want to display information on homescreen botton area.
homescreen:
display notification and information.
Bug-AGL: SPEC-1931
Change-Id: Ia17a9793c5d284458009ea71eb9594a40286fa8c
Signed-off-by: wang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>
Diffstat (limited to 'homescreen/src/homescreenhandler.cpp')
-rw-r--r-- | homescreen/src/homescreenhandler.cpp | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp index daf1b90..3aaef26 100644 --- a/homescreen/src/homescreenhandler.cpp +++ b/homescreen/src/homescreenhandler.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#include <QFileInfo> #include "homescreenhandler.h" #include <functional> #include "hmi-debug.h" @@ -49,12 +50,44 @@ void HomescreenHandler::init(int port, const char *token) 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){ + const char *application_id = json_object_get_string( + json_object_object_get(object, "application_id")); + + 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")); + 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(application_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))); + }); } void HomescreenHandler::tapShortcut(QString application_id) { HMI_DEBUG("HomeScreen","tapShortcut %s", application_id.toStdString().c_str()); - mp_hs->tapShortcut(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); } void HomescreenHandler::onRep_static(struct json_object* reply_contents) |