版本更新到 4.9.4

Hotfix v4.9.3 333 crash

See merge request halo/android/assistant-android!111

app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt

@@ -42,6 +42,7 @@ import org.greenrobot.eventbus.ThreadMode
 /**
  * 包名检测弹窗
  */
+// TODO 将 gameEntity 放到 argument 里再取出，避免重建时为空
 class PackageCheckDialogFragment : BaseDialogFragment() {
 
     private lateinit var binding: FragmentPackageCheckBinding
@@ -73,7 +74,9 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         EventBus.getDefault().register(this)
-        LogUtils.uploadPackageCheck("pkg_check_pop_click", "出现弹窗", gameEntity, "", "", "", "")
+        gameEntity?.let {
+            LogUtils.uploadPackageCheck("pkg_check_pop_click", "出现弹窗", it, "", "", "", "")
+        }
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {

app/src/main/java/com/gh/common/util/Extensions.kt

@@ -489,8 +489,8 @@ fun Float.sp2px(): Int {
     return (this * scale + 0.5f).toInt()
 }
 
-fun Float.roundTo(n : Int) : Float {
-    return "%.${n}f".format(this).toFloat()
+fun Float.roundTo(n: Int): Float {
+    return "%.${n}f".format(Locale.CHINA, this).toFloat()
 }
 
 /**

app/src/main/java/com/gh/common/util/HomePluggableHelper.kt

@@ -24,17 +24,24 @@ object HomePluggableHelper {
         val apkList = gameEntity.getApk()
         if (apkList.isNotEmpty()) {
             val apk = apkList.first()
-            val filterData = mHomePluggableFilterDao.getDataByPkgName(apk.packageName)
-            if (filterData?.active == true) {
-                val filterTag = filterData.tag
-                return filterTag != "never" && apk.version != filterTag
+            tryCatchInRelease {
+                val filterData = mHomePluggableFilterDao.getDataByPkgName(apk.packageName)
+                if (filterData?.active == true) {
+                    val filterTag = filterData.tag
+                    return filterTag != "never" && apk.version != filterTag
+                }
             }
         }
         return true
     }
 
     @JvmStatic
-    fun getPermanentInactivePluggablePackage() = mHomePluggableFilterDao.getDataByTag("never")
+    fun getPermanentInactivePluggablePackage(): List<HomePluggableFilterEntity>? {
+        tryCatchInRelease {
+            return mHomePluggableFilterDao.getDataByTag("never")
+        }
+        return emptyList()
+    }
 
     @JvmStatic
     fun activationFilterData() {

app/src/main/java/com/gh/common/util/ImageUtils.kt

@@ -484,4 +484,22 @@ object ImageUtils {
     fun getVideoSnapshot(videoUrl: String, progress: Long): String {
         return "$videoUrl?x-oss-process=video/snapshot,t_$progress,f_jpg,w_0,h_0"
     }
+
+    /**
+     * 虽然在 Application 里有使用子线程初始化但有可能出现初始化超时(卡住？)的情况，
+     * 这里反射获取 sDraweecontrollerbuildersupplier 根据是否有值确定是否被初始化了
+     */
+    @JvmStatic
+    fun isFrescoInitialized(): Boolean {
+        val clazz = SimpleDraweeView::class.java
+        return try {
+            val field =
+                clazz.getDeclaredField("sDraweecontrollerbuildersupplier")
+            field.isAccessible = true
+            val obj = field[SimpleDraweeView::class.java]
+            obj != null
+        } catch (ignore: java.lang.Exception) {
+            false
+        }
+    }
 }

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();

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) {

app/src/main/java/com/gh/common/xapk/XapkInstaller.kt

@@ -121,9 +121,14 @@ object XapkInstaller : IXapkUnzipListener {
             DownloadManager.getInstance(mContext).updateDownloadEntity(downloadEntity)
         }
 
-        SentryHelper.onEvent("XAPK_UNZIP_ERROR",
+        // 仅官网渠道上报 XAPK 异常信息
+        if (HaloApp.getInstance().channel == "GH_206") {
+            SentryHelper.onEvent(
+                "XAPK_UNZIP_ERROR",
                 "gameName", downloadEntity.name,
-                "errorDigest", exception.localizedMessage)
+                "errorDigest", exception.localizedMessage
+            )
+        }
 
         debugOnly {
             Utils.log("unzip", "onFailure->$exception")

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;
 

app/src/main/java/com/gh/gamecenter/MainActivity.java

@@ -52,6 +52,7 @@ import com.gh.common.util.ErrorHelper;
 import com.gh.common.util.ExtensionsKt;
 import com.gh.common.util.GsonUtils;
 import com.gh.common.util.HomePluggableHelper;
+import com.gh.common.util.ImageUtils;
 import com.gh.common.util.LogUtils;
 import com.gh.common.util.LunchType;
 import com.gh.common.util.MtaHelper;
@@ -176,7 +177,7 @@ public class MainActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         setStatusBarColor(Color.TRANSPARENT);
 
-        if (!isFrescoInitialized()) {
+        if (!ImageUtils.isFrescoInitialized()) {
             BigImageViewer.initialize(FrescoImageLoader.with(this));
         }
 
@@ -966,19 +967,4 @@ public class MainActivity extends BaseActivity {
         context.startActivity(intent);
     }
 
-    /**
-     * 虽然在 Application 里有使用子线程初始化但有可能出现初始化超时(卡住？)的情况，
-     * 这里反射获取 sDraweecontrollerbuildersupplier 根据是否有值确定是否被初始化了
-     */
-    public boolean isFrescoInitialized() {
-        Class<SimpleDraweeView> clazz = SimpleDraweeView.class;
-        try {
-            Field field = clazz.getDeclaredField("sDraweecontrollerbuildersupplier");
-            field.setAccessible(true);
-            Object object = field.get(SimpleDraweeView.class);
-            return object != null;
-        } catch (Exception ignore) {
-            return false;
-        }
-    }
 }

app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLatestServiceAdapter.kt

@@ -1,11 +1,15 @@
 package com.gh.gamecenter.gamedetail.desc
 
 import android.content.Context
-import android.view.*
+import android.view.Gravity
+import android.view.LayoutInflater
 import android.view.View.MeasureSpec
+import android.view.ViewGroup
+import android.view.ViewTreeObserver
 import androidx.databinding.DataBindingUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.gh.common.util.TimeUtils
+import com.gh.common.util.safelyGetInRelease
 import com.gh.gamecenter.R
 import com.gh.gamecenter.databinding.ItemGameDetailLatestServiceBinding
 import com.gh.gamecenter.databinding.ItemGameDetailMoreBinding
@@ -79,7 +83,10 @@ class GameLatestServiceAdapter(val context: Context, val datas: ArrayList<Server
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         if (holder is GameLatestServiceViewHolder) {
-            val entity = if (mIsExpand) mExpandEntities[position] else mShrinkEntities[position]
+            // TODO 这里会数组越界，需要检查原因
+            val entity = (if (mIsExpand) mExpandEntities.safelyGetInRelease(position) else mShrinkEntities.safelyGetInRelease(position))
+                ?: return
+
             holder.binding.timeTv.text = TimeUtils.getFormatDate(entity.getTime())
             holder.binding.serviceNameTv.text = "${entity.getNote()} ${entity.remark}"
 

app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt

@@ -125,7 +125,9 @@ class SubjectListFragment : LazyListFragment<GameEntity, SubjectListViewModel>()
 
     // 与外部Appbar交互
     override fun onTitleClick() {
-        if (mLayoutManager.findFirstCompletelyVisibleItemPosition() == 0 || provideListAdapter().itemCount == 0) {
+        if (mLayoutManager == null
+            || mLayoutManager.findFirstCompletelyVisibleItemPosition() == 0
+            || provideListAdapter().itemCount == 0) {
             // do nothing
         } else {
             mLayoutManager.scrollToPosition(0)

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 {

app/src/main/java/com/halo/assistant/HaloApp.java

@@ -27,6 +27,7 @@ import com.gh.common.util.DeviceUtils;
 import com.gh.common.util.DownloadNotificationHelper;
 import com.gh.common.util.DownloadObserver;
 import com.gh.common.util.HomeBottomBarHelper;
+import com.gh.common.util.ImageUtils;
 import com.gh.common.util.PackageHelper;
 import com.gh.common.util.PackageUtils;
 import com.gh.common.util.SPUtils;
@@ -141,8 +142,10 @@ public class HaloApp extends MultiDexApplication {
             initDataHelper();
             Tracker.init(this);
 
-            //初始化Fresco(BigImageViewer 已包含Fresco)
-            BigImageViewer.initialize(FrescoImageLoader.with(this));
+            // 初始化 Fresco(BigImageViewer 已包含Fresco)
+            if (!ImageUtils.isFrescoInitialized()) {
+                BigImageViewer.initialize(FrescoImageLoader.with(this));
+            }
 
             deviceRamSize = DeviceUtils.getTotalRamSizeOfDevice(this);
 

channel.txt

@@ -1,191 +1,2 @@
 GH_TEST
-GH_TEST2
-GH_REFRESH
-GH_100
-GH_101
-GH_102
-GH_103
-GH_104
-GH_106
-GH_107
-GH_108
-GH_109
-GH_110
-GH_111
-GH_113
-GH_114
-GH_115
-GH_116
-GH_117
-GH_118
-GH_119
-GH_120
-GH_121
-GH_123
-GH_127
-GH_200
-GH_201
-GH_202
-GH_203
-GH_204
-GH_205
-GH_206
-GH_222
-GH_307
-GH_333
-GH_600
-GH_601
-GH_602
-GH_603
-GH_604
-GH_605
-GH_606
-GH_607
-GH_608
-GH_609
-GH_610
-GH_611
-GH_612
-GH_613
-GH_614
-GH_615
-GH_616
-GH_617
-GH_618
-GH_619
-GH_620
-GH_621
-GH_622
-GH_623
-GH_624
-GH_625
-GH_626
-GH_627
-GH_628
-GH_629
-GH_630
-GH_631
-GH_632
-GH_633
-GH_634
-GH_635
-GH_636
-GH_637
-GH_638
-GH_639
-GH_640
-GH_641
-GH_642
-GH_643
-GH_644
-GH_645
-GH_646
-GH_647
-GH_648
-GH_649
-GH_650
-GH_651
-GH_652
-GH_653
-GH_654
-GH_655
-GH_656
-GH_657
-GH_658
-GH_659
-GH_660
-GH_661
-GH_662
-GH_663
-GH_664
-GH_665
-GH_666
-GH_667
-GH_667
-GH_668
-GH_669
-GH_670
-GH_671
-GH_672
-GH_673
-GH_674
-GH_675
-GH_676
-GH_677
-GH_678
-GH_679
-GH_680
-GH_681
-GH_682
-GH_683
-GH_684
-GH_685
-GH_686
-GH_687
-GH_688
-GH_689
-GH_690
-GH_691
-GH_692
-GH_693
-GH_694
-GH_695
-GH_696
-GH_697
-GH_698
-GH_699
-GH_700
-GH_701
-GH_702
-GH_703
-GH_704
-GH_705
-GH_706
-GH_707
-GH_708
-GH_709
-GH_710
-GH_711
-GH_712
-GH_713
-GH_714
-GH_715
-GH_716
-GH_717
-GH_718
-GH_719
-GH_720
-GH_721
-GH_722
-GH_723
-GH_724
-GH_725
-GH_726
-GH_727
-GH_728
-GH_729
-GH_730
-GH_731
-GH_732
-GH_733
-GH_734
-GH_735
-GH_736
-GH_737
-GH_738
-GH_739
-GH_740
-GH_741
-GH_742
-GH_743
-GH_744
-GH_745
-GH_746
-GH_747
-GH_748
-GH_749
-GH_750
-GH_777
-GH_787
-GH_888
-GH_999
+GH_TEST2

dependencies.gradle

@@ -7,8 +7,8 @@ ext {
     targetSdkVersion = 26
 
     // application info (每个大版本之间的 versionCode 增加 20)
-    versionCode = 331
-    versionName = "4.9.1"
+    versionCode = 334
+    versionName = "4.9.4"
     applicationId = "com.gh.gamecenter"
 
     // AndroidX