From 6cc954343b253bf5bc236cf90be5bb5474a4e2ca Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Mon, 31 Aug 2020 16:12:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE=E6=8B=89?=
 =?UTF-8?q?=E5=88=B0=E6=95=B0=E6=8D=AE=E5=B0=B1=E7=AB=8B=E5=88=BB=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E5=88=B0=E6=A1=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../launchercard/LauncherCardRefresher.java   | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 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 189e9d6735..ac24e684db 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
@@ -67,7 +67,7 @@ class LauncherCardRefresher {
     public static final long ONE_MINUTE = 60 * 1000L;
     public static final long ONE_DAY = 24 * 60 * ONE_MINUTE;
     private String mLaunchTTSText;
-    private long mDefaultTTSPlayInterval = 30 * ONE_MINUTE;
+    private long mDefaultTTSPlayInterval = 3 * ONE_MINUTE;
     private LauncherCardAdvertisementData.LauncherCardAdvertisement mDefaultLauncherCardConfig;
     private List< LauncherCardAdvertisementData.LauncherCardAdvertisement > mAdvertisements;
 
@@ -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;// 当前广告索引
@@ -154,7 +154,7 @@ class LauncherCardRefresher {
             new LauncherCardRefreshStrategy(
                     3 * ONE_MINUTE,
                     new LauncherCardRefreshStrategy(
-                            20 * ONE_MINUTE,
+                            5 * ONE_MINUTE,
                             null,
                             MSG_EXPLORER_WAY_OR_ONLINE_CAR_DATA ),
                     MSG_INDUCE ),
@@ -327,8 +327,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 +353,10 @@ class LauncherCardRefresher {
             }
         }
 
+        if ( sendConfigOnly ) {
+            return;
+        }
+
         if ( mDefaultConfigCounter++ >= 3 ) {
             return;
         }
@@ -358,7 +364,7 @@ class LauncherCardRefresher {
         int counter = SharedPrefsMgr.getInstance( mContext ).getInt( KEY_LauncherCardTipCounter, 0 );
         if ( counter >= 5 ) {
             long lastTipTime = SharedPrefsMgr.getInstance( mContext ).getLong( KEY_LauncherCardTipLastTipTime, 0L );
-            if ( System.currentTimeMillis() - lastTipTime < 10 * ONE_DAY ) {
+            if ( System.currentTimeMillis() - lastTipTime < 10 * ONE_MINUTE ) {
                 return;
             } else {
                 SharedPrefsMgr.getInstance( mContext ).putInt( KEY_LauncherCardTipCounter, 0 );
@@ -454,6 +460,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 ) {