Merge branch 'dev' into dev_1.1.2

.idea/misc.xml

@@ -4,7 +4,7 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>

app/proguard-rules.pro

@@ -333,6 +333,14 @@
     <init>(java.lang.Throwable);
 }
 
+#-----Netty-----
+-keepattributes Signature,InnerClasses
+-keepclasseswithmembers class io.netty.** {
+    *;
+}
+-dontwarn io.netty.**
+-dontwarn sun.**
+
 #-----ZhiDaoService-----
 -keep class com.zhidao.auto.platform.**{*;}
 -keep class com.zhidao.auto.carcorder.**{*;}
@@ -340,6 +348,7 @@
 -keep class com.zhidao.boot.**{*;}
 -keep class com.elegant.**{*;}
 -keep class com.zhidao.socketsdk.**{*;}
+-keep class com.zhidao.socket.**{*;}
 -keep class com.zhidao.ptech.**{*;}
 -keep class com.zhidao.autopilotcore.**{*;}
 -keep class com.zhidao.autopilot.support.**{*;}

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() {
-            if ( mStatusManager.isSearchUIShow() || mStatusManager.isV2XShow() ) {
-                mStatusManager.setUserInteractionStatus( TAG, true, false );
-                mUiController.recoverLockMode();
-                return;
-            }
-            mStatusManager.setUserInteractionStatus( ServiceConst.TYPE, true, false );
-            mUiController.changeZoom( ServiceConst.DEFAULT_LOCK_CAR_ZOOM_LEVEL );
-            mUiController.setLockZoom( ServiceConst.DEFAULT_LOCK_CAR_ZOOM_LEVEL );
+    };
+
+    /**
+     * 自动刷新：锁车、缩放比例：16、半径 2KM
+     */
+    private void invokeAutoRefresh() {
+        if ( mStatusManager.isSearchUIShow() || mStatusManager.isV2XShow() ) {
             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