X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fqlibhomescreen.cpp;h=c67d408dd0300bd5fc7d96cfe729cfe44f9a4cf1;hb=e43fd3fa6d165008bb0f659bfa82344e3c3aa20e;hp=248dd725a4eac7f7f6f9f3bac83c3defb028ca71;hpb=5716a8eebad5e503f2c73c382ba2a6fa9e101bc6;p=src%2Flibqthomescreen.git

diff --git a/src/qlibhomescreen.cpp b/src/qlibhomescreen.cpp
index 248dd72..c67d408 100644
--- a/src/qlibhomescreen.cpp
+++ b/src/qlibhomescreen.cpp
@@ -17,13 +17,14 @@
 #include "qlibhomescreen.h"
 #include <QJsonDocument>
 #include <QJsonObject>
+#include "hmi-debug.h"
 using namespace std;
 
 #define _POPUPREPLY "on_screen_reply"
 #define _REQ_POPUP_MESSAGE "on_screen_message"
 #define _TAPSHORTCUT "tap_shortcut"
 #define _KEY_DATA "data"
-#define _KEY_APPLICATION_DATA "application_name"
+#define _KEY_APPLICATION_DATA "application_id"
 #define _KEY_REPLY_MESSAGE "reply_message"
 #define _KEY_REQUEST_MESSAGE "display_message"
 
@@ -44,7 +45,7 @@ QLibHomeScreen::QLibHomeScreen(QObject *parent) :
     QObject(parent),
     mp_hs(NULL)
 {
-
+    HMI_DEBUG("qlibhomescreen", "called.");
 }
 
 /**
@@ -59,6 +60,7 @@ QLibHomeScreen::QLibHomeScreen(QObject *parent) :
  */
 QLibHomeScreen::~QLibHomeScreen()
 {
+    HMI_DEBUG("qlibhomescreen", "called.");
     if (mp_hs != NULL) {
         delete mp_hs;
     }
@@ -79,6 +81,7 @@ QLibHomeScreen::~QLibHomeScreen()
  */
 void QLibHomeScreen::init(int port, const QString &token)
 {
+    HMI_DEBUG("qlibhomescreen", "called.");
     string ctoken = token.toStdString();
     mp_hs = new LibHomeScreen();
     mp_hs->init(port, ctoken.c_str());
@@ -101,6 +104,7 @@ void QLibHomeScreen::init(int port, const QString &token)
  */
 int QLibHomeScreen::onScreenMessage(const QString &message)
 {
+    HMI_DEBUG("qlibhomescreen", "called.");
     string str = message.toStdString();
     return mp_hs->onScreenMessage(str.c_str());
 }
@@ -119,6 +123,7 @@ int QLibHomeScreen::onScreenMessage(const QString &message)
  */
 int QLibHomeScreen::subscribe(const QString &evetName)
 {
+    HMI_DEBUG("qlibhomescreen", "called.");
     string str = evetName.toStdString();
     return mp_hs->subscribe(str);
 }
@@ -137,6 +142,7 @@ int QLibHomeScreen::subscribe(const QString &evetName)
  */
 int QLibHomeScreen::unsubscribe(const QString &evetName)
 {
+    HMI_DEBUG("qlibhomescreen", "called.");
     string str = evetName.toStdString();
     return mp_hs->unsubscribe(str);
 }
@@ -154,6 +160,157 @@ int QLibHomeScreen::unsubscribe(const QString &evetName)
  */
 void QLibHomeScreen::set_event_handler(enum QEventType et, handler_fun f)
 {
+    HMI_DEBUG("qlibhomescreen", "called.");
     LibHomeScreen::EventType hs_et = (LibHomeScreen::EventType)et;
     return this->mp_hs->set_event_handler(hs_et, std::move(f));
 }
+
+/**
+ * tapShortcut function
+ *
+ * #### Parameters
+ * - application_id : tapped application id
+  *
+ * #### Return
+ * - None.
+ *
+ */
+void QLibHomeScreen::tapShortcut(QString application_id)
+{
+    HMI_DEBUG("qlibhomescreen","tapShortcut %s", application_id.toStdString().c_str());
+    mp_hs->showWindow(application_id.toStdString().c_str(), nullptr);
+}
+
+/**
+ * show application by application id and display area
+ *
+ * #### Parameters
+ * - application_id  : application id
+ * - area  : display area liked {"area":"normal"}
+ *
+ * #### Return
+ * - None.
+ *
+ */
+void QLibHomeScreen::showWindow(QString application_id, json_object* area)
+{
+    mp_hs->showWindow(application_id.toStdString().c_str(), area);
+}
+
+/**
+ * show application by application id and display area
+ *
+ * #### Parameters
+ * - application_id  : application id
+ * - area  : display area liked "normal"
+ *
+ * #### Return
+ * - None.
+ *
+ */
+void QLibHomeScreen::showWindow(QString application_id, QString area)
+{
+    if(area.isNull()) {
+        mp_hs->showWindow(application_id.toStdString().c_str(), nullptr);
+    } else {
+        struct json_object *j_obj = json_object_new_object();
+        struct json_object *value = json_object_new_string(area.toStdString().c_str());
+        json_object_object_add(j_obj, "area", value);
+        mp_hs->showWindow(application_id.toStdString().c_str(), j_obj);
+    }
+}
+
+/**
+ * hide application by application id
+ *
+ * #### Parameters
+ * - application_id  : application id
+ *
+ * #### Return
+ * - None.
+ *
+ */
+void QLibHomeScreen::hideWindow(QString application_id)
+{
+    mp_hs->hideWindow(application_id.toStdString().c_str());
+}
+
+/**
+ * send onscreen reply to application
+ *
+ * #### Parameters
+ * - application_id  : application id
+ * - reply  : the reply contents
+ *
+ * #### Return
+ * - None.
+ *
+ */
+void QLibHomeScreen::replyShowWindow(QString application_id, json_object* reply)
+{
+    mp_hs->replyShowWindow(application_id.toStdString().c_str(), reply);
+}
+
+/**
+ * send onscreen reply to application
+ *
+ * #### Parameters
+ * - application_id  : application id
+ * - reply  : the reply contents which can convert to json
+ *
+ * #### Return
+ * - None.
+ *
+ */
+void QLibHomeScreen::replyShowWindow(QString application_id, QString reply)
+{
+    if(reply.isNull())
+        mp_hs->replyShowWindow(application_id.toStdString().c_str(), nullptr);
+    else
+        mp_hs->replyShowWindow(application_id.toStdString().c_str(), json_tokener_parse(reply.toStdString().c_str()));
+}
+
+/**
+ * show information
+ *
+ * push information to HomeScreen
+ *
+ * #### Parameters
+ * - info : information that want to show
+ *
+ * #### Return
+ * - None.
+ *
+ */
+void QLibHomeScreen::showInformation(QString info)
+{
+	struct json_object* j_obj = json_object_new_object();
+	struct json_object* val = json_object_new_string(info.toStdString().c_str());
+	json_object_object_add(j_obj, "info", val);
+
+    mp_hs->showInformation(j_obj);
+}
+
+/**
+ * show notification
+ *
+ * push notification to HomeScreen
+ *
+ * #### Parameters
+ * - icon : provided icon
+ * - text : text that want to show
+ *
+ * #### Resturn
+ * - None.
+ *
+ */
+void QLibHomeScreen::showNotification(QString icon, QString text)
+{
+	struct json_object* j_obj = json_object_new_object();
+	struct json_object* val_icon = json_object_new_string(icon.toStdString().c_str());
+	struct json_object* val_text = json_object_new_string(text.toStdString().c_str());
+	json_object_object_add(j_obj, "icon", val_icon);
+	json_object_object_add(j_obj, "text", val_text);
+
+    mp_hs->showNotification(j_obj);
+}