From 9cb874c0f2828ebfcc3e3f3823db820313de5571 Mon Sep 17 00:00:00 2001 From: Leith Bade Date: Sun, 9 Nov 2014 17:19:11 +1100 Subject: [PATCH] Reduce log noise --- android/cpp/NativeMapView.cpp | 2 +- android/cpp/log.h | 11 +++++++++-- .../main/java/com/mapbox/mapboxgl/lib/MapView.java | 5 ++--- .../java/com/mapbox/mapboxgl/lib/NativeMapView.java | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/android/cpp/NativeMapView.cpp b/android/cpp/NativeMapView.cpp index ebed4c0d1..394e01bdb 100644 --- a/android/cpp/NativeMapView.cpp +++ b/android/cpp/NativeMapView.cpp @@ -537,6 +537,7 @@ void NativeMapView::notifyMapChange() { NULL }; + // TODO do this only once per thread? jint ret; JNIEnv* env = nullptr; bool detach = false; @@ -553,7 +554,6 @@ void NativeMapView::notifyMapChange() { } } - env->CallVoidMethod(obj, on_map_changed_id); if (env->ExceptionCheck()) { env->ExceptionDescribe(); diff --git a/android/cpp/log.h b/android/cpp/log.h index aa1950843..3cf203853 100644 --- a/android/cpp/log.h +++ b/android/cpp/log.h @@ -7,12 +7,19 @@ #define S_(x) S(x) #define S__LINE__ S_(__LINE__) +#ifdef DEBUG #define LOG_VERBOSE(fmt, args...) __android_log_print(ANDROID_LOG_VERBOSE, __FILE__ ":" S__LINE__, fmt, ##args) #define LOG_DEBUG(fmt, args...) __android_log_print(ANDROID_LOG_DEBUG, __FILE__ ":" S__LINE__, fmt, ##args) +#define LOG_ASSERT(cond, ...) ((cond)?(void)0:__android_log_assert(#cond, __FILE__ ":" S__LINE__, NULL)) +#define LOG_ASSERTMSG(cond, fmt, args...) ((cond)?(void)0:__android_log_assert(#cond, __FILE__ ":" S__LINE__, fmt, ##args)) +#else +#define LOG_VERBOSE(fmt, args...) +#define LOG_DEBUG(fmt, args...) +#define LOG_ASSERT(cond, ...) +#define LOG_ASSERTMSG(cond, fmt, args...) +#endif #define LOG_INFO(fmt, args...) __android_log_print(ANDROID_LOG_INFO, __FILE__ ":" S__LINE__, fmt, ##args) #define LOG_WARN(fmt, args...) __android_log_print(ANDROID_LOG_WARN, __FILE__ ":" S__LINE__, fmt, ##args) #define LOG_ERROR(fmt, args...) __android_log_print(ANDROID_LOG_ERROR, __FILE__ ":" S__LINE__, fmt, ##args) -#define LOG_ASSERT(cond, ...) ((cond)?(void)0:__android_log_assert(#cond, __FILE__ ":" S__LINE__, NULL)) -#define LOG_ASSERTMSG(cond, fmt, args...) ((cond)?(void)0:__android_log_assert(#cond, __FILE__ ":" S__LINE__, fmt, ##args)) #endif // LOG_H diff --git a/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java b/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java index 3c1910758..e9e815ded 100644 --- a/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java +++ b/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java @@ -29,7 +29,6 @@ import com.arieslabs.assetbridge.Assetbridge; // Custom view that shows a Map // Based on SurfaceView as we use OpenGL ES to render public class MapView extends SurfaceView { - // TODO try TextureView // // Static members @@ -112,7 +111,7 @@ public class MapView extends SurfaceView { // Check if we are in Eclipse UI editor if (isInEditMode()) { - // TODO editor does not load properly because + // TODO editor does not load properly because we dont implement this return; } @@ -1142,7 +1141,7 @@ public class MapView extends SurfaceView { // Called via JNI from NativeMapView // Need to update anything that relies on map state protected void onMapChanged() { - Log.v(TAG, "onMapChanged"); + //Log.v(TAG, "onMapChanged"); if (mOnMapChangedListener != null) { mOnMapChangedListener.onMapChanged(); } diff --git a/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java b/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java index 56578eeb2..01ee430df 100644 --- a/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java +++ b/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java @@ -384,7 +384,7 @@ class NativeMapView { // protected void onMapChanged() { - Log.v(TAG, "onMapChanged"); + //Log.v(TAG, "onMapChanged"); mMapView.onMapChanged(); }