Merge branch 'qa_byd' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_byd

modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java

@@ -190,23 +190,25 @@ public class MogoServices implements IMogoMapListener,
             }
         }
 
-        /**
+    };
-         * 自动刷新：锁车、缩放比例：16、半径 2KM
+
-         */
+    /**
-        private void invokeAutoRefresh() {
+     * 自动刷新：锁车、缩放比例：16、半径 2KM
-            if ( mStatusManager.isSearchUIShow() || mStatusManager.isV2XShow() ) {
+     */
-                mStatusManager.setUserInteractionStatus( TAG, true, false );
+    private void invokeAutoRefresh() {
-                mUiController.recoverLockMode();
+        if ( mStatusManager.isSearchUIShow() || mStatusManager.isV2XShow() ) {
-                return;
-            }
-            mStatusManager.setUserInteractionStatus( ServiceConst.TYPE, true, false );
-            mUiController.changeZoom( ServiceConst.DEFAULT_LOCK_CAR_ZOOM_LEVEL );
-            mUiController.setLockZoom( ServiceConst.DEFAULT_LOCK_CAR_ZOOM_LEVEL );
             mStatusManager.setUserInteractionStatus( TAG, true, false );
             mUiController.recoverLockMode();
-            notifyRefreshData( mLastAutoRefreshLocation, ServiceConst.DEFAULT_AUTO_REFRESH_DATA_RADIUS, mAutoRefreshCallback );
+            return;
         }
-    };
+        mStatusManager.setUserInteractionStatus( ServiceConst.TYPE, true, false );
+        mUiController.changeZoom( ServiceConst.DEFAULT_LOCK_CAR_ZOOM_LEVEL );
+        mUiController.setLockZoom( ServiceConst.DEFAULT_LOCK_CAR_ZOOM_LEVEL );
+        mStatusManager.setUserInteractionStatus( TAG, true, false );
+        mUiController.recoverLockMode();
+        notifyRefreshData( mLastAutoRefreshLocation, ServiceConst.DEFAULT_AUTO_REFRESH_DATA_RADIUS, mAutoRefreshCallback );
+    }
+
     private Context mContext;
 
     /**
@@ -783,7 +785,12 @@ public class MogoServices implements IMogoMapListener,
         if ( mRefreshRemainingTime < ServiceConst.DECREASE_INTERVAL ) {
             delay = mRefreshRemainingTime;
         }
-        mHandler.sendEmptyMessageDelayed( ServiceConst.MSG_TYPE_REFRESH_DECREASE, delay );
+        if ( time == 0 ) {
+            Logger.d( TAG, "立即刷新" );
+            invokeAutoRefresh();
+        } else {
+            mHandler.sendEmptyMessageDelayed( ServiceConst.MSG_TYPE_REFRESH_DECREASE, delay );
+        }
         Logger.i( TAG, "下次刷新时间：%ss后", mRefreshRemainingTime );
     }
 

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java

@@ -67,7 +67,7 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
         // 锁车
         V2XServiceManager.getMapUIController().recoverLockMode();
         // 开启主Launcher刷新
-        V2XServiceManager.getIMogoRefreshStrategyController().restartAutoRefreshAtTime(500);
+        V2XServiceManager.getIMogoRefreshStrategyController().restartAutoRefreshAtTime(0);
     }
 
     @Override