chore: 版本更新至 5.15.3

fix: 修改选择活动标签弹窗列表不显示问题

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

app/src/main/java/com/gh/common/constant/Config.java

@@ -8,24 +8,26 @@ import android.text.TextUtils;
 
 import androidx.annotation.Nullable;
 
-import com.gh.gamecenter.common.utils.DarkModeUtils;
-import com.gh.gamecenter.common.utils.EnvHelper;
-import com.gh.gamecenter.common.constant.Constants;
-import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.common.util.PackageHelper;
 import com.gh.common.util.PackageUtils;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.SuggestionActivity;
+import com.gh.gamecenter.common.constant.Constants;
+import com.gh.gamecenter.common.eventbus.EBReuse;
+import com.gh.gamecenter.common.retrofit.BiResponse;
+import com.gh.gamecenter.common.retrofit.Response;
+import com.gh.gamecenter.common.utils.DarkModeUtils;
+import com.gh.gamecenter.common.utils.EnvHelper;
+import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.gamecenter.core.utils.SPUtils;
 import com.gh.gamecenter.entity.GameGuidePopupEntity;
+import com.gh.gamecenter.entity.NewApiSettingsEntity;
 import com.gh.gamecenter.entity.NewSettingsEntity;
 import com.gh.gamecenter.entity.NewsEntity;
 import com.gh.gamecenter.entity.SettingsEntity;
 import com.gh.gamecenter.common.eventbus.EBReuse;
 import com.gh.gamecenter.entity.SimulatorEntity;
 import com.gh.gamecenter.entity.VSetting;
-import com.gh.gamecenter.common.retrofit.BiResponse;
-import com.gh.gamecenter.common.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.gh.vspace.VHelper;
 import com.halo.assistant.HaloApp;
@@ -64,8 +66,9 @@ public class Config {
 
     private static SettingsEntity mSettingsEntity;
     private static NewSettingsEntity mNewSettingsEntity;
+    private static NewApiSettingsEntity mNewApiSettingsEntity;
 
-    private static NewSettingsEntity.NightMode mNightModeSetting;
+    private static NewApiSettingsEntity.NightMode mNightModeSetting;
     private static SimulatorEntity mNewSimulatorEntity;
     private static VSetting mVSetting;
     private static GameGuidePopupEntity mGameGuidePopupEntity;
@@ -227,19 +230,19 @@ public class Config {
     public static SimulatorEntity getNewSimulatorEntitySetting() {
         if (mNewSimulatorEntity != null) {
             return mNewSimulatorEntity;
-        } else if (mNewSettingsEntity != null && mNewSettingsEntity.getSimulator() != null) {
-            return mNewSettingsEntity.getSimulator();
+        } else if (mNewApiSettingsEntity != null && mNewApiSettingsEntity.getSimulator() != null) {
+            return mNewApiSettingsEntity.getSimulator();
         } else {
             return null;
         }
     }
 
     @Nullable
-    public static NewSettingsEntity.NightMode getNightModeSetting() {
+    public static NewApiSettingsEntity.NightMode getNightModeSetting() {
         if (mNightModeSetting != null) {
             return mNightModeSetting;
-        } else if (mNewSettingsEntity != null && mNewSettingsEntity.getNightMode() != null) {
-            return mNewSettingsEntity.getNightMode();
+        } else if (mNewApiSettingsEntity != null && mNewApiSettingsEntity.getNightMode() != null) {
+            return mNewApiSettingsEntity.getNightMode();
         } else {
             return null;
         }
@@ -364,9 +367,6 @@ public class Config {
                     @Override
                     public void onSuccess(NewSettingsEntity data) {
                         mNewSettingsEntity = data;
-                        if (mNightModeSetting != null) {
-                            mNewSettingsEntity.setNightMode(mNightModeSetting);
-                        }
                         SPUtils.setString(Constants.SP_NEW_SETTINGS, GsonUtils.toJson(data));
                     }
                 });
@@ -384,27 +384,22 @@ public class Config {
                     });
         }
 
-        if (mNightModeSetting == null && mNewSimulatorEntity == null) {
+        if (mNewApiSettingsEntity == null) {
             RetrofitManager.getInstance()
                     .getNewApi().getNewSettings(PackageUtils.getGhVersionName(), channel)
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new BiResponse<NewSettingsEntity>() {
+                    .subscribe(new BiResponse<NewApiSettingsEntity>() {
                         @Override
-                        public void onSuccess(NewSettingsEntity data) {
+                        public void onSuccess(NewApiSettingsEntity data) {
+                            mNewApiSettingsEntity = data;
                             mNightModeSetting = data.getNightMode();
                             mNewSimulatorEntity = data.getSimulator();
                             if (HaloApp.getInstance().isNewForThisVersion && mNightModeSetting != null && mNightModeSetting.getInstall()) {
                                 DarkModeUtils.INSTANCE.updateFollowSystemDarkModeToSp(true);
-                                DarkModeUtils.INSTANCE.updateAppDarkModeStatusToSp(true);
                                 DarkModeUtils.INSTANCE.initDarkMode();
                             }
-
-                            if (mNewSettingsEntity != null) {
-                                mNewSettingsEntity.setSimulator(mNewSimulatorEntity);
-                                mNewSettingsEntity.setNightMode(mNightModeSetting);
-                                SPUtils.setString(Constants.SP_NEW_SETTINGS, GsonUtils.toJson(data));
-                            }
+                            SPUtils.setString(Constants.SP_NEW_API_SETTINGS, GsonUtils.toJson(data));
                         }
                     });
         }

app/src/main/java/com/gh/common/history/HistoryDatabase.kt

@@ -18,7 +18,7 @@ import com.halo.assistant.HaloApp
 
 @Database(
     entities = [AnswerEntity::class, ArticleEntity::class, NewsEntity::class, HistoryGameEntity::class, MyVideoEntity::class, GamesCollectionEntity::class],
-    version = 11,
+    version = 12,
     exportSchema = false
 )
 @TypeConverters(
@@ -28,6 +28,7 @@ import com.halo.assistant.HaloApp
     AnswerUserConverter::class,
     ThumbnailConverter::class,
     TagStyleListConverter::class,
+    TagStyleConverter::class,
     StringArrayListConverter::class,
     ListStringConverter::class,
     CommunityVideoConverter::class,
@@ -127,6 +128,13 @@ abstract class HistoryDatabase : RoomDatabase() {
             }
         }
 
+        val MIGRATION_11_12: Migration = object : Migration(11, 12) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("Alter TABLE HistoryGameEntity add subtitle TEXT NOT NULL DEFAULT ''")
+                database.execSQL("Alter TABLE HistoryGameEntity add subtitleStyle TEXT")
+            }
+        }
+
         val instance by lazy {
             Room.databaseBuilder(
                 HaloApp.getInstance().application,
@@ -142,6 +150,7 @@ abstract class HistoryDatabase : RoomDatabase() {
                 .addMigrations(MIGRATION_8_9)
                 .addMigrations(MIGRATION_9_10)
                 .addMigrations(MIGRATION_10_11)
+                .addMigrations(MIGRATION_11_12)
                 .build()
         }
     }

app/src/main/java/com/gh/common/history/HistoryHelper.kt

@@ -71,6 +71,8 @@ object HistoryHelper {
         historyGame.name = gameEntity.name
         historyGame.tagStyle = gameEntity.tagStyle
         historyGame.tag = gameEntity.getTag()
+        historyGame.subtitle = gameEntity.subtitle
+        historyGame.subtitleStyle = gameEntity.subtitleStyle
         return historyGame
     }
 

app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt

@@ -146,21 +146,31 @@ class SimulatorDownloadManager private constructor() {
 
         PermissionHelper.checkGetInstalledAppsListBeforeAction(context, object : EmptyCallback {
             override fun onCallback() {
-                //判断是否隐藏
-                if (simulator?.active == false) {
+                val isInstalledNewSimulator =
+                    SimulatorGameManager.isNewSimulatorInstalled(HaloApp.getInstance().application)
+                //当没有安装新版本模拟器时候 判断是否隐藏
+                if (simulator?.active == false && !isInstalledNewSimulator) {
                     showNoneEmulatorDialog(context)
                     return
                 }
-                val isInstalled = PackageUtils.isInstalledFromAllPackage(context, simulator?.apk?.packageName)
+                var isInstalled = PackageUtils.isInstalledFromAllPackage(
+                    context,
+                    simulator?.apk?.packageName
+                )
+                //模拟器管理界面还是用之前的逻辑
+                if (isInstalledNewSimulator && location != SimulatorLocation.SIMULATOR_MANAGE) {
+                    isInstalled = isInstalledNewSimulator
+                }
 //                val versionFromInstalledApp = PackageUtils.getVersionNameByPackageName(simulator?.apk?.packageName)
-                val shouldShowUpdate = PackageUtils.isInstalledApkMatchedMd5(simulator?.apk?.packageName, simulator?.apk?.md5)
+                val shouldShowUpdate =
+                    PackageUtils.isInstalledApkMatchedMd5(simulator?.apk?.packageName, simulator?.apk?.md5)
                 val showAlertTag = SPUtils.getString(SimulatorGameManager.SIMULATOR_UPDATE_SHOW_ALERT_TAG, "") //当天是否弹过
                 val todayIsShow = showAlertTag == TimeUtils.getToday()
                 downloadType = if (shouldShowUpdate && isInstalled) "update" else "download"
-                if (downloadType == "update" && todayIsShow && location != SimulatorLocation.SIMULATOR_MANAGE){
+                if (downloadType == "update" && todayIsShow && location != SimulatorLocation.SIMULATOR_MANAGE) {
                     return
                 }
-                if (downloadType == "download" && isInstalled){
+                if (downloadType == "download" && isInstalled) {
                     return
                 }
                 val title = if (shouldShowUpdate && isInstalled) "更新模拟器" else "安装模拟器"

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

@@ -771,6 +771,36 @@ object DirectUtils {
         jumpActivity(context, bundle)
     }
 
+    @JvmStatic
+    fun directToFeedbackCompat(
+        context: Context,
+        content: String? = null,
+        hintType: String? = null,
+        isQaFeedback: Boolean = false,
+        qaContentId: String? = "",
+        entrance: String? = null
+    ) {
+        val bundle = Bundle()
+        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+        bundle.putString(KEY_TO, SuggestionActivity::class.java.simpleName)
+        if (isQaFeedback) {
+            bundle.putBoolean(KEY_IS_QA_FEEDBACK, true)
+            bundle.putString(KEY_QA_CONTENT_ID, qaContentId)
+            bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.normal)
+        } else {
+            bundle.putString(KEY_CONTENT, content)
+            if (TextUtils.isEmpty(hintType)) {
+                bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.gameQuestion)
+                bundle.putString(KEY_SUGGEST_HINT_TYPE, KEY_PLUGIN)
+            } else {
+                bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.normal)
+                bundle.putString(KEY_SUGGEST_HINT_TYPE, hintType)
+            }
+        }
+
+        jumpActivityCompat(context, bundle)
+    }
+
     @JvmStatic
     fun directToDownloadManager(context: Context, entrance: String? = null) {
         val bundle = Bundle()

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

@@ -787,6 +787,7 @@ object DownloadItemUtils {
             DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
         } else if (str == context.getString(R.string.attempt)) {
             ChainBuilder().apply {
+                addHandler(UpdateNewSimulatorHandler())
                 addHandler(GamePermissionHandler())
                 addHandler(BrowserInstallHandler())
                 addHandler(PackageCheckHandler())
@@ -844,8 +845,11 @@ object DownloadItemUtils {
                 val isInstalledNewSimulator = SimulatorGameManager.isNewSimulatorInstalled(context)
                 val isInstalledOldSimulator = SimulatorGameManager.isOldSimulatorInstalled(context)
                 var simulator = gameEntity.simulator
-                if (!isInstalledOldSimulator) {
-                    simulator = Config.getNewSimulatorEntitySetting()
+                val newSimulator = Config.getNewSimulatorEntitySetting()
+                if (!isInstalledOldSimulator && newSimulator != null) {//在没有安装旧的模拟器且有配置新版模拟器 才使用新版模拟器 否则还是用以前旧的
+                    if (newSimulator.active) {
+                        simulator = newSimulator
+                    }
                 }
                 if (downloadEntity != null && SimulatorGameManager.isSimulatorGame(gameEntity) && !isInstalled && !isInstalledNewSimulator) {
                     SimulatorDownloadManager.getInstance().showDownloadDialog(

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

@@ -241,16 +241,20 @@ object DownloadObserver {
                     val gameName = downloadEntity.getMetaExtra(Constants.GAME_NAME)
                     if (simulatorJson.isEmpty()) return
                     var simulator = GsonUtils.fromJson(simulatorJson, SimulatorEntity::class.java)
-                    val isInstalled = PackageUtils.isInstalledFromAllPackage(HaloApp.getInstance().application, simulator.apk?.packageName)
-                    val isInstalledNewSimulator = SimulatorGameManager.isNewSimulatorInstalled(HaloApp.getInstance().application)
-                    val isInstalledOldSimulator = SimulatorGameManager.isOldSimulatorInstalled(HaloApp.getInstance().application)
+                    val isInstalled = PackageUtils.isInstalledFromAllPackage(
+                        HaloApp.getInstance().application,
+                        simulator.apk?.packageName
+                    )
+                    val isInstalledNewSimulator =
+                        SimulatorGameManager.isNewSimulatorInstalled(HaloApp.getInstance().application)
+                    val isInstalledOldSimulator =
+                        SimulatorGameManager.isOldSimulatorInstalled(HaloApp.getInstance().application)
 //                    if (!isInstalled && !isInstalledNewSimulator) {
                     val currentActivity = AppManager.getInstance().currentActivity()
                         ?: return
-                    if (!isInstalledOldSimulator || isInstalledNewSimulator) { //如果没有安装任一旧的模拟器 或者下载了新模拟器 则使用新版本模拟器
-                        Config.getNewSimulatorEntitySetting().let {
-                            simulator = it!!
-                        }
+                    val newSimulator = Config.getNewSimulatorEntitySetting()
+                    if ((!isInstalledOldSimulator && newSimulator != null && newSimulator.active) || isInstalledNewSimulator) { //如果没有安装任一旧的模拟器 或者下载了新模拟器 则使用新版本模拟器
+                        simulator = newSimulator ?: simulator
                     }
                     SimulatorDownloadManager.getInstance().showDownloadDialog(
                         currentActivity, simulator,

app/src/main/java/com/gh/common/util/EntranceUtils.java

@@ -37,6 +37,32 @@ import java.util.Set;
 
 public class EntranceUtils {
 
+    public static void jumpActivityCompat(Context context, Bundle bundle) {
+        bundle.putBoolean(KEY_REQUIRE_REDIRECT, true);
+
+        if (HaloApp.getInstance().isRunningForeground || HaloApp.getInstance().isAlreadyUpAndRunning) {
+            // 应用正在运行，前台或后台
+            String to = bundle.getString(KEY_TO);
+            Class<?> clazz = ClassUtils.forName(to);
+            if (clazz == null) clazz = MainActivity.class;
+            if (ToolbarFragment.class.isAssignableFrom(clazz)) { // 兼容ToolbarFragment
+                ToolBarActivity.startFragmentNewTask(context, (Class<? extends ToolbarFragment>) clazz, bundle);
+            } else {
+                Intent intent1 = new Intent(context, clazz);
+                intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                // 如果 activity 名称有 singleton 的就添加 reorder_to_front 标签 (有点粗暴有点蠢，但暂时就先这样吧 :C )
+                if (clazz.getSimpleName().toLowerCase().contains("singleton")) {
+                    intent1.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+                }
+                intent1.putExtras(bundle);
+                context.startActivity(intent1);
+            }
+        } else {
+            // 应用未在运行
+            context.startActivity(SplashScreenActivity.getSplashScreenIntent(context, bundle));
+        }
+    }
+
     public static void jumpActivity(Context context, Bundle bundle) {
         bundle.putBoolean(KEY_REQUIRE_REDIRECT, true);
 

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

@@ -36,6 +36,7 @@ import com.gh.common.util.PackageUtils;
 import com.gh.gamecenter.core.utils.PageSwitchDataHelper;
 import com.gh.gamecenter.core.utils.SPUtils;
 import com.gh.gamecenter.BuildConfig;
+import com.gh.gamecenter.core.utils.SentryHelper;
 import com.gh.gamecenter.download.DownloadedGameIdAndPackageNameDao;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
@@ -389,12 +390,16 @@ public class DownloadManager implements DownloadStatusListener {
      * 清理不存在本地 APK 文件的任务
      */
     public void clearTasksThatFileBeenDeleted() {
-        for (DownloadEntity entity : getAllDownloadEntity()) {
-            if (entity.getStatus() == DownloadStatus.done) {
-                if (FileUtils.isEmptyFile(entity.getPath())) {
-                    cancel(entity.getUrl());
+        try {
+            for (DownloadEntity entity : getAllDownloadEntity()) {
+                if (entity.getStatus() == DownloadStatus.done) {
+                    if (FileUtils.isEmptyFile(entity.getPath())) {
+                        cancel(entity.getUrl());
+                    }
                 }
             }
+        } catch (Exception e) {
+            SentryHelper.INSTANCE.onEvent("CLEAR_DELETED_TASK_ERROR", "exception_digest", e.getLocalizedMessage());
         }
     }
 

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

@@ -180,6 +180,7 @@ public class MainActivity extends BaseActivity {
         showAd = getIntent().getBooleanExtra(SHOW_AD, false) && savedInstanceState == null;
 
         HaloApp.getInstance().initFresco();
+        HaloApp.getInstance().isAlreadyUpAndRunning = true;
 
         super.onCreate(savedInstanceState);
         setStatusBarColor(Color.TRANSPARENT);

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

@@ -137,7 +137,7 @@ public class SkipActivity extends BaseActivity {
                             if (!TextUtils.isEmpty(qaId)) {
                                 DirectUtils.directToQa(this, qaTitle, qaId);
                             } else if ("vgame".equals(suggestionType)) {
-                                DirectUtils.directToFeedback(this, content, "game", isQaFeedback, qaContentId, EntranceConsts.ENTRANCE_BROWSER);
+                                DirectUtils.directToFeedbackCompat(this, content, "game", isQaFeedback, qaContentId, EntranceConsts.ENTRANCE_BROWSER);
                             } else {
                                 DirectUtils.directToFeedback(this, content, null, isQaFeedback, qaContentId, EntranceConsts.ENTRANCE_BROWSER);
                             }

app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt

@@ -1,5 +1,6 @@
 package com.gh.gamecenter
 
+import android.Manifest
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
@@ -25,6 +26,7 @@ import com.gh.common.util.GameSubstituteRepositoryHelper.updateGameSubstituteRep
 import com.gh.common.util.UsageStatsHelper.checkAndPostUsageStats
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.common.base.activity.BaseActivity
+import com.gh.gamecenter.common.callback.SimpleCallback
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.tracker.TrackerLogger
@@ -60,6 +62,8 @@ class SplashScreenActivity : BaseActivity() {
     private var mShouldPrefetchData = true
 
     private val mPermissions = arrayOf(
+        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        Manifest.permission.READ_EXTERNAL_STORAGE,
         PermissionHelper.PERMISSION_GET_INSTALLED_LIST
     )
 
@@ -150,42 +154,41 @@ class SplashScreenActivity : BaseActivity() {
     private fun showPrivacyDialog(guideLayout: ViewPager) {
         NewPrivacyPolicyDialogFragment.show(this, null) { isSuccess: Boolean ->
             if (isSuccess) {
-                guideLayout.visibility = View.VISIBLE
-                SPUtils.setBoolean(Constants.SP_BRAND_NEW_USER, false)
+//                guideLayout.visibility = View.VISIBLE
+//                SPUtils.setBoolean(Constants.SP_BRAND_NEW_USER, false)
+//
+//                // 恢复畅玩数据
+//                VHelper.recoverVDataIfPossible()
+//
+//                requestPermission()
+//
+//                // 检查是否有旧版本光环，有就删掉
+//                AppExecutor.ioExecutor.execute { deleteOutdatedUpdatePackage() }
+//                if (mStartMainActivityDirectly) {
+//                    launchMainActivity()
+//                }
 
-                // 恢复畅玩数据
-                VHelper.recoverVDataIfPossible()
+                mShouldPrefetchData = false
+                prefetchData()
 
-                requestPermission()
-
-                // 检查是否有旧版本光环，有就删掉
-                AppExecutor.ioExecutor.execute { deleteOutdatedUpdatePackage() }
-                if (mStartMainActivityDirectly) {
-                    launchMainActivity()
-                } else {
-                    mShouldPrefetchData = false
-                    prefetchData()
+                val callback = object : SimpleCallback<Boolean> {
+                    override fun onCallback(arg: Boolean) {
+                        // Dialog dismiss 后的回调
+                        guideLayout.visibility = View.VISIBLE
+                        SPUtils.setBoolean(Constants.SP_BRAND_NEW_USER, false)
+                        if (arg) {
+                            requestPermission()
+                        } else {
+                            mStartMainActivityDirectly = false
+                        }
+                    }
                 }
 
-//                val callback = object : SimpleCallback<Boolean> {
-//                    override fun onCallback(arg: Boolean) {
-//                        // Dialog dismiss 后的回调
-//                        guideLayout.visibility = View.VISIBLE
-//                        SPUtils.setBoolean(Constants.SP_BRAND_NEW_USER, false)
-//                        if (arg) {
-//                            requestPermission()
-//                        } else {
-//                            mStartMainActivityDirectly = false
-//                        }
-//                    }
-//                }
-//
-//                mViewModel?.showPrivacyPolicy({
-//                    DialogUtils.showPrivacyPolicyDialog(this@SplashScreenActivity, it, callback)
-//                }, {
-//                    DialogUtils.showPrivacyPolicyDialog(this@SplashScreenActivity, PrivacyPolicyEntity.createDefaultData(), callback)
-//                })
-
+                mViewModel?.showPrivacyPolicy({
+                    DialogUtils.showPrivacyPolicyDialog(this@SplashScreenActivity, it, callback)
+                }, {
+                    DialogUtils.showPrivacyPolicyDialog(this@SplashScreenActivity, PrivacyPolicyEntity.createDefaultData(), callback)
+                })
             } else {
                 DialogUtils.showPrivacyPolicyDisallowDialog(
                     this,
@@ -385,10 +388,10 @@ class SplashScreenActivity : BaseActivity() {
     private fun checkAndRequestPermission() {
         if (EasyPermissions.hasPermissions(this, *mPermissions)) {
             // 恢复畅玩数据
-//            VHelper.recoverVDataIfPossible()
+            VHelper.recoverVDataIfPossible()
 
             // 检查是否有旧版本光环，有就删掉
-//            AppExecutor.ioExecutor.execute { deleteOutdatedUpdatePackage() }
+            AppExecutor.ioExecutor.execute { deleteOutdatedUpdatePackage() }
             if (mStartMainActivityDirectly) {
                 if (com.gh.gamecenter.common.BuildConfig.BUILD_TIME != 0L) {
                     showGitLogDialogIfNeeded()
@@ -477,7 +480,7 @@ class SplashScreenActivity : BaseActivity() {
             intent.action = Intent.ACTION_MAIN
             intent.addCategory(Intent.CATEGORY_LAUNCHER)
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            intent.putExtras(bundle!!)
+            intent.putExtras(bundle ?: Bundle())
             return intent
         }
     }

app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java

@@ -42,6 +42,7 @@ import com.gh.gamecenter.entity.LibaoStatusEntity;
 import com.gh.gamecenter.entity.MeEntity;
 import com.gh.gamecenter.entity.UserDataLibaoEntity;
 import com.gh.gamecenter.common.retrofit.Response;
+import com.gh.gamecenter.game.GameItemViewHolder;
 import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.gh.gamecenter.suggest.SuggestType;
 import com.lightgame.adapter.BaseRecyclerAdapter;
@@ -196,6 +197,8 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter<ViewHolder> {
         ExtensionsKt.setRootBackgroundColor(holder.binding.getRoot(), R.color.background_white);
         if (mLibaoEntity.getGame() != null) {
             holder.binding.libaodetailGameIcon.displayGameIcon(mLibaoEntity.getGame().getIcon(), mLibaoEntity.getGame().getIconSubscript());
+            GameEntity gameEntity = mLibaoEntity.getGame().toGameEntity();
+            GameItemViewHolder.initGameSubtitle(gameEntity, holder.binding.gameSubtitleTv, null, null, false);
         } else {
             holder.binding.libaodetailGameIcon.displayGameIcon(mLibaoEntity.getIcon(), null);
         }

app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java

@@ -315,9 +315,10 @@ public class DetailViewHolder {
                         boolean isInstalledNewSimulator = SimulatorGameManager.isNewSimulatorInstalled(mViewHolder.context);
                         boolean isInstalledOldSimulator = SimulatorGameManager.isOldSimulatorInstalled(mViewHolder.context);
                         SimulatorEntity simulator = mGameEntity.getSimulator();
-                        if (!isInstalledOldSimulator){
-                            if (Config.getNewSimulatorEntitySetting() != null){
-                                simulator = Config.getNewSimulatorEntitySetting();
+                        SimulatorEntity newSimulator = Config.getNewSimulatorEntitySetting();
+                        if (!isInstalledOldSimulator && newSimulator != null) {
+                            if (newSimulator.getActive()) {
+                                simulator = newSimulator;
                             }
                         }
 

app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt

@@ -28,6 +28,7 @@ import com.gh.gamecenter.core.utils.NumberUtils
 import com.gh.gamecenter.databinding.AmwayCommentItemBinding
 import com.gh.gamecenter.eventbus.EBDownloadStatus
 import com.gh.gamecenter.game.GameAndPosition
+import com.gh.gamecenter.game.GameItemViewHolder
 import com.gh.gamecenter.game.vertical.GameVerticalAdapter
 import com.gh.gamecenter.gamedetail.rating.RatingFragment
 import com.gh.gamecenter.gamedetail.rating.RatingReplyActivity
@@ -206,6 +207,7 @@ class AmwayAdapter(
         ) {
             val context = binding.root.context
             val amway = itemData.amwayCommentItem!!
+            val gameEntity = amway.game.toGameEntity()
 
             binding.gameContainer.background = R.drawable.selector_f8f8f8.toDrawable(context)
             binding.commentContainer.background = R.drawable.selector_f8f8f8.toDrawable(context)
@@ -237,7 +239,8 @@ class AmwayAdapter(
                 )
             }
 
-            itemData.exposureEvent = ExposureEvent.createEvent(amway.game.toGameEntity(), basicExposureSource)
+            itemData.exposureEvent = ExposureEvent.createEvent(gameEntity, basicExposureSource)
+            GameItemViewHolder.initGameSubtitle(gameEntity, binding.gameSubtitleTv)
 
             binding.gameContainer.setOnClickListener {
                 GameDetailActivity.startGameDetailActivity(

app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListAdapter.kt

@@ -27,6 +27,7 @@ import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.databinding.CategoryGameItemBinding
 import com.gh.gamecenter.entity.GameEntity
 import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.game.GameItemViewHolder
 import com.lightgame.download.DownloadEntity
 
 class CategoryV2ListAdapter(
@@ -245,6 +246,8 @@ class CategoryV2ListAdapter(
                     )
                 )
                 gameDes.text = gameEntity.decoratedDes
+
+                GameItemViewHolder.initGameSubtitle(gameEntity, gameSubtitleTv, gameDesSpace, root)
             }
         }
 

app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java

@@ -14,6 +14,7 @@ import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler;
 import com.gh.common.util.CollectionUtils;
 import com.gh.gamecenter.common.utils.DialogHelper;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
+import com.gh.gamecenter.common.view.DrawableView;
 import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.common.viewholder.FooterViewHolder;
@@ -232,6 +233,11 @@ public class AnswerAdapter extends ListAdapter<AnswerEntity> implements ISyncAda
 
             }
         });
+        mPopupBinding.checkAllCb.setCompoundDrawablesWithIntrinsicBounds(
+                DrawableView.getCheckSelectorDrawable(
+                        mContext
+                ), null, null, null
+        );
         mPopupBinding.checkAllCb.setOnClickListener(v -> {
             if (mPopupBinding.checkAllCb.isChecked()) {
                 selectItems.clear();

app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java

@@ -16,6 +16,7 @@ import com.gh.gamecenter.common.callback.OnListClickListener;
 import com.gh.gamecenter.common.constant.ItemViewType;
 import com.gh.gamecenter.common.utils.DialogHelper;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
+import com.gh.gamecenter.common.view.DrawableView;
 import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.common.utils.ImageUtils;
 import com.gh.common.util.NewsUtils;
@@ -361,6 +362,11 @@ public class ArticleAdapter extends ListAdapter<NewsEntity> {
 
             }
         });
+        mPopupBinding.checkAllCb.setCompoundDrawablesWithIntrinsicBounds(
+                DrawableView.getCheckSelectorDrawable(
+                        mContext
+                ), null, null, null
+        );
         mPopupBinding.checkAllCb.setOnClickListener(v -> {
             if (mPopupBinding.checkAllCb.isChecked()) {
                 selectItems.clear();

app/src/main/java/com/gh/gamecenter/collection/CommunityArticleAdapter.kt

@@ -18,6 +18,7 @@ import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.databinding.CommunityAnswerItemBinding
 import com.gh.gamecenter.databinding.PopupHistoryOptionBinding
 import com.gh.gamecenter.common.entity.CommunityEntity
+import com.gh.gamecenter.common.view.DrawableView
 import com.gh.gamecenter.history.ManageOption
 import com.gh.gamecenter.qa.answer.CommunityAnswerItemViewHolder
 import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity
@@ -172,6 +173,11 @@ class CommunityArticleAdapter(
             }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true))
 
         }
+        mPopupBinding?.checkAllCb?.setCompoundDrawablesWithIntrinsicBounds(
+            DrawableView.getCheckSelectorDrawable(
+                mContext
+            ), null, null, null
+        )
         mPopupBinding?.checkAllCb?.setOnClickListener {
             if (mPopupBinding?.checkAllCb?.isChecked == true) {
                 selectItems.clear()

app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt

@@ -24,6 +24,7 @@ import com.gh.gamecenter.adapter.viewholder.GameCollectionItemViewHolder
 import com.gh.gamecenter.common.baselist.ListAdapter
 import com.gh.gamecenter.collection.GamesCollectionFragment.Companion.TYPE_USER
 import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.common.view.DrawableView
 import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.databinding.ItemGameCollectionFlexTagBinding
 import com.gh.gamecenter.databinding.PopupHistoryOptionBinding
@@ -424,6 +425,11 @@ class GamesCollectionAdapter(
             }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true))
 
         }
+        mPopupBinding?.checkAllCb?.setCompoundDrawablesWithIntrinsicBounds(
+            DrawableView.getCheckSelectorDrawable(
+                mContext
+            ), null, null, null
+        )
         mPopupBinding?.checkAllCb?.setOnClickListener {
             if (mPopupBinding?.checkAllCb?.isChecked == true) {
                 selectItems.clear()

app/src/main/java/com/gh/gamecenter/collection/VideoAdapter.kt

@@ -3,6 +3,7 @@ package com.gh.gamecenter.collection
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import android.graphics.drawable.StateListDrawable
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
@@ -17,6 +18,7 @@ import com.gh.gamecenter.R
 import com.gh.gamecenter.common.viewholder.FooterViewHolder
 import com.gh.gamecenter.common.baselist.ListAdapter
 import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.common.view.DrawableView
 import com.gh.gamecenter.databinding.PopupHistoryOptionBinding
 import com.gh.gamecenter.databinding.VideoNewItemBinding
 import com.gh.gamecenter.entity.MyVideoEntity
@@ -166,6 +168,11 @@ class VideoAdapter(
             }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true))
 
         }
+        mPopupBinding?.checkAllCb?.setCompoundDrawablesWithIntrinsicBounds(
+            DrawableView.getCheckSelectorDrawable(
+                mContext
+            ), null, null, null
+        )
         mPopupBinding?.checkAllCb?.setOnClickListener {
             if (mPopupBinding?.checkAllCb?.isChecked == true) {
                 selectItems.clear()

app/src/main/java/com/gh/gamecenter/entity/AmwayCommentEntity.kt

@@ -32,6 +32,10 @@ data class AmwayCommentEntity(
         @SerializedName("new_star")
         var star: Float,
 
+        var subtitle: String? = "",
+        @SerializedName("subtitle_style")
+        var subtitleStyle: TagStyleEntity? = null,
+
         // 曝光用的位置
         var sequence: Int = 0,
         var outerSequence: Int = 0
@@ -50,6 +54,9 @@ data class AmwayCommentEntity(
             gameEntity.iconSubscript = iconSubscript
             gameEntity.platform = ""
 
+            gameEntity.subtitle = subtitle ?: ""
+            gameEntity.subtitleStyle = subtitleStyle
+
             gameEntity.sequence = sequence
             gameEntity.outerSequence = outerSequence
             return gameEntity

app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt

@@ -876,7 +876,11 @@ data class SimpleGame(
     @SerializedName("recommend_text")
     var recommendText: String = "",
     @SerializedName("download_status")
-    var downloadStatus: String = ""
+    var downloadStatus: String = "",
+
+    var subtitle: String? = "",
+    @SerializedName("subtitle_style")
+    var subtitleStyle: TagStyleEntity? = null,
 ) : Parcelable {
 
     @IgnoredOnParcel
@@ -902,6 +906,8 @@ data class SimpleGame(
         gameEntity.recommendStar = recommendStar
         gameEntity.recommendText = recommendText
         gameEntity.downloadStatus = downloadStatus
+        gameEntity.subtitle = subtitle ?: ""
+        gameEntity.subtitleStyle = subtitleStyle
         return gameEntity
     }
 

app/src/main/java/com/gh/gamecenter/entity/HistoryGameEntity.kt

@@ -16,6 +16,9 @@ data class HistoryGameEntity(
     var tag: ArrayList<String>? = null,
     var isLibaoExist: Boolean = false,
 
+    var subtitle: String = "",
+    var subtitleStyle: TagStyleEntity? = null,
+
     @SerializedName("tag_style")
     var tagStyle: ArrayList<TagStyleEntity> = ArrayList(),
 
@@ -31,6 +34,8 @@ data class HistoryGameEntity(
         gameEntity.des = des
         gameEntity.rawIcon = icon
         gameEntity.iconSubscript = iconSubscript
+        gameEntity.subtitle = subtitle
+        gameEntity.subtitleStyle = subtitleStyle
         gameEntity.name = name
         gameEntity.tagStyle = tagStyle
         gameEntity.isLibaoExists = isLibaoExist

app/src/main/java/com/gh/gamecenter/entity/NewApiSettingsEntity.kt

@@ -0,0 +1,21 @@
+package com.gh.gamecenter.entity
+
+import com.google.gson.annotations.SerializedName
+
+data class NewApiSettingsEntity(
+    @SerializedName("night_mode")
+    var nightMode: NightMode? = null,
+    var simulator: SimulatorEntity? = null,
+) {
+    /**
+     *
+     *   "icon": false, // 是否显示切换，true显示
+     *   "setting": false, // 设置页面是否显示，true显示
+     *   "install": false, // 安装时的默认值，true开启
+     */
+    data class NightMode(
+        val icon: Boolean,
+        val setting: Boolean,
+        val install: Boolean
+    )
+}

app/src/main/java/com/gh/gamecenter/entity/NewSettingsEntity.kt

@@ -5,9 +5,6 @@ import com.google.gson.annotations.SerializedName
 data class NewSettingsEntity(
     @SerializedName("install_model")
     var installModel: InstallModel? = null,
-    @SerializedName("night_mode")
-    var nightMode: NightMode? = null,
-    var simulator: SimulatorEntity? = null
 ) {
     data class InstallModel(
         var status: String = "",
@@ -15,16 +12,4 @@ data class NewSettingsEntity(
         @SerializedName("white_list")
         var whiteList: ArrayList<String>? = arrayListOf()
     )
-
-    /**
-     *
-     *   "icon": false, // 是否显示切换，true显示
-     *   "setting": false, // 设置页面是否显示，true显示
-     *   "install": false, // 安装时的默认值，true开启
-     */
-    data class NightMode(
-        val icon: Boolean,
-        val setting: Boolean,
-        val install: Boolean
-    )
 }

app/src/main/java/com/gh/gamecenter/entity/PrivacyPolicyEntity.kt

@@ -28,13 +28,13 @@ data class PrivacyPolicyEntity(
                     intro = "用于下载游戏，以及实现内容缓存提升浏览体验"
                 )
             )
-            permissions.add(
-                PermissionsEntity(
-                    icon = "res:///" + R.drawable.permission_phone_state,
-                    name = "设备信息",
-                    intro = "为保障您的账号安全及使用软件与服务可安全运行"
-                )
-            )
+//            permissions.add(
+//                PermissionsEntity(
+//                    icon = "res:///" + R.drawable.permission_phone_state,
+//                    name = "设备信息",
+//                    intro = "为保障您的账号安全及使用软件与服务可安全运行"
+//                )
+//            )
 //            permissions.add(PermissionsEntity(
 //                    icon = "res:///" + R.drawable.permission_sdk,
 //                    name = "第三方SDK使用信息提醒",

app/src/main/java/com/gh/gamecenter/game/GameItemViewHolder.kt

@@ -2,6 +2,7 @@ package com.gh.gamecenter.game
 
 import android.graphics.Color
 import android.graphics.drawable.GradientDrawable
+import android.text.TextUtils
 import android.view.View
 import android.widget.Space
 import android.widget.TextView
@@ -11,6 +12,7 @@ import com.gh.common.databind.BindingAdapters
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
 import com.gh.gamecenter.common.utils.dip2px
+import com.gh.gamecenter.common.utils.maxWidthExcludeZero
 import com.gh.gamecenter.common.utils.toColor
 import com.gh.gamecenter.common.utils.toDrawable
 import com.gh.gamecenter.common.view.DrawableView
@@ -32,6 +34,7 @@ class GameItemViewHolder(var binding: GameItemBinding) : BaseRecyclerViewHolder<
     ) {
         binding.run {
             root.background = R.drawable.reuse_listview_item_style.toDrawable(root.context)
+            selectIv.setImageDrawable(DrawableView.getCheckSelectorDrawable(root.context))
             gameKaifuType.setBackgroundColor(R.color.theme.toColor(root.context))
             gameName.setTextColor(R.color.text_title.toColor(root.context))
             gameDes.setTextColor(R.color.text_subtitleDesc.toColor(root.context))
@@ -86,19 +89,17 @@ class GameItemViewHolder(var binding: GameItemBinding) : BaseRecyclerViewHolder<
         }
 
         @JvmStatic
-        fun initGameSubtitle(
-            entity: GameEntity,
-            gameSubtitleTv: TextView,
-            gameDesSpace: Space,
-            rootContainer: ConstraintLayout,
-            forceShowSubtitle: Boolean = false
-        ) {
+        fun initGameSubtitle(entity: GameEntity,
+                             gameSubtitleTv: TextView,
+                             gameDesSpace: Space? = null,
+                             rootContainer: ConstraintLayout? = null,
+                             forceShowSubtitle: Boolean = false) {
             gameSubtitleTv.visibility = View.GONE
             if ((entity.serverLabel == null && entity.subtitle.isNotEmpty() && !entity.advanceDownload) || (forceShowSubtitle && entity.subtitle.isNotEmpty())) {
                 gameSubtitleTv.run {
                     visibility = View.VISIBLE
                     text = entity.subtitle
-                    if (entity.subtitleStyle != null) {
+                    if (entity.subtitleStyle != null && !TextUtils.isEmpty(entity.subtitleStyle?.color)) {
                         setTextColor(Color.parseColor("#${entity.subtitleStyle?.color}"))
                         background = GradientDrawable().apply {
                             cornerRadius = 2F.dip2px().toFloat()
@@ -112,8 +113,9 @@ class GameItemViewHolder(var binding: GameItemBinding) : BaseRecyclerViewHolder<
                         }
                     }
                 }
-                gameDesSpace.post {
-                    gameSubtitleTv.maxWidth = gameDesSpace.width
+                gameDesSpace?.post {
+                    // 模拟器上可能出现未提前 bindView 导致 gameDesSpace.width 为 0 的情况
+                    gameSubtitleTv.maxWidthExcludeZero(gameDesSpace.width)
                 }
             }
             if (entity.advanceDownload) {
@@ -124,15 +126,12 @@ class GameItemViewHolder(var binding: GameItemBinding) : BaseRecyclerViewHolder<
                     background = R.drawable.bg_advance_download_game_subtitle.toDrawable(context)
                 }
             }
-            ConstraintSet().apply {
-                clone(rootContainer)
-                connect(
-                    R.id.game_name,
-                    ConstraintSet.END,
-                    if (entity.serverLabel != null && !entity.advanceDownload && !forceShowSubtitle) R.id.recent_played_tag else R.id.gameSubtitleTv,
-                    ConstraintSet.START
-                )
-            }.applyTo(rootContainer)
+            rootContainer?.let {
+                ConstraintSet().apply {
+                    clone(rootContainer)
+                    connect(R.id.game_name, ConstraintSet.END, if (entity.serverLabel != null && !entity.advanceDownload && !forceShowSubtitle) R.id.recent_played_tag else R.id.gameSubtitleTv, ConstraintSet.START)
+                }.applyTo(rootContainer)
+            }
         }
     }
 

app/src/main/java/com/gh/gamecenter/game/commoncollection/CommonCollectionViewHolder.kt

@@ -37,6 +37,8 @@ class CommonCollectionViewHolder(val binding: CommonCollectionListBinding) : Bas
                         if (newState == RecyclerView.SCROLL_STATE_IDLE) {
                             var position = mLayoutManager.findLastCompletelyVisibleItemPosition()
                             if (position == -1) position = mLayoutManager.findLastVisibleItemPosition() - 1
+                            if (position < 0) return
+
                             val linkEntity = mCollection?.commonCollectionList?.get(position)
                             NewLogUtils.logSlideCommonCollection(
                                 mCollection?.id ?: "",

app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalAdapter.kt

@@ -13,6 +13,7 @@ import com.gh.common.util.DownloadItemUtils
 import com.gh.gamecenter.R
 import com.gh.gamecenter.adapter.viewholder.GameViewHolder
 import com.gh.gamecenter.common.utils.dip2px
+import com.gh.gamecenter.common.utils.maxWidthExcludeZero
 import com.gh.gamecenter.common.utils.toColor
 import com.gh.gamecenter.common.utils.toDrawable
 import com.gh.gamecenter.common.view.AsyncUi
@@ -111,7 +112,7 @@ class GameVerticalAdapter(
                         }
                     }
                     mGameDesSpace.post {
-                        gameSubtitleTv.maxWidth = mGameDesSpace.width
+                        gameSubtitleTv.maxWidthExcludeZero(mGameDesSpace.width)
                     }
                 }
                 if (gameEntity.advanceDownload) {

app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt

@@ -639,7 +639,7 @@ open class GameCollectionDetailAdapter(
                             }
                         }
                         gameDesSpace.post {
-                            gameSubtitleTv.maxWidth = gameDesSpace.width
+                            gameSubtitleTv.maxWidthExcludeZero(gameDesSpace.width)
                         }
                     }
                     if (gameEntity.advanceDownload) {

app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionActivityLabelFragment.kt

@@ -7,10 +7,10 @@ import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.fragment.ToolbarFragment
+import com.gh.gamecenter.common.databinding.FragmentListBaseBinding
 import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.viewModelProvider
 import com.gh.gamecenter.common.view.divider.HorizontalDividerItemDecoration
-import com.gh.gamecenter.common.databinding.FragmentListBaseBinding
 import com.gh.gamecenter.entity.ActivityLabelEntity
 import com.gh.gamecenter.video.label.VideoLabelActivity
 import com.gh.gamecenter.video.label.VideoLabelAdapter
@@ -50,6 +50,7 @@ class GameCollectionActivityLabelFragment : ToolbarFragment() {
             if (it != null) {
                 mBinding.reuseNoConnection.root.visibility = View.GONE
                 if (it.isNotEmpty()) {
+                    mBinding.listRv.visibility = View.VISIBLE
                     mBinding.reuseNoneData.root.visibility = View.GONE
                     mAdapter?.setListData(it)
                 } else {

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

@@ -592,32 +592,36 @@ class GameDetailFragment : ToolbarFragment(), IScrollable {
     }
 
     private fun subtractGameNameIfNeeded(textView: TextView, name: CharSequence, tagLayout: FrameLayout) {
-        if (!isAdded) return
-        textView.run {
-            if (lineCount > 2 || (layout != null && layout.getEllipsisCount(1) > 0)) {
-                val displayName = name.substring(0, name.length - 2) + "…"
-                text = displayName
-                if (tagLayout.getChildAt(0) != null) {
-                    val tagView = tagLayout.getChildAt(0)
-                    tagView.layoutParams = (tagView.layoutParams as FrameLayout.LayoutParams).apply {
-                        setMargins(if (lineCount == 1) 0 else 4F.dip2px(), 0, 0, 0)
+        try {
+            if (!isAdded) return
+            textView.run {
+                if (lineCount > 2 || (layout != null && layout.getEllipsisCount(1) > 0)) {
+                    val displayName = name.substring(0, name.length - 2) + "…"
+                    text = displayName
+                    if (tagLayout.getChildAt(0) != null) {
+                        val tagView = tagLayout.getChildAt(0)
+                        tagView.layoutParams = (tagView.layoutParams as FrameLayout.LayoutParams).apply {
+                            setMargins(if (lineCount == 1) 0 else 4F.dip2px(), 0, 0, 0)
+                        }
                     }
-                }
-                val tagBitmap = tagLayout.convertViewToBitmap()
-                text = SpannableStringBuilder("$displayName ").apply {
-                    tagBitmap?.let {
-                        setSpan(
-                            CenterImageSpan(
-                                context,
-                                it
-                            ), displayName.length, displayName.length + 1, Spanned.SPAN_EXCLUSIVE_INCLUSIVE
-                        )
+                    val tagBitmap = tagLayout.convertViewToBitmap()
+                    text = SpannableStringBuilder("$displayName ").apply {
+                        tagBitmap?.let {
+                            setSpan(
+                                CenterImageSpan(
+                                    context,
+                                    it
+                                ), displayName.length, displayName.length + 1, Spanned.SPAN_EXCLUSIVE_INCLUSIVE
+                            )
+                        }
+                    }
+                    post {
+                        subtractGameNameIfNeeded(this, displayName, tagLayout)
                     }
-                }
-                post {
-                    subtractGameNameIfNeeded(this, displayName, tagLayout)
                 }
             }
+        } catch (e: Exception) {
+            SentryHelper.onEvent("GAME_DETAIL_SUBTRACT_GAME_NAME_ERROR", "exception_digest", e.localizedMessage)
         }
     }
 

app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt

@@ -13,31 +13,31 @@ import android.view.View
 import android.webkit.*
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
-import com.gh.gamecenter.common.base.activity.ToolBarActivity
-import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment
-import com.gh.gamecenter.core.AppExecutor
 import com.gh.common.DefaultJsApi
-import com.gh.gamecenter.common.constant.Constants
 import com.gh.common.util.*
 import com.gh.common.util.DialogUtils
 import com.gh.common.util.NewLogUtils
-import com.gh.gamecenter.common.view.dsbridge.DWebView
-import com.gh.gamecenter.common.view.dsbridge.OnReturnValue
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.R
 import com.gh.gamecenter.ShellActivity
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.adapter.viewholder.UnAvaliableWebviewViewHolder
+import com.gh.gamecenter.common.base.activity.ToolBarActivity
+import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment
 import com.gh.gamecenter.common.callback.CancelListener
+import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.entity.NotificationUgc
+import com.gh.gamecenter.common.mvvm.Status
 import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.common.view.dsbridge.DWebView
+import com.gh.gamecenter.common.view.dsbridge.OnReturnValue
+import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.databinding.ActivityRatingEditBinding
+import com.gh.gamecenter.databinding.FragmentWebWarningBinding
 import com.gh.gamecenter.entity.*
 import com.gh.gamecenter.login.user.UserManager
-import com.gh.gamecenter.common.mvvm.Status
-import com.gh.gamecenter.databinding.FragmentWebWarningBinding
 import com.gh.gamecenter.suggest.SuggestType
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
@@ -374,12 +374,10 @@ class RatingEditActivity : ToolBarActivity(), KeyboardHeightObserver {
                             }, TrackableEntity(event = "游戏评论跳转", key = "意见反馈弹窗")
                         )
                     }
+                    400401 -> {
+                        CheckLoginUtils.checkLogin(this, mEntrance) {}
+                    }
                     else -> {
-                        val errorCode = JSONObject(errorString ?: "").getInt("code")
-                        if (errorCode == 400401) {
-                            CheckLoginUtils.checkLogin(this, mEntrance) {}
-                            return@Observer
-                        }
                         ErrorHelper.handleError(this@RatingEditActivity, errorString, false, {
                             postGameComment(again = false)
                         }, "游戏评论及回复")

app/src/main/java/com/gh/gamecenter/history/HistoryGameListAdapter.kt

@@ -16,6 +16,7 @@ import com.gh.gamecenter.common.viewholder.FooterViewHolder
 import com.gh.gamecenter.adapter.viewholder.GameViewHolder
 import com.gh.gamecenter.common.baselist.ListAdapter
 import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.common.view.DrawableView
 import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.databinding.GameItemBinding
 import com.gh.gamecenter.databinding.PopupHistoryOptionBinding
@@ -149,6 +150,11 @@ class HistoryGameListAdapter(context: Context, private val mViewModel: HistoryGa
             }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true))
 
         }
+        mPopupBinding?.checkAllCb?.setCompoundDrawablesWithIntrinsicBounds(
+            DrawableView.getCheckSelectorDrawable(
+                mContext
+            ), null, null, null
+        )
         mPopupBinding?.checkAllCb?.setOnClickListener {
             if (mPopupBinding?.checkAllCb?.isChecked == true) {
                 selectItems.clear()

app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayItemViewHolder.kt

@@ -12,13 +12,16 @@ import com.gh.gamecenter.common.utils.toDrawable
 import com.gh.gamecenter.common.view.AsyncCell
 import com.gh.gamecenter.databinding.HomeAmwayItemBinding
 import com.gh.gamecenter.entity.AmwayCommentEntity
+import com.gh.gamecenter.game.GameItemViewHolder
 import com.gh.gamecenter.gamedetail.rating.edit.RatingEditActivity
 import java.util.regex.Pattern
 
 class HomeAmwayItemViewHolder(val binding: HomeAmwayItemBinding) : BaseRecyclerViewHolder<Any>(binding.root) {
 
     fun bindAmway(amway: AmwayCommentEntity) {
-        binding.gameIcon.displayGameIcon(amway.game.toGameEntity())
+        val gameEntity = amway.game.toGameEntity()
+
+        binding.gameIcon.displayGameIcon(gameEntity)
         binding.gameName.text = amway.game.name
         binding.amwayScoreNumber.text = amway.game.star.toString()
         BindingAdapters.setGameTags(binding.gameTags, amway.game.tag, 2)
@@ -51,6 +54,7 @@ class HomeAmwayItemViewHolder(val binding: HomeAmwayItemBinding) : BaseRecyclerV
             ratingName.setTextColor(R.color.text_subtitleDesc.toColor(root.context))
             all.setTextColor(R.color.text_title.toColor(root.context))
         }
+        GameItemViewHolder.initGameSubtitle(gameEntity, binding.gameSubtitleTv)
     }
 }
 

app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java

@@ -27,10 +27,12 @@ import com.gh.gamecenter.adapter.viewholder.NewsDigestViewHolder;
 import com.gh.gamecenter.databinding.NewsDigestItemBinding;
 import com.gh.gamecenter.entity.CommentnumEntity;
 import com.gh.gamecenter.entity.ConcernEntity;
+import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.entity.LibaoStatusEntity;
 import com.gh.gamecenter.entity.MeEntity;
 import com.gh.gamecenter.entity.UserDataLibaoEntity;
 import com.gh.gamecenter.entity.ViewsEntity;
+import com.gh.gamecenter.game.GameItemViewHolder;
 import com.gh.gamecenter.manager.CommentManager;
 import com.gh.gamecenter.login.user.UserManager;
 import com.gh.gamecenter.manager.VisitManager;
@@ -365,6 +367,9 @@ class ConcernAdapter extends BaseRecyclerAdapter<ViewHolder> {
             viewHolder.binding.newsDigestThumb.displayGameIcon(concernEntity.getGameIcon(), null);
         }
         viewHolder.binding.newsDigestTitle.setText(concernEntity.getGameName());
+
+        GameEntity gameEntity = concernEntity.getGame().toGameEntity();
+        GameItemViewHolder.initGameSubtitle(gameEntity, viewHolder.binding.gameSubtitleTv, null, null, false);
         NewsUtils.setNewsPublishOn(viewHolder.binding.newsDigestTime, concernEntity.getTime());
 
         if ("libao".equals(concernEntity.getType())) {

app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java

@@ -22,8 +22,10 @@ import com.gh.gamecenter.common.callback.OnRequestCallBackListener;
 import com.gh.gamecenter.common.constant.ItemViewType;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.databinding.LibaoItemBinding;
+import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.entity.LibaoEntity;
 import com.gh.gamecenter.entity.LibaoStatusEntity;
+import com.gh.gamecenter.game.GameItemViewHolder;
 import com.gh.gamecenter.login.user.UserManager;
 import com.gh.gamecenter.common.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
@@ -238,6 +240,9 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter<ViewHolder> {
             }
 //            LibaoUtils.setLiBaoBtnStatusRound(holder.libaoBtnStatus, libaoEntity, true, mContext);
         }
+
+        GameEntity gameEntity = libaoEntity.getGame().toGameEntity();
+        GameItemViewHolder.initGameSubtitle(gameEntity, holder.binding.gameSubtitleTv, null, null, false);
     }
 
     private void initFooterViewHolder(FooterViewHolder holder) {

app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java

@@ -25,10 +25,12 @@ import com.gh.gamecenter.R;
 import com.gh.gamecenter.common.viewholder.FooterViewHolder;
 import com.gh.gamecenter.adapter.viewholder.LibaoNormalViewHolder;
 import com.gh.gamecenter.databinding.LibaoItemBinding;
+import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.entity.LibaoEntity;
 import com.gh.gamecenter.entity.LibaoStatusEntity;
 import com.gh.gamecenter.entity.MeEntity;
 import com.gh.gamecenter.entity.UserDataLibaoEntity;
+import com.gh.gamecenter.game.GameItemViewHolder;
 import com.gh.gamecenter.login.user.UserManager;
 import com.gh.gamecenter.common.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
@@ -261,6 +263,9 @@ class Libao3FragmentAdapter extends BaseRecyclerAdapter<RecyclerView.ViewHolder>
 
             holder.binding.libaoBtnStatus.setText("复制");
             holder.binding.libaoBtnStatus.setBackgroundResource(R.drawable.button_normal_round_style);
+
+            GameEntity gameEntity = libaoEntity.getGame().toGameEntity();
+            GameItemViewHolder.initGameSubtitle(gameEntity, holder.binding.gameSubtitleTv, null, null, false);
         } else if (viewHolder instanceof FooterViewHolder) {
             initFooterViewHolder((FooterViewHolder) viewHolder);
         }

app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java

@@ -20,10 +20,12 @@ import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.core.utils.UrlFilterUtils;
 import com.gh.gamecenter.databinding.LibaoItemBinding;
+import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.entity.LibaoEntity;
 import com.gh.gamecenter.entity.MeEntity;
 import com.gh.gamecenter.entity.UserDataLibaoEntity;
 import com.gh.gamecenter.common.retrofit.Response;
+import com.gh.gamecenter.game.GameItemViewHolder;
 import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.lightgame.adapter.BaseRecyclerAdapter;
 
@@ -168,6 +170,8 @@ public class LibaoHistoryAdapter extends BaseRecyclerAdapter<ViewHolder> {
             LibaoUtils.setLiBaoBtnStatusRound(viewHolder.binding.libaoBtnStatus,
                     libaoEntity, true, mContext);
 
+            GameEntity gameEntity = libaoEntity.getGame().toGameEntity();
+            GameItemViewHolder.initGameSubtitle(gameEntity, viewHolder.binding.gameSubtitleTv, null, null, false);
         } else {
             FooterViewHolder viewHolder = (FooterViewHolder) holder;
             viewHolder.initFooterViewHolder(isLoading, isNetworkError, isOver, v -> {

app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt

@@ -18,6 +18,7 @@ import com.gh.gamecenter.databinding.LibaoItemBinding
 import com.gh.gamecenter.entity.LibaoEntity
 import com.gh.gamecenter.entity.LibaoStatusEntity
 import com.gh.gamecenter.common.retrofit.Response
+import com.gh.gamecenter.game.GameItemViewHolder
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.lightgame.adapter.BaseRecyclerAdapter
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -224,6 +225,10 @@ class LibaoNewAdapter(
                 }
             }
         }
+
+        libaoEntity.game?.toGameEntity()?.let {
+            GameItemViewHolder.initGameSubtitle(it, holder.binding.gameSubtitleTv)
+        }
     }
 
     fun getLibaoListSize(): Int {

app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt

@@ -126,7 +126,7 @@ class MyFollowedGameAdapter(context: Context, var mViewModel: MyFollowedGameView
                                     }
                                 }
                                 gameDesSpace.post {
-                                    gameSubtitleTv.maxWidth = gameDesSpace.width
+                                    gameSubtitleTv.maxWidthExcludeZero(gameDesSpace.width)
                                 }
                             }
                             if (gameEntity.advanceDownload) {

app/src/main/java/com/gh/gamecenter/mygame/MyReservationAdapter.kt

@@ -127,7 +127,7 @@ class MyReservationAdapter(context: Context, var mViewModel: MyReservationViewMo
                                 }
                             }
                             gameDesSpace.post {
-                                gameSubtitleTv.maxWidth = gameDesSpace.width
+                                gameSubtitleTv.maxWidthExcludeZero(gameDesSpace.width)
                             }
                         }
                         if (gameEntity.advanceDownload) {

app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt

@@ -165,7 +165,7 @@ open class PlayedGameAdapter(
                             }
                         }
                         gameDesSpace.post {
-                            gameSubtitleTv.maxWidth = gameDesSpace.width
+                            gameSubtitleTv.maxWidthExcludeZero(gameDesSpace.width)
                         }
                     }
                     if (gameEntity.advanceDownload) {

app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java

@@ -756,7 +756,7 @@ public interface ApiService {
      * 新的设置接口
      */
     @GET("settings")
-    Single<NewSettingsEntity> getNewSettings(@Query("version") String version, @Query("channel") String channel);
+    Single<NewApiSettingsEntity> getNewSettings(@Query("version") String version, @Query("channel") String channel);
 
     /**
      * 获取新的配置信息，因为旧的已经太大了避免冲突

app/src/main/java/com/gh/gamecenter/room/converter/TagStyleConverter.kt

@@ -0,0 +1,20 @@
+package com.gh.gamecenter.room.converter
+
+import androidx.room.TypeConverter
+import com.gh.gamecenter.common.utils.toJson
+import com.gh.gamecenter.common.utils.toObject
+import com.gh.gamecenter.entity.TagStyleEntity
+
+class TagStyleConverter {
+
+    @TypeConverter
+    fun toString(entity: TagStyleEntity?): String {
+        return entity?.toJson() ?: ""
+    }
+
+    @TypeConverter
+    fun toObject(value: String?): TagStyleEntity {
+        return value?.toObject() ?: TagStyleEntity()
+    }
+
+}

app/src/main/java/com/gh/gamecenter/search/SearchGameIndexAdapter.kt

@@ -166,7 +166,7 @@ class SearchGameIndexAdapter(
                             }
                         }
                         gameDesSpace.post {
-                            gameSubtitleTv.maxWidth = gameDesSpace.width
+                            gameSubtitleTv.maxWidthExcludeZero(gameDesSpace.width)
                         }
                     }
                     if (gameEntity.advanceDownload) {

app/src/main/java/com/gh/gamecenter/search/SearchGameIndexItemViewHolder.kt

@@ -10,6 +10,7 @@ import com.gh.common.exposure.ExposureSource
 import com.gh.common.util.DirectUtils
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.toColor
+import com.gh.gamecenter.common.utils.toDrawable
 import com.gh.gamecenter.common.view.DrawableView
 import com.gh.gamecenter.databinding.SearchGameIndexItemBinding
 import com.gh.gamecenter.databinding.SearchSubjectItemBinding
@@ -75,7 +76,7 @@ class SearchSubjectItemViewHolder(var binding: SearchSubjectItemBinding) : Recyc
             headContainer.headActionTv.setCompoundDrawablesWithIntrinsicBounds(
                 null,
                 null,
-                VectorDrawableCompat.create(context.resources, R.drawable.ic_home_head_arrow, null),
+                R.drawable.ic_home_head_arrow.toDrawable(context),
                 null
             )
             headContainer.headActionTv.setOnClickListener {

app/src/main/java/com/gh/gamecenter/search/SearchGameResultAdapter.kt

@@ -228,7 +228,7 @@ class SearchGameResultAdapter(
                     }
                 }
                 gameDesSpace.post {
-                    gameSubtitleTv.maxWidth = gameDesSpace.width
+                    gameSubtitleTv.maxWidthExcludeZero(gameDesSpace.width)
                 }
             }
             if (gameEntity.advanceDownload) {

app/src/main/java/com/gh/gamecenter/servers/GameServersContentAdapter.kt

@@ -25,6 +25,7 @@ import com.gh.gamecenter.common.utils.toColor
 import com.gh.gamecenter.common.utils.toDrawable
 import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.game.GameItemViewHolder
 import com.lightgame.adapter.BaseRecyclerAdapter
 import java.text.SimpleDateFormat
 import java.util.*
@@ -299,6 +300,8 @@ class GameServersContentAdapter(
             viewHolder.binding.home2TestType.background = getServerDrawableBySource(R.color.tag_orange)
         }
 
+        GameItemViewHolder.initGameSubtitle(gameEntity, viewHolder.binding.gameSubtitleTv, forceShowSubtitle = true)
+
         if (gameEntity.fixedTop!!) {
             val tag = "今日开服"
             viewHolder.binding.home2TestType.visibility = View.VISIBLE

app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListAdapter.kt

@@ -36,6 +36,7 @@ import com.gh.gamecenter.common.baselist.ListAdapter
 import com.gh.gamecenter.common.callback.BiCallback
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.common.view.DrawableView
 import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.databinding.SimulatorGameItemBinding
 import com.gh.gamecenter.databinding.SimulatorHeaderViewBinding
@@ -199,6 +200,7 @@ class SimulatorGameListAdapter(
                         recommendStar.rating = gameEntity.recommendStar.toFloat()
                     }
                     gameItemIncluded.recentPlayedTag.goneIf(!gameEntity.isRecentlyPlayed)
+                    gameItemIncluded.selectIv.setImageDrawable(DrawableView.getCheckSelectorDrawable(mContext))
                     gameItemIncluded.selectIv.goneIf(!mShowSelectFlag)
                     gameItemIncluded.selectIv.isChecked = mSelectList[position - 1]
                     gameItemIncluded.selectIv.setOnClickListener {

app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt

@@ -6,14 +6,14 @@ import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.gh.gamecenter.R
+import com.gh.gamecenter.common.base.fragment.ToolbarFragment
 import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.databinding.FragmentListBaseBinding
 import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.viewModelProvider
 import com.gh.gamecenter.common.view.divider.HorizontalDividerItemDecoration
-import com.gh.gamecenter.R
 import com.gh.gamecenter.entity.ActivityLabelEntity
-import com.gh.gamecenter.common.base.fragment.ToolbarFragment
-import com.gh.gamecenter.common.databinding.FragmentListBaseBinding
 import com.gh.gamecenter.qa.dialog.ChooseActivityDialogFragment
 
 class VideoLabelFragment : ToolbarFragment() {
@@ -53,6 +53,7 @@ class VideoLabelFragment : ToolbarFragment() {
             if (it != null) {
                 mBinding.reuseNoConnection.root.visibility = View.GONE
                 if (it.isNotEmpty()) {
+                    mBinding.listRv.visibility = View.VISIBLE
                     mBinding.reuseNoneData.root.visibility = View.GONE
                     mAdapter?.setListData(it)
                 } else {

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

@@ -25,6 +25,7 @@ import com.gh.gamecenter.common.baselist.LoadType
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.ItemViewType
 import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.common.view.DrawableView
 import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.utils.CurrentActivityHolder
@@ -136,7 +137,7 @@ class VDownloadManagerAdapter(
                 holder.binding.descTv.goneIf(!mViewModel.isTypeDownloaded() || gameEntity.des?.isEmpty() == true)
                 holder.binding.descTv.text = gameEntity.des
 
-                holder.binding.selectIv.setImageDrawable(R.drawable.selector_ic_simulator.toDrawable(mContext))
+                holder.binding.selectIv.setImageDrawable(DrawableView.getCheckSelectorDrawable(mContext))
                 holder.binding.selectIv.goneIf(mCurrentOption == ManageOption.OPTION_MANAGER)
                 holder.binding.selectIv.isChecked = selectItems.contains(gameEntity.id)
 
@@ -242,6 +243,11 @@ class VDownloadManagerAdapter(
                 extraConfig = DialogHelper.Config(centerTitle = true)
             )
         }
+        mPopupBinding?.checkAllCb?.setCompoundDrawablesWithIntrinsicBounds(
+            DrawableView.getCheckSelectorDrawable(
+                mContext
+            ), null, null, null
+        )
         mPopupBinding?.checkAllCb?.setOnClickListener {
             if (mPopupBinding?.checkAllCb?.isChecked == true) {
                 selectItems.clear()
@@ -261,7 +267,7 @@ class VDownloadManagerAdapter(
             checkAllCb.setTextColor(R.color.text_title.toColor(mContext))
             selectNumTv.setTextColor(R.color.theme_font.toColor(mContext))
             checkAllCb.setCompoundDrawablesWithIntrinsicBounds(
-                R.drawable.selector_ic_simulator.toDrawable(mContext),
+                DrawableView.getCheckSelectorDrawable(mContext),
                 null,
                 null,
                 null

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

@@ -5,6 +5,7 @@ import android.annotation.SuppressLint
 import android.content.ContentValues
 import android.content.Context
 import android.content.Intent
+import android.database.sqlite.SQLiteFullException
 import android.net.Uri
 import android.os.Build
 import android.text.TextUtils
@@ -610,9 +611,13 @@ object VHelper {
      */
     private fun updateVGamePlayedTime(packageName: String, lastPlayedTime: Long, totalPlayedTime: Long) {
         getVGameSnapshot(null, packageName)?.let {
-            it.downloadEntity.addMetaExtra(KEY_LAST_PLAYED_TIME, totalPlayedTime.toString())
+            it.downloadEntity.addMetaExtra(KEY_LAST_PLAYED_TIME, lastPlayedTime.toString())
             it.downloadEntity.addMetaExtra(KEY_TOTAL_PLAYED_TIME, totalPlayedTime.toString())
-            mVGameDao.insert(it)
+            try {
+                mVGameDao.insert(it)
+            } catch (e: SQLiteFullException) {
+                ToastUtils.toast("设备存储空间不足，请清理后重试")
+            }
         }
 
         // 更新首页排序

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

@@ -98,6 +98,8 @@ public class HaloApp extends MultiDexApplication {
     public boolean isBrandNewInstall = false; // 当前用户是否是安装光环后第一次打开
     public boolean isNewForThisVersion = false; // 当前用户是否是安装当前版本后第一次打开 (包括全新和更新)
     public boolean isRunningForeground = false;  // 标记当前 APP 是否处于前台运行中
+
+    public boolean isAlreadyUpAndRunning = false; // 应用是否处于运行中状态 (进入到 MainActivity 就当运行中)
     private List<String> webViewAbiList;
     private ChannelProvider mChannelProvider = new ChannelProviderImp();
     private final ServiceLoader<IApplication> mApplicationList = ServiceLoader.load(IApplication.class, this.getClass().getClassLoader());

app/src/main/res/drawable/selector_ic_simulator.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/ic_video_setting_select" android:state_checked="true" />
-    <item android:drawable="@drawable/ic_selector_default" />
-
-</selector>

app/src/main/res/layout/amway_comment_item.xml

@@ -46,10 +46,33 @@
                     android:textColor="@color/title"
                     android:textSize="15sp"
                     android:textStyle="bold"
+                    app:layout_constrainedWidth="true"
+                    app:layout_constraintHorizontal_bias="0"
+                    app:layout_constraintHorizontal_chainStyle="packed"
                     app:layout_constraintLeft_toRightOf="@id/gameIconView"
+                    app:layout_constraintRight_toLeftOf="@id/gameSubtitleTv"
                     app:layout_constraintTop_toTopOf="@id/gameIconView"
                     tools:text="我的世界（像素村落）如果有很长的文字的话就截断处理" />
 
+                <TextView
+                    android:id="@+id/gameSubtitleTv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="14dp"
+                    android:layout_marginLeft="4dp"
+                    android:background="@drawable/bg_advance_download_game_subtitle"
+                    android:paddingLeft="2dp"
+                    android:paddingRight="2dp"
+                    android:singleLine="true"
+                    android:textColor="@color/text_subtitle"
+                    android:textSize="@dimen/tag_text_size"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="@+id/gameNameTv"
+                    app:layout_constraintLeft_toRightOf="@+id/gameNameTv"
+                    app:layout_constraintRight_toRightOf="@+id/parent"
+                    app:layout_constraintTop_toTopOf="@+id/gameNameTv"
+                    app:layout_goneMarginLeft="0dp"
+                    tools:text="副标题" />
+
                 <ImageView
                     android:id="@+id/starIv"
                     android:layout_width="12dp"

app/src/main/res/layout/category_game_item.xml

@@ -36,8 +36,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@+id/game_order"
         app:layout_constraintRight_toLeftOf="@+id/gameIconView"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/selector_ic_simulator" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <com.gh.common.view.GameIconView
         android:id="@+id/gameIconView"
@@ -60,14 +59,45 @@
         android:textStyle="bold"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toTopOf="@+id/gameDescContainer"
+        app:layout_constraintEnd_toStartOf="@+id/recent_played_tag"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintLeft_toLeftOf="@+id/gameDescContainer"
-        app:layout_constraintRight_toLeftOf="@+id/recent_played_tag"
+        app:layout_constraintStart_toStartOf="@+id/gameDescContainer"
         app:layout_constraintTop_toTopOf="@+id/gameIconView"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="地海争霸：巫妖王再怒" />
 
+    <TextView
+        android:id="@+id/gameSubtitleTv"
+        android:layout_width="wrap_content"
+        android:layout_height="14dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginLeft="4dp"
+        android:background="@drawable/bg_advance_download_game_subtitle"
+        android:paddingStart="2dp"
+        android:paddingEnd="2dp"
+        android:singleLine="true"
+        android:textColor="@color/text_subtitle"
+        android:textSize="@dimen/tag_text_size"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/game_name"
+        app:layout_constraintEnd_toEndOf="@+id/gameDesSpace"
+        app:layout_constraintStart_toEndOf="@+id/game_name"
+        app:layout_constraintTop_toTopOf="@+id/game_name"
+        app:layout_goneMarginStart="0dp"
+        tools:text="副标题"
+        tools:visibility="visible" />
+
+    <Space
+        android:id="@+id/gameDesSpace"
+        android:layout_width="0dp"
+        android:layout_height="28dp"
+        android:background="@color/black"
+        app:layout_constraintBottom_toTopOf="@+id/label_list"
+        app:layout_constraintEnd_toStartOf="@+id/download_btn"
+        app:layout_constraintStart_toEndOf="@+id/gameIconView"
+        app:layout_constraintTop_toBottomOf="@+id/game_name" />
+
     <TextView
         android:id="@+id/recent_played_tag"
         android:layout_width="44dp"
@@ -80,9 +110,10 @@
         android:textSize="9sp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/game_name"
-        app:layout_constraintLeft_toRightOf="@+id/game_name"
-        app:layout_constraintRight_toLeftOf="@+id/game_kaifu_type"
-        app:layout_constraintTop_toTopOf="@+id/game_name" />
+        app:layout_constraintEnd_toStartOf="@+id/game_kaifu_type"
+        app:layout_constraintStart_toEndOf="@+id/game_name"
+        app:layout_constraintTop_toTopOf="@+id/game_name"
+        tools:visibility="visible" />
 
     <TextView
         android:id="@+id/game_kaifu_type"
@@ -99,9 +130,11 @@
         android:textSize="9sp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/game_name"
-        app:layout_constraintLeft_toRightOf="@+id/recent_played_tag"
-        app:layout_constraintRight_toRightOf="@+id/gameDescContainer"
-        app:layout_constraintTop_toTopOf="@+id/game_name" />
+        app:layout_constraintEnd_toEndOf="@+id/gameDescContainer"
+        app:layout_constraintStart_toEndOf="@+id/recent_played_tag"
+        app:layout_constraintTop_toTopOf="@+id/game_name"
+        tools:text="九游版"
+        tools:visibility="visible" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/gameDescContainer"

app/src/main/res/layout/discovery_game_item.xml

@@ -39,8 +39,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@+id/game_order"
         app:layout_constraintRight_toLeftOf="@+id/gameIconView"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/selector_ic_simulator" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <com.gh.common.view.GameIconView
         android:id="@+id/gameIconView"

app/src/main/res/layout/fragment_community_home.xml

@@ -80,7 +80,7 @@
             android:layout_width="14dp"
             android:layout_height="14dp"
             android:layout_marginLeft="8dp"
-            android:src="@drawable/toolbar_search_icon"
+            app:srcCompat="@drawable/toolbar_search_icon"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent" />

app/src/main/res/layout/fragment_search_game.xml

@@ -53,7 +53,7 @@
                 android:layout_height="16dp"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="12dp"
-                android:src="@drawable/toolbar_search_icon"
+                app:srcCompat="@drawable/toolbar_search_icon"
                 app:layout_constraintBottom_toBottomOf="@+id/search_input"
                 app:layout_constraintStart_toStartOf="@+id/search_input"
                 app:layout_constraintTop_toTopOf="@+id/search_input" />

app/src/main/res/layout/fragment_toolbar.xml

@@ -69,7 +69,7 @@
             android:layout_height="16dp"
             android:layout_centerVertical="true"
             android:layout_marginLeft="13dp"
-            android:src="@drawable/toolbar_search_icon" />
+            app:srcCompat="@drawable/toolbar_search_icon" />
 
         <TextView
             android:id="@+id/actionbar_search_input"

app/src/main/res/layout/game_item.xml

@@ -36,8 +36,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@+id/game_order"
         app:layout_constraintRight_toLeftOf="@+id/gameIconView"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/selector_ic_simulator" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <com.gh.common.view.GameIconView
         android:id="@+id/gameIconView"
@@ -101,6 +100,7 @@
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/game_name"
         app:layout_constraintLeft_toRightOf="@+id/game_name"
+        app:layout_constraintRight_toLeftOf="@+id/game_kaifu_type"
         app:layout_constraintTop_toTopOf="@+id/game_name" />
 
     <TextView

app/src/main/res/layout/game_test_item.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:fresco="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
@@ -30,7 +31,7 @@
             android:layout_weight="1"
             android:orientation="vertical">
 
-            <RelativeLayout
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -45,7 +46,32 @@
                     android:singleLine="true"
                     android:textColor="@color/text_title"
                     android:textSize="14sp"
-                    android:textStyle="bold" />
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:text="who let dog out" />
+
+                <TextView
+                    android:id="@+id/gameSubtitleTv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="14dp"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginLeft="4dp"
+                    android:layout_toRightOf="@id/home2_game_nameAndsize"
+                    android:background="@drawable/bg_advance_download_game_subtitle"
+                    android:paddingStart="2dp"
+                    android:paddingEnd="2dp"
+                    android:singleLine="true"
+                    android:textColor="@color/text_subtitle"
+                    android:textSize="@dimen/tag_text_size"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="@id/home2_game_nameAndsize"
+                    app:layout_constraintStart_toEndOf="@id/home2_game_nameAndsize"
+                    app:layout_constraintTop_toTopOf="@id/home2_game_nameAndsize"
+                    app:layout_goneMarginStart="0dp"
+                    tools:text="副标题"
+                    tools:visibility="visible" />
 
                 <TextView
                     android:id="@+id/home2_game_server_type"
@@ -57,10 +83,15 @@
                     android:paddingLeft="3dp"
                     android:paddingRight="3dp"
                     android:paddingBottom="0.5dp"
+                    android:text="九游版"
                     android:textColor="@color/white"
                     android:textSize="9sp"
-                    android:visibility="gone" />
-            </RelativeLayout>
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="@id/home2_game_nameAndsize"
+                    app:layout_constraintStart_toEndOf="@id/gameSubtitleTv"
+                    app:layout_constraintTop_toTopOf="@id/home2_game_nameAndsize"
+                    tools:visibility="visible" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -167,8 +198,8 @@
             android:id="@+id/home2_download_btn"
             android:layout_width="60dp"
             android:layout_height="28.5dp"
-            fresco:download_button_show_progress="false"
-            fresco:download_button_text_size="12sp" />
+            app:download_button_show_progress="false"
+            app:download_button_text_size="12sp" />
     </LinearLayout>
 
     <FrameLayout

app/src/main/res/layout/home_amway_item.xml

@@ -31,21 +31,43 @@
 
     <TextView
         android:id="@+id/game_name"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="12dp"
         android:layout_marginTop="8dp"
-        android:layout_marginRight="12dp"
+        android:layout_marginRight="8dp"
         android:includeFontPadding="false"
         android:singleLine="true"
         android:textColor="@color/text_title"
         android:textSize="16sp"
         android:textStyle="bold"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constrainedWidth="true"
         app:layout_constraintLeft_toRightOf="@id/game_icon"
-        app:layout_constraintRight_toRightOf="@id/amway_background"
+        app:layout_constraintRight_toLeftOf="@id/gameSubtitleTv"
         app:layout_constraintTop_toTopOf="@id/amway_background"
         tools:text="泡面三国" />
 
+    <TextView
+        android:id="@+id/gameSubtitleTv"
+        android:layout_width="wrap_content"
+        android:layout_height="14dp"
+        android:layout_marginRight="16dp"
+        android:background="@drawable/bg_advance_download_game_subtitle"
+        android:paddingLeft="2dp"
+        android:paddingRight="2dp"
+        android:singleLine="true"
+        android:textColor="@color/text_subtitle"
+        android:textSize="@dimen/tag_text_size"
+        android:visibility="gone"
+        app:layout_goneMarginStart="0dp"
+        app:layout_constraintBottom_toBottomOf="@+id/game_name"
+        app:layout_constraintLeft_toRightOf="@+id/game_name"
+        app:layout_constraintTop_toTopOf="@+id/game_name"
+        app:layout_constraintRight_toRightOf="@id/amway_background"
+        tools:text="副标题" />
+
     <ImageView
         android:id="@+id/amway_score_icon"
         android:layout_width="wrap_content"

app/src/main/res/layout/item_vgame_download_manager.xml

@@ -21,7 +21,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/selector_ic_simulator"
         tools:visibility="visible" />
 
     <com.gh.common.view.GameIconView

app/src/main/res/layout/layout_search_bar.xml

@@ -47,7 +47,7 @@
         android:layout_centerVertical="true"
         android:layout_marginStart="12dp"
         android:layout_marginLeft="12dp"
-        android:src="@drawable/toolbar_search_icon"
+        app:srcCompat="@drawable/toolbar_search_icon"
         app:layout_constraintBottom_toBottomOf="@id/search_background"
         app:layout_constraintLeft_toLeftOf="@id/search_background"
         app:layout_constraintTop_toTopOf="@id/search_background" />

app/src/main/res/layout/libao_item.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -33,16 +34,49 @@
             android:textColor="@color/text_title"
             android:textSize="16sp" />
 
-        <TextView
-            android:id="@+id/libao_game_name"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:layout_marginBottom="6dp"
-            android:includeFontPadding="false"
-            android:singleLine="true"
-            android:textColor="@color/text_subtitleDesc"
-            android:textSize="12sp" />
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/libao_game_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                android:layout_marginBottom="6dp"
+                android:includeFontPadding="false"
+                android:singleLine="true"
+                android:textColor="@color/text_subtitleDesc"
+                android:textSize="12sp"
+                app:layout_constrainedWidth="true"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/gameSubtitleTv"
+                app:layout_constraintHorizontal_bias="0"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_chainStyle="packed"
+                tools:text="who let the dog out" />
+
+            <TextView
+                android:id="@+id/gameSubtitleTv"
+                android:layout_width="wrap_content"
+                android:layout_height="14dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="4dp"
+                android:background="@drawable/bg_advance_download_game_subtitle"
+                android:paddingLeft="2dp"
+                android:paddingRight="2dp"
+                android:singleLine="true"
+                android:textColor="@color/text_subtitle"
+                android:textSize="@dimen/tag_text_size"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="@+id/libao_game_name"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/libao_game_name"
+                app:layout_constraintTop_toTopOf="@+id/libao_game_name"
+                tools:text="副标题" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <TextView
             android:id="@+id/libao_des"

app/src/main/res/layout/libaodetail_item_top.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/background_white"
@@ -35,13 +37,49 @@
                 android:gravity="center_vertical"
                 android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/libaodetail_name"
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:textColor="@color/title"
-                    android:textSize="16sp" />
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/libaodetail_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:layout_marginBottom="6dp"
+                        android:includeFontPadding="false"
+                        android:singleLine="true"
+                        android:textColor="@color/title"
+                        android:textSize="16sp"
+                        app:layout_constrainedWidth="true"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/gameSubtitleTv"
+                        app:layout_constraintHorizontal_bias="0"
+                        app:layout_constraintHorizontal_chainStyle="packed"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintVertical_chainStyle="packed"
+                        tools:text="who let the dog out" />
+
+                    <TextView
+                        android:id="@+id/gameSubtitleTv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="14dp"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="4dp"
+                        android:background="@drawable/bg_advance_download_game_subtitle"
+                        android:paddingLeft="2dp"
+                        android:paddingRight="2dp"
+                        android:singleLine="true"
+                        android:textColor="@color/text_subtitle"
+                        android:textSize="@dimen/tag_text_size"
+                        android:visibility="gone"
+                        app:layout_constraintBottom_toBottomOf="@id/libaodetail_name"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toEndOf="@id/libaodetail_name"
+                        app:layout_constraintTop_toTopOf="@id/libaodetail_name"
+                        tools:text="副标题" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <TextView
                     android:id="@+id/libaodetail_game_name"

app/src/main/res/layout/news_digest_item.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/reuse_listview_item_style"
@@ -21,19 +23,57 @@
             android:layout_marginRight="11dp" />
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_toRightOf="@id/news_digest_thumb"
             android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/news_digest_title"
-                android:layout_width="wrap_content"
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="7dp"
-                android:textColor="@color/text_black"
-                android:textSize="16sp" />
+                android:layout_marginBottom="7dp">
+
+                <TextView
+                    android:id="@+id/news_digest_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:layout_marginBottom="6dp"
+                    android:includeFontPadding="false"
+                    android:singleLine="true"
+                    android:textColor="@color/text_black"
+                    android:textSize="16sp"
+                    app:layout_constrainedWidth="true"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/gameSubtitleTv"
+                    app:layout_constraintHorizontal_bias="0"
+                    app:layout_constraintHorizontal_chainStyle="packed"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_chainStyle="packed"
+                    tools:text="who let the dog out" />
+
+                <TextView
+                    android:id="@+id/gameSubtitleTv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="14dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4dp"
+                    android:background="@drawable/bg_advance_download_game_subtitle"
+                    android:paddingLeft="2dp"
+                    android:paddingRight="2dp"
+                    android:singleLine="true"
+                    android:textColor="@color/text_subtitle"
+                    android:textSize="@dimen/tag_text_size"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="@+id/news_digest_title"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/news_digest_title"
+                    app:layout_constraintTop_toTopOf="@+id/news_digest_title"
+                    tools:visibility="visible"
+                    tools:text="副标题" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
             <TextView
                 android:id="@+id/news_digest_time"

app/src/main/res/layout/popup_history_option.xml

@@ -17,8 +17,7 @@
         android:button="@null"
         android:drawablePadding="6dp"
         android:text="全选"
-        android:textColor="@color/text_title"
-        app:drawableLeftCompat="@drawable/selector_ic_simulator" />
+        android:textColor="@color/text_title" />
 
     <TextView
         android:id="@+id/selectNumTv"

dependencies.gradle

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

module_common/build.gradle

@@ -16,6 +16,8 @@ android {
             }
         }
 
+        vectorDrawables.useSupportLibrary = true
+
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode rootProject.ext.versionCode

module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity.java

@@ -80,6 +80,9 @@ import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 
+import io.sentry.Breadcrumb;
+import io.sentry.Sentry;
+import io.sentry.SentryLevel;
 import kotlin.Pair;
 import pub.devrel.easypermissions.EasyPermissions;
 
@@ -564,12 +567,19 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
             // 这里根据调用栈是否存在 DarkModeUtils 来确定是否为系统回调
             StackTraceElement[] trace = Thread.currentThread().getStackTrace();
             for (StackTraceElement element : trace) {
-                if (element.getClassName().contains(DarkModeUtils.class.getSimpleName())) {
+                if (element.getClassName().equals(DarkModeUtils.class.getName())) {
                     isCalledBySystem = false;
                     break;
                 }
             }
 
+            Breadcrumb breadcrumb = new Breadcrumb();
+            breadcrumb.setCategory("onConfigurationChanged");
+            breadcrumb.setMessage("IsCalledBySystem " + isCalledBySystem + ","
+                    + this.getClass().getSimpleName() + " lifecycle is " + getLifecycle().getCurrentState());
+            breadcrumb.setLevel(SentryLevel.INFO);
+            Sentry.addBreadcrumb(breadcrumb);
+
             if (BuildConfig.IS_DARK_MODE_ON && mIsDarkModeOn != DarkModeUtils.INSTANCE.isDarkModeOn(this)) {
                 // 当且仅当页面处于可见状态时响应新的 UiMode，并将它传递下去
                 // （在不可见的 activity 调用 onConfigurationChanged 方法有一定概率触发 ANR）

module_common/src/main/java/com/gh/gamecenter/common/constant/Constants.java

@@ -207,6 +207,9 @@ public class Constants {
     // 补充配置项
     public static final String SP_NEW_SETTINGS = "new_settings";
 
+    // 新接口配置项
+    public static final String SP_NEW_API_SETTINGS = "new_api_settings";
+
     // 畅玩组件的配置
     public static final String SP_V_SETTINGS = "v_settings";
 

module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt

@@ -1,6 +1,7 @@
 package com.gh.gamecenter.common.utils
 
 import android.animation.Animator
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.ClipData
 import android.content.ClipboardManager
@@ -854,6 +855,15 @@ fun TextView.setTextWithInterceptingInternalUrl(text: CharSequence) {
     setText(ssb)
 }
 
+/**
+ * 为 TextView 设置最大宽度，忽略入参为 0 的场景
+ */
+fun TextView.maxWidthExcludeZero(width: Int) {
+    if (width != 0) {
+        maxWidth = width
+    }
+}
+
 fun CharSequence.interceptUrlSpanAndRoundImageSpan(clickedCallback: ((url: String) -> Unit)? = null): SpannableStringBuilder {
     return SpannableStringBuilder.valueOf(this).apply {
         getSpans(0, length, URLSpan::class.java).forEach {
@@ -1271,8 +1281,15 @@ fun String.emojiCount(): Int {
 /**
  * WebView启用强制深色模式
  */
+@SuppressLint("RequiresFeature")
 fun WebView.enableForceDark(isDarkModeOn: Boolean) {
-    if (BuildConfig.IS_DARK_MODE_ON && WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) {
+    val isFeatureSupported = try {
+        WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)
+    } catch (throwable: Throwable) {
+        throwable.printStackTrace()
+        false
+    }
+    if (BuildConfig.IS_DARK_MODE_ON && isFeatureSupported) {
         WebSettingsCompat.setForceDark(
             settings,
             if (isDarkModeOn) WebSettingsCompat.FORCE_DARK_ON else WebSettingsCompat.FORCE_DARK_OFF

module_common/src/main/java/com/gh/gamecenter/common/utils/NewFlagLogUtils.kt

@@ -0,0 +1,49 @@
+package com.gh.gamecenter.common.utils
+
+import com.gh.gamecenter.common.json.JsonObjectBuilder
+import com.gh.gamecenter.common.json.json
+import com.gh.gamecenter.common.loghub.LoghubUtils
+import com.lightgame.utils.Utils
+import org.json.JSONObject
+
+object NewFlagLogUtils {
+
+    private fun log(jsonObject: JSONObject, logStore: String, uploadImmediately: Boolean) {
+        Utils.log("NewFlatLogUtils", jsonObject.toString(4))
+        LoghubUtils.log(jsonObject, logStore, uploadImmediately, true)
+    }
+
+    private fun parseAndPutMeta(): JsonObjectBuilder.() -> Unit = {
+        val meta = LogUtils.getMetaObject()
+        val metaKeys = meta.keys()
+        while (metaKeys.hasNext()) {
+            val key: String = metaKeys.next().toString()
+            val value = meta.getString(key)
+            key to value
+        }
+    }
+
+    /**
+     * 记录外部存储权限提示弹窗出现
+     */
+    fun logExternalStoragePermissionDialogAppearance() {
+        val json = json {
+            "event" to "storage_permission_pop_show"
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    /**
+     * 记录外部存储权限弹窗行为
+     */
+    fun logExternalStoragePermissionDialogAction(action: String) {
+        val json = json {
+            "event" to "storage_permission_pop_click"
+            "button" to action
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+}

module_common/src/main/java/com/gh/gamecenter/common/utils/PermissionHelper.kt

@@ -249,14 +249,25 @@ object PermissionHelper {
     }
 
     private fun showDialogBeforeRequestingStorageDialog(context: FragmentActivity, emptyCallback: EmptyCallback) {
+        // 是否点击外部区域触发弹窗消失
+        var isCanceledByClickingOutside = true
+
+        NewFlagLogUtils.logExternalStoragePermissionDialogAppearance()
         DialogHelper.showDialog(
             context,
             title = "权限申请",
             content = "光环助手将向您申请开启设备的存储权限，以保证能正常使用相关功能。拒绝授权将无法正常使用部分功能。",
             cancelText = "放弃",
             confirmText = "去授权",
-            cancelClickCallback = null,
-            confirmClickCallback = { checkStoragePermissionBeforeAction(context, emptyCallback) },
+            cancelClickCallback = {
+                isCanceledByClickingOutside = false
+                NewFlagLogUtils.logExternalStoragePermissionDialogAction("放弃")
+            },
+            confirmClickCallback = {
+                isCanceledByClickingOutside = false
+                checkStoragePermissionBeforeAction(context, emptyCallback)
+                NewFlagLogUtils.logExternalStoragePermissionDialogAction("去授权")
+            },
             extraConfig = DialogHelper.Config(hint = "查看权限应用场景"),
             uiModificationCallback = {
                 it.hintTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font))
@@ -264,10 +275,15 @@ object PermissionHelper {
                     val provider =
                         ARouter.getInstance().build(RouteConsts.provider.directUtils).navigation() as? IDirectProvider
                     provider?.directToWebView(context, Constants.PERMISSION_SCENARIO_ADDRESS, "(权限弹窗)")
+                    NewFlagLogUtils.logExternalStoragePermissionDialogAction("查看权限应用场景")
                 }
                 it.contentTv.setTextColor(ContextCompat.getColor(context, R.color.text_title))
             }
-        )
+        )?.setOnDismissListener {
+            if (isCanceledByClickingOutside) {
+                NewFlagLogUtils.logExternalStoragePermissionDialogAction("点击弹窗以外空白区域")
+            }
+        }
     }
 
     private fun showDialogBeforeRequestingGetInstalledListDialog(

module_common/src/main/java/com/gh/gamecenter/common/view/DrawableView.kt

@@ -13,8 +13,10 @@ import android.graphics.drawable.shapes.RectShape
 import android.widget.TextView
 import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
 import com.gh.gamecenter.common.HaloApp
+import com.gh.gamecenter.common.R
 import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.common.utils.dip2px
 
@@ -186,4 +188,14 @@ object DrawableView {
         val hexString = Integer.toHexString(Math.round((255 * percent / 100).toFloat()))
         return (if (hexString.length < 2) "0" else "") + hexString
     }
+
+    @JvmStatic
+    fun getCheckSelectorDrawable(context: Context) =
+        StateListDrawable().apply {
+            addState(
+                intArrayOf(android.R.attr.state_checked),
+                AppCompatResources.getDrawable(context, R.drawable.ic_selector_selected)
+            )
+            addState(intArrayOf(), AppCompatResources.getDrawable(context, R.drawable.ic_selector_default))
+        }
 }

module_login/build.gradle

@@ -9,6 +9,8 @@ android {
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
+        vectorDrawables.useSupportLibrary = true
+
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode rootProject.ext.versionCode

module_login/src/main/java/com/gh/gamecenter/login/view/LoginFragment.java

@@ -1,6 +1,7 @@
 package com.gh.gamecenter.login.view;
 
 import android.content.Intent;
+import android.graphics.drawable.StateListDrawable;
 import android.os.Bundle;
 import android.os.Message;
 import android.text.Editable;
@@ -17,6 +18,7 @@ import android.widget.EditText;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.Observer;
@@ -31,6 +33,7 @@ import com.gh.gamecenter.common.constant.RouteConsts;
 import com.gh.gamecenter.common.eventbus.EBReuse;
 import com.gh.gamecenter.common.retrofit.ApiResponse;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
+import com.gh.gamecenter.common.view.DrawableView;
 import com.gh.gamecenter.core.provider.ILogUtilsProvider;
 import com.gh.gamecenter.core.provider.IWebProvider;
 import com.gh.gamecenter.core.utils.ClickUtils;
@@ -171,6 +174,12 @@ public class LoginFragment
         mBinding.loginPrivacyPolicy.setText(getPrivacyContent());
         mBinding.loginPrivacyPolicy.setHighlightColor(getResources().getColor(R.color.transparent));
         mBinding.loginPrivacyPolicy.setMovementMethod(new LinkMovementMethod());
+
+        setCheckIvSrc();
+    }
+
+    private void setCheckIvSrc() {
+        mBinding.checkIv.setImageDrawable(DrawableView.getCheckSelectorDrawable(requireContext()));
     }
 
     private SpannableStringBuilder getPrivacyContent() {
@@ -468,6 +477,7 @@ public class LoginFragment
             mBinding.normalToolbarContainer.normalToolbar.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white));
             mBinding.normalToolbarContainer.backBtn.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_bar_back));
         }
+        setCheckIvSrc();
     }
 
     private class LoginTextWatcher implements TextWatcher {

module_login/src/main/res/drawable/selector_login_checkbox.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_selector_selected" android:state_checked="true" />
-    <item android:drawable="@drawable/ic_selector_default" />
-</selector>

module_login/src/main/res/layout/fragment_login.xml

@@ -184,8 +184,7 @@
                 android:id="@+id/checkIv"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:padding="4dp"
-                android:src="@drawable/selector_login_checkbox" />
+                android:padding="4dp" />
 
             <TextView
                 android:id="@+id/login_privacy_policy"
@@ -260,7 +259,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/statusBarView"
         android:padding="12dp"
-        android:src="@drawable/ic_login_close" />
+        app:srcCompat="@drawable/ic_login_close" />
 
     <include
         android:visibility="gone"

module_login/src/main/res/layout/layout_quick_login.xml

@@ -2,7 +2,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <ImageView
         android:layout_width="match_parent"
@@ -21,7 +22,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/statusBarView"
         android:padding="12dp"
-        android:src="@drawable/ic_login_close" />
+        app:srcCompat="@drawable/ic_login_close" />
 
     <TextView
         android:layout_width="wrap_content"