删除 .gradle/caches/build-cache-1 缓存目录

处理 ARM 处理器的编译问题

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

.gitlab-ci.yml

@@ -1,43 +1,43 @@
 stages:
-  - analysis
-  - sendmail
+  - android-build
+  - docker-build
 
-## 代码检查
-sonarqube_analysis:
+android_build:
   tags:
     - offline-test
-  stage: analysis
-  image: sonarsource/sonar-scanner-cli:latest
-  dependencies: []    #禁止传递来的artifact
+  stage: android-build
+  image: hub.shanqu.cc/devops/ci-android:jdk11
+  variables:
+    KUBERNETES_CPU_LIMIT: "16"
+    GIT_SUBMODULE_STRATEGY: recursive
+    Apk_Path: "app/build/outputs/apk/**/release/*.apk"
   script:
-    ## 获取项目的一级组和二级组和项目名作为projectKey，例如projectKey=platform-backend-eci-monitor
-    - group=`echo $CI_PROJECT_PATH | sed 's#/#-#g'`
-    - sonar-scanner
-      -Dsonar.host.url=http://sonarqube-server.sonarqube:9000/
-      -Dsonar.login=be43de7264ce4c4766eb0c020373c3e74e6df257
-      -Dsonar.jacoco.reportPaths=target/jacoco.exec
-      -Dsonar.projectKey=$group
-      -Dsonar.projectName=$CI_PROJECT_PATH
-      -Dsonar.sourceEncoding=UTF-8
-      -Dsonar.exclusions=**/vendor/**,**/errcode/**
-      -Dsonar.gitlab.project_id=$CI_PROJECT_ID
-      -Dsonar.gitlab.commit_sha=$CI_COMMIT_SHA
-      -Dsonar.gitlab.ref_name=$CI_COMMIT_REF_NAME
-      -Dsonar.gitlab.ci_merge_request_iid=$CI_MERGE_REQUEST_IID
-      -Dsonar.gitlab.merge_request_discussion=true
-      -Dsonar.java.binaries=.                 # 如果不使用Maven或Gradle进行分析，则必须手动提供测试二进制文件
+    - export GRADLE_USER_HOME=./.gradle
+    - chmod +x ./gradlew
+    - ./scripts/jenkins_build.sh -c
+    - rm -rf ./.gradle/caches/build-cache-1
+  cache:
+    paths:
+      - .gradle
   only:
-    - dev
- 
-## 发送简易检测结果报告
-send_sonar_report:
+    - feature-ci
+
+# 构建推送docker镜像
+docker-build:
   tags:
     - offline-test
-  stage: sendmail
+  stage: docker-build
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
   image: hub.shanqu.cc/library/docker:latest
-  dependencies: []    #禁止传递来的artifact
   script:
-    - group=`echo $CI_PROJECT_PATH | sed 's#/#-#g'`
-    - docker run -e PROJECTKEY=$group -e EMAIL=$GITLAB_USER_EMAIL --name send-email --rm hub.shanqu.cc/platform/send-sonar-report:latest
+    - imageName=`echo $CI_PROJECT_PATH | sed 's#/#-#g'`
+    - docker build -t registry.cn-shenzhen.aliyuncs.com/ghzs/$imageName:latest .
+    - docker push registry.cn-shenzhen.aliyuncs.com/ghzs/$imageName:latest
+  cache:
+    paths:
+      - .gradle
+    policy: pull
   only:
-    - dev
+    - feature-ci
+

.gitmodules

@@ -1,13 +1,13 @@
 [submodule "libraries/LGLibrary"]
 	path = libraries/LGLibrary
-	url = git@git.shanqu.cc:android/common-library.git
+	url = ../../../android/common-library.git
 	branch = master
 [submodule "vspace-bridge"]
 	path = vspace-bridge
-	url = git@git.shanqu.cc:cwzs/android/vspace-bridge.git
+	url = ../../../cwzs/android/vspace-bridge.git
 [submodule "module_common/src/debug/assets/assistant-android-mock"]
 	path = module_common/src/debug/assets/assistant-android-mock
-	url = git@git.shanqu.cc:halo/android/assistant-android-mock.git
+	url = ../../../halo/android/assistant-android-mock.git
 [submodule "ndownload"]
 	path = ndownload
-	url = git@git.shanqu.cc:android/ndownload.git
+	url = ../../../android/ndownload.git

Dockerfile

@@ -0,0 +1,18 @@
+FROM openjdk:11-jdk
+WORKDIR /project
+ARG CI_PROJECT_PATH=default_value
+SHELL ["/bin/bash", "-c"]
+#配置SDK环境变量
+ENV ANDROID_SDK_ROOT /usr/lib/sdk
+ENV ANDROID_HOME /usr/lib/sdk
+ENV PATH $ANDROID_SDK_ROOT:$PATH
+ENV PATH=$PATH:${ANDROID_HOME}/cmdline-tools/cmdline-tools/bin/
+ENV GRADLE_USER_HOME /project/.gradle
+
+RUN source ~/.bashrc
+RUN sed -i "s@http://\(deb\|security\).debian.org@https://mirrors.aliyun.com@g" /etc/apt/sources.list \
+    && apt-get --quiet update --yes \
+    && apt-get --quiet install --yes wget lib32stdc++6 lib32z1 libncurses5  \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY  . /project

app/build.gradle

@@ -127,7 +127,7 @@ android {
     variantFilter { variant ->
         def names = variant.flavors*.name
         def isDebugType = variant.buildType.name == "debug"
-        if ((names.contains("tea")) && isDebugType) {
+        if ((names.contains("tea") || name.contains("kuaishou")) && isDebugType) {
             setIgnore(true)
         }
     }
@@ -144,6 +144,9 @@ android {
         tea {
             java.srcDirs = ['src/main/java', 'src/tea/java']
         }
+        kuaishou {
+            java.srcDirs = ['src/main/java', 'src/kuaishou/java']
+        }
     }
 
     productFlavors {
@@ -181,6 +184,16 @@ android {
 
             manifestPlaceholders.put("APPLOG_SCHEME", "rangersapplog.byAx6uYt".toLowerCase())
         }
+
+        kuaishou {
+            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}\""
+        }
     }
 }
 
@@ -195,6 +208,7 @@ dependencies {
     implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
 
     teaImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/tea/libs')
+    kuaishouImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/kuaishou/libs')
     testImplementation 'junit:junit:4.12'
 
     debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakcanary}"
@@ -272,6 +286,15 @@ dependencies {
     implementation(project(':module_setting')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
+//    implementation(project(':module_setting_compose')) {
+//        exclude group: 'androidx.swiperefreshlayout'
+//    }
+    implementation(project(':module_core_feature')){
+        exclude group: 'androidx.swiperefreshlayout'
+    }
+    implementation(project(':module_feedback')) {
+        exclude group: 'androidx.swiperefreshlayout'
+    }
     // 默认不接入光能模块，提高编译速度
 //    debugImplementation(project(':module_energy')) {
 //        exclude group: 'androidx.swiperefreshlayout'
@@ -425,7 +448,7 @@ andResGuard {
             "*.gif",
     ]
     sevenzip {
-        artifact = 'com.tencent.mm:SevenZip:1.2.20'
+        artifact = 'io.github.leon406:SevenZip:1.2.22.5'
     }
 }
 
@@ -511,4 +534,4 @@ project.afterEvaluate {
             }
         }
     }
-}
+}

app/proguard-rules.txt

@@ -17,15 +17,30 @@
 -dontwarn com.j256.**
 
 ### app models
--keep class com.gh.common.view.* {*;}
 -keep class com.gh.gamecenter.db.info.* {*;}
--keep class com.gh.gamecenter.entity.* {*;}
--keep class com.gh.gamecenter.qa.entity.* {*;}
+-keep class com.gh.gamecenter.entity.** {<fields>;}
+-keep class com.gh.gamecenter.qa.entity.** {<fields>;}
+-keep class com.gh.gamecenter.BR
 -keep class com.gh.gamecenter.retrofit.* {*;}
 -keep class com.gh.gamecenter.eventbus.* {*;}
--keep class com.gh.gamecenter.video.detail.* {*;}
--keep class com.gh.gamecenter.home.gamecollection.* {*;}
+-keep class com.gh.gamecenter.home.gamecollection.GameCollectionStackLayout {*;}
+-keep class com.gh.gamecenter.home.gamecollection.GameCollectionStackAnimation {*;}
 
+# Prevent R8 from leaving Data object members always null
+-keepclassmembers,allowobfuscation class * {
+  @com.google.gson.annotations.SerializedName <fields>;
+}
+
+# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
+# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
+-keep class * extends com.google.gson.TypeAdapter
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+
+# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher.
+-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
+-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
 
 # TODO What's this ?
 -ignorewarnings
@@ -39,7 +54,7 @@
 -dontwarn com.shuyu.gsyvideoplayer.utils.**
 -keep class tv.danmaku.ijk.* { *; }
 -dontwarn tv.danmaku.ijk.**
--keep public class * extends android.view.View{
+-keep public class * extends android.view.View {
     *** get*();
     void set*(***);
     public <init>(android.content.Context);
@@ -54,15 +69,4 @@
 -keep class com.lzf.easyfloat.* {*;}
 
 ### dokit
--keep class com.didichuxing.** {*;}
-
-# Flutter模块
--keep class com.gh.common.util.DirectUtils {
-    public static void directToQa(...);
-    public static void directToQaCollection(...);
-    public static void directToGift(...);
-    public static void directToConcernInfo(...);
-    public static void directToFeedback(...);
-    public static void directToSuggestion(...);
-}
-
+-keep class com.didichuxing.** {*;}

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

@@ -1,14 +1,16 @@
 package com.gh.gamecenter.provider
 
+import android.app.Activity
 import android.app.Application
 import android.text.TextUtils
 import com.gh.gamecenter.common.constant.Config
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.utils.PackageFlavorHelper
+import com.gh.gamecenter.core.provider.IFlavorProvider
 import com.gh.gamecenter.core.utils.SPUtils
 import com.leon.channel.helper.ChannelReaderUtil
 
-class ChannelProviderImp : ChannelProvider {
+class FlavorProviderImp : IFlavorProvider {
     override fun getChannelStr(application: Application): String {
         var channel = ChannelReaderUtil.getChannel(application)
         if (channel == null || TextUtils.isEmpty(channel.trim())) {
@@ -23,4 +25,12 @@ class ChannelProviderImp : ChannelProvider {
         }
         return channel
     }
+
+    override fun init(application: Application, activity: Activity) {
+        // do nothing
+    }
+
+    override fun logEvent(content: String) {
+        // do nothing
+    }
 }

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

@@ -0,0 +1,30 @@
+package com.gh.gamecenter
+
+import android.content.Context
+import com.kwai.monitor.log.TurboAgent
+import com.kwai.monitor.log.TurboConfig
+
+object KuaishouHelper {
+    private const val APP_ID = "80655"
+    private const val APP_NAME = "guanghuanzhushou_1"
+
+    @JvmStatic
+    fun init(context: Context, channel: String) {
+        TurboAgent.init(
+            TurboConfig.TurboConfigBuilder.create(context)
+                .setAppId(APP_ID)
+                .setAppName(APP_NAME)
+                .setAppChannel(channel)
+                .build()
+        )
+    }
+
+    @JvmStatic
+    fun onEvent(type: String) {
+        when (type) {
+            "EVENT_ACTIVE" -> TurboAgent.onAppActive()
+            "active_register" -> TurboAgent.onRegister()
+            "EVENT_NEXTDAY_STAY" -> TurboAgent.onNextDayStay()
+        }
+    }
+}

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

@@ -0,0 +1,48 @@
+package com.gh.gamecenter.provider
+
+import android.app.Activity
+import android.app.Application
+import android.text.TextUtils
+import com.gh.gamecenter.KuaishouHelper
+import com.gh.gamecenter.core.provider.IFlavorProvider
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.core.utils.TimeUtils
+import com.halo.assistant.HaloApp
+import com.leon.channel.helper.ChannelReaderUtil
+
+class FlavorProviderImp : IFlavorProvider {
+
+    override fun init(application: Application, activity: Activity) {
+        KuaishouHelper.init(application, getChannelStr(application))
+
+        if (HaloApp.getInstance().isBrandNewInstall) {
+            logEvent("EVENT_ACTIVE")
+            SPUtils.setLong("TIME_OF_BRAND_NEW_INSTALL", System.currentTimeMillis() / 1000)
+        } else {
+            val shouldSendRetentionLogEvent =
+                SPUtils.getBoolean("SHOULD_SEND_RETENTION_EVENT", true)
+            val installTimeNotToday =
+                !TimeUtils.isToday(SPUtils.getLong("TIME_OF_BRAND_NEW_INSTALL", System.currentTimeMillis() / 1000))
+            if (shouldSendRetentionLogEvent && installTimeNotToday) {
+                logEvent("EVENT_NEXTDAY_STAY")
+                SPUtils.setBoolean("SHOULD_SEND_RETENTION_EVENT", false)
+            }
+        }
+    }
+
+    override fun getChannelStr(application: Application): String {
+        var channel = ChannelReaderUtil.getChannel(application)
+        if (channel == null || TextUtils.isEmpty(channel.trim())) {
+            channel = KUAISHOU_CHANNEL
+        }
+        return channel
+    }
+
+    override fun logEvent(content: String) {
+        KuaishouHelper.onEvent(content)
+    }
+
+    companion object {
+        private const val KUAISHOU_CHANNEL = "KS-GHZS-01"
+    }
+}

app/src/main/AndroidManifest.xml

@@ -6,6 +6,11 @@
     <queries>
         <package android:name="com.gh.gamecenter" />
     </queries>
+
+    <queries>
+        <package android:name="com.lg.vspace" />
+    </queries>
+
     <!-- 允许应用程序访问网络连接 -->
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- 允许应用程序写入外部存储，如SD卡上写文件 -->
@@ -51,7 +56,27 @@
         com.google.android.exoplayer2,
         tv.danmaku.ijk.media.exo2,
         pl.droidsonroids.gif,
-        com.lzf.easyfloat" />
+        com.lzf.easyfloat,
+        com.airbnb.lottie.compose,
+        androidx.compose.ui.platform,
+        androidx.compose.material.icons,
+        androidx.activity.compose,
+        androidx.compose.ui.tooling,
+        androidx.compose.ui.tooling.data,
+        androidx.compose.material.ripple,
+        androidx.compose.foundation,
+        androidx.compose.animation,
+        androidx.compose.foundation.layout,
+        androidx.compose.ui.text,
+        androidx.compose.ui.graphics,
+        androidx.compose.ui.unit,
+        androidx.compose.ui.util,
+        androidx.compose.ui.geometry,
+        androidx.compose.runtime.saveable,
+        androidx.compose.animation.core,
+        androidx.constraintlayout.compose,
+        androidx.compose.ui.test.manifest,
+        androidx.compose.ui.tooling.preview"/>
 
     <!-- 去掉 SDK 一些流氓权限 -->
     <uses-permission
@@ -229,9 +254,6 @@
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.SuggestionActivity"
-            android:screenOrientation="portrait" />
         <activity
             android:name="com.gh.gamecenter.VoteActivity"
             android:screenOrientation="portrait"
@@ -415,10 +437,6 @@
             android:name="com.gh.gamecenter.qa.editor.LocalMediaActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.mygame.PlayedGameActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.gh.gamecenter.servers.GameServersActivity"
             android:screenOrientation="portrait" />
@@ -435,15 +453,6 @@
             android:name="com.halo.assistant.fragment.user.UserPortraitCropImageActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.HelpAndFeedbackActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden" />
-
-        <activity
-            android:name="com.gh.gamecenter.help.HelpDetailActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.gh.gamecenter.qa.comment.CommentActivity"
             android:theme="@style/Theme.Transparent"
@@ -467,10 +476,6 @@
             android:name="com.gh.gamecenter.gamedetail.fuli.kaifu.ServersCalendarActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.QaActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name=".qa.answer.draft.AnswerDraftActivity"
             android:screenOrientation="portrait" />
@@ -717,6 +722,14 @@
             android:name=".savegame.GameArchiveListActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name=".discovery.interestedgame.InterestedGameActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".servers.gametest2.GameServerTestV2Activity"
+            android:screenOrientation="portrait" />
+
 
         <!--        <activity-->
         <!--            android:name="${applicationId}.douyinapi.DouYinEntryActivity"-->

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

@@ -6,6 +6,7 @@ import android.app.Activity
 import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
+import android.graphics.Color
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.View
@@ -25,9 +26,10 @@ import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.entity.*
+import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.qa.editor.*
-import com.gh.gamecenter.qa.entity.AnswerEntity
-import com.gh.gamecenter.qa.entity.ArticleEntity
+import com.gh.gamecenter.feature.entity.AnswerEntity
+import com.gh.gamecenter.feature.entity.ArticleEntity
 import com.gh.gamecenter.qa.entity.EditorInsertEntity
 import com.gh.gamecenter.video.poster.PosterEditActivity
 import com.gh.gamecenter.video.upload.UploadManager
@@ -214,6 +216,8 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
         mKeyboardHeightProvider = KeyboardHeightProvider(this)
         mRichEditor.post { mKeyboardHeightProvider?.start() }
         mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(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")
         mRichEditor.addJavascriptInterface(OnCursorChangeListener(), "OnCursorChangeListener")
@@ -473,14 +477,14 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
     private fun chooseImage() {
         MtaHelper.onEvent(mtaEventName(), "插入图片", "插入图片")
         val imageCount = mViewModel.quoteCountEntity.imageCount
-        if (imageCount >= MAX_MEDIA_COUNT) {
+        if (imageCount >= MAX_IMAGE_COUNT) {
             toast(R.string.answer_edit_max_img_hint)
             return
         }
         try {
             PermissionHelper.checkStoragePermissionBeforeAction(this, object : EmptyCallback {
                 override fun onCallback() {
-                    val maxChooseCount = if (imageCount + 10 <= MAX_MEDIA_COUNT) 10 else MAX_MEDIA_COUNT - imageCount
+                    val maxChooseCount = if (imageCount + 10 <= MAX_IMAGE_COUNT) 10 else MAX_IMAGE_COUNT - imageCount
                     val intent = LocalMediaActivity.getIntent(
                         this@BaseRichEditorActivity,
                         LocalMediaActivity.ChooseType.IMAGE,
@@ -750,6 +754,8 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
         super.onDarkModeChanged()
         updateStatusBarColor(R.color.background_white, R.color.background_white)
         mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this))
+        mRichEditor.setEditorBackgroundColor(R.color.background_white.toColor(this))
+        mRichEditor.setEditorFontColor(if (mIsDarkModeOn) Color.parseColor("#C2C2C2") else Color.parseColor("#4A4A4A"))
     }
 
     companion object {
@@ -770,6 +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 = 35
 
         const val REQUEST_CODE_IMAGE = 120
         const val INSERT_MEDIA_VIDEO_CODE = 121

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

@@ -9,16 +9,17 @@ import android.text.TextUtils
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
-import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment
-import com.gh.gamecenter.core.runOnUiThread
 import com.gh.gamecenter.R
+import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment
+import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.utils.*
-import com.gh.gamecenter.entity.ErrorEntity
+import com.gh.gamecenter.core.runOnUiThread
+import com.gh.gamecenter.core.utils.MD5Utils
+import com.gh.gamecenter.core.utils.ToastUtils
+import com.gh.gamecenter.common.entity.ErrorEntity
 import com.gh.gamecenter.entity.LocalVideoEntity
 import com.gh.gamecenter.entity.QuoteCountEntity
 import com.gh.gamecenter.qa.BbsType
-import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.retrofit.service.ApiService
 import com.gh.gamecenter.video.upload.OnUploadListener
@@ -32,20 +33,12 @@ import okhttp3.ResponseBody
 import retrofit2.HttpException
 import java.io.File
 import java.io.FileOutputStream
-import java.util.*
-import kotlin.collections.HashMap
-import kotlin.collections.LinkedHashMap
-import kotlin.collections.List
-import kotlin.collections.Map
-import kotlin.collections.find
-import kotlin.collections.forEach
 import kotlin.collections.set
 
 // TODO: 移动到module_bbs模块
 abstract class BaseRichEditorViewModel(application: Application) : AndroidViewModel(application) {
     val mApi: ApiService = RetrofitManager.getInstance().api
     val processDialog = MediatorLiveData<WaitingDialogFragment.WaitingDialogData>()
-    val uploadingImage = ArrayList<LinkedHashMap<String, String>>()
     val chooseImagesUpload = MutableLiveData<LinkedHashMap<String, String>>()
     val chooseImagesUploadSuccess = MutableLiveData<LinkedHashMap<String, String>>()
     var uploadImageSubscription: Disposable? = null
@@ -70,7 +63,10 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
     //检查图片是否符合规则并上传图片
     fun uploadPic(data: Intent) {
         val uris = Matisse.obtainResult(data)
-        val pictureList = ArrayList<String>()
+        val rawImgUrlList = ArrayList<String>() // 需要上传图片的原始地址列表
+        val uploadingImgList = ArrayList<String>() // 正在上传图片的地址列表（已压缩处理）
+        val compressedImgUrlList = ArrayList<String>() // 压缩处理后图片的地址列表
+
         for (uri in uris) {
             val picturePath = PathUtils.getPath(getApplication(), uri)
             if (picturePath != null) {
@@ -84,12 +80,12 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
                     continue
                 }
                 Utils.log("picturePath = $picturePath")
-                pictureList.add(picturePath)
+                rawImgUrlList.add(picturePath)
             } else {
                 Utils.log("picturePath is null")
             }
         }
-        if (pictureList.size == 0) return
+        if (rawImgUrlList.size == 0) return
         val imageType = when (getRichType()) {
             RichType.ARTICLE -> UploadImageUtils.UploadType.community_article
             RichType.QUESTION -> UploadImageUtils.UploadType.question
@@ -97,7 +93,7 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
         }
         uploadImageSubscription = UploadImageUtils.compressAndUploadImageList(
             imageType,
-            pictureList,
+            rawImgUrlList,
             false,
             object : UploadImageUtils.OnUploadImageListListener {
                 override fun onProgress(total: Long, progress: Long) {}
@@ -107,87 +103,108 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
                     imageUrls.forEach {
                         chooseImageMd5Map[MD5Utils.getUrlMD5(it)] = ""
                     }
-                    uploadingImage.add(chooseImageMd5Map)
+                    uploadingImgList.addAll(imageUrls)
+                    compressedImgUrlList.addAll(imageUrls)
                     chooseImagesUpload.postValue(chooseImageMd5Map)
                 }
 
-                override fun onSingleSuccess(imageUrl: Map<String, String>) {
-                    val map = LinkedHashMap<String, String>()
-                    for (key in imageUrl.keys) {
-                        map[MD5Utils.getUrlMD5(key)] = FILE_HOST + key.decodeURI()
-                        mapImages[TextUtils.htmlEncode(key).decodeURI()] = imageUrl[key] ?: ""
+                override fun onSingleSuccess(imageUrlMap: Map<String, String>) {
+                    imageUrlMap.forEach {
+                        if (uploadingImgList.contains(it.key)) {
+                            uploadingImgList.remove(it.key)
+                        }
                     }
-                    chooseImagesUploadSuccess.postValue(map)
+                    val map = LinkedHashMap<String, String>()
+                    for (key in imageUrlMap.keys) {
+                        map[MD5Utils.getUrlMD5(key)] = FILE_HOST + key.decodeURI()
+                        mapImages[TextUtils.htmlEncode(key).decodeURI()] = imageUrlMap[key] ?: ""
+                    }
+                    chooseImagesUploadSuccess.value = map
                 }
 
-                override fun onSuccess(
-                    imageUrl: LinkedHashMap<String, String>,
-                    errorMap: Map<String, Exception>
-                ) {
-                    val uploadMap = uploadingImage.find {
-                        it.containsKey(
-                            MD5Utils.getUrlMD5(
-                                imageUrl.entries.iterator().next().key
-                            )
-                        )
-                    }
-                    uploadMap?.let {
-                        uploadingImage.remove(uploadMap)
-                    }
-
-                    val errorSize = pictureList.size - imageUrl.size
-                    if (errorSize > 0) {
-                        val map = LinkedHashMap<String, String>()
-                        for (key in errorMap.keys) {
-                            map[MD5Utils.getUrlMD5(key)] = ""
+                override fun onSuccess(imageUrlMap: LinkedHashMap<String, String>, errorMap: Map<String, Exception>) {
+                    imageUrlMap.forEach {
+                        if (uploadingImgList.contains(it.key)) {
+                            uploadingImgList.remove(it.key)
                         }
-                        //value为空会删除PlaceholderImage
-                        chooseImagesUploadSuccess.postValue(map)
+                    }
 
-                        for (error in errorMap.values) {
-                            if (error is HttpException && error.code() == 403) {
-                                Utils.toast(getApplication(), errorSize.toString() + "张违规图片上传失败")
-                                return
+                    var errorSize = compressedImgUrlList.size - imageUrlMap.size
+                    if (errorSize > 0 || uploadingImgList.isNotEmpty()) {
+                        val errorImageMap = LinkedHashMap<String, String>()
+                        for (key in errorMap.keys) {
+                            errorImageMap[MD5Utils.getUrlMD5(key)] = ""
+                        }
+
+                        for (rawImgUrl in compressedImgUrlList) {
+                            if (!imageUrlMap.containsKey(rawImgUrl)) {
+                                errorImageMap[MD5Utils.getUrlMD5(rawImgUrl)] = ""
                             }
                         }
-                        Utils.toast(getApplication(), errorSize.toString() + "张图片上传失败")
+                        errorSize = if (errorMap.isEmpty()) {
+                            errorImageMap.size
+                        } else {
+                            errorMap.size + errorImageMap.size
+                        }
+
+                        // value为空会删除PlaceholderImage
+                        chooseImagesUploadSuccess.value = errorImageMap
+
+                        if (handleUploadError(errorSize, errorMap)) return
+
+                        if (errorSize > 0) {
+                            ToastUtils.showToast(errorSize.toString() + "张图片上传失败")
+                        }
                     }
                 }
 
                 override fun onError(errorMap: Map<String, Exception>) {
-                    val errorSize = errorMap.size
-                    if (errorSize > 0) {
+                    val errorSize = uploadingImgList.size
+                    if (uploadingImgList.size > 0) {
                         val map = LinkedHashMap<String, String>()
-                        for (key in errorMap.keys) {
+                        for (key in uploadingImgList) {
                             map[MD5Utils.getUrlMD5(key)] = ""
                         }
-                        //value为空会删除PlaceholderImage
-                        chooseImagesUploadSuccess.postValue(map)
+                        // value为空会删除PlaceholderImage
+                        chooseImagesUploadSuccess.value = map
                     }
 
-                    for (error in errorMap.values) {
-                        if (error is HttpException && error.code() == 403) {
-                            val e = error.response()?.errorBody()?.string()?.toObject<ErrorEntity>()
-                            if (e != null && e.code == 403017) {
-                                Utils.toast(
-                                    getApplication(),
-                                    errorSize.toString() + "张图片的宽或高超过限制，请裁剪后上传"
-                                )
-                            } else {
-                                Utils.toast(getApplication(), errorSize.toString() + "张违规图片上传失败")
-                            }
-                            return
-                        }
-                    }
+                    if (handleUploadError(errorSize, errorMap)) return
+
+                    if (errorSize == 0) return
+
                     if (errorSize == 1) {
-                        Utils.toast(getApplication(), "图片上传失败")
+                        ToastUtils.showToast("图片上传失败")
                     } else {
-                        Utils.toast(getApplication(), errorSize.toString() + "张图片上传失败")
+                        ToastUtils.showToast(errorSize.toString() + "张图片上传失败")
                     }
                 }
             })
     }
 
+    /**
+     * 处理上传错误 (包括超时 cancel 的异常)
+     * @return 如果 toast 过了就返回 true
+     */
+    private fun handleUploadError(
+        errorSize: Int,
+        errorMap: Map<String, Exception>
+    ): Boolean {
+        for (error in errorMap.values) {
+            if (error is HttpException && error.code() == 403) {
+                val e = error.response()?.errorBody()?.string()?.toObject<ErrorEntity>()
+                if (e != null && e.code == 403017) {
+                    ToastUtils.showToast(errorSize.toString() + "张图片的宽或高超过限制，请裁剪后上传")
+                } else {
+                    ToastUtils.showToast(errorSize.toString() + "张违规图片上传失败")
+                }
+                return true
+            }
+        }
+
+        return false
+    }
+
     fun uploadPoster(picturePath: String) {
         processDialog.postValue(WaitingDialogFragment.WaitingDialogData("封面上传中...", true))
         uploadImageSubscription =

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

@@ -6,14 +6,9 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.gh.common.util.FloatingBackViewManager
 import com.gh.download.DownloadManager
-import com.gh.gamecenter.MainActivity
+import com.gh.gamecenter.SingletonWebActivity
 import com.gh.gamecenter.SplashScreenActivity
 import com.gh.gamecenter.common.utils.PackageFlavorHelper
-import com.gh.gamecenter.forum.detail.ForumDetailActivity
-import com.gh.gamecenter.forum.list.ForumListActivity
-import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity
-import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity
-import com.gh.gamecenter.qa.video.detail.ForumVideoDetailActivity
 import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
 
@@ -35,7 +30,7 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
                 && FloatingBackViewManager.getType() == FloatingBackViewManager.TYPE_TASK
             ) {
                 FloatingBackViewManager.disableBackView()
-            } else if (!shouldShowActivityBackView(activity)
+            } else if (activity is SingletonWebActivity
                 && FloatingBackViewManager.getType() == FloatingBackViewManager.TYPE_ACTIVITY
             ) {
                 FloatingBackViewManager.disableBackView()
@@ -65,15 +60,6 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
         }
     }
 
-    private fun shouldShowActivityBackView(activity: Activity): Boolean {
-        return (activity is MainActivity
-                || activity is ArticleDetailActivity
-                || activity is ForumVideoDetailActivity
-                || activity is ForumDetailActivity
-                || activity is ForumListActivity
-                || activity is NewQuestionDetailActivity)
-    }
-
     override fun onActivityPaused(activity: Activity) {
         FloatingBackViewManager.dismissBackView()
         if (PackageFlavorHelper.IS_TEST_FLAVOR && activity is AppCompatActivity) {

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

@@ -4,33 +4,38 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.util.Base64
+import android.view.View
 import android.webkit.JavascriptInterface
 import androidx.annotation.Keep
 import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
+import androidx.fragment.app.FragmentManager
+import com.alibaba.android.arouter.launcher.ARouter
 import com.gh.common.util.*
 import com.gh.common.util.LogUtils
+import com.gh.download.DownloadManager
+import com.gh.download.PackageObserver
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.ImageViewerActivity
 import com.gh.gamecenter.WebActivity
 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.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.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.CurrentActivityHolder
-import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.core.utils.MtaHelper
-import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.energy.EnergyBridge
-import com.gh.gamecenter.entity.MtaEvent
-import com.gh.gamecenter.help.QaFeedbackDialogFragment
-import com.gh.gamecenter.login.entity.Badge
+import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.feature.entity.Badge
+import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.login.user.LoginTag
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.login.user.UserRepository
@@ -38,9 +43,12 @@ import com.gh.gamecenter.login.utils.LoginHelper
 import com.gh.gamecenter.login.utils.QuickLoginHelper
 import com.gh.gamecenter.login.view.LoginActivity
 import com.gh.gamecenter.personalhome.border.AvatarBorderActivity
-import com.gh.gamecenter.setting.view.AboutActivity
-import com.gh.gamecenter.setting.view.security.BindPhoneActivity
+import com.gh.gamecenter.setting.SettingBridge
+import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
+import com.lightgame.download.DataWatcher
+import com.lightgame.download.DownloadEntity
+import com.lightgame.download.DownloadStatus.*
 import com.lightgame.utils.Utils
 import org.json.JSONObject
 import java.io.BufferedOutputStream
@@ -48,9 +56,18 @@ import java.io.File
 import java.io.FileOutputStream
 import java.util.*
 
-class DefaultJsApi(var context: Context, val entrance: String = "") {
+class DefaultJsApi(var context: Context, val entrance: String = "", private var mFragment: Fragment? = null) {
 
     private var mLoginHandler: CompletionHandler<Any>? = null
+    private var mDownloadWatcher: DataWatcher? = null
+    private var mDownloadUrlSet: HashSet<String>? = null
+    private var mDownloadHandler: CompletionHandler<Any>? = null
+
+    init {
+        if (mFragment != null) {
+            autoUnregisterDownloadObserverIfNeeded(mFragment)
+        }
+    }
 
     @JavascriptInterface
     fun isGhzs(msg: Any): String {
@@ -64,9 +81,7 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
 
     @JavascriptInterface
     fun logMtaEvent(event: Any) {
-        val mtaEvent = event.toString().toObject() ?: MtaEvent()
-
-        MtaHelper.onEvent(mtaEvent.name, mtaEvent.key, mtaEvent.value)
+        // do nothing, mta is deprecated
     }
 
     @JavascriptInterface
@@ -167,7 +182,18 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
     @JavascriptInterface
     fun startApp(msg: Any) {
         val packageName = msg.toString()
-        PackageUtils.launchApplicationByPackageName(HaloApp.getInstance().application, packageName)
+        val context = HaloApp.getInstance().application
+
+        runOnUiThread {
+            // 若畅玩列表中安装了，优先启动畅玩游戏
+            if (VHelper.isInstalled(packageName)) {
+                if (!VHelper.showDialogIfVSpaceIsNeeded(context)) {
+                    VHelper.launch(context, packageName)
+                }
+            } else {
+                PackageUtils.launchApplicationByPackageName(context, packageName)
+            }
+        }
     }
 
     @JavascriptInterface
@@ -270,7 +296,7 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
 
     @JavascriptInterface
     fun bindPhone(msg: Any) {
-        val intent = BindPhoneActivity.getNormalIntent(context, false)
+        val intent = SettingBridge.getBindPhoneNormalIntent(context, false)
         context.startActivity(intent)
     }
 
@@ -314,7 +340,9 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
 
     @JavascriptInterface
     fun showQaFeedbackDialog(msg: Any) {
-        QaFeedbackDialogFragment.show(context as AppCompatActivity, msg.toString())
+         val mHelpAndFeedbackHelp =
+            ARouter.getInstance().build(RouteConsts.provider.helpAndFeedback).navigation() as? IHelpAndFeedbackProvider
+        mHelpAndFeedbackHelp?.showQaFeedbackDialogFragment(context as AppCompatActivity, msg.toString())
     }
 
     @JavascriptInterface
@@ -361,11 +389,6 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
         FloatingBackViewManager.enableBackView(FloatingBackViewManager.TYPE_ACTIVITY, msg.toString())
     }
 
-    @JavascriptInterface
-    fun startBBSStayTimeCount(msg: Any) {
-        BbsStayTimeHelper.enableStayTimeCount(msg.toString().toInt())
-    }
-
     @JavascriptInterface
     fun saveBase64ImageToGallery(msg: Any) {
         val base64StringData = msg.toString()
@@ -405,18 +428,9 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
         runOnUiThread { DirectUtils.directToFullScreenWebPage(context, url.toString(), true, entrance) }
     }
 
-    @JavascriptInterface
-    fun startGameCollectionSquareBrowseTask(event: Any) {
-        val browseTimeEvent = event.toString().toObject() ?: BrowseTaskEvent()
-        GameCollectionSquareBrowseTaskHelper.enableBrowseTimeCount(
-            browseTimeEvent.timeout.toInt(),
-            browseTimeEvent.isFinished == "true"
-        )
-    }
-
     @JavascriptInterface
     fun checkUpdateGhzs(msg: Any) {
-        context.startActivity(AboutActivity.getIntent(context, true))
+        context.startActivity(SettingBridge.getAboutIntent(context, true))
     }
 
     @JavascriptInterface
@@ -439,17 +453,182 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
 
     @JavascriptInterface
     fun getEntrance(msg: Any): String {
-        return entrance
+        return when {
+            entrance.contains("论坛-活动") -> "社区-活动tab-活动banner"
+            entrance.contains("启动弹窗") -> "首页_弹窗"
+            entrance.contains("新首页-轮播图") -> "首页banner"
+            entrance.contains("论坛banner") -> "社区banner"
+            entrance.contains("启动广告") -> "app_开屏文案"
+//            entrance.contains("资讯广场-轮播图") -> "资讯_活动banner"
+            entrance.contains("通用链接合集") -> "资讯_活动banner"
+            entrance.contains("视频流广告位") -> "视频流_广告位"
+            entrance.contains("我的光环banner") -> "我的光环_banner"
+            entrance.contains("论坛详情页置顶栏") -> "社区_论坛置顶"
+
+            else -> entrance
+        }
+    }
+
+    @JavascriptInterface
+    fun getInstallStatus(event: Any): String {
+        val localInstalledPackageList = PackageUtils.getAllPackageName(HaloApp.getInstance().application)
+        val packageNameList: ArrayList<String> = event.toString().toObject() ?: ArrayList()
+        val installStatusMap: HashMap<String, Boolean> = hashMapOf()
+
+        for (packageName in packageNameList) {
+            installStatusMap[packageName] =
+                localInstalledPackageList.contains(packageName) || VHelper.isInstalled(packageName)
+        }
+
+        return installStatusMap.toJson()
+    }
+
+    @JavascriptInterface
+    fun installDownloadedGame(event: Any) {
+        val url = event.toString()
+        val vUrl = VHelper.getVUrl(url)
+
+        val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(url, null, false)
+            ?: DownloadManager.getInstance().getDownloadEntitySnapshot(vUrl, null, false)
+
+        downloadEntity?.let {
+            PackageInstaller.install(context, it, showUnzipToast = false)
+        }
+    }
+
+    @JavascriptInterface
+    fun registerDownloadCallback(msg: Any, handler: CompletionHandler<Any>) {
+        val downloadUrlSet: HashSet<String> = msg.toString().toObject() ?: return
+
+        mDownloadHandler = handler
+        mDownloadUrlSet = downloadUrlSet
+
+        if (mDownloadWatcher == null) {
+            mDownloadWatcher = object : DataWatcher() {
+                override fun onDataInit(downloadEntity: DownloadEntity) {
+                    onDataChanged(downloadEntity)
+                }
+
+                override fun onDataChanged(downloadEntity: DownloadEntity?) {
+                    val url = VHelper.getOriginalUrl(downloadEntity?.url)
+
+                    if (downloadEntity != null && mDownloadUrlSet?.contains(url) == true) {
+                        mDownloadHandler?.setProgressData(
+                            SimpleDownloadEntity.fromDownloadEntity(downloadEntity).toJson()
+                        )
+                    }
+                }
+            }
+            DownloadManager.getInstance().addObserver(mDownloadWatcher)
+        }
+    }
+
+    @JavascriptInterface
+    fun registerPackageChangesCallback(msg: Any, handler: CompletionHandler<Any>) {
+        PackageObserver.registerPackageChangeChangeListener(object : PackageObserver.PackageChangeListener {
+            override fun onChanged(data: EBPackage) {
+                handler.setProgressData(data.toJson())
+            }
+        })
+    }
+
+    @JavascriptInterface
+    fun startDownload(msg: Any) {
+        val gameEntity: GameEntity? = msg.toString().toObject()
+
+        if (gameEntity == null) {
+            ToastUtils.toast("下载异常，请稍后重试")
+            return
+        }
+
+        runOnUiThread {
+            // 用一个假的 view 来当 downloadView
+            val stubView = View(context)
+            DownloadItemUtils.setOnClickListener(
+                position = 0,
+                context = context,
+                downloadBtn = stubView,
+                gameEntity = gameEntity,
+                adapter = null,
+                entrance = "(网页活动)",
+                location = "",
+                traceEvent = null,
+                clickCallback = null,
+                refreshCallback = null,
+                allStateClickCallback = null
+            )
+
+            stubView.performClick()
+        }
+    }
+
+    @JavascriptInterface
+    fun resumeDownload(msg: Any) {
+        val url = msg.toString()
+
+        DownloadManager.getInstance().resumeDownload(url)
+    }
+
+    @JavascriptInterface
+    fun pauseDownload(msg: Any) {
+        val url = msg.toString()
+
+        DownloadManager.getInstance().pause(url)
+    }
+
+    @JavascriptInterface
+    fun shareText(event: Any) {
+        val textShareEvent = event.toString().toObject() ?: TextShareEvent()
+        if (textShareEvent.text.isNotEmpty() && textShareEvent.type.isNotEmpty()) {
+            val activity = CurrentActivityHolder.getCurrentActivity()
+            MessageShareUtils.getInstance(activity).shareTextFromWeb(activity, textShareEvent.text, textShareEvent.type)
+        }
+    }
+
+    private fun autoUnregisterDownloadObserverIfNeeded(fragment: Fragment?) {
+        fragment?.parentFragmentManager?.registerFragmentLifecycleCallbacks(
+            object : FragmentManager.FragmentLifecycleCallbacks() {
+                override fun onFragmentViewDestroyed(fm: FragmentManager, f: Fragment) {
+                    super.onFragmentViewDestroyed(fm, f)
+                    if (f === fragment) {
+                        fragment.parentFragmentManager.unregisterFragmentLifecycleCallbacks(this)
+
+                        if (mDownloadWatcher != null) {
+                            DownloadManager.getInstance().removeObserver(mDownloadWatcher)
+                        }
+                    }
+                }
+
+                override fun onFragmentResumed(fm: FragmentManager, f: Fragment) {
+                    super.onFragmentResumed(fm, f)
+
+                    if (f === fragment && mDownloadWatcher != null) {
+                        DownloadManager.getInstance().addObserver(mDownloadWatcher)
+                    }
+                }
+
+                override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
+                    super.onFragmentPaused(fm, f)
+
+                    if (f === fragment && mDownloadWatcher != null) {
+                        DownloadManager.getInstance().removeObserver(mDownloadWatcher)
+                    }
+                }
+            }, false
+        )
     }
 
     @Keep
-    internal data class ImageEvent(var imageList: ArrayList<String> = arrayListOf(), var position: Int = 0)
+    internal class ImageEvent(var imageList: ArrayList<String> = arrayListOf(), var position: Int = 0)
 
     @Keep
-    internal data class ImageShareEvent(var image: String = "", var type: String = "")
+    internal class ImageShareEvent(var image: String = "", var type: String = "")
 
     @Keep
-    internal data class InviteFriendsEvent(
+    internal class TextShareEvent(var text: String = "", var type: String = "")
+
+    @Keep
+    internal class InviteFriendsEvent(
         var type: String = "",
         var way: String = "",
         var url: String = "",
@@ -457,16 +636,48 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
     )
 
     @Keep
-    internal data class LogEvent(var jsonString: String = "", var logStore: String = "")
+    internal class LogEvent(var jsonString: String = "", var logStore: String = "")
 
     @Keep
-    internal data class BrowseTaskEvent(var timeout: String = "", var isFinished: String = "")
-
-    @Keep
-    data class GameActivityEvent(
+    class GameActivityEvent(
         var gameId: String = "",
         var activityTitle: String = "",
         var activityId: String = "",
         var platform: String = ""
     )
+
+    @Keep
+    class SimpleDownloadEntity(
+        var url: String = "",
+        var progress: Float = 0F,
+        var status: String = "" // DOWNLOADING, PAUSED, DOWNLOADED, ERROR, UNKNOWN
+    ) {
+        companion object {
+            fun fromDownloadEntity(downloadEntity: DownloadEntity): SimpleDownloadEntity {
+                val status: String = when (downloadEntity.status) {
+                    add,
+                    download,
+                    downloading -> "DOWNLOADING"
+
+                    done -> "DOWNLOADED"
+
+                    pause,
+                    resume,
+                    subscribe,
+                    waiting -> "PAUSED"
+
+                    cancel,
+                    delete -> "UNKNOWN"
+
+                    else -> "ERROR"
+                }
+
+                return SimpleDownloadEntity(
+                    url = VHelper.getOriginalUrl(downloadEntity.url),
+                    progress = downloadEntity.percent.toFloat(),
+                    status = status
+                )
+            }
+        }
+    }
 }

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

@@ -15,25 +15,29 @@ import com.gh.common.util.DirectUtils.directToGameVideo
 import com.gh.common.util.DirectUtils.directToLegacyVideoDetail
 import com.gh.common.util.DirectUtils.directToLinkPage
 import com.gh.common.util.DirectUtils.directToQa
+import com.gh.gamecenter.*
 import com.gh.gamecenter.core.utils.GsonUtils.gson
-import com.gh.gamecenter.LibaoDetailActivity
-import com.gh.gamecenter.MainActivity
-import com.gh.gamecenter.NewsDetailActivity
-import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.entity.CommunityEntity
 import com.gh.gamecenter.common.entity.LinkEntity
+import com.gh.gamecenter.common.eventbus.EBReuse
+import com.gh.gamecenter.common.entity.SimpleGameEntity
 import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.common.utils.DialogHelper
 import com.gh.gamecenter.common.utils.EnvHelper
 import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.entity.*
+import com.gh.gamecenter.eventbus.EBSkip
+import com.gh.gamecenter.fragment.MainWrapperFragment
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.utils.PlatformUtils
 import com.gh.gamecenter.gamecollection.publish.GameCollectionEditActivity
 import com.gh.gamecenter.qa.BbsType
 import com.gh.gamecenter.qa.video.publish.VideoPublishActivity
 import com.gh.gamecenter.subject.SubjectActivity
 import com.gh.gamecenter.video.detail.VideoDetailContainerViewModel
 import com.lightgame.utils.Utils
+import org.greenrobot.eventbus.EventBus
 import java.nio.charset.Charset
 
 object DefaultUrlHandler {
@@ -185,10 +189,12 @@ object DefaultUrlHandler {
                 EntranceConsts.HOST_USERHOME -> {
                     val position = uri.getQueryParameter("position")
                     val subtype = uri.getQueryParameter("sub_type") ?: ""
+                    val subGameType = uri.getQueryParameter("sub_game_type") ?: "game_collection"
                     DirectUtils.directToHomeActivity(
                         context,
                         id,
                         subtype,
+                        subGameType,
                         if (position.isNullOrEmpty()) -1 else position.toInt(),
                         entrance,
                         ""
@@ -260,21 +266,6 @@ object DefaultUrlHandler {
                 EntranceConsts.HOST_COLUMN -> {
                     DirectUtils.directToSubject(context, id, uri.getQueryParameter(EntranceConsts.KEY_NAME), entrance)
                 }
-                EntranceConsts.HOST_COMMUNITY_QUESTION_LABEL_DETAIL -> {
-                    val community = CommunityEntity()
-                    community.id = uri.getQueryParameter("community_id") ?: ""
-                    community.name = uri.getQueryParameter("community_name") ?: ""
-                    val tag = uri.getQueryParameter("tag") ?: ""
-                    DirectUtils.directAskColumnLabelDetail(context, tag, community, entrance, "")
-                }
-                EntranceConsts.HOST_COMMUNITY_COLUMN_DETAIL -> {
-                    val community = CommunityEntity()
-                    community.id = uri.getQueryParameter("community_id") ?: ""
-                    community.name = uri.getQueryParameter("community_name") ?: ""
-                    val columnId = uri.getQueryParameter("column_id") ?: ""
-                    DirectUtils.directAskColumnDetail(context, columnId, community, entrance, "")
-                }
-
                 EntranceConsts.HOST_BLOCK -> {
                     val name = uri.getQueryParameter("name")
                         ?: ""
@@ -490,6 +481,18 @@ object DefaultUrlHandler {
                     )
                 }
 
+                EntranceConsts.HOST_GAME_LIBRARY -> {
+                    DirectUtils.directToMainActivity(context)
+                    EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_GAME))
+                }
+
+                EntranceConsts.HOST_HOME_GAME_COLLECTION_SQUARE -> {
+                    DirectUtils.directToMainActivity(context)
+                    EventBus.getDefault()
+                        .post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_HOME))
+                    EventBus.getDefault().post(EBReuse(host))
+                }
+
                 else -> {
                     if (bringAppToFront) {
                         DirectUtils.directToMainActivity(context)

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

@@ -21,7 +21,7 @@ object FixedRateJobHelper {
     private const val TIME_PERIOD: Long = 600 * 1000L
     private const val LOGHUB_PERIOD: Long = 120 * 1000L
     private const val EXPOSURE_PERIOD: Long = 300 * 1000L
-    private const val REGION_SETTING_PERIOD: Long = 300 * 1000L
+    private const val REGION_SETTING_PERIOD: Long = 30 * 1000L
     private const val VIDEO_RECORD_PERIOD: Long = 60 * 1000L
 
     private const val DOWNLOAD_HEARTBEAT_PERIOD: Long = 60 * 1000L

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

@@ -3,7 +3,7 @@ package com.gh.common.chain
 import android.content.Context
 import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.core.utils.EmptyCallback
-import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.feature.entity.GameEntity
 
 class BrowserInstallHandler : ChainHandler() {
 

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

@@ -2,7 +2,7 @@ package com.gh.common.chain
 
 import android.content.Context
 import com.gh.common.dialog.CertificationDialog
-import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.feature.entity.GameEntity
 
 class CertificationHandler : ChainHandler() {
 

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

@@ -1,7 +1,7 @@
 package com.gh.common.chain
 
 import android.content.Context
-import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.feature.entity.GameEntity
 
 abstract class ChainHandler {
     private var next: ChainHandler? = null

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

@@ -3,7 +3,7 @@ package com.gh.common.chain
 import android.content.Context
 import com.gh.common.util.DialogUtils
 import com.gh.gamecenter.common.utils.safelyGetInRelease
-import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.feature.entity.GameEntity
 
 class CheckDownloadHandler : ChainHandler() {
 

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

@@ -3,7 +3,7 @@ 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.entity.GameEntity
+import com.gh.gamecenter.feature.entity.GameEntity
 
 class CheckStoragePermissionHandler : ChainHandler() {
 

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

@@ -4,7 +4,7 @@ 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.entity.GameEntity
+import com.gh.gamecenter.feature.entity.GameEntity
 
 class DownloadDialogHelperHandler : ChainHandler() {
 

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

@@ -2,7 +2,7 @@ package com.gh.common.chain
 
 import android.content.Context
 import androidx.appcompat.app.AppCompatActivity
-import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment
 
 class GamePermissionHandler : ChainHandler() {

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

@@ -2,7 +2,7 @@ package com.gh.common.chain
 
 import android.content.Context
 import com.gh.common.util.DialogUtils
-import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.feature.entity.GameEntity
 
 class OverseaDownloadHandler : ChainHandler() {
 

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

@@ -3,7 +3,7 @@ package com.gh.common.chain
 import android.content.Context
 import androidx.appcompat.app.AppCompatActivity
 import com.gh.common.dialog.PackageCheckDialogFragment
-import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.feature.entity.GameEntity
 
 class PackageCheckHandler : ChainHandler() {
 

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

@@ -3,7 +3,7 @@ package com.gh.common.chain
 import android.content.Context
 import com.gh.common.simulator.NewSimulatorGameManager
 import com.gh.common.simulator.SimulatorGameManager
-import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.feature.entity.GameEntity
 
 class UpdateNewSimulatorHandler: ChainHandler() {
 

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

@@ -1,7 +1,7 @@
 package com.gh.common.chain
 
 import android.content.Context
-import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.vspace.VHelper
 
 class ValidateVSpaceHandler : ChainHandler() {

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

@@ -4,7 +4,7 @@ import android.content.Context
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.DialogHelper
 import com.gh.gamecenter.common.utils.toResString
-import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.feature.entity.GameEntity
 
 class VersionNumberHandler : ChainHandler() {
 

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

@@ -12,7 +12,7 @@ import com.gh.common.util.AdHelper;
 import com.gh.common.util.PackageHelper;
 import com.gh.common.util.PackageUtils;
 import com.gh.gamecenter.BuildConfig;
-import com.gh.gamecenter.SuggestionActivity;
+import com.gh.gamecenter.common.constant.CommonConsts;
 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.eventbus.EBReuse;
 import com.gh.gamecenter.common.retrofit.BiResponse;
@@ -24,10 +24,10 @@ import com.gh.gamecenter.core.utils.SPUtils;
 import com.gh.gamecenter.entity.GameGuidePopupEntity;
 import com.gh.gamecenter.entity.NewApiSettingsEntity;
 import com.gh.gamecenter.entity.NewSettingsEntity;
-import com.gh.gamecenter.entity.NewsEntity;
-import com.gh.gamecenter.entity.SettingsEntity;
-import com.gh.gamecenter.entity.SimulatorEntity;
 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.retrofit.RetrofitManager;
 import com.gh.vspace.VHelper;
 import com.halo.assistant.HaloApp;
@@ -248,6 +248,14 @@ public class Config {
         }
     }
 
+    public static boolean getUserInterestedGame() {
+        if (mNewApiSettingsEntity != null) {
+            return mNewApiSettingsEntity.getUserInterestedGame();
+        } else {
+            return false;
+        }
+    }
+
     @Nullable
     public static NewSettingsEntity getNewSettingsEntity() {
         if (mNewSettingsEntity == null) {
@@ -346,7 +354,7 @@ public class Config {
 
                         // 意见反馈
                         SharedPreferences.Editor edit = getPreferences().edit();
-                        edit.putString(SuggestionActivity.SUGGESTION_HINT_TYPE,
+                        edit.putString(CommonConsts.SUGGESTION_HINT_TYPE,
                                 GsonUtils.toJson(response.getSuggestion()));
                         edit.apply();
 

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

@@ -21,7 +21,7 @@ import com.gh.gamecenter.R
 import com.gh.gamecenter.databinding.KaifuAddItemBinding
 import com.gh.gamecenter.databinding.LayoutAddKaifuPopupBinding
 import com.gh.gamecenter.databinding.LayoutPopupContainerBinding
-import com.gh.gamecenter.entity.ServerCalendarEntity
+import com.gh.gamecenter.feature.entity.ServerCalendarEntity
 import com.gh.gamecenter.servers.add.AddKaiFuPopupAdapter
 import java.text.SimpleDateFormat
 import java.util.*

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

@@ -31,7 +31,7 @@ import com.gh.common.chain.PackageCheckHandler;
 import com.gh.common.chain.ValidateVSpaceHandler;
 import com.gh.common.chain.VersionNumberHandler;
 import com.gh.common.constant.Config;
-import com.gh.common.exposure.ExposureEvent;
+import com.gh.gamecenter.feature.exposure.ExposureEvent;
 import com.gh.common.filter.RegionSetting;
 import com.gh.common.filter.RegionSettingHelper;
 import com.gh.common.history.HistoryHelper;
@@ -46,10 +46,11 @@ import com.gh.common.util.LogUtils;
 import com.gh.common.util.NewsUtils;
 import com.gh.common.util.PackageInstaller;
 import com.gh.common.util.PackageUtils;
-import com.gh.common.util.PlatformUtils;
+import com.gh.gamecenter.feature.utils.PlatformUtils;
 import com.gh.common.util.ReservationHelper;
-import com.gh.common.view.DownloadButton;
-import com.gh.common.view.GameIconView;
+import com.gh.gamecenter.feature.view.DownloadButton;
+import com.gh.gamecenter.feature.view.GameIconView;
+import com.gh.gamecenter.common.view.NoEllipsizeSpaceTextView;
 import com.gh.download.DownloadManager;
 import com.gh.download.dialog.DownloadDialog;
 import com.gh.gamecenter.DownloadManagerActivity;
@@ -65,17 +66,17 @@ import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.core.utils.MtaHelper;
 import com.gh.gamecenter.core.utils.NumberUtils;
 import com.gh.gamecenter.databinding.KaifuDetailItemRowBinding;
-import com.gh.gamecenter.entity.ApkEntity;
-import com.gh.gamecenter.entity.GameEntity;
+import com.gh.gamecenter.feature.entity.ApkEntity;
+import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.common.entity.LinkEntity;
-import com.gh.gamecenter.entity.PluginLocation;
-import com.gh.gamecenter.entity.ServerCalendarEntity;
-import com.gh.gamecenter.entity.TagStyleEntity;
-import com.gh.gamecenter.entity.TestEntity;
+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.common.eventbus.EBReuse;
 import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment;
 import com.gh.gamecenter.manager.PackagesManager;
-import com.gh.gamecenter.qa.entity.CommunityVideoEntity;
+import com.gh.gamecenter.feature.entity.CommunityVideoEntity;
 import com.gh.vspace.VDownloadManagerActivity;
 import com.gh.vspace.VHelper;
 import com.lightgame.download.DownloadEntity;
@@ -261,7 +262,7 @@ public class BindingAdapters {
 
     public static void setGameIcon(View view, GameEntity gameEntity) {
         if (gameEntity != null && view instanceof GameIconView) {
-            ((GameIconView) view).displayGameIcon(gameEntity.getIcon(), gameEntity.getIconSubscript());
+            ((GameIconView) view).displayGameIcon(gameEntity.getIcon(), gameEntity.getIconSubscript(), gameEntity.getIconFloat());
         }
     }
 
@@ -784,14 +785,23 @@ public class BindingAdapters {
         }
     }
 
-    public static void setGameName(TextView view, GameEntity game, boolean isShowPlatform, @Nullable Boolean isShowSuffix) {
+    public static void setGameName(NoEllipsizeSpaceTextView view, GameEntity game, boolean isShowPlatform, @Nullable Boolean isShowSuffix) {
         if (isShowSuffix == null) isShowSuffix = true; // 默认显示
+        String gameName;
         if (isShowPlatform && game.getApk().size() > 0) {
-            view.setText(String.format("%s - %s", !isShowSuffix ? game.getNameWithoutSuffix() : game.getName(),
+            gameName = String.format("%s - %s", !isShowSuffix ? game.getNameWithoutSuffix() : game.getName(),
                     PlatformUtils.getInstance(view.getContext()).getPlatformName(
-                            game.getApk().get(0).getPlatform())));
+                            game.getApk().get(0).getPlatform()));
+            if (!gameName.equals((String) view.getTag(R.string.tag_game_name_id))) {
+                view.setText(gameName);
+                view.setTag(R.string.tag_game_name_id, gameName);
+            }
         } else {
-            view.setText(!isShowSuffix ? game.getNameWithoutSuffix() : game.getName());
+            gameName = !isShowSuffix ? game.getNameWithoutSuffix() : game.getName();
+            if (gameName != null && !gameName.equals((String) view.getTag(R.string.tag_game_name_id))) {
+                view.setText(gameName);
+                view.setTag(R.string.tag_game_name_id, gameName);
+            }
         }
 
     }
@@ -842,7 +852,7 @@ public class BindingAdapters {
             int start = index;
             int end = start + tag.getName().length() + ((i != showCount - 1) ? 1 : 0);
             index = end;
-            span.setSpan(new ForegroundColorSpan(Color.parseColor("#" + tag.getColor())),
+            span.setSpan(new ForegroundColorSpan(ExtensionsKt.hexStringToIntColor("#" + tag.getColor(), Color.WHITE)),
                     start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         }
         view.setText(span);

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

@@ -24,9 +24,9 @@ import com.gh.gamecenter.common.callback.ConfirmListener
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.core.utils.GsonUtils
 import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.entity.AuthDialogEntity
-import com.gh.gamecenter.entity.AuthDialogLevel
-import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.feature.entity.AuthDialogEntity
+import com.gh.gamecenter.feature.entity.AuthDialogLevel
+import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.login.user.UserManager
 import com.google.gson.reflect.TypeToken
 import com.halo.assistant.fragment.user.UserInfoEditFragment

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

@@ -18,18 +18,17 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import com.facebook.drawee.view.SimpleDraweeView
-import com.gh.gamecenter.common.constant.Constants
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
-import com.gh.gamecenter.core.utils.GsonUtils
-import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.utils.ImageUtils
 import com.gh.gamecenter.common.utils.countDownTimer
 import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.common.utils.ImageUtils
+import com.gh.gamecenter.core.utils.GsonUtils
+import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.databinding.DialogDeviceRemindBinding
 import com.gh.gamecenter.entity.DeviceDialogEntity
-import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.setting.view.GameDownloadSettingFragment
+import com.gh.gamecenter.feature.entity.GameEntity
 import com.google.gson.reflect.TypeToken
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
@@ -53,7 +52,7 @@ class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val g
     private val dataWatcher = object : DataWatcher() {
         override fun onDataChanged(downloadEntity: DownloadEntity) {
             if (downloadEntity.status == DownloadStatus.done && downloadEntity.name == gameEntity.name) {
-                val autoInstall = SPUtils.getBoolean(GameDownloadSettingFragment.AUTO_INSTALL_SP_KEY, true)
+                val autoInstall = SPUtils.getBoolean(Constants.SP_AUTO_INSTALL, true)
                 if (autoInstall) {
                     dismiss()
                 }

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

@@ -16,7 +16,7 @@ import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.toColor
 import com.gh.gamecenter.R
 import com.gh.gamecenter.databinding.DialogGameOffServiceBinding
-import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.feature.entity.GameEntity
 
 // 游戏关闭下载弹窗
 class GameOffServiceDialogFragment : BaseDialogFragment() {

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

@@ -31,9 +31,9 @@ import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.core.utils.SpanBuilder
 import com.gh.gamecenter.databinding.FragmentPackageCheckBinding
 import com.gh.gamecenter.databinding.PackageCheckItemBinding
-import com.gh.gamecenter.entity.DetectionObjectEntity
-import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.entity.PackageDialogEntity
+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

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

@@ -15,7 +15,7 @@ import com.gh.gamecenter.R
 import com.gh.gamecenter.common.view.FixLinearLayoutManager
 import com.gh.gamecenter.databinding.DialogReserveBinding
 import com.gh.gamecenter.databinding.DialogReserveItemBinding
-import com.gh.gamecenter.entity.SimpleGameEntity
+import com.gh.gamecenter.common.entity.SimpleGameEntity
 import com.gh.gamecenter.mygame.MyGameActivity
 import com.lightgame.adapter.BaseRecyclerAdapter
 

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

@@ -4,6 +4,7 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.gh.gamecenter.feature.exposure.ExposureEvent
 import io.reactivex.functions.Consumer
 
 /**

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

@@ -5,6 +5,7 @@ import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.common.loghub.LoghubHelper
 import com.gh.gamecenter.common.utils.FixedSizeLinkedHashSet
 import com.gh.gamecenter.common.utils.toJson
+import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.lightgame.utils.Utils
 
 /**

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

@@ -1,5 +1,7 @@
 package com.gh.common.exposure
 
+import com.gh.gamecenter.feature.exposure.ExposureEvent
+
 object ExposureTraceUtils {
 
     fun appendTrace(event: ExposureEvent?): List<ExposureEvent> {

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

@@ -5,8 +5,10 @@ import com.g00fy2.versioncompare.Version
 import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.common.utils.FixedSizeLinkedHashSet
 import com.gh.gamecenter.common.utils.toObject
-import com.gh.gamecenter.entity.ApkEntity
-import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.feature.entity.ApkEntity
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.exposure.ExposureEvent
+import com.gh.gamecenter.feature.exposure.ExposureType
 import com.gh.gamecenter.manager.PackagesManager
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DownloadEntity
@@ -22,7 +24,7 @@ object ExposureUtils {
         traceEvent: ExposureEvent?,
         downloadType: DownloadType
     ): ExposureEvent {
-        val gameEntity = entity.clone()
+        val gameEntity = entity.copy()
         gameEntity.id = if (entity.id.contains(DownloadEntity.GAME_ID_DIVIDER)) {
             entity.id.split(DownloadEntity.GAME_ID_DIVIDER).toTypedArray()[0]
         } else {
@@ -49,11 +51,12 @@ object ExposureUtils {
         entity: GameEntity,
         platform: String?,
         trace: String?,
+        speed: Long,
         host: String? = "unknown",
         path: String? = "unknown",
         downloadType: DownloadType
     ) {
-        val gameEntity = entity.clone()
+        val gameEntity = entity.copy()
         gameEntity.platform = platform
         gameEntity.downloadCompleteType = downloadType.toString()
         val traceEvent = trace?.toObject<ExposureEvent>()
@@ -75,6 +78,8 @@ object ExposureUtils {
         )
         exposureEvent.payload.host = host
         exposureEvent.payload.path = path
+        exposureEvent.payload.speed = speed
+
         ExposureManager.log(exposureEvent)
         ExposureManager.commitSavedExposureEvents(forcedUpload = true)
     }

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

@@ -1,5 +1,7 @@
 package com.gh.common.exposure
 
+import com.gh.gamecenter.feature.exposure.ExposureEvent
+
 /**
  *  统计曝光的列表的 adapter 需要实现这个接口
  */

app/src/main/java/com/gh/common/exposure/time/TimeUtil.kt

@@ -1,15 +0,0 @@
-package com.gh.common.exposure.time
-
-import com.gh.common.FixedRateJobHelper
-
-object TimeUtil {
-
-    fun currentTimeMillis(): Long {
-        return FixedRateJobHelper.timeDeltaBetweenServerAndClient + System.currentTimeMillis()
-    }
-
-    fun currentTime(): Int {
-        return ((FixedRateJobHelper.timeDeltaBetweenServerAndClient + System.currentTimeMillis()) / 1000).toInt()
-    }
-
-}

app/src/main/java/com/gh/common/filter/RegionSetting.kt

@@ -1,10 +1,11 @@
 package com.gh.common.filter
 
 import androidx.annotation.Keep
+import com.gh.gamecenter.feature.entity.IpInfo
 import com.google.gson.annotations.SerializedName
 
 @Keep
-data class RegionSetting(
+class RegionSetting(
     @SerializedName("game_mirror")
     var mirrorGameIdSet: HashSet<String>,
     @SerializedName("game_block")
@@ -14,11 +15,13 @@ data class RegionSetting(
     @SerializedName("game_h5_download")
     var gameH5DownloadList: List<GameH5Download>,
     @SerializedName("game_special_download")
-    var gameSpecialDownloadInfoList: List<GameSpecialDownloadInfo>
+    var gameSpecialDownloadInfoList: List<GameSpecialDownloadInfo>,
+    @SerializedName("ip_info")
+    var ipInfo: IpInfo? = null
 ) {
 
     @Keep
-    data class ChannelControl(
+    class ChannelControl(
         @SerializedName("game_category")
         var gameCategory: String,
         @SerializedName("effect")
@@ -26,7 +29,7 @@ data class RegionSetting(
     )
 
     @Keep
-    data class GameH5Download(
+    class GameH5Download(
         @SerializedName("game_id")
         var gameId: String,// 游戏id
         @SerializedName("h5_link")
@@ -37,7 +40,7 @@ data class RegionSetting(
         var buttonText: String,// 按钮文案
     )
 
-    data class GameSpecialDownloadInfo(
+    class GameSpecialDownloadInfo(
         @SerializedName("game_id")
         var gameId: String = "",
         @SerializedName("bbs_id")

app/src/main/java/com/gh/common/filter/RegionSettingHelper.kt

@@ -1,14 +1,16 @@
 package com.gh.common.filter
 
 import android.annotation.SuppressLint
+import com.gh.gamecenter.R
 import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.utils.debounceActionWithInterval
 import com.gh.gamecenter.common.utils.toJson
 import com.gh.gamecenter.common.utils.toObject
-import com.gh.gamecenter.R
-import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.common.retrofit.BiResponse
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.entity.IpInfo
+import com.gh.gamecenter.feature.entity.SimpleGame
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import io.reactivex.functions.Function
@@ -21,8 +23,10 @@ object RegionSettingHelper {
     private var mDisplayMirrorIfoGameIdSet: HashSet<String>? = hashSetOf()
     private var mGameH5DownloadList: List<RegionSetting.GameH5Download>? = listOf()
     private var mGameSpecialDownloadInfoList: List<RegionSetting.GameSpecialDownloadInfo>? = listOf()
+    private var mIpInfo: IpInfo? = null
 
     private const val SP_SETTING = "region_setting"
+    const val SP_SETTING_FAILURE = "region_setting_failure"
 
     fun shouldThisGameDisplayMirrorInfo(gameId: String): Boolean {
         return mDisplayMirrorIfoGameIdSet?.contains(gameId) ?: false
@@ -39,6 +43,8 @@ object RegionSettingHelper {
     @JvmStatic
     fun getGameSpecialDownloadInfo(gameId: String) = mGameSpecialDownloadInfoList?.find { it.gameId == gameId }
 
+    fun getIpInfo(): IpInfo? = mIpInfo
+
     @JvmStatic
     fun filterGame(list: List<GameEntity>?): ArrayList<GameEntity> {
         if (list == null) return arrayListOf()
@@ -52,6 +58,19 @@ object RegionSettingHelper {
         return listCopy
     }
 
+    @JvmStatic
+    fun filterSimpleGame(list: List<SimpleGame>?): ArrayList<SimpleGame> {
+        if (list == null) return arrayListOf()
+
+        if (mFilterGameIdSet?.isEmpty() == true) {
+            if (list is ArrayList) return list
+        }
+
+        val listCopy: ArrayList<SimpleGame> = if (list is ArrayList) list else ArrayList(list)
+        listCopy.removeAll { mFilterGameIdSet?.contains(it.id) ?: false }
+        return listCopy
+    }
+
     @JvmField
     var filterGame = Function { list: List<GameEntity> ->
         filterGame(list)
@@ -88,9 +107,10 @@ object RegionSettingHelper {
                     }
 
                     override fun onFailure(exception: Exception) {
-                        SPUtils.getString(SP_SETTING)?.toObject<RegionSetting>()?.let {
+                        SPUtils.getString(SP_SETTING).toObject<RegionSetting>()?.let {
                             updateSettingsInMemory(it)
                         }
+                        SPUtils.setBoolean(SP_SETTING_FAILURE, true)
                     }
                 })
         }
@@ -102,6 +122,7 @@ object RegionSettingHelper {
         mChannelControl = data.channelControl
         mGameH5DownloadList = data.gameH5DownloadList
         mGameSpecialDownloadInfoList = data.gameSpecialDownloadInfoList
+        mIpInfo = data.ipInfo
     }
 
     /**

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

@@ -9,16 +9,17 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 import com.gh.gamecenter.entity.GamesCollectionEntity
 import com.gh.gamecenter.entity.HistoryGameEntity
 import com.gh.gamecenter.entity.MyVideoEntity
-import com.gh.gamecenter.entity.NewsEntity
-import com.gh.gamecenter.qa.entity.AnswerEntity
-import com.gh.gamecenter.qa.entity.ArticleEntity
+import com.gh.gamecenter.feature.entity.NewsEntity
+import com.gh.gamecenter.feature.entity.AnswerEntity
+import com.gh.gamecenter.feature.entity.ArticleEntity
+import com.gh.gamecenter.feature.room.converter.*
 import com.gh.gamecenter.room.converter.*
 import com.gh.gamecenter.room.dao.*
 import com.halo.assistant.HaloApp
 
 @Database(
     entities = [AnswerEntity::class, ArticleEntity::class, NewsEntity::class, HistoryGameEntity::class, MyVideoEntity::class, GamesCollectionEntity::class],
-    version = 12,
+    version = 13,
     exportSchema = false
 )
 @TypeConverters(
@@ -39,7 +40,8 @@ import com.halo.assistant.HaloApp
     MeConverter::class,
     SimpleGameListConverter::class,
     TagInfoListConverter::class,
-    ActivityLabelListConverter::class
+    ActivityLabelListConverter::class,
+    IconFloatConverter::class
 )
 
 abstract class HistoryDatabase : RoomDatabase() {
@@ -135,6 +137,12 @@ abstract class HistoryDatabase : RoomDatabase() {
             }
         }
 
+        val MIGRATION_12_13: Migration = object : Migration(12, 13) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("Alter TABLE HistoryGameEntity add iconFloat TEXT")
+            }
+        }
+
         val instance by lazy {
             Room.databaseBuilder(
                 HaloApp.getInstance().application,
@@ -151,6 +159,7 @@ abstract class HistoryDatabase : RoomDatabase() {
                 .addMigrations(MIGRATION_9_10)
                 .addMigrations(MIGRATION_10_11)
                 .addMigrations(MIGRATION_11_12)
+                .addMigrations(MIGRATION_12_13)
                 .build()
         }
     }

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

@@ -6,10 +6,12 @@ import com.gh.gamecenter.common.utils.removeVideoContent
 import com.gh.gamecenter.common.utils.tryCatchInRelease
 import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.entity.*
+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.qa.entity.AnswerDetailEntity
-import com.gh.gamecenter.qa.entity.AnswerEntity
 import com.gh.gamecenter.qa.entity.ArticleDetailEntity
-import com.gh.gamecenter.qa.entity.ArticleEntity
 
 object HistoryHelper {
 
@@ -54,6 +56,7 @@ object HistoryHelper {
         historyGame.des = ""
         historyGame.icon = updateEntity.rawIcon ?: updateEntity.icon
         historyGame.iconSubscript = updateEntity.iconSubscript
+        historyGame.iconFloat = updateEntity.iconFloat
         historyGame.name = updateEntity.name
         historyGame.tagStyle = updateEntity.tagStyle
         return historyGame
@@ -68,6 +71,7 @@ object HistoryHelper {
         historyGame.des = gameEntity.des
         historyGame.icon = gameEntity.rawIcon ?: gameEntity.icon
         historyGame.iconSubscript = gameEntity.iconSubscript
+        historyGame.iconFloat = gameEntity.iconFloat
         historyGame.name = gameEntity.name
         historyGame.tagStyle = gameEntity.tagStyle
         historyGame.tag = gameEntity.getTag()

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

@@ -0,0 +1,19 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.AdHelper
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.feature.entity.SettingsEntity
+import com.gh.gamecenter.feature.provider.IAdHelperProvider
+
+@Route(path = RouteConsts.provider.adHelper, name = "AdHelper暴露服务")
+class AdHelperProviderImpl : IAdHelperProvider {
+    override fun getSuggestionFunctionAd(): SettingsEntity.AD? {
+        return AdHelper.getAd(AdHelper.LOCATION_SUGGESTION_FUNCTION)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

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

@@ -5,6 +5,7 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IAppProvider
+import com.gh.gamecenter.core.provider.IFlavorProvider
 import com.halo.assistant.HaloApp
 
 @Route(path = RouteConsts.provider.app, name = "Application暴露服务")
@@ -56,4 +57,16 @@ class AppProviderImpl : IAppProvider {
     override fun isUserAcceptPrivacyPolicy(context: Context): Boolean {
         return HaloApp.isUserAcceptPrivacyPolicy(context)
     }
+
+    override fun put(key: String, any: Any) {
+        HaloApp.put(key, any)
+    }
+
+    override fun get(key: String, isRemove: Boolean): Any? {
+        return HaloApp.get(key, isRemove)
+    }
+
+    override fun getFlavorProvider(): IFlavorProvider {
+        return HaloApp.getInstance().flavorProvider
+    }
 }

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

@@ -0,0 +1,30 @@
+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.databind.BindingAdapters
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.common.view.NoEllipsizeSpaceTextView
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.provider.IBindingAdaptersProvider
+
+@Route(path = RouteConsts.provider.bindingAdapters, name = "BindingAdapters暴露服务")
+class BindingAdaptersProviderImpl : IBindingAdaptersProvider {
+    override fun setGameName(
+        view: NoEllipsizeSpaceTextView,
+        game: GameEntity,
+        isShowPlatform: Boolean,
+        isShowSuffix: Boolean
+    ) {
+        BindingAdapters.setGameName(view, game, isShowPlatform, isShowSuffix)
+    }
+
+    override fun setGameTags(layout: LinearLayout, gameEntity: GameEntity) {
+        BindingAdapters.setGameTags(layout, gameEntity)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

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

@@ -60,6 +60,14 @@ class ConfigProviderImpl : IConfigProvider {
         return Config.getSettings()?.support?.qq ?: ""
     }
 
+    override fun getQQun(): String {
+        return Config.getSettings()?.support?.qQun ?: ""
+    }
+
+    override fun getQQunKey(): String {
+        return Config.getSettings()?.support?.qQunKey ?: ""
+    }
+
     override fun getQuickLoginAppId(): String {
         return Config.QUICK_LOGIN_APPID
     }
@@ -76,6 +84,10 @@ class ConfigProviderImpl : IConfigProvider {
         return Config.getNightModeSetting()?.setting ?: false
     }
 
+    override fun isShowPlugin(gameId: String): Boolean {
+        return Config.isShowPlugin(gameId)
+    }
+
     override fun init(context: Context?) {
         // Do nothing
     }

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

@@ -25,23 +25,6 @@ class DialogUtilsProviderImpl : IDialogUtilsProvider {
 
     override fun showWaitDialog(context: Context, string: String): Dialog = DialogUtils.showWaitDialog(context, string)
 
-    override fun showForceDialog(
-        context: Context,
-        title: String,
-        message: CharSequence,
-        positive: String,
-        negative: String,
-        confirm: () -> Unit,
-        cancel: () -> Unit
-    ) {
-        DialogUtils.showForceDialog(context, title, message, positive, negative,
-            { confirm.invoke() }, object :CancelListener{
-            override fun onCancel() {
-                cancel.invoke()
-            }
-        })
-    }
-
     override fun showUsageStatsDialog(context: Context, confirm: () -> Unit, cancel: () -> Unit) {
         DialogUtils.showUsageStatsDialog(context,
             { confirm.invoke() }, object :CancelListener{

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

@@ -57,6 +57,18 @@ class DirectProviderImpl : IDirectProvider {
         DirectUtils.directToSuggestion(context, diagnosis = diagnosis)
     }
 
+    override fun directToQa(context: Context, text: String?, id: String) {
+        DirectUtils.directToQa(context, text, id)
+    }
+
+    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 init(context: Context?) {
         // Do nothing
     }

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

@@ -0,0 +1,18 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.FixedRateJobHelper
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IFixedRateJobHelperProvider
+
+@Route(path = RouteConsts.provider.fixedRateJobHelper, name = "FixedRateJobHelper暴露服务")
+class FixedRateJobHelperProviderImpl : IFixedRateJobHelperProvider {
+    override fun getTimeDeltaBetweenServerAndClient(): Long {
+        return FixedRateJobHelper.timeDeltaBetweenServerAndClient
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

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

@@ -0,0 +1,46 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.gamecenter.GameDetailActivity
+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.IGameDetailProvider
+
+@Route(path = RouteConsts.provider.gameDetail, name = "GameDetailActivity暴露服务")
+class GameDetailProviderImpl : IGameDetailProvider {
+    override fun startGameDetailActivity(
+        context: Context,
+        gameId: String,
+        entrance: String?,
+        traceEvent: ExposureEvent?
+    ) {
+        GameDetailActivity.startGameDetailActivity(context, gameId, entrance, traceEvent)
+    }
+    override fun startGameDetailActivity(
+        context: Context,
+        gameEntity: GameEntity?,
+        entrance: String,
+        defaultTab: Int,
+        isSkipGameComment: Boolean,
+        scrollToLibao: Boolean,
+        scrollToServer: Boolean,
+        traceEvent: ExposureEvent?
+    ) {
+        GameDetailActivity.startGameDetailActivity(
+            context,
+            gameEntity,
+            entrance,
+            defaultTab,
+            isSkipGameComment,
+            scrollToLibao,
+            scrollToServer,
+            traceEvent
+        )
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

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

@@ -3,13 +3,13 @@ package com.gh.common.provider
 import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.filter.RegionSettingHelper
-import com.gh.common.util.ApkActiveUtils
+import com.gh.gamecenter.feature.utils.ApkActiveUtils
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.utils.countOccurrences
 import com.gh.gamecenter.core.provider.IHandleGameResponseProvider
-import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.feature.entity.GameEntity
 
 @Route(path = RouteConsts.provider.handleGameResponse, name = "处理游戏类型返回")
 class HandleGameResponseProviderImpl : IHandleGameResponseProvider {

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

@@ -5,6 +5,8 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.DirectUtils
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.entity.LinkEntity
+import com.gh.gamecenter.common.entity.SimpleGameEntity
+import com.gh.gamecenter.common.entity.SuggestType
 import com.gh.gamecenter.common.provider.ILinkDirectUtilsProvider
 
 @Route(path = RouteConsts.provider.linkDirectUtils, name = "DirectUtils暴露服务，主要是暴露directToLinkPage方法")
@@ -19,6 +21,35 @@ class LinkDirectUtilsProviderImpl : ILinkDirectUtilsProvider {
         DirectUtils.directToLinkPage(context, linkEntity, entrance, path)
     }
 
+    override fun directToSuggestion(context: Context, type: SuggestType, requestCode: Int?) {
+        DirectUtils.directToSuggestion(context, type, requestCode)
+    }
+
+    override fun directToSuggestion(
+        context: Context,
+        type: SuggestType,
+        suggestHintType: String?,
+        content: String?,
+        isQaFeedback: Boolean,
+        qaContentId: String
+    ) {
+        DirectUtils.directToSuggestion(context, type, suggestHintType, content, isQaFeedback, qaContentId)
+    }
+
+    override fun directToSuggestion(
+        context: Context,
+        type: SuggestType,
+        suggestHintType: String?,
+        content: String?,
+        game: SimpleGameEntity,
+        platform: String
+    ) {
+        DirectUtils.directToSuggestion(context, type, suggestHintType, content, game, platform)
+    }
+
+    override fun directToSuggestion(context: Context, type: SuggestType, hiddenHint: String) {
+        DirectUtils.directToSuggestion(context, type, hiddenHint)
+    }
 
     override fun init(context: Context?) {
         // Do nothing

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

@@ -1,10 +1,8 @@
 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.MainActivity
-import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IMainProvider
 

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

@@ -0,0 +1,18 @@
+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.IPackagesManagerProvider
+import com.gh.gamecenter.manager.PackagesManager
+
+@Route(path = RouteConsts.provider.packagesManager, name = "PackagesManager暴露服务")
+class PackagesManagerProviderImpl: IPackagesManagerProvider {
+    override fun isCanPluggable(gameId: String?, packageName: String?): Boolean {
+        return PackagesManager.isCanPluggable(gameId, packageName)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

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

@@ -0,0 +1,32 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.filter.RegionSettingHelper
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.entity.IpInfo
+import com.gh.gamecenter.feature.provider.IRegionSettingHelperProvider
+
+@Route(path = RouteConsts.provider.regionSettingHelper, name = "RegionSettingHelper暴露服务")
+class RegionSettingHelperProviderImpl : IRegionSettingHelperProvider {
+    override fun shouldThisGameDisplayMirrorInfo(gameId: String): Boolean {
+        return RegionSettingHelper.shouldThisGameDisplayMirrorInfo(gameId)
+    }
+
+    override fun shouldThisGameShowSpecialDownload(gameId: String): Boolean {
+        return RegionSettingHelper.shouldThisGameShowSpecialDownload(gameId)
+    }
+
+    override fun filterGame(list: List<GameEntity>): ArrayList<GameEntity> {
+        return RegionSettingHelper.filterGame(list)
+    }
+
+    override fun getIpInfo(): IpInfo? {
+        return RegionSettingHelper.getIpInfo()
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

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

@@ -2,7 +2,7 @@ package com.gh.common.provider
 
 import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.common.exposure.time.TimeUtil
+import com.gh.gamecenter.feature.exposure.time.TimeUtil
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.ITimeUtilProvider
 

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

@@ -5,7 +5,6 @@ import android.os.Build
 import androidx.annotation.RequiresApi
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.UsageStatsHelper
-import com.gh.common.util.WechatBindHelper
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IUsageStatsHelperProvider
 

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

@@ -0,0 +1,26 @@
+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.IVHelperProvider
+import com.gh.vspace.VHelper
+
+@Route(path = RouteConsts.provider.vhelper, name = "VHelper暴露服务")
+class VHelperProviderImpl: IVHelperProvider {
+    override fun getPlatformV(): String {
+        return VHelper.PLATFORM_V
+    }
+
+    override fun getVUrl(originUrl: String?): String {
+        return VHelper.getVUrl(originUrl)
+    }
+
+    override fun isVGameOn(): Boolean {
+        return VHelper.isVGameOn()
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

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

@@ -25,6 +25,16 @@ class WebProviderImpl : IWebProvider {
         return WebActivity.getSecurityCertificationIntent(context)
     }
 
+    override fun getQAIntent(
+        context: Context?,
+        url: String?,
+        title: String?,
+        isWebPageHandleBackPressed: Boolean,
+        qaType: Int
+    ): Intent {
+        return WebActivity.getQAIntent(context, url, title, isWebPageHandleBackPressed, qaType)
+    }
+
     override fun init(context: Context?) {
         // Do nothing
     }

app/src/main/java/com/gh/common/repository/RemenkapaiRepository.kt

@@ -1,57 +0,0 @@
-package com.gh.common.repository
-
-import com.gh.common.filter.RegionSettingHelper
-import com.gh.common.util.ApkActiveUtils
-import com.gh.gamecenter.core.utils.RandomUtils
-import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.retrofit.RetrofitManager
-import io.reactivex.Observable
-
-// 热门卡牌的仓库
-object RemenkapaiRepository {
-
-    var remenkapaiList = arrayListOf<GameEntity>()
-
-    @JvmStatic
-    fun getRemenkapai(size: Int): Observable<List<GameEntity>> {
-        return if (remenkapaiList.isEmpty()) {
-            RetrofitManager.getInstance().api.remenkapai
-                .map(RegionSettingHelper.filterGame)
-                .map { gameList -> filterEntityWithoutApk(gameList) }
-                .map { pickRandomSizeEntity(size) }
-                .map(ApkActiveUtils.filterMapperList)
-        } else {
-            Observable.create { emitter -> emitter.onNext(pickRandomSizeEntity(size)) }
-        }
-    }
-
-    /**
-     * 选择随机数量的热门卡牌
-     */
-    private fun pickRandomSizeEntity(size: Int): List<GameEntity> {
-        if (size > remenkapaiList.size) return remenkapaiList
-
-        val randomGameList = arrayListOf<GameEntity>()
-        val randomArray = RandomUtils.getRandomArray(size, remenkapaiList.size)
-        for (i in randomArray) {
-            randomGameList.add(remenkapaiList[i])
-        }
-        return randomGameList
-    }
-
-    /**
-     * 过滤没有 Apk 的实体
-     */
-    private fun filterEntityWithoutApk(gameList: List<GameEntity>): List<GameEntity> {
-        val realGameList = arrayListOf<GameEntity>()
-        for (gameEntity in gameList) {
-            val apk = gameEntity.getApk()
-            if (apk.size != 0) {
-                realGameList.add(gameEntity)
-            }
-        }
-        remenkapaiList = realGameList
-        return remenkapaiList
-    }
-
-}

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

@@ -7,12 +7,9 @@ import android.content.Intent
 import android.graphics.Bitmap
 import android.view.Gravity
 import androidx.core.content.FileProvider
-import com.g00fy2.versioncompare.Version
 import com.gh.common.constant.Config
-import com.gh.common.util.DownloadItemUtils
 import com.gh.common.util.LogUtils
 import com.gh.common.util.NewFlatLogUtils
-import com.gh.common.util.PackageUtils
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.*
@@ -20,7 +17,7 @@ import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.core.utils.TimeUtils
 import com.gh.gamecenter.core.utils.ToastUtils
-import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.feature.entity.GameEntity
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DownloadEntity
 import com.lightgame.utils.AppManager

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

@@ -8,7 +8,6 @@ import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
-import com.g00fy2.versioncompare.Version
 import com.gh.common.util.LogUtils
 import com.gh.common.util.NewFlatLogUtils
 import com.gh.common.util.PackageInstaller
@@ -20,8 +19,8 @@ import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.AppExecutor.uiExecutor
 import com.gh.gamecenter.core.utils.*
-import com.gh.gamecenter.entity.ApkEntity
-import com.gh.gamecenter.entity.SimulatorEntity
+import com.gh.gamecenter.feature.entity.ApkEntity
+import com.gh.gamecenter.feature.entity.SimulatorEntity
 import com.gh.gamecenter.entity.TrackableEntity
 import com.halo.assistant.HaloApp
 import com.lightgame.download.*

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

@@ -8,7 +8,7 @@ import android.graphics.Bitmap
 import android.net.Uri
 import android.text.TextUtils
 import com.gh.common.constant.Config
-import com.gh.common.util.ApkActiveUtils
+import com.gh.gamecenter.feature.utils.ApkActiveUtils
 import com.gh.common.util.LogUtils
 import com.gh.common.util.PackageUtils
 import com.gh.download.DownloadManager
@@ -22,8 +22,8 @@ import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.core.utils.TimeUtils
 import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.core.utils.UrlFilterUtils
-import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.entity.SimulatorGameRecordEntity
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.entity.SimulatorGameRecordEntity
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.room.AppDatabase

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

@@ -4,25 +4,17 @@ import android.net.Uri
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.EnvHelper
-import com.gh.gamecenter.common.utils.tryWithDefaultCatch
-import com.gh.gamecenter.core.GHThreadFactory
-import java.util.concurrent.ExecutorService
-import java.util.concurrent.Executors
 
 /**
  * 活动相关数据统计辅助类
  */
 object ActivityCountHelper {
 
-    private val ACTIVITY_URL_COMMON_PREF =
-        if (EnvHelper.isDevEnv) Constants.ACTIVITY_DETAIL_ADDRESS_DEV else Constants.ACTIVITY_DETAIL_ADDRESS
-    private var mStayTimeCount = 0
-    private var mIsStayTimeCountEnabled = false
-    private var mStayTimeArray = arrayOf(5, 10, 20, 40, 80, 160)
     private const val MAX_STAY_TIME = 320
-    private val mThreadService: ExecutorService by lazy {
-        Executors.newSingleThreadExecutor(GHThreadFactory("STAY_TIME_THREAD"))
+    private val ACTIVITY_URL_COMMON_PREF by lazy {
+        if (EnvHelper.isDevEnv) Constants.ACTIVITY_DETAIL_ADDRESS_DEV else Constants.ACTIVITY_DETAIL_ADDRESS
     }
+    private var mStayTimeArray = arrayOf(5, 10, 20, 40, 80, 160)
 
     @JvmStatic
     fun postActivityPageEnter(url: String?, entrance: String) {
@@ -45,34 +37,20 @@ object ActivityCountHelper {
         }
     }
 
-    fun startCountStayTime(url: String) {
+    fun handleStayTime(url: String, stayTime: Int) {
         if (url.contains(ACTIVITY_URL_COMMON_PREF)) {
             val uri = Uri.parse(url)
             val activityId = uri.getQueryParameter("id") ?: return
-            mIsStayTimeCountEnabled = true
-            mThreadService.execute {
-                while (mIsStayTimeCountEnabled) {
-                    tryWithDefaultCatch {
-                        mStayTimeCount++
-                        when {
-                            mStayTimeCount % MAX_STAY_TIME == 0 -> NewFlatLogUtils.logActivityPageView(
-                                MAX_STAY_TIME,
-                                activityId
-                            )
-                            mStayTimeArray.contains(mStayTimeCount) -> NewFlatLogUtils.logActivityPageView(
-                                mStayTimeCount,
-                                activityId
-                            )
-                        }
-                    }
-                    Thread.sleep(1000)
-                }
+            when {
+                stayTime % MAX_STAY_TIME == 0 -> NewFlatLogUtils.logActivityPageView(
+                    MAX_STAY_TIME,
+                    activityId
+                )
+                mStayTimeArray.contains(stayTime) -> NewFlatLogUtils.logActivityPageView(
+                    stayTime,
+                    activityId
+                )
             }
         }
     }
-
-    fun endCountStayTime() {
-        mIsStayTimeCountEnabled = false
-        mStayTimeCount = 0
-    }
 }

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

@@ -6,8 +6,8 @@ import com.gh.gamecenter.common.utils.ImageUtils
 import com.gh.gamecenter.common.utils.observableToMain
 import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.entity.NewApiSettingsEntity
-import com.gh.gamecenter.entity.SettingsEntity
 import com.gh.gamecenter.entity.StartupAdEntity
+import com.gh.gamecenter.feature.entity.SettingsEntity
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 

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

@@ -14,6 +14,7 @@ import com.gh.gamecenter.common.utils.DialogHelper
 import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.roundTo
 import com.gh.gamecenter.common.utils.toResString
+import com.gh.gamecenter.core.runOnUiThread
 import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.databinding.DialogArchiveLoadingBinding
@@ -133,10 +134,12 @@ object ArchiveDownloadButtonHelper {
                 .subscribe()
 
             VArchiveHelper.applyGameArchive(context, packageName, this) { packageName, isSuccess ->
-                if (isSuccess) {
-                    VHelper.launch(context, packageName)
-                } else {
-                    ToastUtils.toast(R.string.archive_apply_fail.toResString())
+                runOnUiThread {
+                    if (isSuccess) {
+                        VHelper.launch(context, packageName)
+                    } else {
+                        ToastUtils.toast(R.string.archive_apply_fail.toResString())
+                    }
                 }
             }
         }

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

@@ -9,19 +9,19 @@ import android.view.View
 import android.view.Window
 import androidx.core.widget.doOnTextChanged
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.common.json.json
-import com.gh.gamecenter.common.view.VerticalItemDecoration
 import com.gh.gamecenter.R
-import com.gh.gamecenter.SuggestionActivity
 import com.gh.gamecenter.adapter.ReportReasonAdapter
-import com.gh.gamecenter.core.utils.ToastUtils
+import com.gh.gamecenter.common.constant.CommonConsts
+import com.gh.gamecenter.common.json.json
+import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.utils.toColor
 import com.gh.gamecenter.common.utils.toObject
 import com.gh.gamecenter.common.utils.toRequestBody
+import com.gh.gamecenter.common.view.VerticalItemDecoration
+import com.gh.gamecenter.core.utils.CurrentActivityHolder
+import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.databinding.DialogReportReasonBinding
-import com.gh.gamecenter.entity.SettingsEntity
-import com.gh.gamecenter.common.retrofit.BiResponse
+import com.gh.gamecenter.feature.entity.SettingsEntity
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -35,7 +35,7 @@ object BbsReportHelper {
     fun showReportDialog(contentId: String) {
         val sp = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance())
         val suggestion: SettingsEntity.Suggestion? =
-            sp.getString(SuggestionActivity.SUGGESTION_HINT_TYPE, null)?.toObject()
+            sp.getString(CommonConsts.SUGGESTION_HINT_TYPE, null)?.toObject()
         val reportList = suggestion?.report ?: return
 
         CurrentActivityHolder.getCurrentActivity()?.apply {

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

@@ -1,131 +0,0 @@
-package com.gh.common.util
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.app.Application
-import android.os.Bundle
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.core.GHThreadFactory
-import com.gh.gamecenter.MainActivity
-import com.gh.gamecenter.core.utils.ToastUtils
-import com.gh.gamecenter.common.utils.isPublishEnv
-import com.gh.gamecenter.common.utils.tryWithDefaultCatch
-import com.gh.gamecenter.forum.detail.ForumDetailActivity
-import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity
-import com.gh.gamecenter.qa.comment.CommentActivity
-import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity
-import com.gh.gamecenter.qa.video.detail.ForumVideoDetailActivity
-import com.gh.gamecenter.common.retrofit.BiResponse
-import com.gh.gamecenter.retrofit.RetrofitManager
-import com.halo.assistant.HaloApp
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
-import okhttp3.ResponseBody
-import java.util.concurrent.ExecutorService
-import java.util.concurrent.Executors
-
-object BbsStayTimeHelper {
-
-    private var mStayTimeCount = 0
-    private var mIsStayTimeCountEnabled = false // 论坛停留时间统计是否开启
-    private var mStayTimeTimeout = 30
-    private var mIsStayTimeCountValid = false // 论坛停留时间统计是否有效
-
-    const val IS_BBS_CONTENT_VISIBLE = "is_bbs_content_visible"
-
-    private val mThreadService: ExecutorService by lazy {
-        Executors.newSingleThreadExecutor(GHThreadFactory("STAY_TIME_THREAD"))
-    }
-
-    private val mActivityLifecycleCallbacks by lazy {
-        object : Application.ActivityLifecycleCallbacks {
-            override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {}
-            override fun onActivityStopped(activity: Activity) {}
-            override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
-            override fun onActivityDestroyed(activity: Activity) {}
-            override fun onActivityStarted(activity: Activity) {}
-
-            override fun onActivityResumed(activity: Activity) {
-                if (isTopActivityBbsRelated(activity) && mIsStayTimeCountEnabled) {
-                    resumeTimeCount()
-                }
-            }
-
-            override fun onActivityPaused(activity: Activity) {
-                if (isTopActivityBbsRelated(activity) && mIsStayTimeCountEnabled) {
-                    pauseTimeCount()
-                }
-            }
-        }
-    }
-
-    fun enableStayTimeCount(timeout: Int) {
-        mIsStayTimeCountEnabled = true
-        mStayTimeTimeout = timeout
-
-        resumeTimeCount()
-
-        HaloApp.getInstance().registerActivityLifecycleCallbacks(mActivityLifecycleCallbacks)
-    }
-
-    fun disableStayTimeCount() {
-        mIsStayTimeCountEnabled = false
-        mStayTimeCount = 0
-
-        HaloApp.getInstance().unregisterActivityLifecycleCallbacks(mActivityLifecycleCallbacks)
-    }
-
-    fun resumeTimeCount() {
-        if (!mIsStayTimeCountEnabled) return
-
-        mIsStayTimeCountValid = true
-
-        mThreadService.execute {
-            while (mIsStayTimeCountEnabled && mIsStayTimeCountValid) {
-                val topActivity = CurrentActivityHolder.getCurrentActivity() ?: continue
-                if (isTopActivityBbsRelated(topActivity)) {
-                    tryWithDefaultCatch {
-                        mStayTimeCount++
-                        if (mStayTimeCount >= mStayTimeTimeout) {
-                            postExploreFinish()
-                        }
-                    }
-                }
-                Thread.sleep(1000)
-            }
-        }
-    }
-
-    fun pauseTimeCount() {
-        if (!mIsStayTimeCountEnabled) return
-
-        mIsStayTimeCountValid = false
-    }
-
-    private fun isTopActivityBbsRelated(activity: Activity): Boolean {
-        return (activity is MainActivity && activity.intent.extras?.getBoolean(IS_BBS_CONTENT_VISIBLE) == true)
-                || activity is ForumDetailActivity
-                || activity is ArticleDetailActivity
-                || activity is ForumVideoDetailActivity
-                || activity is CommentActivity
-                || activity is NewQuestionDetailActivity
-    }
-
-    @SuppressLint("CheckResult")
-    private fun postExploreFinish() {
-        RetrofitManager.getInstance()
-            .api
-            .postExplorerFinish()
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(object : BiResponse<ResponseBody>() {
-                override fun onSuccess(data: ResponseBody) {
-                    if (!isPublishEnv()) {
-                        ToastUtils.toast("完成了论坛停留任务（仅测试环境有这个 toast 不要慌）")
-                    }
-                    disableStayTimeCount()
-                }
-            })
-    }
-
-}

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

@@ -1,11 +1,9 @@
 package com.gh.common.util
 
-import android.content.Context
 import com.gh.gamecenter.eventbus.EBCollectionChanged
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
-import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import okhttp3.ResponseBody
@@ -19,18 +17,16 @@ import retrofit2.HttpException
 object CollectionUtils {
 
     enum class CollectionType {
-        toolkit, article, answer, communityArticle
+        TOOLKIT, ARTICLE, ANSWER, COMMUNITY_ARTICLE
     }
 
-    fun postCollection(context: Context, content: String, type: CollectionType, listener: OnCollectionListener) {
+    fun postCollection(content: String, type: CollectionType, listener: OnCollectionListener) {
+        val api = RetrofitManager.getInstance().api
 
         val postCollection = when (type) {
-            CollectionType.article -> RetrofitManager.getInstance().getApi()
-                .postCollectionArticle(UserManager.getInstance().userId, content)
-            CollectionType.toolkit -> RetrofitManager.getInstance().getApi()
-                .postCollectionTools(UserManager.getInstance().userId, content)
-            CollectionType.answer -> RetrofitManager.getInstance().getApi()
-                .postCollectionAnswer(UserManager.getInstance().userId, content)
+            CollectionType.ARTICLE -> api.postCollectionArticle(UserManager.getInstance().userId, content)
+            CollectionType.TOOLKIT -> api.postCollectionTools(UserManager.getInstance().userId, content)
+            CollectionType.ANSWER -> api.postCollectionAnswer(UserManager.getInstance().userId, content)
             else -> return
         }
         postCollection
@@ -47,7 +43,7 @@ object CollectionUtils {
                     super.onFailure(e)
                     if (e != null) {
                         try {
-                            val string = e.response()?.errorBody()?.string()
+                            val string = e.response()?.errorBody()?.string() ?: ""
                             val errorBody = JSONObject(string)
                             if (errorBody.getInt("code") == 403009) {
                                 listener.onSuccess()
@@ -62,16 +58,13 @@ object CollectionUtils {
             })
     }
 
-    fun deleteCollection(context: Context, id: String, type: CollectionType, listener: OnCollectionListener) {
+    fun deleteCollection(id: String, type: CollectionType, listener: OnCollectionListener) {
+        val api = RetrofitManager.getInstance().api
 
-        val postCollection: Observable<ResponseBody>
-        when (type) {
-            CollectionType.article -> postCollection =
-                RetrofitManager.getInstance().getApi().deletaCollectionArticle(UserManager.getInstance().userId, id)
-            CollectionType.toolkit -> postCollection =
-                RetrofitManager.getInstance().getApi().deleteCollectionTools(UserManager.getInstance().userId, id)
-            CollectionType.answer -> postCollection =
-                RetrofitManager.getInstance().getApi().deleteCollectionAnswer(UserManager.getInstance().userId, id)
+        val postCollection = when (type) {
+            CollectionType.ARTICLE -> api.deletaCollectionArticle(UserManager.getInstance().userId, id)
+            CollectionType.TOOLKIT -> api.deleteCollectionTools(UserManager.getInstance().userId, id)
+            CollectionType.ANSWER -> api.deleteCollectionAnswer(UserManager.getInstance().userId, id)
             else -> return
         }
         postCollection

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

@@ -10,22 +10,15 @@ import com.gh.gamecenter.CommentDetailActivity
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.json.json
-import com.gh.gamecenter.common.retrofit.Response
-import com.gh.gamecenter.common.utils.DialogHelper
 import com.gh.gamecenter.common.utils.ifLogin
 import com.gh.gamecenter.common.utils.showAutoOrientation
 import com.gh.gamecenter.common.view.BugFixedPopupWindow
 import com.gh.gamecenter.entity.CommentEntity
-import com.gh.gamecenter.entity.MeEntity
-import com.gh.gamecenter.entity.Permissions
+import com.gh.gamecenter.feature.entity.Permissions
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.qa.comment.OnCommentOptionClickListener
-import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
-import okhttp3.ResponseBody
 import org.json.JSONObject
 import retrofit2.HttpException
 
@@ -316,200 +309,6 @@ object CommentHelper {
         popupWindow.showAutoOrientation(view)
     }
 
-    private fun showControlDialog(
-        context: Context,
-        answerId: String? = null,
-        articleId: String? = null,
-        communityId: String? = null,
-        comment: CommentEntity,
-        me: MeEntity
-    ) {
-        val dialogOptions = arrayListOf<String>()
-        val highlight = "置顶评论"
-        val hide = "隐藏评论"
-
-        var canHighlightCommentDirectly = false
-        var canHideCommentDirectly = false
-
-        if (me.isModerator || me.moderatorPermissions.topAnswerComment > Permissions.GUEST
-            || me.moderatorPermissions.topCommunityArticleComment > Permissions.GUEST
-        ) {
-            dialogOptions.add(highlight)
-            if (me.moderatorPermissions.topAnswerComment > Permissions.REPORTER
-                || me.moderatorPermissions.topCommunityArticleComment > Permissions.REPORTER
-            ) {
-                canHighlightCommentDirectly = true
-            }
-        }
-
-        if (me.isModerator || me.moderatorPermissions.hideAnswerComment > Permissions.GUEST
-            || me.moderatorPermissions.hideCommunityArticleComment > Permissions.GUEST
-        ) {
-            dialogOptions.add(hide)
-            if (me.moderatorPermissions.hideAnswerComment > Permissions.REPORTER
-                || me.moderatorPermissions.hideCommunityArticleComment > Permissions.REPORTER
-            ) {
-                canHideCommentDirectly = true
-            }
-        }
-
-        val highlightDialogHintContent = if (canHighlightCommentDirectly) {
-            "你的操作将立即生效，确定提交吗？（你的管理权限为：高级）"
-        } else {
-            "你的操作将提交给小编审核，确定提交吗？"
-        }
-
-        val hideDialogHintContent = if (canHideCommentDirectly) {
-            "你的操作将立即生效，确定提交吗？（你的管理权限为：高级）"
-        } else {
-            "你的操作将提交给小编审核，确定提交吗？"
-        }
-
-        val disabledOptions = arrayListOf<String>()
-
-        if (comment.priority != 0) {
-            disabledOptions.add(highlight)
-        }
-
-        comment.me?.let {
-            if (it.isCommentOwner) {
-                disabledOptions.add(highlight)
-            }
-        }
-
-        DialogUtils.showListDialog(context, dialogOptions, disabledOptions) {
-            when (it) {
-                highlight -> {
-                    if (comment.priority != 0) {
-                        Utils.toast(context, "评论已经置顶")
-                        return@showListDialog
-                    }
-
-                    comment.me?.let { me ->
-                        if (me.isCommentOwner) {
-                            Utils.toast(context, "不能置顶自己的评论")
-                            return@showListDialog
-                        }
-                    }
-
-                    val highlightObserver = object : Response<ResponseBody>() {
-                        override fun onResponse(response: ResponseBody?) {
-                            if (canHighlightCommentDirectly) {
-                                Utils.toast(context, "置顶成功，请刷新列表")
-                            } else {
-                                Utils.toast(context, "提交成功")
-                            }
-                        }
-
-                        override fun onFailure(e: HttpException?) {
-                            super.onFailure(e)
-                            e?.let { httpException ->
-                                if (httpException.code() == 403) {
-                                    val string = e.response().errorBody()?.string()
-                                    val errorJson = JSONObject(string)
-                                    val errorCode = errorJson.getInt("code")
-                                    if (errorCode == 403059) {
-                                        Utils.toast(
-                                            HaloApp.getInstance().application,
-                                            "权限错误，请刷新后重试"
-                                        )
-                                        return
-                                    } else {
-                                        Utils.toast(HaloApp.getInstance().application, e.message())
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    if (answerId != null) {
-                        DialogHelper.showDialog(
-                            context, highlight, highlightDialogHintContent,
-                            "确定", "取消", {
-                                RetrofitManager.getInstance().api
-                                    .highlightAnswerComment(answerId, comment.id)
-                                    .observeOn(AndroidSchedulers.mainThread())
-                                    .subscribeOn(Schedulers.io())
-                                    .subscribe(highlightObserver)
-                            },
-                            extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
-                        )
-                    } else {
-                        DialogHelper.showDialog(
-                            context, highlight, highlightDialogHintContent,
-                            "确定", "取消", {
-                                RetrofitManager.getInstance().api
-                                    .highlightCommunityArticleComment(comment.id)
-                                    .observeOn(AndroidSchedulers.mainThread())
-                                    .subscribeOn(Schedulers.io())
-                                    .subscribe(highlightObserver)
-                            },
-                            extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
-                        )
-                    }
-                }
-
-                hide -> {
-                    val hideObserver = object : Response<ResponseBody>() {
-                        override fun onResponse(response: ResponseBody?) {
-                            if (canHideCommentDirectly) {
-                                Utils.toast(context, "隐藏成功，请刷新列表")
-                            } else {
-                                Utils.toast(context, "提交成功")
-                            }
-                        }
-
-                        override fun onFailure(e: HttpException?) {
-                            super.onFailure(e)
-                            e?.let { httpException ->
-                                if (httpException.code() == 403) {
-                                    val string = e.response().errorBody()?.string()
-                                    val errorJson = JSONObject(string)
-                                    val errorCode = errorJson.getInt("code")
-                                    if (errorCode == 403059) {
-                                        Utils.toast(
-                                            HaloApp.getInstance().application,
-                                            "权限错误，请刷新后重试"
-                                        )
-                                        return
-                                    } else {
-                                        Utils.toast(HaloApp.getInstance().application, e.message())
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    if (answerId != null) {
-                        DialogHelper.showDialog(
-                            context, hide, hideDialogHintContent,
-                            "确定", "取消", {
-                                RetrofitManager.getInstance().api
-                                    .hideAnswerComment(answerId, comment.id)
-                                    .observeOn(AndroidSchedulers.mainThread())
-                                    .subscribeOn(Schedulers.io())
-                                    .subscribe(hideObserver)
-                            },
-                            extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
-                        )
-                    } else {
-                        DialogHelper.showDialog(
-                            context, hide, hideDialogHintContent,
-                            "确定", "取消", {
-                                RetrofitManager.getInstance().api
-                                    .hideCommunityArticleComment(comment.id)
-                                    .observeOn(AndroidSchedulers.mainThread())
-                                    .subscribeOn(Schedulers.io())
-                                    .subscribe(hideObserver)
-                            },
-                            extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
-                        )
-                    }
-                }
-            }
-        }
-    }
-
     private fun showReportTypeDialog(
         context: Context,
         reportCallback: (reportType: String) -> Unit

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

@@ -3,7 +3,6 @@ package com.gh.common.util;
 import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.content.Context;
-import android.graphics.Color;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.Window;
@@ -26,7 +25,7 @@ import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.core.utils.NumberUtils;
 import com.gh.gamecenter.core.utils.ToastUtils;
 import com.gh.gamecenter.entity.CommentEntity;
-import com.gh.gamecenter.entity.MeEntity;
+import com.gh.gamecenter.feature.entity.MeEntity;
 import com.gh.gamecenter.login.entity.UserInfoEntity;
 import com.gh.gamecenter.login.user.UserManager;
 import com.gh.gamecenter.retrofit.RetrofitManager;

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

@@ -1,6 +1,5 @@
 package com.gh.common.util
 
-import android.content.Context
 import android.text.TextUtils
 import com.gh.gamecenter.eventbus.EBConcernChanged
 import com.gh.gamecenter.login.user.UserManager
@@ -8,11 +7,8 @@ import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
-import okhttp3.MediaType
-import okhttp3.RequestBody
 import okhttp3.ResponseBody
 import org.greenrobot.eventbus.EventBus
-import org.json.JSONArray
 import retrofit2.HttpException
 
 /**
@@ -25,9 +21,8 @@ object ConcernUtils {
      * autoConcern:是否自动关注'关联关注'
      */
     fun postConcernGameId(
-        context: Context,
         gameId: String,
-        listener: onConcernListener?,
+        listener: OnConcernListener?,
         autoConcern: Boolean = false
     ) {
         val mode = if (autoConcern) "auto" else "manual"
@@ -53,7 +48,7 @@ object ConcernUtils {
             })
     }
 
-    fun deleteConcernData(context: Context, gameId: String, listener: onConcernListener?) {
+    fun deleteConcernData(gameId: String, listener: OnConcernListener?) {
         RetrofitManager.getInstance().api
             .deleteConcern(UserManager.getInstance().userId, gameId)
             .subscribeOn(Schedulers.io())
@@ -72,73 +67,7 @@ object ConcernUtils {
             })
     }
 
-    fun updateConcernData(context: Context, data: JSONArray) {
-        val body = RequestBody.create(
-            MediaType.parse("application/json"),
-            data.toString()
-        )
-        RetrofitManager.getInstance().api
-            .putConcern(UserManager.getInstance().userId, body)
-            .subscribeOn(Schedulers.io())
-            .observeOn(Schedulers.io())
-            .subscribe(object : Response<ResponseBody>() {
-                override fun onResponse(response: ResponseBody?) {
-                    EventBus.getDefault().post(EBConcernChanged())
-                }
-            })
-    }
-
-    fun deleteConcernQuestions(context: Context, questionsId: String, listener: onConcernListener?) {
-        RetrofitManager.getInstance().api
-            .deleteConcernQuestions(UserManager.getInstance().userId, questionsId)
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(object : Response<ResponseBody>() {
-                override fun onResponse(response: ResponseBody?) {
-                    super.onResponse(response)
-                    listener?.onSuccess()
-                }
-
-                override fun onFailure(e: HttpException?) {
-                    super.onFailure(e)
-                    listener?.onError()
-                    var errorString: String? = null
-                    try {
-                        errorString = e?.response()?.errorBody()?.string()
-                    } catch (e1: Exception) {
-                        e1.printStackTrace()
-                    }
-                    ErrorHelper.handleError(context, errorString, false)
-                }
-            })
-    }
-
-    fun postConcernQuestions(context: Context, questionsId: String, listener: onConcernListener?) {
-        RetrofitManager.getInstance().api
-            .postConcernQuestions(UserManager.getInstance().userId, questionsId)
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(object : Response<ResponseBody>() {
-                override fun onResponse(response: ResponseBody?) {
-                    super.onResponse(response)
-                    listener?.onSuccess()
-                }
-
-                override fun onFailure(e: HttpException?) {
-                    super.onFailure(e)
-                    listener?.onError()
-                    var errorString: String? = null
-                    try {
-                        errorString = e?.response()?.errorBody()?.string()
-                    } catch (e1: Exception) {
-                        e1.printStackTrace()
-                    }
-                    ErrorHelper.handleError(context, errorString, false)
-                }
-            })
-    }
-
-    interface onConcernListener {
+    interface OnConcernListener {
         fun onSuccess()
         fun onError()
     }

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

@@ -6,8 +6,9 @@ import android.os.Build;
 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.constant.EntranceConsts;
 import com.gh.gamecenter.common.utils.NetworkUtils;
-import com.gh.gamecenter.entity.GameEntity;
+import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.entity.NewsDetailEntity;
+import com.gh.gamecenter.feature.utils.PlatformUtils;
 import com.gh.gamecenter.manager.DataCollectionManager;
 import com.gh.gamecenter.manager.PackagesManager;
 import com.lightgame.download.DownloadEntity;
@@ -71,16 +72,6 @@ public class DataCollectionUtils {
         DataCollectionManager.onEvent(context, "click-item", map);
     }
 
-    // 上传游戏数据
-    public static void uploadGame(Context context, GameEntity gameEntity, int seconds, String from) {
-        Map<String, Object> map = new HashMap<>();
-        map.put("game", gameEntity.getName());
-        map.put("game_id", gameEntity.getId());
-        map.put("time", seconds);
-        map.put("from", from);
-        DataCollectionManager.onEvent(context, "game", map);
-    }
-
     // 上传新闻数据
     public static void uploadNews(Context context, NewsDetailEntity newsDetailEntity,
                                   GameEntity gameEntity, int seconds, String from) {
@@ -116,15 +107,6 @@ public class DataCollectionUtils {
         DataCollectionManager.onEvent(context, "hijack", map);
     }
 
-    // 上传用户数据
-    public static void uploadUser(Context context) {
-        Map<String, Object> map = new HashMap<>();
-        map.put("type", Build.MODEL);
-        map.put("system", Build.VERSION.SDK_INT + "=" + Build.VERSION.RELEASE);
-        map.put("install", PackagesManager.INSTANCE.getInstalledList());
-        DataCollectionManager.upsert(context, "user", map);
-    }
-
     // 上传搜索数据
     public static void uploadSearch(Context context, String... args) {
         if (args.length != 5) {

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

@@ -2,17 +2,14 @@ package com.gh.common.util;
 
 import android.annotation.SuppressLint;
 import android.app.Application;
-import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
 import android.net.Uri;
-import android.os.Build;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.Log;
 
 import com.gh.base.GlobalActivityManager;
-
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.common.base.activity.BaseActivity;
 import com.gh.gamecenter.common.constant.Constants;
@@ -126,6 +123,16 @@ public class DataUtils {
 
                 // 避免初始化顺序问题导致 MetaUtil 一直持有空的 gid
                 MetaUtil.INSTANCE.refreshMeta();
+
+                ContentValues values = new ContentValues();
+                values.put(GhContentProvider.KEY_GID, gid);
+                values.put(GhContentProvider.KEY_ANDROID_ID, MetaUtil.getBase64EncodedAndroidId());
+                try {
+                    HaloApp.getInstance().getContentResolver().insert(Uri.parse("content://com.gh.gamecenter.provider/device"), values);
+                } catch (Exception exception) {
+                    SentryHelper.INSTANCE.onEvent("DEVICE_INSERT_ERROR", "exception_digest", exception.getLocalizedMessage());
+                    exception.printStackTrace();
+                }
             }
 
             @Override

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

@@ -8,7 +8,7 @@ import com.gh.common.filter.RegionSetting;
 import com.gh.common.filter.RegionSettingHelper;
 import com.gh.common.repository.ReservationRepository;
 import com.gh.common.simulator.SimulatorGameManager;
-import com.gh.common.view.DownloadButton;
+import com.gh.gamecenter.feature.view.DownloadButton;
 import com.gh.common.xapk.XapkInstaller;
 import com.gh.common.xapk.XapkUnzipStatus;
 import com.gh.download.DownloadManager;
@@ -18,7 +18,7 @@ import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.entity.LinkEntity;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.core.utils.SPUtils;
-import com.gh.gamecenter.entity.PluginLocation;
+import com.gh.gamecenter.feature.entity.PluginLocation;
 import com.gh.gamecenter.manager.PackagesManager;
 import com.gh.vspace.VHelper;
 import com.lightgame.download.DownloadEntity;
@@ -274,11 +274,7 @@ public class DetailDownloadUtils {
                 break;
             case waiting:
                 viewHolder.mDownloadPb.setText(R.string.waiting);
-                if (downloadEntity.isPluggable() && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
-                    viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.WAITING);
-                } else {
-                    viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.WAITING);
-                }
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.WAITING);
                 break;
             case done:
                 if (SimulatorGameManager.isSimulatorGame(viewHolder.gameEntity)) {

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

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
@@ -21,7 +20,6 @@ import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
 import android.text.style.URLSpan;
 import android.text.style.UnderlineSpan;
-import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -30,15 +28,11 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
-import android.widget.Button;
-import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -49,7 +43,6 @@ import com.gh.common.constant.Config;
 import com.gh.common.filter.RegionSetting;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.ShellActivity;
-import com.gh.gamecenter.SuggestionActivity;
 import com.gh.gamecenter.adapter.ReportReasonAdapter;
 import com.gh.gamecenter.adapter.viewholder.PrivacyPolicyItemViewHolder;
 import com.gh.gamecenter.common.base.TrackableDialog;
@@ -57,13 +50,16 @@ import com.gh.gamecenter.common.callback.CancelListener;
 import com.gh.gamecenter.common.callback.ConfirmListener;
 import com.gh.gamecenter.common.callback.SimpleCallback;
 import com.gh.gamecenter.common.databinding.DialogAlertDefaultBinding;
+import com.gh.gamecenter.common.entity.SimpleGameEntity;
+import com.gh.gamecenter.common.entity.SuggestType;
+import com.gh.gamecenter.common.utils.DialogHelper;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.common.utils.ImageUtils;
 import com.gh.gamecenter.common.utils.NetworkUtils;
 import com.gh.gamecenter.common.view.CustomLinkMovementMethod;
 import com.gh.gamecenter.common.view.DrawableView;
 import com.gh.gamecenter.common.view.FixLinearLayoutManager;
-import com.gh.gamecenter.common.view.LimitHeightLinearLayout;
+import com.gh.gamecenter.common.view.MaxHeightLinearLayout;
 import com.gh.gamecenter.common.view.MaxHeightNestedScrollView;
 import com.gh.gamecenter.common.view.VerticalItemDecoration;
 import com.gh.gamecenter.core.AppExecutor;
@@ -72,40 +68,32 @@ import com.gh.gamecenter.core.utils.EmptyCallback;
 import com.gh.gamecenter.core.utils.MtaHelper;
 import com.gh.gamecenter.core.utils.SPUtils;
 import com.gh.gamecenter.core.utils.SpanBuilder;
-import com.gh.gamecenter.core.utils.StringUtils;
 import com.gh.gamecenter.core.utils.ToastUtils;
 import com.gh.gamecenter.databinding.DialogBindPhoneBinding;
 import com.gh.gamecenter.databinding.DialogOverseaConfirmationBinding;
 import com.gh.gamecenter.databinding.DialogPackageParseErrorBinding;
-import com.gh.gamecenter.databinding.DialogReceiveLibaoSuccessBinding;
 import com.gh.gamecenter.databinding.DialogRelievePhoneBinding;
 import com.gh.gamecenter.databinding.DialogReportReasonBinding;
 import com.gh.gamecenter.databinding.DialogWechatReserveSuccessBinding;
 import com.gh.gamecenter.databinding.ImprintContentItemBinding;
 import com.gh.gamecenter.databinding.PrivacyItemBinding;
-import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.BadgeEntity;
-import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.entity.PermissionsEntity;
 import com.gh.gamecenter.entity.PrivacyPolicyEntity;
-import com.gh.gamecenter.entity.SettingsEntity;
-import com.gh.gamecenter.entity.SimpleGameEntity;
 import com.gh.gamecenter.entity.TrackableEntity;
-import com.gh.gamecenter.login.entity.Badge;
-import com.gh.gamecenter.setting.view.GameDownloadSettingFragment;
-import com.gh.gamecenter.setting.view.security.BindPhoneActivity;
-import com.gh.gamecenter.suggest.SuggestType;
+import com.gh.gamecenter.feature.entity.ApkEntity;
+import com.gh.gamecenter.feature.entity.Badge;
+import com.gh.gamecenter.feature.entity.GameEntity;
+import com.gh.gamecenter.feature.entity.SettingsEntity;
+import com.gh.gamecenter.help.HelpAndFeedbackBridge;
+import com.gh.gamecenter.setting.SettingBridge;
 import com.lightgame.adapter.BaseRecyclerAdapter;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.utils.AppManager;
 import com.lightgame.utils.Util_System_Keyboard;
 import com.lightgame.utils.Utils;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import kotlin.Unit;
@@ -131,91 +119,15 @@ public class DialogUtils {
         return dialog;
     }
 
-    public static void showInstallHintDialog(Context context, final ConfirmListener cmListener) {
-        context = checkDialogContext(context);
-
-        final Dialog dialog = new Dialog(context);
-
-        View view = View.inflate(context, R.layout.dialog_install_hint, null);
-
-        // 标题
-        TextView alertdialog_title = view.findViewById(R.id.installhint_title);
-        alertdialog_title.setText("重要提示");
-        Spanned content = Html.fromHtml("如果您使用的是" + "<font color=\"#ff0000\">华为</font>" + "或" +
-                "<font color=\"#ff0000\">OPPO</font>" + "手机，安装游戏时请选择“" +
-                "<font color=\"#ff0000\">继续安装</font>" +
-                "”（记住不要选择“官方推荐”或“软件商店安装”）");
-        // 内容
-        TextView alertdialog_content = view.findViewById(R.id.installhint_content);
-        alertdialog_content.setText(content);
-
-        // 确定按钮
-        TextView installhint_confirm = view.findViewById(R.id.installhint_confirm);
-        installhint_confirm.setText("知道了");
-
-        final ImageView installhint_unselect = view.findViewById(R.id.installhint_unselect);
-        final ImageView installhint_select = view.findViewById(R.id.installhint_select);
-
-        LinearLayout installhint_unselect_ll = view.findViewById(R.id.installhint_unselect_ll);
-
-        installhint_unselect_ll.setOnClickListener(v -> {
-            if (installhint_unselect.getVisibility() == View.GONE) {
-                installhint_unselect.setVisibility(View.VISIBLE);
-                installhint_select.setVisibility(View.GONE);
-            } else {
-                installhint_unselect.setVisibility(View.GONE);
-                installhint_select.setVisibility(View.VISIBLE);
-            }
-        });
-
-        installhint_confirm.setOnClickListener(v -> {
-            dialog.dismiss();
-            if (installhint_select.getVisibility() == View.VISIBLE) {
-                if (cmListener != null) {
-                    cmListener.onConfirm();
-                }
-            }
-        });
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(view);
-        dialog.show();
-    }
-
-    public static void showHintDialog(Context context, String title, CharSequence msg, String confirm) {
-        context = checkDialogContext(context);
-
-        final Dialog dialog = new Dialog(context);
-
-        View view = View.inflate(context, R.layout.common_hintdialog, null);
-
-        TextView hintdialog_title = view.findViewById(R.id.tv_dialog_hint_title);
-        hintdialog_title.setText(title);
-
-        // 内容
-        TextView hintdialog_content = view.findViewById(R.id.tv_dialog_hint_content);
-        hintdialog_content.setText(msg);
-
-        TextView hintdialog_confirm = view.findViewById(R.id.tv_dialog_hint_confirm);
-
-        hintdialog_confirm.setText(confirm);
-
-        hintdialog_confirm.setOnClickListener(v -> dialog.cancel());
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(view);
-        dialog.show();
-    }
-
-
     public static void checkDownload(Context context, String size, CheckDownloadCallBack callBack) {
         if (!NetworkUtils.isNetworkConnected(context)) {
-            showNoConnectionDownloadDialog(context, null,
+            showNoConnectionDownloadDialog(context, () -> {
+                    },
                     () -> callBack.onResponse(true));
         } else if (NetworkUtils.isWifiConnected(context)
                 || filter4GorSize(context, size)) {
             callBack.onResponse(false);
-        } else if (!SPUtils.getBoolean(GameDownloadSettingFragment.getTrafficDownloadHintKey(), true)) {
+        } else if (!SPUtils.getBoolean(getTrafficDownloadHintKey(), true)) {
             AppExecutor.getUiExecutor().executeWithDelay(() -> Utils.toast(context, "当前使用移动网络下载，请注意流量消耗"), 500);
             callBack.onResponse(false);
         } else {
@@ -226,6 +138,10 @@ public class DialogUtils {
         }
     }
 
+    private static String getTrafficDownloadHintKey() {
+        return PackageUtils.getGhVersionName() + "traffic_download_hint";
+    }
+
     private static boolean filter4GorSize(Context context, String size) {
         try {
             if (TextUtils.isEmpty(size)) {
@@ -243,23 +159,8 @@ public class DialogUtils {
         }
         return false;
     }
-
-    public static void checkResumeDownload(Context context, CheckDownloadCallBack callBack) {
-        if (!NetworkUtils.isNetworkConnected(context)) {
-            showNoConnectionDownloadDialog(context, null, () -> callBack.onResponse(true));
-        } else if (NetworkUtils.isWifiConnected(context)) {
-            callBack.onResponse(false);
-        } else {
-            showResumeDownloadDialog(context, () -> {
-                callBack.onResponse(false);
-            }, () -> {
-                callBack.onResponse(true);
-            });
-        }
-    }
-
     public static void showNoConnectionDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener) {
-        com.gh.gamecenter.common.utils.DialogUtils.showWarningDialog(context, "下载提示", "网络异常，请检查手机网络状态", "连上WiFi后自动下载", "关闭", listener, cancelListener);
+        DialogHelper.showDialog(context, "下载提示", "网络异常，请检查手机网络状态", "知道了", "WiFi自动下载", listener::onConfirm, cancelListener::onCancel, false, "", "");
     }
 
     public static void showDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener) {
@@ -287,7 +188,7 @@ public class DialogUtils {
 //            MtaHelper.onEvent("移动网络下载", NetworkUtils.getMobileNetworkType(finalContext), "连上WiFi后自动下载");
         });
         allowAlways.setOnClickListener(v -> {
-            SPUtils.setBoolean(GameDownloadSettingFragment.getTrafficDownloadHintKey(), false);
+            SPUtils.setBoolean(getTrafficDownloadHintKey(), false);
             AppExecutor.getUiExecutor().executeWithDelay(() -> {
                 // 显示了弹窗以后，即便下面这个 toast 放在 listener.onConfirm 后调用也是显示 listener.onConfirm 里的 toast
                 // 喷了，延时包治疑难杂症
@@ -300,363 +201,10 @@ public class DialogUtils {
 
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         dialog.setContentView(contentView);
+        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
         dialog.show();
     }
 
-    public static void showResumeDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener) {
-        com.gh.gamecenter.common.utils.DialogUtils.showWarningDialog(context, "下载提示", "当前正在使用移动网络，继续下载会消耗手机流量", "连上WiFi后自动下载", "继续下载", listener, cancelListener);
-    }
-
-    public static void showDownloadDialog(Context context, ConfirmListener listener) {
-        com.gh.gamecenter.common.utils.DialogUtils.showWarningDialog(context, "下载提示", "您当前使用的网络为2G/3G/4G，开始下载将会消耗移动流量，确定下载？", listener);
-    }
-
-    public static void showCancelDialog(Context context, final ConfirmListener listener, CancelListener cancelListener) {
-        Spanned content = Html.fromHtml(context.getString(R.string.cancel_concern_dialog));
-        showCancelListenerDialog(context, "取消关注", content, "确定取消", "暂不取消", listener, cancelListener);
-    }
-
-    /**
-     * ios 风格弹窗
-     *
-     * @param context
-     * @param title      标题
-     * @param message    内容
-     * @param negative   取消按钮文本
-     * @param positive   确认按钮文本
-     * @param clListener 取消按钮监听
-     * @param cmListener 确认按钮监听
-     */
-    public static Dialog showNewAlertDialog(Context context, String title, CharSequence message
-            , String negative, String positive, TrackableEntity trackableEntity, int gravity, boolean shouldShowCloseBtn, final CancelListener clListener, final ConfirmListener cmListener) {
-        context = checkDialogContext(context);
-        final Dialog dialog;
-        if (trackableEntity != null) {
-            dialog = new TrackableDialog(context,
-                    R.style.GhAlertDialog,
-                    trackableEntity.getEvent(),
-                    trackableEntity.getKey(),
-                    trackableEntity.getValue(),
-                    trackableEntity.getCancelValue(),
-                    trackableEntity.getKeyBackValue(),
-                    trackableEntity.getLogShowEvent());
-        } else {
-            dialog = new Dialog(context, R.style.GhAlertDialog);
-        }
-
-        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_new_alert, null);
-
-        TextView titleTv = contentView.findViewById(R.id.title);
-        TextView contentTv = contentView.findViewById(R.id.content);
-        TextView cancelBtn = contentView.findViewById(R.id.cancel);
-        TextView confirmBtn = contentView.findViewById(R.id.confirm);
-        View middleLine = contentView.findViewById(R.id.middle_line);
-        View closeIv = contentView.findViewById(R.id.closeIv);
-        titleTv.setGravity(gravity);
-        contentTv.setGravity(gravity);
-
-        titleTv.setText(title);
-        contentTv.setText(message);
-        cancelBtn.setText(negative);
-        confirmBtn.setText(positive);
-        if (negative.isEmpty()) {
-            cancelBtn.setVisibility(View.GONE);
-            middleLine.setVisibility(View.GONE);
-            confirmBtn.setTextColor(ContextCompat.getColor(context, R.color.text_title));
-        }
-        if (positive.isEmpty()) {
-            confirmBtn.setVisibility(View.GONE);
-            middleLine.setVisibility(View.GONE);
-        }
-        closeIv.setVisibility(shouldShowCloseBtn ? View.VISIBLE : View.GONE);
-        closeIv.setOnClickListener(v -> dialog.dismiss());
-
-        cancelBtn.setOnClickListener(v -> {
-            if (clListener != null) clListener.onCancel();
-            dialog.dismiss();
-        });
-
-        confirmBtn.setOnClickListener(v -> {
-            if (cmListener != null) cmListener.onConfirm();
-            dialog.dismiss();
-        });
-
-        Window window = dialog.getWindow();
-        if (window != null) {
-            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-        }
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(contentView);
-        dialog.show();
-        return dialog;
-    }
-
-    public static Dialog showNewAlertDialog(Context context, String title, CharSequence message
-            , String negative, String positive, final CancelListener clListener, final ConfirmListener cmListener) {
-        return showNewAlertDialog(context, title, message, negative, positive, null, Gravity.LEFT, false, clListener, cmListener);
-    }
-
-    public static Dialog showNewAlertDialog(Context context, String title, CharSequence message
-            , String negative, String positive, int gravity, boolean shouldShowCloseBtn, final CancelListener clListener, final ConfirmListener cmListener) {
-        return showNewAlertDialog(context, title, message, negative, positive, null, gravity, shouldShowCloseBtn, clListener, cmListener);
-    }
-
-
-    public static Dialog showDialogWithHtmlContent(Context context, String title, String content
-            , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) {
-        context = checkDialogContext(context);
-
-        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
-
-        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_alert, null);
-        TextView contentTv = contentView.findViewById(R.id.dialog_content);
-        TextView titleTv = contentView.findViewById(R.id.dialog_title);
-        TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
-        TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
-        contentTv.setText(Html.fromHtml(content));
-        titleTv.setText(title);
-        negativeTv.setText(negative);
-        positiveTv.setText(positive);
-
-        negativeTv.setOnClickListener(view -> {
-            if (clListener != null) {
-                clListener.onCancel();
-            }
-            dialog.dismiss();
-        });
-
-        positiveTv.setOnClickListener(view -> {
-            if (cmListener != null) {
-                cmListener.onConfirm();
-            }
-            dialog.dismiss();
-        });
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(contentView);
-        dialog.show();
-        return dialog;
-    }
-
-    /**
-     * 取消按钮灰色
-     *
-     * @param context
-     * @param title
-     * @param message
-     * @param positive
-     * @param negative
-     * @param cmListener
-     */
-
-    public static void showCancelAlertDialog(Context context, String title, CharSequence message
-            , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) {
-        context = checkDialogContext(context);
-
-        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
-
-        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_alert, null);
-        TextView contentTv = contentView.findViewById(R.id.dialog_content);
-        TextView titleTv = contentView.findViewById(R.id.dialog_title);
-        TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
-        TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
-
-        contentTv.setText(message);
-        titleTv.setText(title);
-        negativeTv.setText(negative);
-        negativeTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
-        positiveTv.setText(positive);
-
-        negativeTv.setOnClickListener(view -> {
-            if (clListener != null) {
-                clListener.onCancel();
-            }
-            dialog.dismiss();
-        });
-
-        positiveTv.setOnClickListener(view -> {
-            if (cmListener != null) {
-                cmListener.onConfirm();
-            }
-            dialog.dismiss();
-        });
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(contentView);
-        dialog.show();
-    }
-
-    /**
-     * 点击外部退出和取消监听绑定
-     */
-    public static void showCancelListenerDialog(Context context, String title, CharSequence message
-            , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) {
-        context = checkDialogContext(context);
-
-        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
-
-        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_alert, null);
-        TextView contentTv = contentView.findViewById(R.id.dialog_content);
-        TextView titleTv = contentView.findViewById(R.id.dialog_title);
-        TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
-        TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
-
-        contentTv.setText(message);
-        titleTv.setText(title);
-        negativeTv.setText(negative);
-        //negativeTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
-        positiveTv.setText(positive);
-
-        negativeTv.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if (clListener != null) {
-                    clListener.onCancel();
-                }
-                dialog.dismiss();
-            }
-        });
-
-        positiveTv.setOnClickListener(view -> {
-            if (cmListener != null) {
-                cmListener.onConfirm();
-            }
-            dialog.dismiss();
-        });
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(contentView);
-        dialog.setOnCancelListener(dialogInterface -> {
-            if (clListener != null)
-                clListener.onCancel();
-        });
-        dialog.show();
-    }
-
-
-    /**
-     * 权限弹窗
-     * 只能在弹窗内取消
-     */
-    public static void showPermissionDialog(Context context, String title, CharSequence message
-            , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) {
-        context = checkDialogContext(context);
-
-        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
-
-        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_alert, null);
-        TextView contentTv = contentView.findViewById(R.id.dialog_content);
-        TextView titleTv = contentView.findViewById(R.id.dialog_title);
-        TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
-        TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
-
-        contentTv.setText(message);
-        titleTv.setText(title);
-        negativeTv.setText(negative);
-        negativeTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
-        positiveTv.setText(positive);
-
-        negativeTv.setOnClickListener(view -> {
-            if (clListener != null) {
-                clListener.onCancel();
-            }
-            dialog.dismiss();
-        });
-
-        positiveTv.setOnClickListener(view -> {
-            if (cmListener != null) {
-                cmListener.onConfirm();
-            }
-            dialog.dismiss();
-        });
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(contentView);
-        dialog.setCancelable(false);
-        dialog.show();
-    }
-
-    /**
-     * 只能在弹窗内取消
-     */
-    public static void showForceDialog(Context context, String title, CharSequence message
-            , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) {
-        context = checkDialogContext(context);
-
-        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
-
-        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_alert, null);
-        TextView contentTv = contentView.findViewById(R.id.dialog_content);
-        TextView titleTv = contentView.findViewById(R.id.dialog_title);
-        TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
-        TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
-
-        contentTv.setText(message);
-        titleTv.setText(title);
-        negativeTv.setText(negative);
-        positiveTv.setText(positive);
-
-        negativeTv.setOnClickListener(view -> {
-            if (clListener != null) {
-                clListener.onCancel();
-            }
-            dialog.dismiss();
-        });
-
-        positiveTv.setOnClickListener(view -> {
-            if (cmListener != null) {
-                cmListener.onConfirm();
-            }
-            dialog.dismiss();
-        });
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(contentView);
-        dialog.setCancelable(false);
-        dialog.show();
-    }
-
-    /**
-     * 特殊：验证手机号码
-     */
-
-    public static void checkPhoneNumDialog(Context context, CharSequence message, final ConfirmListener cmListener) {
-        String s = message.toString();
-        String sub1 = s.substring(0, 3);
-        String sub2 = s.substring(3, 7);
-        String sub3 = s.substring(7, 11);
-        String phoneNum = StringUtils.buildString(sub1, " - ", sub2, " - ", sub3);
-
-        AlertDialog alertDialog = new AlertDialog.Builder(context, R.style.GhAlertDialog)
-                .setTitle("请确定手机号：")
-                .setMessage(phoneNum)
-                .setPositiveButton("确认", (dialog, which) -> {
-                    if (cmListener != null) {
-                        cmListener.onConfirm();
-                    }
-                })
-                .setNegativeButton("取消", null)
-                .create();
-        alertDialog.show();
-
-        TextView mesage = (TextView) alertDialog.findViewById(android.R.id.message);
-        Button positiveBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_POSITIVE);
-        Button negativeBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_NEGATIVE);
-
-        positiveBtn.setTextSize(13);
-        positiveBtn.setTextColor(ContextCompat.getColor(context, R.color.theme_font));
-        negativeBtn.setTextSize(13);
-        negativeBtn.setTextColor(ContextCompat.getColor(context, R.color.theme_font));
-        if (mesage != null) {
-            mesage.setGravity(Gravity.CENTER);
-            mesage.setTextSize(24);
-            mesage.setTextColor(ContextCompat.getColor(context, R.color.title));
-            TextPaint tp = mesage.getPaint();
-            tp.setFakeBoldText(true);
-        }
-    }
-
     public static void showSignDialog(Context context, String title, CharSequence message, CharSequence message2
             , String positive, final ConfirmListener cmListener) {
         context = checkDialogContext(context);
@@ -672,7 +220,7 @@ public class DialogUtils {
 
         contentTv.setText(Html.fromHtml(message.toString()));
         content2Tv.setText(Html.fromHtml(message2.toString()));
-        titleTv.setText(title);
+        titleTv.setText(Html.fromHtml(title));
         positiveTv.setText(positive);
 
         negativeTv.setOnClickListener(view -> dialog.dismiss());
@@ -686,92 +234,10 @@ public class DialogUtils {
 
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         dialog.setContentView(contentView);
+        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
         dialog.show();
     }
 
-
-    public static void showLowSystemVersionDialog(Context context) {
-        final Context activityContext = checkDialogContext(context);
-
-        final Dialog dialog = new Dialog(activityContext, R.style.GhAlertDialog);
-
-        View contentView = LayoutInflater.from(activityContext).inflate(R.layout.dialog_alert, null);
-        TextView contentTv = contentView.findViewById(R.id.dialog_content);
-        TextView titleTv = contentView.findViewById(R.id.dialog_title);
-        TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
-
-        titleTv.setText("提示");
-        contentTv.setText("抱歉，您当前系统版本过低，暂不支持视频功能");
-        positiveTv.setText("我知道了");
-
-        positiveTv.setOnClickListener(view -> {
-            dialog.dismiss();
-        });
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(contentView);
-        dialog.show();
-    }
-
-    public static void showListDialog(Context context,
-                                      List<String> selectionList,
-                                      DialogInterface.OnClickListener onClickListener) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(context);
-
-        String[] selectionArray = new String[selectionList.size()];
-        selectionArray = selectionList.toArray(selectionArray);
-        builder.setItems(selectionArray, onClickListener);
-        AlertDialog dialog = builder.create();
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.show();
-    }
-
-    /**
-     * @param options         供以显示的选项
-     * @param disabledOptions 显示为灰色的选项（是 options 的子集）
-     */
-    public static void showListDialog(Context context,
-                                      List<String> options,
-                                      List<String> disabledOptions,
-                                      OptionCallback callback) {
-        context = checkDialogContext(context);
-
-        Dialog dialog = new Dialog(context);
-
-        LinearLayout container = new LinearLayout(context);
-        container.setOrientation(LinearLayout.VERTICAL);
-        container.setBackgroundColor(ContextCompat.getColor(context, R.color.background_white));
-        container.setPadding(0, DisplayUtils.dip2px(context, 12f), 0, DisplayUtils.dip2px(context, 12f));
-
-        for (String option : options) {
-            TextView reportTv = new TextView(context);
-            reportTv.setText(option);
-            reportTv.setTextSize(17f);
-            if (disabledOptions != null && disabledOptions.contains(option)) {
-                reportTv.setTextColor(ContextCompat.getColor(context, R.color.btn_gray));
-            } else {
-                reportTv.setTextColor(ContextCompat.getColor(context, R.color.title));
-                reportTv.setBackgroundResource(R.drawable.textview_white_style);
-            }
-            int widthPixels = context.getResources().getDisplayMetrics().widthPixels;
-            reportTv.setLayoutParams(new LinearLayout.LayoutParams(widthPixels * 9 / 10,
-                    LinearLayout.LayoutParams.WRAP_CONTENT));
-            reportTv.setPadding(DisplayUtils.dip2px(context, 20f), DisplayUtils.dip2px(context, 12f),
-                    0, DisplayUtils.dip2px(context, 12f));
-            container.addView(reportTv);
-
-            reportTv.setOnClickListener(v -> {
-                dialog.cancel();
-                callback.onClicked(reportTv.getText().toString());
-            });
-        }
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(container);
-        dialog.show();
-    }
-
-
     /**
      * 特殊：目前只在提交问题错误返回时弹出
      */
@@ -1343,8 +809,8 @@ public class DialogUtils {
         ((TextView) inflate.findViewById(R.id.imprint_title)).setText(titleName);
         View head = LayoutInflater.from(context).inflate(R.layout.imprint_content_item, null);
         content.addView(head, LinearLayout.LayoutParams.MATCH_PARENT, DisplayUtils.dip2px(30));
-        LimitHeightLinearLayout imprintContainer = inflate.findViewById(R.id.imprint_container);
-        imprintContainer.setLimitHeight((int) (context.getResources().getDisplayMetrics().heightPixels * 0.8));
+        MaxHeightLinearLayout imprintContainer = inflate.findViewById(R.id.imprint_container);
+        imprintContainer.setMaxHeight((int) (context.getResources().getDisplayMetrics().heightPixels * 0.8));
 
         ArrayList<ApkEntity> list = gameEntity.getApk();
         SettingsEntity settings = Config.getSettings();
@@ -1436,30 +902,9 @@ public class DialogUtils {
     }
 
     public static void showPluggableNeverRemindDialog(Context context, String nameAndPlatform, @NonNull ConfirmListener listener) {
-        context = checkDialogContext(context);
-
-        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
-
-        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_pluggable_never_remind, null);
-
-        View cancelBtn = contentView.findViewById(R.id.cancel);
-        View confirmBtn = contentView.findViewById(R.id.confirm);
-        TextView contentTv = contentView.findViewById(R.id.content);
-
-        contentTv.setText(("助手首页将不再提示《" + nameAndPlatform + "》的所有插件化消息，确定吗？"));
-
-        cancelBtn.setOnClickListener(v -> {
-            dialog.dismiss();
-        });
-
-        confirmBtn.setOnClickListener(v -> {
-            listener.onConfirm();
-            dialog.dismiss();
-        });
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(contentView);
-        dialog.show();
+        String content = "助手首页将不再提示《" + nameAndPlatform + "》的所有插件化消息，确定吗？";
+        DialogHelper.showDialog(context, "温馨提醒", content, "确定", "取消", listener::onConfirm, () -> {
+        }, false, "", "");
     }
 
     public static void showRegulationTestDialog(Context context, @NonNull ConfirmListener confirmListener, @NonNull CancelListener cancelListener) {
@@ -1534,7 +979,7 @@ public class DialogUtils {
         confirmBtn.setOnClickListener(v -> {
             dialog.dismiss();
             String hint = "《" + downloadEntity.getName() + "》游戏安装包解压失败，问题反馈：";
-            SuggestionActivity.startSuggestionActivity(activityContext, SuggestType.normal, null, hint);
+            HelpAndFeedbackBridge.startSuggestionActivity(activityContext, SuggestType.normal, null, hint);
         });
 
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
@@ -1569,100 +1014,6 @@ public class DialogUtils {
         dialog.show();
     }
 
-    public static void showVideoComplaintDialog(Context context,
-                                                List<String> options,
-                                                List<String> disabledOptions,
-                                                OptionCallback callback) {
-        context = checkDialogContext(context);
-
-        Dialog dialog = new Dialog(context);
-
-        View view = LayoutInflater.from(context).inflate(R.layout.dialog_video_complaint, null, false);
-        LinearLayout complaintContainer = view.findViewById(R.id.complaintContainer);
-        ConstraintLayout otherComplaintContainer = view.findViewById(R.id.otherComplaintContainer);
-        EditText complaintCommentEt = view.findViewById(R.id.complaintCommentEt);
-        TextView backTv = view.findViewById(R.id.backTv);
-        TextView commitTv = view.findViewById(R.id.commitTv);
-        Context finalContext = context;
-        //添加透明阴影，实现类似 clipPadding=false 效果
-        complaintCommentEt.setShadowLayer(complaintCommentEt.getExtendedPaddingBottom(), 0F, 0F, Color.TRANSPARENT);
-
-        ExtensionsKt.setTextChangedListener(complaintCommentEt, (s, start, before, count) -> {
-            commitTv.setTextColor(ContextCompat.getColor(finalContext, s.toString().trim().isEmpty() ? R.color.text_subtitleDesc : R.color.theme_font));
-            return null;
-        });
-
-        for (String option : options) {
-            TextView reportTv = new TextView(context);
-            reportTv.setText(option);
-            reportTv.setTextSize(16F);
-            if (disabledOptions != null && disabledOptions.contains(option)) {
-                reportTv.setTextColor(ContextCompat.getColor(context, R.color.btn_gray));
-            } else {
-                reportTv.setTextColor(ContextCompat.getColor(context, R.color.title));
-                reportTv.setBackgroundResource(R.drawable.textview_white_style);
-            }
-            reportTv.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
-                    LinearLayout.LayoutParams.WRAP_CONTENT));
-            reportTv.setPadding(DisplayUtils.dip2px(context, 20F), DisplayUtils.dip2px(context, 17F),
-                    DisplayUtils.dip2px(context, 20F), DisplayUtils.dip2px(context, 17F));
-            if (option.equals("其它")) {
-                ExtensionsKt.setDrawableEnd(reportTv, R.drawable.ic_complaint_arrow_right, DisplayUtils.dip2px(6F), DisplayUtils.dip2px(6F));
-            }
-            complaintContainer.addView(reportTv);
-
-            reportTv.setOnClickListener(v -> {
-                if (option.equals("其它")) {
-                    complaintContainer.setVisibility(View.GONE);
-                    otherComplaintContainer.setVisibility(View.VISIBLE);
-                    complaintCommentEt.requestFocus();
-                    Util_System_Keyboard.showSoftKeyboard(finalContext, complaintCommentEt);
-                } else {
-                    dialog.cancel();
-                    JSONObject jsonObject = new JSONObject();
-                    try {
-                        jsonObject.put("reason", reportTv.getText().toString());
-                    } catch (JSONException e) {
-                        e.printStackTrace();
-                    }
-                    callback.onClicked(jsonObject.toString());
-                }
-            });
-        }
-
-        backTv.setOnClickListener(v -> {
-            Util_System_Keyboard.hideSoftKeyboard(finalContext, complaintCommentEt);
-            complaintContainer.setVisibility(View.VISIBLE);
-            otherComplaintContainer.setVisibility(View.GONE);
-        });
-        commitTv.setOnClickListener(v -> {
-            if (complaintCommentEt.getText().toString().isEmpty()) {
-                ToastUtils.INSTANCE.showToast("请先输入说明~");
-                return;
-            }
-            dialog.cancel();
-            JSONObject jsonObject = new JSONObject();
-            try {
-                jsonObject.put("reason", "其它");
-                jsonObject.put("description", complaintCommentEt.getText().toString());
-            } catch (JSONException e) {
-                e.printStackTrace();
-            }
-            callback.onClicked(jsonObject.toString());
-        });
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(view);
-        dialog.show();
-        Window window = dialog.getWindow();
-        if (window != null) {
-            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-            WindowManager.LayoutParams params = window.getAttributes();
-            params.width = context.getResources().getDisplayMetrics().widthPixels - DisplayUtils.dip2px(40f);
-            window.setAttributes(params);
-        }
-    }
-
     public static void showViewBadgeDialog(Context context, Badge badge, ConfirmListener listener) {
         context = checkDialogContext(context);
 
@@ -1842,7 +1193,7 @@ public class DialogUtils {
             @Override
             public Unit invoke() {
                 SimpleGameEntity entity = new SimpleGameEntity(gameId, gameName, "");
-                SuggestionActivity.startSuggestionActivity(finalContext, SuggestType.gameQuestion, "notfound", "模拟器安装包解析错误", entity, "-");
+                HelpAndFeedbackBridge.startSuggestionActivity(finalContext, SuggestType.gameQuestion, "notfound", "模拟器安装包解析错误", entity, "-");
                 dialog.dismiss();
                 return null;
             }
@@ -1951,36 +1302,6 @@ public class DialogUtils {
         return dialog;
     }
 
-    public static void showReceiveLibaoSuccessDialog(Context context, String title, String des, String libaoCode, ConfirmListener listener) {
-        context = checkDialogContext(context);
-
-        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
-        DialogReceiveLibaoSuccessBinding binding = DialogReceiveLibaoSuccessBinding.inflate(LayoutInflater.from(context));
-        binding.title.setText(title);
-        binding.libaoCodeTv.setText(libaoCode);
-        binding.desTv.setText(des);
-
-        binding.confirm.setOnClickListener(v -> {
-            dialog.dismiss();
-            listener.onConfirm();
-        });
-
-        binding.cancel.setOnClickListener(v -> {
-            dialog.dismiss();
-        });
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(binding.getRoot());
-        dialog.show();
-        Window window = dialog.getWindow();
-        if (window != null) {
-            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-            WindowManager.LayoutParams params = window.getAttributes();
-            params.width = context.getResources().getDisplayMetrics().widthPixels - DisplayUtils.dip2px(60f);
-            window.setAttributes(params);
-        }
-    }
-
     public static void showReserveSuccess2WechatBindDialog(Context context, ConfirmListener confirmListener, CancelListener cancelListener) {
         context = checkDialogContext(context);
 
@@ -2045,7 +1366,7 @@ public class DialogUtils {
 
         binding.bindPhoneBtn.setOnClickListener(v -> {
             dialog.dismiss();
-            Intent intent = BindPhoneActivity.getNormalIntent(finalContext, false);
+            Intent intent = SettingBridge.INSTANCE.getBindPhoneNormalIntent(finalContext, false);
             finalContext.startActivity(intent);
         });
 

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

@@ -10,11 +10,8 @@ import android.os.Bundle
 import android.text.TextUtils
 import androidx.appcompat.app.AppCompatActivity
 import com.gh.common.constant.Config
-import com.gh.common.exposure.ExposureEvent
-import com.gh.common.exposure.ExposureEvent.Companion.createEvent
 import com.gh.common.exposure.ExposureManager.log
 import com.gh.common.exposure.ExposureTraceUtils.appendTrace
-import com.gh.common.exposure.ExposureType
 import com.gh.common.util.EntranceUtils.jumpActivity
 import com.gh.gamecenter.*
 import com.gh.gamecenter.amway.AmwayActivity
@@ -25,20 +22,25 @@ import com.gh.gamecenter.common.base.activity.BaseActivity
 import com.gh.gamecenter.common.base.activity.BaseActivity_TabLayout
 import com.gh.gamecenter.common.base.activity.ToolBarActivity
 import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout
+import com.gh.gamecenter.common.constant.CommonConsts
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.constant.EntranceConsts.*
-import com.gh.gamecenter.common.entity.CommunityEntity
-import com.gh.gamecenter.common.entity.Display
-import com.gh.gamecenter.common.entity.LinkEntity
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.common.entity.*
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.AppExecutor
+import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.discovery.DiscoveryActivity
 import com.gh.gamecenter.download.DownloadFragment.Companion.INDEX_UPDATE
 import com.gh.gamecenter.entity.*
 import com.gh.gamecenter.eventbus.EBSkip
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.entity.MeEntity
+import com.gh.gamecenter.feature.exposure.ExposureEvent
+import com.gh.gamecenter.feature.exposure.ExposureEvent.Companion.createEvent
+import com.gh.gamecenter.feature.exposure.ExposureType
 import com.gh.gamecenter.forum.detail.ForumDetailActivity
 import com.gh.gamecenter.forum.home.CommunityHomeFragment
 import com.gh.gamecenter.fragment.MainWrapperFragment
@@ -51,8 +53,8 @@ import com.gh.gamecenter.gamedetail.GameDetailFragment
 import com.gh.gamecenter.gamedetail.fuli.kaifu.ServersCalendarActivity
 import com.gh.gamecenter.gamedetail.history.HistoryApkListActivity
 import com.gh.gamecenter.gamedetail.rating.RatingReplyActivity
+import com.gh.gamecenter.help.HelpAndFeedbackBridge
 import com.gh.gamecenter.login.user.UserManager
-import com.gh.gamecenter.mygame.PlayedGameActivity
 import com.gh.gamecenter.personalhome.UserHomeActivity
 import com.gh.gamecenter.personalhome.background.PersonalityBackgroundActivity
 import com.gh.gamecenter.personalhome.border.AvatarBorderActivity
@@ -65,10 +67,9 @@ import com.gh.gamecenter.qa.video.detail.ForumVideoDetailActivity
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.servers.GameServerTestActivity
 import com.gh.gamecenter.servers.GameServersActivity
-import com.gh.gamecenter.setting.view.security.BindPhoneActivity
-import com.gh.gamecenter.setting.view.SettingActivity
+import com.gh.gamecenter.servers.gametest2.GameServerTestV2Activity
+import com.gh.gamecenter.setting.SettingBridge
 import com.gh.gamecenter.subject.SubjectActivity
-import com.gh.gamecenter.suggest.SuggestType
 import com.gh.gamecenter.tag.TagsActivity
 import com.gh.gamecenter.toolbox.ToolBoxBlockActivity
 import com.gh.gamecenter.video.data.VideoDataActivity
@@ -252,11 +253,6 @@ object DirectUtils {
                 path
             )
 
-            "community_special_column" -> directAskColumnDetail(
-                context, linkEntity.link
-                    ?: "", linkEntity.community!!, entrance, path
-            )
-
             "web", "inurl", "web链接" -> {
                 when {
                     linkEntity.link!!.contains("v.douyin") && PackageHelper.localPackageNameSet.contains("com.ss.android.ugc.aweme") -> {
@@ -287,11 +283,6 @@ object DirectUtils {
                 )
             )
 
-            "all_community_article" -> directSimpleArticleList(
-                context, linkEntity.link
-                    ?: "", entrance, path
-            )
-
             "category", "分类" -> directCategoryDirectory(context, linkEntity.link!!, linkEntity.text!!)
 
             "catalog" -> directCatalog(context, linkEntity.link!!, linkEntity.text!!, entrance, path)
@@ -359,7 +350,7 @@ object DirectUtils {
 
             "mobile_bind" -> {
                 CheckLoginUtils.checkLogin(context, entrance) {
-                    context.startActivity(BindPhoneActivity.getNormalIntent(context, false))
+                    context.startActivity(SettingBridge.getBindPhoneNormalIntent(context, false))
                 }
             }
 
@@ -389,7 +380,7 @@ object DirectUtils {
 
             "etiquette_exam" -> directToRegulationTestPage(context)
 
-            "setting" -> context.startActivity(SettingActivity.getIntent(context, false, entrance))
+            "setting" -> context.startActivity(SettingBridge.getSettingIntent(context, false, entrance))
 
             "index_page" -> directToHomeTab(context)
 
@@ -440,6 +431,8 @@ object DirectUtils {
 
             "explore_column" -> context.startActivity(DiscoveryActivity.getIntent(context, entrance))
 
+            "column_test_v2" -> context.startActivity(GameServerTestV2Activity.getIntent(context, entrance))
+
             "" -> {
                 // do nothing
             }
@@ -459,8 +452,9 @@ object DirectUtils {
     @JvmStatic
     fun directToQa(context: Context, text: String? = "", id: String) {
         if (id.isEmpty()) return
+        val destination = RouteConsts.activity.qaActivity.toDestinationClass()
         val bundle = Bundle()
-        bundle.putString(KEY_TO, QaActivity::class.java.simpleName)
+        bundle.putString(KEY_TO, destination?.name ?: "")
         bundle.putString(KEY_NAVIGATION_TITLE, text)
         bundle.putString(KEY_QA_ID, id)
         jumpActivity(context, bundle)
@@ -472,8 +466,9 @@ object DirectUtils {
     @JvmStatic
     fun directToQaCollection(context: Context, text: String, id: String) {
         if (id.isEmpty()) return
+        val destination = RouteConsts.activity.qaActivity.toDestinationClass()
         val bundle = Bundle()
-        bundle.putString(KEY_TO, QaActivity::class.java.simpleName)
+        bundle.putString(KEY_TO, destination?.name ?: "")
         bundle.putString(KEY_NAVIGATION_TITLE, text)
         bundle.putString(KEY_QA_COLLECTION_ID, id)
         jumpActivity(context, bundle)
@@ -591,19 +586,21 @@ object DirectUtils {
         entrance: String? = null,
         path: String? = null
     ) {
-        directToHomeActivity(context, userId, "", position, entrance, path)
+        directToHomeActivity(context, userId, "", "", position, entrance, path)
     }
 
     /**
      * 跳转至个人主页
      * @param position 定位到某个tab 0游戏 1发布
-     * @param type 类型
+     * @param type 类型 (发布)
+     * @param gameType 类型 (游戏)
      */
     @JvmStatic
     fun directToHomeActivity(
         context: Context,
         userId: String? = "",
         type: String? = "",
+        gameType: String? = "",
         position: Int? = 0,
         entrance: String? = null,
         path: String? = null
@@ -616,6 +613,7 @@ object DirectUtils {
         bundle.putString(KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path))
         bundle.putString(KEY_PATH, path)
         bundle.putString(KEY_TYPE, UserHistoryViewModel.TYPE.fromValue(type).value)
+        bundle.putString(KEY_GAME, gameType)
         bundle.putInt(KEY_POSITION, position ?: 0)
         jumpActivity(context, bundle)
     }
@@ -710,11 +708,6 @@ object DirectUtils {
         jumpActivity(context, bundle)
     }
 
-    // 跳转至用户玩过的游戏
-    fun directToPlayedGame(context: Context, userId: String, entrance: String = "", path: String = "") {
-        context.startActivity(PlayedGameActivity.getIntent(context, userId, entrance, path))
-    }
-
     // 专栏
     @JvmStatic
     fun directToSubject(
@@ -754,7 +747,8 @@ object DirectUtils {
     ) {
         val bundle = Bundle()
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
-        bundle.putString(KEY_TO, SuggestionActivity::class.java.simpleName)
+        val destination = RouteConsts.activity.suggestionActivity.toDestinationClass()
+        bundle.putString(KEY_TO, destination?.name ?: "")
         if (isQaFeedback) {
             bundle.putBoolean(KEY_IS_QA_FEEDBACK, true)
             bundle.putString(KEY_QA_CONTENT_ID, qaContentId)
@@ -784,7 +778,8 @@ object DirectUtils {
     ) {
         val bundle = Bundle()
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
-        bundle.putString(KEY_TO, SuggestionActivity::class.java.simpleName)
+        val destination = RouteConsts.activity.suggestionActivity.toDestinationClass()
+        bundle.putString(KEY_TO, destination?.name ?: "")
         if (isQaFeedback) {
             bundle.putBoolean(KEY_IS_QA_FEEDBACK, true)
             bundle.putString(KEY_QA_CONTENT_ID, qaContentId)
@@ -897,15 +892,6 @@ object DirectUtils {
         jumpActivity(context, bundle)
     }
 
-    // 个人-系统消息
-    @JvmStatic
-    fun directToOfficialNotification(context: Context, entrance: String? = null) {
-        val bundle = Bundle()
-        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
-        bundle.putString(KEY_TO, MessageKeFuActivity::class.java.simpleName)
-        jumpActivity(context, bundle)
-    }
-
     @JvmStatic
     fun directToExternalBrowser(context: Context, url: String) {
         try {
@@ -1093,7 +1079,7 @@ object DirectUtils {
             bundle.putString(KEY_PATH, path)
             jumpActivity(context, bundle)
         } else {
-            DialogUtils.showLowSystemVersionDialog(context)
+            DialogHelper.showVideoUnsupportedDialog(context)
         }
     }
 
@@ -1135,7 +1121,7 @@ object DirectUtils {
             bundle.putString(KEY_SECTION_NAME, sectionName)
             jumpActivity(context, bundle)
         } else {
-            DialogUtils.showLowSystemVersionDialog(context)
+            DialogHelper.showVideoUnsupportedDialog(context)
         }
     }
 
@@ -1282,30 +1268,6 @@ object DirectUtils {
         }
     }
 
-    /**
-     * 跳转梦工厂小游戏
-     */
-    /*@JvmStatic
-    fun directLetoGameCenter(context: Context) {
-        if (UserManager.getInstance().isLoggedIn) {
-            UserManager.getInstance().userInfoEntity?.run {
-                MgcAccountManager.syncAccount(context, if (idCard != null) idCard!!.name else name, mobile, name, icon, true,
-                        object : SyncUserInfoListener {
-                            override fun onSuccess(data: LoginResultBean?) {}
-
-                            override fun onFail(code: String?, message: String?) {}
-                        })
-            }
-        } else {
-            MgcAccountManager.exitAccount(context, object : SyncUserInfoListener {
-                override fun onSuccess(data: LoginResultBean?) {}
-
-                override fun onFail(code: String?, message: String?) {}
-            })
-        }
-        Leto.getInstance().startGameCenter(context)
-    }*/
-
     /**
      * 跳转分类
      */
@@ -1372,47 +1334,6 @@ object DirectUtils {
         jumpActivity(context, bundle)
     }
 
-    /**
-     * 跳转到问题标签详情
-     */
-    @JvmStatic
-    fun directAskColumnLabelDetail(
-        context: Context,
-        tag: String,
-        community: CommunityEntity,
-        entrance: String? = null,
-        path: String? = ""
-    ) {
-//        val bundle = Bundle()
-//        bundle.putString(KEY_TO, AskColumnDetailActivity::class.java.name)
-//        bundle.putString(KEY_ASK_TAG, tag)
-//        bundle.putParcelable(KEY_COMMUNITY_DATA, community)
-//        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
-//        bundle.putString(KEY_PATH, path)
-//        jumpActivity(context, bundle)
-    }
-
-    /**
-     * 跳转到专栏详情
-     */
-    @JvmStatic
-    fun directAskColumnDetail(
-        context: Context,
-        columnId: String,
-        community: CommunityEntity,
-        entrance: String? = null,
-        path: String? = ""
-    ) {
-//        if (columnId.isEmpty()) return
-//        val bundle = Bundle()
-//        bundle.putString(KEY_TO, AskColumnDetailActivity::class.java.name)
-//        bundle.putString(KEY_COLUMN_ID, columnId)
-//        bundle.putParcelable(KEY_COMMUNITY_DATA, community)
-//        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
-//        bundle.putString(KEY_PATH, path)
-//        jumpActivity(context, bundle)
-    }
-
     /**
      * 跳转到板块
      */
@@ -1448,20 +1369,6 @@ object DirectUtils {
         jumpActivity(context, bundle)
     }
 
-    /**
-     * 社区文章
-     */
-    @JvmStatic
-    fun directSimpleArticleList(context: Context, sortType: String, entrance: String? = null, path: String? = "") {
-//        if (sortType.isEmpty()) return
-//        val bundle = Bundle()
-//        bundle.putString(KEY_TO, SimpleArticleListActivity::class.java.name)
-//        bundle.putString(KEY_TYPE, sortType)
-//        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
-//        bundle.putString(KEY_PATH, path)
-//        jumpActivity(context, bundle)
-    }
-
     @JvmStatic
     fun directGameZone(context: Context, gameId: String, url: String, entrance: String? = null) {
         RetrofitManager.getInstance()
@@ -1518,7 +1425,7 @@ object DirectUtils {
             context.startActivity(intent)
 
             // 这里换个线程操作是为了做一点延时
-            AppExecutor.ioExecutor.execute {
+            runOnIoThread {
                 EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_HOME))
             }
         } else {
@@ -1539,7 +1446,7 @@ object DirectUtils {
             context.startActivity(intent)
 
             // 这里换个线程操作是为了做一点延时
-            AppExecutor.ioExecutor.execute {
+            runOnIoThread {
                 EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_BBS))
                 EventBus.getDefault().post(EBSkip(CommunityHomeFragment.EB_TAB, position))
             }
@@ -1562,7 +1469,7 @@ object DirectUtils {
             context.startActivity(intent)
 
             // 这里换个线程操作是为了做一点延时
-            AppExecutor.ioExecutor.execute {
+            runOnIoThread {
                 EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_VIDEO))
             }
         } else {
@@ -1581,7 +1488,7 @@ object DirectUtils {
             context.startActivity(intent)
 
             // 这里换个线程操作是为了做一点延时
-            AppExecutor.ioExecutor.execute {
+            runOnIoThread {
                 EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_PERSONAL))
             }
         } else {
@@ -1591,12 +1498,13 @@ object DirectUtils {
 
     /**
      * 跳转至使用帮助与反馈，请不要随意修改方法名
-     * @param position 使用帮助：[HelpAndFeedbackActivity.HELP_ITEM],意见反馈：[HelpAndFeedbackActivity.SUGGESTION_ITEM]
+     * @param position 使用帮助：[CommonConsts.TAB_MAIN],意见反馈：[CommonConsts.TAB_SUB]
      */
     @JvmStatic
-    fun directToHelpAndFeedback(context: Context, position: Int = HelpAndFeedbackActivity.HELP_ITEM) {
+    fun directToHelpAndFeedback(context: Context, position: Int = CommonConsts.TAB_MAIN) {
+        val destination = RouteConsts.activity.helpAndFeedbackActivity.toDestinationClass()
         val bundle = Bundle()
-        bundle.putString(KEY_TO, HelpAndFeedbackActivity::class.java.name)
+        bundle.putString(KEY_TO, destination?.name ?: "")
         bundle.putInt(BaseActivity_TabLayout.PAGE_INDEX, position)
         jumpActivity(context, bundle)
     }
@@ -1952,7 +1860,7 @@ object DirectUtils {
         diagnosis: String = "",
         requestCode: Int? = null
     ) {
-        val intent = SuggestionActivity.getIntent(
+        val intent = HelpAndFeedbackBridge.getIntent(
             context,
             type,
             hiddenHint,

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

@@ -4,8 +4,8 @@ import android.content.Context
 import android.os.Build
 import com.gh.gamecenter.common.utils.DialogHelper
 import com.gh.gamecenter.core.utils.EmptyCallback
-import com.gh.gamecenter.entity.ApkEntity
-import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.feature.entity.ApkEntity
+import com.gh.gamecenter.feature.entity.GameEntity
 
 object DownloadDialogHelper {
 

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

@@ -3,8 +3,9 @@ package com.gh.common.util
 import com.gh.common.filter.RegionSettingHelper
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.common.retrofit.Response
+import com.gh.gamecenter.feature.utils.ApkActiveUtils
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import io.reactivex.schedulers.Schedulers

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

@@ -10,14 +10,14 @@ import androidx.recyclerview.widget.RecyclerView
 import com.gh.common.chain.*
 import com.gh.common.constant.Config
 import com.gh.common.dialog.DeviceRemindDialog
-import com.gh.common.exposure.ExposureEvent
+import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.common.filter.RegionSettingHelper
 import com.gh.common.history.HistoryHelper
 import com.gh.common.repository.ReservationRepository
 import com.gh.common.simulator.NewSimulatorGameManager
 import com.gh.common.simulator.SimulatorDownloadManager
 import com.gh.common.simulator.SimulatorGameManager
-import com.gh.common.view.DownloadButton
+import com.gh.gamecenter.feature.view.DownloadButton
 import com.gh.common.xapk.XapkInstaller
 import com.gh.common.xapk.XapkInstaller.cancelUnzipTask
 import com.gh.common.xapk.XapkUnzipStatus
@@ -33,8 +33,8 @@ import com.gh.gamecenter.common.entity.LinkEntity
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.energy.EnergyBridge
-import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.entity.PluginLocation
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.entity.PluginLocation
 import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment
 import com.gh.gamecenter.manager.PackagesManager
 import com.gh.gamecenter.teenagermode.TeenagerModeActivity
@@ -119,7 +119,7 @@ object DownloadItemUtils {
     fun updateItemWithReserveStatus(holder: GameViewHolder, gameEntity: GameEntity) {
         if ("download" == gameEntity.reserveStatus) {
             // 已上线
-            updateItem(holder.gameDes.context, gameEntity, holder, false)
+            updateItem(holder.gameDownloadBtn.context, gameEntity, holder, false)
         } else if ("appointment" == gameEntity.reserveStatus) {
             // 已预约
             holder.gameDownloadBtn.text = "已预约"
@@ -316,7 +316,9 @@ object DownloadItemUtils {
                         DownloadStatus.cancel -> {
                             GameUtils.setDownloadBtnStatus(context, gameEntity, downloadBtn, pluginLocation)
                         }
-                        else -> {}
+                        else -> {
+                            // do nothing
+                        }
                     }
                 }
             } else {
@@ -337,20 +339,24 @@ object DownloadItemUtils {
     ) {
         val entryMap: ArrayMap<String, DownloadEntity> = gameEntity.getEntryMap()
         val apkEntity = gameEntity.getApk()[0]
+        var downloadEntity: DownloadEntity? = null
         if (entryMap.isNotEmpty()) {
-            val downloadEntity = entryMap[apkEntity.getPlatform()]
-            if (downloadEntity != null) {
-                if (downloadEntity.isSimulatorGame()) {
-                    if (downloadEntity.status != DownloadStatus.done) {
-                        // 更改进度条和提示文本的状态
-                        changeStatus(context, holder, downloadEntity)
-                        return
-                    }
-                } else {
+            downloadEntity = entryMap[apkEntity.getPlatform()]
+        }
+        if (downloadEntity == null) {
+            downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
+        }
+        if (downloadEntity != null) {
+            if (downloadEntity.isSimulatorGame()) {
+                if (downloadEntity.status != DownloadStatus.done) {
                     // 更改进度条和提示文本的状态
                     changeStatus(context, holder, downloadEntity)
                     return
                 }
+            } else {
+                // 更改进度条和提示文本的状态
+                changeStatus(context, holder, downloadEntity)
+                return
             }
         }
         updateItemViewStatus(holder, briefStyle, gameEntity.columnRecommend, isShowRecommendStar)
@@ -365,18 +371,22 @@ object DownloadItemUtils {
         isShowRecommendStar: Boolean = false
     ) {
         val entryMap = gameEntity.getEntryMap()
+        var downloadEntity: DownloadEntity? = null
         if (entryMap.isNotEmpty()) {
             val queue = DownloadManager.getInstance().getQueue(gameEntity.name)
-            val downloadEntity = if (queue != null && !queue.isEmpty()) {
+            downloadEntity = if (queue != null && !queue.isEmpty()) {
                 entryMap[queue.peek()]
             } else {
                 entryMap[entryMap.keyAt(0)]
             }
-            if (downloadEntity != null) {
-                // 更改进度条和提示文本的状态
-                changeStatus(context, holder, downloadEntity, gameEntity.getApk().size > 1)
-                return
-            }
+        }
+        if (downloadEntity == null) {
+            downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
+        }
+        if (downloadEntity != null) {
+            // 更改进度条和提示文本的状态
+            changeStatus(context, holder, downloadEntity, gameEntity.getApk().size > 1)
+            return
         }
         updateItemViewStatus(holder, briefStyle, gameEntity.columnRecommend, isShowRecommendStar)
     }
@@ -463,7 +473,7 @@ object DownloadItemUtils {
         if (isShowRecommendStar && holder.recommendStarInfo != null) {
             holder.recommendStarInfo!!.visibility = View.VISIBLE
             if (holder.gameRating != null) holder.gameRating!!.visibility = View.GONE
-            holder.gameDes.visibility = View.GONE
+            holder.gameDes?.visibility = View.GONE
             return
         }
 
@@ -473,13 +483,13 @@ object DownloadItemUtils {
                 holder.recommendContainer!!.visibility = View.VISIBLE
             }
             if (holder.gameRating != null) holder.gameRating!!.visibility = View.GONE
-            holder.gameDes.visibility = View.GONE
-            holder.recommendTv.text = recommendStyle.text
+            holder.gameDes?.visibility = View.GONE
+            holder.recommendTv?.text = recommendStyle.text
             if (TextUtils.isEmpty(recommendStyle.icon)) {
-                holder.recommendIv.visibility = View.GONE
+                holder.recommendIv?.visibility = View.GONE
                 holder.recommendContainer?.setPadding(6F.dip2px(), 0, 8F.dip2px(), 0)
             } else {
-                holder.recommendIv.visibility = View.VISIBLE
+                holder.recommendIv?.visibility = View.VISIBLE
                 ImageUtils.display(holder.recommendIv, recommendStyle.icon)
             }
             return
@@ -496,9 +506,9 @@ object DownloadItemUtils {
 
         // 缺省情况下回落到游戏简介
         if (TextUtils.isEmpty(briefStyle) || briefStyle!!.contains("brief") || briefStyle.contains("recommend")) {
-            holder.gameDes.visibility = View.VISIBLE
+            holder.gameDes?.visibility = View.VISIBLE
         } else {
-            holder.gameDes.visibility = View.GONE
+            holder.gameDes?.visibility = View.GONE
         }
     }
 
@@ -565,7 +575,7 @@ object DownloadItemUtils {
     @JvmStatic
     fun setOnClickListener(
         context: Context,
-        downloadBtn: DownloadButton,
+        downloadBtn: View,
         gameEntity: GameEntity,
         position: Int,
         adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder?>?,
@@ -645,30 +655,22 @@ object DownloadItemUtils {
                     allStateClickCallback?.onCallback()
                     clickCallback?.onCallback()
                     if ("download" == gameEntity.reserveStatus) {
-                        ReservationHelper.showDeleteReservationDialog(context, object : EmptyCallback {
-                            override fun onCallback() {
-                                ReservationHelper.deleteReservation(gameEntity, object : EmptyCallback {
-                                    override fun onCallback() {
-                                        adapter?.notifyItemChanged(position)
-                                        refreshCallback?.onCallback()
-                                    }
-                                })
+                        ReservationHelper.showDeleteReservationDialog(context) {
+                            ReservationHelper.deleteReservation(gameEntity) {
+                                adapter?.notifyItemChanged(position)
+                                refreshCallback?.onCallback()
                             }
-                        })
+                        }
                     } else {
-                        ReservationHelper.showCancelReservationDialog(context, object : EmptyCallback {
-                            override fun onCallback() {
-                                NewFlatLogUtils.logMyGameCancelReserveDialogClick(
-                                    "确定取消",
-                                    gameEntity.id,
-                                    gameEntity.name ?: ""
-                                )
-                                ReservationHelper.cancelReservation(gameEntity, object : EmptyCallback {
-                                    override fun onCallback() {
-                                        adapter?.notifyItemChanged(position)
-                                        refreshCallback?.onCallback()
-                                    }
-                                })
+                        ReservationHelper.showCancelReservationDialog(context, {
+                            NewFlatLogUtils.logMyGameCancelReserveDialogClick(
+                                "确定取消",
+                                gameEntity.id,
+                                gameEntity.name ?: ""
+                            )
+                            ReservationHelper.cancelReservation(gameEntity) {
+                                adapter?.notifyItemChanged(position)
+                                refreshCallback?.onCallback()
                             }
                         }, object : CancelListener {
                             override fun onCancel() {
@@ -711,26 +713,24 @@ object DownloadItemUtils {
             }
         } else if (gameEntity.getApk().size == 1) {
             downloadBtn.setOnClickListener {
-                val clickRunnable = object : EmptyCallback {
-                    override fun onCallback() {
-                        allStateClickCallback?.onCallback()
-                        clickCallback?.onCallback()
-                        onNormalClick(
-                            context,
-                            downloadBtn,
-                            gameEntity,
-                            position,
-                            adapter,
-                            entrance,
-                            location,
-                            traceEvent,
-                            refreshCallback
-                        )
-                    }
+                val clickRunnable = EmptyCallback {
+                    allStateClickCallback?.onCallback()
+                    clickCallback?.onCallback()
+                    onNormalClick(
+                        context,
+                        downloadBtn,
+                        gameEntity,
+                        position,
+                        adapter,
+                        entrance,
+                        location,
+                        traceEvent,
+                        refreshCallback
+                    )
                 }
 
                 // 启动不需要请求存储权限
-                if (downloadBtn.text.toString() == context.getString(R.string.launch)) {
+                if (downloadBtn is DownloadButton && downloadBtn.text == context.getString(R.string.launch)) {
                     clickRunnable.onCallback()
                 } else {
                     PermissionHelper.checkStoragePermissionBeforeAction(context, clickRunnable)
@@ -759,7 +759,7 @@ object DownloadItemUtils {
     @JvmOverloads
     fun onNormalClick(
         context: Context,
-        downloadBtn: DownloadButton,
+        downloadBtn: View?,
         gameEntity: GameEntity,
         position: Int,
         adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder?>?,
@@ -768,7 +768,7 @@ object DownloadItemUtils {
         traceEvent: ExposureEvent? = null,
         refreshCallback: EmptyCallback? = null
     ) {
-        val str = downloadBtn.text.toString()
+        val str = if (downloadBtn is DownloadButton) downloadBtn.text else context.getString(R.string.download)
         if (gameEntity.getApk().isEmpty()) return
         val apk = gameEntity.getApk().safelyGetInRelease(0) ?: return
         if (str == context.getString(R.string.download)) {
@@ -849,10 +849,8 @@ object DownloadItemUtils {
                 val isInstalledOldSimulator = SimulatorGameManager.isOldSimulatorInstalled(context)
                 var simulator = gameEntity.simulator
                 val newSimulator = Config.getNewSimulatorEntitySetting()
-                if (!isInstalledOldSimulator && newSimulator != null) {//在没有安装旧的模拟器且有配置新版模拟器 才使用新版模拟器 否则还是用以前旧的
-                    if (newSimulator.active) {
-                        simulator = newSimulator
-                    }
+                if (!isInstalledOldSimulator && newSimulator != null && newSimulator.active) {//在没有安装旧的模拟器且有配置新版模拟器 才使用新版模拟器 否则还是用以前旧的
+                    simulator = newSimulator
                 }
                 if (downloadEntity != null && SimulatorGameManager.isSimulatorGame(gameEntity) && !isInstalled && !isInstalledNewSimulator) {
                     SimulatorDownloadManager.getInstance().showDownloadDialog(
@@ -947,7 +945,7 @@ object DownloadItemUtils {
     private fun download(
         context: Context,
         gameEntity: GameEntity,
-        downloadBtn: DownloadButton,
+        downloadBtn: View?,
         entrance: String,
         location: String,
         isSubscribe: Boolean,
@@ -967,8 +965,10 @@ object DownloadItemUtils {
                 traceEvent
             )
             Utils.toast(context, gameEntity.name + "已加入下载队列")
-            downloadBtn.text = "0%"
-            downloadBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_NORMAL
+            if (downloadBtn is DownloadButton) {
+                downloadBtn.text = "0%"
+                downloadBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_NORMAL
+            }
             DeviceRemindDialog.showDeviceRemindDialog(context, gameEntity)
         } else {
             Utils.toast(context, msg)
@@ -977,15 +977,22 @@ object DownloadItemUtils {
 
     //插件化
     private fun plugin(
-        context: Context, gameEntity: GameEntity, downloadBtn: DownloadButton, entrance: String,
-        location: String, isSubscribe: Boolean, traceEvent: ExposureEvent?
+        context: Context,
+        gameEntity: GameEntity,
+        downloadBtn: View?,
+        entrance: String,
+        location: String,
+        isSubscribe: Boolean,
+        traceEvent: ExposureEvent?
     ) {
         val msg = FileUtils.isCanDownload(context, gameEntity.getApk()[0].size)
         if (TextUtils.isEmpty(msg)) {
             DownloadManager.createDownload(context, gameEntity, "插件化", entrance, location, isSubscribe, traceEvent)
             Utils.toast(context, gameEntity.name + "已加入下载队列")
-            downloadBtn.setText(R.string.downloading)
-            downloadBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN
+            if (downloadBtn is DownloadButton) {
+                downloadBtn.setText(R.string.downloading)
+                downloadBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN
+            }
         } else {
             Utils.toast(context, msg)
         }
@@ -993,8 +1000,11 @@ object DownloadItemUtils {
 
     //安装
     private fun install(
-        context: Context, gameEntity: GameEntity, position: Int,
-        adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder?>?, refreshCallback: EmptyCallback?
+        context: Context,
+        gameEntity: GameEntity,
+        position: Int,
+        adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder?>?,
+        refreshCallback: EmptyCallback?
     ) {
         val apkEntity = gameEntity.getApk()[0]
         val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)

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

@@ -35,7 +35,7 @@ object DownloadNotificationHelper {
     const val ACTION_DOWNLOAD = "com.gh.gamecenter.DOWNLOAD"
     const val ACTION_VDOWNLOAD = "com.gh.gamecenter.VDOWNLOAD"
 
-    private val mNotifyMap: MutableMap<String, Long> = mutableMapOf()
+    private val mNotifyMap: MutableMap<String, Long> by lazy { mutableMapOf() }
 
     private fun getNotificationManager(): NotificationManager {
         return HaloApp.getInstance().application.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
@@ -196,13 +196,6 @@ object DownloadNotificationHelper {
         }
     }
 
-    @JvmStatic
-    fun initDownloadNotification(downloadTasks: MutableList<DownloadEntity>) {
-        for (downloadTask in downloadTasks) {
-            addOrUpdateDownloadNotification(downloadTask)
-        }
-    }
-
     private fun getNotificationIcon(): Int {
         return R.mipmap.logo
     }

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

@@ -1,6 +1,5 @@
 package com.gh.common.util
 
-import android.preference.PreferenceManager
 import com.gh.common.constant.Config
 import com.gh.common.exposure.ExposureUtils
 import com.gh.common.simulator.SimulatorDownloadManager
@@ -9,28 +8,25 @@ import com.gh.common.xapk.XapkInstaller
 import com.gh.download.DownloadDataHelper
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
-import com.gh.gamecenter.SuggestionActivity
 import com.gh.gamecenter.common.base.activity.BaseActivity
 import com.gh.gamecenter.common.callback.ConfirmListener
 import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.entity.SimpleGameEntity
+import com.gh.gamecenter.common.entity.SuggestType
 import com.gh.gamecenter.common.eventbus.EBShowDialog
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.energy.EnergyBridge
-import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.entity.SimpleGameEntity
-import com.gh.gamecenter.entity.SimulatorEntity
 import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.entity.SimulatorEntity
+import com.gh.gamecenter.feature.utils.PlatformUtils
+import com.gh.gamecenter.help.HelpAndFeedbackBridge
 import com.gh.gamecenter.retrofit.RetrofitManager
-import com.gh.gamecenter.setting.view.GameDownloadSettingFragment
-import com.gh.gamecenter.suggest.SuggestType
 import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
-import com.lightgame.download.DataWatcher
-import com.lightgame.download.DownloadEntity
-import com.lightgame.download.DownloadStatus
-import com.lightgame.download.FileUtils
+import com.lightgame.download.*
 import com.lightgame.utils.AppManager
 import com.lightgame.utils.Utils
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -48,6 +44,8 @@ object DownloadObserver {
     // TODO 修复因为更改内存对象造成的双重下载完成事件问题，具体触发代码见 DownloadDao.updateSnapshotList
     private var mDoneDebouncePair: Pair<String, Long>? = null
 
+    private const val TEA_EVENT_DOWNLOAD_COMPLETE = "game_addiction"
+
     // 如果在WIFI状态下,下载自动暂停,则再重试一遍
     @JvmStatic
     fun initObserver() {
@@ -78,7 +76,7 @@ object DownloadObserver {
                     val currentActivity = AppManager.getInstance().currentActivity() ?: return
 
                     DialogHelper.showDialog(currentActivity, "下载失败", "下载链接已失效，建议提交反馈", "立即反馈", "取消", {
-                        SuggestionActivity.startSuggestionActivity(
+                        HelpAndFeedbackBridge.startSuggestionActivity(
                             currentActivity,
                             SuggestType.gameQuestion, "notfound",
                             StringUtils.buildString(downloadEntity.name, "，问题反馈：下载链接失效"),
@@ -201,6 +199,11 @@ object DownloadObserver {
         } else {
             statDoneEvent(downloadEntity)
 
+            if (!SPUtils.getBoolean(TEA_EVENT_DOWNLOAD_COMPLETE)) {
+                HaloApp.getInstance().flavorProvider.logEvent(TEA_EVENT_DOWNLOAD_COMPLETE)
+                SPUtils.setBoolean(TEA_EVENT_DOWNLOAD_COMPLETE, true)
+            }
+
             GameActivityDownloadHelper.clear()
 
             EnergyBridge.postEnergyTask("download_game", downloadEntity.gameId, downloadEntity.packageName)
@@ -266,7 +269,7 @@ object DownloadObserver {
                 } else {
                     val downloadType = downloadEntity.getMetaExtra(Constants.EXTRA_DOWNLOAD_TYPE)
                     // 是否是自动安装
-                    val isAutoInstall = SPUtils.getBoolean(GameDownloadSettingFragment.AUTO_INSTALL_SP_KEY, true)
+                    val isAutoInstall = SPUtils.getBoolean(Constants.SP_AUTO_INSTALL, true)
                     if (downloadType == Constants.SIMULATOR_DOWNLOAD || isAutoInstall) {
                         if (FileUtils.isEmptyFile(downloadEntity.path)) {
                             Utils.toast(mApplication, R.string.install_failure_hint)
@@ -367,6 +370,22 @@ object DownloadObserver {
         if (downloadEntity.isPluggable) {
             type = ExposureUtils.DownloadType.PLUGIN_DOWNLOAD
         }
+
+        var downloadSpeed = 0L
+        val elapsedTimeString = downloadEntity.meta[DownloadConfig.KEY_DOWNLOAD_ELAPSED_TIME]
+        if (elapsedTimeString != null) {
+            var elapsedTime = elapsedTimeString.toLong()
+            if (elapsedTime == 0L) {
+                elapsedTime = 1L
+                SentryHelper.onEvent(
+                    "DOWNLOAD_ELAPSED_TIME",
+                    "elapsedTime is zero",
+                    downloadEntity.gameId + ":" + downloadEntity.size
+                )
+            }
+            downloadSpeed = downloadEntity.size / elapsedTime
+        }
+
         val isPlatformRecommend =
             java.lang.Boolean.parseBoolean(downloadEntity.getMetaExtra(Constants.IS_PLATFORM_RECOMMEND))
         ExposureUtils.logADownloadCompleteExposureEvent(
@@ -378,6 +397,7 @@ object DownloadObserver {
             ),
             downloadEntity.platform,
             downloadEntity.exposureTrace,
+            downloadSpeed,
             downloadEntity.meta[DownloadEntity.DOWNLOAD_HOST_KEY] ?: "unknown",
             downloadEntity.meta[DownloadEntity.DOWNLOAD_PATH_KEY] ?: "unknown",
             type

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

@@ -19,7 +19,7 @@ import com.gh.gamecenter.common.utils.DialogHelper
 import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.toColor
 import com.gh.gamecenter.common.utils.toObject
-import com.gh.gamecenter.entity.ErrorEntity
+import com.gh.gamecenter.common.entity.ErrorEntity
 import com.halo.assistant.fragment.user.UserInfoEditFragment
 import com.halo.assistant.fragment.user.VerifyPhoneFragment
 import com.lightgame.utils.AppManager

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

@@ -3,10 +3,10 @@ package com.gh.common.util
 import android.app.Activity
 import android.os.Build
 import android.view.Gravity
+import android.view.View
 import android.widget.TextView
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.dip2px
-import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.energy.EnergyBridge
 import com.lightgame.utils.Util_System_Keyboard
 import com.lzf.easyfloat.EasyFloat
@@ -67,23 +67,14 @@ object FloatingBackViewManager {
                 }
 
                 dragEnd { view ->
-                    val statusBarHeight = DisplayUtils.getStatusBarHeight(activity.resources)
-
                     // 记录停止拖动的最后位置
-                    val outLocation = IntArray(2)
-                    view.getLocationInWindow(outLocation)
-                    val yOffset = outLocation[1]
+                    view.findViewById<View>(R.id.titleTv)?.apply {
+                        val outLocation = IntArray(2)
+                        getLocationOnScreen(outLocation)
+                        val yOffset = outLocation[1]
 
-                    if (yOffset <= statusBarHeight) {
-                        // 判断状态栏是否被消费
-                        if (yOffset == view.y.toInt()) {
-                            view.y = statusBarHeight.toFloat()
-                        } else {
-                            view.y = 0F
-                        }
+                        mLastPositionY = yOffset
                     }
-
-                    mLastPositionY = yOffset
                 }
             }
             .show()
@@ -113,8 +104,6 @@ object FloatingBackViewManager {
 
     /**
      * 停用返回小浮窗
-     * @param type 类型
-     * @param activityUrl 类型为活动的时候用的地址
      */
     @JvmStatic
     fun disableBackView() {

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

@@ -7,10 +7,7 @@ import androidx.appcompat.app.AppCompatActivity
 import com.gh.common.DefaultJsApi
 import com.gh.common.constant.Config
 import com.gh.common.dialog.CertificationDialog
-import com.gh.common.exposure.ExposureEvent
 import com.gh.common.exposure.ExposureManager
-import com.gh.common.exposure.ExposureSource
-import com.gh.common.exposure.ExposureType
 import com.gh.common.history.HistoryHelper
 import com.gh.common.repository.ReservationRepository
 import com.gh.common.simulator.NewSimulatorGameManager
@@ -35,9 +32,13 @@ import com.gh.gamecenter.core.utils.MtaHelper
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.energy.EnergyBridge
-import com.gh.gamecenter.entity.ApkEntity
-import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.entity.PluginLocation
+import com.gh.gamecenter.feature.entity.ApkEntity
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.entity.PluginLocation
+import com.gh.gamecenter.feature.exposure.ExposureEvent
+import com.gh.gamecenter.feature.exposure.ExposureSource
+import com.gh.gamecenter.feature.exposure.ExposureType
+import com.gh.gamecenter.feature.utils.ApkActiveUtils
 import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.retrofit.RetrofitManager
@@ -102,7 +103,7 @@ object GameActivityDownloadHelper {
                 // 开始玩
                 gameEntity.getApk().size == 0 && gameEntity.h5Link != null -> play(context, gameEntity)
                 // 下载
-                else -> handleDownload(context, event, gameEntity, entrance, location, this)
+                else -> handleDownloadStatus(context, event, gameEntity, entrance, location, this)
             }
         }
     }
@@ -166,8 +167,8 @@ object GameActivityDownloadHelper {
         context.startActivity(i)
     }
 
-    // 下载
-    private fun handleDownload(
+    // 处理下载的各种状态
+    private fun handleDownloadStatus(
         context: Context,
         event: DefaultJsApi.GameActivityEvent,
         gameEntity: GameEntity,
@@ -184,106 +185,183 @@ object GameActivityDownloadHelper {
         ) {
             ToastUtils.toast("${gameEntity.name}已加入下载队列")
         } else {
-            if (str == context.getString(R.string.download) || str == context.getString(R.string.attempt)) {
-                GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) {
-                    CertificationDialog.showCertificationDialog(context, gameEntity) {
-                        DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
-                            download(context, gameEntity, apk, isSubscribe, entrance, location, traceEvent)
-                        }
-                    }
+            when {
+                str == context.getString(R.string.download) || str == context.getString(R.string.attempt) -> {
+                    handleDownloadStatus(context, gameEntity, apk, entrance, location, traceEvent)
                 }
-                DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
-            } else if (str == context.getString(R.string.smooth)) {
-                VHelper.validateVSpaceBeforeAction(context, gameEntity) {
-                    GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) {
-                        CertificationDialog.showCertificationDialog(context, gameEntity) {
-                            DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
-                                download(context, gameEntity, apk, isSubscribe, entrance, location, traceEvent)
-                            }
-                        }
-                    }
+                str == context.getString(R.string.smooth) -> {
+                    handleSmoothStatus(context, gameEntity, apk, entrance, location, traceEvent)
                 }
-            } else if (str.contains("化")) {
-                if (gameEntity.pluggableCollection != null) {
-                    DownloadDialog.showDownloadDialog(context, gameEntity, traceEvent, entrance, location)
-                } else {
-                    CertificationDialog.showCertificationDialog(context, gameEntity) {
-                        DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
-                            plugin(context, gameEntity, apk, entrance, location, isSubscribe, traceEvent)
-                        }
-                    }
+                str.contains("化") -> {
+                    handlePluginStatus(context, gameEntity, apk, entrance, location, traceEvent)
                 }
-            } else if (str == context.getString(R.string.install)) {
-                val simulatorDownloadEntity = SimulatorGameManager.findDownloadEntityByUrl(apk.url)
-                if (gameEntity.simulator != null) {
-                    val isInstalled =
-                        PackageUtils.isInstalledFromAllPackage(context, gameEntity.simulator!!.apk!!.packageName)
-                    val isInstalledNewSimulator = SimulatorGameManager.isNewSimulatorInstalled(context)
-                    val isInstalledOldSimulator = SimulatorGameManager.isOldSimulatorInstalled(context)
-                    var simulator = gameEntity.simulator
-                    val newSimulator = Config.getNewSimulatorEntitySetting()
-                    if (!isInstalledOldSimulator && newSimulator != null) {//在没有安装旧的模拟器且有配置新版模拟器 才使用新版模拟器 否则还是用以前旧的
-                        if (newSimulator.active) {
-                            simulator = newSimulator
-                        }
-                    }
-                    if (simulatorDownloadEntity != null && SimulatorGameManager.isSimulatorGame(gameEntity) && !isInstalled && !isInstalledNewSimulator) {
-                        SimulatorDownloadManager.getInstance().showDownloadDialog(
-                            context, simulator,
-                            SimulatorDownloadManager.SimulatorLocation.LAUNCH, gameEntity.id, gameEntity.name!!, null
-                        )
-                        return
-                    }
+                str == context.getString(R.string.install) -> {
+                    handleInstallStatus(context, gameEntity, apk, downloadEntity)
                 }
-
-                if (gameEntity.isVGame()) {
-                    VHelper.installOrLaunch((context as AppCompatActivity), gameEntity.getUniquePackageName() ?: "")
-                } else {
-                    downloadEntity?.run {
-                        install(context, gameEntity, apk, this)
-                    }
+                str == context.getString(R.string.launch) -> {
+                    handleLaunchStatus(context, gameEntity, apk, entrance, location, traceEvent)
                 }
-            } else if (str == context.getString(R.string.launch)) {
-                EnergyBridge.postEnergyTask("play_game", gameEntity.id, gameEntity.getApk()[0].packageName)
-                //启动模拟器游戏
-                if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
-                    if (NewSimulatorGameManager.shouldShowUpdateNewSimulatorAlert(context)) {
-                        NewSimulatorGameManager.showUpdateNewsSimulator(context, null)
-                        return
-                    }
-                    val simulatorDownloadEntity =
-                        SimulatorGameManager.findDownloadEntityByUrl(gameEntity.getApk()[0].url)
-                    if (simulatorDownloadEntity != null) {
-                        val file = File(simulatorDownloadEntity.path)
-                        if (!file.exists()) {
-                            download(context, gameEntity, apk, false, entrance, location, traceEvent)
-                            return
-                        }
-                        NewFlatLogUtils.logSimulatorGameCardClick("启动")
-                        SimulatorGameManager.launchSimulatorGame(simulatorDownloadEntity, gameEntity)
-                    }
-                    return
+                str == context.getString(R.string.update) -> {
+                    handleUpdateStatus(context, gameEntity, apk, entrance, location, traceEvent)
                 }
-
-                if (gameEntity.isVGame()) {
-                    VHelper.installOrLaunch((context as AppCompatActivity), gameEntity.getUniquePackageName() ?: "")
-                    return
+                else -> {
+                    ToastUtils.toast("${gameEntity.name}已加入下载队列")
                 }
-
-                if (entrance.contains("我的游戏")) {
-                    MtaHelper.onEvent("我的游戏_启动", "启动", gameEntity.name)
-                }
-                PackageUtils.launchApplicationByPackageName(context, gameEntity.getApk()[0].packageName)
-            } else if (str == context.getString(R.string.update)) {
-                DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
-                    update(context, gameEntity, apk, entrance, location, isSubscribe, traceEvent)
-                }
-            } else {
-                ToastUtils.toast("${gameEntity.name}已加入下载队列")
             }
         }
     }
 
+    // 处理下载状态
+    private fun handleDownloadStatus(
+        context: Context,
+        gameEntity: GameEntity,
+        apk: ApkEntity,
+        entrance: String,
+        location: String,
+        traceEvent: ExposureEvent
+    ) {
+        GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) {
+            CertificationDialog.showCertificationDialog(context, gameEntity) {
+                DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
+                    download(context, gameEntity, apk, isSubscribe, entrance, location, traceEvent)
+                }
+            }
+        }
+        DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
+    }
+
+    // 处理畅玩状态
+    private fun handleSmoothStatus(
+        context: Context,
+        gameEntity: GameEntity,
+        apk: ApkEntity,
+        entrance: String,
+        location: String,
+        traceEvent: ExposureEvent
+    ) {
+        VHelper.validateVSpaceBeforeAction(context, gameEntity) {
+            GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) {
+                CertificationDialog.showCertificationDialog(context, gameEntity) {
+                    DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
+                        download(context, gameEntity, apk, isSubscribe, entrance, location, traceEvent)
+                    }
+                }
+            }
+        }
+    }
+
+    // 处理插件化状态
+    private fun handlePluginStatus(
+        context: Context,
+        gameEntity: GameEntity,
+        apk: ApkEntity,
+        entrance: String,
+        location: String,
+        traceEvent: ExposureEvent
+    ) {
+        if (gameEntity.pluggableCollection != null) {
+            DownloadDialog.showDownloadDialog(context, gameEntity, traceEvent, entrance, location)
+        } else {
+            CertificationDialog.showCertificationDialog(context, gameEntity) {
+                DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
+                    plugin(context, gameEntity, apk, entrance, location, isSubscribe, traceEvent)
+                }
+            }
+        }
+    }
+
+    // 处理安装状态
+    private fun handleInstallStatus(
+        context: Context,
+        gameEntity: GameEntity,
+        apk: ApkEntity,
+        downloadEntity: DownloadEntity?
+    ) {
+        val simulatorDownloadEntity = SimulatorGameManager.findDownloadEntityByUrl(apk.url)
+        if (gameEntity.simulator != null) {
+            val isInstalled =
+                PackageUtils.isInstalledFromAllPackage(context, gameEntity.simulator!!.apk!!.packageName)
+            val isInstalledNewSimulator = SimulatorGameManager.isNewSimulatorInstalled(context)
+            val isInstalledOldSimulator = SimulatorGameManager.isOldSimulatorInstalled(context)
+            var simulator = gameEntity.simulator
+            val newSimulator = Config.getNewSimulatorEntitySetting()
+            // 在没有安装旧的模拟器且有配置新版模拟器 才使用新版模拟器 否则还是用以前旧的
+            if (!isInstalledOldSimulator && newSimulator != null && newSimulator.active) {
+                simulator = newSimulator
+            }
+            if (simulatorDownloadEntity != null && SimulatorGameManager.isSimulatorGame(gameEntity) && !isInstalled && !isInstalledNewSimulator) {
+                SimulatorDownloadManager.getInstance().showDownloadDialog(
+                    context, simulator,
+                    SimulatorDownloadManager.SimulatorLocation.LAUNCH, gameEntity.id, gameEntity.name!!, null
+                )
+                return
+            }
+        }
+
+        if (gameEntity.isVGame()) {
+            VHelper.installOrLaunch((context as AppCompatActivity), gameEntity.getUniquePackageName() ?: "")
+        } else {
+            downloadEntity?.run {
+                install(context, gameEntity, apk, this)
+            }
+        }
+    }
+
+    // 处理启动状态
+    private fun handleLaunchStatus(
+        context: Context,
+        gameEntity: GameEntity,
+        apk: ApkEntity,
+        entrance: String,
+        location: String,
+        traceEvent: ExposureEvent
+    ) {
+        EnergyBridge.postEnergyTask("play_game", gameEntity.id, gameEntity.getApk()[0].packageName)
+        //启动模拟器游戏
+        if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
+            if (NewSimulatorGameManager.shouldShowUpdateNewSimulatorAlert(context)) {
+                NewSimulatorGameManager.showUpdateNewsSimulator(context, null)
+                return
+            }
+            val simulatorDownloadEntity =
+                SimulatorGameManager.findDownloadEntityByUrl(gameEntity.getApk()[0].url)
+            if (simulatorDownloadEntity != null) {
+                val file = File(simulatorDownloadEntity.path)
+                if (!file.exists()) {
+                    download(context, gameEntity, apk, false, entrance, location, traceEvent)
+                    return
+                }
+                NewFlatLogUtils.logSimulatorGameCardClick("启动")
+                SimulatorGameManager.launchSimulatorGame(simulatorDownloadEntity, gameEntity)
+            }
+            return
+        }
+
+        if (gameEntity.isVGame()) {
+            VHelper.installOrLaunch((context as AppCompatActivity), gameEntity.getUniquePackageName() ?: "")
+            return
+        }
+
+        if (entrance.contains("我的游戏")) {
+            MtaHelper.onEvent("我的游戏_启动", "启动", gameEntity.name)
+        }
+        PackageUtils.launchApplicationByPackageName(context, gameEntity.getApk()[0].packageName)
+    }
+
+    // 处理更新状态
+    private fun handleUpdateStatus(
+        context: Context,
+        gameEntity: GameEntity,
+        apk: ApkEntity,
+        entrance: String,
+        location: String,
+        traceEvent: ExposureEvent
+    ) {
+        DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
+            update(context, gameEntity, apk, entrance, location, isSubscribe, traceEvent)
+        }
+    }
+
     private fun getApk(
         gameEntity: GameEntity,
         event: DefaultJsApi.GameActivityEvent,

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

@@ -1,254 +0,0 @@
-package com.gh.common.util
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.app.Application
-import android.os.Build
-import android.os.Bundle
-import android.view.Gravity
-import android.view.View
-import android.widget.ImageView
-import android.widget.ProgressBar
-import com.gh.gamecenter.common.base.activity.ToolBarActivity
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.retrofit.BiResponse
-import com.gh.gamecenter.common.utils.singleToMain
-import com.gh.gamecenter.common.utils.tryWithDefaultCatch
-import com.gh.gamecenter.core.GHThreadFactory
-import com.gh.gamecenter.core.runOnUiThread
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailActivity
-import com.gh.gamecenter.gamecollection.square.GameCollectionSquareActivity
-import com.gh.gamecenter.retrofit.RetrofitManager
-import com.halo.assistant.HaloApp
-import com.lzf.easyfloat.EasyFloat
-import com.lzf.easyfloat.enums.ShowPattern
-import com.lzf.easyfloat.enums.SidePattern
-import okhttp3.ResponseBody
-import java.util.concurrent.ExecutorService
-import java.util.concurrent.Executors
-
-/**
- * 浏览游戏单广场任务辅助类
- */
-@SuppressLint("StaticFieldLeak")
-object GameCollectionSquareBrowseTaskHelper {
-
-    const val KEY_IS_FORM_BROWSE_TASK = "is_from_browse_task"
-    private const val FLOATING_SQUARE_BROWSE_TASK_VIEW = "floating_square_browse_task_view"
-
-    private var mBrowseTimeCount = 0
-    private var mIsBrowseTimeCountEnabled = false // 游戏单广场浏览时间统计是否开启
-    private var mBrowseTimeTimeout = 15
-    private var mIsBrowseTimeCountValid = false // 游戏单广场浏览时间统计是否有效
-    private var mBrowsePro: ProgressBar? = null
-    private var mIsFinished = false
-    private var mNeedShowFloatView = false
-    private var mIsFirstEnterSquare = true
-
-    private val mThreadService: ExecutorService by lazy {
-        Executors.newSingleThreadExecutor(GHThreadFactory("BROWSE_SQUARE_THREAD"))
-    }
-
-    private val mActivityLifecycleCallbacks by lazy {
-        object : Application.ActivityLifecycleCallbacks {
-            override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {}
-            override fun onActivityStopped(activity: Activity) {}
-            override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
-            override fun onActivityStarted(activity: Activity) {}
-
-            override fun onActivityResumed(activity: Activity) {
-                if (isTopActivityGameCollectionRelated(activity) && mIsBrowseTimeCountEnabled) {
-                    resumeTimeCount()
-                } else if (isGameCollectionSquare(activity) && mNeedShowFloatView) {
-                    showOrUpdateFloatView(activity, mBrowseTimeTimeout)
-                }
-            }
-
-            override fun onActivityPaused(activity: Activity) {
-                if (isTopActivityGameCollectionRelated(activity) && mIsBrowseTimeCountEnabled) {
-                    pauseTimeCount()
-                }
-                if (isGameCollectionSquare(activity)) {
-                    dismissFloatView()
-                }
-            }
-
-            override fun onActivityDestroyed(activity: Activity) {
-                if (isGameCollectionSquare(activity) && mIsBrowseTimeCountEnabled) {
-                    disableBrowseTimeCount()
-                    unregisterActivityLifecycleCallbacks()
-                }
-            }
-        }
-    }
-
-    fun enableBrowseTimeCount(timeout: Int, isFinished: Boolean) {
-        mIsBrowseTimeCountEnabled = true
-        mBrowseTimeTimeout = timeout
-        mIsFinished = isFinished
-        mNeedShowFloatView = true
-        mIsFirstEnterSquare = true
-
-        resumeTimeCount()
-
-        HaloApp.getInstance().registerActivityLifecycleCallbacks(mActivityLifecycleCallbacks)
-    }
-
-    fun disableBrowseTimeCount() {
-        mBrowseTimeCount = 0
-        mIsBrowseTimeCountEnabled = false
-        mBrowsePro = null
-        mIsFinished = false
-        mIsFirstEnterSquare = true
-    }
-
-    fun unregisterActivityLifecycleCallbacks() {
-        mNeedShowFloatView = false
-        HaloApp.getInstance().unregisterActivityLifecycleCallbacks(mActivityLifecycleCallbacks)
-    }
-
-    private fun resumeTimeCount() {
-        if (!mIsBrowseTimeCountEnabled) return
-
-        mIsBrowseTimeCountValid = true
-
-        mThreadService.execute {
-            while (mIsBrowseTimeCountEnabled && mIsBrowseTimeCountValid) {
-                val topActivity = CurrentActivityHolder.getCurrentActivity() ?: continue
-                checkFirstEnterSquare(topActivity)
-                runBrowseTask(topActivity)
-                Thread.sleep(1000)
-            }
-        }
-    }
-
-    private fun checkFirstEnterSquare(topActivity: Activity) {
-        if (isGameCollectionSquare(topActivity, false) && mIsFirstEnterSquare) {
-            mIsFirstEnterSquare = false
-            topActivity.intent.putExtra(KEY_IS_FORM_BROWSE_TASK, true)
-        }
-    }
-
-    private fun runBrowseTask(topActivity: Activity) {
-        if (isTopActivityGameCollectionRelated(topActivity)) {
-            tryWithDefaultCatch {
-                showOrUpdateFloatView(topActivity, if (mIsFinished) mBrowseTimeTimeout else mBrowseTimeCount)
-                if (mIsFinished) {
-                    disableBrowseTimeCount()
-                } else {
-                    countBrowseTimeout(topActivity)
-                }
-            }
-        }
-    }
-
-    private fun countBrowseTimeout(topActivity: Activity) {
-        mBrowseTimeCount++
-        if (mBrowseTimeCount >= mBrowseTimeTimeout) {
-            showOrUpdateFloatView(topActivity, mBrowseTimeTimeout)
-            postBrowseFinish()
-        }
-    }
-
-    private fun pauseTimeCount() {
-        if (!mIsBrowseTimeCountEnabled) return
-
-        mIsBrowseTimeCountValid = false
-    }
-
-    // 从任务跳转的游戏单广场/此游戏单广场进入的游戏单详情都计时
-    private fun isTopActivityGameCollectionRelated(activity: Activity): Boolean {
-        return isGameCollectionSquare(activity)
-                || (activity is GameCollectionDetailActivity
-                && activity.intent.getBundleExtra(ToolBarActivity.NORMAL_FRAGMENT_BUNDLE)
-            ?.getBoolean(KEY_IS_FORM_BROWSE_TASK) == true)
-    }
-
-    private fun isGameCollectionSquare(activity: Activity, checkIsFromTask: Boolean = true): Boolean {
-        return activity is GameCollectionSquareActivity
-                && (!checkIsFromTask || activity.intent.getBooleanExtra(KEY_IS_FORM_BROWSE_TASK, false))
-    }
-
-    private fun showOrUpdateFloatView(activity: Activity, time: Int) {
-        // 不支持 Android 4.1 的设备
-        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.JELLY_BEAN) return
-
-        // 游戏单广场才显示FloatView
-        if (!isGameCollectionSquare(activity)) return
-
-        runOnUiThread {
-            val isFinished = time == mBrowseTimeTimeout
-            val floatView = EasyFloat.getFloatView(FLOATING_SQUARE_BROWSE_TASK_VIEW)
-            if (floatView != null) {
-                updateFloatView(floatView, isFinished, time)
-            } else {
-                showFloatView(activity, isFinished)
-            }
-        }
-    }
-
-    private fun showFloatView(activity: Activity, isFinished: Boolean) {
-        EasyFloat.with(activity)
-            .setLayout(R.layout.layout_square_browse_task_float)
-            .setTag(FLOATING_SQUARE_BROWSE_TASK_VIEW)
-            .setAnimator(null)
-            .setGravity(Gravity.END.or(Gravity.CENTER_VERTICAL), 0, 0)
-            .setSidePattern(SidePattern.RIGHT)
-            .setShowPattern(ShowPattern.CURRENT_ACTIVITY)
-            .setDragEnable(false)
-            .registerCallback {
-                createResult { _, _, view ->
-                    initFloatView(view, isFinished)
-                }
-            }
-            .show()
-    }
-
-    private fun initFloatView(view: View?, isFinished: Boolean) {
-        if (isFinished) {
-            view?.findViewById<ProgressBar>(R.id.browsePro)?.run {
-                max = mBrowseTimeTimeout
-                progress = mBrowseTimeTimeout
-            }
-            view?.findViewById<ImageView>(R.id.browsePic)
-                ?.setImageResource(R.drawable.pic_browse_square_finish)
-        } else {
-            view?.findViewById<ProgressBar>(R.id.browsePro)?.run {
-                mBrowsePro = this
-                max = mBrowseTimeTimeout
-                progress = 0
-            }
-            view?.findViewById<ImageView>(R.id.browsePic)
-                ?.setImageResource(R.drawable.pic_browse_square)
-        }
-    }
-
-    private fun updateFloatView(floatView: View, isFinished: Boolean, time: Int) {
-        if (mBrowsePro == null) {
-            mBrowsePro = floatView.findViewById(R.id.browsePro)
-        }
-        mBrowsePro?.progress = time
-        if (isFinished) {
-            floatView.findViewById<ImageView>(R.id.browsePic)
-                .setImageResource(R.drawable.pic_browse_square_finish)
-        }
-    }
-
-    private fun dismissFloatView() {
-        EasyFloat.dismiss(FLOATING_SQUARE_BROWSE_TASK_VIEW)
-    }
-
-    @SuppressLint("CheckResult")
-    private fun postBrowseFinish() {
-        RetrofitManager.getInstance()
-            .newApi
-            .postGameCollectionTask("browse_game_list_square", "0")
-            .compose(singleToMain())
-            .subscribe(object : BiResponse<ResponseBody>() {
-                override fun onSuccess(data: ResponseBody) {
-                    disableBrowseTimeCount()
-                }
-            })
-    }
-}

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

@@ -7,7 +7,7 @@ import com.gh.gamecenter.common.utils.doOnMainProcessOnly
 import com.gh.gamecenter.common.utils.toJson
 import com.gh.gamecenter.common.utils.toObject
 import com.gh.gamecenter.core.utils.MtaHelper
-import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.entity.SubjectEntity
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.common.retrofit.BiResponse

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

@@ -8,17 +8,17 @@ import androidx.annotation.WorkerThread;
 
 import com.gh.common.constant.Config;
 import com.gh.common.simulator.SimulatorGameManager;
-import com.gh.common.view.DownloadButton;
+import com.gh.gamecenter.feature.view.DownloadButton;
 import com.gh.download.DownloadManager;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.core.AppExecutor;
-import com.gh.gamecenter.entity.ApkEntity;
-import com.gh.gamecenter.entity.ApkLink;
-import com.gh.gamecenter.entity.GameCollectionEntity;
-import com.gh.gamecenter.entity.GameEntity;
+import com.gh.gamecenter.feature.entity.ApkEntity;
+import com.gh.gamecenter.feature.entity.ApkLink;
+import com.gh.gamecenter.feature.entity.GameCollectionEntity;
+import com.gh.gamecenter.feature.entity.GameEntity;
 import com.gh.gamecenter.entity.GameUpdateEntity;
-import com.gh.gamecenter.entity.PluginLocation;
-import com.gh.gamecenter.entity.SettingsEntity;
+import com.gh.gamecenter.feature.entity.PluginLocation;
+import com.gh.gamecenter.feature.entity.SettingsEntity;
 import com.gh.gamecenter.manager.PackagesManager;
 import com.gh.vspace.VHelper;
 import com.lightgame.download.DownloadEntity;
@@ -180,7 +180,17 @@ public class GameUtils {
             if (gameEntity.isVGame()) {
                 return context.getString(R.string.smooth);
             } else {
-                return context.getString(R.string.download);
+                if ("smooth".equals(gameEntity.getDownloadStatus())) {
+                    GameEntity.GameCategory gameCategory = gameEntity.getGameCategory();
+                    if (gameCategory.equals(GameEntity.GameCategory.ONLINE_GAME)
+                            || gameCategory.equals(GameEntity.GameCategory.INTERNATIONAL_ONLINE_GAME)) {
+                        return context.getString(R.string.download);
+                    } else {
+                        return context.getString(R.string.attempt);
+                    }
+                } else {
+                    return context.getString(R.string.download);
+                }
             }
         }
     }
@@ -194,6 +204,7 @@ public class GameUtils {
         gameUpdateEntity.setIcon(gameEntity.getIcon());
         gameUpdateEntity.setRawIcon(gameEntity.getRawIcon());
         gameUpdateEntity.setIconSubscript(gameEntity.getIconSubscript());
+        gameUpdateEntity.setIconFloat(gameEntity.getIconFloat());
         gameUpdateEntity.setName(gameEntity.getName());
         gameUpdateEntity.setPackageName(apkEntity.getPackageName());
         gameUpdateEntity.setSize(apkEntity.getSize());

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

@@ -12,11 +12,12 @@ import android.widget.TextView;
 
 import androidx.core.content.ContextCompat;
 
+import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.core.AppExecutor;
 import com.gh.gamecenter.common.view.DrawableView;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.core.utils.DisplayUtils;
-import com.gh.gamecenter.entity.TagStyleEntity;
+import com.gh.gamecenter.feature.entity.TagStyleEntity;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -72,28 +73,6 @@ public class GameViewUtils {
         }
     }
 
-    public static void setLabelList(Context context, LinearLayout labelLayout, String tagType, List<TagStyleEntity> tagStyle) {
-        labelLayout.removeAllViews();
-        if (tagStyle == null || tagStyle.isEmpty()) {
-            labelLayout.addView(getGameTagView(context, "官方版", 0, tagType, null));
-        } else {
-            for (int i = 0; i < tagStyle.size() - 1; i++) {
-                View view;
-                if (i == tagStyle.size() - 1) {
-                    view = getGameTagView(context, tagStyle.get(i).getName(), 0, tagType, tagStyle.size() > i ? tagStyle.get(i) : null);
-                } else {
-                    view = getGameTagView(context, tagStyle.get(i).getName(), DisplayUtils.dip2px(context, 8), tagType, tagStyle.size() > i ? tagStyle.get(i) : null);
-                }
-                if (view != null) {
-                    labelLayout.addView(view);
-                }
-                if (labelLayout.getChildCount() == 3) {
-                    break;
-                }
-            }
-        }
-    }
-
     // 新的游戏标签样式 version>=4.0.0
     private static TextView getNewGameTagView(Context context, TagStyleEntity tagEntity, int rightMargin) {
         // 参数不全,用旧样式实现
@@ -125,8 +104,8 @@ public class GameViewUtils {
                 DisplayUtils.dip2px(context, 4),
                 DisplayUtils.dip2px(context, 1));
 
-        textView.setTextColor(Color.parseColor("#" + tagEntity.getColor()));
-        textView.setBackground(DrawableView.getServerDrawable(Color.parseColor("#" + tagEntity.getBackground())));
+        textView.setTextColor(ExtensionsKt.hexStringToIntColor("#" + tagEntity.getColor(), Color.WHITE));
+        textView.setBackground(DrawableView.getServerDrawable(ExtensionsKt.hexStringToIntColor("#" + tagEntity.getBackground(), Color.WHITE)));
     }
 
     private static TextView getGameTagView(Context context, String tagStr, int rightMargin, String tagType, TagStyleEntity tagEntity) {
@@ -149,10 +128,10 @@ public class GameViewUtils {
 
                 if ("border".equals(tagEntity.getStyle())) {
                     gradientDrawable.setColor(Color.TRANSPARENT);
-                    gradientDrawable.setStroke(DisplayUtils.dip2px(context, 1f), Color.parseColor(colorStr));
-                    tag.setTextColor(Color.parseColor(colorStr));
+                    gradientDrawable.setStroke(DisplayUtils.dip2px(context, 1f), ExtensionsKt.hexStringToIntColor(colorStr, Color.WHITE));
+                    tag.setTextColor(ExtensionsKt.hexStringToIntColor(colorStr, Color.WHITE));
                 } else {
-                    gradientDrawable.setColor(Color.parseColor(colorStr));
+                    gradientDrawable.setColor(ExtensionsKt.hexStringToIntColor(colorStr, Color.WHITE));
                     gradientDrawable.setShape(GradientDrawable.RECTANGLE);
                     tag.setTextColor(Color.WHITE);
                 }
@@ -163,7 +142,7 @@ public class GameViewUtils {
                 if (colorStr == null) {
                     return null;
                 }
-                int color = Color.parseColor(colorStr);
+                int color = ExtensionsKt.hexStringToIntColor(colorStr, Color.WHITE);
                 GradientDrawable gradientDrawable = new GradientDrawable();
                 gradientDrawable.setColor(Color.TRANSPARENT);
                 gradientDrawable.setStroke(DisplayUtils.dip2px(context, 1f), color);

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

@@ -2,8 +2,8 @@ package com.gh.common.util
 
 import com.gh.gamecenter.common.utils.toastInInternalRelease
 import com.gh.gamecenter.common.utils.tryCatchInRelease
-import com.gh.gamecenter.entity.GameEntity
 import com.gh.gamecenter.entity.HomePluggableFilterEntity
+import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.room.AppDatabase
 
 /**
@@ -11,7 +11,7 @@ import com.gh.gamecenter.room.AppDatabase
  */
 object HomePluggableHelper {
 
-    private val mHomePluggableFilterDao = AppDatabase.getInstance().homePluggableFilterDao()
+    private val mHomePluggableFilterDao by lazy { AppDatabase.getInstance().homePluggableFilterDao() }
 
     @JvmStatic
     fun setHomePluggableFilterData(gameEntity: GameEntity, isNever: Boolean) {

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

@@ -20,14 +20,15 @@ import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.common.utils.NotificationHelper;
 import com.gh.gamecenter.core.utils.ToastUtils;
 import com.gh.gamecenter.core.utils.UrlFilterUtils;
-import com.gh.gamecenter.entity.ApkEntity;
+import com.gh.gamecenter.feature.entity.ApkEntity;
 import com.gh.gamecenter.entity.LibaoEntity;
 import com.gh.gamecenter.entity.LibaoStatusEntity;
-import com.gh.gamecenter.entity.MeEntity;
+import com.gh.gamecenter.feature.entity.MeEntity;
 import com.gh.gamecenter.common.entity.NotificationUgc;
-import com.gh.gamecenter.entity.UserDataLibaoEntity;
+import com.gh.gamecenter.feature.entity.UserDataLibaoEntity;
 import com.gh.gamecenter.common.eventbus.EBReuse;
 import com.gh.gamecenter.eventbus.EBUISwitch;
+import com.gh.gamecenter.feature.utils.PlatformUtils;
 import com.gh.gamecenter.geetest.GeetestUtils;
 import com.gh.gamecenter.login.user.UserManager;
 import com.gh.gamecenter.common.retrofit.JSONObjectResponse;
@@ -392,73 +393,6 @@ public class LibaoUtils {
         });
     }
 
-    public static void libaoBtnClick(final Context context, final TextView libaoBtn, final LibaoEntity libaoEntity,
-                                     final boolean isInstallRequired, final LibaoDetailAdapter adapter,
-                                     final String entrance, final String loginEntrance, final OnLibaoStatusChangeListener listener) {
-        String status = libaoEntity.getStatus();
-        // 领取限制
-        CheckLoginUtils.checkLogin(context, loginEntrance, () -> {// "礼包详情-[" + btnStatus + "]"
-            if ("ling".equals(status) || "tao".equals(status)) {
-                if (isInstallRequired && !isAppInstalled(context, libaoEntity.getPackageName()) && adapter != null) {
-                    String platform;
-                    if (TextUtils.isEmpty(libaoEntity.getPlatform())) {
-                        platform = "";
-                    } else {
-                        platform = PlatformUtils.getInstance(context).getPlatformName(libaoEntity.getPlatform());
-                    }
-
-                    boolean isExistPlatform = false;
-                    ArrayList<ApkEntity> apk = adapter.getGameEntity().getApk();
-                    for (ApkEntity apkEntity : apk) {
-                        if (TextUtils.isEmpty(libaoEntity.getPlatform())) break;
-                        if (libaoEntity.getPlatform().equals(apkEntity.getPlatform())) {
-                            isExistPlatform = true;
-                            break;
-                        }
-                    }
-
-                    String dialogContent = context.getString(R.string.ling_rules_dialog, libaoEntity.getGame().getName(), platform);
-                    boolean finalIsExistPlatform = isExistPlatform;
-                    DialogHelper.showWarningDialog(context, "条件不符",
-                            Html.fromHtml(dialogContent), isExistPlatform ? "关闭" : "",
-                            isExistPlatform ? "立即安装" : "关闭",
-                            () -> {
-                                if (finalIsExistPlatform) {
-                                    adapter.openDownload(libaoEntity.getPlatform());
-                                }
-                                return null;
-                            }, null);
-                    return;
-                }
-            }
-
-            switch (Objects.requireNonNull(status)) {
-                case "coming":
-                    Utils.toast(context, "还没到开始领取时间");
-                    break;
-                case "check":
-                    if (!TextUtils.isEmpty(libaoEntity.getDes())) {
-                        DialogHelper.showDialog(context, "使用说明", Html.fromHtml(libaoEntity.getDes()), "关闭", "", () -> {
-                        }, () -> {
-                        }, false, "", "");
-                    }
-                    break;
-                case "repeatLing":
-                    ToastUtils.showToast("礼包每天0点刷新，明日0点后可再领一个");
-                    break;
-                case "repeatLinged":
-                case "ling":
-                    libaoLing(context, libaoBtn, libaoEntity, adapter, isInstallRequired, null, entrance, listener);
-                    break;
-                case "repeatTao":
-                case "repeatTaoed":
-                case "tao":
-                    libaoTao(context, libaoBtn, libaoEntity, isInstallRequired, adapter, status, entrance, listener);
-                    break;
-            }
-        });
-    }
-
     private static void libaoTao(Context context, TextView libaoBtn, LibaoEntity libaoEntity, boolean isInstallRequired, LibaoDetailAdapter adapter,
                                  String status, String entrance, final OnLibaoStatusChangeListener listener) {
         if ("repeatTao".equals(status)) {
@@ -548,8 +482,9 @@ public class LibaoUtils {
                                     break;
                                 case "try tao":
                                 case "used up":
-                                    DialogUtils.showHintDialog(context, "礼包已领光"
-                                            , "手速不够快，礼包已经被抢光了，十分抱歉", "知道了");
+                                    DialogHelper.showDialog(context, "礼包已领光", "手速不够快，礼包已经被抢光了，十分抱歉", "知道了", "", () -> {
+                                    }, () -> {
+                                    }, false, "", "");
                                     break;
                                 case "maintaining":
                                     Utils.toast(context, "网络状态异常，请稍后再试");
@@ -675,8 +610,9 @@ public class LibaoUtils {
                                     break;
                                 case "try tao":
                                 case "used up":
-                                    DialogUtils.showHintDialog(context, "礼包已领光"
-                                            , "手速不够快，礼包已经被抢光了，十分抱歉", "知道了");
+                                    DialogHelper.showDialog(context, "礼包已领光", "手速不够快，礼包已经被抢光了，十分抱歉", "知道了", "", () -> {
+                                    }, () -> {
+                                    }, false, "", "");
                                     libaoEntity.setStatus("used_up");
                                     if (libaoBtn != null) {
                                         initLibaoBtn(context, libaoBtn, libaoEntity, isInstallRequired, adapter, false, entrance, listener);

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

@@ -7,8 +7,6 @@ import android.text.TextUtils;
 
 import androidx.annotation.Nullable;
 
-import com.gh.common.exposure.ExposureEvent;
-import com.gh.common.exposure.ExposureSource;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.entity.CommunityEntity;
@@ -19,13 +17,15 @@ import com.gh.gamecenter.common.loghub.LoghubUtils;
 import com.gh.gamecenter.common.loghub.SimpleLogContainerEntity;
 import com.gh.gamecenter.common.utils.DeviceUtils;
 import com.gh.gamecenter.core.utils.GsonUtils;
-import com.gh.gamecenter.entity.DetectionObjectEntity;
-import com.gh.gamecenter.entity.GameEntity;
-import com.gh.gamecenter.entity.PackageDialogEntity;
 import com.gh.gamecenter.entity.SpecialColumn;
 import com.gh.gamecenter.entity.StartupAdEntity;
+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.feature.entity.Questions;
+import com.gh.gamecenter.feature.exposure.ExposureEvent;
+import com.gh.gamecenter.feature.exposure.ExposureSource;
 import com.gh.gamecenter.login.user.UserManager;
-import com.gh.gamecenter.qa.entity.Questions;
 import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
 
@@ -41,17 +41,26 @@ import java.util.List;
  */
 public class LogUtils {
 
+    private static final String KEY_EVENT = "event";
+    private static final String KEY_META = "meta";
+    private static final String KEY_TIMESTAMP = "timestamp";
+    private static final String KEY_ENTRANCE = "entrance";
+    private static final String KEY_PAY_LOAD = "payload";
+    private static final String KEY_GAME_NAME = "game_name";
+    private static final String KEY_GAME_ID = "game_id";
+    private static final String LOG_STORE_EVENT = "event";
+
     public static void logVideoStreamingUpload(String action, String entrance, String entranceDetail, String videoId) {
         JSONObject object = new JSONObject();
         JSONObject payloadObject = new JSONObject();
 
         try {
-            object.put("event", "UPLOAD_VIDEO_STEAMING");
+            object.put(KEY_EVENT, "UPLOAD_VIDEO_STEAMING");
             object.put("action", action);
-            payloadObject.put("entrance", entrance);
+            payloadObject.put(KEY_ENTRANCE, entrance);
             payloadObject.put("entrance_detail", entranceDetail);
             payloadObject.put("video_id", videoId);
-            object.put("payload", payloadObject);
+            object.put(KEY_PAY_LOAD, payloadObject);
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -161,7 +170,7 @@ public class LogUtils {
     public static void login(String loginStep, String loginType, String entrance) {
         JSONObject object = new JSONObject();
         try {
-            object.put("entrance", entrance);
+            object.put(KEY_ENTRANCE, entrance);
             object.put("subject", "login");
             object.put("step", loginStep);
             object.put("login_type", loginType);
@@ -199,8 +208,8 @@ public class LogUtils {
 
         try {
             object.put("source", GsonUtils.toJson(exposureSourceList));
-            object.put("game_name", gameEntity.getName());
-            object.put("game_id", gameEntity.getId());
+            object.put(KEY_GAME_NAME, gameEntity.getName());
+            object.put(KEY_GAME_ID, gameEntity.getId());
             object.put("game_platform", gameEntity.getPlatform());
             if (event != null) {
                 object.put("sequence", event.getPayload().getSequence());
@@ -285,8 +294,8 @@ public class LogUtils {
             metaObject.put("os", meta.getOs());
             metaObject.put("userId", meta.getUserId());
 
-            object.put("meta", metaObject);
-            object.put("timestamp", System.currentTimeMillis() / 1000);
+            object.put(KEY_META, metaObject);
+            object.put(KEY_TIMESTAMP, System.currentTimeMillis() / 1000);
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -302,14 +311,14 @@ public class LogUtils {
         JSONObject payloadObject = new JSONObject();
 
         try {
-            object.put("event", "ENTERING_VIDEO_STEAMING");
-            payloadObject.put("entrance", entrance);
+            object.put(KEY_EVENT, "ENTERING_VIDEO_STEAMING");
+            payloadObject.put(KEY_ENTRANCE, entrance);
             if (!TextUtils.isEmpty(entranceDetail)) {
                 payloadObject.put("entrance_detail", entranceDetail);
             }
             payloadObject.put("video_id", videoId);
             payloadObject.put("streaming_id", streamingId);
-            object.put("payload", payloadObject);
+            object.put(KEY_PAY_LOAD, payloadObject);
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -321,13 +330,13 @@ public class LogUtils {
         JSONObject payloadObject = new JSONObject();
 
         try {
-            object.put("event", "VIDEO_PLAYING");
+            object.put(KEY_EVENT, "VIDEO_PLAYING");
             object.put("action", action);
             if (!TextUtils.isEmpty(msg)) {
                 object.put("msg", msg);
             }
 
-            payloadObject.put("entrance", entrance);
+            payloadObject.put(KEY_ENTRANCE, entrance);
             if (!TextUtils.isEmpty(entranceDetail)) {
                 payloadObject.put("entrance_detail", entranceDetail);
             }
@@ -342,7 +351,7 @@ public class LogUtils {
             payloadObject.put("progress", progress);
             payloadObject.put("video_play_status", videoPlayStatus);
 
-            object.put("payload", payloadObject);
+            object.put(KEY_PAY_LOAD, payloadObject);
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -353,22 +362,22 @@ public class LogUtils {
         JSONObject object = new JSONObject();
         JSONObject payloadObject = new JSONObject();
         try {
-            object.put("event", "TOP_VIDEO_PLAYING");
+            object.put(KEY_EVENT, "TOP_VIDEO_PLAYING");
             object.put("action", action);
 
             payloadObject.put("video_mode", videoModel);//视频播放方式 ["自动播放"/"点击播放"/"全屏播放"]
             payloadObject.put("video_id", videoId);
             payloadObject.put("video_title", videoTitle);
-            payloadObject.put("game_id", gameId);
-            payloadObject.put("game_name", gameName);
+            payloadObject.put(KEY_GAME_ID, gameId);
+            payloadObject.put(KEY_GAME_NAME, gameName);
             payloadObject.put("video_size", videoSize);
             payloadObject.put("video_total_time", videoTotalTime);
             payloadObject.put("progress", progress);
             payloadObject.put("video_play_ts", videoPlayTs);
             payloadObject.put("video_play_status", videoPlayStatus);
 
-            object.put("payload", payloadObject);
-            object.put("meta", getMetaObject());
+            object.put(KEY_PAY_LOAD, payloadObject);
+            object.put(KEY_META, getMetaObject());
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -382,21 +391,21 @@ public class LogUtils {
         JSONObject object = new JSONObject();
         JSONObject payloadObject = new JSONObject();
         try {
-            object.put("event", "HOME_VIDEO_PLAYING");
+            object.put(KEY_EVENT, "HOME_VIDEO_PLAYING");
             object.put("action", action);
 
             payloadObject.put("video_id", videoId);
             payloadObject.put("video_title", videoTitle);
-            payloadObject.put("game_id", gameId);
-            payloadObject.put("game_name", gameName);
+            payloadObject.put(KEY_GAME_ID, gameId);
+            payloadObject.put(KEY_GAME_NAME, gameName);
             payloadObject.put("video_size", videoSize);
             payloadObject.put("video_total_time", videoTotalTime);
             payloadObject.put("progress", progress);
             payloadObject.put("video_play_ts", videoPlayTs);
             payloadObject.put("video_shade", String.valueOf(videoShade));//["true"/"false"]是否存在引导遮罩
 
-            object.put("payload", payloadObject);
-            object.put("meta", getMetaObject());
+            object.put(KEY_PAY_LOAD, payloadObject);
+            object.put(KEY_META, getMetaObject());
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -418,7 +427,7 @@ public class LogUtils {
         entity.setPayload(payload);
         entity.setTimestamp(System.currentTimeMillis() / 1000);
 
-        LoghubUtils.log(GsonUtils.toJsonIgnoreNull(entity), "event", false);
+        LoghubUtils.log(GsonUtils.toJsonIgnoreNull(entity), LOG_STORE_EVENT, false);
     }
 
     public static void uploadLikeFromWelcomeDialog() {
@@ -435,7 +444,7 @@ public class LogUtils {
         entity.setPayload(payload);
         entity.setTimestamp(System.currentTimeMillis() / 1000);
 
-        LoghubUtils.log(GsonUtils.toJsonIgnoreNull(entity), "event", false);
+        LoghubUtils.log(GsonUtils.toJsonIgnoreNull(entity), LOG_STORE_EVENT, false);
     }
 
     public static void uploadCommentFromWelcomeDialog() {
@@ -452,7 +461,7 @@ public class LogUtils {
         entity.setPayload(payload);
         entity.setTimestamp(System.currentTimeMillis() / 1000);
 
-        LoghubUtils.log(GsonUtils.toJsonIgnoreNull(entity), "event", false);
+        LoghubUtils.log(GsonUtils.toJsonIgnoreNull(entity), LOG_STORE_EVENT, false);
     }
 
     /**
@@ -486,8 +495,8 @@ public class LogUtils {
 
     private static void uploadCommunity(JSONObject object) {
         try {
-            object.put("meta", getMetaObject());
-            object.put("timestamp", System.currentTimeMillis() / 1000);
+            object.put(KEY_META, getMetaObject());
+            object.put(KEY_TIMESTAMP, System.currentTimeMillis() / 1000);
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -504,8 +513,8 @@ public class LogUtils {
             payload.put("location", location);//关注板块/文章外所属论坛/游戏详情/文章内所属论坛
             payload.put("bbs_id", bbsId);
 
-            object.put("event", "access_to_bbs");
-            object.put("payload", payload);
+            object.put(KEY_EVENT, "access_to_bbs");
+            object.put(KEY_PAY_LOAD, payload);
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -516,7 +525,7 @@ public class LogUtils {
     public static void uploadAccessBbsTab() {
         JSONObject object = new JSONObject();
         try {
-            object.put("event", "main_tab[bbs]");
+            object.put(KEY_EVENT, "main_tab[bbs]");
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -528,20 +537,20 @@ public class LogUtils {
         JSONObject object = new JSONObject();
         JSONObject payload = new JSONObject();
         try {
-            object.put("event", event);// 取值有[开始, 完成] [simulator_download, simulator_download_complete]
-            object.put("meta", getMetaObject());
-            object.put("timestamp", System.currentTimeMillis() / 1000);
+            object.put(KEY_EVENT, event);// 取值有[开始, 完成] [simulator_download, simulator_download_complete]
+            object.put(KEY_META, getMetaObject());
+            object.put(KEY_TIMESTAMP, System.currentTimeMillis() / 1000);
 
             payload.put("filename", fileName);// 下载模拟器文件名,每次新创建的下载任务文件名都不同,可以用来关联同一次的下载开始与完成
             payload.put("simulator_id", simulatorId);
             payload.put("simulator_name", simulatorName);
             payload.put("location", location);//启动《具体的游戏名称》/模拟器游戏/模拟器游戏-模拟器管理
-            payload.put("game_id", gameId);//如果是 启动《游戏名称》 这种方式, 记录这个游戏具体的游戏ID
+            payload.put(KEY_GAME_ID, gameId);//如果是 启动《游戏名称》 这种方式, 记录这个游戏具体的游戏ID
             payload.put("download_type", downloadType);// update/download 下载类型（更新/下载）
             if (!TextUtils.isEmpty(startTime) && event.equals("simulator_download_complete")) {
                 payload.put("simulator_download_timestamp", startTime);// 对应的下载开始时间
             }
-            object.put("payload", payload);
+            object.put(KEY_PAY_LOAD, payload);
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -549,7 +558,7 @@ public class LogUtils {
         if (BuildConfig.DEBUG) {
             Utils.log("LogUtils->" + object.toString());
         }
-        LoghubUtils.log(object, "event", false);
+        LoghubUtils.log(object, LOG_STORE_EVENT, false);
     }
 
     public static void uploadSearchGame(String event, String location, String key, String searchType) {
@@ -567,18 +576,18 @@ public class LogUtils {
         JSONObject object = new JSONObject();
         JSONObject payload = new JSONObject();
         try {
-            object.put("event", event);
+            object.put(KEY_EVENT, event);
             object.put("location", location);
-            object.put("meta", getMetaObject());
-            object.put("timestamp", System.currentTimeMillis() / 1000);
+            object.put(KEY_META, getMetaObject());
+            object.put(KEY_TIMESTAMP, System.currentTimeMillis() / 1000);
 
             payload.put("key", key); //搜索关键词
             payload.put("search_type", searchType); //搜索类型, 有四种取值 默认搜索/历史搜索/自动搜索/主动搜索
-            payload.put("game_id", gameId); //event为search_click才取值
-            payload.put("game_name", gameName); //event为search_click才取值
+            payload.put(KEY_GAME_ID, gameId); //event为search_click才取值
+            payload.put(KEY_GAME_NAME, gameName); //event为search_click才取值
             payload.put("is_mirror_data", isMirrorData);
             payload.put("is_ad_data", isAdData);
-            object.put("payload", payload);
+            object.put(KEY_PAY_LOAD, payload);
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -586,7 +595,7 @@ public class LogUtils {
         if (BuildConfig.DEBUG) {
             Utils.log("LogUtils->" + object.toString());
         }
-        LoghubUtils.log(object, "event", false);
+        LoghubUtils.log(object, LOG_STORE_EVENT, false);
     }
 
     public static void logGameDetailStrategyButtonEvent(String gameId,
@@ -594,11 +603,11 @@ public class LogUtils {
                                                         String text) {
         JSONObject object = new JSONObject();
         try {
-            object.put("event", "game_detail_click_strategy_button");
-            object.put("timestamp", System.currentTimeMillis() / 1000);
-            object.put("meta", getMetaObject());
-            object.put("game_id", gameId);
-            object.put("game_name", gameName);
+            object.put(KEY_EVENT, "game_detail_click_strategy_button");
+            object.put(KEY_TIMESTAMP, System.currentTimeMillis() / 1000);
+            object.put(KEY_META, getMetaObject());
+            object.put(KEY_GAME_ID, gameId);
+            object.put(KEY_GAME_NAME, gameName);
             object.put("text", text);
         } catch (JSONException e) {
             e.printStackTrace();
@@ -606,7 +615,7 @@ public class LogUtils {
         if (BuildConfig.DEBUG) {
             Utils.log("LogUtils->" + object.toString());
         }
-        LoghubUtils.log(object, "event", false);
+        LoghubUtils.log(object, LOG_STORE_EVENT, false);
     }
 
     public static void logServerTestAccessEvent(String entrance,
@@ -617,7 +626,7 @@ public class LogUtils {
         try {
             payload.put("server_test_name", serverTestName);
             payload.put("server_test_note", serverTestNote);
-            payload.put("entrance", entrance);
+            payload.put(KEY_ENTRANCE, entrance);
             payload.put("entrance_detail", entranceDetail);
         } catch (JSONException e) {
             e.printStackTrace();
@@ -689,10 +698,10 @@ public class LogUtils {
     private static void logServerTestEvent(String event, JSONObject payload) {
         JSONObject object = new JSONObject();
         try {
-            object.put("event", event);
-            object.put("meta", getMetaObject());
-            object.put("timestamp", System.currentTimeMillis() / 1000);
-            object.put("payload", payload);
+            object.put(KEY_EVENT, event);
+            object.put(KEY_META, getMetaObject());
+            object.put(KEY_TIMESTAMP, System.currentTimeMillis() / 1000);
+            object.put(KEY_PAY_LOAD, payload);
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -700,7 +709,7 @@ public class LogUtils {
         if (BuildConfig.DEBUG) {
             Utils.log("LogUtils->" + object.toString());
         }
-        LoghubUtils.log(object, "event", false);
+        LoghubUtils.log(object, LOG_STORE_EVENT, false);
     }
 
     public static void logNewCatalogAppearanceEvent(String entrance, String key) {
@@ -726,9 +735,9 @@ public class LogUtils {
     public static void logSpecialCatalogBannerClickEvent(String key, int seq) {
         JSONObject object = new JSONObject();
         try {
-            object.put("event", "category_lunbo_click");
-            object.put("meta", getMetaObject());
-            object.put("timestamp", System.currentTimeMillis() / 1000);
+            object.put(KEY_EVENT, "category_lunbo_click");
+            object.put(KEY_META, getMetaObject());
+            object.put(KEY_TIMESTAMP, System.currentTimeMillis() / 1000);
 
             object.put("key", key);
             object.put("sequence", seq);
@@ -739,24 +748,24 @@ public class LogUtils {
         if (BuildConfig.DEBUG) {
             Utils.log("LogUtils->" + object.toString());
         }
-        LoghubUtils.log(object, "event", false);
+        LoghubUtils.log(object, LOG_STORE_EVENT, false);
     }
 
     private static void logCatalogEvent(String event, String entrance, String key, int seq1, int seq2, int seqContent, int seqContentList) {
         JSONObject object = new JSONObject();
         JSONObject payload = new JSONObject();
         try {
-            object.put("event", event);
-            object.put("meta", getMetaObject());
-            object.put("timestamp", System.currentTimeMillis() / 1000);
+            object.put(KEY_EVENT, event);
+            object.put(KEY_META, getMetaObject());
+            object.put(KEY_TIMESTAMP, System.currentTimeMillis() / 1000);
 
-            payload.put("entrance", entrance); //入口分类, 分为 首页或版块,
+            payload.put(KEY_ENTRANCE, entrance); //入口分类, 分为 首页或版块,
             payload.put("key", key); //搜索类型, 有四种取值 默认搜索/历史搜索/自动搜索/主动搜索
             payload.put("seq_1st", seq1); //从0开始,默认-1表示没有
             payload.put("seq_2nd", seq2); //从0开始,默认-1表示没有
             payload.put("seq_content", seqContent);  //精选页上 图片、专题-全部按钮、专题合集-全部按钮 的排序;从0开始,默认-1表示没有
             payload.put("seq_content_list", seqContentList);
-            object.put("payload", payload);
+            object.put(KEY_PAY_LOAD, payload);
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -764,34 +773,34 @@ public class LogUtils {
         if (BuildConfig.DEBUG) {
             Utils.log("LogUtils->" + object.toString());
         }
-        LoghubUtils.log(object, "event", false);
+        LoghubUtils.log(object, LOG_STORE_EVENT, false);
     }
 
     public static void uploadPackageSkip(String event, String action, String gameId, String gameName) {
         JSONObject object = new JSONObject();
         try {
-            object.put("event", event);//external_jump/external_show
+            object.put(KEY_EVENT, event);//external_jump/external_show
             object.put("action", action);
             if (!TextUtils.isEmpty(gameId) && !TextUtils.isEmpty(gameName)) {
-                object.put("game_id", gameId);
-                object.put("game_name", gameName);
+                object.put(KEY_GAME_ID, gameId);
+                object.put(KEY_GAME_NAME, gameName);
             }
-            object.put("meta", getMetaObject());
+            object.put(KEY_META, getMetaObject());
         } catch (JSONException e) {
             e.printStackTrace();
         }
         if (BuildConfig.DEBUG) {
             Utils.log("LogUtils->" + object.toString());
         }
-        LoghubUtils.log(object, "event", false);
+        LoghubUtils.log(object, LOG_STORE_EVENT, false);
     }
 
     public static void logStartAd(String event, StartupAdEntity adEntity) {
         JSONObject object = new JSONObject();
         try {
-            object.put("event", event);
-            object.put("timestamp", System.currentTimeMillis() / 1000);
-            object.put("meta", getMetaObject());
+            object.put(KEY_EVENT, event);
+            object.put(KEY_TIMESTAMP, System.currentTimeMillis() / 1000);
+            object.put(KEY_META, getMetaObject());
             if (adEntity != null) {
                 object.put("abs_id", adEntity.getId());
                 object.put("abs_text", adEntity.getDesc());
@@ -807,16 +816,16 @@ public class LogUtils {
         if (BuildConfig.DEBUG) {
             Utils.log("LogUtils->" + object.toString());
         }
-        LoghubUtils.log(object, "event", false);
+        LoghubUtils.log(object, LOG_STORE_EVENT, false);
     }
 
     public static void logRecommendClick(String entrance, String recommendName, String linkType, String linkTitle, String linkId, int sequence) {
         JSONObject object = new JSONObject();
         try {
-            object.put("event", "recommend_click");
-            object.put("timestamp", System.currentTimeMillis() / 1000);
-            object.put("meta", getMetaObject());
-            object.put("entrance", entrance);
+            object.put(KEY_EVENT, "recommend_click");
+            object.put(KEY_TIMESTAMP, System.currentTimeMillis() / 1000);
+            object.put(KEY_META, getMetaObject());
+            object.put(KEY_ENTRANCE, entrance);
             object.put("recommend_name", recommendName);
             object.put("link_id", linkId);
             object.put("link_type", linkType);
@@ -828,7 +837,7 @@ public class LogUtils {
         if (BuildConfig.DEBUG) {
             Utils.log("LogUtils->" + object.toString());
         }
-        LoghubUtils.log(object, "event", false);
+        LoghubUtils.log(object, LOG_STORE_EVENT, false);
     }
 
     public static void uploadPackageCheck(String event, String action, GameEntity gameEntity, String linkTitle, String linkDesc, String downloadGameId, String downloadGameName) {
@@ -839,11 +848,11 @@ public class LogUtils {
         JSONObject object = new JSONObject();
         JSONObject payloadObject = new JSONObject();
         try {
-            object.put("event", event);
+            object.put(KEY_EVENT, event);
             object.put("action", action);
 
-            payloadObject.put("game_id", gameEntity.getId());
-            payloadObject.put("game_name", gameEntity.getName());
+            payloadObject.put(KEY_GAME_ID, gameEntity.getId());
+            payloadObject.put(KEY_GAME_NAME, gameEntity.getName());
             payloadObject.put("link_title", linkTitle);
             payloadObject.put("link_desc", linkDesc);
             payloadObject.put("download_game_id", downloadGameId);
@@ -857,16 +866,16 @@ public class LogUtils {
             }
             payloadObject.put("detection_objects", detectionArray);
 
-            object.put("meta", getMetaObject());
-            object.put("payload", payloadObject);
-            object.put("timestamp", System.currentTimeMillis() / 1000);
+            object.put(KEY_META, getMetaObject());
+            object.put(KEY_PAY_LOAD, payloadObject);
+            object.put(KEY_TIMESTAMP, System.currentTimeMillis() / 1000);
         } catch (JSONException e) {
             e.printStackTrace();
         }
         if (BuildConfig.DEBUG) {
             Utils.log("LogUtils->" + object.toString());
         }
-        LoghubUtils.log(object, "event", false);
+        LoghubUtils.log(object, LOG_STORE_EVENT, false);
     }
 
     public static void logCategoryV2AppearanceEvent(String entrance, String classification) {
@@ -919,11 +928,11 @@ public class LogUtils {
                                           int seq2) {
         JSONObject object = new JSONObject();
         try {
-            object.put("event", event);
-            object.put("meta", getMetaObject());
-            object.put("timestamp", System.currentTimeMillis() / 1000);
+            object.put(KEY_EVENT, event);
+            object.put(KEY_META, getMetaObject());
+            object.put(KEY_TIMESTAMP, System.currentTimeMillis() / 1000);
 
-            object.put("entrance", entrance);
+            object.put(KEY_ENTRANCE, entrance);
             object.put("classification", classification);
             object.put("side_classification", sideClassification);
             object.put("classification_1st", classification1);
@@ -941,45 +950,45 @@ public class LogUtils {
         if (BuildConfig.DEBUG) {
             Utils.log("LogUtils->" + object.toString());
         }
-        LoghubUtils.log(object, "event", false);
+        LoghubUtils.log(object, LOG_STORE_EVENT, false);
     }
 
     public static void logGameDetailFixedTopArticleClick(String gameId, String gameName, String url) {
         JSONObject object = new JSONObject();
         try {
-            object.put("event", "game_detail_click_top_strategy");
-            object.put("game_id", gameId);
-            object.put("game_name", gameName);
+            object.put(KEY_EVENT, "game_detail_click_top_strategy");
+            object.put(KEY_GAME_ID, gameId);
+            object.put(KEY_GAME_NAME, gameName);
             object.put("top_strategy_url", url);
-            object.put("meta", getMetaObject());
-            object.put("timestamp", System.currentTimeMillis() / 1000);
+            object.put(KEY_META, getMetaObject());
+            object.put(KEY_TIMESTAMP, System.currentTimeMillis() / 1000);
         } catch (JSONException e) {
             e.printStackTrace();
         }
         if (BuildConfig.DEBUG) {
             Utils.log("LogUtils->" + object.toString());
         }
-        LoghubUtils.log(object, "event", false);
+        LoghubUtils.log(object, LOG_STORE_EVENT, false);
     }
 
     public static void logHomeTopTabClick(String tabName, String linkType, String linkTitle, String linkId, int sequence) {
         JSONObject object = new JSONObject();
         try {
-            object.put("event", "top_tab_click");
+            object.put(KEY_EVENT, "top_tab_click");
             object.put("tab_name", tabName);
             object.put("link_type", linkType);
             object.put("link_id", linkId);
             object.put("link_text", linkTitle);
             object.put("sequence", sequence);
-            object.put("meta", getMetaObject());
-            object.put("timestamp", System.currentTimeMillis() / 1000);
+            object.put(KEY_META, getMetaObject());
+            object.put(KEY_TIMESTAMP, System.currentTimeMillis() / 1000);
         } catch (JSONException e) {
             e.printStackTrace();
         }
         if (BuildConfig.DEBUG) {
             Utils.log("LogUtils->" + object.toString());
         }
-        LoghubUtils.log(object, "event", false);
+        LoghubUtils.log(object, LOG_STORE_EVENT, false);
     }
 
     public static void uploadRecommendPopup(String event, String popupId, String gameId, String gameName,
@@ -987,10 +996,10 @@ public class LogUtils {
         JSONObject object = new JSONObject();
         JSONObject payloadObject = new JSONObject();
         try {
-            object.put("event", event);//recommend_pop_show推荐弹窗出现、recommend_pop_close推荐弹窗手动关闭、recommend_pop_link_click点击推荐弹窗链接、recommend_pop_download推荐弹窗下载开始、recommend_pop_download_complete推荐弹窗下载完成
+            object.put(KEY_EVENT, event);//recommend_pop_show推荐弹窗出现、recommend_pop_close推荐弹窗手动关闭、recommend_pop_link_click点击推荐弹窗链接、recommend_pop_download推荐弹窗下载开始、recommend_pop_download_complete推荐弹窗下载完成
             payloadObject.put("recommend_pop_id", popupId);
-            payloadObject.put("game_id", gameId);
-            payloadObject.put("game_name", gameName);
+            payloadObject.put(KEY_GAME_ID, gameId);
+            payloadObject.put(KEY_GAME_NAME, gameName);
             if (!TextUtils.isEmpty(linkType)) {
                 payloadObject.put("link_type", linkType);
             }
@@ -1003,37 +1012,37 @@ public class LogUtils {
             if (!TextUtils.isEmpty(downloadGameName)) {
                 payloadObject.put("download_game_name", downloadGameName);
             }
-            object.put("payload", payloadObject);
-            object.put("meta", getMetaObject());
-            object.put("timestamp", System.currentTimeMillis() / 1000);
+            object.put(KEY_PAY_LOAD, payloadObject);
+            object.put(KEY_META, getMetaObject());
+            object.put(KEY_TIMESTAMP, System.currentTimeMillis() / 1000);
         } catch (JSONException e) {
             e.printStackTrace();
         }
         if (BuildConfig.DEBUG) {
             Utils.log("LogUtils->" + object.toString());
         }
-        LoghubUtils.log(object, "event", false);
+        LoghubUtils.log(object, LOG_STORE_EVENT, false);
     }
 
     public static void uploadReceiveGift(String event, String giftId, String giftName, String location, String gameId, String gameName) {
         JSONObject object = new JSONObject();
         JSONObject payloadObject = new JSONObject();
         try {
-            object.put("event", event);//game_gift_get_successful领取礼包、game_gift_dig_successful淘号
+            object.put(KEY_EVENT, event);//game_gift_get_successful领取礼包、game_gift_dig_successful淘号
             payloadObject.put("gift_id", giftId);
             payloadObject.put("gift_name", giftName);
             payloadObject.put("location", location);
-            payloadObject.put("game_id", gameId);
-            payloadObject.put("game_name", gameName);
-            object.put("payload", payloadObject);
-            object.put("meta", getMetaObject());
-            object.put("timestamp", System.currentTimeMillis() / 1000);
+            payloadObject.put(KEY_GAME_ID, gameId);
+            payloadObject.put(KEY_GAME_NAME, gameName);
+            object.put(KEY_PAY_LOAD, payloadObject);
+            object.put(KEY_META, getMetaObject());
+            object.put(KEY_TIMESTAMP, System.currentTimeMillis() / 1000);
         } catch (JSONException e) {
             e.printStackTrace();
         }
         if (BuildConfig.DEBUG) {
             Utils.log("LogUtils->" + object.toString());
         }
-        LoghubUtils.log(object, "event", false);
+        LoghubUtils.log(object, LOG_STORE_EVENT, false);
     }
 }

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

@@ -43,6 +43,7 @@ import com.tencent.connect.share.QQShare;
 import com.tencent.mm.opensdk.modelmsg.SendMessageToWX;
 import com.tencent.mm.opensdk.modelmsg.WXImageObject;
 import com.tencent.mm.opensdk.modelmsg.WXMediaMessage;
+import com.tencent.mm.opensdk.modelmsg.WXTextObject;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 import com.tencent.open.TDialog;
@@ -311,6 +312,48 @@ public class MessageShareUtils {
         }
     }
 
+    public void shareTextFromWeb(Activity activity, String text, String type) {
+        if ("qq".equals(type)) {
+            Utils.toast(mContext, "分享跳转中...");
+            if (ShareUtils.isQQClientAvailable(activity)) {
+                Intent intent = new Intent();
+                intent.setAction(Intent.ACTION_SEND);
+                intent.putExtra(Intent.EXTRA_TEXT, text);
+                intent.setType("text/plain");
+                intent.setPackage("com.tencent.mobileqq");
+                intent.setClassName("com.tencent.mobileqq", "com.tencent.mobileqq.activity.JumpActivity");
+                try {
+                    activity.startActivity(intent);
+                } catch (Exception e) {
+                    Utils.toast(mContext, "分享失败");
+                }
+            } else {
+                Utils.toast(mContext, "请安装QQ客户端");
+            }
+        } else if ("wechat".equals(type)) {
+            Utils.toast(mContext, "分享跳转中...");
+
+            if (!mIWXAPI.isWXAppInstalled() && !PermissionHelper.isGetInstalledListPermissionDisabled(mContext)) {
+                Utils.toast(mContext, mContext.getString(R.string.share_no_wechat_hint));
+                return;
+            }
+
+            WXTextObject textObj = new WXTextObject();
+            textObj.text = text;
+
+            WXMediaMessage msg = new WXMediaMessage();
+            msg.mediaObject = textObj;
+            msg.description = text;
+
+            SendMessageToWX.Req req = new SendMessageToWX.Req();
+            req.transaction = buildTransaction("text");
+            req.message = msg;
+            req.scene = SendMessageToWX.Req.WXSceneSession;
+
+            mIWXAPI.sendReq(req);
+        }
+    }
+
     //QQ分享
     private void qqShare() {
         Utils.toast(mContext, "分享跳转中...");