From b1fb0101019b72f7895c1fe0290f6009d089de00 Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Fri, 31 Jan 2020 16:41:59 +0300 Subject: [PATCH] Review fixes. --- android/jni/com/mapswithme/maps/Framework.cpp | 9 ++++++++- android/jni/com/mapswithme/maps/Framework.hpp | 5 +++-- .../maps/isolines/IsolinesManager.cpp | 17 +++++++++-------- xcode/map/map.xcodeproj/project.pbxproj | 8 ++++++++ 4 files changed, 28 insertions(+), 11 deletions(-) diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index 7bf86d1522..82f7e71fd9 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -122,6 +122,7 @@ Framework::Framework() { m_work.GetTrafficManager().SetStateListener(bind(&Framework::TrafficStateChanged, this, _1)); m_work.GetTransitManager().SetStateListener(bind(&Framework::TransitSchemeStateChanged, this, _1)); + m_work.GetIsolinesManager().SetStateListener(bind(&Framework::IsolinesSchemeStateChanged, this, _1)); m_work.GetPowerManager().Subscribe(this); } @@ -167,6 +168,12 @@ void Framework::TransitSchemeStateChanged(TransitReadManager::TransitSchemeState m_onTransitStateChangedFn(state); } +void Framework::IsolinesSchemeStateChanged(IsolinesManager::IsolinesState state) +{ + if (m_onIsolinesStateChangedFn) + m_onIsolinesStateChangedFn(state); +} + bool Framework::DestroySurfaceOnDetach() { if (m_vulkanContextFactory) @@ -609,7 +616,7 @@ void Framework::SetTransitSchemeListener(TransitReadManager::TransitStateChanged m_onTransitStateChangedFn = function; } -void Framework::SetIsolinesListener(TransitReadManager::TransitStateChangedFn const & function) +void Framework::SetIsolinesListener(IsolinesManager::IsolinesStateChangedFn const & function) { m_onIsolinesStateChangedFn = function; } diff --git a/android/jni/com/mapswithme/maps/Framework.hpp b/android/jni/com/mapswithme/maps/Framework.hpp index a04fe79665..4eaf070f1e 100644 --- a/android/jni/com/mapswithme/maps/Framework.hpp +++ b/android/jni/com/mapswithme/maps/Framework.hpp @@ -69,6 +69,7 @@ namespace android void TrafficStateChanged(TrafficManager::TrafficState state); void TransitSchemeStateChanged(TransitReadManager::TransitSchemeState state); + void IsolinesSchemeStateChanged(IsolinesManager::IsolinesState state); void MyPositionModeChanged(location::EMyPositionMode mode, bool routingActive); @@ -78,7 +79,7 @@ namespace android TrafficManager::TrafficStateChangedFn m_onTrafficStateChangedFn; TransitReadManager::TransitStateChangedFn m_onTransitStateChangedFn; - TransitReadManager::TransitStateChangedFn m_onIsolinesStateChangedFn; + IsolinesManager::IsolinesStateChangedFn m_onIsolinesStateChangedFn; bool m_isChoosePositionMode; @@ -168,7 +169,7 @@ namespace android void SetTrafficStateListener(TrafficManager::TrafficStateChangedFn const & fn); void SetTransitSchemeListener(TransitReadManager::TransitStateChangedFn const & fn); - void SetIsolinesListener(TransitReadManager::TransitStateChangedFn const & fn); + void SetIsolinesListener(IsolinesManager::IsolinesStateChangedFn const & fn); bool IsTrafficEnabled(); void EnableTraffic(); void DisableTraffic(); diff --git a/android/jni/com/mapswithme/maps/isolines/IsolinesManager.cpp b/android/jni/com/mapswithme/maps/isolines/IsolinesManager.cpp index 71835f3a82..836a0a7512 100644 --- a/android/jni/com/mapswithme/maps/isolines/IsolinesManager.cpp +++ b/android/jni/com/mapswithme/maps/isolines/IsolinesManager.cpp @@ -7,29 +7,30 @@ using namespace std::placeholders; extern "C" { -/*static void TransitSchemeStateChanged(TransitReadManager::TransitSchemeState state, - std::shared_ptr const & listener) +static void IsolinesStateChanged(IsolinesManager::IsolinesState state, + std::shared_ptr const & listener) { + LOG(LINFO, (static_cast(state))); JNIEnv * env = jni::GetEnv(); env->CallVoidMethod(*listener, - jni::GetMethodID(env, *listener, "onTransitStateChanged", "(I)V"), + jni::GetMethodID(env, *listener, "onStateChanged", "(I)V"), static_cast(state)); -}*/ +} JNIEXPORT void JNICALL Java_com_mapswithme_maps_maplayer_isolines_IsolinesManager_nativeAddListener(JNIEnv *env, jclass clazz, jobject listener) { CHECK(g_framework, ("Framework isn't created yet!")); -/* g_framework->SetIsolinesListener(std::bind(&TransitSchemeStateChanged, - std::placeholders::_1, - jni::make_global_ref(listener)));*/ + g_framework->SetIsolinesListener(std::bind(&IsolinesStateChanged, + std::placeholders::_1, + jni::make_global_ref(listener))); } JNIEXPORT void JNICALL Java_com_mapswithme_maps_maplayer_isolines_IsolinesManager_nativeRemoveListener(JNIEnv * env, jclass clazz) { CHECK(g_framework, ("Framework isn't created yet!")); -// g_framework->SetIsolinesListener(TransitReadManager::TransitStateChangedFn()); + g_framework->SetIsolinesListener(nullptr); } } diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj index ff315fed8a..06d1b04f50 100644 --- a/xcode/map/map.xcodeproj/project.pbxproj +++ b/xcode/map/map.xcodeproj/project.pbxproj @@ -222,6 +222,8 @@ BBA014AE2073C784007402E4 /* bookmark_helpers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BBA014AC2073C784007402E4 /* bookmark_helpers.hpp */; }; BBA014B120754997007402E4 /* user_mark_id_storage.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BBA014AF20754996007402E4 /* user_mark_id_storage.hpp */; }; BBA014B220754997007402E4 /* user_mark_id_storage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBA014B020754996007402E4 /* user_mark_id_storage.cpp */; }; + BBB7060B23E45F3400A7F29A /* isolines_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBB7060923E45F3300A7F29A /* isolines_manager.cpp */; }; + BBB7060C23E45F3400A7F29A /* isolines_manager.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BBB7060A23E45F3300A7F29A /* isolines_manager.hpp */; }; BBD9E2C61EE9D01900DF189A /* routing_mark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBD9E2C41EE9D01900DF189A /* routing_mark.cpp */; }; BBD9E2C71EE9D01900DF189A /* routing_mark.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BBD9E2C51EE9D01900DF189A /* routing_mark.hpp */; }; BBFC7E3A202D29C000531BE7 /* user_mark_layer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBFC7E38202D29BF00531BE7 /* user_mark_layer.cpp */; }; @@ -497,6 +499,8 @@ BBA014AC2073C784007402E4 /* bookmark_helpers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = bookmark_helpers.hpp; sourceTree = ""; }; BBA014AF20754996007402E4 /* user_mark_id_storage.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = user_mark_id_storage.hpp; sourceTree = ""; }; BBA014B020754996007402E4 /* user_mark_id_storage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = user_mark_id_storage.cpp; sourceTree = ""; }; + BBB7060923E45F3300A7F29A /* isolines_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = isolines_manager.cpp; sourceTree = ""; }; + BBB7060A23E45F3300A7F29A /* isolines_manager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = isolines_manager.hpp; sourceTree = ""; }; BBD9E2C41EE9D01900DF189A /* routing_mark.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = routing_mark.cpp; sourceTree = ""; }; BBD9E2C51EE9D01900DF189A /* routing_mark.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = routing_mark.hpp; sourceTree = ""; }; BBFC7E38202D29BF00531BE7 /* user_mark_layer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = user_mark_layer.cpp; sourceTree = ""; }; @@ -842,6 +846,8 @@ 675345BD1A4054AD00A0A8C3 /* map */ = { isa = PBXGroup; children = ( + BBB7060923E45F3300A7F29A /* isolines_manager.cpp */, + BBB7060A23E45F3300A7F29A /* isolines_manager.hpp */, 3D0D2F7123D854AA00945C8D /* tips_api_delegate.cpp */, 3D0D2F7223D854AA00945C8D /* tips_api_delegate.hpp */, 3DF528D4237DC82E000ED0D5 /* catalog_headers_provider.cpp */, @@ -997,6 +1003,7 @@ 3D4F44BB21345D270005E765 /* tips_api.hpp in Headers */, 675346A21A4054E800A0A8C3 /* user_mark.hpp in Headers */, 454649F21F2728CE00EF4064 /* local_ads_mark.hpp in Headers */, + BBB7060C23E45F3400A7F29A /* isolines_manager.hpp in Headers */, 39E3C60323312BA800FB0C37 /* features_fetcher.hpp in Headers */, BBA014AE2073C784007402E4 /* bookmark_helpers.hpp in Headers */, F6B283061C1B03320081957A /* gps_track_filter.hpp in Headers */, @@ -1215,6 +1222,7 @@ 3DA5714120B5CC80007BDE27 /* booking_availability_filter.cpp in Sources */, F6B283051C1B03320081957A /* gps_track_filter.cpp in Sources */, 675346481A4054E800A0A8C3 /* bookmark_manager.cpp in Sources */, + BBB7060B23E45F3400A7F29A /* isolines_manager.cpp in Sources */, 3D0D2F7323D854AA00945C8D /* tips_api_delegate.cpp in Sources */, 40ACC79923191C2600238E21 /* power_manager_tests.cpp in Sources */, 45F6EE9F1FB1C77600019892 /* search_api.cpp in Sources */,