Change function argument to json due to change in libwindowmanagereel_4.99.2eel/4.99.24.99.2

    As libwindowmanager changed the function argument from char* to 
    json_object, we need to modify homscreen-2017, too.
    Related Commit:
        https://gerrit.automotivelinux.org/gerrit/#/c/11459/

BUG-AGL: SPEC-990
Change-Id: I1ccc61de1c3f817ab69ab4579216faaf85408d0a
Signed-off-by: zheng_wenlong <wenlong_zheng@nexty-ele.com>

1 files changed, 16 insertions, 9 deletions

diff --git a/homescreen/src/layouthandler.cpp b/homescreen/src/layouthandler.cpp
index a252e6e..9d72221 100644
--- a/homescreen/src/layouthandler.cpp
+++ b/homescreen/src/layouthandler.cpp
@@ -40,41 +40,48 @@ void LayoutHandler::init(int port, const char* token)
         exit(EXIT_FAILURE);
     }
 
-    mp_wm->requestSurface(HOMESCREEN);
+    json_object *obj = json_object_new_object();
+    json_object_object_add(obj, mp_wm->kKeyDrawingName, json_object_new_string(HOMESCREEN));
+    mp_wm->requestSurface(obj);
 
-    mp_wm->set_event_handler(LibWindowmanager::Event_Active, [this](const char* label) {
+    mp_wm->set_event_handler(LibWindowmanager::Event_Active, [this](json_object *object) {
         this->isActived = true;
         HMI_DEBUG("HomeScreen","Surface %s got activated!", HOMESCREEN);
     });
 
-    mp_wm->set_event_handler(LibWindowmanager::Event_Inactive, [this](const char* label) {
+    mp_wm->set_event_handler(LibWindowmanager::Event_Inactive, [this](json_object *object) {
         this->isActived = false;
         HMI_DEBUG("HomeScreen","Surface %s got deactivated!", HOMESCREEN);
     });
 
-	mp_wm->set_event_handler(LibWindowmanager::Event_Visible, [](char const *label) {
+	mp_wm->set_event_handler(LibWindowmanager::Event_Visible, [](json_object *object) {
 		HMI_DEBUG("HomeScreen","Surface %s  got visibled!", HOMESCREEN);
 	});
 
-	mp_wm->set_event_handler(LibWindowmanager::Event_Invisible, [](char const *label) {
+	mp_wm->set_event_handler(LibWindowmanager::Event_Invisible, [](json_object *object) {
 		HMI_DEBUG("HomeScreen","Surface %s  got invisibled!", HOMESCREEN);
 	});
 
-    mp_wm->set_event_handler(LibWindowmanager::Event_SyncDraw, [this](const char* label) {
+    mp_wm->set_event_handler(LibWindowmanager::Event_SyncDraw, [this](json_object *object) {
         HMI_DEBUG("HomeScreen","Surface %s got syncDraw!", HOMESCREEN);
         HMI_DEBUG("HomeScreen","Try to endDraw Surface %s Start!", HOMESCREEN);
-        this->mp_wm->endDraw(HOMESCREEN);
+        json_object *obj = json_object_new_object();
+        json_object_object_add(obj, mp_wm->kKeyDrawingName, json_object_new_string(HOMESCREEN));
+        this->mp_wm->endDraw(obj);
         HMI_DEBUG("HomeScreen","Try to endDraw Surface %s End!", HOMESCREEN);
     });
 
-    mp_wm->set_event_handler(LibWindowmanager::Event_FlushDraw, [](char const *label) {
+    mp_wm->set_event_handler(LibWindowmanager::Event_FlushDraw, [](json_object *object) {
         HMI_DEBUG("HomeScreen","Surface %s got flushDraw!", HOMESCREEN);
     });
 }
 
 void LayoutHandler::activateSurface()
 {
-    mp_wm->activateSurface(HOMESCREEN);
+    json_object *obj = json_object_new_object();
+    json_object_object_add(obj, mp_wm->kKeyDrawingName, json_object_new_string(HOMESCREEN));
+    json_object_object_add(obj, mp_wm->kKeyDrawingArea, json_object_new_string("normal.full"));
+    mp_wm->activateSurface(obj);
 }
 
 void LayoutHandler::slotActivateSurface()