From c7e9f1482ef0506c91d2a1567d7cb19f7def62d3 Mon Sep 17 00:00:00 2001 From: "fukubayashi.akio" Date: Thu, 11 Jul 2019 18:05:45 +0900 Subject: Fix WM connection Signed-off-by: fukubayashi.akio --- policy_manager/config/roles.json.zipc.split | 10 +++++----- src/config/areas.json | 10 +++++----- src/window_manager.cpp | 6 ++++-- src/wm_connection.cpp | 5 ++++- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/policy_manager/config/roles.json.zipc.split b/policy_manager/config/roles.json.zipc.split index eee2156..7708845 100644 --- a/policy_manager/config/roles.json.zipc.split +++ b/policy_manager/config/roles.json.zipc.split @@ -50,7 +50,7 @@ }, { "category": "tbt", - "role": "tbtnavi | tbtnavi2 | dashboard", + "role": "tbtnavi", "area": "master.split.sub", "layer": "remote", }, @@ -137,8 +137,8 @@ }, { "category": "tbt", - "role": "tbtnavi", - "area": "master.split.sub", + "role": "tbtnavi | hudtbt", + "area": "master.split.sub | hud.normal.full", "layer": "remote", }, { @@ -207,13 +207,13 @@ }, { "category": "general", - "role": "video | music | sdl_bt | webbrowser | eb | poi | browser | mixer | radio | hvac | debug | phone | settings | hvac | hudtbt | tbtnavi | tbtnavi2 | dashboard", + "role": "hudtbt", "area": "hud.normal.full", "layer": "remote_hud", }, { "category": "speed", - "role": "tachometer | speed | hudspeed", + "role": "hudspeed", "area": "hud.upper.left", "layer": "remote_hud_upper_left", } diff --git a/src/config/areas.json b/src/config/areas.json index 1fb85b7..d63e046 100644 --- a/src/config/areas.json +++ b/src/config/areas.json @@ -101,7 +101,7 @@ "rect": { "x": 0, "y": 0, - "w": 480, + "w": 240, "h": 180 } } @@ -319,9 +319,9 @@ { "name": "upper.left", "rect": { - "x": 0, - "y": 0, - "w": 480, + "x": 480, + "y": 450, + "w": 240, "h": 180 } }, @@ -339,7 +339,7 @@ "rect": { "x": 0, "y": 0, - "w": 480, + "w": 240, "h": 180 } } diff --git a/src/window_manager.cpp b/src/window_manager.cpp index 52a7144..6955131 100644 --- a/src/window_manager.cpp +++ b/src/window_manager.cpp @@ -529,6 +529,7 @@ void WindowManager::api_activate_window(char const *appid, char const *drawing_n // g_app_list.removeFloatingSurface(client);i unsigned layer = client->layerID(); +#if 0 //TODO Deactivate remote viewing app for remote view change to local view. if(this->lc->hasRemoteLayer(layer) != "" && this->wmcon.getAppIdToEcuName(appid) != "") { @@ -557,6 +558,7 @@ void WindowManager::api_activate_window(char const *appid, char const *drawing_n this->emit_invisible(role); this->emit_deactivated(role); } +#endif Task task = Task::TASK_ALLOCATE; unsigned req_num = 0; @@ -692,7 +694,7 @@ void WindowManager::api_activate_surface_to_master( // g_app_list.removeFloatingSurface(client); unsigned layer = client->layerID(); - +#if 0 //TODO Deactivate remote viewing app for remote view change to local view. if(this->lc->hasRemoteLayer(layer) != "" && this->wmcon.getAppIdToEcuName(appid) != "") { @@ -721,7 +723,7 @@ void WindowManager::api_activate_surface_to_master( this->emit_invisible(role); this->emit_deactivated(role); } - +#endif Task task = Task::TASK_ALLOCATE; unsigned req_num = 0; WMError ret = WMError::UNKNOWN; diff --git a/src/wm_connection.cpp b/src/wm_connection.cpp index 16bb2d6..3600cd4 100644 --- a/src/wm_connection.cpp +++ b/src/wm_connection.cpp @@ -557,7 +557,7 @@ int WMConnection::connectToEcu() std::string ecu_name = itr->first; HMI_DEBUG("ECU Names %s", ecu_name.c_str()); - if (itr->second.connectedSocket() != -1 || !itr->second.masterMode()) + if (itr->second.connectedSocket() != -1 || itr->first == this->ecu_name) { cnt++; HMI_DEBUG("Already Connected"); @@ -569,6 +569,9 @@ int WMConnection::connectToEcu() HMI_DEBUG("Try Connection"); connectToServer(ecu_name); } + + HMI_DEBUG("Wait Connection"); + } if (cnt == (int)this->wm_socket.size()) -- cgit 1.2.3-korg