try fix bugsandbox/zheng_wenlong/ces2019_vertical2

2 files changed, 20 insertions, 48 deletions

diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp
index 4e3d0eb..7573b7b 100644
--- a/homescreen/src/homescreenhandler.cpp
+++ b/homescreen/src/homescreenhandler.cpp
@@ -50,34 +50,6 @@ void HomescreenHandler::init(int port, const char *token)
             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){
-       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, bool is_full)
diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp
index 176bcec..f4866b1 100644
--- a/homescreen/src/main.cpp
+++ b/homescreen/src/main.cpp
@@ -110,26 +110,6 @@ int main(int argc, char *argv[])
         layoutHandler->endDraw(graphic_role);
     });
 
-    layoutHandler->set_event_handler(QLibWindowmanager::Event_ScreenUpdated, [layoutHandler, launcher, homescreenHandler, root](json_object *object) {
-        json_object *jarray = json_object_object_get(object, "ids");
-        HMI_DEBUG("HomeScreen","ids=%s", json_object_to_json_string(object));
-        int arrLen = json_object_array_length(jarray);
-        QString label = QString("");
-        for( int idx = 0; idx < arrLen; idx++)
-        {
-            label = QString(json_object_get_string(	json_object_array_get_idx(jarray, idx) ));
-            HMI_DEBUG("HomeScreen","Event_ScreenUpdated application: %s.", label.toStdString().c_str());
-            homescreenHandler->setCurrentApplication(label);
-            QMetaObject::invokeMethod(launcher, "setCurrent", Qt::QueuedConnection, Q_ARG(QString, label));
-        }
-        if((arrLen == 1) && (QString("navigation") == label)){
-            QMetaObject::invokeMethod(root, "changeSwitchState", Q_ARG(QVariant, true));
-        }else{
-            QMetaObject::invokeMethod(root, "changeSwitchState", Q_ARG(QVariant, false));
-        }
-
-    });
-
     HomescreenHandler* homescreenHandler = new HomescreenHandler();
     homescreenHandler->init(port, token.toStdString().c_str());
 
@@ -160,6 +140,26 @@ int main(int argc, char *argv[])
     QObject *root = engine.rootObjects().first();
     QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
 
+        layoutHandler->set_event_handler(QLibWindowmanager::Event_ScreenUpdated, [layoutHandler, launcher, homescreenHandler, root](json_object *object) {
+        json_object *jarray = json_object_object_get(object, "ids");
+        HMI_DEBUG("HomeScreen","ids=%s", json_object_to_json_string(object));
+        int arrLen = json_object_array_length(jarray);
+        QString label = QString("");
+        for( int idx = 0; idx < arrLen; idx++)
+        {
+            label = QString(json_object_get_string(	json_object_array_get_idx(jarray, idx) ));
+            HMI_DEBUG("HomeScreen","Event_ScreenUpdated application: %s.", label.toStdString().c_str());
+            homescreenHandler->setCurrentApplication(label);
+            QMetaObject::invokeMethod(launcher, "setCurrent", Qt::QueuedConnection, Q_ARG(QString, label));
+        }
+        if((arrLen == 1) && (QString("navigation") == label)){
+            QMetaObject::invokeMethod(root, "changeSwitchState", Q_ARG(QVariant, true));
+        }else{
+            QMetaObject::invokeMethod(root, "changeSwitchState", Q_ARG(QVariant, false));
+        }
+
+    });
+
     touchArea->setWindow(window);
     QThread* thread = new QThread;
     touchArea->moveToThread(thread);