版本更新到 4.9.4

Merge branch 'hotfix-v4.9.3-333-crash' into 'release'
Hotfix v4.9.3 333 crash See merge request halo/android/assistant-android!111
2021-05-28 10:28:06 +08:00 · 2021-05-28 10:26:50 +08:00 · 2021-05-28 10:26:50 +08:00
5 changed files with 18 additions and 9 deletions
--- a/app/src/main/java/com/gh/common/util/LogUtils.java
+++ b/app/src/main/java/com/gh/common/util/LogUtils.java
@ -956,6 +956,8 @@ public class LogUtils {
    }

    public static void uploadPackageCheck(String event, String action, GameEntity gameEntity, String linkTitle, String linkDesc, String downloadGameId, String downloadGameName) {
+        if (gameEntity == null) return;
+
        PackageDialogEntity packageDialog = gameEntity.getPackageDialog();
        if (packageDialog == null) return;
        JSONObject object = new JSONObject();
--- a/app/src/main/java/com/gh/common/util/QuickLoginHelper.kt
+++ b/app/src/main/java/com/gh/common/util/QuickLoginHelper.kt
@ -274,7 +274,9 @@ object QuickLoginHelper {

    private fun startCodeLoginPage(context: Context, entrance: String, isFinishAuth: Boolean, isFromPermission: Boolean) {
        if (mPreDialog != null && mPreDialog!!.isShowing) {
-            mPreDialog?.dismiss()
+            tryWithDefaultCatch {
+                mPreDialog?.dismiss()
+            }
        }

        if (isFinishAuth) {
--- a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java
@ -196,7 +196,9 @@ public class LibaoDetailActivity extends ToolBarActivity implements LibaoDetailA
        setNavigationTitle(mName);
        mLibaoEntity = (LibaoEntity) HaloApp.get(LibaoEntity.TAG, false);
        isClickReceiveBtnIn = getIntent().getBooleanExtra(EntranceUtils.KEY_IS_CLICK_RECEIVE_BTN, false);
-        mLibaoEntity.setClickReceiveBtnIn(isClickReceiveBtnIn);
+        if (mLibaoEntity != null) {
+            mLibaoEntity.setClickReceiveBtnIn(isClickReceiveBtnIn);
+        }

        mIsScroll = true;

--- a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt
@ -16,7 +16,6 @@ import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.OrientationHelper
 import androidx.recyclerview.widget.RecyclerView
 import com.gh.base.fragment.BaseLazyFragment
-import com.gh.common.constant.Constants
 import com.gh.common.exposure.ExposureListener
 import com.gh.common.util.*
 import com.gh.common.videolog.VideoRecordUtils
@ -558,10 +557,14 @@ class VideoDetailContainerFragment : BaseLazyFragment(), OnBackPressedListener {
    }

    fun findVisibleVideoViewByPosition(): DetailPlayerView? {
-        val pos = findVisibleItemPosition()
-        val holder = mBinding.recyclerview?.findViewHolderForAdapterPosition(pos)
-
-        return holder?.itemView as? DetailPlayerView
+        // 页面被销毁重建时，旧 fragment 可能会收到 onActivityResult 的 callback ，这时 mBinding 为未初始化状态
+        return if (::mBinding.isInitialized) {
+            val pos = findVisibleItemPosition()
+            val holder = mBinding.recyclerview?.findViewHolderForAdapterPosition(pos)
+            holder?.itemView as? DetailPlayerView
+        } else {
+            null
+        }
    }

    private fun findVisibleItemPosition(): Int {
--- a/dependencies.gradle
+++ b/dependencies.gradle
@ -7,8 +7,8 @@ ext {
    targetSdkVersion = 26

    // application info (每个大版本之间的 versionCode 增加 20)
-    versionCode = 333
-    versionName = "4.9.3"
+    versionCode = 334
+    versionName = "4.9.4"
    applicationId = "com.gh.gamecenter"

    // AndroidX
Author	SHA1	Message	Date
juntao	85d3412fd8	版本更新到 4.9.4	2021-05-28 10:28:06 +08:00
juntao	71b8cbbef3	Merge branch 'hotfix-v4.9.3-333-crash' into 'release' Hotfix v4.9.3 333 crash See merge request halo/android/assistant-android!111	2021-05-28 10:26:50 +08:00
juntao	dfc0183a14	1. 处理包名检测弹窗上报日志的空指针闪退问题 2. 捕抓评论列表一键登录可能触发的闪退问题 3. 修复礼包详情页重建时的闪退问题 4. 修复视频流评论页页面重建时的闪退问题	2021-05-28 10:26:50 +08:00