From de4ff7944811d8ad7ef0bd95c032df953034bab3 Mon Sep 17 00:00:00 2001 From: zheng_wenlong Date: Thu, 27 Jun 2019 14:53:49 +0900 Subject: fix issues --- src/hs-vuiadapter.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/hs-vuiadapter.cpp') diff --git a/src/hs-vuiadapter.cpp b/src/hs-vuiadapter.cpp index e6837ba..4bfc24d 100644 --- a/src/hs-vuiadapter.cpp +++ b/src/hs-vuiadapter.cpp @@ -172,7 +172,7 @@ void Vui_Navigation::set_destination(afb_api_t api, struct json_object *object) */ void Vui_Navigation::cancel_navigation(afb_api_t api, struct json_object *object) { - HS_ClientManager::instance()->pushEvent(_stopNavigation, nullptr); + HS_ClientManager::instance()->pushEvent(_stopNavigation, nullptr, _navigation); } /** @@ -188,11 +188,11 @@ void Vui_Navigation::cancel_navigation(afb_api_t api, struct json_object *object */ void Vui_Navigation::notify(afb_api_t api, std::string appid) { - this->removeListenAppId(appid); + AFB_INFO("recover appid=[%s].", appid.c_str()); if(isListenAppId(appid)) { if (appid == _poi) { m_start_flg.first = true; - sleep(1); + // sleep(1); set_destination2poi(api); } else if(appid == _navigation) { @@ -204,9 +204,10 @@ void Vui_Navigation::notify(afb_api_t api, std::string appid) return; } } + if(m_start_flg.first && m_start_flg.second) { clearListenAppSet(); - HS_ClientManager::instance()->removeListener(this); + // HS_ClientManager::instance()->removeListener(this); } } @@ -225,7 +226,7 @@ void Vui_Navigation::set_destination2poi(afb_api_t api) struct json_object *param = json_object_new_object(); json_object_object_add(param, _latitudeInDegrees, json_object_new_double(m_dest.first)); json_object_object_add(param, _longitudeInDegrees, json_object_new_double(m_dest.second)); - HS_ClientManager::instance()->pushEvent(_setDestination, param); + HS_ClientManager::instance()->pushEvent(_setDestination, param, _poi); } /** @@ -240,7 +241,7 @@ void Vui_Navigation::set_destination2poi(afb_api_t api) */ void Vui_Navigation::start_navigation(afb_api_t api) { - HS_ClientManager::instance()->pushEvent(_startNavigation, nullptr); + HS_ClientManager::instance()->pushEvent(_startNavigation, nullptr, _navigation); HS_ClientManager::instance()->pushEvent("showWindow", nullptr, _navigation); } @@ -282,6 +283,9 @@ void HS_VuiAdapter::init(afb_api_t api) AFB_INFO("%s api isn't existing.", _vshl_capabilities); return; } + else { + AFB_INFO("%s api is existing.", _vshl_capabilities); + } std::string uid = std::string(_vui_prefixe) + std::string("-") + _navigation; module_list[uid] = new Vui_Navigation(uid); -- cgit 1.2.3-korg