},
{
"category": "tbt",
- "role": "tbtnavi | tbtnavi2 | dashboard",
+ "role": "tbtnavi",
"area": "master.split.sub",
"layer": "remote",
},
},
{
"category": "tbt",
- "role": "tbtnavi",
- "area": "master.split.sub",
+ "role": "tbtnavi | hudtbt",
+ "area": "master.split.sub | hud.normal.full",
"layer": "remote",
},
{
},
{
"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",
}
"rect": {
"x": 0,
"y": 0,
- "w": 480,
+ "w": 240,
"h": 180
}
}
{
"name": "upper.left",
"rect": {
- "x": 0,
- "y": 0,
- "w": 480,
+ "x": 480,
+ "y": 450,
+ "w": 240,
"h": 180
}
},
"rect": {
"x": 0,
"y": 0,
- "w": 480,
+ "w": 240,
"h": 180
}
}
// 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) != "")
{
this->emit_invisible(role);
this->emit_deactivated(role);
}
+#endif
Task task = Task::TASK_ALLOCATE;
unsigned req_num = 0;
// 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) != "")
{
this->emit_invisible(role);
this->emit_deactivated(role);
}
-
+#endif
Task task = Task::TASK_ALLOCATE;
unsigned req_num = 0;
WMError ret = WMError::UNKNOWN;
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");
HMI_DEBUG("Try Connection");
connectToServer(ecu_name);
}
+
+ HMI_DEBUG("Wait Connection");
+
}
if (cnt == (int)this->wm_socket.size())