feat: 礼包功能模块化

# Conflicts:
#	app/src/main/java/com/gh/gamecenter/servers/GameServersContentFragment.kt
#	ndownload

.gitlab-ci.yml

@@ -61,7 +61,7 @@ android_build:
   script:
     - export GRADLE_USER_HOME=/home/gitlab-runner/ci-build-cache/$CI_PROJECT_PATH/.gradle
     - chmod +x ./gradlew
-    - ./scripts/jenkins_build.sh $CI_COMMIT_REF_NAME $BEFORE_COMMIT_SHA $CI_COMMIT_SHA
+    - ./scripts/jenkins_build.sh -c
   #设置打包后的产物，用于job之间共享
   artifacts:
       paths:
@@ -71,7 +71,8 @@ android_build:
     exit_codes: 137
   only:
     - dev
-    - dev-5.33.0
+    - dev-5.29.0
+    - dev-5.30.0
 
 # 代码检查
 sonarqube_analysis:
@@ -102,7 +103,8 @@ sonarqube_analysis:
      exit_codes: 137
    only:
      - dev
-     - dev-5.33.0
+     - dev-5.29.0
+     - dev-5.30.0
 
 ## 发送简易检测结果报告
 send_sonar_report:
@@ -120,11 +122,12 @@ send_sonar_report:
      exit_codes: 137
    only:
      - dev
-     - dev-5.33.0
+     - dev-5.29.0
+     - dev-5.30.0
 
 oss-upload&send-email:
     tags:
-        - sysadm-devops
+        - rancher-k8s
     stage: oss-upload&send-email
     image: hub.shanqu.cc/devops/android-apk-oss-upload:latest
     variables:
@@ -132,9 +135,9 @@ oss-upload&send-email:
         VAULT_ADDR: https://vault.shanqu.cc                         # 固定值
         VAULT_SECRET_PATH: prod/devops/android-apk-oss-upload       # 固定值
         VAULT_ROLE: android-apk-oss-upload                          # 固定值
-        ENDPOINT: "tos-cn-guangzhou.ivolces.com"                    # 固定值
-        BUCKET: "sysadm-public"                                     # 固定值
-        FILE_PATH: "app/build/tmp/"                                 # APK 存放路径
+        ENDPOINT: "oss-cn-shenzhen-internal.aliyuncs.com"           # 固定值
+        BUCKET: "shanqu"                                            # 固定值
+        FILE_PATH: "app/build/tmp/"                         # APK 存放路径
         Email_To_List: $EMAIL_TO_LIST                               # 邮件接受人列表
         Email_Title: "光环助手 $CI_COMMIT_BRANCH"                    # 邮件标题
         PIPELINE_ID: $CI_PIPELINE_ID                                # 流水线id
@@ -149,7 +152,8 @@ oss-upload&send-email:
         ### 开启上传 ###
         - /usr/local/bin/python /upload.py
         ### 发送邮件
-        - /usr/local/bin/python /ci-android-mail-jira-comment.py
+        - /usr/local/bin/python /ci-android-mail.py
     only:
         - dev
-        - dev-5.33.0
+        - dev-5.29.0
+        - dev-5.30.0

README.md

@@ -30,7 +30,14 @@
 
 ### git 版本管理
 
-本项目使用简化版的 git flow 来管理分支，细节请看 [光环安卓简单 git 规范](https://git.shanqu.cc/halo/android/assistant-android/-/wikis/%E5%85%89%E7%8E%AF%E5%AE%89%E5%8D%93%E7%AE%80%E5%8D%95-git-%E8%A7%84%E8%8C%83)
+本项目使用简化版的 git flow 来管理分支，细节请看 [光环安卓简单 git 规范](https://git.ghzs.com/halo/android/assistant-android/-/wikis/%E5%85%89%E7%8E%AF%E5%AE%89%E5%8D%93%E7%AE%80%E5%8D%95-git-%E8%A7%84%E8%8C%83)
+
+### API 环境配置
+
+本项目使用 Build Variants 来切换 API 环境
+
+* internal 为测试环境
+* publish 为正式环境
 
 ### 图片资源配置
 
@@ -46,3 +53,14 @@
 
 * 本项目使用了微信的 [AndResGuard](https://github.com/shwenzhang/AndResGuard) 作为资源混淆压缩方案，新增需要使用 `getIdentifier` 获取的资源文件时需要添加至白名单
 * 本项目默认使用 R8 作为混淆工具，往 proguard-rules.txt 添加 proguard 新配置项时请检查可用性(如语法等)
+
+### APK打包配置
+
+> 打内部测试包：`./scripts/test_build.sh`
+> 打邮件测试包：`./scripts/jenkins_build.sh`
+
+### TODO
+
+* 把原有 EventBus 的消息 Type 统一到一个文件内
+* 将实现细节从 View(Fragment、Activity) 剥离并以 MVVM 结构改造
+* 重构 MainActivity

app/build.gradle

@@ -11,10 +11,6 @@ android {
 
     String CONFIG_ID = ""
     String FIRST_LAUNCH = ""
-    String SDK_VERSION = ""
-    String SDK_APP_ID = ""
-    String SDK_APP_NAME = ""
-    boolean USE_DEFAULT_CHANNEL_SDK = true
     int ACTIVATE_REPORTING_RATIO = 100
 
     buildFeatures {
@@ -83,22 +79,14 @@ android {
         // 推广用的配置 id
         buildConfigField "String", "CONFIG_ID", "\"${CONFIG_ID}\""
 
-        // 推广用的 SDK 版本 （仅记录使用）
-        buildConfigField "String", "SDK_VERSION", "\"${SDK_VERSION}\""
-        buildConfigField "String", "SDK_APP_ID", "\"${SDK_APP_ID}\""
-        buildConfigField "String", "SDK_APP_NAME", "\"${SDK_APP_NAME}\""
-        buildConfigField "boolean", "USE_DEFAULT_CHANNEL_SDK", "${USE_DEFAULT_CHANNEL_SDK}"
-
         // 首次启动的跳转配置
         buildConfigField "String", "FIRST_LAUNCH", "\"${FIRST_LAUNCH}\""
 
         buildConfigField "int", "ACTIVATE_REPORTING_RATIO", "${ACTIVATE_REPORTING_RATIO}"
 
         // All third-party appid/appkey
-        buildConfigField "boolean", "IS_GAT_APP", "false"
         buildConfigField "String", "API_HOST", "\"${API_HOST}\""
         buildConfigField "String", "NEW_API_HOST", "\"${NEW_API_HOST}\""
-        buildConfigField "String", "LOG_HUB_PROJECT", "\"${LOG_HUB_PROJECT}\""
         buildConfigField "String", "VAPI_HOST", "\"${VAPI_HOST}\""
         buildConfigField "String", "WECHAT_APPID", "\"${WECHAT_APPID}\""
         buildConfigField "String", "WECHAT_SECRET", "\"${WECHAT_SECRET}\""
@@ -159,7 +147,7 @@ android {
         }
     }
 
-    flavorDimensions("env", "region")
+    flavorDimensions("env")
 
     sourceSets {
         publish {
@@ -177,15 +165,6 @@ android {
         gdt {
             java.srcDirs = ['src/main/java', 'src/gdt/java']
         }
-        gat {
-            java.srcDirs = ['src/main/java', 'src/gat/java']
-        }
-        cn {
-            java.srcDirs = ['src/main/java', 'src/cn/java']
-        }
-        sm {
-            java.srcDirs = ['src/main/java', 'src/sm/java']
-        }
     }
 
     productFlavors {
@@ -199,8 +178,6 @@ android {
             buildConfigField "String", "DEV_VAPI_HOST", "\"${DEV_VAPI_HOST}\""
             buildConfigField "String", "QUICK_LOGIN_APPID", "\"${DEV_QUICK_LOGIN_APPID}\""
             buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${DEV_QUICK_LOGIN_APPKEY}\""
-            buildConfigField "String", "DEV_CSJ_APPID", "\"${DEV_CSJ_APPID}\""
-            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
         }
 
         // publish， 发布时候使用的 flavor，接口仅包含正式环境
@@ -212,8 +189,6 @@ android {
             buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
             buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
             buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
-            buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
-            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
         }
 
         tea {
@@ -224,8 +199,6 @@ android {
             buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
             buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
             buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
-            buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
-            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
 
             manifestPlaceholders.put("APPLOG_SCHEME", "rangersapplog.byAx6uYt".toLowerCase())
         }
@@ -233,13 +206,17 @@ android {
         kuaishou {
             dimension "env"
 
+            String KUAI_SHOU_APP_ID = ""
+            String KUAI_SHOU_APP_NAME = ""
+
             buildConfigField "String", "DEV_API_HOST", "\"${API_HOST}\""
             buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_API_HOST}\""
             buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
             buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
             buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
-            buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
-            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
+
+            buildConfigField "String", "KUAI_SHOU_APP_ID", "\"${KUAI_SHOU_APP_ID}\""
+            buildConfigField "String", "KUAI_SHOU_APP_NAME", "\"${KUAI_SHOU_APP_NAME}\""
         }
 
         gdt {
@@ -250,39 +227,6 @@ android {
             buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
             buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
             buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
-            buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
-            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
-        }
-
-        sm {
-            dimension "env"
-
-            buildConfigField "String", "DEV_API_HOST", "\"${API_HOST}\""
-            buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_API_HOST}\""
-            buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
-            buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
-            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
-            buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
-            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
-        }
-
-        // 港澳台
-        gat {
-            dimension "region"
-
-            applicationId rootProject.ext.applicationIdGat
-
-            // 支持繁体
-            resConfigs "zh", "zh-rTW"
-
-            buildConfigField "boolean", "IS_GAT_APP", "true"
-            buildConfigField "String", "LOG_HUB_PROJECT", "\"${LOG_HUB_PROJECT_GAT}\""
-            buildConfigField "String", "API_HOST", "\"${API_HOST_GAT}\""
-            buildConfigField "String", "NEW_API_HOST", "\"${NEW_API_HOST_GAT}\""
-        }
-
-        cn {
-            dimension "region"
         }
     }
 }
@@ -300,7 +244,6 @@ dependencies {
     teaImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/tea/libs')
     kuaishouImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/kuaishou/libs')
     gdtImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/gdt/libs')
-    smImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/sm/libs')
     testImplementation 'junit:junit:4.12'
 
     debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakcanary}"
@@ -376,6 +319,9 @@ dependencies {
     implementation(project(':module_login')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
+    implementation(project(':module_libao')) {
+        exclude group: 'androidx.swiperefreshlayout'
+    }
     implementation(project(':module_setting')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
@@ -385,29 +331,18 @@ dependencies {
     implementation(project(':module_core_feature')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
-//    implementation(project(':module_feedback')) {
-//        exclude group: 'androidx.swiperefreshlayout'
-//    }
-    implementation(project(':feature:new_feedback',)) {
+    implementation(project(':module_feedback')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
     implementation(project(':module_sensors_data')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
-    implementation(project(':module_message')) {
-        exclude group: 'androidx.swiperefreshlayout'
-    }
 //    implementation(project(':feature:vpn'))
     implementation(project(':feature:pkg'))
     implementation(project(':feature:oaid'))
     implementation(project(':feature:floating-window'))
-    implementation(project(':feature:csj_ad'))
-//    implementation(project(':feature:beizi_startup_ad'))
+    implementation(project(':feature:beizi_startup_ad'))
     implementation(project(':feature:xapk-installer'))
-    implementation(project(':feature:qq_game')) {
-        exclude group: 'androidx.swiperefreshlayout'
-    }
-    internalImplementation(project(':module_internal_test'))
 }
 
 File propFile = file('sign.properties')

app/proguard-rules.txt

@@ -20,7 +20,6 @@
 -keep class com.gh.gamecenter.db.info.* {*;}
 -keep class com.gh.gamecenter.entity.** {<fields>;}
 -keep class com.gh.gamecenter.qa.entity.** {<fields>;}
--keep class com.gh.download.DownloadDataSimpleEntity {<fields>;}
 -keep class com.gh.gamecenter.floatingwindow.FloatingWindowEntity {<fields>;}
 -keep class com.gh.gamecenter.BR
 -keep class com.gh.gamecenter.retrofit.* {*;}
@@ -88,14 +87,7 @@
 -keep class com.qq.gdt.action.** {*;}
 -keep public class com.tencent.turingfd.sdk.**
 
-### 神马 SDK
--dontwarn com.gism.**
-
 -keepclasseswithmembers class * {
 native <methods>;
 }
 
--keepclassmembernames class com.contrarywind.view.WheelView {
-    private int itemsVisible;
-}
-

app/src/gdt/java/com/gh/gamecenter/GdtHelper.kt

@@ -5,7 +5,6 @@ import com.lightgame.utils.Utils
 import com.qq.gdt.action.ActionParam
 import com.qq.gdt.action.ActionType
 import com.qq.gdt.action.GDTAction
-import com.qq.gdt.action.PrivateController
 import org.json.JSONObject
 
 object GdtHelper {
@@ -17,12 +16,6 @@ object GdtHelper {
 
     @JvmStatic
     fun init(application: Application, channel: String) {
-        GDTAction.setPrivateController(object : PrivateController() {
-            override fun isCanUsePhoneState(): Boolean {
-                return false
-            }
-        })
-
         if (channel == "KS_GDT_GHZS_MC01") {
             GDTAction.init(application, KS_USER_ACTION_SET_ID, KS_APP_SECRET_ID, channel)
         } else {

app/src/internal/java/com/gh/vspace/ExternalGameUsage.kt

@@ -1,32 +0,0 @@
-package com.gh.vspace
-
-import android.content.Intent
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.annotation.Keep
-import com.gh.gamecenter.R
-import com.gh.gamecenter.databinding.LayoutPersonalOtherItemBinding
-import com.gh.vspace.installexternalgames.InstallExternalGameActivity
-
-@Keep
-class ExternalGameUsage : IExternalGamesUsage {
-    override fun addInstallExternalGameButton(viewParent: ViewGroup) {
-        val context = viewParent.context
-        viewParent.findViewById<View>(R.id.install_game_from_external) ?: run {
-            val binding = LayoutPersonalOtherItemBinding.inflate(LayoutInflater.from(context)).apply {
-                root.id = R.id.install_game_from_external
-                titleTv.text = context.getString(R.string.title_install_external_game)
-                iconIv.setImageResource(R.drawable.ic_personal_my_game)
-                root.setOnClickListener {
-                    VHelper.connectService {
-                        context.startActivity(
-                            InstallExternalGameActivity.getIntent(context)
-                                .apply { flags = flags or Intent.FLAG_ACTIVITY_NEW_TASK })
-                    }
-                }
-            }
-            viewParent.addView(binding.root, 0)
-        }
-    }
-}

app/src/internal/java/com/gh/vspace/installexternalgames/Constants.java

@@ -1,5 +0,0 @@
-package com.gh.vspace.installexternalgames;
-
-public class Constants {
-    public static final String TAG = "从SD卡安装";
-}

app/src/internal/java/com/gh/vspace/installexternalgames/ExternalGameAdapter.kt

@@ -1,47 +0,0 @@
-package com.gh.vspace.installexternalgames
-
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import com.gh.gamecenter.common.utils.goneIf
-import com.gh.gamecenter.common.utils.toBinding
-
-class ExternalGameAdapter(private val games: List<ExternalGameUiState>, private val onItemClickListener: OnItemClickListener) :
-    RecyclerView.Adapter<ExternalGameViewHolder>() {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ExternalGameViewHolder {
-        return ExternalGameViewHolder(parent.toBinding())
-    }
-
-    override fun getItemCount(): Int {
-        return games.size
-    }
-
-    override fun onBindViewHolder(holder: ExternalGameViewHolder, position: Int) {
-        val item = games[position]
-        holder.apkInfo.text = item.externalGameEntity.let { item ->
-            """
-            应用程序名：${item.appName}
-            版本号：${item.apkVersion}
-            包名: ${item.apkPackageName}
-            路径:${item.apkPath}
-            """.trimIndent()
-        }
-        holder.install.goneIf(item.isInstalled) {
-            holder.install.setOnClickListener {
-                onItemClickListener.onItemClick(item, OnItemClickListener.ClickType.CLICK_INSTALL)
-            }
-        }
-        holder.uninstall.goneIf(!item.isInstalled) {
-            holder.uninstall.setOnClickListener {
-                onItemClickListener.onItemClick(
-                    item,
-                    OnItemClickListener.ClickType.CLICK_UNINSTALL
-                )
-            }
-        }
-        holder.start.goneIf(!item.isInstalled) {
-            holder.start.setOnClickListener {
-                onItemClickListener.onItemClick(item, OnItemClickListener.ClickType.CLICK_START)
-            }
-        }
-    }
-}

app/src/internal/java/com/gh/vspace/installexternalgames/ExternalGameEntity.kt

@@ -1,11 +0,0 @@
-package com.gh.vspace.installexternalgames
-
-data class ExternalGameEntity(
-    val cpuAbi: Set<String>,
-    val apkPath: String,
-    val apkFileName: String,
-    val appName: String,
-    val apkVersion: String,
-    val apkPackageName: String,
-    val lastModified: Long,
-)

app/src/internal/java/com/gh/vspace/installexternalgames/ExternalGameUiState.kt

@@ -1,6 +0,0 @@
-package com.gh.vspace.installexternalgames
-
-data class ExternalGameUiState(
-    val externalGameEntity: ExternalGameEntity,
-    val isInstalled: Boolean
-)

app/src/internal/java/com/gh/vspace/installexternalgames/ExternalGameViewHolder.kt

@@ -1,11 +0,0 @@
-package com.gh.vspace.installexternalgames
-
-import androidx.recyclerview.widget.RecyclerView
-import com.gh.gamecenter.databinding.LayoutExternalGameItemBinding
-
-class ExternalGameViewHolder(binding: LayoutExternalGameItemBinding) : RecyclerView.ViewHolder(binding.root) {
-    val apkInfo = binding.apkFileInfo
-    val install = binding.btnInstall
-    val uninstall = binding.btnUninstall
-    val start = binding.btnStart
-}

app/src/internal/java/com/gh/vspace/installexternalgames/InstallExternalGameActivity.kt

@@ -1,14 +0,0 @@
-package com.gh.vspace.installexternalgames
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import com.gh.gamecenter.common.base.activity.ToolBarActivity
-
-class InstallExternalGameActivity : ToolBarActivity() {
-    companion object {
-        fun getIntent(context: Context): Intent {
-            return getTargetIntent(context, InstallExternalGameActivity::class.java, InstallExternalGameFragment::class.java, Bundle())
-        }
-    }
-}

app/src/internal/java/com/gh/vspace/installexternalgames/InstallExternalGameFragment.kt

@@ -1,153 +0,0 @@
-package com.gh.vspace.installexternalgames
-
-import android.app.Dialog
-import android.os.Bundle
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.gh.common.util.DialogUtils
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.base.fragment.ToolbarFragment
-import com.gh.gamecenter.common.exposure.meta.MetaUtil
-import com.gh.gamecenter.common.utils.dip2px
-import com.gh.gamecenter.common.utils.toColor
-import com.gh.gamecenter.common.utils.viewModelProvider
-import com.gh.gamecenter.common.view.divider.HorizontalDividerItemDecoration
-import com.gh.gamecenter.core.AppExecutor
-import com.gh.gamecenter.databinding.FragmentInstallExternalGamesBinding
-import com.gh.vspace.VHelper
-import com.halo.assistant.HaloApp
-import com.lg.vspace.VirtualAppManager
-import io.reactivex.Single
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.Disposable
-import io.reactivex.schedulers.Schedulers
-
-class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
-
-    private val mViewModel: InstallExternalGameViewModel by lazy { viewModelProvider() }
-
-    private lateinit var mBinding: FragmentInstallExternalGamesBinding
-
-    private val games = mutableListOf<ExternalGameUiState>()
-    private var adapter = ExternalGameAdapter(games, this)
-
-    private var uninstallDisposable: Disposable? = null
-
-    override fun getLayoutId() = 0
-
-    override fun getInflatedLayout() =
-        FragmentInstallExternalGamesBinding.inflate(layoutInflater).apply { mBinding = this }.root
-
-    private lateinit var dialog: Dialog
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setNavigationTitle(getString(com.gh.gamecenter.R.string.title_install_external_game))
-        initView()
-        mViewModel.gamesList.observe(this) {
-            if (dialog.isShowing) {
-                dialog.dismiss()
-            }
-            games.clear()
-            games.addAll(
-                it.map {
-                    ExternalGameUiState(it, VHelper.isInstalled(it.apkPackageName))
-                }
-            )
-            adapter.notifyDataSetChanged()
-        }
-        mViewModel.scanPaths()
-
-
-    }
-
-    private fun initView() {
-        dialog = DialogUtils.showWaitDialog(requireContext(), "")
-        mBinding.externalGamesList.let {
-            it.adapter = adapter
-            it.layoutManager = LinearLayoutManager(requireContext())
-            val itemDecoration = HorizontalDividerItemDecoration.Builder(requireContext())
-                .size(2F.dip2px())
-                .color(R.color.ui_divider.toColor(requireContext()))
-                .build()
-            if (it.itemDecorationCount != 0) {
-                it.removeItemDecorationAt(0)
-            }
-            it.addItemDecoration(itemDecoration)
-
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        if (dialog.isShowing) {
-            dialog.dismiss()
-        }
-        if (uninstallDisposable?.isDisposed != true) {
-            uninstallDisposable?.dispose()
-        }
-    }
-
-
-    override fun onItemClick(externalGameUiState: ExternalGameUiState, clickType: OnItemClickListener.ClickType) {
-        when (clickType) {
-            OnItemClickListener.ClickType.CLICK_INSTALL -> {
-                install(externalGameUiState)
-            }
-            OnItemClickListener.ClickType.CLICK_UNINSTALL -> {
-                uninstall(externalGameUiState)
-            }
-            OnItemClickListener.ClickType.CLICK_START -> {
-                start(externalGameUiState)
-            }
-        }
-    }
-
-    private fun install(externalGameUiState: ExternalGameUiState) {
-        val bit =
-            externalGameUiState.externalGameEntity.cpuAbi.let { if (it.size == 1 && it.contains("armeabi-v7a")) "32" else "64" }
-        if (VHelper.showDialogIfVSpaceIsNeeded(
-                requireContext(),
-                "",
-                externalGameUiState.externalGameEntity.appName,
-                "",
-                bit = bit
-            )
-        ) return
-        dialog.show()
-        externalGameUiState.externalGameEntity.let {
-            val intent = VirtualAppManager.getInstallIntent(context, it.apkPath, it.apkPackageName)
-            requireActivity().startActivity(intent)
-        }
-    }
-
-    private fun uninstall(externalGameUiState: ExternalGameUiState) {
-        dialog.show()
-        uninstallDisposable = Single.create<Void> {
-            VHelper.uninstall(externalGameUiState.externalGameEntity.apkPackageName)
-        }.subscribeOn(Schedulers.from(AppExecutor.lightWeightIoExecutor)).observeOn(AndroidSchedulers.mainThread())
-            .subscribe { t1, t2 ->
-                if (dialog.isShowing) {
-                    dialog.dismiss()
-                }
-            }
-    }
-
-
-    private fun start(externalGameUiState: ExternalGameUiState) {
-        val intent = VirtualAppManager.get().getStartGameIntent(
-            externalGameUiState.externalGameEntity.apkPackageName,
-            "",
-            externalGameUiState.externalGameEntity.appName,
-            "",
-            MetaUtil.getBase64EncodedAndroidId(),
-            HaloApp.getInstance().gid,
-            com.gh.gamecenter.BuildConfig.VERSION_NAME,
-            HaloApp.getInstance().channel,
-            "",
-            ""
-        )
-        requireActivity().startActivity(intent)
-    }
-
-
-}

app/src/internal/java/com/gh/vspace/installexternalgames/InstallExternalGameViewModel.kt

@@ -1,64 +0,0 @@
-package com.gh.vspace.installexternalgames
-
-import android.app.Application
-import android.content.pm.PackageManager
-import android.os.Environment
-import androidx.lifecycle.AndroidViewModel
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import com.gh.gamecenter.core.runOnIoThread
-import com.gh.vspace.VHelper
-import com.lg.vspace.helper.compat.NativeLibraryHelperCompat
-import com.lightgame.utils.Utils
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.Disposable
-
-class InstallExternalGameViewModel(application: Application) : AndroidViewModel(application) {
-    private val _gamesList = MutableLiveData<List<ExternalGameEntity>>(listOf())
-    val gamesList: LiveData<List<ExternalGameEntity>> = _gamesList
-    private val pkgManger = getApplication<Application>().packageManager
-    private var disposable: Disposable = VHelper.callSite.observeOn(AndroidSchedulers.mainThread()).subscribe {
-        scanPaths()
-    }
-
-    fun scanPaths() {
-        runOnIoThread {
-            _gamesList.postValue(Environment.getExternalStorageDirectory().walk().maxDepth(1)
-                .filter { it.isHidden.not() }
-                .filter { it.isFile }
-                .onEach {
-                    Utils.log(Constants.TAG, "获得文件: ${it.name}")
-                }
-                .filter { it.extension == "apk" }
-                .map {
-                    val packageInfo = pkgManger.getPackageArchiveInfo(
-                        it.absolutePath,
-                        PackageManager.GET_META_DATA or PackageManager.GET_ACTIVITIES
-                    )
-                    packageInfo?.let { packageInfo ->
-                        val applicationInfo = packageInfo.applicationInfo
-                        applicationInfo.publicSourceDir = it.absolutePath
-                        applicationInfo.sourceDir = it.absolutePath
-                        ExternalGameEntity(
-                            cpuAbi = NativeLibraryHelperCompat.getPackageAbiList(it.absolutePath),
-                            apkPath = it.absolutePath,
-                            apkFileName = it.name,
-                            apkPackageName = packageInfo.packageName,
-                            apkVersion = packageInfo.versionName,
-                            appName = pkgManger.getApplicationLabel(applicationInfo).toString(),
-                            lastModified = it.lastModified()
-                        )
-                    }
-                }.filterNotNull()
-                .toList().sortedByDescending { it.lastModified }
-            )
-        }
-    }
-
-
-    override fun onCleared() {
-        super.onCleared()
-        disposable.dispose()
-    }
-
-}

app/src/internal/java/com/gh/vspace/installexternalgames/OnItemClickListener.kt

@@ -1,11 +0,0 @@
-package com.gh.vspace.installexternalgames
-
-interface OnItemClickListener {
-
-    enum class ClickType {
-        CLICK_INSTALL, CLICK_UNINSTALL, CLICK_START
-    }
-
-    fun onItemClick(externalGameUiState: ExternalGameUiState, clickType: ClickType)
-
-}

app/src/internal/res/layout/fragment_install_external_games.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/external_games_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/internal/res/layout/layout_external_game_item.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/apk_file_info"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="20sp"
-        tools:text="文件名：\n路径：" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <Button
-            android:id="@+id/btn_install"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/text_install"
-            android:visibility="gone"
-            tools:visibility="visible" />
-
-        <Button
-            android:id="@+id/btn_uninstall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/text_uninstall"
-            android:visibility="gone"
-            tools:visibility="visible" />
-
-        <Button
-            android:id="@+id/btn_start"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/text_start"
-            android:visibility="gone"
-            tools:visibility="visible" />
-    </LinearLayout>
-</LinearLayout>

app/src/internal/res/values-zh-rTW/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="title_install_external_game">從SD卡安裝</string>
-    <string name="text_install">安裝</string>
-    <string name="text_uninstall">卸載</string>
-    <string name="text_start">啟動</string>
-</resources>

app/src/internal/res/values/ids.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <item name="install_game_from_external" type="id" />
-</resources>

app/src/internal/res/values/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="title_install_external_game">从SD卡安装</string>
-    <string name="text_install">安装</string>
-    <string name="text_uninstall">卸载</string>
-    <string name="text_start">启动</string>
-</resources>

app/src/kuaishou/java/com/gh/gamecenter/KuaishouHelper.kt

@@ -5,8 +5,8 @@ import com.kwai.monitor.log.TurboAgent
 import com.kwai.monitor.log.TurboConfig
 
 object KuaishouHelper {
-    private val mAppId by lazy { BuildConfig.SDK_APP_ID.ifEmpty { "81537" } }
-    private val mAppName by lazy { BuildConfig.SDK_APP_NAME.ifEmpty { "guanghuanzhushou_1" } }
+    private val mAppId by lazy { BuildConfig.KUAI_SHOU_APP_ID.ifEmpty { "81537" } }
+    private val mAppName by lazy { BuildConfig.KUAI_SHOU_APP_NAME.ifEmpty { "guanghuanzhushou_1" } }
 
     @JvmStatic
     fun init(context: Context, channel: String) {

app/src/kuaishou/java/com/gh/gamecenter/provider/FlavorProviderImp.kt

@@ -3,16 +3,12 @@ package com.gh.gamecenter.provider
 import android.app.Activity
 import android.app.Application
 import android.text.TextUtils
-import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.KuaishouHelper
-import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.provider.IFlavorProvider
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.core.utils.TimeUtils
-import com.gh.gamecenter.core.utils.ToastUtils
 import com.halo.assistant.HaloApp
 import com.kwai.monitor.payload.TurboHelper
-import com.leon.channel.helper.ChannelReaderUtil
 
 class FlavorProviderImp : IFlavorProvider {
 
@@ -35,11 +31,7 @@ class FlavorProviderImp : IFlavorProvider {
     }
 
     override fun getChannelStr(application: Application): String {
-        var channel = if (BuildConfig.USE_DEFAULT_CHANNEL_SDK) {
-            ChannelReaderUtil.getChannel(application)
-        } else {
-            TurboHelper.getChannel(application)
-        }
+        var channel = TurboHelper.getChannel(application)
         if (channel == null || TextUtils.isEmpty(channel.trim())) {
             channel = KUAISHOU_CHANNEL
         }
@@ -52,11 +44,6 @@ class FlavorProviderImp : IFlavorProvider {
 
     override fun logCoreEvent() {
         logEvent("EVENT_KEY_PATH_OPTIMIZATION")
-        if (BuildConfig.ACTIVATE_REPORTING_RATIO == 1) {
-            AppExecutor.uiExecutor.executeWithDelay({
-                ToastUtils.toast("关键行为 EVENT_KEY_PATH_OPTIMIZATION")
-            }, 500)
-        }
     }
 
     companion object {

app/src/main/AndroidManifest.xml

@@ -77,14 +77,7 @@
         androidx.compose.animation.core,
         androidx.constraintlayout.compose,
         androidx.compose.ui.test.manifest,
-        com.bytedance.sdk.openadsdk,
-        com.bykv.vk.openvk,
-        com.bytedance.tools,
-        androidx.compose.ui.tooling.preview,
-        com.tencent.qqmini,
-        com.tencent.qqmini.minigame.external,
-        com.tencent.qqmini.minigame.opensdk,
-        com.tencent.qqmini.union.ad" />
+        androidx.compose.ui.tooling.preview" />
 
     <!-- 去掉 SDK 一些流氓权限 -->
     <uses-permission
@@ -99,9 +92,6 @@
         android:name="android.permission.GET_TASKS"
         tools:node="remove" />
 
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"
-        tools:node="remove"/>
-
     <supports-screens
         android:anyDensity="true"
         android:largeScreens="true"
@@ -242,15 +232,6 @@
             android:screenOrientation="portrait"
             android:theme="@style/TransparentStatusBarAndNavigationBar" />
 
-        <activity
-            android:name="com.gh.gamecenter.LibaoActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden" />
-
-        <activity
-            android:name="com.gh.gamecenter.LibaoDetailActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.gh.gamecenter.ShareGhActivity"
             android:screenOrientation="portrait" />
@@ -280,7 +261,7 @@
         <activity
             android:name="com.gh.gamecenter.VoteActivity"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateAlwaysHidden|adjustPan" />
+            android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
 
         <activity
             android:name="com.gh.gamecenter.WeiBoShareActivity"
@@ -307,6 +288,10 @@
             android:name="com.gh.gamecenter.CollectionActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="com.gh.gamecenter.MessageActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name="com.gh.gamecenter.UserInfoEditActivity"
             android:screenOrientation="portrait"
@@ -320,10 +305,26 @@
             android:name="com.gh.gamecenter.qa.answer.edit.AnswerEditActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="com.gh.gamecenter.ConcernInfoActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name="com.gh.gamecenter.InfoActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="com.gh.gamecenter.MessageKeFuActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.MessageInviteActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.MessageVoteActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name=".qa.questions.invite.QuestionsInviteActivity"
             android:screenOrientation="portrait" />
@@ -479,14 +480,6 @@
             android:name="com.gh.gamecenter.gamedetail.fuli.kaifu.ServersCalendarActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name=".gamedetail.fuli.kaifu.ServersCalendarManagementActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".gamedetail.fuli.kaifu.ServersSubscribedGameListActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name=".qa.answer.draft.AnswerDraftActivity"
             android:screenOrientation="portrait" />
@@ -758,26 +751,6 @@
             android:name="com.gh.gamecenter.gamecollection.hotlist.GameCollectionHotListActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.qgame.QGameHomeWrapperActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.qgame.QGameSearchActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.gamecollection.hotlist.GameCollectionListDetailActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.UserAuthActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.SplashAdActivity"
-            android:screenOrientation="portrait" />
-
 
         <!--        <activity-->
         <!--            android:name="${applicationId}.douyinapi.DouYinEntryActivity"-->
@@ -833,8 +806,6 @@
         <!--                tools:node="remove" />-->
         <!--        </provider>-->
 
-        <service android:name = "com.gh.gamecenter.install.InstallService" />
-
         <receiver
             android:name="com.gh.gamecenter.receiver.DownloadReceiver"
             android:exported="false">
@@ -850,9 +821,8 @@
             </intent-filter>
         </receiver>
 
-        <activity
+        <receiver
             android:name="com.gh.common.xapk.XapkInstallReceiver"
-            android:theme="@style/Theme.Transparent"
             android:exported="false" />
 
         <receiver
@@ -863,6 +833,39 @@
             </intent-filter>
         </receiver>
 
+        <!-- 梦工厂配置 开始 -->
+        <!--<meta-data
+            android:name="MGC_APPID"
+            android:value="1001276" />
+
+        <provider
+            android:name="com.leto.game.base.provider.LetoFileProvider"
+            android:authorities="${applicationId}.leto.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/leto_file_path"
+                tools:replace="android:resource" />
+        </provider>-->
+        <!-- 梦工厂配置 结束 -->
+
+        <!-- 穿山甲配置 开始 -->
+        <!--<provider
+            android:name="com.bytedance.sdk.openadsdk.TTFileProvider"
+            android:authorities="${applicationId}.TTFileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+
+        <provider
+            android:name="com.bytedance.sdk.openadsdk.multipro.TTMultiProvider"
+            android:authorities="${applicationId}.TTMultiProvider"
+            android:exported="false" />-->
+        <!-- 穿山甲配置 结束 -->
     </application>
 
 </manifest>

app/src/main/assets/rich_editor.js

@@ -205,17 +205,14 @@ RE.setOutdent = function() {
 
 RE.setJustifyLeft = function() {
     document.execCommand('justifyLeft', false, null);
-    RE.enabledEditingItems()
 }
 
 RE.setJustifyCenter = function() {
     document.execCommand('justifyCenter', false, null);
-    RE.enabledEditingItems()
 }
 
 RE.setJustifyRight = function() {
     document.execCommand('justifyRight', false, null);
-    RE.enabledEditingItems()
 }
 
 RE.setBlockquote = function() {
@@ -230,16 +227,6 @@ RE.insertImage = function(url) {
     RE.insertHTML(html);
 }
 
-// 设置分割线
-RE.insertHorizontalRule = function() {
-    document.execCommand('insertHorizontalRule', false, null);
-}
-
-// 设置编辑器默认换行符
-RE.setDefaultParagraphSeparator = function(separator) {
-    document.execCommand('defaultParagraphSeparator', false, separator);
-}
-
 // 替换成缩略图
 RE.replaceTbImage = function(imgRuleFlag, gifRuleFlag) {
     var imgs = document.getElementsByTagName("img");
@@ -587,10 +574,6 @@ document.addEventListener("selectionchange", function(e) {
    RE.sendElementNameToNative()
 });
 
-document.addEventListener("selectionchange", function(e) {
-   RE.enabledEditingItems(e)
-});
-
 RE.recursion = function(dom) {
     var parenDom = dom.parentElement
     if (parenDom && parenDom instanceof Element &&
@@ -633,6 +616,7 @@ RE.sendElementNameToNative = function() {
 // android function to open link
 function customLinkgo(self) {
   var datas = self.dataset.datas
+  // console.log(datas)
   window.OnLinkClickListener.onClick(datas)
 }
 

app/src/main/assets/style.css

@@ -30,6 +30,7 @@ body {
 }
 
 #editor {
+  display: table-cell;
   outline: 0px solid transparent;
   background-repeat: no-repeat;
   background-position: center;

app/src/main/java/com/gh/ad/AdDelegateHelper.kt

@@ -1,650 +0,0 @@
-package com.gh.ad
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.content.Context
-import android.content.SharedPreferences
-import android.text.TextUtils
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.TextView
-import androidx.appcompat.content.res.AppCompatResources
-import androidx.fragment.app.Fragment
-import com.alibaba.android.arouter.launcher.ARouter
-import com.facebook.drawee.view.SimpleDraweeView
-import com.gh.common.exposure.ExposureManager
-import com.gh.common.util.DirectUtils.directToLinkPage
-import com.gh.common.util.LogUtils
-import com.gh.common.util.NewFlatLogUtils.logOpenScreenAdSkip
-import com.gh.common.util.PackageUtils
-import com.gh.gamecenter.BuildConfig
-import com.gh.gamecenter.MainActivity
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.base.activity.BaseActivity
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.common.exposure.ExposureSource
-import com.gh.gamecenter.common.retrofit.BiResponse
-import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.provider.IBeiziAdProvider
-import com.gh.gamecenter.core.provider.ICsjAdProvider
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.core.utils.TimeUtils.getToday
-import com.gh.gamecenter.entity.AdConfig
-import com.gh.gamecenter.entity.StartupAdEntity
-import com.gh.gamecenter.feature.exposure.ExposureEvent.Companion.createEvent
-import com.gh.gamecenter.feature.exposure.ExposureType
-import com.gh.gamecenter.retrofit.RetrofitManager
-import com.halo.assistant.HaloApp
-import io.reactivex.schedulers.Schedulers
-
-/**
- * 广告实现代理类
- *
- * 由它来分发功能实现到具体的实现
- *
- * 以最复杂的开屏广告为例，有三种实现（1. 自有的广告实现 2. 穿山甲的开屏广告实现 3. Beizi 的开屏广告实现）
- *
- * 由于两个广告 SDK 有可能在一次启动中都被使用，所以会根据获取到的广告配置 config 来决定是否需要出是很好两个 SDK
- */
-object AdDelegateHelper {
-
-    private var mCsjAdImpl: ICsjAdProvider? = null
-    private var mBeiziAdImpl: IBeiziAdProvider? = null
-
-    private var mAdConfigList: ArrayList<AdConfig>? = null
-
-    private var mSplashAd: AdConfig? = null
-    private var mDownloadManagerAd: AdConfig? = null
-    private val mGameSearchAdList: ArrayList<AdConfig> by lazy { arrayListOf() }
-    private var mVGameLaunchAd: AdConfig? = null
-
-    val vGameLaunchAd: AdConfig?
-        get() = mVGameLaunchAd
-
-    private const val AD_SDK_CSJ = "穿山甲"
-    private const val AD_SDK_BEIZI = "倍孜"
-    const val AD_TYPE_SDK = "third_party_ads" // 第三方 SDK 广告
-    const val AD_TYPE_OWNER = "owner_ads" // 自有广告
-
-    private const val KEY_CACHE_CONFIG = "cache_config" // 放在 SP 里的广告缓存（避免接口加载问题）
-
-    private val mAdConfigSp: SharedPreferences by lazy {
-        HaloApp.getInstance().getSharedPreferences("AdConfig", Context.MODE_PRIVATE)
-    }
-
-    var isShowingSplashAd = false // 是否正在显示开屏广告
-    var gameSearchKeyword = ""
-
-    fun initAdSdk(context: Context) {
-        // 初始化 Beizi
-        if (mBeiziAdImpl == null) {
-            mBeiziAdImpl =
-                ARouter.getInstance().build(RouteConsts.provider.beiziAd).navigation() as? IBeiziAdProvider
-            mBeiziAdImpl?.initSDK(context)
-        }
-
-        // 初始化穿山甲
-        if (mCsjAdImpl == null) {
-            mCsjAdImpl =
-                ARouter.getInstance().build(RouteConsts.provider.csjAd).navigation() as? ICsjAdProvider
-            val csjAppId = if (EnvHelper.isDevEnv) BuildConfig.DEV_CSJ_APPID else BuildConfig.CSJ_APPID
-            mCsjAdImpl?.initSDK(context, csjAppId, HaloApp.getInstance().oaid)
-            // 监听亮色/暗色模式切换
-            DarkModeUtils.registerModeChangeListener {
-                val topActivity = CurrentActivityHolder.getCurrentActivity() ?: return@registerModeChangeListener
-                updateThemeStatus(context, DarkModeUtils.isDarkModeOn(topActivity))
-            }
-        }
-    }
-
-    /**
-     * 请求接口获取广告相关配置
-     */
-    @SuppressLint("CheckResult")
-    fun requestAdConfig(isFromRetry: Boolean, keyword: String = "", callback: (() -> Unit)? = null) {
-        // mAdConfigList 不为空不需要重试
-        if (isFromRetry && mAdConfigList != null) {
-            return
-        }
-        val paramsMap = if (keyword.isNotEmpty()) mapOf("keyword" to keyword) else mapOf()
-        RetrofitManager.getInstance()
-            .newApi
-            .getAdConfig(paramsMap)
-            .subscribeOn(Schedulers.io())
-            .subscribe(object : BiResponse<List<AdConfig>>() {
-                override fun onSuccess(data: List<AdConfig>) {
-                    gameSearchKeyword = keyword
-                    handleAdConfig(data)
-                    callback?.invoke()
-
-                    // 缓存数据到 SP 供接口请求失败用
-                    SPUtils.setString(mAdConfigSp, KEY_CACHE_CONFIG, data.toJson())
-                }
-
-                override fun onFailure(exception: Exception) {
-                    super.onFailure(exception)
-
-                    // 若接口请求失败时，从 SP 里获取上次缓存的数据
-                    val cachedConfig: List<AdConfig>? = SPUtils.getString(mAdConfigSp, KEY_CACHE_CONFIG).toObject()
-                    if (cachedConfig != null) {
-                        handleAdConfig(cachedConfig)
-                    }
-
-                    callback?.invoke()
-                }
-            })
-    }
-
-    /**
-     * 获取搜索页的广告列表
-     */
-    fun getGameSearchAdList(): ArrayList<AdConfig> {
-        return mGameSearchAdList
-    }
-
-    /**
-     * 获取下载管理页的广告
-     */
-    fun getDownloadManagerAd(): AdConfig? {
-        return mDownloadManagerAd
-    }
-
-    /**
-     * 处理广告配置
-     */
-    fun handleAdConfig(configList: List<AdConfig>) {
-        mGameSearchAdList.clear()
-        mSplashAd = null
-        mDownloadManagerAd = null
-        mVGameLaunchAd = null
-        for (config in configList) {
-            // 处理返回的数据
-            when (config.location) {
-                "halo_launch" -> {
-                    config.ownerAd?.startAd?.let { it.id = config.ownerAd.id }
-                    mSplashAd = config
-                }
-
-                "download_manager" -> mDownloadManagerAd = config
-                "game_search" -> config.let { mGameSearchAdList.add(it) }
-                "helper_launch" -> mVGameLaunchAd = config
-            }
-        }
-    }
-
-    /**
-     * 是否需要显示开屏广告
-     * @param isHotLaunch 是否为热启动
-     */
-    fun shouldShowStartUpAd(isHotLaunch: Boolean): Boolean {
-        return mSplashAd != null
-                && !isShowingSplashAd
-                && (!isHotLaunch || shouldShowStartUpAdWhenHotLaunch())
-                && !isMatchAdFreeRule(mSplashAd)
-                && isMatchStartUpAdDisplayRule()
-    }
-
-    /**
-     * 热启动是否需要显示开屏广告
-     */
-    private fun shouldShowStartUpAdWhenHotLaunch() = mSplashAd?.displayRule?.hotStartSplashAd?.type == AD_TYPE_SDK
-
-    /**
-     * 是否需要显示下载管理广告
-     */
-    fun shouldShowDownloadManagerAd(): Boolean {
-        return mDownloadManagerAd != null && !isMatchAdFreeRule(mDownloadManagerAd) && isMatchDownloadManagerAdDisplayRule()
-    }
-
-    /**
-     * 是否需要显示游戏搜索广告
-     */
-    fun shouldShowGameSearchAd(adConfig: AdConfig): Boolean {
-        return !isMatchAdFreeRule(adConfig) && isMatchGameSearchAdDisplayRule(adConfig)
-    }
-
-    /**
-     * 是否在免广告时长内
-     */
-    private fun isMatchAdFreeRule(adConfig: AdConfig?): Boolean {
-        adConfig?.displayRule?.run {
-            if (adFreeDuration > 0) {
-                val ghInstalledDurationInHours = (System.currentTimeMillis() - PackageUtils.getInstalledTime(
-                    HaloApp.getInstance(),
-                    BuildConfig.APPLICATION_ID
-                )).toFloat() / 1000 / 3600
-                return ghInstalledDurationInHours < adFreeDuration
-            } else {
-                return false
-            }
-        }
-        return false
-    }
-
-    /**
-     * 是否大于开屏广告展示间隔时长
-     */
-    private fun isMatchStartUpAdDisplayRule(): Boolean {
-        mSplashAd?.displayRule?.run {
-            if (adDisplayInterval > 0) {
-                val lastShowTime = SPUtils.getLong(Constants.SP_LAST_SPLASH_AD_SHOW_TIME, 0L)
-                val durationInMinutes = (System.currentTimeMillis() - lastShowTime).toFloat() / 1000 / 60
-                return durationInMinutes > adDisplayInterval
-            } else {
-                return true
-            }
-        }
-        return true
-    }
-
-    /**
-     * 是否大于广告管理展示间隔时长
-     */
-    private fun isMatchDownloadManagerAdDisplayRule(): Boolean {
-        mDownloadManagerAd?.displayRule?.run {
-            if (adDisplayInterval > 0) {
-                val lastShowTime = SPUtils.getLong(Constants.SP_LAST_DOWNLOAD_MANAGER_AD_SHOW_TIME, 0L)
-                val durationInMinutes = (System.currentTimeMillis() - lastShowTime).toFloat() / 1000 / 60
-                return durationInMinutes > adDisplayInterval
-            } else {
-                return true
-            }
-        }
-        return true
-    }
-
-    /**
-     * 是否大于游戏搜索展示间隔时长
-     */
-    private fun isMatchGameSearchAdDisplayRule(adConfig: AdConfig?): Boolean {
-        adConfig?.displayRule?.run {
-            if (adDisplayInterval > 0) {
-                val lastShowTime = SPUtils.getLong(Constants.SP_LAST_GAME_SEARCH_AD_SHOW_TIME + adConfig.position, 0L)
-                val durationInMinutes = (System.currentTimeMillis() - lastShowTime).toFloat() / 1000 / 60
-                return durationInMinutes > adDisplayInterval
-            } else {
-                return true
-            }
-        }
-        return true
-    }
-
-    /**
-     * 更新主题样式
-     */
-    private fun updateThemeStatus(context: Context, isDarkMode: Boolean) {
-        mCsjAdImpl?.updateThemeStatus(context, isDarkMode)
-    }
-
-    /**
-     * 请求开屏广告
-     */
-    @JvmStatic
-    fun requestSplashAd(
-        activity: Activity,
-        adViewWidthInPx: Int,
-        adViewHeightInPx: Int,
-        adViewWidthInDp: Float,
-        adViewHeightInDp: Float,
-        startAdContainer: ViewGroup,
-        sdkStartAdContainer: ViewGroup,
-        adsViewGroup: FrameLayout,
-        handler: BaseActivity.BaseHandler,
-        isHotLaunch: Boolean,
-        hideAction: () -> Unit
-    ) {
-        val hideCallback = {
-            isShowingSplashAd = false
-            hideAction.invoke()
-        }
-        if (mSplashAd != null) {
-            when (if (isHotLaunch) mSplashAd!!.displayRule.hotStartSplashAd?.type else mSplashAd!!.displayRule.adSource) {
-                AD_TYPE_SDK -> {
-                    isShowingSplashAd = true
-                    requestThirdPartySplashAd(
-                        activity,
-                        adViewWidthInPx,
-                        adViewHeightInPx,
-                        adViewWidthInDp,
-                        adViewHeightInDp,
-                        startAdContainer,
-                        sdkStartAdContainer,
-                        adsViewGroup,
-                        handler,
-                        isHotLaunch,
-                        hideCallback
-                    )
-                }
-
-                AD_TYPE_OWNER -> {
-                    isShowingSplashAd = true
-                    requestStandardSplashAd(
-                        activity,
-                        adViewWidthInPx,
-                        adViewHeightInPx,
-                        adViewWidthInDp,
-                        adViewHeightInDp,
-                        startAdContainer,
-                        sdkStartAdContainer,
-                        adsViewGroup,
-                        handler,
-                        isHotLaunch,
-                        hideCallback
-                    )
-                }
-            }
-        } else {
-            hideCallback.invoke()
-        }
-    }
-
-    /**
-     * 获取第三方开屏广告
-     */
-    private fun requestThirdPartySplashAd(
-        activity: Activity,
-        adViewWidthInPx: Int,
-        adViewHeightInPx: Int,
-        adViewWidthInDp: Float,
-        adViewHeightInDp: Float,
-        startAdContainer: ViewGroup,
-        sdkStartAdContainer: ViewGroup,
-        adsViewGroup: FrameLayout,
-        handler: BaseActivity.BaseHandler,
-        isHotLaunch: Boolean,
-        hideCallback: () -> Unit
-    ) {
-        val timeout = if (isHotLaunch) {
-            ((mSplashAd!!.displayRule.hotStartSplashAd?.timeout ?: 3.5F) * 1000).toInt()
-        } else {
-            (mSplashAd!!.displayRule.timeout * 1000).toInt()
-        }
-        // 第三方开屏广告回调，失败时根据接口配置选项决定是否显示自有开屏广告
-        val sdkSplashCallback: (isSuccess: Boolean) -> Unit = { isSuccess ->
-            if (isSuccess) {
-                hideCallback.invoke()
-                SPUtils.setLong(Constants.SP_LAST_SPLASH_AD_SHOW_TIME, System.currentTimeMillis())
-            } else {
-                if (mSplashAd?.displayRule?.adSource == AD_TYPE_SDK && mSplashAd?.displayRule?.onFailedAction == "show" && !isHotLaunch) {
-                    sdkStartAdContainer.visibility = View.GONE
-                    requestStandardSplashAd(
-                        activity,
-                        adViewWidthInPx,
-                        adViewHeightInPx,
-                        adViewWidthInDp,
-                        adViewHeightInDp,
-                        startAdContainer,
-                        sdkStartAdContainer,
-                        adsViewGroup,
-                        handler,
-                        isHotLaunch,
-                        hideCallback
-                    )
-                } else {
-                    hideCallback.invoke()
-                }
-            }
-        }
-
-        // 第三方广告的数据为空，按加载失败处理
-        if (mSplashAd?.thirdPartyAd == null) {
-            sdkSplashCallback.invoke(false)
-            return
-        }
-
-        if (mSplashAd?.thirdPartyAd?.sourceName == AD_SDK_BEIZI) {
-            sdkStartAdContainer.visibility = View.VISIBLE
-            requestBeiziSplashAd(sdkStartAdContainer, adsViewGroup, adViewWidthInPx, adViewHeightInPx, timeout.toLong(), sdkSplashCallback)
-        } else if (mSplashAd?.thirdPartyAd?.sourceName == AD_SDK_CSJ) {
-            sdkStartAdContainer.visibility = View.VISIBLE
-            requestCsjSplashAd(
-                activity,
-                mSplashAd?.thirdPartyAd?.slotId ?: "unknown",
-                adViewWidthInPx,
-                adViewHeightInPx,
-                adViewWidthInDp,
-                adViewHeightInDp,
-                sdkStartAdContainer,
-                timeout,
-                sdkSplashCallback
-            )
-        }
-    }
-
-    /**
-     * 获取穿山甲的开屏广告
-     */
-    private fun requestCsjSplashAd(
-        activity: Activity,
-        slotId: String,
-        adViewWidthInPx: Int,
-        adViewHeightInPx: Int,
-        adViewWidthInDp: Float,
-        adViewHeightInDp: Float,
-        startAdContainer: ViewGroup,
-        timeout: Int,
-        callback: (isSuccess: Boolean) -> Unit,
-    ) {
-        if (mCsjAdImpl == null) {
-            callback.invoke(false)
-        } else {
-            mCsjAdImpl?.requestSplashAd(
-                activity,
-                slotId,
-                adViewWidthInPx,
-                adViewHeightInPx,
-                adViewWidthInDp,
-                adViewHeightInDp,
-                startAdContainer,
-                timeout,
-                callback,
-            )
-        }
-    }
-
-    /**
-     * 获取 Beizi 的开屏广告
-     */
-    private fun requestBeiziSplashAd(
-        startAdContainer: View,
-        adsFl: FrameLayout,
-        adViewWidthInPx: Int,
-        adViewHeightInPx: Int,
-        timeout: Long,
-        callback: (isSuccess: Boolean) -> Unit,
-    ) {
-        if (mBeiziAdImpl == null) {
-            callback.invoke(false)
-        } else {
-            mBeiziAdImpl?.requestSplashAd(startAdContainer, adsFl, adViewWidthInPx, adViewHeightInPx, timeout, callback)
-        }
-    }
-
-    /**
-     * 显示自有的开屏广告
-     */
-    private fun requestStandardSplashAd(
-        activity: Activity,
-        adViewWidthInPx: Int,
-        adViewHeightInPx: Int,
-        adViewWidthInDp: Float,
-        adViewHeightInDp: Float,
-        startAdContainer: ViewGroup,
-        sdkStartAdContainer: ViewGroup,
-        adsViewGroup: FrameLayout,
-        handler: BaseActivity.BaseHandler,
-        isHotLaunch: Boolean,
-        hideCallback: () -> Unit
-    ) {
-        val splashAd = mSplashAd?.ownerAd?.startAd
-        val onEmptyCallback = {
-            if (mSplashAd?.displayRule?.adSource == AD_TYPE_OWNER && mSplashAd?.displayRule?.onFailedAction == "show" && mSplashAd?.thirdPartyAd != null) {
-                // 自有广告为空时，显示第三方广告
-                requestThirdPartySplashAd(
-                    activity,
-                    adViewWidthInPx,
-                    adViewHeightInPx,
-                    adViewWidthInDp,
-                    adViewHeightInDp,
-                    startAdContainer,
-                    sdkStartAdContainer,
-                    adsViewGroup,
-                    handler,
-                    isHotLaunch,
-                    hideCallback
-                )
-            } else {
-                hideCallback.invoke()
-            }
-        }
-        if (splashAd == null) {
-            onEmptyCallback.invoke()
-            return
-        }
-
-        if (!TextUtils.isEmpty(splashAd.img)) {
-            val showedTodayTimestamp = SPUtils.getString(Constants.SP_STARTUP_AD_TIMESTAMP, "") ?: ""
-            when (splashAd.rule) {
-                "each" -> showStandardSplashAd(splashAd, startAdContainer, handler, hideCallback)
-                "once" -> if (TextUtils.isEmpty(showedTodayTimestamp)
-                    || !showedTodayTimestamp.contains(splashAd.id)
-                ) {
-                    showStandardSplashAd(splashAd, startAdContainer, handler, hideCallback)
-                } else {
-                    onEmptyCallback.invoke()
-                }
-
-                "everyday" -> {
-                    val today = getToday()
-                    if (TextUtils.isEmpty(showedTodayTimestamp)
-                        || !showedTodayTimestamp.contains(today)
-                        || !showedTodayTimestamp.contains(splashAd.id)
-                    ) {
-                        showStandardSplashAd(splashAd, startAdContainer, handler, hideCallback)
-                    } else {
-                        onEmptyCallback.invoke()
-                    }
-                }
-
-                else -> hideCallback.invoke()
-            }
-            SPUtils.setString(Constants.SP_STARTUP_AD_TIMESTAMP, splashAd.id + getToday())
-        } else {
-            hideCallback.invoke()
-        }
-    }
-
-    private fun showStandardSplashAd(
-        ad: StartupAdEntity,
-        startAdContainer: ViewGroup,
-        handler: BaseActivity.BaseHandler,
-        hideCallback: () -> Unit
-    ) {
-        val jumpBtn: View = startAdContainer.findViewById(R.id.jumpBtn)
-        val jumpDetailBtn: TextView = startAdContainer.findViewById(R.id.jumpDetailBtn)
-        val adImage: SimpleDraweeView = startAdContainer.findViewById(R.id.adImage)
-        val icpContainer: View? = startAdContainer.findViewById(R.id.startAdIcpContainer)
-        startAdContainer.visibility = View.VISIBLE
-        icpContainer?.visibility = View.VISIBLE
-        jumpDetailBtn.text = ad.desc
-        jumpDetailBtn.setDrawableEnd(
-            AppCompatResources.getDrawable(
-                startAdContainer.context,
-                R.drawable.ic_startup_ad_arrow
-            ), null, null
-        )
-        ImageUtils.display(adImage, ad.img)
-        startAdContainer.setOnClickListener {
-            // 拦截点击事件传递
-        }
-        jumpBtn.setOnClickListener {
-            handler.removeMessages(MainActivity.COUNTDOWN_AD)
-            hideCallback.invoke()
-            val linkEntity = ad.jump
-            logOpenScreenAdSkip(
-                ad.id,
-                (if (linkEntity.text != null) linkEntity.text else "")!!,
-                (if (linkEntity.type != null) linkEntity.type else "")!!,
-                (if (linkEntity.link != null) linkEntity.link else "")!!
-            )
-        }
-        val sources: MutableList<ExposureSource> = ArrayList()
-        sources.add(ExposureSource("开屏广告", ad.id))
-        val event = createEvent(null, sources, null, ExposureType.EXPOSURE)
-        ExposureManager.log(event)
-        if (ad.button) {
-            jumpDetailBtn.setOnClickListener { v: View ->
-                directToLinkPage(v.context, ad.jump, "(启动广告)", "", event)
-                v.postDelayed({
-                    handler.removeMessages(MainActivity.COUNTDOWN_AD)
-                    hideCallback.invoke()
-                }, 1000)
-            }
-            jumpDetailBtn.visibility = View.VISIBLE
-            LogUtils.logStartAd("watch_start_ads", ad)
-        } else {
-            LogUtils.logStartAd("start_ads", ad)
-        }
-        SPUtils.setLong(Constants.SP_LAST_SPLASH_AD_SHOW_TIME, System.currentTimeMillis())
-        handler.sendEmptyMessageDelayed(MainActivity.COUNTDOWN_AD, 1000)
-    }
-
-    /**
-     * 获取第三方信息流广告
-     */
-    fun requestThirdPartyFlowAd(
-        fragment: Fragment,
-        slotId: String,
-        adContainerView: ViewGroup,
-        expressViewWidth: Float,
-        callback: (isSuccess: Boolean) -> Unit,
-    ) {
-        mCsjAdImpl?.requestFlowAd(fragment, adContainerView, slotId, expressViewWidth, callback)
-    }
-
-    /**
-     * 获取第三方 Banner 广告
-     */
-    fun requestThirdPartyBannerAd(
-        fragment: Fragment,
-        containerView: ViewGroup,
-        ad: AdConfig.ThirdPartyAd,
-        expressViewWidthInDp: Float,
-        callback: (isSuccess: Boolean) -> Unit
-    ) {
-
-        val slotId = ad.slotId
-        val displayRatio: Float = if (ad.displaySize.isEmpty()) {
-            2F
-        } else {
-            val array = ad.displaySize.split("*")
-            if (array.size == 2) {
-                array[0].toFloat() / array[1].toFloat()
-            } else {
-                2F
-            }
-        }
-        val expressViewHeightInDp = expressViewWidthInDp / displayRatio
-
-        mCsjAdImpl?.requestBannerAd(
-            fragment,
-            containerView,
-            slotId,
-            expressViewWidthInDp,
-            expressViewHeightInDp,
-            callback
-        )
-    }
-
-    /**
-     * 取消开屏广告
-     */
-    fun cancelSplashAd(context: Context) {
-        mBeiziAdImpl?.cancelSplashAd(context)
-        mCsjAdImpl?.cancelSplashAd(context)
-    }
-
-}

app/src/main/java/com/gh/base/BaseRichEditorActivity.kt

@@ -57,16 +57,11 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
     private lateinit var mEditorFontItalic: CheckableImageView
     private lateinit var mEditorFontStrikeThrough: CheckableImageView
     private lateinit var mEditorFontUnderline: CheckableImageView
-    private lateinit var mEditorParagraphDivider: CheckableImageView
     private lateinit var mEditorParagraphH1: CheckableImageView
     private lateinit var mEditorParagraphH2: CheckableImageView
     private lateinit var mEditorParagraphH3: CheckableImageView
     private lateinit var mEditorParagraphH4: CheckableImageView
     private lateinit var mEditorParagraphQuote: CheckableImageView
-    private lateinit var mEditorAlignLeft: CheckableImageView
-    private lateinit var mEditorAlignCenter: CheckableImageView
-    private lateinit var mEditorAlignRight: CheckableImageView
-    private lateinit var mEditorAlignContainer: View
     private lateinit var mEditorFontContainer: View
     private lateinit var mEditorParagraphContainer: View
     private lateinit var mEditorLinkContainer: View
@@ -102,7 +97,6 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                     mRichEditor.insertCustomStyleLink(insertData)
                 }
             }
-
             INSERT_ARTICLE_CODE -> {
                 val article =
                     data?.getParcelableExtra<ArticleEntity>(ArticleEntity::class.java.simpleName)
@@ -112,7 +106,6 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                     mRichEditor.insertCustomStyleLink(insertData)
                 }
             }
-
             INSERT_GAME_CODE -> {
                 val game = data?.getParcelableExtra<GameEntity>(GameEntity::class.java.simpleName)
                 if (game != null) {
@@ -121,7 +114,6 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                     mRichEditor.insertCustomStyleLink(insertData)
                 }
             }
-
             INSERT_GAME_COLLECTION_CODE -> {
                 val gameCollectionEntity =
                     data?.getParcelableExtra<GamesCollectionEntity>(GamesCollectionEntity::class.java.simpleName)
@@ -131,11 +123,9 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                     mRichEditor.insertCustomStyleLink(insertData)
                 }
             }
-
             REQUEST_CODE_IMAGE -> {
                 if (data != null) mViewModel.uploadPic(data)
             }
-
             INSERT_MEDIA_VIDEO_CODE -> {
                 val localVideoList =
                     data?.getParcelableArrayListExtra<LocalVideoEntity>(LocalVideoEntity::class.java.name)
@@ -145,14 +135,12 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                     uploadVideo(localVideoList)
                 }
             }
-
             REQUEST_CODE_IMAGE_CROP -> {
                 val imagePath = data?.getStringExtra(CropImageActivity.RESULT_CLIP_PATH)
                 if (!imagePath.isNullOrEmpty()) {
                     mViewModel.uploadPoster(imagePath)
                 }
             }
-
             INSERT_VIDEO_CODE -> {
                 val videoEntity = data?.getParcelableExtra<MyVideoEntity>(MyVideoEntity::class.java.simpleName)
                 if (videoEntity != null) {
@@ -206,12 +194,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
         mEditorParagraphH2 = findViewById(R.id.editor_paragraph_h2)
         mEditorParagraphH3 = findViewById(R.id.editor_paragraph_h3)
         mEditorParagraphH4 = findViewById(R.id.editor_paragraph_h4)
-        mEditorParagraphDivider = findViewById(R.id.editor_paragraph_divider)
         mEditorParagraphQuote = findViewById(R.id.editor_paragraph_quote)
-        mEditorAlignLeft = findViewById(R.id.editor_align_left)
-        mEditorAlignCenter = findViewById(R.id.editor_align_center)
-        mEditorAlignRight = findViewById(R.id.editor_align_right)
-        mEditorAlignContainer = findViewById(R.id.editor_align_container)
         mEditorFontContainer = findViewById(R.id.editor_font_container)
         mEditorParagraphContainer = findViewById(R.id.editor_paragraph_container)
         mEditorLinkContainer = findViewById(R.id.editor_link_container)
@@ -233,7 +216,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
         mKeyboardHeightProvider = KeyboardHeightProvider(this)
         mRichEditor.post { mKeyboardHeightProvider?.start() }
         mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this))
-        mRichEditor.setEditorBackgroundColor(R.color.ui_surface.toColor(this))
+        mRichEditor.setEditorBackgroundColor(R.color.background_white.toColor(this))
         mRichEditor.setEditorFontColor(if (mIsDarkModeOn) Color.parseColor("#C2C2C2") else Color.parseColor("#4A4A4A"))
         // 防止个别手机在Js里无法获取粘贴内容
         mRichEditor.addJavascriptInterface(OnPasteListener(), "onPasteListener")
@@ -258,13 +241,6 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                 mRichEditor.hasFocus()
             } else false
         }
-
-        mRichEditor.setOnDecorationChangeListener { _, types ->
-            mEditorAlignLeft.isChecked = types.contains(RichEditor.Type.JUSTIFYLEFT)
-            mEditorAlignCenter.isChecked = types.contains(RichEditor.Type.JUSTIFYCENTER)
-            mEditorAlignRight.isChecked = types.contains(RichEditor.Type.JUSTIFYRIGHT)
-        }
-
         mOriginalCb.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 mOriginalTipsContainer.alpha = 0f
@@ -349,9 +325,6 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                 MtaHelper.onEvent(mtaEventName(), "文字样式", "文字样式-下滑线")
             }
         }
-        mEditorParagraphDivider.setOnClickListener {
-            mRichEditor.insertDivider()
-        }
         mEditorParagraphH1.setOnClickListener {
             if (mEditorParagraphH1.isChecked) {
                 mRichEditor.formatBlock()
@@ -397,27 +370,6 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
             }
             mEditorParagraphQuote.isChecked = !mEditorParagraphQuote.isChecked
         }
-        mEditorAlignLeft.setOnClickListener {
-            if (!mEditorAlignLeft.isChecked) {
-                mRichEditor.setAlignLeft()
-                MtaHelper.onEvent(mtaEventName(), "文本对齐选项", "文本对齐选项-靠左")
-                mEditorAlignLeft.isChecked = !mEditorAlignLeft.isChecked
-            }
-        }
-        mEditorAlignCenter.setOnClickListener {
-            if (!mEditorAlignCenter.isChecked) {
-                mRichEditor.setAlignCenter()
-                MtaHelper.onEvent(mtaEventName(), "文本对齐选项", "文本对齐选项-靠中")
-                mEditorAlignCenter.isChecked = !mEditorAlignCenter.isChecked
-            }
-        }
-        mEditorAlignRight.setOnClickListener {
-            if (!mEditorAlignRight.isChecked) {
-                mRichEditor.setAlignRight()
-                MtaHelper.onEvent(mtaEventName(), "文本对齐选项", "文本对齐选项-靠右")
-                mEditorAlignRight.isChecked = !mEditorAlignRight.isChecked
-            }
-        }
         findViewById<View>(R.id.editor_link_answer).setOnClickListener {
             MtaHelper.onEvent(mtaEventName(), "插入链接", "插入链接-回答")
             startActivityForResult(
@@ -497,22 +449,25 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
             return
         }
         try {
-            PermissionHelper.checkStoragePermissionBeforeAction(this) {
-                val maxChooseCount = if (videoCount + 3 <= MAX_MEDIA_COUNT) 3 else MAX_MEDIA_COUNT - videoCount
-                startActivityForResult(
-                    LocalMediaActivity.getIntent(
-                        this@BaseRichEditorActivity,
-                        LocalMediaActivity.ChooseType.VIDEO,
-                        maxChooseCount,
-                        if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
-                    ), INSERT_MEDIA_VIDEO_CODE
-                )
-                NewLogUtils.logChooseMedia(
-                    "view_media",
-                    if (mtaEventName() == "提问帖") "提问帖" else "帖子",
-                    "视频"
-                )
-            }
+            PermissionHelper.checkStoragePermissionBeforeAction(this,
+                object : EmptyCallback {
+                    override fun onCallback() {
+                        val maxChooseCount = if (videoCount + 3 <= MAX_MEDIA_COUNT) 3 else MAX_MEDIA_COUNT - videoCount
+                        startActivityForResult(
+                            LocalMediaActivity.getIntent(
+                                this@BaseRichEditorActivity,
+                                LocalMediaActivity.ChooseType.VIDEO,
+                                maxChooseCount,
+                                if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
+                            ), INSERT_MEDIA_VIDEO_CODE
+                        )
+                        NewLogUtils.logChooseMedia(
+                            "view_media",
+                            if (mtaEventName() == "提问帖") "提问帖" else "帖子",
+                            "视频"
+                        )
+                    }
+                })
         } catch (e: Exception) {
             toast(R.string.media_image_hint)
             e.printStackTrace()
@@ -527,16 +482,18 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
             return
         }
         try {
-            PermissionHelper.checkStoragePermissionBeforeAction(this) {
-                val maxChooseCount = if (imageCount + 10 <= MAX_IMAGE_COUNT) 10 else MAX_IMAGE_COUNT - imageCount
-                val intent = LocalMediaActivity.getIntent(
-                    this@BaseRichEditorActivity,
-                    LocalMediaActivity.ChooseType.IMAGE,
-                    maxChooseCount,
-                    if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
-                )
-                startActivityForResult(intent, REQUEST_CODE_IMAGE)
-            }
+            PermissionHelper.checkStoragePermissionBeforeAction(this, object : EmptyCallback {
+                override fun onCallback() {
+                    val maxChooseCount = if (imageCount + 10 <= MAX_IMAGE_COUNT) 10 else MAX_IMAGE_COUNT - imageCount
+                    val intent = LocalMediaActivity.getIntent(
+                        this@BaseRichEditorActivity,
+                        LocalMediaActivity.ChooseType.IMAGE,
+                        maxChooseCount,
+                        if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
+                    )
+                    startActivityForResult(intent, REQUEST_CODE_IMAGE)
+                }
+            })
         } catch (e: Exception) {
             toast(R.string.media_image_hint)
             e.printStackTrace()
@@ -559,7 +516,6 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
             mEditorFontContainer.visibility = if (mEditorFont.isChecked) View.VISIBLE else View.GONE
             mEditorParagraphContainer.visibility =
                 if (mEditorFont.isChecked) View.VISIBLE else View.GONE
-            mEditorAlignContainer.visibility = if (mEditorFont.isChecked) View.VISIBLE else View.GONE
             mEditorLinkContainer.visibility = View.GONE
             mTagsContainer.visibility = View.GONE
             mIsExtendedKeyboardShow = mEditorFont.isChecked
@@ -581,7 +537,6 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                 if (mEditorLink.isChecked) View.VISIBLE else View.GONE
             mEditorLinkContainer.visibility = if (mEditorLink.isChecked) View.VISIBLE else View.GONE
             mEditorFontContainer.visibility = View.GONE
-            mEditorAlignContainer.visibility = View.GONE
             mEditorParagraphContainer.visibility = View.GONE
             mTagsContainer.visibility = View.GONE
             mIsExtendedKeyboardShow = mEditorLink.isChecked
@@ -797,9 +752,9 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
 
     override fun onDarkModeChanged() {
         super.onDarkModeChanged()
-        updateStatusBarColor(R.color.ui_surface, R.color.ui_surface)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
         mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this))
-        mRichEditor.setEditorBackgroundColor(R.color.ui_surface.toColor(this))
+        mRichEditor.setEditorBackgroundColor(R.color.background_white.toColor(this))
         mRichEditor.setEditorFontColor(if (mIsDarkModeOn) Color.parseColor("#C2C2C2") else Color.parseColor("#4A4A4A"))
     }
 
@@ -821,7 +776,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
         const val INSERT_VIDEO_CODE = 415
         const val MAX_INPUT_TEXT_NUM = 10000
         const val MAX_MEDIA_COUNT = 20
-        const val MAX_IMAGE_COUNT = 70
+        const val MAX_IMAGE_COUNT = 35
 
         const val REQUEST_CODE_IMAGE = 120
         const val INSERT_MEDIA_VIDEO_CODE = 121

app/src/main/java/com/gh/base/BaseRichEditorViewModel.kt

@@ -28,7 +28,6 @@ import com.gh.gamecenter.retrofit.service.ApiService
 import com.gh.gamecenter.video.upload.OnUploadListener
 import com.gh.gamecenter.video.upload.UploadManager
 import com.google.gson.JsonObject
-import com.lightgame.download.FileUtils
 import com.lightgame.utils.Utils
 import com.zhihu.matisse.Matisse
 import com.zhihu.matisse.internal.utils.PathUtils
@@ -39,10 +38,6 @@ import okhttp3.ResponseBody
 import retrofit2.HttpException
 import java.io.File
 import java.io.FileOutputStream
-import java.util.*
-import kotlin.collections.ArrayList
-import kotlin.collections.HashMap
-import kotlin.collections.LinkedHashMap
 import kotlin.collections.set
 
 // TODO: 移动到module_bbs模块
@@ -129,17 +124,8 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
                     }
                     val map = LinkedHashMap<String, String>()
                     for (key in imageUrlMap.keys) {
-                        val localFileUri = FILE_HOST + key.decodeURI()
-
-                        // 文件格式为 HEIC 时，使用经 OSS 转码的图片作为预览图片
-                        if (FileUtils.getFileMimeType(getApplication(), key.decodeURI())?.lowercase(Locale.CHINA)?.contains("heic") == true) {
-                            val transformedImgUrl = ImageUtils.getTransformedUrl(imageUrlMap[key], 5000) ?: ""
-                            map[MD5Utils.getUrlMD5(key)] = transformedImgUrl
-                            mapImages[transformedImgUrl.decodeURI()] = imageUrlMap[key] ?: ""
-                        } else {
-                            map[MD5Utils.getUrlMD5(key)] = localFileUri
-                            mapImages[TextUtils.htmlEncode(key).decodeURI()] = imageUrlMap[key] ?: ""
-                        }
+                        map[MD5Utils.getUrlMD5(key)] = FILE_HOST + key.decodeURI()
+                        mapImages[TextUtils.htmlEncode(key).decodeURI()] = imageUrlMap[key] ?: ""
                     }
                     chooseImagesUploadSuccess.value = map
                 }

app/src/main/java/com/gh/base/DownloadToolbarActivity.kt

@@ -1,23 +1,21 @@
 package com.gh.base
 
-import android.graphics.Typeface
 import android.os.Bundle
+import android.text.TextUtils
 import android.view.MenuItem
 import android.view.View
-import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.constraintlayout.widget.ConstraintLayout
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.DownloadManagerActivity
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.activity.ToolBarActivity
 import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.viewModelProvider
+import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.core.utils.SPUtils.getBoolean
 import com.gh.gamecenter.entity.GameUpdateEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
 import com.gh.gamecenter.packagehelper.PackageViewModel
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -60,7 +58,6 @@ abstract class DownloadToolbarActivity : ToolBarActivity() {
         }
         val downloadMenuView = mActionMenuView.menu.findItem(R.id.menu_download).actionView
         mDownloadCountHint = downloadMenuView?.findViewById(R.id.menu_download_count_hint)
-        mDownloadCountHint?.typeface = Typeface.createFromAsset(assets, "fonts/d_din_bold_only_number.ttf")
     }
 
     override fun onMenuItemClick(item: MenuItem?): Boolean {
@@ -77,27 +74,19 @@ abstract class DownloadToolbarActivity : ToolBarActivity() {
         if (mDownloadCountHint == null) return
         val count = DownloadManager.getInstance().getDownloadOrUpdateCount(updateList)
         if (count != null) {
-            mDownloadCountHint?.visibility = View.VISIBLE
-            mDownloadCountHint?.text = count
-            val params = mDownloadCountHint?.layoutParams
-            params?.width = if (count.isEmpty()) 6F.dip2px() else ConstraintLayout.LayoutParams.WRAP_CONTENT
-            params?.height = if (count.isEmpty()) 6F.dip2px() else 14F.dip2px()
-            (params as? ViewGroup.MarginLayoutParams)?.setMargins(
-                0,
-                if (count.isEmpty()) 0 else (-4F).dip2px(),
-                if (count.isEmpty()) (-4F).dip2px() else (-8F).dip2px(),
-                0
-            )
-            mDownloadCountHint?.setPadding(
-                if (count.isEmpty()) 0 else 4F.dip2px(),
-                0,
-                if (count.isEmpty()) 0 else 4F.dip2px(),
-                0
-            )
-            mDownloadCountHint?.minWidth = if (count.isEmpty()) 0 else 14F.dip2px()
-            mDownloadCountHint?.layoutParams = params
+            mDownloadCountHint!!.visibility = View.VISIBLE
+            mDownloadCountHint!!.text = count
+            val params = mDownloadCountHint!!.layoutParams
+            if (TextUtils.isEmpty(count)) {
+                params.width = DisplayUtils.dip2px(6f)
+                params.height = DisplayUtils.dip2px(6f)
+            } else {
+                params.width = DisplayUtils.dip2px(12f)
+                params.height = DisplayUtils.dip2px(12f)
+            }
+            mDownloadCountHint!!.layoutParams = params
         } else {
-            mDownloadCountHint?.visibility = View.GONE
+            mDownloadCountHint!!.visibility = View.GONE
         }
     }
 

app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt

@@ -4,13 +4,11 @@ import android.app.Activity
 import android.app.Application
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.gh.ad.AdDelegateHelper
 import com.gh.common.util.FloatingBackViewManager
 import com.gh.common.xapk.XapkInstaller
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.SingletonWebActivity
 import com.gh.gamecenter.SkipActivity
-import com.gh.gamecenter.SplashAdActivity
 import com.gh.gamecenter.SplashScreenActivity
 import com.gh.gamecenter.authorization.AuthorizationActivity
 import com.gh.gamecenter.common.base.GlobalActivityManager
@@ -20,8 +18,6 @@ import com.halo.assistant.HaloApp
 
 // TODO：移动到对应的模块
 class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
-    private var isFromBackgroundToForeground = false // 是否后台回到前台
-    private var activityCount = 0
 
     override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
         // do nothing
@@ -29,19 +25,6 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
 
     override fun onActivityStarted(activity: Activity) {
         GlobalActivityManager.currentActivity = activity
-        activityCount ++
-        if (activityCount == 1 && isFromBackgroundToForeground) {
-            if (AdDelegateHelper.shouldShowStartUpAd(true)
-                && !HaloApp.getInstance().isSkippingThirdParty
-                && activity !is SplashScreenActivity
-                && activity !is SkipActivity
-                && activity !is AuthorizationActivity
-                && activity !is SplashAdActivity
-            ) {
-                activity.startActivity(SplashAdActivity.getIntent(activity))
-            }
-            isFromBackgroundToForeground = false
-        }
     }
 
     override fun onActivityResumed(activity: Activity) {
@@ -91,8 +74,7 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
     }
 
     override fun onActivityStopped(activity: Activity) {
-        activityCount --
-        isFromBackgroundToForeground = activityCount <= 0
+        // do nothing
     }
 
     override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {

app/src/main/java/com/gh/common/DefaultJsApi.kt

@@ -24,23 +24,22 @@ import com.gh.gamecenter.common.callback.BiCallback
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.entity.NotificationUgc
-import com.gh.gamecenter.common.exposure.ExposureSource
 import com.gh.gamecenter.common.loghub.LoghubUtils
 import com.gh.gamecenter.common.provider.IHelpAndFeedbackProvider
 import com.gh.gamecenter.common.tracker.Tracker
 import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.common.utils.NewFlatLogUtils
 import com.gh.gamecenter.common.view.dsbridge.CompletionHandler
 import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.runOnUiThread
 import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.entity.SensorsEvent
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.common.eventbus.EBDownloadStatus
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.feature.entity.Badge
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.exposure.ExposureEvent
+import com.gh.gamecenter.feature.exposure.ExposureSource
 import com.gh.gamecenter.login.user.LoginTag
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.login.user.UserRepository
@@ -69,14 +68,8 @@ class DefaultJsApi(
     val entrance: String = "",
     private var mFragment: Fragment? = null,
     private var mBbsId: String? = "",
-    private var mOriginUrl: String? = "",
-    private val mForumName: String? = ""
 ) {
 
-    companion object {
-        private const val SOURCE_ENTRANCE = "webView"
-    }
-
     private var mLoginHandler: CompletionHandler<Any>? = null
     private var mDownloadWatcher: DataWatcher? = null // 下载观察者
     private var mDownloadUrlSet: HashSet<String>? = null // 下载的 url 集合
@@ -235,14 +228,7 @@ class DefaultJsApi(
 
         val context = CurrentActivityHolder.getCurrentActivity()
 
-        context?.startActivity(
-            ImageViewerActivity.getIntent(
-                context,
-                imageEvent.imageList,
-                imageEvent.position,
-                "浏览器"
-            )
-        )
+        context?.startActivity(ImageViewerActivity.getIntent(context, imageEvent.imageList, imageEvent.position, "浏览器"))
     }
 
     @JavascriptInterface
@@ -291,18 +277,11 @@ class DefaultJsApi(
 
     /**
      * 打开论坛搜索页
-     * 如果用户是从 webView跳转到论坛搜索页，则sourceEntrance为空
      */
     @JavascriptInterface
     fun openForumSearch(msg: Any) {
         runOnUiThread {
-            DirectUtils.directToForumOrUserSearch(
-                context,
-                mBbsId ?: "",
-                entrance.ifBlank { "内部网页" },
-                SOURCE_ENTRANCE,
-                mForumName ?: ""
-            )
+            DirectUtils.directToForumOrUserSearch(context, mBbsId ?: "", entrance.ifBlank { "内部网页" })
         }
     }
 
@@ -404,7 +383,7 @@ class DefaultJsApi(
 
     @JavascriptInterface
     fun showQaFeedbackDialog(msg: Any) {
-        val mHelpAndFeedbackHelp =
+         val mHelpAndFeedbackHelp =
             ARouter.getInstance().build(RouteConsts.provider.helpAndFeedback).navigation() as? IHelpAndFeedbackProvider
         mHelpAndFeedbackHelp?.showQaFeedbackDialogFragment(context as AppCompatActivity, msg.toString())
     }
@@ -550,24 +529,13 @@ class DefaultJsApi(
     @JavascriptInterface
     fun installDownloadedGame(event: Any) {
         val url = event.toString()
+        val vUrl = VHelper.getVUrl(url)
 
-        val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(url, null)
-            ?: DownloadManager.getInstance().getDownloadEntitySnapshot(url, null)
-
-        NewFlatLogUtils.logGameInstall(
-            gameId = downloadEntity?.gameId ?: "",
-            gameName = downloadEntity?.name ?: "",
-            trigger = "主动安装"
-        )
-
-        SensorsBridge.trackInstallGameClick(
-            gameId = downloadEntity?.gameId ?: "",
-            gameName = downloadEntity?.name ?: "",
-            action = "主动安装"
-        )
+        val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(url, null, false)
+            ?: DownloadManager.getInstance().getDownloadEntitySnapshot(vUrl, null, false)
 
         downloadEntity?.let {
-            PackageInstaller.install(context, it, showUnzipToast = false, ignoreAsVGame = false)
+            PackageInstaller.install(context, it, showUnzipToast = false)
         }
     }
 
@@ -664,19 +632,12 @@ class DefaultJsApi(
     fun logExposure(event: Any) {
         val simpleExposureEvent = event.toString().toObject() ?: SimpleExposureEvent()
         if (simpleExposureEvent.id.isNotEmpty()) {
-            val sourceKey = if (mOriginUrl?.contains(Constants.URL_QUERY_FROM_FLOATING_WINDOW) == true) {
-                "落地页"
-            } else {
-                "游戏活动"
-            }
-
-            val exposureSource = ExposureSource(sourceKey, "${simpleExposureEvent.title}+${simpleExposureEvent.id}")
+            val exposureSource = ExposureSource("游戏活动", "${simpleExposureEvent.title}+${simpleExposureEvent.id}")
             mExposureEvent = ExposureEvent.createEvent(
                 gameEntity = null,
                 source = arrayListOf(exposureSource),
             )
             ExposureManager.log(mExposureEvent!!)
-            ExposureManager.commitSavedExposureEvents(true)
         }
     }
 
@@ -768,7 +729,6 @@ class DefaultJsApi(
         var status: String = "" // DOWNLOADING, PAUSED, DOWNLOADED, ERROR, UNKNOWN
     ) {
         companion object {
-
             fun fromDownloadEntity(downloadEntity: DownloadEntity): SimpleDownloadEntity {
                 val status: String = when (downloadEntity.status) {
                     add,

app/src/main/java/com/gh/common/DefaultUrlHandler.kt

@@ -15,7 +15,6 @@ import com.gh.common.util.DirectUtils.directToLegacyVideoDetail
 import com.gh.common.util.DirectUtils.directToLinkPage
 import com.gh.common.util.DirectUtils.directToQa
 import com.gh.common.util.PackageUtils
-import com.gh.gamecenter.LibaoDetailActivity
 import com.gh.gamecenter.MainActivity
 import com.gh.gamecenter.NewsDetailActivity
 import com.gh.gamecenter.WebActivity
@@ -103,7 +102,7 @@ object DefaultUrlHandler {
                     entrance
                 )
 
-                "libao" -> context.startActivity(LibaoDetailActivity.getIntentById(context, id, entrance))
+                "libao" -> DirectUtils.directToGiftDetail(context, id, entrance)
 
                 "qq" -> try {
                     DirectUtils.directToQqConversation(context, id)
@@ -350,8 +349,7 @@ object DefaultUrlHandler {
                 }
 
                 EntranceConsts.HOST_FORUM_DETAIL -> {
-                    val sectionId = uri.getQueryParameter("section_id") ?: ""
-                    DirectUtils.directForumDetailSection(context, id, sectionId, entrance)
+                    DirectUtils.directForumDetail(context, id, entrance)
                 }
 
                 EntranceConsts.HOST_GAME_RATING_DETAIL -> {
@@ -439,17 +437,17 @@ object DefaultUrlHandler {
                         directToFeedback(
                             context,
                             content,
+                            null,
                             isQaFeedback,
                             qaContentId,
-                            isPlugin = false,
-                            isSmoothGame = false,
                             EntranceConsts.ENTRANCE_BROWSER
                         )
                     }
                 }
 
                 EntranceConsts.HOST_HELP_AND_FEEDBACK -> {
-                    DirectUtils.directToHelpAndFeedback(context)
+                    val position = uri.getQueryParameter("position") ?: ""
+                    DirectUtils.directToHelpAndFeedback(context, position.toInt())
                 }
 
                 EntranceConsts.HOST_HELP_DETAIL -> {
@@ -490,13 +488,12 @@ object DefaultUrlHandler {
                     val activityName = uri.getQueryParameter("activity_name") ?: ""
                     val gameId = uri.getQueryParameter("game_id") ?: ""
                     context.startActivity(
-                        GameCollectionEditActivity.getCreateIntent(
+                        GameCollectionEditActivity.getIntent(
                             context,
                             activityId,
                             activityName,
                             gameId,
-                            entrance,
-                            "其他"
+                            entrance
                         )
                     )
                 }

app/src/main/java/com/gh/common/FixedRateJobHelper.kt

@@ -84,6 +84,11 @@ object FixedRateJobHelper {
                     VideoRecordUtils.commitVideoRecord()
                 }
 
+                // 获取启动广告 (第一次不需要获取)
+                if (elapsedTime % STARTUP_AD == 0L && mExecuteCount != 0) {
+                    AdHelper.getSettingAdCache()
+                }
+
                 mExecuteCount++
             }
         }

app/src/main/java/com/gh/common/chain/AutoSwitchAssistantInstallHandler.kt

@@ -0,0 +1,23 @@
+package com.gh.common.chain
+
+import android.content.Context
+import com.gh.download.server.BrowserInstallHelper
+import com.gh.gamecenter.R
+import com.gh.gamecenter.core.utils.ToastUtils
+import com.gh.gamecenter.feature.entity.GameEntity
+
+class AutoSwitchAssistantInstallHandler : ChainHandler() {
+
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+        if (BrowserInstallHelper.isUseBrowserToInstallEnabled()
+            && BrowserInstallHelper.shouldUseBrowserToInstall()
+            && gameEntity.isSplitXApk()) {
+            ToastUtils.toast(context.getString(R.string.unsupported_browser_install_hint))
+        }
+        if (hasNext()) {
+            getNext()?.handleRequest(context, gameEntity)
+        } else {
+            processEndCallback?.invoke(null)
+        }
+    }
+}

app/src/main/java/com/gh/common/chain/BrowserInstallHandler.kt

@@ -1,21 +1,22 @@
 package com.gh.common.chain
 
 import android.content.Context
+import com.gh.common.xapk.XapkInstaller
 import com.gh.download.server.BrowserInstallHelper
+import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.feature.entity.GameEntity
 
-class BrowserInstallHandler : DownloadChainHandler() {
+class BrowserInstallHandler : ChainHandler() {
 
-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
         BrowserInstallHelper.showBrowserInstallHintDialog(
             context,
-            gameEntity,
-            asVGame || gameEntity.isSplitXApk()
+            gameEntity.isVGame() || gameEntity.isSplitXApk()
         ) {
             if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
+                getNext()?.handleRequest(context, gameEntity)
             } else {
-                processEndCallback?.invoke(asVGame, null)
+                processEndCallback?.invoke(null)
             }
         }
     }

app/src/main/java/com/gh/common/chain/CertificationHandler.kt

@@ -4,14 +4,14 @@ import android.content.Context
 import com.gh.common.dialog.CertificationDialog
 import com.gh.gamecenter.feature.entity.GameEntity
 
-class CertificationHandler : DownloadChainHandler() {
+class CertificationHandler : ChainHandler() {
 
-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
         CertificationDialog.showCertificationDialog(context, gameEntity) {
             if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
+                getNext()?.handleRequest(context, gameEntity)
             } else {
-                processEndCallback?.invoke(asVGame, null)
+                processEndCallback?.invoke(null)
             }
         }
     }

app/src/main/java/com/gh/common/chain/ChainBuilder.kt

@@ -1,22 +1,22 @@
 package com.gh.common.chain
 
-class DownloadChainBuilder {
+class ChainBuilder {
 
-    private val handlers: MutableList<DownloadChainHandler> = ArrayList()
+    private val handlers: MutableList<ChainHandler> = ArrayList()
 
-    private var processEndCallback: ((asVGame: Boolean, Any?) -> Unit)? = null
+    private var processEndCallback: ((Any?) -> Unit)? = null
 
-    fun setProcessEndCallback(callback: (asVGame: Boolean, Any?) -> Unit): DownloadChainBuilder {
+    fun setProcessEndCallback(callback: (Any?) -> Unit): ChainBuilder {
         processEndCallback = callback
         return this
     }
 
-    fun addHandler(handler: DownloadChainHandler): DownloadChainBuilder {
+    fun addHandler(handler: ChainHandler): ChainBuilder {
         handlers.add(handler)
         return this
     }
 
-    fun buildHandlerChain(): DownloadChainHandler? {
+    fun buildHandlerChain(): ChainHandler? {
         for (i in handlers.indices) {
             handlers[i].processEndCallback = processEndCallback
             if (i + 1 < handlers.size) {

app/src/main/java/com/gh/common/chain/ChainHandler.kt

@@ -0,0 +1,24 @@
+package com.gh.common.chain
+
+import android.content.Context
+import com.gh.gamecenter.feature.entity.GameEntity
+
+abstract class ChainHandler {
+    private var next: ChainHandler? = null
+    var processEndCallback: ((Any?) -> Unit)? = null
+
+    fun setNext(next: ChainHandler?) {
+        this.next = next
+    }
+
+    fun getNext(): ChainHandler? {
+        return next
+    }
+
+    fun hasNext(): Boolean {
+        return next != null
+    }
+
+    abstract fun handleRequest(context: Context, gameEntity: GameEntity)
+
+}

app/src/main/java/com/gh/common/chain/CheckDownloadHandler.kt

@@ -5,15 +5,15 @@ import com.gh.common.util.DialogUtils
 import com.gh.gamecenter.common.utils.safelyGetInRelease
 import com.gh.gamecenter.feature.entity.GameEntity
 
-class CheckDownloadHandler : DownloadChainHandler() {
+class CheckDownloadHandler : ChainHandler() {
 
-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
         val apk = gameEntity.getApk().safelyGetInRelease(0) ?: return
-        DialogUtils.checkDownload(context, apk.size, gameEntity.id, gameEntity.name, gameEntity.categoryChinese) { isSubscribe: Boolean ->
+        DialogUtils.checkDownload(context, apk.size, gameEntity.id, gameEntity.name) { isSubscribe: Boolean ->
             if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
+                getNext()?.handleRequest(context, gameEntity)
             } else {
-                processEndCallback?.invoke(asVGame, isSubscribe)
+                processEndCallback?.invoke(isSubscribe)
             }
         }
 

app/src/main/java/com/gh/common/chain/CheckStoragePermissionHandler.kt

@@ -2,23 +2,20 @@ package com.gh.common.chain
 
 import android.content.Context
 import com.gh.gamecenter.common.utils.PermissionHelper
+import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.feature.entity.GameEntity
 
-class CheckStoragePermissionHandler : DownloadChainHandler() {
+class CheckStoragePermissionHandler : ChainHandler() {
 
-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
-        PermissionHelper.checkStoragePermissionBeforeAction(
-            context,
-            gameEntity.id,
-            gameEntity.name ?: "",
-            gameEntity.categoryChinese,
-            gameEntity.getApk().firstOrNull()?.format,
-        ) {
-            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
-            } else {
-                processEndCallback?.invoke(asVGame, null)
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+        PermissionHelper.checkStoragePermissionBeforeAction(context, object : EmptyCallback {
+            override fun onCallback() {
+                if (hasNext()) {
+                    getNext()?.handleRequest(context, gameEntity)
+                } else {
+                    processEndCallback?.invoke(null)
+                }
             }
-        }
+        })
     }
 }

app/src/main/java/com/gh/common/chain/DownloadChainHandler.kt

@@ -1,40 +0,0 @@
-package com.gh.common.chain
-
-import android.content.Context
-import com.gh.gamecenter.feature.entity.GameEntity
-
-abstract class DownloadChainHandler {
-    private var next: DownloadChainHandler? = null
-
-    // asVGame: 当前下载是否以畅玩游戏来进行
-    var processEndCallback: ((asVGame: Boolean, Any?) -> Unit)? = null
-
-    /**
-     * 设置下一个处理者
-     */
-    fun setNext(next: DownloadChainHandler?) {
-        this.next = next
-    }
-
-    /**
-     * 获取下一个处理者
-     */
-    fun getNext(): DownloadChainHandler? {
-        return next
-    }
-
-    /**
-     * 是否存在下一个处理者
-     */
-    fun hasNext(): Boolean {
-        return next != null
-    }
-
-    /**
-     * 处理请求
-     * @param gameEntity 游戏实体
-     * @param asVGame 是否作为畅玩游戏进行
-     */
-    abstract fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean)
-
-}

app/src/main/java/com/gh/common/chain/DownloadDialogHelperHandler.kt

@@ -3,18 +3,21 @@ package com.gh.common.chain
 import android.content.Context
 import com.gh.common.util.DownloadDialogHelper
 import com.gh.gamecenter.common.utils.safelyGetInRelease
+import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.feature.entity.GameEntity
 
-class DownloadDialogHelperHandler : DownloadChainHandler() {
+class DownloadDialogHelperHandler : ChainHandler() {
 
-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
         val apk = gameEntity.getApk().safelyGetInRelease(0) ?: return
-        DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk) {
-            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
-            } else {
-                processEndCallback?.invoke(asVGame, null)
+        DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, object : EmptyCallback {
+            override fun onCallback() {
+                if (hasNext()) {
+                    getNext()?.handleRequest(context, gameEntity)
+                } else {
+                    processEndCallback?.invoke(null)
+                }
             }
-        }
+        })
     }
 }

app/src/main/java/com/gh/common/chain/GamePermissionHandler.kt

@@ -5,14 +5,14 @@ import androidx.appcompat.app.AppCompatActivity
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment
 
-class GamePermissionHandler : DownloadChainHandler() {
+class GamePermissionHandler : ChainHandler() {
 
-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
         GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) {
             if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
+                getNext()?.handleRequest(context, gameEntity)
             } else {
-                processEndCallback?.invoke(asVGame, null)
+                processEndCallback?.invoke(null)
             }
         }
     }

app/src/main/java/com/gh/common/chain/LandPageAddressHandler.kt

@@ -1,32 +0,0 @@
-package com.gh.common.chain
-
-import android.app.Activity
-import android.content.Context
-import com.gh.common.util.DialogUtils
-import com.gh.common.util.DirectUtils
-import com.gh.common.util.TempCertificationUtils
-import com.gh.gamecenter.feature.entity.GameEntity
-
-class LandPageAddressHandler : DownloadChainHandler() {
-
-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
-        if (gameEntity.isLandPageAddressDialog()) {
-            TempCertificationUtils.checkCertificationBeforeAction(gameEntity) {
-                if (context is Activity && context.isFinishing) {
-                    // 当前 context 已经无效，不需要再传递执行下去了
-                    return@checkCertificationBeforeAction
-                }
-
-                DialogUtils.showLandPageAddressDialog(context, gameEntity) {// 跳转第三方落地页
-                    DirectUtils.directToExternalBrowser(context, gameEntity.landPageAddressDialog!!.link!!)
-                }
-            }
-        } else {
-            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
-            } else {
-                processEndCallback?.invoke(asVGame, null)
-            }
-        }
-    }
-}

app/src/main/java/com/gh/common/chain/OverseaDownloadHandler.kt

@@ -1,34 +1,17 @@
 package com.gh.common.chain
 
-import android.app.Activity
 import android.content.Context
 import com.gh.common.util.DialogUtils
-import com.gh.common.util.TempCertificationUtils
 import com.gh.gamecenter.feature.entity.GameEntity
 
-class OverseaDownloadHandler : DownloadChainHandler() {
+class OverseaDownloadHandler : ChainHandler() {
 
-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
-        if (gameEntity.isOverseaAddressDialog()) {
-            TempCertificationUtils.checkCertificationBeforeAction(gameEntity) {
-                if (context is Activity && context.isFinishing) {
-                    // 当前 context 已经无效，不需要再传递执行下去了
-                    return@checkCertificationBeforeAction
-                }
-
-                DialogUtils.showOverseaDownloadDialog(context, gameEntity) {// 跳转海外下载地址弹窗
-                    if (hasNext()) {
-                        getNext()?.handleRequest(context, gameEntity, asVGame)
-                    } else {
-                        processEndCallback?.invoke(asVGame, null)
-                    }
-                }
-            }
-        } else {
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+        DialogUtils.showOverseaDownloadDialog(context, gameEntity) {
             if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
+                getNext()?.handleRequest(context, gameEntity)
             } else {
-                processEndCallback?.invoke(asVGame, null)
+                processEndCallback?.invoke(null)
             }
         }
     }

app/src/main/java/com/gh/common/chain/PackageCheckHandler.kt

@@ -5,14 +5,14 @@ import androidx.appcompat.app.AppCompatActivity
 import com.gh.common.dialog.PackageCheckDialogFragment
 import com.gh.gamecenter.feature.entity.GameEntity
 
-class PackageCheckHandler : DownloadChainHandler() {
+class PackageCheckHandler : ChainHandler() {
 
-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
         PackageCheckDialogFragment.show((context as AppCompatActivity), gameEntity) {
             if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
+                getNext()?.handleRequest(context, gameEntity)
             } else {
-                processEndCallback?.invoke(asVGame, null)
+                processEndCallback?.invoke(null)
             }
         }
     }

app/src/main/java/com/gh/common/chain/UnsupportedFeatureHandler.kt

@@ -4,20 +4,18 @@ import android.content.Context
 import com.gh.gamecenter.common.utils.DialogHelper
 import com.gh.gamecenter.feature.entity.GameEntity
 
-class UnsupportedFeatureHandler : DownloadChainHandler() {
+class UnsupportedFeatureHandler : ChainHandler() {
 
     override fun handleRequest(
-        context: Context,
-        gameEntity: GameEntity,
-        asVGame: Boolean
+        context: Context, gameEntity: GameEntity
     ) {
         if (shouldShowUnsupportedFeatureDialog()) {
             DialogHelper.showUnsupportedFeatureDialog(context)
         } else {
             if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
+                getNext()?.handleRequest(context, gameEntity)
             } else {
-                processEndCallback?.invoke(asVGame, null)
+                processEndCallback?.invoke(null)
             }
         }
     }

app/src/main/java/com/gh/common/chain/UpdateNewSimulatorHandler.kt

@@ -5,27 +5,31 @@ import com.gh.common.simulator.NewSimulatorGameManager
 import com.gh.common.simulator.SimulatorGameManager
 import com.gh.gamecenter.feature.entity.GameEntity
 
-class UpdateNewSimulatorHandler: DownloadChainHandler() {
+class UpdateNewSimulatorHandler: ChainHandler() {
 
-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
         if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
             if (NewSimulatorGameManager.shouldShowUpdateNewSimulatorAlert(context)) {
-                NewSimulatorGameManager.showUpdateNewsSimulator(context, gameEntity) {
+                NewSimulatorGameManager.showUpdateNewsSimulator(context) {
                     if (hasNext()) {
-                        getNext()?.handleRequest(context, gameEntity, asVGame)
+                        getNext()?.handleRequest(context, gameEntity)
                     } else {
-                        processEndCallback?.invoke(asVGame, null)
+                        processEndCallback?.invoke(null)
                     }
                 }
-            } else {
+            }
+            else{
                 if (hasNext()) {
-                    getNext()?.handleRequest(context, gameEntity, asVGame)
+                    getNext()?.handleRequest(context, gameEntity)
                 }
             }
-        } else {
+        }
+        else{
             if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
+                getNext()?.handleRequest(context, gameEntity)
             }
         }
+
+
     }
 }

app/src/main/java/com/gh/common/chain/ValidateVSpaceHandler.kt

@@ -4,23 +4,15 @@ import android.content.Context
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.vspace.VHelper
 
-class ValidateVSpaceHandler : DownloadChainHandler() {
+class ValidateVSpaceHandler : ChainHandler() {
 
-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
-        val closure = {
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+        VHelper.validateVSpaceBeforeAction(context, gameEntity) {
             if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
+                getNext()?.handleRequest(context, gameEntity)
             } else {
-                processEndCallback?.invoke(asVGame, null)
+                processEndCallback?.invoke(null)
             }
         }
-
-        if (asVGame) {
-            VHelper.validateVSpaceBeforeAction(context, gameEntity) {
-                closure.invoke()
-            }
-        } else {
-            closure.invoke()
-        }
     }
 }

app/src/main/java/com/gh/common/chain/VersionNumberHandler.kt

@@ -3,59 +3,29 @@ package com.gh.common.chain
 import android.content.Context
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.DialogHelper
-import com.gh.gamecenter.common.utils.SensorsBridge
 import com.gh.gamecenter.common.utils.toResString
 import com.gh.gamecenter.feature.entity.GameEntity
 
-class VersionNumberHandler : DownloadChainHandler() {
+class VersionNumberHandler : ChainHandler() {
 
-    override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) {
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
         val confirmCallback = {
             if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity, asVGame)
+                getNext()?.handleRequest(context, gameEntity)
             } else {
-                processEndCallback?.invoke(asVGame, null)
+                processEndCallback?.invoke(null)
             }
         }
         if (!gameEntity.isShowVersionNumber()) {
             confirmCallback.invoke()
         } else {
-            SensorsBridge.trackGameDemoDialogShow(
-                gameId = gameEntity.id,
-                gameName = gameEntity.name ?: "",
-                gameType = gameEntity.categoryChinese
-            )
             DialogHelper.showGuideDialog(
                 context,
                 "温馨提示",
                 gameEntity.getVersionNumberString(),
                 "继续下载",
                 R.string.cancel.toResString(),
-                {
-                    confirmCallback.invoke()
-                    SensorsBridge.trackGameDemoDialogClick(
-                        buttonName = "继续下载",
-                        gameId = gameEntity.id,
-                        gameName = gameEntity.name ?: "",
-                        gameType = gameEntity.categoryChinese
-                    )
-                },
-                cancelClickCallback = {
-                    SensorsBridge.trackGameDemoDialogClick(
-                        buttonName = R.string.cancel.toResString(),
-                        gameId = gameEntity.id,
-                        gameName = gameEntity.name ?: "",
-                        gameType = gameEntity.categoryChinese
-                    )
-                },
-                touchOutsideCallback = {
-                    SensorsBridge.trackGameDemoDialogClick(
-                        buttonName = "关闭弹窗",
-                        gameId = gameEntity.id,
-                        gameName = gameEntity.name ?: "",
-                        gameType = gameEntity.categoryChinese
-                    )
-                },
+                { confirmCallback.invoke() },
                 extraConfig = DialogHelper.Config(titleIcon = R.drawable.ic_dialog_tips)
             )
         }

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

@@ -29,7 +29,6 @@ import com.gh.gamecenter.entity.VSetting;
 import com.gh.gamecenter.feature.entity.NewsEntity;
 import com.gh.gamecenter.feature.entity.SettingsEntity;
 import com.gh.gamecenter.feature.entity.SimulatorEntity;
-import com.gh.gamecenter.feature.utils.ContentBlockedHelper;
 import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.gh.vspace.VHelper;
 import com.halo.assistant.HaloApp;
@@ -460,12 +459,8 @@ public class Config {
                                 DarkModeUtils.INSTANCE.updateFollowSystemDarkModeToSp(true);
                                 DarkModeUtils.INSTANCE.initDarkMode();
                             }
+                            AdHelper.prefetchStartUpAd(mNewApiSettingsEntity);
                             SPUtils.setString(Constants.SP_NEW_API_SETTINGS, GsonUtils.toJson(data));
-
-                            // 刷新屏蔽字段
-                            if (mNewApiSettingsEntity.getGameShieldContents() != null) {
-                                ContentBlockedHelper.INSTANCE.init(mNewApiSettingsEntity.getGameShieldContents());
-                            }
                         }
                     });
         }

app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt

@@ -13,12 +13,12 @@ import android.widget.PopupWindow
 import androidx.core.content.ContextCompat
 import androidx.databinding.BindingAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.gh.gamecenter.R
 import com.gh.gamecenter.common.callback.OnViewClickListener
-import com.gh.gamecenter.common.databinding.LayoutPopupContainerBinding
 import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.toDrawable
 import com.gh.gamecenter.common.view.BugFixedPopupWindow
+import com.gh.gamecenter.R
+import com.gh.gamecenter.common.databinding.LayoutPopupContainerBinding
 import com.gh.gamecenter.databinding.KaifuAddItemBinding
 import com.gh.gamecenter.databinding.LayoutAddKaifuPopupBinding
 import com.gh.gamecenter.feature.entity.ServerCalendarEntity
@@ -120,13 +120,13 @@ object AddKaiFuBindingAdapter {
     @BindingAdapter("kaiFuTextColor", "kaiFuTextPosition")
     fun kaiFuTextColor(view: EditText, dataMark: Int, position: Int) {
         if (dataMark == 1 && view.id == R.id.kaifu_add_time || dataMark == 2 && view.id == R.id.kaifu_add_first_name || dataMark == 3 && view.id == R.id.kaifu_add_server_name || dataMark == 4) {
-            view.setTextColor(ContextCompat.getColor(view.context, R.color.secondary_red))
-            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.secondary_red))
+            view.setTextColor(ContextCompat.getColor(view.context, R.color.theme_red))
+            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.theme_red))
         } else if (position == 0) {
             view.setTextColor(ContextCompat.getColor(view.context, R.color.hint))
             view.setHintTextColor(ContextCompat.getColor(view.context, R.color.hint))
         } else {
-            view.setTextColor(ContextCompat.getColor(view.context, R.color.text_primary))
+            view.setTextColor(ContextCompat.getColor(view.context, R.color.text_title))
             view.setHintTextColor(ContextCompat.getColor(view.context, R.color.hint))
         }
     }

app/src/main/java/com/gh/common/databind/BindingAdapters.java

@@ -1,28 +1,33 @@
 package com.gh.common.databind;
 
-import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
+import android.graphics.Typeface;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.gh.common.chain.AutoSwitchAssistantInstallHandler;
 import com.gh.common.chain.BrowserInstallHandler;
 import com.gh.common.chain.CertificationHandler;
-import com.gh.common.chain.DownloadChainBuilder;
-import com.gh.common.chain.DownloadChainHandler;
+import com.gh.common.chain.ChainBuilder;
+import com.gh.common.chain.ChainHandler;
 import com.gh.common.chain.CheckDownloadHandler;
 import com.gh.common.chain.CheckStoragePermissionHandler;
 import com.gh.common.chain.DownloadDialogHelperHandler;
 import com.gh.common.chain.GamePermissionHandler;
-import com.gh.common.chain.LandPageAddressHandler;
 import com.gh.common.chain.OverseaDownloadHandler;
 import com.gh.common.chain.PackageCheckHandler;
 import com.gh.common.chain.UnsupportedFeatureHandler;
@@ -40,26 +45,33 @@ import com.gh.common.util.DialogUtils;
 import com.gh.common.util.GameUtils;
 import com.gh.common.util.GameViewUtils;
 import com.gh.common.util.LogUtils;
+import com.gh.common.util.NewsUtils;
 import com.gh.common.util.PackageInstaller;
 import com.gh.common.util.PackageLauncher;
 import com.gh.common.util.PackageUtils;
 import com.gh.common.util.ReservationHelper;
 import com.gh.download.DownloadManager;
 import com.gh.download.dialog.DownloadDialog;
-import com.gh.download.server.BrowserInstallHelper;
 import com.gh.gamecenter.DownloadManagerActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.WebActivity;
+import com.gh.gamecenter.common.baselist.LoadStatus;
+import com.gh.gamecenter.common.callback.OnViewClickListener;
 import com.gh.gamecenter.common.entity.LinkEntity;
+import com.gh.gamecenter.common.eventbus.EBReuse;
 import com.gh.gamecenter.common.utils.DarkModeUtils;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
-import com.gh.gamecenter.common.utils.NewFlatLogUtils;
-import com.gh.gamecenter.common.utils.SensorsBridge;
+import com.gh.gamecenter.common.utils.ImageUtils;
+import com.gh.gamecenter.common.view.DrawableView;
+import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.core.utils.MtaHelper;
-import com.gh.gamecenter.core.utils.ToastUtils;
+import com.gh.gamecenter.core.utils.NumberUtils;
+import com.gh.gamecenter.databinding.KaifuDetailItemRowBinding;
 import com.gh.gamecenter.feature.entity.ApkEntity;
+import com.gh.gamecenter.feature.entity.CommunityVideoEntity;
 import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.feature.entity.PluginLocation;
+import com.gh.gamecenter.feature.entity.ServerCalendarEntity;
 import com.gh.gamecenter.feature.entity.TagStyleEntity;
 import com.gh.gamecenter.feature.entity.TestEntity;
 import com.gh.gamecenter.feature.exposure.ExposureEvent;
@@ -68,11 +80,14 @@ import com.gh.gamecenter.feature.view.DownloadButton;
 import com.gh.gamecenter.feature.view.GameIconView;
 import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment;
 import com.gh.gamecenter.manager.PackagesManager;
+import com.gh.vspace.VDownloadManagerActivity;
 import com.gh.vspace.VHelper;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.FileUtils;
 import com.lightgame.utils.Utils;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -80,8 +95,134 @@ import java.util.List;
 /**
  * Created by khy on 12/02/18.
  */
+
 public class BindingAdapters {
 
+    public static void loadIcon(SimpleDraweeView view, String imageUrl) {
+        ImageUtils.displayIcon(view, imageUrl);
+    }
+
+    public static void loadImage(SimpleDraweeView view, String imageUrl) {
+        ImageUtils.display(view, imageUrl);
+    }
+
+    public static void setTextSize(TextView view, int number) {
+        view.setTextSize(number);
+    }
+
+    public static void setTypeface(TextView view, String type) {
+        if (type == null) return;
+
+        switch (type) {
+            case "bold":
+                view.setTypeface(null, Typeface.BOLD);
+                break;
+            case "italic":
+                view.setTypeface(null, Typeface.ITALIC);
+                break;
+            case "bold_italic":
+                view.setTypeface(null, Typeface.BOLD_ITALIC);
+                break;
+            default:
+                view.setTypeface(null, Typeface.NORMAL);
+                break;
+        }
+    }
+
+    public static void addDetailKaiFuView(LinearLayout view, List<ServerCalendarEntity> list
+            , OnViewClickListener listener, Boolean isReadyPatch) {
+        if (list == null) return;
+        view.removeAllViews();
+        for (int i = 0; i < list.size() + 1; i++) { // 1 is Title
+            View inflate = LayoutInflater.from(view.getContext()).inflate(R.layout.kaifu_detail_item_row, null);
+            KaifuDetailItemRowBinding binding = KaifuDetailItemRowBinding.bind(inflate);
+            binding.getRoot().setBackgroundColor(isReadyPatch != null && isReadyPatch ? ExtensionsKt.toColor(R.color.theme) : ExtensionsKt.toColor(R.color.white));
+            binding.getRoot().setPadding(DisplayUtils.dip2px(1), DisplayUtils.dip2px(1), DisplayUtils.dip2px(1), i == list.size() ? DisplayUtils.dip2px(1) : 0);
+            ServerCalendarEntity serverEntity = list.get(i - 1);
+            binding.timeTv.setText(i == 0 ? "时间" : serverEntity.getFormatTime("HH:mm"));
+            binding.remarkTv.setText(i == 0 ? "备注" : serverEntity.getRemark());
+            binding.nameTv.setText(i == 0 ? "名字" : (TextUtils.isEmpty(serverEntity.getNote()) ? "-" : serverEntity.getNote()));
+            if (i != 0) {
+                binding.getRoot().setOnClickListener(v -> {
+                    listener.onClick(v, isReadyPatch != null && isReadyPatch ? serverEntity : null);
+                });
+
+                // 滑动冲突处理
+                binding.getRoot().setOnTouchListener((v, event) -> {
+                    if (list.size() > 5) {
+                        if (event.getAction() == MotionEvent.ACTION_DOWN) {
+                            EventBus.getDefault().post(new EBReuse("CalenderDown"));
+                        } else if (event.getAction() == MotionEvent.ACTION_UP || event.getAction() == MotionEvent.ACTION_CANCEL) {
+                            EventBus.getDefault().post(new EBReuse("CalenderCancel"));
+                        }
+                    }
+                    return false;
+                });
+            }
+            view.addView(inflate);
+        }
+    }
+
+    // 如果超过10000，则转换为1.0W
+    public static void transSimpleCount(TextView view, int count) {
+        view.setText(NumberUtils.transSimpleCount(count));
+    }
+
+    public static void textColorFromString(TextView tv, String hexString) {
+        if (TextUtils.isEmpty(hexString)) return;
+
+        try {
+            tv.setTextColor(Color.parseColor(hexString));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void showHide(View view, Boolean show) {
+        if (show != null && show) {
+            view.setVisibility(View.VISIBLE);
+        } else {
+            view.setVisibility(View.GONE);
+        }
+    }
+
+    public static void goneIf(View view, Boolean gone) {
+        if (gone != null && gone) {
+            view.setVisibility(View.GONE);
+        } else {
+            view.setVisibility(View.VISIBLE);
+        }
+    }
+
+    /**
+     * lazy 的 paddingTop
+     */
+    public static void lazyPaddingLeft(View view, int paddingLeftInDp) {
+        view.setPadding(DisplayUtils.dip2px(paddingLeftInDp), view.getPaddingTop(), view.getPaddingRight(), view.getPaddingBottom());
+    }
+
+    /**
+     * lazy 的 paddingTop
+     */
+    public static void lazyPaddingTop(View view, int paddingTopInDp) {
+        view.setPadding(view.getPaddingLeft(), DisplayUtils.dip2px(paddingTopInDp), view.getPaddingRight(), view.getPaddingBottom());
+    }
+
+    /**
+     * lazy 的 paddingBottom
+     */
+    public static void lazyPaddingBottom(View view, int paddingBottomInDp) {
+        view.setPadding(view.getPaddingLeft(), view.getPaddingTop(), view.getPaddingRight(), DisplayUtils.dip2px(paddingBottomInDp));
+    }
+
+    public static void visibleInvisible(View view, Boolean show) {
+        if (show != null && show) {
+            view.setVisibility(View.VISIBLE);
+        } else {
+            view.setVisibility(View.INVISIBLE);
+        }
+    }
+
     public static void setMessageUnread(TextView view, int unreadCount) {
         if (unreadCount < 100) {
             view.setText(String.valueOf(unreadCount));
@@ -90,12 +231,119 @@ public class BindingAdapters {
         }
     }
 
+    public static void setServerTypePadding(TextView view, String serverType) {
+        int paddRight = 0;
+        if (TextUtils.isEmpty(serverType)) {
+        } else {
+            if ("删档内测".equals(serverType) || "不删档内测".equals(serverType)) {
+                if ("删档内测".equals(serverType)) {
+                    paddRight = DisplayUtils.dip2px(view.getContext(), 50);
+                } else {
+                    paddRight = DisplayUtils.dip2px(view.getContext(), 60);
+                }
+            } else {
+                paddRight = DisplayUtils.dip2px(view.getContext(), 30);
+            }
+        }
+        view.setPadding(0, 0, paddRight, 0);
+    }
+
+    public static void setServerType(TextView view, String serverType) {
+        view.setText(serverType);
+        if ("删档内测".equals(serverType) || "不删档内测".equals(serverType)) {
+            view.setBackgroundResource(R.drawable.textview_server_tag);
+        } else {
+            view.setBackgroundResource(R.drawable.textview_orange_up);
+        }
+    }
+
     public static void setGame(View view, GameEntity gameEntity) {
         if (gameEntity != null && view instanceof GameIconView) {
             ((GameIconView) view).displayGameIcon(gameEntity);
         }
     }
 
+    public static void setGameIcon(View view, GameEntity gameEntity) {
+        if (gameEntity != null && view instanceof GameIconView) {
+            ((GameIconView) view).displayGameIcon(gameEntity.getIcon(), gameEntity.getIconSubscript(), gameEntity.getIconFloat());
+        }
+    }
+
+    public static void setArticleType(TextView view, String articleType) {
+        NewsUtils.setNewsType(view, articleType, 0, 0);
+    }
+
+    public static void setDetailDownloadText(TextView view, GameEntity gameEntity) {
+        if (gameEntity == null || gameEntity.getApk().isEmpty()) {
+            view.setBackgroundResource(R.drawable.game_item_btn_pause_style);
+            view.setTextColor(0xFF999999);
+            view.setClickable(false);
+        }
+    }
+
+//    public static void setLiBaoBtn(TextView view, String status) {
+//        if (TextUtils.isEmpty(status)) return;
+//        switch (status) {
+//            case "coming":
+//                view.setText(R.string.libao_coming);
+//                view.setBackgroundResource(R.drawable.textview_blue_style);
+//                break;
+//            case "ling":
+//                view.setText(R.string.libao_ling);
+//                view.setBackgroundResource(R.drawable.textview_green_style);
+//                break;
+//            case "tao":
+//                view.setText(R.string.libao_tao);
+//                view.setBackgroundResource(R.drawable.textview_orange_style);
+//                break;
+//            case "used_up":
+//                view.setText(R.string.libao_used_up);
+//                view.setBackgroundResource(R.drawable.textview_cancel_up);
+//                break;
+//            case "finish":
+//                view.setText(R.string.libao_finish);
+//                view.setBackgroundResource(R.drawable.textview_cancel_up);
+//                break;
+//            case "linged":
+//                view.setText(R.string.libao_linged);
+//                view.setBackgroundResource(R.drawable.libao_linged_style);
+//                view.setTextColor(ContextCompat.getColorStateList(view.getContext(), R.color.libao_linged_selector));
+//                break;
+//            case "taoed":
+//                view.setText(R.string.libao_taoed);
+//                view.setBackgroundResource(R.drawable.libao_taoed_style);
+//                view.setTextColor(ContextCompat.getColorStateList(view.getContext(), R.color.libao_taoed_selector));
+//                break;
+//            case "copy":
+//                view.setText(R.string.libao_copy);
+//                view.setBackgroundResource(R.drawable.textview_blue_style);
+//                break;
+//            case "repeatLing":
+//                view.setText(R.string.libao_repeat_ling);
+//                view.setBackgroundResource(R.drawable.textview_cancel_up);
+//                break;
+//            case "repeatLinged":
+//                view.setText(R.string.libao_repeat_ling);
+//                view.setBackgroundResource(R.drawable.textview_green_style);
+//                break;
+//            case "repeatTao":
+//                view.setText(R.string.libao_repeat_tao);
+//                view.setBackgroundResource(R.drawable.textview_cancel_up);
+//                break;
+//            case "repeatTaoed":
+//                view.setText(R.string.libao_repeat_tao);
+//                view.setBackgroundResource(R.drawable.textview_orange_style);
+//                break;
+//            case "unshelve":
+//                view.setBackgroundResource(R.drawable.textview_cancel_style);
+//                view.setText(R.string.libao_unshelve);
+//                break;
+//            default:
+//                view.setBackgroundResource(R.drawable.textview_cancel_style);
+//                view.setText("异常");
+//        }
+//    }
+
     // 大图下的进度条
     public static void setDownloadButton(DownloadButton progressBar,
                                          GameEntity gameEntity,
@@ -123,9 +371,13 @@ public class BindingAdapters {
             switch (progressBar.getButtonStyle()) {
                 case DOWNLOADING_PLUGIN:
                 case DOWNLOADING_NORMAL:
-                    Intent intent = DownloadManagerActivity.getDownloadMangerIntent(v.getContext(),
-                            gameEntity.getApk().get(0).getUrl(), entrance);
-                    v.getContext().startActivity(intent);
+                    if (gameEntity.isVGame()) {
+                        v.getContext().startActivity(VDownloadManagerActivity.getIntent(v.getContext(), true));
+                    } else {
+                        Intent intent = DownloadManagerActivity.getDownloadMangerIntent(v.getContext(),
+                                gameEntity.getApk().get(0).getUrl(), entrance);
+                        v.getContext().startActivity(intent);
+                    }
                     break;
                 case NONE:
                     Utils.toast(v.getContext(), "该游戏已关闭下载");
@@ -143,12 +395,12 @@ public class BindingAdapters {
                                 boolean isInstalled = PackageUtils.isInstalledFromAllPackage(v.getContext(), gameEntity.getSimulator().getApk().getPackageName());
                                 if (downloadEntity != null && SimulatorGameManager.isSimulatorGame(gameEntity) && !isInstalled) {
                                     SimulatorDownloadManager.getInstance().showDownloadDialog(v.getContext(), gameEntity.getSimulator(),
-                                            SimulatorDownloadManager.SimulatorLocation.LAUNCH, gameEntity.getId(), gameEntity.getName(), gameEntity.getCategoryChinese(), null);
+                                            SimulatorDownloadManager.SimulatorLocation.LAUNCH, gameEntity.getId(), gameEntity.getName(), null);
                                     return;
                                 }
                             }
 
-                            DownloadChainBuilder builder = new DownloadChainBuilder();
+                            ChainBuilder builder = new ChainBuilder();
                             builder.addHandler(new UnsupportedFeatureHandler());
                             builder.addHandler(new GamePermissionHandler());
                             builder.addHandler(new CheckStoragePermissionHandler());
@@ -158,37 +410,25 @@ public class BindingAdapters {
                             builder.addHandler(new DownloadDialogHelperHandler());
                             builder.addHandler(new CertificationHandler());
                             builder.addHandler(new VersionNumberHandler());
-                            builder.addHandler(new LandPageAddressHandler());
                             builder.addHandler(new OverseaDownloadHandler());
                             builder.addHandler(new CheckDownloadHandler());
 
-                            builder.setProcessEndCallback((asVGame, isSubscribe) -> {
-                                download(v.getContext(),
-                                        progressBar,
-                                        gameEntity,
-                                        traceEvent,
-                                        asVGame,
-                                        (boolean) isSubscribe,
-                                        entrance,
-                                        location);
+                            builder.setProcessEndCallback(o -> {
+                                download(progressBar, gameEntity, traceEvent, (boolean) o, entrance, location);
                                 return null;
                             });
-                            final DownloadChainHandler chainHandler = builder.buildHandlerChain();
+                            final ChainHandler chainHandler = builder.buildHandlerChain();
                             if (chainHandler != null) {
-                                chainHandler.handleRequest(
-                                        v.getContext(),
-                                        gameEntity,
-                                        GameUtils.shouldPerformAsVGame(gameEntity)
-                                );
+                                chainHandler.handleRequest(v.getContext(), gameEntity);
                             }
                         } else {
-                            DownloadChainBuilder builder = new DownloadChainBuilder();
+                            ChainBuilder builder = new ChainBuilder();
                             builder.addHandler(new UnsupportedFeatureHandler());
                             builder.addHandler(new GamePermissionHandler());
                             builder.addHandler(new CertificationHandler());
                             builder.addHandler(new VersionNumberHandler());
 
-                            builder.setProcessEndCallback((asVGame, isSubscribe) -> {
+                            builder.setProcessEndCallback(o -> {
                                 DownloadDialog.showDownloadDialog(
                                         v.getContext(),
                                         gameEntity,
@@ -197,13 +437,9 @@ public class BindingAdapters {
                                         location + ":" + gameEntity.getName());
                                 return null;
                             });
-                            final DownloadChainHandler chainHandler = builder.buildHandlerChain();
+                            final ChainHandler chainHandler = builder.buildHandlerChain();
                             if (chainHandler != null) {
-                                chainHandler.handleRequest(
-                                        v.getContext(),
-                                        gameEntity,
-                                        GameUtils.shouldPerformAsVGame(gameEntity)
-                                );
+                                chainHandler.handleRequest(v.getContext(), gameEntity);
                             }
                         }
                     }
@@ -216,14 +452,7 @@ public class BindingAdapters {
                             if (downloadEntity != null) {
                                 File file = new File(downloadEntity.getPath());
                                 if (!file.exists()) {
-                                    download(v.getContext(),
-                                            progressBar,
-                                            gameEntity,
-                                            traceEvent,
-                                            false,
-                                            false,
-                                            entrance,
-                                            location);
+                                    download(progressBar, gameEntity, traceEvent, false, entrance, location);
                                     return;
                                 }
 
@@ -232,7 +461,12 @@ public class BindingAdapters {
                             return;
                         }
 
-                        PackageLauncher.launch(v.getContext(), gameEntity, null);
+                        if (gameEntity.isVGame()) {
+                            VHelper.installOrLaunch((AppCompatActivity) v.getContext(), gameEntity, null);
+                            return;
+                        }
+
+                        PackageLauncher.launchApp(v.getContext(), gameEntity, gameEntity.getApk().get(0).getPackageName());
                     } else {
                         DownloadDialog.showDownloadDialog(
                                 v.getContext(),
@@ -245,27 +479,15 @@ public class BindingAdapters {
                 case INSTALL_PLUGIN:
                 case INSTALL_NORMAL:
                     if (gameEntity.getApk().size() == 1) {
-
-                        NewFlatLogUtils.INSTANCE.logGameInstall(
-                                gameEntity.getId(),
-                                gameEntity.getName() != null ? gameEntity.getName() : "",
-                                "主动安装"
-                        );
-
-                        SensorsBridge.trackInstallGameClick(
-                                gameEntity.getId(),
-                                gameEntity.getName() != null ? gameEntity.getName() : "",
-                                "主动安装"
-                        );
-
                         DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity);
 
+                        if (gameEntity.isVGame()) {
+                            VHelper.installOrLaunch(v.getContext(), gameEntity, null);
+                            return;
+                        }
+
                         if (downloadEntity != null) {
-                            if (ExtensionsKt.isLocalDownloadInDualDownloadMode(downloadEntity)) {
-                                PackageInstaller.install(v.getContext(), downloadEntity);
-                            } else {
-                                VHelper.installOrLaunch(v.getContext(), gameEntity, null);
-                            }
+                            PackageInstaller.install(v.getContext(), downloadEntity);
                         }
                     }
                     break;
@@ -351,7 +573,7 @@ public class BindingAdapters {
             }
 
         } else {
-            String status = GameUtils.getDownloadBtnText(progressBar.getContext(), gameEntity, true, false, PluginLocation.only_game);
+            String status = GameUtils.getDownloadBtnText(progressBar.getContext(), gameEntity, PluginLocation.only_game);
             switch (status) {
                 case "插件化":
                     progressBar.setButtonStyle(DownloadButton.ButtonStyle.PLUGIN);
@@ -423,6 +645,24 @@ public class BindingAdapters {
         }
     }
 
+    /*private static void download(DownloadProgressBar progressBar, GameEntity gameEntity, ExposureEvent traceEvent, @Nullable String entrance, @Nullable String location, View v) {
+        if (gameEntity.getApk().size() == 1) {
+            ApkEntity apk = gameEntity.getApk().get(0);
+            DownloadDialogHelper.findAvailableDialogAndShow(
+                    v.getContext(),
+                    gameEntity,
+                    apk,
+                    () -> {
+                        DialogUtils.checkDownload(v.getContext(), apk.getSize(),
+                                isSubscribe -> download(progressBar, gameEntity, traceEvent, isSubscribe, entrance, location));
+                    });
+        } else {
+            DownloadDialog.getInstance(v.getContext()).showPopupWindow(v, gameEntity,
+                    entrance, location + gameEntity.getName(), traceEvent);
+        }
+    }*/
+
+
     private static void updateReservation(DownloadButton progressBar, GameEntity gameEntity) {
         // 显示预约
         if (gameEntity.isReservable()) {
@@ -438,39 +678,45 @@ public class BindingAdapters {
 
 
     // 开始下载
-    private static void download(Context context,
-                                 DownloadButton progressBar,
+    private static void download(DownloadButton progressBar,
                                  GameEntity gameEntity,
                                  ExposureEvent traceEvent,
-                                 boolean asVGame,
                                  boolean isSubscribe,
                                  String entrance,
                                  String location) {
-        if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
-            ToastUtils.toast(context.getString(R.string.unsupported_browser_install_hint));
+        String str = progressBar.getText().toString();
+        String method;
+        if (str.contains("更新")) {
+            method = "更新";
+        } else if (str.contains("插件化")) {
+            method = "插件化";
+        } else {
+            method = progressBar.getContext().getString(R.string.download);
         }
-        String buttonText = progressBar.getText();
         ApkEntity apkEntity = gameEntity.getApk().get(0);
         String msg = FileUtils.isCanDownload(progressBar.getContext(), apkEntity.getSize());
         if (TextUtils.isEmpty(msg)) {
             DownloadManager.createDownload(progressBar.getContext(),
                     apkEntity,
                     gameEntity,
-                    asVGame,
-                    gameEntity.isDualBtnModeEnabled(),
+                    method,
                     entrance,
                     location + gameEntity.getName(),
                     isSubscribe,
                     traceEvent);
 
             progressBar.setProgress(0);
-            progressBar.setButtonStyle(buttonText.contains("插件化") ?
+            progressBar.setButtonStyle("插件化".equals(method) ?
                     DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN : DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
         } else {
             Utils.toast(progressBar.getContext(), msg);
         }
     }
 
+    public static void setGameLabelList(LinearLayout layout, List<TagStyleEntity> tagStyle) {
+        GameViewUtils.setLabelList(layout.getContext(), layout, tagStyle);
+    }
+
     // 包含测试开服标签
     public static void setGameTags(LinearLayout layout, GameEntity gameEntity) {
         try {
@@ -540,6 +786,12 @@ public class BindingAdapters {
         }
     }
 
+    public static void isRefreshing(SwipeRefreshLayout layout, LoadStatus status) {
+        if (status != LoadStatus.INIT_LOADING && status != LoadStatus.LIST_LOADING) {
+            layout.setRefreshing(false);
+        }
+    }
+
     public static void setGameName(TextView view, GameEntity game, boolean isShowPlatform, @Nullable Boolean isShowSuffix) {
         if (isShowSuffix == null) isShowSuffix = true; // 默认显示
         String gameName;
@@ -561,6 +813,30 @@ public class BindingAdapters {
 
     }
 
+    public static void setCommunityImage(SimpleDraweeView imageView, List<String> images, List<CommunityVideoEntity> videos) {
+        if (videos.size() > 0) {
+            CommunityVideoEntity videoEntity = videos.get(0);
+            ImageUtils.display(imageView, videoEntity.getPoster());
+            imageView.setVisibility(View.VISIBLE);
+        } else if (images.size() > 0) {
+            imageView.setVisibility(View.VISIBLE);
+            ImageUtils.display(imageView, images.get(0));
+        } else {
+            imageView.setVisibility(View.GONE);
+        }
+    }
+
+    public static void setCommunityVideoDuration(TextView mVideoDuration, List<CommunityVideoEntity> videos) {
+        if (videos != null && videos.size() > 0) {
+            CommunityVideoEntity videoEntity = videos.get(0);
+            mVideoDuration.setBackground(DrawableView.getOvalDrawable(R.color.black_alpha_50, 999F));
+            mVideoDuration.setText(videoEntity.getDuration());
+            mVideoDuration.setVisibility(View.VISIBLE);
+        } else {
+            mVideoDuration.setVisibility(View.GONE);
+        }
+    }
+
     public static void setGameTags(TextView view, List<TagStyleEntity> tags, int maxTags) {
         if (tags == null) {
             view.setText("");
@@ -588,4 +864,16 @@ public class BindingAdapters {
         }
         view.setText(span);
     }
+
+    public static void setVideoData(TextView view, int count) {
+        if (count > 0) {
+            ExtensionsKt.setDrawableStart(view, ContextCompat.getDrawable(view.getContext(), R.drawable.ic_video_data_up), null, null);
+            view.setTextColor(ContextCompat.getColor(view.getContext(), R.color.text_EA3333));
+            view.setText(count + "");
+        } else {
+            ExtensionsKt.removeDrawable(view);
+            view.setTextColor(ContextCompat.getColor(view.getContext(), R.color.text_subtitleDesc));
+            view.setText("-");
+        }
+    }
 }

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

@@ -49,7 +49,7 @@ class ApplyModeratorDialogFragment : BaseDialogFragment() {
                 requireContext(),
                 startText.length,
                 startText.length + mGroupNumber.length,
-                R.color.text_theme,
+                R.color.theme_font,
                 true
             ) {
                 DirectUtils.directToQqGroup(

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

@@ -60,7 +60,7 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {
                         if (index == notEmptySite.size - 1) bottomMargin = 8F.dip2px()
                     }
                     siteTv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14F)
-                    siteTv.setTextColor(R.color.text_theme.toColor(requireContext()))
+                    siteTv.setTextColor(R.color.theme_font.toColor(requireContext()))
                     siteTv.text = site.text
                     siteTv.paintFlags = siteTv.paintFlags or Paint.UNDERLINE_TEXT_FLAG
                     siteTv.setOnClickListener {

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

@@ -1,7 +1,6 @@
 package com.gh.common.dialog
 
 import android.app.Activity.RESULT_OK
-import android.content.DialogInterface
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
@@ -19,10 +18,13 @@ import com.gh.common.xapk.XapkInstaller
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
 import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.common.utils.PermissionHelper
 import com.gh.gamecenter.common.utils.PermissionHelper.INSTALL_PERMISSION_CODE
+import com.gh.gamecenter.common.utils.getExtension
+import com.gh.gamecenter.common.utils.goneIf
 import com.gh.gamecenter.core.utils.SPUtils
 import com.lightgame.download.DownloadEntity
+import com.lightgame.utils.Utils
 import kotlin.random.Random
 
 class InstallPermissionDialogFragment : BaseDialogFragment() {
@@ -32,11 +34,8 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
     var url: String = ""
     var gameId: String = ""
     var gameName: String = ""
-    var gameType: String = ""
     var mCallBack: ((isFromPermissionGrantedCallback: Boolean) -> Unit)? = null
 
-    private var dismissByTouchInside = false
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         mView = inflater.inflate(R.layout.dialog_install_permission, null, false)
         return mView
@@ -56,12 +55,6 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
 
         if (isXapk) NewFlatLogUtils.logXApkInstallPermissionDialogShowed(gameId, gameName)
 
-        SensorsBridge.trackInstallPermissionDialogShow(
-            gameId = gameId,
-            gameName = gameName,
-            gameType = gameType
-        )
-
         val randomNumber = if (isXapk) 1 else Random.nextInt(2)
         closeTv.goneIf(randomNumber == 0)
         closeIv.goneIf(randomNumber != 0)
@@ -71,38 +64,18 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
         }
 
         closeTv.setOnClickListener {
-            dismissByTouchInside = true
             if (isXapk) {
                 NewFlatLogUtils.logXApkInstallPermissionDialogClick("尝试解压", false, gameId, gameName)
                 mCallBack?.invoke(false)
             }
-            SensorsBridge.trackInstallPermissionDialogClick(
-                buttonName = "尝试解压",
-                gameId = gameId,
-                gameName = gameName,
-                gameType = gameType
-            )
             dismiss()
         }
         closeIv.setOnClickListener {
-            dismissByTouchInside = true
             if (isXapk) NewFlatLogUtils.logXApkInstallPermissionDialogClick("关闭", false, gameId, gameName)
-            SensorsBridge.trackInstallPermissionDialogClick(
-                buttonName = "关闭",
-                gameId = gameId,
-                gameName = gameName,
-                gameType = gameType
-            )
             dismiss()
         }
         activateTv.setOnClickListener {
             NewFlatLogUtils.logXApkInstallPermissionDialogClick("立即开启", false, gameId, gameName)
-            SensorsBridge.trackInstallPermissionDialogClick(
-                buttonName = "立即开启",
-                gameId = gameId,
-                gameName = gameName,
-                gameType = gameType
-            )
             PermissionHelper.toInstallPermissionSetting(requireActivity())
             if (isXapk) {
                 SPUtils.setString(Constants.SP_XAPK_UNZIP_ACTIVITY, requireActivity().javaClass.name)
@@ -111,23 +84,9 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
         }
     }
 
-    override fun onDismiss(dialog: DialogInterface) {
-        if (!dismissByTouchInside) {
-            SensorsBridge.trackInstallPermissionDialogClick(
-                buttonName = "关闭弹窗",
-                gameId = gameId,
-                gameName = gameName,
-                gameType = gameType
-            )
-        }
-        super.onDismiss(dialog)
-    }
-
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (resultCode == RESULT_OK && requestCode == INSTALL_PERMISSION_CODE) {
-            dismissByTouchInside = true
-
             NewFlatLogUtils.logXApkInstallPermissionDialogClick("立即开启", true, gameId, gameName)
 
             if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
@@ -177,7 +136,6 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
                 installPermissionDialogFragment.url = downloadEntity.url
                 installPermissionDialogFragment.gameId = downloadEntity.gameId
                 installPermissionDialogFragment.gameName = downloadEntity.name
-                installPermissionDialogFragment.gameType = downloadEntity.categoryChinese
                 val transaction: FragmentTransaction = activity.supportFragmentManager.beginTransaction()
                 transaction.show(installPermissionDialogFragment)
                 transaction.commit()
@@ -188,7 +146,6 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
                     this.url = downloadEntity.url
                     this.gameId = downloadEntity.gameId
                     this.gameName = downloadEntity.name
-                    this.gameType = downloadEntity.categoryChinese
                 }
                 installPermissionDialogFragment.show(
                     activity.supportFragmentManager,

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

@@ -76,7 +76,7 @@ class NewPrivacyPolicyDialogFragment : BaseDialogFragment() {
             contentText.setSpan(object : ClickableSpan() {
                 override fun updateDrawState(ds: TextPaint) {
                     super.updateDrawState(ds)
-                    ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
+                    ds.color = ContextCompat.getColor(requireContext(), R.color.theme_font)
                     ds.isUnderlineText = false
                 }
 

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

@@ -2,7 +2,6 @@ package com.gh.common.dialog
 
 import android.animation.ValueAnimator
 import android.content.Context
-import android.content.DialogInterface
 import android.content.pm.PackageInfo
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -12,7 +11,6 @@ import android.view.animation.LinearInterpolator
 import android.widget.LinearLayout
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
-import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentTransaction
 import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -26,6 +24,7 @@ import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
 import com.gh.gamecenter.common.callback.ConfirmListener
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.entity.LinkEntity
+import com.gh.gamecenter.common.eventbus.EBPackage
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.view.CustomLinkMovementMethod
 import com.gh.gamecenter.core.utils.DisplayUtils
@@ -36,7 +35,6 @@ import com.gh.gamecenter.databinding.PackageCheckItemBinding
 import com.gh.gamecenter.feature.entity.DetectionObjectEntity
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.PackageDialogEntity
-import com.gh.gamecenter.eventbus.EBPackage
 import com.halo.assistant.HaloApp
 import com.lightgame.adapter.BaseRecyclerAdapter
 import com.lightgame.dialog.BaseDialogFragment
@@ -63,8 +61,6 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
     var gameEntity: GameEntity? = null
     var callBack: ConfirmListener? = null
 
-    private var mDismissByTouchInside = false
-
     private val dataWatcher = object : DataWatcher() {
         override fun onDataChanged(downloadEntity: DownloadEntity) {
             val packageName = downloadEntity.packageName
@@ -94,11 +90,6 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
         EventBus.getDefault().register(this)
         gameEntity?.let {
             LogUtils.uploadPackageCheck("pkg_check_pop_click", "出现弹窗", it, "", "", "", "")
-            SensorsBridge.trackPkgCheckDialogShow(
-                gameId = it.id,
-                gameName = it.name ?: "",
-                gameType = it.categoryChinese
-            )
         }
     }
 
@@ -125,7 +116,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                     requireContext(),
                     0,
                     (link.title ?: "").length,
-                    R.color.text_theme,
+                    R.color.theme_font,
                     true
                 ) {
                     LogUtils.uploadPackageCheck(
@@ -137,18 +128,6 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                         "",
                         ""
                     )
-                    SensorsBridge.trackPkgCheckDialogClick(
-                        buttonName = "点击链接",
-                        gameId = gameEntity?.id ?: "",
-                        gameName = gameEntity?.name ?: "",
-                        gameType = gameEntity?.categoryChinese ?: "",
-                        isNotPrompt = if (binding.noRemindAgainCb.isVisible) {
-                            binding.noRemindAgainCb.isChecked
-                        } else null,
-                        linkId = link.link ?: "",
-                        linkType = link.type ?: "",
-                        linkText = link.linkText ?: ""
-                    )
                     DirectUtils.directToLinkPage(requireContext(), link, "包名检测弹窗", "")
                 }.build()
                 spanBuilder.append(linkSpan)
@@ -197,7 +176,6 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
             }
             val isAllPackageInstalled = isAllPackageInstalled(mAllInstalledPackages, entity)
             if (isAllPackageInstalled) {
-                mDismissByTouchInside = true
                 callBack?.onConfirm()
                 dismissAllowingStateLoss()
             } else {
@@ -215,15 +193,6 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                         "",
                         ""
                     )
-                    SensorsBridge.trackPkgCheckDialogClick(
-                        buttonName = "点击前往下载",
-                        gameId = gameEntity?.id ?: "",
-                        gameName = gameEntity?.name ?: "",
-                        gameType = gameEntity?.categoryChinese ?: "",
-                        isNotPrompt = if (binding.noRemindAgainCb.isVisible) {
-                            binding.noRemindAgainCb.isChecked
-                        } else null
-                    )
                     DirectUtils.directToLinkPage(requireContext(), packageLink, "包名检测弹窗", "")
                 }
             }
@@ -237,19 +206,6 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                 saveRecord(entity)
                 LogUtils.uploadPackageCheck("pkg_check_pop_click", "不再提示", gameEntity, "", "", "", "")
             }
-
-            mDismissByTouchInside = true
-
-            SensorsBridge.trackPkgCheckDialogClick(
-                buttonName = binding.cancelTv.text.toString(),
-                gameId = gameEntity?.id ?: "",
-                gameName = gameEntity?.name ?: "",
-                gameType = gameEntity?.categoryChinese ?: "",
-                isNotPrompt = if (binding.noRemindAgainCb.isVisible) {
-                    binding.noRemindAgainCb.isChecked
-                } else null
-            )
-
             dismissAllowingStateLoss()
         }
     }
@@ -344,21 +300,6 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
         DownloadManager.getInstance().removeObserver(dataWatcher)
     }
 
-    override fun onDismiss(dialog: DialogInterface) {
-        if (!mDismissByTouchInside) {
-            SensorsBridge.trackPkgCheckDialogClick(
-                buttonName = "关闭弹窗",
-                gameId = gameEntity?.id ?: "",
-                gameName = gameEntity?.name ?: "",
-                gameType = gameEntity?.categoryChinese ?: "",
-                isNotPrompt = if (binding.noRemindAgainCb.isVisible) {
-                    binding.noRemindAgainCb.isChecked
-                } else null
-            )
-        }
-        super.onDismiss(dialog)
-    }
-
     //安装、卸载事件
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onEventMainThread(busFour: EBPackage) {
@@ -391,10 +332,10 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                     val isAllInstalled = checkDetectionsInstalled(mAllInstalledPackages, entity.packages)
                     if (isAllInstalled) {
                         holder.binding.statusTv.text = "已安装"
-                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme))
+                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font))
                     } else {
                         holder.binding.statusTv.text = "未安装"
-                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.secondary_red))
+                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.theme_red))
                     }
                     holder.binding.statusTv.visibility = View.VISIBLE
                 } else {

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

@@ -59,7 +59,7 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
         skipText.setSpan(object : ClickableSpan() {
             override fun updateDrawState(ds: TextPaint) {
                 super.updateDrawState(ds)
-                ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
+                ds.color = ContextCompat.getColor(requireContext(), R.color.theme_font)
                 ds.isUnderlineText = false
             }
 
@@ -101,7 +101,7 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
         skipText.setSpan(object : ClickableSpan() {
             override fun updateDrawState(ds: TextPaint) {
                 super.updateDrawState(ds)
-                ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
+                ds.color = ContextCompat.getColor(requireContext(), R.color.theme_font)
                 ds.isUnderlineText = false
             }
 
@@ -115,7 +115,7 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
         skipText.setSpan(object : ClickableSpan() {
             override fun updateDrawState(ds: TextPaint) {
                 super.updateDrawState(ds)
-                ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
+                ds.color = ContextCompat.getColor(requireContext(), R.color.theme_font)
                 ds.isUnderlineText = false
             }
 

app/src/main/java/com/gh/common/exposure/ExposureManager.kt

@@ -47,7 +47,7 @@ object ExposureManager {
     fun log(eventList: List<ExposureEvent>) {
         AppExecutor.logExecutor.execute {
             for (event in eventList) {
-                if (event != null && !exposureCache.contains(event.id)) {
+                if (!exposureCache.contains(event.id)) {
                     exposureSet.add(event)
                     exposureCache.add(event.id)
                 } else {

app/src/main/java/com/gh/common/exposure/ExposureUtils.kt

@@ -62,17 +62,17 @@ object ExposureUtils {
         host: String? = "unknown",
         path: String? = "unknown",
         downloadType: DownloadType
-    ): ExposureEvent? {
+    ) {
         val gameEntity = entity.copy()
         gameEntity.platform = platform
         gameEntity.downloadCompleteType = downloadType.toString()
         val traceEvent = trace?.toObject<ExposureEvent>()
 
-        if (TextUtils.isEmpty(entity.id)) return null
+        if (TextUtils.isEmpty(entity.id)) return
 
         // 避免生成 trace 相同的下载完成事件，根据日志看下载完成的同一秒有可能生成两条
         if (mDownloadCompleteTraceEventIdSet.contains(traceEvent?.id)) {
-            return null
+            return
         }
 
         traceEvent?.payload?.gameId?.let { mDownloadCompleteTraceEventIdSet.add(it) }
@@ -91,14 +91,12 @@ object ExposureUtils {
 
         ExposureManager.log(exposureEvent)
         ExposureManager.commitSavedExposureEvents(forcedUpload = true)
-
-        return exposureEvent
     }
 
     @JvmStatic
-    fun getDownloadType(apkEntity: ApkEntity, gameId: String, asVGame: Boolean): DownloadType {
+    fun getDownloadType(apkEntity: ApkEntity, gameId: String, isVGame: Boolean): DownloadType {
         return when {
-            asVGame -> getVGameDownloadType(apkEntity, gameId)
+            isVGame -> getVGameDownloadType(apkEntity, gameId)
             PackageUtils.isInstalled(
                 HaloApp.getInstance().application,
                 apkEntity.packageName
@@ -109,7 +107,7 @@ object ExposureUtils {
 
     private fun getVGameDownloadType(apkEntity: ApkEntity, gameId: String): DownloadType {
         return when {
-            PackagesManager.isCanUpdate(gameId, apkEntity.packageName, asVGame = true) -> DownloadType.FUN_UPDATE
+            PackagesManager.isCanUpdate(gameId, apkEntity.packageName) -> DownloadType.FUN_UPDATE
             else -> DownloadType.FUN_DOWNLOAD
         }
     }

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

@@ -10,7 +10,6 @@ import com.gh.gamecenter.feature.entity.AnswerEntity
 import com.gh.gamecenter.feature.entity.ArticleEntity
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.NewsEntity
-import com.gh.gamecenter.feature.entity.User
 import com.gh.gamecenter.qa.entity.AnswerDetailEntity
 import com.gh.gamecenter.qa.entity.ArticleDetailEntity
 

app/src/main/java/com/gh/common/prioritychain/AccelerateNotificationHandler.kt

@@ -1,135 +0,0 @@
-package com.gh.common.prioritychain
-
-import android.app.Activity
-import android.view.Gravity
-import android.view.LayoutInflater
-import android.widget.FrameLayout
-import com.gh.common.util.NewFlatLogUtils
-import com.gh.gamecenter.GameDetailActivity
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.base.fragment.BaseFragment
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.view.BugFixedPopupWindow
-import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.databinding.PopupAccelerateNotificationBinding
-import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.fragment.MainWrapperViewModel
-
-class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priority) {
-
-    private var mActivity: Activity? = null
-    private var mBaseHandler: BaseFragment.BaseHandler? = null
-    private var mGameList: List<GameEntity>? = null
-    private var mViewModel: MainWrapperViewModel? = null
-
-    /**
-     * 提前预处理显示弹窗的内容
-     */
-    fun doPreProcess(
-        activity: Activity,
-        baseHandler: BaseFragment.BaseHandler,
-        gameEntityList: List<GameEntity>?,
-        viewModel: MainWrapperViewModel
-    ) {
-        mActivity = activity
-        mGameList = gameEntityList
-        mBaseHandler = baseHandler
-        mViewModel = viewModel
-
-        if (getStatus() == STATUS_PENDING) {
-            if (gameEntityList == null) {
-                processNext()
-            } else {
-                updateStatus(STATUS_VALID)
-                onProcess()
-            }
-        } else {
-            if (gameEntityList == null) {
-                updateStatus(STATUS_INVALID)
-            } else {
-                updateStatus(STATUS_VALID)
-            }
-        }
-    }
-
-    override fun onProcess() {
-        when (getStatus()) {
-            STATUS_VALID -> {
-                val accelerateSet =
-                    HashSet(SPUtils.getStringSet(Constants.SP_ACCELERATE_NOTIFICATION_POP_UP_SET))
-                if (!mGameList.isNullOrEmpty() && !accelerateSet.contains(mGameList!![0].messageId)) {
-                    showAccelerateNotificationPopupWindow(mActivity!!, mViewModel, mBaseHandler, mGameList!![0]) {
-                        processNext()
-                    }
-                    accelerateSet.add(mGameList!![0].messageId)
-                    SPUtils.setStringSet(Constants.SP_ACCELERATE_NOTIFICATION_POP_UP_SET, accelerateSet)
-                } else {
-                    processNext()
-                }
-            }
-
-            STATUS_INVALID -> {
-                processNext()
-            }
-        }
-    }
-
-    companion object {
-        fun showAccelerateNotificationPopupWindow(
-            activity: Activity,
-            viewModel: MainWrapperViewModel?,
-            baseHandler: BaseFragment.BaseHandler?,
-            gameEntity: GameEntity?,
-            dismissCallback: (() -> Unit)?
-        ) {
-            val binding: PopupAccelerateNotificationBinding =
-                PopupAccelerateNotificationBinding.inflate(LayoutInflater.from(activity))
-            if (gameEntity != null) {
-                binding.gameIconView.displayGameIcon(gameEntity)
-                binding.gameNameTv.text = gameEntity.name
-                binding.root.setOnClickListener {
-                    NewFlatLogUtils.logMessageInformClickPluginVersion(
-                        gameEntity.id,
-                        gameEntity.name!!
-                    )
-                    if (gameEntity.messageId.isNotEmpty()) {
-                        // 把对应系统消息设为已读
-                        viewModel?.postMessageRead(gameEntity.messageId)
-                    }
-                    GameDetailActivity.startGameDetailActivity(
-                        context = activity,
-                        gameId = gameEntity.id,
-                        entrance = "首页插件上架弹窗",
-                        defaultTab = -1,
-                        isSkipGameComment = false,
-                        scrollToLibao = false,
-                        openVideoStreaming = false,
-                        openPlatformWindow = true,
-                        traceEvent = null
-                    )
-                }
-            }
-            BugFixedPopupWindow(
-                binding.root,
-                FrameLayout.LayoutParams.MATCH_PARENT,
-                FrameLayout.LayoutParams.WRAP_CONTENT
-            ).apply {
-                isTouchable = true
-                isFocusable = true
-                isOutsideTouchable = true
-                animationStyle = R.style.popup_window_ease_in_and_out_anim_style
-                showAtLocation(
-                    activity.window.decorView,
-                    Gravity.TOP,
-                    0,
-                    DisplayUtils.getStatusBarHeight(activity.resources) + DisplayUtils.dip2px(42f)
-                )
-                setOnDismissListener {
-                    dismissCallback?.invoke()
-                }
-                baseHandler?.postDelayed({ dismiss() }, 5000)
-            }
-        }
-    }
-}

app/src/main/java/com/gh/common/prioritychain/FloatingWindowHandler.kt

@@ -1,87 +0,0 @@
-package com.gh.common.prioritychain
-
-import androidx.recyclerview.widget.RecyclerView
-import com.alibaba.android.arouter.launcher.ARouter
-import com.gh.gamecenter.common.base.fragment.BaseLazyFragment
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.core.provider.IFloatingWindowProvider
-import com.gh.gamecenter.feature.entity.WelcomeDialogEntity
-import com.gh.gamecenter.floatingwindow.FloatingWindowEntity
-import com.gh.gamecenter.fragment.WelcomeDialogFragment
-import com.lightgame.utils.Utils
-
-class FloatingWindowHandler(priority: Int) : PriorityChainHandler(priority) {
-
-    private var mFragment: BaseLazyFragment? = null
-    private var mRecyclerView: RecyclerView? = null
-    private var mWindowList: ArrayList<FloatingWindowEntity>? = null
-
-    fun setData(windowList: ArrayList<FloatingWindowEntity>?) {
-        mWindowList = windowList
-
-        if (mFragment != null) {
-            doPreProcess()
-        }
-    }
-
-    fun setView(
-        fragment: BaseLazyFragment,
-        recyclerView: RecyclerView
-    ) {
-        mFragment = fragment
-        mRecyclerView = recyclerView
-
-        if (mWindowList != null) {
-            doPreProcess()
-        }
-    }
-
-    private fun doPreProcess() {
-        Utils.log(TAG, "FloatingWindowHandler preProcess windowSize is -> ${mWindowList?.size}")
-
-        if (getStatus() == STATUS_PENDING) {
-            if (!mWindowList.isNullOrEmpty()) {
-                updateStatus(STATUS_VALID)
-                onProcess()
-            } else {
-                processNext()
-            }
-        } else {
-            if (!mWindowList.isNullOrEmpty()) {
-                updateStatus(STATUS_VALID)
-            } else {
-                updateStatus(STATUS_INVALID)
-            }
-        }
-    }
-
-    override fun onProcess() {
-        when (getStatus()) {
-            STATUS_VALID -> {
-                val floatingWindowProvider =
-                    ARouter.getInstance().build(RouteConsts.provider.floatingwindow)
-                        .navigation() as? IFloatingWindowProvider<WelcomeDialogEntity>
-
-                // 强校验所有条件均通过才能显示
-                if (floatingWindowProvider == null || mFragment == null || mFragment?.isAdded == false || mRecyclerView == null) {
-                    processNext()
-                    return
-                }
-
-                floatingWindowProvider.showFloatingWindowOnly(
-                    mFragment!!,
-                    mRecyclerView!!,
-                    mWindowList!!,
-                ) {
-                    val welcomeDialog = WelcomeDialogFragment.getInstance(it, true, mFragment)
-                    welcomeDialog.show(mFragment!!.childFragmentManager, "WelcomeDialog")
-                }
-            }
-
-            STATUS_INVALID -> {
-                processNext()
-            }
-        }
-    }
-
-}

app/src/main/java/com/gh/common/prioritychain/HomePushHandler.kt

@@ -1,45 +0,0 @@
-package com.gh.common.prioritychain
-
-import com.gh.gamecenter.fragment.HomeSearchToolWrapperFragment
-
-class HomePushHandler(priority: Int): PriorityChainHandler(priority) {
-
-    private var mHomeFragment: HomeSearchToolWrapperFragment? = null
-
-    /**
-     * 提前预处理显示弹窗的内容
-     */
-    fun doPreProcess(homeFragment: HomeSearchToolWrapperFragment?, shouldShow: Boolean) {
-        mHomeFragment = homeFragment
-
-        if (getStatus() == STATUS_PENDING) {
-            if (shouldShow && homeFragment != null) {
-                updateStatus(STATUS_VALID)
-                onProcess()
-            } else {
-                processNext()
-            }
-        } else {
-            if (shouldShow && homeFragment != null) {
-                updateStatus(STATUS_VALID)
-            } else {
-                updateStatus(STATUS_INVALID)
-            }
-        }
-    }
-
-    override fun onProcess() {
-        when (getStatus()) {
-            STATUS_VALID -> {
-                // 目前首页下拉二楼是首页最后一个弹窗类的东西，还没实现回调，如果有其它要在它后面弹出的，需要自行在它的实现结果后添加回调
-                mHomeFragment?.popUpHomePushIfNeeded {
-                    processNext()
-                }
-            }
-            STATUS_INVALID -> {
-                processNext()
-            }
-        }
-    }
-
-}

app/src/main/java/com/gh/common/prioritychain/NotificationPermissionDialogHandler.kt

@@ -1,20 +0,0 @@
-package com.gh.common.prioritychain
-
-import com.gh.gamecenter.common.entity.NotificationUgc
-import com.gh.gamecenter.common.utils.NotificationHelper
-import com.gh.gamecenter.login.user.UserManager
-
-class NotificationPermissionDialogHandler(priority: Int) : PriorityChainHandler(priority) {
-
-    override fun onProcess() {
-        // 仅登录后再启动光环时请求一次权限
-        if (UserManager.getInstance().isLoggedIn) {
-            NotificationHelper.showNotificationHintDialog(NotificationUgc.LOGIN) {
-                processNext()
-            }
-        } else {
-            processNext()
-        }
-    }
-
-}

app/src/main/java/com/gh/common/prioritychain/PriorityChain.kt

@@ -1,22 +0,0 @@
-package com.gh.common.prioritychain
-
-import java.util.*
-import java.util.concurrent.PriorityBlockingQueue
-
-class PriorityChain {
-
-    private val mHandlerQueue: Queue<PriorityChainHandler> = PriorityBlockingQueue()
-
-    fun addHandler(handler: PriorityChainHandler) {
-        mHandlerQueue.add(handler.also {
-            it.setPriorityChain(this)
-        })
-    }
-
-    fun start() {
-        mHandlerQueue.poll()?.process(mHandlerQueue)
-    }
-
-    fun isHandlerQueueEmpty() = mHandlerQueue.isEmpty()
-
-}

app/src/main/java/com/gh/common/prioritychain/PriorityChainHandler.kt

@@ -1,71 +0,0 @@
-package com.gh.common.prioritychain
-
-import com.lightgame.utils.Utils
-import java.util.*
-
-abstract class PriorityChainHandler(private val mPriority: Int) : Comparable<PriorityChainHandler> {
-
-    private var mStatus = STATUS_UNKNOWN
-    private var mQueue: Queue<PriorityChainHandler>? = null
-
-    private var mPriorityChain: PriorityChain? = null
-
-    /**
-     * 获取当前 handler 的状态
-     * - 等待结果返回 （STATUS_PENDING）
-     * - 无需执行 （STATUS_INVALID）
-     * - 可执行 （STATUS_VALID）
-     * - 未知 （STATUS_UNKNOWN）
-     */
-    fun getStatus(): Int = mStatus
-
-    fun updateStatus(status: Int) {
-        Utils.log(TAG, "${javaClass.simpleName} updateStatus $status")
-
-        mStatus = status
-    }
-
-    fun setPriorityChain(priorityChain: PriorityChain) {
-        mPriorityChain = priorityChain
-    }
-
-    fun process(queue: Queue<PriorityChainHandler>) {
-        Utils.log(TAG, "${javaClass.simpleName} process $mStatus")
-
-        mQueue = queue
-        // 若当前 handler 未经处理，将其状态改为 pending
-        if (mStatus == STATUS_UNKNOWN) {
-            updateStatus(STATUS_PENDING)
-        }
-
-        onProcess()
-    }
-
-    /**
-     * 执行相关功能的地方
-     */
-    abstract fun onProcess()
-
-    /**
-     * 分发给下一个 handler 处理
-     */
-    fun processNext() {
-        Utils.log(TAG, "${javaClass.simpleName} processNext $mStatus")
-
-        mQueue?.poll()?.process(mQueue!!)
-    }
-
-    override fun compareTo(other: PriorityChainHandler): Int {
-        return (mPriority - other.mPriority)
-    }
-
-    companion object {
-        internal const val STATUS_PENDING = 0
-        internal const val STATUS_INVALID = 1
-        internal const val STATUS_VALID = 2
-        internal const val STATUS_UNKNOWN = 3
-
-        const val TAG = "PriorityChainHandler"
-    }
-
-}

app/src/main/java/com/gh/common/prioritychain/PrivacyPolicyDialogHandler.kt

@@ -1,48 +0,0 @@
-package com.gh.common.prioritychain
-
-import androidx.fragment.app.FragmentActivity
-import com.gh.common.dialog.PrivacyPolicyDialogFragment
-import com.gh.gamecenter.entity.DialogEntity
-
-class PrivacyPolicyDialogHandler(priority: Int) : PriorityChainHandler(priority) {
-
-    private var mActivity: FragmentActivity? = null
-    private var mPrivacyPolicyEntity: DialogEntity.PrivacyPolicyEntity? = null
-
-    /**
-     * 提前预处理显示弹窗的内容
-     */
-    fun doPreProcess(fragmentActivity: FragmentActivity, privacyPolicyEntity: DialogEntity.PrivacyPolicyEntity?) {
-        mActivity = fragmentActivity
-        mPrivacyPolicyEntity = privacyPolicyEntity
-
-        if (getStatus() == STATUS_PENDING) {
-            if (privacyPolicyEntity == null) {
-                processNext()
-            } else {
-                updateStatus(STATUS_VALID)
-                onProcess()
-            }
-        } else {
-            if (privacyPolicyEntity == null) {
-                updateStatus(STATUS_INVALID)
-            } else {
-                updateStatus(STATUS_VALID)
-            }
-        }
-    }
-
-    override fun onProcess() {
-        when(getStatus()) {
-            STATUS_VALID -> {
-                PrivacyPolicyDialogFragment.show(mActivity!!, mPrivacyPolicyEntity) { _: Boolean? ->
-                    processNext()
-                }
-            }
-            STATUS_INVALID -> {
-                processNext()
-            }
-        }
-    }
-
-}

app/src/main/java/com/gh/common/prioritychain/ReserveDialogHandler.kt

@@ -1,53 +0,0 @@
-package com.gh.common.prioritychain
-
-import androidx.fragment.app.Fragment
-import com.gh.common.dialog.ReserveDialog
-import com.gh.gamecenter.common.entity.SimpleGameEntity
-import com.gh.gamecenter.message.MessageUnreadRepository
-
-class ReserveDialogHandler(priority: Int) : PriorityChainHandler(priority) {
-
-    private var mFragment: Fragment? = null
-    private var mReserveData: List<SimpleGameEntity>? = null
-
-    /**
-     * 提前预处理显示弹窗的内容
-     */
-    fun doPreProcess(fragment: Fragment, reserveData: List<SimpleGameEntity>?) {
-        mFragment = fragment
-        mReserveData = reserveData
-
-        if (getStatus() == STATUS_PENDING) {
-            if (reserveData.isNullOrEmpty()) {
-                processNext()
-            } else {
-                updateStatus(STATUS_VALID)
-                onProcess()
-            }
-        } else {
-            if (reserveData.isNullOrEmpty()) {
-                updateStatus(STATUS_INVALID)
-            } else {
-                updateStatus(STATUS_VALID)
-            }
-        }
-    }
-
-    override fun onProcess() {
-        when (getStatus()) {
-            STATUS_VALID -> {
-                val reserveDialog = ReserveDialog.getInstance(mReserveData!!)
-                reserveDialog.setOnDismissListener {
-                    MessageUnreadRepository.loadMessageUnreadData()
-                    processNext()
-                }
-                reserveDialog.show(mFragment!!.childFragmentManager, "reserveDialog")
-            }
-
-            STATUS_INVALID -> {
-                processNext()
-            }
-        }
-    }
-
-}

app/src/main/java/com/gh/common/prioritychain/UpdateDialogHandler.kt

@@ -1,17 +0,0 @@
-package com.gh.common.prioritychain
-
-import android.content.Context
-import com.gh.gamecenter.manager.UpdateManager
-
-class UpdateDialogHandler(context: Context, priority: Int) : PriorityChainHandler(priority) {
-
-    private val mUpdateManager = UpdateManager.getInstance(context)
-
-    override fun onProcess() {
-        mUpdateManager.checkUpdate(true, null)
-        mUpdateManager.setDismissCallback {
-            processNext()
-        }
-    }
-
-}

app/src/main/java/com/gh/common/prioritychain/WelcomeDialogHandler.kt

@@ -1,79 +0,0 @@
-package com.gh.common.prioritychain
-
-import android.graphics.Bitmap
-import androidx.fragment.app.Fragment
-import com.gh.gamecenter.common.callback.BiCallback
-import com.gh.gamecenter.common.utils.ImageUtils
-import com.gh.gamecenter.feature.entity.WelcomeDialogEntity
-import com.gh.gamecenter.fragment.MainWrapperViewModel
-import com.gh.gamecenter.fragment.WelcomeDialogFragment
-import com.halo.assistant.HaloApp
-
-class WelcomeDialogHandler(priority: Int): PriorityChainHandler(priority) {
-
-    private var mFragment: Fragment? = null
-    private var mWelcomeDialogEntity: WelcomeDialogEntity? = null
-
-    fun doPreProcess(fragment: Fragment, welcomeDialogEntity: WelcomeDialogEntity?) {
-        mFragment = fragment
-        mWelcomeDialogEntity = welcomeDialogEntity
-
-        val preLoadClosure = {
-            // 判断启动本次应用是否已经弹窗，不是的话弹启动弹窗
-            if (HaloApp.get(MainWrapperViewModel.SHOULD_SHOW_OPENING_DIALOG, false) == null) {
-                HaloApp.put(MainWrapperViewModel.SHOULD_SHOW_OPENING_DIALOG, false)
-                ImageUtils.getBitmap(mWelcomeDialogEntity!!.icon, object : BiCallback<Bitmap, Boolean> {
-                    override fun onFirst(first: Bitmap) {
-                        if (getStatus() == STATUS_PENDING) {
-                            updateStatus(STATUS_VALID)
-                            onProcess()
-                        } else {
-                            updateStatus(STATUS_VALID)
-                        }
-                    }
-
-                    override fun onSecond(second: Boolean) {
-                        processNext()
-                    }
-                })
-            } else {
-                processNext()
-            }
-        }
-
-        if (getStatus() == STATUS_PENDING) {
-            if (welcomeDialogEntity == null) {
-                processNext()
-            } else {
-                preLoadClosure.invoke()
-            }
-        } else {
-            if (welcomeDialogEntity == null) {
-                updateStatus(STATUS_INVALID)
-            } else {
-                preLoadClosure.invoke()
-            }
-        }
-    }
-
-    override fun onProcess() {
-        when (getStatus()) {
-            STATUS_VALID -> {
-                if (mFragment == null || !mFragment!!.isAdded) {
-                    updateStatus(STATUS_INVALID)
-                    processNext()
-                } else {
-                    val welcomeDialog = WelcomeDialogFragment.getInstance(mWelcomeDialogEntity)
-                    welcomeDialog.setOnDismissListener {
-                        processNext()
-                    }
-                    welcomeDialog.show(mFragment!!.childFragmentManager, "WelcomeDialog")
-                }
-            }
-            STATUS_INVALID -> {
-                processNext()
-            }
-        }
-    }
-
-}

app/src/main/java/com/gh/common/provider/AppDialogUtilsProviderImpl.kt

@@ -0,0 +1,22 @@
+package com.gh.common.provider
+
+import android.app.Dialog
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.DialogUtils
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IAppDialogUtilsProvider
+
+@Route(path = RouteConsts.provider.appDialogUtils, name = "DialogUtils暴露服务")
+class AppDialogUtilsProviderImpl : IAppDialogUtilsProvider {
+
+    override fun showWaitDialog(context: Context, string: String): Dialog {
+        return DialogUtils.showWaitDialog(context, string)
+    }
+
+
+
+    override fun init(context: Context?) {
+
+    }
+}

app/src/main/java/com/gh/common/provider/AppProviderImpl.kt

@@ -2,7 +2,6 @@ package com.gh.common.provider
 
 import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IAppProvider
@@ -19,10 +18,6 @@ class AppProviderImpl : IAppProvider {
         return HaloApp.getInstance().getString(R.string.app_name)
     }
 
-    override fun getAppVersion(): String {
-        return BuildConfig.VERSION_NAME
-    }
-
     override fun getGid(): String {
         return HaloApp.getInstance().gid ?: ""
     }
@@ -75,15 +70,7 @@ class AppProviderImpl : IAppProvider {
         return HaloApp.getInstance().flavorProvider
     }
 
-    override fun getFlavor(): String {
-        return BuildConfig.FLAVOR
-    }
-
     override fun getIsBrandNewInstall(): Boolean {
         return HaloApp.getInstance().isBrandNewInstall
     }
-
-    override fun setSkippingThirdParty(isSkippingThirdParty: Boolean) {
-        HaloApp.getInstance().isSkippingThirdParty = isSkippingThirdParty
-    }
 }

app/src/main/java/com/gh/common/provider/BindingAdaptersProviderImpl.kt

@@ -1,7 +1,6 @@
 package com.gh.common.provider
 
 import android.content.Context
-import android.view.View
 import android.widget.LinearLayout
 import android.widget.TextView
 import com.alibaba.android.arouter.facade.annotation.Route
@@ -25,14 +24,6 @@ class BindingAdaptersProviderImpl : IBindingAdaptersProvider {
         BindingAdapters.setGameTags(layout, gameEntity)
     }
 
-    override fun setMessageUnread(view: TextView, unreadCount: Int) {
-        BindingAdapters.setMessageUnread(view, unreadCount)
-    }
-
-    override fun setGame(view: View, gameEntity: GameEntity) {
-        BindingAdapters.setGame(view, gameEntity)
-    }
-
     override fun init(context: Context?) {
         // Do nothing
     }

app/src/main/java/com/gh/common/provider/BuildConfigImpl.kt

@@ -19,7 +19,6 @@ class BuildConfigImpl : IBuildConfigProvider {
     override fun getExposureVersion(): String = BuildConfig.EXPOSURE_VERSION
 
     override fun isDebug(): Boolean = BuildConfig.DEBUG
-    override fun isGATApp(): Boolean = BuildConfig.IS_GAT_APP
 
     override fun getApiHost(): String = BuildConfig.API_HOST
 
@@ -32,5 +31,4 @@ class BuildConfigImpl : IBuildConfigProvider {
     override fun getVApiHost(): String = BuildConfig.VAPI_HOST
 
     override fun getVDevApiHost(): String = BuildConfig.DEV_VAPI_HOST
-    override fun getLogProducerProject(): String = BuildConfig.LOG_HUB_PROJECT
 }

app/src/main/java/com/gh/common/provider/CommentDetailProviderImpl.kt

@@ -1,22 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import android.content.Intent
-import android.os.Parcelable
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.CommentDetailActivity
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.provider.ICommentDetailProvider
-import com.gh.gamecenter.feature.entity.MessageEntity
-
-@Route(path = RouteConsts.provider.commentDetail, name = "CommentDetailActivity暴露服务")
-class CommentDetailProviderImpl : ICommentDetailProvider {
-
-    override fun getIntent(context: Context, commentId: String?, message: Parcelable): Intent {
-        return CommentDetailActivity.getIntent(context, commentId, message as MessageEntity.Article)
-    }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}

app/src/main/java/com/gh/common/provider/CommentManagerProviderImpl.kt

@@ -1,18 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.core.provider.ICommentManagerProvider
-import com.gh.gamecenter.manager.CommentManager
-
-@Route(path = RouteConsts.provider.commentManager, name = "CommentManager暴露服务")
-class CommentManagerProviderImpl : ICommentManagerProvider {
-    override fun addUrl(ids: String) {
-        CommentManager.getInstance().addUrl(ids)
-    }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}

app/src/main/java/com/gh/common/provider/CommentUtilsProviderImpl.kt

@@ -1,23 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import android.widget.TextView
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.common.util.CommentUtils
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.provider.ICommentUtilsProvider
-
-@Route(path = RouteConsts.provider.commentUtils, name = "CommentUtils暴露服务")
-class CommentUtilsProviderImpl : ICommentUtilsProvider {
-    override fun setCommentTime(textView: TextView, time: Long) {
-        CommentUtils.setCommentTime(textView, time)
-    }
-
-    override fun getCommentTime(timestamp: Long): String {
-        return CommentUtils.getCommentTime(timestamp)
-    }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}

app/src/main/java/com/gh/common/provider/ConcernContentUtilsProviderImpl.kt

@@ -1,26 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import android.widget.LinearLayout
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.common.util.ConcernContentUtils
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.core.provider.IConcernContentUtilsProvider
-
-@Route(path = RouteConsts.provider.concernContentUtils, name = "ConcernContentUtils暴露服务")
-class ConcernContentUtilsProviderImpl : IConcernContentUtilsProvider {
-    override fun addContentPic(
-        context: Context,
-        linearLayout: LinearLayout,
-        list: List<String>,
-        entrance: String,
-        width: Int
-    ) {
-        ConcernContentUtils.addContentPic(context, linearLayout, list, entrance, width)
-    }
-
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}

app/src/main/java/com/gh/common/provider/ConcernProviderImpl.kt

@@ -5,16 +5,14 @@ import android.content.Intent
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.gamecenter.ConcernActivity
 import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.core.provider.IConcernProvider
+import com.gh.gamecenter.feature.provider.IConcernProvider
 
-@Route(path = RouteConsts.provider.concernActivity, name = "ConcernActivity暴露服务")
+@Route(path = RouteConsts.provider.concern, name = "ConcernActivity暴露服务")
 class ConcernProviderImpl : IConcernProvider {
 
     override fun getIntent(context: Context, entrance: String): Intent {
         return ConcernActivity.getIntent(context, entrance)
     }
 
-    override fun init(context: Context?) {
-        // Do nothing
-    }
+    override fun init(context: Context?) {}
 }

app/src/main/java/com/gh/common/provider/ConfigProviderImpl.kt

@@ -56,22 +56,6 @@ class ConfigProviderImpl : IConfigProvider {
         return Config.getSettings()?.image?.oss?.gifWaterMark ?: ""
     }
 
-    override fun getVideoSnapshotSuffix(): String {
-        return Config.getSettings()?.image?.oss?.snapshot ?: ""
-    }
-
-    override fun getImageCropSuffix(): String {
-        return Config.getSettings()?.image?.oss?.crop ?: ""
-    }
-
-    override fun getImageInfoSuffix(): String {
-        return Config.getSettings()?.image?.oss?.info ?: ""
-    }
-
-    override fun getImageResizeSuffix(): String {
-        return Config.getSettings()?.image?.oss?.resize ?: ""
-    }
-
     override fun getQQ(): String {
         return Config.getSettings()?.support?.qq ?: ""
     }

app/src/main/java/com/gh/common/provider/ConfigSettingProviderImpl.kt

@@ -1,19 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.common.constant.Config
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.entity.SettingsEntity
-import com.gh.gamecenter.feature.provider.IConfigSettingProvider
-
-@Route(path = RouteConsts.provider.configSetting, name = "Config.getSettings暴露服务")
-class ConfigSettingProviderImpl : IConfigSettingProvider {
-    override fun getSettings(): SettingsEntity? {
-        return Config.getSettings()
-    }
-
-    override fun init(context: Context?) {
-        // do nothing
-    }
-}

app/src/main/java/com/gh/common/provider/DataCollectionProviderImpl.kt

@@ -1,22 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.common.util.DataCollectionUtils
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.provider.IDataCollectionProvider
-
-@Route(path = RouteConsts.provider.dataCollection, name = "DataCollectionUtils暴露服务")
-class DataCollectionProviderImpl : IDataCollectionProvider {
-    override fun uploadClick(context: Context, vararg args: String) {
-        DataCollectionUtils.uploadClick(context, *args)
-    }
-
-    override fun uploadConcern(context: Context, vararg args: String) {
-        DataCollectionUtils.uploadConcern(context, *args)
-    }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}

app/src/main/java/com/gh/common/provider/DetailDownloadUtilsProviderImpl.kt

@@ -0,0 +1,70 @@
+package com.gh.common.provider
+
+import android.content.Context
+import android.view.View
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.DetailDownloadUtils
+import com.gh.gamecenter.adapter.viewholder.DetailViewHolder
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.exposure.ExposureEvent
+import com.gh.gamecenter.feature.provider.IDetailDownloadUtilsProvider
+import com.lightgame.download.DownloadEntity
+
+@Route(path = RouteConsts.provider.detailDownloadUtils, name = "DetailDownloadUtils暴露服务")
+class DetailDownloadUtilsProviderImpl : IDetailDownloadUtilsProvider {
+
+    override fun detailInitDownload(
+        contentView: View,
+        gameEntity: GameEntity?,
+        downloadEntity: DownloadEntity?,
+        isNewsDetail: Boolean,
+        entrance: String?,
+        name: String?,
+        title: String?,
+        exposureEvent: ExposureEvent?,
+        isCheck: Boolean
+    ) {
+        return DetailDownloadUtils.detailInitDownload(
+            DetailViewHolder(
+                contentView,
+                gameEntity,
+                downloadEntity,
+                isNewsDetail,
+                entrance,
+                name,
+                title,
+                exposureEvent
+            ),
+            isCheck
+        )
+    }
+
+    override fun detailInitInvalidate(
+        contentView: View,
+        gameEntity: GameEntity,
+        downloadEntity: DownloadEntity,
+        isNewsDetail: Boolean,
+        entrance: String,
+        name: String,
+        title: String,
+        exposureEvent: ExposureEvent?
+    ) {
+        return DetailDownloadUtils.detailInvalidate(
+            DetailViewHolder(
+                contentView,
+                gameEntity,
+                downloadEntity,
+                isNewsDetail,
+                entrance,
+                name,
+                title,
+                exposureEvent
+            )
+        )
+    }
+
+    override fun init(context: Context?) {
+
+    }
+}

app/src/main/java/com/gh/common/provider/DeviceTokenUtilsProviderImpl.kt

@@ -0,0 +1,17 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.DeviceTokenUtils
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IDeviceTokenUtilsProvider
+
+@Route(path = RouteConsts.provider.deviceTokenUtils, name = "DeviceTokenUtils暴露服务")
+class DeviceTokenUtilsProviderImpl : IDeviceTokenUtilsProvider {
+
+    override fun syncServerTime(context: Context) {
+        DeviceTokenUtils.syncServerTime(context)
+    }
+
+    override fun init(context: Context?) {}
+}

app/src/main/java/com/gh/common/provider/DirectProviderImpl.kt

@@ -1,7 +1,6 @@
 package com.gh.common.provider
 
 import android.content.Context
-import android.os.Bundle
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.DirectUtils
 import com.gh.gamecenter.common.constant.RouteConsts
@@ -54,76 +53,22 @@ class DirectProviderImpl : IDirectProvider {
         DirectUtils.directDouyin(context, userId)
     }
 
-    override fun directToSuggestionFromDiagnosis(context: Context, content: String, diagnosis: String) {
-        DirectUtils.directToSuggestion(context, content = content, diagnosis = diagnosis)
+    override fun directToSuggestionFromDiagnosis(context: Context, diagnosis: String) {
+        DirectUtils.directToSuggestion(context, diagnosis = diagnosis)
     }
 
     override fun directToQa(context: Context, text: String?, id: String) {
         DirectUtils.directToQa(context, text, id)
     }
 
-    override fun directToHelpAndFeedback(context: Context, bundle: Bundle?) {
-        DirectUtils.directToHelpAndFeedback(context, bundle)
+    override fun directToHelpAndFeedback(context: Context, position: Int) {
+        DirectUtils.directToHelpAndFeedback(context, position)
     }
 
     override fun directToQqGroup(context: Context, groupNumber: String?): Boolean {
         return DirectUtils.directToQqGroup(context, groupNumber)
     }
 
-    override fun directToHomeActivity(context: Context, userId: String?, entrance: String?, path: String?) {
-        DirectUtils.directToHomeActivity(context, userId, entrance, path)
-    }
-
-    override fun directToAnswerDetail(context: Context, id: String, entrance: String?, path: String?) {
-        DirectUtils.directToAnswerDetail(context, id, entrance, path)
-    }
-
-    override fun directToCommunityArticle(
-        context: Context,
-        articleId: String?,
-        communityId: String?,
-        entrance: String?,
-        path: String?
-    ) {
-        DirectUtils.directToCommunityArticle(context, articleId, communityId, entrance, path)
-    }
-
-    override fun directToVideoDetail(context: Context, videoId: String, entrance: String?, path: String?) {
-        DirectUtils.directToVideoDetail(context, videoId, entrance, path)
-    }
-
-    override fun directToAmway(context: Context, fixedTopAmwayCommentId: String?, entrance: String?, path: String?) {
-        DirectUtils.directToAmway(context, fixedTopAmwayCommentId, entrance, path)
-    }
-
-    override fun directToOrderCenter(context: Context) {
-        DirectUtils.directToOrderCenter(context)
-    }
-
-    override fun directToOrderDetail(context: Context, orderId: String) {
-        DirectUtils.directToOrderDetail(context, orderId)
-    }
-
-    override fun directToEnergyRecord(context: Context, position: Int) {
-        DirectUtils.directToEnergyRecord(context, position)
-    }
-
-    override fun directToMyPrizePage(context: Context) {
-        DirectUtils.directToMyPrizePage(context)
-    }
-
-    override fun directToWinOrderDetail(context: Context, orderId: String, activityId: String) {
-        DirectUtils.directToWinOrderDetail(context, orderId, activityId)
-    }
-
-    override fun directToQGame(context: Context) {
-        return DirectUtils.directToQGameHome(context)
-    }
-
-    override fun directToExternalBrowser(context: Context, url: String) {
-        DirectUtils.directToExternalBrowser(context, url)
-    }
-
     override fun init(context: Context?) {
         // Do nothing
     }

app/src/main/java/com/gh/common/provider/DownloadButtonClickedProviderImpl.kt

@@ -3,14 +3,11 @@ package com.gh.common.provider
 import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.NewFlatLogUtils
-import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.GlobalActivityManager
 import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.common.exposure.ExposureSource
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.entity.GameUpdateEntity
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.feature.provider.IDownloadButtonClickedProvider
 import com.gh.gamecenter.feature.view.DownloadButton
 import com.gh.gamecenter.packagehelper.PackageRepository
@@ -28,7 +25,6 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
         var downloadStatusInChinese = ""
         var gameSchemaType = ""
         var packageName = ""
-        var exposureSourceList: List<ExposureSource>? = null
 
         val boundedObject = downloadButton.getObject()
 
@@ -40,21 +36,17 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                     gameId = boundedObject.id
                     gameName = boundedObject.name ?: ""
                     gameCategory = boundedObject.category ?: ""
-                    downloadStatus =
-                        if (boundedObject.isVGamePreferred()) {
-                            "畅玩"
-                        } else {
-                            if (boundedObject.downloadStatus == "demo") {
-                                "试玩"
-                            } else {
-                                "下载"
-                            }
-                        }
+                    downloadStatus = if (boundedObject.isVGame()) {
+                        "畅玩"
+                    } else if (boundedObject.downloadStatus == "demo") {
+                        "试玩"
+                    } else {
+                        "下载"
+                    }
                     gameTypeInChinese = boundedObject.categoryChinese
                     downloadStatusInChinese = boundedObject.downloadStatusChinese
                     gameSchemaType = boundedObject.gameBitChinese
                     packageName = boundedObject.getUniquePackageName() ?: ""
-                    exposureSourceList = boundedObject.exposureEvent?.source
                 }
 
                 is GameUpdateEntity -> {
@@ -65,16 +57,14 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
                     gameTypeInChinese = boundedObject.categoryChinese
                     downloadStatusInChinese = boundedObject.downloadStatusChinese
                     packageName = boundedObject.packageName
-                    exposureSourceList = boundedObject.exposureEvent?.source
                 }
 
                 is DownloadEntity -> {
                     gameId = boundedObject.gameId
                     gameName = boundedObject.name ?: ""
                     gameCategory = boundedObject.getGameCategory()
-                    downloadStatus = if (boundedObject.asVGame()) "畅玩" else "下载"
+                    downloadStatus = if (boundedObject.isVGame()) "畅玩" else "下载"
                     packageName = boundedObject.packageName
-                    exposureSourceList = boundedObject.exposureTrace?.toObject<ExposureEvent>()?.source
                 }
             }
 
@@ -97,38 +87,28 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
             }
 
             // 预约状态不上报
-            if (downloadButton.buttonStyle == DownloadButton.ButtonStyle.NORMAL
-                || downloadButton.buttonStyle == DownloadButton.ButtonStyle.PLUGIN) {
-
-                val text = downloadButton.text.ifEmpty {
-                    downloadButton.getTag(R.string.download) ?: ""
-                }.toString()
-
-                val downloadType = if (text.contains("畅玩")) {
-                    "畅玩下载"
-                } else {
-                    "本地下载"
-                }
+            if (downloadButton.buttonStyle != DownloadButton.ButtonStyle.RESERVABLE
+                && downloadButton.buttonStyle != DownloadButton.ButtonStyle.RESERVED
+            ) {
 
                 // 上报神策点击事件
-                SensorsBridge.trackEventWithExposureSource(
+                SensorsBridge.trackEvent(
                     "DownLoadbuttonClick",
-                    exposureSourceList,
                     "game_id", gameId,
                     "game_name", gameName,
                     "game_type", gameTypeInChinese,
                     "download_status", downloadStatusInChinese,
                     "button_name", downloadButton.text,
                     "game_schema_type", gameSchemaType,
-                    "download_type", downloadType,
                     "page_name", GlobalActivityManager.getCurrentPageEntity().pageName,
                     "page_id", GlobalActivityManager.getCurrentPageEntity().pageId,
                     "page_business_id", GlobalActivityManager.getCurrentPageEntity().pageBusinessId,
                     "last_page_name", GlobalActivityManager.getLastPageEntity().pageName,
                     "last_page_id", GlobalActivityManager.getLastPageEntity().pageId,
-                    "last_page_business_id", GlobalActivityManager.getLastPageEntity().pageBusinessId,
+                    "last_page_business_id", GlobalActivityManager.getLastPageEntity().pageBusinessId
                 )
             }
+
         }
     }
 

app/src/main/java/com/gh/common/provider/DownloadManagerProviderImpl.kt

@@ -5,7 +5,9 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IDownloadManagerProvider
+import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
+import com.lightgame.download.DownloadStatus
 
 @Route(path = RouteConsts.provider.downloadManager, name = "DownloadManager暴露服务")
 class DownloadManagerProviderImpl : IDownloadManagerProvider {
@@ -18,6 +20,18 @@ class DownloadManagerProviderImpl : IDownloadManagerProvider {
         DownloadManager.getInstance().resumeAllInvisiblePendingTask()
     }
 
+    override fun getStatus(url: String): DownloadStatus {
+        return DownloadManager.getInstance().getStatus(url)
+    }
+
+    override fun addObserver(dataWatcher: DataWatcher) {
+        return DownloadManager.getInstance().addObserver(dataWatcher)
+    }
+
+    override fun removeObserver(dataWatcher: DataWatcher) {
+        return DownloadManager.getInstance().removeObserver(dataWatcher)
+    }
+
     override fun init(context: Context?) {
         // Do nothing
     }

app/src/main/java/com/gh/common/provider/GameCollectionDetailProviderImpl.kt

@@ -1,24 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import android.content.Intent
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.provider.IGameCollectionDetailProvider
-import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailActivity
-
-@Route(path = RouteConsts.provider.gameCollectionDetail, name = "GameCollectionDetailActivity暴露服务")
-class GameCollectionDetailProviderImpl : IGameCollectionDetailProvider {
-    override fun getIntent(context: Context, gameCollectionId: String, isFromSquare: Boolean): Intent {
-        return GameCollectionDetailActivity.getIntent(context, gameCollectionId, isFromSquare)
-    }
-
-    override fun getSpecifiedCommentIntent(context: Context, gameCollectionId: String, topCommentId: String): Intent {
-        return GameCollectionDetailActivity.getSpecifiedCommentIntent(context, gameCollectionId, topCommentId)
-    }
-
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}

app/src/main/java/com/gh/common/provider/GameDetailProviderImpl.kt

@@ -10,15 +10,6 @@ import com.gh.gamecenter.feature.provider.IGameDetailProvider
 
 @Route(path = RouteConsts.provider.gameDetail, name = "GameDetailActivity暴露服务")
 class GameDetailProviderImpl : IGameDetailProvider {
-    override fun startGameDetailActivity(
-        context: Context,
-        gameEntity: GameEntity?,
-        entrance: String,
-        traceEvent: ExposureEvent?
-    ) {
-        GameDetailActivity.startGameDetailActivity(context, gameEntity, entrance, traceEvent)
-    }
-
     override fun startGameDetailActivity(
         context: Context,
         gameId: String,
@@ -28,6 +19,15 @@ class GameDetailProviderImpl : IGameDetailProvider {
         GameDetailActivity.startGameDetailActivity(context, gameId, entrance, traceEvent)
     }
 
+    override fun startGameDetailActivity(
+        context: Context,
+        gameEntity: GameEntity?,
+        entrance: String,
+        traceEvent: ExposureEvent?
+    ) {
+        GameDetailActivity.startGameDetailActivity(context, gameEntity, entrance, traceEvent)
+    }
+
     override fun startGameDetailActivity(
         context: Context,
         gameEntity: GameEntity?,
@@ -50,30 +50,6 @@ class GameDetailProviderImpl : IGameDetailProvider {
         )
     }
 
-    override fun startGameDetailActivity(
-        context: Context,
-        gameId: String,
-        entrance: String?,
-        defaultTab: Int,
-        isSkipGameComment: Boolean,
-        scrollToLibao: Boolean,
-        openVideoStreaming: Boolean,
-        openPlatformWindow: Boolean,
-        traceEvent: ExposureEvent?
-    ) {
-        GameDetailActivity.startGameDetailActivity(
-            context,
-            gameId,
-            entrance,
-            defaultTab,
-            isSkipGameComment,
-            scrollToLibao,
-            openVideoStreaming,
-            openPlatformWindow,
-            traceEvent
-        )
-    }
-
     override fun init(context: Context?) {
         // Do nothing
     }

app/src/main/java/com/gh/common/provider/GameSubstituteRepositoryProviderImpl.kt

@@ -9,8 +9,8 @@ import com.gh.gamecenter.core.provider.IGameSubstituteRepositoryProvider
 @Route(path = RouteConsts.provider.gameSubstituteRepository, name = "GameSubstituteRepositoryHelper暴露服务")
 class GameSubstituteRepositoryProviderImpl : IGameSubstituteRepositoryProvider {
 
-    override fun updateHistoricInstalledGameSet() {
-        GameSubstituteRepositoryHelper.updateHistoricInstalledGameSet()
+    override fun updateSubstitutableGames() {
+        GameSubstituteRepositoryHelper.updateSubstitutableGames()
     }
 
     override fun init(context: Context?) {