From 2fe7ab32a44ebba2ae2ff10a5cb85f0078a845dd Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Tue, 30 Jun 2020 17:17:59 +0800 Subject: [PATCH 1/3] opt --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2fbf8224ec..727d3a90a7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -59,7 +59,7 @@ MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.2.1.9 ## 工程外部模块 # 探路 -MOGO_MODULE_TANLU_VERSION=1.2.1.5 +MOGO_MODULE_TANLU_VERSION=1.2.1.9 # 车聊聊 CARCHATTING_VERSION=1.2.0 # 车聊聊接口 @@ -77,7 +77,7 @@ MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 MOGO_MODULE_AD_CARD_VERSION=1.0.1 # 探路上报和分享模块 -TANLULIB_VERSION=1.2.1.7 +TANLULIB_VERSION=1.2.1.9 # Boost分包 From 47cb98e26db2b91335a4f8e8e52d1d2710bd5bd2 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 30 Jun 2020 17:25:56 +0800 Subject: [PATCH 2/3] opt --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2fbf8224ec..6a679e43ec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.48 +MOGO_MODULE_V2X_VERSION=1.1.49 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From c3562cb796ddd3e503cae1080b05f57cd5a77947 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Wed, 1 Jul 2020 11:20:38 +0800 Subject: [PATCH 3/3] opt --- .../com/mogo/module/service/MogoServices.java | 17 ++++++++++++++--- .../module/service/marker/MapMarkerManager.java | 1 - 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index 82ee63cc63..4db61bd822 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -465,7 +465,7 @@ public class MogoServices implements IMogoMapListener, } break; case MotionEvent.ACTION_UP: - restartAutoRefreshAtTime( ServiceConst.DEFAULT_AUTO_REFRESH_WHEN_INTERRUPT ); + restartAutoRefreshAtTime( ServiceConst.DEFAULT_AUTO_REFRESH_WHEN_INTERRUPT, false ); mThreadHandler.removeMessages( ServiceConst.MSG_LOCK_CAR ); mThreadHandler.sendEmptyMessageDelayed( ServiceConst.MSG_LOCK_CAR, ServiceConst.DEFAULT_AUTO_REFRESH_WHEN_INTERRUPT ); break; @@ -473,12 +473,19 @@ public class MogoServices implements IMogoMapListener, } private void stopAutoRefreshStrategy() { + stopAutoRefreshStrategy(true); + } + + private void stopAutoRefreshStrategy(boolean stopOnlineCarRefresh) { if ( DebugConfig.isDebug() ) { Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); } Logger.d( TAG, "stop auto refresh strategy" ); mHandler.removeMessages( ServiceConst.MSG_TYPE_REFRESH_DECREASE ); - MapMarkerManager.getInstance().stopAutoRefresh(); + if ( stopOnlineCarRefresh ) { + Logger.d( TAG, "stop online car auto refresh" ); + MapMarkerManager.getInstance().stopAutoRefresh(); + } } @Override @@ -740,11 +747,15 @@ public class MogoServices implements IMogoMapListener, } public void restartAutoRefreshAtTime( long time ) { + restartAutoRefreshAtTime( time, true ); + } + + private void restartAutoRefreshAtTime( long time, boolean stopOnlineCarRefresh ) { if ( time < 0 ) { Logger.w( TAG, "ignore refresh request case time < 0" ); return; } - stopAutoRefreshStrategy(); + stopAutoRefreshStrategy(stopOnlineCarRefresh); mRefreshRemainingTime = time; long delay = ServiceConst.DECREASE_INTERVAL; if ( mRefreshRemainingTime < ServiceConst.DECREASE_INTERVAL ) { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index 94145f945b..d762476e0c 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -829,7 +829,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, } } if ( points.size() >= 1 ) { - points.add( new MogoLatLng( markerLocation.getLat(), markerLocation.getLon() ) ); iMogoMarker.startSmooth( points, SMOOTH_DURATION ); } else { Logger.d( TAG, "静止小车，但是有相同的连续坐标" );