opt

modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java

@@ -119,7 +119,7 @@ class LauncherCardRefresher {
                     loadNetworkConfigStrategy();
                     break;
                 case MSG_REFRESH_DEFAULT_CARD:
-                    renderDefaultLauncherCardConfig();
+                    renderDefaultLauncherCardConfig( false );
                     mRefreshStrategy = mRefreshStrategy.getNext();
                     restart();
                     break;
@@ -134,7 +134,7 @@ class LauncherCardRefresher {
                     }
                     break;
                 case MSG_START_LOOP_DEFAULT_CARD:
-                    renderDefaultLauncherCardConfig();
+                    renderDefaultLauncherCardConfig( false );
                     break;
                 case MSG_REFRESH_ADVERTISEMENT:
                     int index = msg.arg1;// 当前广告索引
@@ -149,17 +149,17 @@ class LauncherCardRefresher {
     private boolean mStart = false;
     private RefreshModel mRefreshModel;
     private ZhidaoRefreshModel mZhidaoRefreshModel;
-    private LauncherCardRefreshStrategy mRefreshStrategy = new LauncherCardRefreshStrategy(
-            2 * ONE_MINUTE,
-            new LauncherCardRefreshStrategy(
-                    3 * ONE_MINUTE,
-                    new LauncherCardRefreshStrategy(
-                            20 * ONE_MINUTE,
-                            null,
-                            MSG_EXPLORER_WAY_OR_ONLINE_CAR_DATA ),
-                    MSG_INDUCE ),
-            MSG_REFRESH_DEFAULT_CARD
+
+    private LauncherCardRefreshStrategy mExplorerWayOrOnlineCarDataStrategy = new LauncherCardRefreshStrategy(
+            20 * ONE_MINUTE,null, MSG_EXPLORER_WAY_OR_ONLINE_CAR_DATA
     );
+    private LauncherCardRefreshStrategy mInduceStrategy = new LauncherCardRefreshStrategy(
+            3 * ONE_MINUTE,mExplorerWayOrOnlineCarDataStrategy, MSG_INDUCE
+    );
+    private LauncherCardRefreshStrategy mLauncherCardConfigStrategy = new LauncherCardRefreshStrategy(
+            2 * ONE_MINUTE,mInduceStrategy, MSG_REFRESH_DEFAULT_CARD
+    );
+    private LauncherCardRefreshStrategy mRefreshStrategy = mLauncherCardConfigStrategy;
 
     public void start() {
         if ( DebugConfig.isLauncher() || DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_BYD ) {
@@ -172,6 +172,7 @@ class LauncherCardRefresher {
         mLaunchTTSText = mContext.getString( R.string.module_service_open_app_tip );
         mDefaultConfigCounter = 0;
         mRefreshTicketCounter = 0;
+        mRefreshStrategy = mLauncherCardConfigStrategy;
         // 延时加载数据，已保证accOn之后网络恢复正常
         long delay = ONE_MINUTE;
         if ( NetworkUtils.isConnected( mContext ) ) {
@@ -327,8 +328,10 @@ class LauncherCardRefresher {
      * 1. 刷新默认卡片样式
      * <p>
      * 2. 播报默认卡片语音
+     *
+     * @param sendConfigOnly 仅发送配置到
      */
-    private void renderDefaultLauncherCardConfig() {
+    private void renderDefaultLauncherCardConfig( boolean sendConfigOnly ) {
         if ( mDefaultLauncherCardConfig != null ) {
             long curr = System.currentTimeMillis();
             if ( mDefaultLauncherCardConfig.endTime > curr && mDefaultLauncherCardConfig.startTime < curr ) {
@@ -351,6 +354,10 @@ class LauncherCardRefresher {
             }
         }
 
+        if ( sendConfigOnly ) {
+            return;
+        }
+
         if ( mDefaultConfigCounter++ >= 3 ) {
             return;
         }
@@ -454,6 +461,7 @@ class LauncherCardRefresher {
             }
             if ( launcherCardAdvertisement.cardType == LauncherCardAdvertisementData.TYPE_DEFAULT_CONFIG ) {
                 mDefaultLauncherCardConfig = launcherCardAdvertisement;
+                renderDefaultLauncherCardConfig( true );
             } else if ( launcherCardAdvertisement.cardType == LauncherCardAdvertisementData.TYPE_ACTIVITY ) {
                 long curr = System.currentTimeMillis();
                 if ( curr > launcherCardAdvertisement.startTime && curr < launcherCardAdvertisement.endTime ) {
@@ -468,7 +476,7 @@ class LauncherCardRefresher {
             LauncherCardAdvertisementData.LauncherCardAdvertisement[] sorted = new LauncherCardAdvertisementData.LauncherCardAdvertisement[mAdvertisements.size()];
             sorted = mAdvertisements.toArray( sorted );
             Arrays.sort( sorted, ( ( o1, o2 ) -> {
-                return o1.sort < o2.sort ? 1 : ( o1.sort == o2.sort ? 0 : -1 );
+                return o1.sort > o2.sort ? 1 : ( o1.sort == o2.sort ? 0 : -1 );
             } ) );
             mAdvertisements = Arrays.asList( sorted );
         }

modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java

@@ -14,6 +14,7 @@ import com.mogo.map.marker.IMogoMarkerClickListener;
 import com.mogo.map.marker.IMogoMarkerManager;
 import com.mogo.map.marker.MogoMarkerOptions;
 import com.mogo.map.marker.anim.OnMarkerAnimationListener;
+import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.module.common.ModuleNames;
 import com.mogo.module.common.entity.MarkerCarPois;
 import com.mogo.module.common.entity.MarkerCardResult;
@@ -32,6 +33,7 @@ import com.mogo.module.service.Utils;
 import com.mogo.module.service.network.RefreshCallback;
 import com.mogo.module.service.network.RefreshModel;
 import com.mogo.module.service.utils.ViewUtils;
+import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
 import com.mogo.service.connection.IMogoOnMessageListener;
 import com.mogo.service.module.IMogoBizActionDoneListener;
 import com.mogo.utils.ResourcesHelper;
@@ -58,7 +60,8 @@ import java.util.Map;
  */
 public class MapMarkerManager implements IMogoMarkerClickListener,
         IMogoOnMessageListener< MarkerResponse >,
-        IMogoBizActionDoneListener {
+        IMogoBizActionDoneListener,
+        IMogoADASControlStatusChangedListener {
     private static final String TAG = "MapMarkerManager";
 
     private Context mContext;
@@ -108,6 +111,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
         // 长连接
         MarkerServiceHandler.getMogoSocketManager().registerOnMessageListener( 401001, this );
         MarkerServiceHandler.getActionManager().registerBizActionDoneListener( this );
+        MarkerServiceHandler.getApis().getRegisterCenterApi().registerADASControlStatusChangedListener( TAG, this );
     }
 
     // ACC ON 的时候重置为true，ACC OFF 设置为 false
@@ -949,4 +953,21 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
             }
         }
     }
+
+    @Override
+    public void onMapUiModeChanged( EnumMapUI mapUI ) {
+        switch ( mapUI ) {
+            case Type_Light:
+            case Type_Night:
+                if ( !MarkerServiceHandler.getApis().getStatusManagerApi().isMainPageOnResume() ) {
+                    return;
+                }
+                if ( mLastDataResult != null ) {
+                    MarkerServiceHandler.getMarkerManager().removeMarkers( ModuleNames.CARD_TYPE_ROAD_CONDITION );
+                    drawMarkerByCurrentType( mLastDataResult );
+                    mLastCheckMarker = null;
+                }
+                break;
+        }
+    }
 }