From a2569cf87675fd52b5aa5494aa69998caecdde67 Mon Sep 17 00:00:00 2001 From: juntao Date: Mon, 29 Mar 2021 10:39:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=83=A8=E5=88=86=204.7.4=20?= =?UTF-8?q?=E9=81=97=E7=95=99=E7=9A=84=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=92=8C=E6=95=B0=E7=BB=84=E8=B6=8A=E7=95=8C=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/common/util/NotificationHelper.kt | 18 +++++++++--------- .../java/com/gh/common/util/PackageUtils.java | 2 +- .../java/com/gh/gamecenter/MainActivity.java | 13 ++++++++----- .../home/video/ScrollCalculatorHelper.kt | 3 ++- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/NotificationHelper.kt b/app/src/main/java/com/gh/common/util/NotificationHelper.kt index 50ae7ec0d2..22a34e3717 100644 --- a/app/src/main/java/com/gh/common/util/NotificationHelper.kt +++ b/app/src/main/java/com/gh/common/util/NotificationHelper.kt @@ -58,7 +58,7 @@ object NotificationHelper { when (ugc) { NotificationUgc.LOGIN -> { if (!isShowedLogin) { - show(AppManager.getInstance().recentActiveActivity as AppCompatActivity, ugc, callBack) + show(AppManager.getInstance().recentActiveActivity as? AppCompatActivity, ugc, callBack) SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_LOGIN, true) // 设置今天的时间，表示今天已经触发过了 SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday()) @@ -68,7 +68,7 @@ object NotificationHelper { } NotificationUgc.QUESTION -> { if (!isShowedQuestion) { - show(AppManager.getInstance().recentActiveActivity as AppCompatActivity, ugc, callBack) + show(AppManager.getInstance().recentActiveActivity as? AppCompatActivity, ugc, callBack) SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_QUESTION, true) SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday()) } else { @@ -77,7 +77,7 @@ object NotificationHelper { } NotificationUgc.ANSWER -> { if (!isShowedAnswer) { - show(AppManager.getInstance().recentActiveActivity as AppCompatActivity, ugc, callBack) + show(AppManager.getInstance().recentActiveActivity as? AppCompatActivity, ugc, callBack) SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_ANSWER, true) SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday()) } else { @@ -86,7 +86,7 @@ object NotificationHelper { } NotificationUgc.ARTICLE -> { if (!isShowedArticle) { - show(AppManager.getInstance().recentActiveActivity as AppCompatActivity, ugc, callBack) + show(AppManager.getInstance().recentActiveActivity as? AppCompatActivity, ugc, callBack) SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_ARTICLE, true) SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday()) } else { @@ -95,7 +95,7 @@ object NotificationHelper { } NotificationUgc.VIDEO -> { if (!isShowedVideo) { - show(AppManager.getInstance().recentActiveActivity as AppCompatActivity, ugc, callBack) + show(AppManager.getInstance().recentActiveActivity as? AppCompatActivity, ugc, callBack) SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_VIDEO, true) SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday()) } else { @@ -104,7 +104,7 @@ object NotificationHelper { } NotificationUgc.RATING -> { if (!isShowedRating) { - show(AppManager.getInstance().recentActiveActivity as AppCompatActivity, ugc, callBack) + show(AppManager.getInstance().recentActiveActivity as? AppCompatActivity, ugc, callBack) SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_RATING, true) SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday()) } else { @@ -113,7 +113,7 @@ object NotificationHelper { } NotificationUgc.GIFT -> { if (!isShowedGift) { - show(AppManager.getInstance().recentActiveActivity as AppCompatActivity, ugc, callBack) + show(AppManager.getInstance().recentActiveActivity as? AppCompatActivity, ugc, callBack) SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_GIFT, true) SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday()) } else { @@ -122,7 +122,7 @@ object NotificationHelper { } NotificationUgc.RESERVE_GAME -> { if (!isShowedReserveGame) { - show(AppManager.getInstance().recentActiveActivity as AppCompatActivity, ugc, callBack) + show(AppManager.getInstance().recentActiveActivity as? AppCompatActivity, ugc, callBack) SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_RESERVE_GAME, true) SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday()) } else { @@ -131,7 +131,7 @@ object NotificationHelper { } NotificationUgc.FEEDBACK -> { if (!isShowedFeedback) { - show(AppManager.getInstance().recentActiveActivity as AppCompatActivity, ugc, callBack) + show(AppManager.getInstance().recentActiveActivity as? AppCompatActivity, ugc, callBack) SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_FEEDBACK, true) SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday()) } else { diff --git a/app/src/main/java/com/gh/common/util/PackageUtils.java b/app/src/main/java/com/gh/common/util/PackageUtils.java index 87d2f3de10..db0513272b 100644 --- a/app/src/main/java/com/gh/common/util/PackageUtils.java +++ b/app/src/main/java/com/gh/common/util/PackageUtils.java @@ -352,7 +352,7 @@ public class PackageUtils { ApkMeta apkMeta = apkParser.getApkMeta(); apkParser.close(); return apkMeta.getPackageName(); - } catch (Exception e) { + } catch (Throwable e) { e.printStackTrace(); return null; } diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 5227b351f2..b1ba23e8f8 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -173,7 +173,7 @@ public class MainActivity extends BaseActivity { super.onCreate(savedInstanceState); setStatusBarColor(Color.TRANSPARENT); - + if (!isFrescoInitialized()) { BigImageViewer.initialize(FrescoImageLoader.with(this)); } @@ -438,11 +438,14 @@ public class MainActivity extends BaseActivity { } private void hideAd(boolean forceToHide) { - if (forceToHide - || AdHelper.startupAd.getValue() == null) { + if (forceToHide || AdHelper.startupAd.getValue() == null) { showAd = false; getIntent().putExtra(SHOW_AD, false); - findViewById(R.id.maskContainer).setVisibility(View.GONE); + View view = findViewById(R.id.maskContainer); + + if (view != null) { + view.setVisibility(View.GONE); + } mMainWrapperFragment.getWelcomeDialog(); checkDialog(); @@ -950,7 +953,7 @@ public class MainActivity extends BaseActivity { Intent intent = MainActivity.getMainIntent(context); context.startActivity(intent); } - + /** * 虽然在 Application 里有使用子线程初始化但有可能出现初始化超时(卡住？)的情况， * 这里反射获取 sDraweecontrollerbuildersupplier 根据是否有值确定是否被初始化了 diff --git a/app/src/main/java/com/gh/gamecenter/home/video/ScrollCalculatorHelper.kt b/app/src/main/java/com/gh/gamecenter/home/video/ScrollCalculatorHelper.kt index 617ed3b4e3..faaa53f789 100644 --- a/app/src/main/java/com/gh/gamecenter/home/video/ScrollCalculatorHelper.kt +++ b/app/src/main/java/com/gh/gamecenter/home/video/ScrollCalculatorHelper.kt @@ -10,6 +10,7 @@ import com.gh.common.constant.Constants import com.gh.common.util.MD5Utils import com.gh.common.util.NetworkUtils import com.gh.common.util.SPUtils +import com.gh.common.util.safelyGetInRelease import com.gh.gamecenter.entity.SimpleVideoEntity import com.gh.gamecenter.home.HomeItemData import com.gh.gamecenter.video.detail.CustomManager @@ -53,7 +54,7 @@ class ScrollCalculatorHelper(private val playId: Int, private val rangeTop: Int) if (rect.top != 0 || rect.bottom != height) { //保存进度 val currentScheduler = currentPlayer?.currentPositionWhenPlaying?.toLong() ?: 0L - val topVideo = mHomeItemData?.get(currentPosition)?.attachGame?.linkGame?.topVideo + val topVideo = mHomeItemData?.safelyGetInRelease(currentPosition)?.attachGame?.linkGame?.topVideo if (topVideo != null) { savePlaySchedule(MD5Utils.getContentMD5(topVideo.url), currentScheduler) }