From dfee45602bb7ad5e8ee4ef703b5631d5dc85aad8 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Mon, 31 Aug 2020 16:44:25 +0800
Subject: [PATCH] rlgl - 4

---
 .../launchercard/LauncherCardRefresher.java   | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
index ac24e684db..7d5e67b617 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
@@ -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(
-                            5 * ONE_MINUTE,
-                            null,
-                            MSG_EXPLORER_WAY_OR_ONLINE_CAR_DATA ),
-                    MSG_INDUCE ),
-            MSG_REFRESH_DEFAULT_CARD
+
+    private LauncherCardRefreshStrategy mExplorerWayOrOnlineCarDataStrategy = new LauncherCardRefreshStrategy(
+            5 * 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 ) ) {
@@ -475,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 );
         }