chore: 版本更新至 5.19.4

feat: 添加新的 download header 供后端接口使用

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

app/src/main/java/com/gh/download/DownloadManager.java

@@ -1265,7 +1265,8 @@ public class DownloadManager implements DownloadStatusListener {
      */
     public static void updateDownloadMetaMap() {
         String isOverwrite;
-        if (LunchType.UPDATE.name().equals(SPUtils.getString(Constants.SP_INSTALL_TYPE))) {
+        String installType = SPUtils.getString(Constants.SP_INSTALL_TYPE);
+        if (LunchType.UPDATE.name().equals(installType)) {
             isOverwrite = "true";
         } else {
             isOverwrite = "false";
@@ -1280,6 +1281,7 @@ public class DownloadManager implements DownloadStatusListener {
         map.put(HttpDnsManager.IMEI, MetaUtil.getBase64EncodedIMEI());
         map.put(HttpDnsManager.TOKEN, UserManager.getInstance().getToken());
         map.put(HttpDnsManager.IS_OVERWRITE, isOverwrite);
+        map.put(HttpDnsManager.INSTALL_TYPE, installType);
 
         HttpDnsManager.metaMap = map;
     }

app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt

@@ -408,7 +408,7 @@ class GameDetailFragment : ToolbarFragment(), IScrollable {
         savedInstanceState?.let { mDestinationTab = it.getInt(LAST_SELECTED_POSITION) }
         mBinding.reuseNoneData.reuseNoneDataTv.text = "页面不见了"
         mBodyBinding.gamedetailVp.setScrollable(true)
-        mBodyBinding.gamedetailVp.offscreenPageLimit = 3
+        mBodyBinding.gamedetailVp.offscreenPageLimit = 5
 
         mMaxWidth = resources.displayMetrics.widthPixels - DisplayUtils.dip2px(40f)
 
@@ -939,7 +939,7 @@ class GameDetailFragment : ToolbarFragment(), IScrollable {
             for (i in 0 until mBodyBinding.tabLayout.tabCount) {
                 val tab = mBodyBinding.tabLayout.getTabAt(i) ?: continue
                 val tabTitle = if (tab.text != null) tab.text.toString() else ""
-                if (data.showArchive && i == INDEX_ARCHIVE) {
+                if (data.showArchive && i == getTabPositionFromTabName(getString(R.string.game_detail_cloud_archive))) {
                     tab.customView = getArchiveTabView(tabTitle)
                     tab.view.run {
                         clipChildren = false
@@ -1799,6 +1799,9 @@ class GameDetailFragment : ToolbarFragment(), IScrollable {
     }
 
     private fun logTabClick(position: Int) {
+        // 特殊处理延时选中 tab 时可能 fragment 已被移除的情况
+        if (!isAdded) return
+
         val entrance = if (mEntrance.contains("论坛详情")) "论坛" else "游戏"
         mGameEntity?.run {
             when (getTabContentForReal(position)) {
@@ -1836,7 +1839,7 @@ class GameDetailFragment : ToolbarFragment(), IScrollable {
     /**
      * 获取真实的 tab 内容类型
      * @param position tab 的位置
-     * @return 真实的
+     * @return 真实的 tab 类型
      */
     private fun getTabContentForReal(position: Int): String {
         return when (mTabTitleList[position]) {
@@ -1855,6 +1858,15 @@ class GameDetailFragment : ToolbarFragment(), IScrollable {
         }
     }
 
+    /**
+     * 获取 tab 的位置
+     * @param tabName tab 名字
+     * @return tab 的真实位置
+     */
+    private fun getTabPositionFromTabName(tabName: String): Int {
+        return mTabTitleList.indexOf(tabName)
+    }
+
     private fun handleTabTouchEvent(title: String) {
         if (title == mTabClickEvent.second && System.currentTimeMillis() - mTabClickEvent.first < 300) {
             val fragment = mFragmentsList[mBodyBinding.gamedetailVp.currentItem]
@@ -2088,7 +2100,8 @@ class GameDetailFragment : ToolbarFragment(), IScrollable {
 
     private fun updateArchiveTabUI() {
         mBodyBinding.tabLayout.run {
-            getTabAt(INDEX_ARCHIVE)?.customView?.findViewById<ImageView>(R.id.newIv)?.visibility = View.VISIBLE
+            val archivePosition = getTabPositionFromTabName(getString(R.string.game_detail_cloud_archive))
+            getTabAt(archivePosition)?.customView?.findViewById<ImageView>(R.id.newIv)?.visibility = View.VISIBLE
         }
     }
 

app/src/main/java/com/gh/vspace/VHelper.kt

@@ -106,15 +106,17 @@ object VHelper {
 
             if (!isVSpace || !isVIsUsed()) return@PackageChangeListener
 
-            if (it.type == "安装") {
+            if (it.type == EBPackage.TYPE_INSTALLED) {
                 // 即时调用大概率调不起来，我也不知道为什么，只能延迟大法了
                 AppExecutor.uiExecutor.executeWithDelay({
                     connectService()
                 }, 500)
-            } else if (it.type == "卸载") {
+            } else if (it.type == EBPackage.TYPE_UNINSTALLED) {
                 // 执行卸载逻辑
                 mIsServiceConnected = false
                 mInstalledInfoList.clear()
+            } else if (it.type == EBPackage.TYPE_REPLACED) {
+                connectService()
             }
         }
     }
@@ -164,6 +166,7 @@ object VHelper {
      * 连接服务
      */
     fun connectService(shouldCheckUpdate: Boolean = false, callbackClosure: (() -> Unit)? = null) {
+        Utils.log(LOG_TAG, "尝试连接 V 服务")
         toastIfServiceConnectTimeout()
 
         mPendingAction = callbackClosure
@@ -599,7 +602,9 @@ object VHelper {
                 packageName,
                 downloadEntity?.gameId ?: "unknown",
                 MetaUtil.getBase64EncodedAndroidId(),
-                HaloApp.getInstance().gid)
+                HaloApp.getInstance().gid,
+                com.gh.gamecenter.BuildConfig.VERSION_NAME,
+                HaloApp.getInstance().channel)
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             context.startActivity(intent)
 

dependencies.gradle

@@ -7,8 +7,8 @@ ext {
     targetSdkVersion = 28
 
     // application info (每个大版本之间的 versionCode 增加 20)
-    versionCode = 731
-    versionName = "5.19.1"
+    versionCode = 734
+    versionName = "5.19.4"
     applicationId = "com.gh.gamecenter"
 
     // AndroidX

module_core/src/main/java/com/gh/gamecenter/core/AppExecutor.kt

@@ -7,6 +7,7 @@ import com.gh.gamecenter.core.AppExecutor.ioExecutor
 import com.gh.gamecenter.core.AppExecutor.lightWeightIoExecutor
 import com.gh.gamecenter.core.AppExecutor.logExecutor
 import com.gh.gamecenter.core.AppExecutor.uiExecutor
+import com.gh.gamecenter.core.utils.SentryHelper
 import io.reactivex.schedulers.Schedulers
 import java.util.concurrent.*
 
@@ -81,7 +82,14 @@ fun runOnIoThread(
 ) {
     when {
         isLightWeightTask -> lightWeightIoExecutor.execute(f)
-        isHeavyWightTask -> heavyWeightIoExecutor.execute(f)
+        isHeavyWightTask -> {
+            try {
+                heavyWeightIoExecutor.execute(f)
+            } catch (e: RejectedExecutionException) {
+                SentryHelper.onEvent("HEAVY_TASK_REJECTED", "digest", e.localizedMessage)
+                e.printStackTrace()
+            }
+        }
         else -> ioExecutor.execute(f)
     }
 }