From c25782dc84b4803eefe9dccf67f3fa60f925a54c Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 28 Aug 2020 10:41:03 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BC=98=E5=8C=96=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E3=80=81=E6=9B=B4=E6=94=B9=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=92=8C=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E8=B6=85=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/launchercard/LauncherCardRefresher.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 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 7675cc9b51..a014376228 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 @@ -21,6 +21,7 @@ import com.mogo.module.service.network.RefreshModel; import com.mogo.module.service.network.ZhidaoRefreshModel; import com.mogo.module.service.network.bean.LauncherCardAdvertisementData; import com.mogo.utils.AppUtils; +import com.mogo.utils.NetworkUtils; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.RequestOptions; import com.mogo.utils.storage.SharedPrefsMgr; @@ -161,9 +162,13 @@ class LauncherCardRefresher { Logger.d( TAG, "start" ); mLaunchTTSText = mContext.getString( R.string.module_service_open_app_tip ); startExplorerWayStrategy(); - // 延时一分钟加载数据，已保证accOn之后网络恢复正常 - mHandler.sendEmptyMessageDelayed( MSG_START_REFRESH_ADVERTISEMENT, ONE_MINUTE ); mDefaultConfigCounter = 0; + // 延时加载数据，已保证accOn之后网络恢复正常 + long delay = ONE_MINUTE; + if ( NetworkUtils.isConnected( mContext ) ) { + delay = 0L; + } + mHandler.sendEmptyMessageDelayed( MSG_START_REFRESH_ADVERTISEMENT, delay ); } /** @@ -301,6 +306,7 @@ class LauncherCardRefresher { intent.putExtra( "v2x_card_button_name", mDefaultLauncherCardConfig.buttonContent ); intent.putExtra( "v2x_card_startTime", mDefaultLauncherCardConfig.startTime ); intent.putExtra( "v2x_card_endTime", mDefaultLauncherCardConfig.endTime ); + intent.putExtra( "v2x_card_is_default", true ); mContext.sendBroadcast( intent ); Logger.d( TAG, "发送默认配置广播到桌面卡片." ); if ( !TextUtils.isEmpty( mDefaultLauncherCardConfig.content ) ) { @@ -465,6 +471,8 @@ class LauncherCardRefresher { intent.putExtra( "v2x_card_button_name", advertisement.buttonContent ); intent.putExtra( "v2x_card_startTime", advertisement.startTime ); intent.putExtra( "v2x_card_endTime", advertisement.endTime ); + intent.putExtra( "v2x_card_timeout", 20 * 1000 ); + intent.putExtra( "v2x_card_is_default", false ); mContext.sendBroadcast( intent ); if ( !AppUtils.isAppForeground( mContext ) ) { speakTTS( advertisement.content, true );