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

.gitlab-ci.yml

@@ -1,159 +1,43 @@
-# commit_sha 文件记录上一次成功流水线的commit sha，用于定时计划检测是否有新代码提交，有就执行流水线，没有就终止流水线
-cache:
-# 不同的分支采用不同的 cache，防止分支之间相互影响
-   key: "${CI_COMMIT_REF_SLUG}_commit_sha"
-   paths:
-     - commit_sha
-   policy: pull
-
-# 将打包&发送apk包邮件job 和代码分析job 并行执行
 stages:
-  - build&analyze
-  - oss-upload&send-email
-  - ci_sonar_mail
-
-# 阻止了 合并请求 或 push（分支和标签）的流水线。 最后的 when: always 规则运行所有其他流水线类型，包括定时计划流水线。
-workflow:
- rules:
-   - if: '$CI_PIPELINE_SOURCE == "push"'
-     when: always
-   - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-     when: never
-   - when: always
-
-before_script:
-   # 检查是否存在 commit_sha 文件
-   - if [ -f commit_sha ]; then cat commit_sha; else echo "0000000" > commit_sha; fi
-   - export BEFORE_COMMIT_SHA=$(cat commit_sha)
-   # 比较commit sha ,若与上一次成功流水线的commit sha 相同，则退出流水线
-   - if [ "$CI_COMMIT_SHA" == "$BEFORE_COMMIT_SHA" ] && [ "$CI_PIPELINE_SOURCE" != "web" ]; then exit 137; fi
-
-# 使用 .post 阶段使作业在流水线的末尾运行。.post 始终是流水线的最后阶段。
-change_commit:
-   tags:
-     - offline-test
-   stage: .post
-   # 此job 跳过拉取git代码
-   variables:
-     GIT_STRATEGY: none
-   script:
-     # 更新 commit_sha
-     - if [ "$CI_COMMIT_SHA" != "$BEFORE_COMMIT_SHA" ]; then echo $CI_COMMIT_SHA > commit_sha; fi
-   cache:
-     # 不同的分支采用不同的 cache，防止分支之间相互影响
-     key: "${CI_COMMIT_REF_SLUG}_commit_sha"
-     paths:
-       - commit_sha
-     policy: pull-push
-   allow_failure:
-     exit_codes: 137
+  - android-build
+  - docker-build
 
 android_build:
   tags:
-    # - local-runner
     - offline-test
-  stage: build&analyze
-  image: hub.shanqu.cc/library/ci-android:jdk11-sdk31-33
-  resource_group: android_build
+  stage: android-build
+  image: hub.shanqu.cc/devops/ci-android:jdk11
   variables:
+    KUBERNETES_CPU_LIMIT: "16"
     GIT_SUBMODULE_STRATEGY: recursive
-    KUBERNETES_CPU_LIMIT: "10"
+    Apk_Path: "app/build/outputs/apk/**/release/*.apk"
   script:
-    - export GRADLE_USER_HOME=/home/gitlab-runner/ci-build-cache/$CI_PROJECT_PATH/.gradle
+    - export GRADLE_USER_HOME=./.gradle
     - chmod +x ./gradlew
     - ./scripts/jenkins_build.sh -c
-  #设置打包后的产物，用于job之间共享
-  artifacts:
-      paths:
-          - app/build/tmp/*.apk
-      expire_in: 48 hrs       # 指定附件上载后保存的时间24h，默认永久在Gitlab保存
-  allow_failure:
-    exit_codes: 137
+    - rm -rf ./.gradle/caches/build-cache-1
+  cache:
+    paths:
+      - .gradle
   only:
-    - dev
-    - dev-5.29.0
-    - dev-5.30.0
+    - feature-ci
 
-# 代码检查
-sonarqube_analysis:
-   tags:
-     - offline-test
-   stage: build&analyze
-   image: sonarsource/sonar-scanner-cli:latest
-   dependencies: []    #禁止传递来的artifact
-   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=.
-       -Dsonar.branch.name=$CI_COMMIT_REF_NAME
-   allow_failure:
-     exit_codes: 137
-   only:
-     - dev
-     - dev-5.29.0
-     - dev-5.30.0
+# 构建推送docker镜像
+docker-build:
+  tags:
+    - offline-test
+  stage: docker-build
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
+  image: hub.shanqu.cc/library/docker:latest
+  script:
+    - 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:
+    - feature-ci
 
-## 发送简易检测结果报告
-send_sonar_report:
-   tags:
-     - offline-test
-   stage: ci_sonar_mail
-   image: hub.shanqu.cc/library/docker:latest
-   # 此job 跳过拉取git代码
-   variables:
-     GIT_STRATEGY: none
-   script:
-     - group=`echo $CI_PROJECT_PATH | sed 's#/#-#g'`
-     - docker run -e PROJECTKEY=$group -e EMAIL=$GITLAB_USER_EMAIL -e BRANCH=$CI_COMMIT_REF_NAME --name send-email --rm hub.shanqu.cc/platform/send-sonar-report:latest
-   allow_failure:
-     exit_codes: 137
-   only:
-     - dev
-     - dev-5.29.0
-     - dev-5.30.0
-
-oss-upload&send-email:
-    tags:
-        - rancher-k8s
-    stage: oss-upload&send-email
-    image: hub.shanqu.cc/devops/android-apk-oss-upload:latest
-    variables:
-        GIT_STRATEGY: none
-        VAULT_ADDR: https://vault.shanqu.cc                         # 固定值
-        VAULT_SECRET_PATH: prod/devops/android-apk-oss-upload       # 固定值
-        VAULT_ROLE: android-apk-oss-upload                          # 固定值
-        ENDPOINT: "oss-cn-shenzhen-internal.aliyuncs.com"           # 固定值
-        BUCKET: "shanqu"                                            # 固定值
-        FILE_PATH: "app/build/tmp/"                         # APK 存放路径
-        Email_To_List: $EMAIL_TO_LIST                               # 邮件接受人列表
-        Email_Title: "光环助手 $CI_COMMIT_BRANCH"                    # 邮件标题
-        PIPELINE_ID: $CI_PIPELINE_ID                                # 流水线id
-        COMMIT_BRANCH: $CI_COMMIT_BRANCH                            # 提交分支
-        MAIL_MESSAGE: "[$CI_COMMIT_AUTHOR] $CI_COMMIT_MESSAGE"
-    needs:
-        - job: android_build
-          artifacts: true
-    script:
-        ### 绑定上传参数 ###
-        - export OSS_PATH="release/dev/${CI_PROJECT_NAME}/$(date "+%Y/%m/%d")"
-        ### 开启上传 ###
-        - /usr/local/bin/python /upload.py
-        ### 发送邮件
-        - /usr/local/bin/python /ci-android-mail.py
-    only:
-        - dev
-        - dev-5.29.0
-        - dev-5.30.0

Dockerfile

@@ -1,5 +1,6 @@
 FROM openjdk:11-jdk
 WORKDIR /project
+ARG CI_PROJECT_PATH=default_value
 SHELL ["/bin/bash", "-c"]
 #配置SDK环境变量
 ENV ANDROID_SDK_ROOT /usr/lib/sdk
@@ -7,9 +8,11 @@ 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 lib32stdc++6 lib32z1 libncurses5 util-linux bash tzdata librdkafka-dev pkgconf \
+    && apt-get --quiet install --yes wget lib32stdc++6 lib32z1 libncurses5  \
     && rm -rf /var/lib/apt/lists/*
-COPY .gradle /project/.gradle
+
+COPY  . /project

app/build.gradle

@@ -9,14 +9,6 @@ import groovy.xml.XmlUtil
 
 android {
 
-    String CONFIG_ID = ""
-    String FIRST_LAUNCH = ""
-    String SDK_VERSION = ""
-    String SDK_APP_ID = ""
-    String SDK_APP_NAME = ""
-    boolean USE_DEFAULT_CHANNEL_SDK = true
-    int ACTIVATE_REPORTING_RATIO = 100
-
     buildFeatures {
         viewBinding true
         dataBinding true
@@ -75,26 +67,9 @@ android {
 
         proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt', 'proguard-fresco.txt'
 
-        String CORE_EVENT_GAME_CATEGORY = ""
-
-        // 推广用的关键事件游戏类型
-        buildConfigField "String", "CORE_EVENT_GAME_CATEGORY", "\"${CORE_EVENT_GAME_CATEGORY}\""
-
-        // 推广用的配置 id
-        buildConfigField "String", "CONFIG_ID", "\"${CONFIG_ID}\""
-
-        // 推广用的 SDK 版本 （仅记录使用）
-        buildConfigField "String", "SDK_VERSION", "\"${SDK_VERSION}\""
-        buildConfigField "String", "SDK_APP_ID", "\"${SDK_APP_ID}\""
-        buildConfigField "String", "SDK_APP_NAME", "\"${SDK_APP_NAME}\""
-        buildConfigField "boolean", "USE_DEFAULT_CHANNEL_SDK", "${USE_DEFAULT_CHANNEL_SDK}"
-
-        // 首次启动的跳转配置
-        buildConfigField "String", "FIRST_LAUNCH", "\"${FIRST_LAUNCH}\""
-
-        buildConfigField "int", "ACTIVATE_REPORTING_RATIO", "${ACTIVATE_REPORTING_RATIO}"
-
-        // All third-party appid/appkey
+        /**
+         * All third-party appid/appkey
+         */
         buildConfigField "String", "API_HOST", "\"${API_HOST}\""
         buildConfigField "String", "NEW_API_HOST", "\"${NEW_API_HOST}\""
         buildConfigField "String", "VAPI_HOST", "\"${VAPI_HOST}\""
@@ -152,7 +127,7 @@ android {
     variantFilter { variant ->
         def names = variant.flavors*.name
         def isDebugType = variant.buildType.name == "debug"
-        if ((names.contains("tea") || name.contains("kuaishou") || name.contains("gdt")) && isDebugType) {
+        if ((names.contains("tea") || name.contains("kuaishou")) && isDebugType) {
             setIgnore(true)
         }
     }
@@ -172,13 +147,10 @@ android {
         kuaishou {
             java.srcDirs = ['src/main/java', 'src/kuaishou/java']
         }
-        gdt {
-            java.srcDirs = ['src/main/java', 'src/gdt/java']
-        }
     }
 
     productFlavors {
-        // internal， 内部测试包使用的 flavor，接口包含包括测试和正式环境
+        // internal test dev host
         internal {
             dimension "env"
             versionNameSuffix "-debug"
@@ -188,10 +160,9 @@ android {
             buildConfigField "String", "DEV_VAPI_HOST", "\"${DEV_VAPI_HOST}\""
             buildConfigField "String", "QUICK_LOGIN_APPID", "\"${DEV_QUICK_LOGIN_APPID}\""
             buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${DEV_QUICK_LOGIN_APPKEY}\""
-            buildConfigField "String", "CSJ_APPID", "\"${DEV_CSJ_APPID}\""
         }
 
-        // publish， 发布时候使用的 flavor，接口仅包含正式环境
+        // publish release host
         publish {
             dimension "env"
 
@@ -200,7 +171,6 @@ android {
             buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
             buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
             buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
-            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
         }
 
         tea {
@@ -211,7 +181,6 @@ android {
             buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
             buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
             buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
-            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
 
             manifestPlaceholders.put("APPLOG_SCHEME", "rangersapplog.byAx6uYt".toLowerCase())
         }
@@ -224,18 +193,6 @@ android {
             buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
             buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
             buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
-            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
-        }
-
-        gdt {
-            dimension "env"
-
-            buildConfigField "String", "DEV_API_HOST", "\"${API_HOST}\""
-            buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_API_HOST}\""
-            buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
-            buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
-            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
-            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
         }
     }
 }
@@ -252,7 +209,6 @@ dependencies {
 
     teaImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/tea/libs')
     kuaishouImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/kuaishou/libs')
-    gdtImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/gdt/libs')
     testImplementation 'junit:junit:4.12'
 
     debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakcanary}"
@@ -260,7 +216,8 @@ dependencies {
 
 //    debugImplementation "com.gu.android:toolargetool:${toolargetool}" // 需要使用调试时才启用
     debugImplementation "com.github.nichbar:WhatTheStack:${whatTheStack}"
-//    debugImplementation "io.github.didi.dokit:dokitx:${dokit}"
+    debugImplementation "io.github.didi.dokit:dokitx:${dokit}"
+
 
     implementation "androidx.multidex:multidex:${multiDex}"
     implementation "androidx.fragment:fragment-ktx:${fragment}"
@@ -300,7 +257,6 @@ dependencies {
     implementation "com.llew.huawei:verifier:${verifier}"
 
     teaImplementation "com.bytedance.applog:RangersAppLog-Lite-cn:${bytedanceApplog}"
-    teaImplementation "com.bytedance.applog:RangersAppLog-All-convert:${bytedanceApplog}"
 
     implementation "net.lingala.zip4j:zip4j:${zip4j}"
 
@@ -315,8 +271,7 @@ dependencies {
 
     implementation "com.lg:gid:${gid}"
 
-    implementation "com.lg:shortcut:${shortcut}"
-
+    compileOnly "com.github.axen1314.lancet:lancet-base:${lancet_version}"
     kapt "com.alibaba:arouter-compiler:$arouterVersion"
 
     implementation project(':ndownload')
@@ -334,30 +289,17 @@ dependencies {
 //    implementation(project(':module_setting_compose')) {
 //        exclude group: 'androidx.swiperefreshlayout'
 //    }
-    implementation(project(':module_core_feature')) {
+    implementation(project(':module_core_feature')){
         exclude group: 'androidx.swiperefreshlayout'
     }
     implementation(project(':module_feedback')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
-    implementation(project(':module_sensors_data')) {
-        exclude group: 'androidx.swiperefreshlayout'
-    }
-    implementation(project(':module_message')) {
-        exclude group: 'androidx.swiperefreshlayout'
-    }
-//    implementation(project(':feature:vpn'))
-    implementation(project(':feature:pkg'))
-    implementation(project(':feature:oaid'))
-    implementation(project(':feature:floating-window'))
-    implementation(project(':feature:csj_ad'))
-//    implementation(project(':feature:beizi_startup_ad'))
-    implementation(project(':feature:xapk-installer'))
-    implementation(project(':feature:qq_game')) {
-        exclude group: 'androidx.swiperefreshlayout'
-    }
+    // 默认不接入光能模块，提高编译速度
+//    debugImplementation(project(':module_energy')) {
+//        exclude group: 'androidx.swiperefreshlayout'
+//    }
 }
-
 File propFile = file('sign.properties')
 if (propFile.exists()) {
     Properties props = new Properties()
@@ -497,12 +439,7 @@ andResGuard {
             "R.drawable.suggest_add_pic_icon",
             "R.drawable.icon_pic_add",
             "R.drawable.ask_search_input_delete",
-            "R.drawable.suggest_pic_delete",
-            "R.id.cardIv",
-            "R.id.cardMask",
-            "R.id.cardGradientMask",
-            "R.id.gameIconIv",
-            "R.id.titleContainer"
+            "R.drawable.suggest_pic_delete"
     ]
     compressFilePattern = [
             "*.png",
@@ -597,4 +534,4 @@ project.afterEvaluate {
             }
         }
     }
-}
+}

app/proguard-rules.txt

@@ -20,13 +20,11 @@
 -keep class com.gh.gamecenter.db.info.* {*;}
 -keep class com.gh.gamecenter.entity.** {<fields>;}
 -keep class com.gh.gamecenter.qa.entity.** {<fields>;}
--keep class com.gh.download.DownloadDataSimpleEntity {<fields>;}
--keep class com.gh.gamecenter.floatingwindow.FloatingWindowEntity {<fields>;}
 -keep class com.gh.gamecenter.BR
 -keep class com.gh.gamecenter.retrofit.* {*;}
 -keep class com.gh.gamecenter.eventbus.* {*;}
--keep class com.gh.gamecenter.home.gamecollection.carousel.GameCollectionStackLayout {*;}
--keep class com.gh.gamecenter.home.gamecollection.carousel.GameCollectionStackAnimation {*;}
+-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 * {
@@ -64,16 +62,6 @@
     public <init>(android.content.Context, android.util.AttributeSet, int);
 }
 
-### RecyclerView.jumpToPositionForSmoothScroller
--keep class androidx.recyclerview.widget.RecyclerView {
-  void jumpToPositionForSmoothScroller(int);
-}
-
-### ViewBinding 反射相关
--keep class * implements androidx.viewbinding.ViewBinding {
-    public static *** inflate(android.view.LayoutInflater, android.view.ViewGroup, boolean);
-}
-
 ### TEA
 -keep class com.gh.gamecenter.TeaHelper { *; }
 
@@ -81,14 +69,4 @@
 -keep class com.lzf.easyfloat.* {*;}
 
 ### dokit
--keep class com.didichuxing.** {*;}
-
-### 广点通SDK
--dontwarn com.qq.gdt.action.**
--keep class com.qq.gdt.action.** {*;}
--keep public class com.tencent.turingfd.sdk.**
-
--keepclasseswithmembers class * {
-native <methods>;
-}
-
+-keep class com.didichuxing.** {*;}

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

@@ -26,15 +26,11 @@ class FlavorProviderImp : IFlavorProvider {
         return channel
     }
 
-    override fun init(application: Application, activity: Activity, activateRatio: Int) {
+    override fun init(application: Application, activity: Activity) {
         // do nothing
     }
 
     override fun logEvent(content: String) {
         // do nothing
     }
-
-    override fun logCoreEvent() {
-        // do nothing
-    }
 }

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

@@ -1,37 +0,0 @@
-package com.gh.gamecenter
-
-import android.app.Application
-import com.lightgame.utils.Utils
-import com.qq.gdt.action.ActionParam
-import com.qq.gdt.action.ActionType
-import com.qq.gdt.action.GDTAction
-import org.json.JSONObject
-
-object GdtHelper {
-    private const val USER_ACTION_SET_ID = "1201041887"
-    private const val APP_SECRET_ID = "c29cc5c48cf540c43b4b97363bb09216"
-
-    private const val KS_USER_ACTION_SET_ID = "1201032128"
-    private const val KS_APP_SECRET_ID = "9bdbbb81d4e0bd333a2a581f9ee36986"
-
-    @JvmStatic
-    fun init(application: Application, channel: String) {
-        if (channel == "KS_GDT_GHZS_MC01") {
-            GDTAction.init(application, KS_USER_ACTION_SET_ID, KS_APP_SECRET_ID, channel)
-        } else {
-            GDTAction.init(application, USER_ACTION_SET_ID, APP_SECRET_ID, channel)
-        }
-        Utils.log("init GdtHelper")
-    }
-
-    @JvmStatic
-    fun logAction(type: String) {
-        when (type) {
-            "EVENT_ACTIVE" -> GDTAction.logAction(ActionType.START_APP)
-            "active_register" -> GDTAction.logAction(ActionType.REGISTER)
-            "EVENT_NEXTDAY_STAY" -> GDTAction.logAction(ActionType.START_APP, JSONObject().apply {
-                put(ActionParam.Key.LENGTH_OF_STAY, 1)
-            })
-        }
-    }
-}

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

@@ -1,52 +0,0 @@
-package com.gh.gamecenter.provider
-
-import android.app.Activity
-import android.app.Application
-import android.text.TextUtils
-import com.gh.gamecenter.GdtHelper
-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, activateRatio: Int) {
-        GdtHelper.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 = GDT_DEFAULT_CHANNEL
-        }
-        return channel
-    }
-
-    override fun logEvent(content: String) {
-        GdtHelper.logAction(content)
-    }
-
-    override fun logCoreEvent() {
-        // do nothing
-    }
-
-    companion object {
-        private const val GDT_DEFAULT_CHANNEL = "GDT_GHZS_01"
-    }
-}

app/src/internal/res/xml/network_security_config.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
-    <base-config cleartextTrafficPermitted="true">
-        <trust-anchors>
-            <!-- Trust user added CAs while debuggable only -->
-            <certificates src="user" />
-            <certificates src="system" />
-        </trust-anchors>
-    </base-config>
-</network-security-config>

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

@@ -5,15 +5,15 @@ import com.kwai.monitor.log.TurboAgent
 import com.kwai.monitor.log.TurboConfig
 
 object KuaishouHelper {
-    private val mAppId by lazy { BuildConfig.SDK_APP_ID.ifEmpty { "81537" } }
-    private val mAppName by lazy { BuildConfig.SDK_APP_NAME.ifEmpty { "guanghuanzhushou_1" } }
+    private 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(mAppId)
-                .setAppName(mAppName)
+                .setAppId(APP_ID)
+                .setAppName(APP_NAME)
                 .setAppChannel(channel)
                 .build()
         )

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

@@ -3,20 +3,16 @@ package com.gh.gamecenter.provider
 import android.app.Activity
 import android.app.Application
 import android.text.TextUtils
-import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.KuaishouHelper
-import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.provider.IFlavorProvider
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.core.utils.TimeUtils
-import com.gh.gamecenter.core.utils.ToastUtils
 import com.halo.assistant.HaloApp
-import com.kwai.monitor.payload.TurboHelper
 import com.leon.channel.helper.ChannelReaderUtil
 
 class FlavorProviderImp : IFlavorProvider {
 
-    override fun init(application: Application, activity: Activity, activateRatio: Int) {
+    override fun init(application: Application, activity: Activity) {
         KuaishouHelper.init(application, getChannelStr(application))
 
         if (HaloApp.getInstance().isBrandNewInstall) {
@@ -35,11 +31,7 @@ class FlavorProviderImp : IFlavorProvider {
     }
 
     override fun getChannelStr(application: Application): String {
-        var channel = if (BuildConfig.USE_DEFAULT_CHANNEL_SDK) {
-            ChannelReaderUtil.getChannel(application)
-        } else {
-            TurboHelper.getChannel(application)
-        }
+        var channel = ChannelReaderUtil.getChannel(application)
         if (channel == null || TextUtils.isEmpty(channel.trim())) {
             channel = KUAISHOU_CHANNEL
         }
@@ -50,15 +42,6 @@ class FlavorProviderImp : IFlavorProvider {
         KuaishouHelper.onEvent(content)
     }
 
-    override fun logCoreEvent() {
-        logEvent("EVENT_KEY_PATH_OPTIMIZATION")
-        if (BuildConfig.ACTIVATE_REPORTING_RATIO == 1) {
-            AppExecutor.uiExecutor.executeWithDelay({
-                ToastUtils.toast("关键行为 EVENT_KEY_PATH_OPTIMIZATION")
-            }, 500)
-        }
-    }
-
     companion object {
         private const val KUAISHOU_CHANNEL = "KS-GHZS-01"
     }

app/src/main/AndroidManifest.xml

@@ -46,8 +46,7 @@
     <!-- 如果有视频相关的广告且使用textureView播放，请务必添加，否则黑屏 -->
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
-    <uses-sdk tools:overrideLibrary="
-        com.shuyu.gsyvideoplayer,
+    <uses-sdk tools:overrideLibrary="com.shuyu.gsyvideoplayer,
         com.shuyu.gsyvideoplayer.lib,
         com.haroldadmin.whatthestack,
         com.shuyu.gsyvideoplayer.armv7a,
@@ -77,12 +76,7 @@
         androidx.compose.animation.core,
         androidx.constraintlayout.compose,
         androidx.compose.ui.test.manifest,
-        com.bytedance.sdk.openadsdk,
-        androidx.compose.ui.tooling.preview,
-        com.tencent.qqmini,
-        com.tencent.qqmini.minigame.external,
-        com.tencent.qqmini.minigame.opensdk,
-        com.tencent.qqmini.union.ad" />
+        androidx.compose.ui.tooling.preview"/>
 
     <!-- 去掉 SDK 一些流氓权限 -->
     <uses-permission
@@ -111,16 +105,11 @@
         android:icon="@mipmap/logo"
         android:label="@string/app_name"
         android:largeHeap="true"
-        android:networkSecurityConfig="@xml/network_security_config"
         android:resizeableActivity="true"
         android:theme="@style/AppCompatTheme.APP"
         tools:replace="android:name,android:allowBackup"
         tools:targetApi="n">
 
-        <meta-data
-            android:name="EasyGoClient"
-            android:value="true" />
-
         <meta-data
             android:name="io.sentry.auto-init"
             android:value="false" />
@@ -130,8 +119,6 @@
             android:name="io.sentry.breadcrumbs.system-events"
             android:value="false" />
 
-        <service android:name="com.gh.ndownload.NDownloadService" />
-
         <activity
             android:name="com.gh.gamecenter.SplashScreenActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -148,15 +135,10 @@
         <activity
             android:name="com.gh.gamecenter.MainActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
-            android:exported="true"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:theme="@style/AppCompatTheme.APP"
-            android:windowSoftInputMode="stateAlwaysHidden|adjustResize">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-            </intent-filter>
-        </activity>
+            android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
 
         <activity
             android:name="com.gh.gamecenter.DownloadManagerActivity"
@@ -302,6 +284,10 @@
             android:name="com.gh.gamecenter.CollectionActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="com.gh.gamecenter.MessageActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name="com.gh.gamecenter.UserInfoEditActivity"
             android:screenOrientation="portrait"
@@ -315,10 +301,26 @@
             android:name="com.gh.gamecenter.qa.answer.edit.AnswerEditActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="com.gh.gamecenter.ConcernInfoActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name="com.gh.gamecenter.InfoActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="com.gh.gamecenter.MessageKeFuActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.MessageInviteActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.MessageVoteActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name=".qa.questions.invite.QuestionsInviteActivity"
             android:screenOrientation="portrait" />
@@ -617,8 +619,8 @@
         <!--            android:theme="@android:style/Theme.Translucent" />-->
 
         <activity
-            android:name="com.gh.gamecenter.SkipActivity"
             android:exported="true"
+            android:name="com.gh.gamecenter.SkipActivity"
             android:theme="@style/Theme.AppCompat.Light.Fullscreen.Transparent">
             <intent-filter>
                 <data android:scheme="ghzhushou" />
@@ -637,19 +639,6 @@
             </intent-filter>
         </activity>
 
-        <!--    光环助手授权登陆页面    -->
-        <activity
-            android:name=".authorization.AuthorizationActivity"
-            android:exported="true"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait">
-            <intent-filter>
-                <data android:scheme="ghzhushou_authorization" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <action android:name="android.intent.action.VIEW" />
-            </intent-filter>
-        </activity>
-
         <activity
             android:name="com.gh.gamecenter.teenagermode.TeenagerModeActivity"
             android:screenOrientation="portrait" />
@@ -741,22 +730,6 @@
             android:name=".servers.gametest2.GameServerTestV2Activity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.gamecollection.hotlist.GameCollectionHotListActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.qgame.QGameHomeWrapperActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.qgame.QGameSearchActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.qgame.QGameSubjectActivity"
-            android:screenOrientation="portrait" />
-
 
         <!--        <activity-->
         <!--            android:name="${applicationId}.douyinapi.DouYinEntryActivity"-->
@@ -794,9 +767,9 @@
         <service
             android:name=".aidl.CommunicationService"
             android:enabled="true"
-            android:exported="true">
+            android:exported="true" >
             <intent-filter>
-                <action android:name="com.gh.gamecenter.aidl.CommunicationService" />
+                <action android:name="com.gh.gamecenter.aidl.CommunicationService"/>
             </intent-filter>
         </service>
 
@@ -827,11 +800,6 @@
             </intent-filter>
         </receiver>
 
-        <activity
-            android:name="com.gh.common.xapk.XapkInstallReceiver"
-            android:theme="@style/Theme.Transparent"
-            android:exported="false" />
-
         <receiver
             android:name="com.gh.gamecenter.receiver.ActivitySkipReceiver"
             android:exported="true">
@@ -840,6 +808,39 @@
             </intent-filter>
         </receiver>
 
+        <!-- 梦工厂配置 开始 -->
+        <!--<meta-data
+            android:name="MGC_APPID"
+            android:value="1001276" />
+
+        <provider
+            android:name="com.leto.game.base.provider.LetoFileProvider"
+            android:authorities="${applicationId}.leto.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/leto_file_path"
+                tools:replace="android:resource" />
+        </provider>-->
+        <!-- 梦工厂配置 结束 -->
+
+        <!-- 穿山甲配置 开始 -->
+        <!--<provider
+            android:name="com.bytedance.sdk.openadsdk.TTFileProvider"
+            android:authorities="${applicationId}.TTFileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+
+        <provider
+            android:name="com.bytedance.sdk.openadsdk.multipro.TTMultiProvider"
+            android:authorities="${applicationId}.TTMultiProvider"
+            android:exported="false" />-->
+        <!-- 穿山甲配置 结束 -->
     </application>
 
 </manifest>

app/src/main/assets/easygo.json

@@ -1,27 +0,0 @@
-{
-    "easyGoVersion": "1.0",
-    "client": "com.gh.gamecenter",
-    "logicEntities": [
-        {
-            "head": {
-                "function": "magicwindow",
-                "required": "true"
-            },
-            "body": {
-                "mode":"1",
-                "activityPairs":[
-                    {"from":"com.gh.gamecenter.MainActivity","to":"*"}
-                ],
-                "defaultDualActivities": {
-                    "mainPages": "com.gh.gamecenter.MainActivity"
-                },
-                "UX": {
-                    "supportRotationUxCompat": "false",
-                    "isDraggable": "true"
-                },
-                "transActivities":[
-                ]
-            }
-        }
-    ]
-}

app/src/main/assets/lottie/click_guide.json

@@ -0,0 +1 @@
+{"v":"5.5.9","fr":60,"ip":0,"op":90,"w":1080,"h":202,"nm":"click","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"椭圆形","sr":1,"ks":{"o":{"a":0,"k":20,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[204,1455,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[24,24],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":120,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"椭圆形","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":63,"s":[10]},{"t":70,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[204,1455,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":39,"s":[100,100,100]},{"t":49,"s":[110,110,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[36,36],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":120,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"圆环","refId":"comp_0","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.531],"y":[0]},"t":28,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":38,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.526],"y":[0]},"t":48,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.446],"y":[0]},"t":63,"s":[50]},{"t":82,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[125.951,79.658,0],"ix":2},"a":{"a":0,"k":[205.951,1458.658,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.601,0.601,0.333],"y":[0,0,0]},"t":28,"s":[50,50,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.528,0.528,0.333],"y":[0,0,0]},"t":38,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.526,0.526,0.333],"y":[0,0,0]},"t":48,"s":[120,120,100]},{"t":63,"s":[100,100,100]}],"ix":6}},"ao":0,"w":1080,"h":1920,"ip":0,"op":120,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"点击手","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.596],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":10,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.515],"y":[0]},"t":63,"s":[100]},{"t":83,"s":[0]}],"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.507],"y":[0]},"t":10,"s":[6]},{"t":30,"s":[2]}],"ix":10},"p":{"a":0,"k":[178.982,123.325,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.489,0.489,0.333],"y":[0,0,0]},"t":10,"s":[100,100,100]},{"t":30,"s":[90,90,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-5.33,-8.3],[3.89,0.27],[-4.4,-1.68],[-4.33,-0.67],[-4.08,9.32],[3.33,5.44],[3.39,4.6],[0.87,-3.7],[3.6,-0.86],[1.03,-0.21],[2.34,-0.53],[0.96,1.15],[4.22,5.48],[-1.18,-4.56]],"o":[[1.11,1.71],[-3.89,-0.27],[6.42,2.5],[4.33,0.66],[1.63,-5.32],[-3.34,-5.45],[-1.68,-2.1],[-0.71,3.14],[-3.43,0.95],[-0.57,0.08],[-3.86,1.12],[-3.23,-3.94],[-1.89,-2.28],[2.42,4.64]],"v":[[-5.387,9.698],[-10.717,8.498],[-12.327,15.628],[5.813,21.748],[23.313,11.778],[20.273,-1.202],[11.563,-13.962],[5.393,-12.362],[1.083,-13.722],[-2.087,-9.742],[-5.707,-11.752],[-8.777,-7.572],[-18.297,-20.542],[-23.827,-17.832]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"路径备份 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":120,"st":0,"bm":0}],"markers":[]}

app/src/main/assets/lottie/double_click_guide.json

@@ -0,0 +1 @@
+{"v":"5.6.4","fr":25,"ip":0,"op":35,"w":1080,"h":214,"nm":"点赞","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"椭圆形 2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.588],"y":[0]},"t":17,"s":[15]},{"t":20,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[468.04,73.68,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.659,0.659,0.333],"y":[0,0,0]},"t":10,"s":[50,50,100]},{"t":19,"s":[150,150,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[24,24],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":10,"op":1510,"st":10,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"椭圆形 3","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.588],"y":[0]},"t":27,"s":[15]},{"t":30,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[468.04,73.68,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.659,0.659,0.333],"y":[0,0,0]},"t":20,"s":[50,50,100]},{"t":28,"s":[140,140,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[24,24],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":20,"op":1520,"st":20,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"路径备份 2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.602],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":5,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.663],"y":[0]},"t":24,"s":[100]},{"t":29,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[531.02,129.675,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.514,0.514,0.333],"y":[0,0,0]},"t":5,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.533,0.533,0.333],"y":[0,0,0]},"t":10,"s":[90,90,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.586,0.586,0.333],"y":[0,0,0]},"t":15,"s":[95,95,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.499,0.499,0.333],"y":[0,0,0]},"t":19,"s":[90,90,100]},{"t":24,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-5.33,-8.3],[3.89,0.27],[-4.4,-1.68],[-4.33,-0.67],[-4.08,9.32],[3.33,5.44],[3.39,4.6],[0.87,-3.7],[3.6,-0.86],[1.03,-0.21],[2.34,-0.53],[0.96,1.15],[4.22,5.48],[-1.18,-4.56]],"o":[[1.11,1.71],[-3.89,-0.27],[6.42,2.5],[4.33,0.66],[1.63,-5.32],[-3.34,-5.45],[-1.68,-2.1],[-0.71,3.14],[-3.43,0.95],[-0.57,0.08],[-3.86,1.12],[-3.23,-3.94],[-1.89,-2.28],[2.42,4.64]],"v":[[-5.387,9.698],[-10.717,8.498],[-12.327,15.628],[5.813,21.748],[23.313,11.778],[20.273,-1.202],[11.563,-13.962],[5.393,-12.362],[1.083,-13.722],[-2.087,-9.742],[-5.707,-11.752],[-8.777,-7.572],[-18.297,-20.542],[-23.827,-17.832]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"路径备份 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1500,"st":0,"bm":0}],"markers":[]}

app/src/main/assets/lottie/icon_fab_change.json

@@ -1 +0,0 @@
-{"v":"5.9.1","fr":60,"ip":0,"op":60,"w":144,"h":144,"nm":"icon_change","ddd":0,"assets":[{"id":"comp_0","nm":"icon_change_detail","fr":60,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"stroke1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[37.04,52.994,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.533,-0.143],[0.143,-0.533],[1.487,-1.304],[1.961,-0.258],[1.774,0.875],[0.709,0.661],[0,0],[0,0.445],[0,0],[-0.276,0],[0,0],[-0.013,0],[0,0],[0.315,-0.315],[0,0],[-0.682,-0.336],[-1.569,0.207],[-1.19,1.043],[-0.41,1.528]],"o":[[0.533,0.143],[-0.512,1.91],[-1.487,1.304],[-1.961,0.258],[-0.879,-0.433],[0,0],[-0.315,0.315],[0,0],[0,-0.276],[0,0],[0.013,0],[0,0],[0.445,0],[0,0],[0.555,0.508],[1.419,0.7],[1.569,-0.207],[1.19,-1.043],[0.143,-0.533]],"v":[[8.605,-4.301],[9.312,-3.076],[6.247,1.854],[0.958,4.25],[-4.77,3.304],[-7.163,1.652],[-8.493,2.982],[-9.347,2.628],[-9.347,-1.665],[-8.847,-2.165],[-8.161,-2.165],[-8.122,-2.165],[-4.554,-2.165],[-4.2,-1.311],[-5.748,0.237],[-3.885,1.51],[0.697,2.267],[4.928,0.35],[7.381,-3.594]],"c":true},"ix":2},"nm":"stroke1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,1,1,1,0.5,1,1,1,1,1,1,1,0,1,0.5,0.8,1,0.6],"ix":9}},"s":{"a":0,"k":[-5.347,-4.665],"ix":5},"e":{"a":0,"k":[8.653,-4.665],"ix":6},"t":1,"nm":"color1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"stroke1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":300,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"stroke2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[34.96,19.006,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.961,0.258],[-1.774,-0.875],[-0.709,-0.661],[0,0],[0,-0.445],[0,0],[0.276,0],[0,0],[0.012,0],[0,0],[-0.315,0.315],[0,0],[0.682,0.336],[1.569,-0.207],[1.19,-1.043],[0.41,-1.528],[0.533,0.143],[-0.143,0.533],[-1.487,1.304]],"o":[[1.961,-0.258],[0.879,0.433],[0,0],[0.315,-0.315],[0,0],[0,0.276],[0,0],[-0.012,0],[0,0],[-0.445,0],[0,0],[-0.555,-0.508],[-1.419,-0.7],[-1.569,0.207],[-1.19,1.043],[-0.143,0.533],[-0.533,-0.143],[0.512,-1.91],[1.487,-1.304]],"v":[[-0.958,-4.25],[4.77,-3.304],[7.163,-1.652],[8.493,-2.982],[9.347,-2.628],[9.347,1.665],[8.847,2.165],[8.16,2.165],[8.123,2.165],[4.554,2.165],[4.2,1.311],[5.748,-0.237],[3.885,-1.51],[-0.697,-2.267],[-4.928,-0.35],[-7.381,3.594],[-8.605,4.301],[-9.312,3.076],[-6.247,-1.854]],"c":true},"ix":2},"nm":"stroke2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,1,1,1,0.5,1,1,1,1,1,1,1,0,1,0.5,0.8,1,0.6],"ix":9}},"s":{"a":0,"k":[5.347,4.665],"ix":5},"e":{"a":0,"k":[-8.653,4.665],"ix":6},"t":1,"nm":"color2","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"stroke2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":300,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"icon_change_detail","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.5],"y":[1]},"o":{"x":[0.5],"y":[0]},"t":0,"s":[0]},{"t":36,"s":[360]}],"ix":10},"p":{"a":0,"k":[72,72,0],"ix":2,"l":2},"a":{"a":0,"k":[36,36,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":72,"h":72,"ip":0,"op":300,"st":0,"bm":0}],"markers":[]}

app/src/main/assets/lottie/icon_title_change_dark.json

@@ -1 +0,0 @@
-{"v":"5.9.1","fr":60,"ip":0,"op":60,"w":72,"h":72,"nm":"icon_title_change","ddd":0,"assets":[{"id":"comp_0","nm":"arrow","fr":60,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"arrow_e_dark","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[29.25,30,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.701,0.456],[-1.627,-0.674],[-0.705,-0.667],[0,0],[-0.552,0],[0,-0.552],[0,0],[0.552,0],[0,0],[0.012,0],[0,0],[0,0.552],[-0.552,0],[0,0],[0.615,0.255],[1.276,-0.342],[0.804,-1.048],[0,-1.321],[-0.804,-1.048],[-1.276,-0.342],[-1.22,0.505],[-0.66,1.144],[-0.478,-0.276],[0.276,-0.478],[1.627,-0.674],[1.701,0.456],[1.072,1.397],[0,1.761],[-1.072,1.397]],"o":[[1.701,-0.456],[0.909,0.376],[0,0],[0,-0.552],[0.552,0],[0,0],[0,0.552],[0,0],[-0.012,0],[0,0],[-0.552,0],[0,-0.552],[0,0],[-0.493,-0.435],[-1.22,-0.505],[-1.276,0.342],[-0.804,1.048],[0,1.321],[0.804,1.048],[1.276,0.342],[1.22,-0.505],[0.276,-0.478],[0.478,0.276],[-0.881,1.525],[-1.627,0.674],[-1.701,-0.456],[-1.072,-1.397],[0,-1.761],[1.072,-1.397]],"v":[[-1.821,-7.727],[3.311,-7.391],[5.75,-5.809],[5.75,-6.5],[6.75,-7.5],[7.75,-6.5],[7.75,-3.5],[6.75,-2.5],[6.331,-2.5],[6.295,-2.5],[3.75,-2.5],[2.75,-3.5],[3.75,-4.5],[4.219,-4.5],[2.546,-5.543],[-1.303,-5.796],[-4.51,-3.653],[-5.75,0],[-4.51,3.653],[-1.303,5.796],[2.546,5.543],[5.446,3],[6.812,2.634],[7.178,4],[3.311,7.391],[-1.821,7.727],[-6.097,4.87],[-7.75,0],[-6.097,-4.87]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.158117651939,0.532358944416,0.878431379795,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"arrow_e_dark","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":300,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"arrow","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.5],"y":[1]},"o":{"x":[0.5],"y":[0]},"t":0,"s":[0]},{"t":36,"s":[360]}],"ix":10},"p":{"a":0,"k":[36,36,0],"ix":2,"l":2},"a":{"a":0,"k":[30,30,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":60,"h":60,"ip":0,"op":300,"st":0,"bm":0}],"markers":[]}

app/src/main/assets/lottie/icon_title_change_light.json

@@ -1 +0,0 @@
-{"v":"5.9.1","fr":60,"ip":0,"op":60,"w":72,"h":72,"nm":"icon_title_change","ddd":0,"assets":[{"id":"comp_0","nm":"arrow","fr":60,"layers":[{"ddd":0,"ind":2,"ty":4,"nm":"arrow_e_light","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[29.25,30,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.701,0.456],[-1.627,-0.674],[-0.705,-0.667],[0,0],[-0.552,0],[0,-0.552],[0,0],[0.552,0],[0,0],[0.012,0],[0,0],[0,0.552],[-0.552,0],[0,0],[0.615,0.255],[1.276,-0.342],[0.804,-1.048],[0,-1.321],[-0.804,-1.048],[-1.276,-0.342],[-1.22,0.505],[-0.66,1.144],[-0.478,-0.276],[0.276,-0.478],[1.627,-0.674],[1.701,0.456],[1.072,1.397],[0,1.761],[-1.072,1.397]],"o":[[1.701,-0.456],[0.909,0.376],[0,0],[0,-0.552],[0.552,0],[0,0],[0,0.552],[0,0],[-0.012,0],[0,0],[-0.552,0],[0,-0.552],[0,0],[-0.493,-0.435],[-1.22,-0.505],[-1.276,0.342],[-0.804,1.048],[0,1.321],[0.804,1.048],[1.276,0.342],[1.22,-0.505],[0.276,-0.478],[0.478,0.276],[-0.881,1.525],[-1.627,0.674],[-1.701,-0.456],[-1.072,-1.397],[0,-1.761],[1.072,-1.397]],"v":[[-1.821,-7.727],[3.311,-7.391],[5.75,-5.809],[5.75,-6.5],[6.75,-7.5],[7.75,-6.5],[7.75,-3.5],[6.75,-2.5],[6.331,-2.5],[6.295,-2.5],[3.75,-2.5],[2.75,-3.5],[3.75,-4.5],[4.219,-4.5],[2.546,-5.543],[-1.303,-5.796],[-4.51,-3.653],[-5.75,0],[-4.51,3.653],[-1.303,5.796],[2.546,5.543],[5.446,3],[6.812,2.634],[7.178,4],[3.311,7.391],[-1.821,7.727],[-6.097,4.87],[-7.75,0],[-6.097,-4.87]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.141176477075,0.588235318661,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"arrow_e_light","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":300,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"arrow","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.5],"y":[1]},"o":{"x":[0.5],"y":[0]},"t":0,"s":[0]},{"t":36,"s":[360]}],"ix":10},"p":{"a":0,"k":[36,36,0],"ix":2,"l":2},"a":{"a":0,"k":[30,30,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":60,"h":60,"ip":0,"op":300,"st":0,"bm":0}],"markers":[]}

app/src/main/assets/lottie/slide_guide.json

@@ -0,0 +1 @@
+{"v":"5.5.9","fr":60,"ip":0,"op":120,"w":1080,"h":586,"nm":"上滑","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":2,"ty":4,"nm":"手","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.642],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":6,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.558],"y":[0]},"t":60,"s":[100]},{"t":71,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.479,"y":0},"t":3,"s":[611,475,0],"to":[0,-62.75,0],"ti":[0,62.75,0]},{"t":40,"s":[611,98.5,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[90,90,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-7.78,-12.06],[5.68,0.39],[-6.42,-2.45],[-6.32,-0.97],[-5.95,13.55],[4.87,7.91],[4.94,6.69],[1.26,-5.37],[5.25,-1.25],[1.5,-0.3],[3.4,-0.77],[1.4,1.68],[6.15,7.98],[-1.73,-6.64]],"o":[[1.62,2.49],[-5.68,-0.39],[9.37,3.63],[6.31,0.98],[2.39,-7.74],[-4.87,-7.92],[-2.45,-3.05],[-1.05,4.57],[-4.99,1.39],[-0.83,0.13],[-5.63,1.63],[-4.71,-5.72],[-2.75,-3.31],[3.52,6.76]],"v":[[-7.86,14.26],[-15.64,12.52],[-17.99,22.89],[8.47,31.78],[33.98,17.29],[29.55,-1.59],[16.85,-20.15],[7.86,-17.83],[1.56,-19.8],[-3.05,-14.02],[-8.33,-16.94],[-12.44,-11.045],[-26.761,-30.19],[-34.75,-25.78]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"路径","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":120,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"矩形","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.715],"y":[0]},"t":57,"s":[100]},{"t":67,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[525,228.5,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"hasMask":true,"masksProperties":[{"inv":false,"mode":"a","pt":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.491,"y":0},"t":3,"s":[{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[24.328,180.5],[-22,180.5],[-22,204.5],[24.328,204.5]],"c":true}]},{"t":40,"s":[{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[24.328,-207.5],[-22,-207.5],[-22,204.5],[24.328,204.5]],"c":true}]}],"ix":1},"o":{"a":0,"k":100,"ix":3},"x":{"a":0,"k":0,"ix":4},"nm":"蒙版 1"}],"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[6,137],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":2,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,1,1,1,0.5,1,1,1,1,1,1,1,0,1,0.5,0.5,1,0],"ix":9}},"s":{"a":0,"k":[0,-68.5],"ix":5},"e":{"a":0,"k":[0,68.5],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":33,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":3,"op":123,"st":3,"bm":0}],"markers":[]}

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

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

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

@@ -1,6 +1,5 @@
 package com.gh.base
 
-import android.annotation.SuppressLint
 import android.app.Application
 import android.content.Intent
 import android.graphics.Bitmap
@@ -18,8 +17,6 @@ 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.common.retrofit.BiResponse
-import com.gh.gamecenter.entity.ForumDetailEntity
 import com.gh.gamecenter.entity.LocalVideoEntity
 import com.gh.gamecenter.entity.QuoteCountEntity
 import com.gh.gamecenter.qa.BbsType
@@ -31,9 +28,7 @@ import com.google.gson.JsonObject
 import com.lightgame.utils.Utils
 import com.zhihu.matisse.Matisse
 import com.zhihu.matisse.internal.utils.PathUtils
-import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
-import io.reactivex.schedulers.Schedulers
 import okhttp3.ResponseBody
 import retrofit2.HttpException
 import java.io.File
@@ -43,7 +38,6 @@ import kotlin.collections.set
 // TODO: 移动到module_bbs模块
 abstract class BaseRichEditorViewModel(application: Application) : AndroidViewModel(application) {
     val mApi: ApiService = RetrofitManager.getInstance().api
-    val mNewApi: ApiService = RetrofitManager.getInstance().newApi
     val processDialog = MediatorLiveData<WaitingDialogFragment.WaitingDialogData>()
     val chooseImagesUpload = MutableLiveData<LinkedHashMap<String, String>>()
     val chooseImagesUploadSuccess = MutableLiveData<LinkedHashMap<String, String>>()
@@ -61,8 +55,6 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
     var id = ""//视频标记
     var videoId = ""//更改封面视频id
     val quoteCountEntity = QuoteCountEntity()//数据上报用
-    val sectionListLiveData = MutableLiveData<List<ForumDetailEntity.Section>>()
-    var isModerator = false
 
     fun setUploadVideoListener(uploadVideoListener: UploadVideoListener) {
         this.mUploadVideoListener = uploadVideoListener
@@ -416,30 +408,6 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
         return true
     }
 
-    fun getForumSections(bbsId: String) {
-        mNewApi.getForumSections(bbsId)
-            .compose(observableToMain())
-            .subscribe(object : Response<List<ForumDetailEntity.Section>>() {
-                override fun onResponse(response: List<ForumDetailEntity.Section>?) {
-                    response?.run {
-                        sectionListLiveData.postValue(this)
-                    }
-                }
-            })
-    }
-
-    @SuppressLint("CheckResult")
-    fun getModeratorsInfo(bbsId: String) {
-        mApi.getModeratorsInfo(bbsId)
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(object : BiResponse<JsonObject>() {
-                override fun onSuccess(data: JsonObject) {
-                    isModerator = data["is_moderators"].asBoolean
-                }
-            })
-    }
-
     private fun getVideoType(): String {
         return when (type) {
             BbsType.GAME_BBS.value -> {

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

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

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

@@ -5,13 +5,9 @@ import android.app.Application
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.gh.common.util.FloatingBackViewManager
-import com.gh.common.xapk.XapkInstaller
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.SingletonWebActivity
-import com.gh.gamecenter.SkipActivity
 import com.gh.gamecenter.SplashScreenActivity
-import com.gh.gamecenter.authorization.AuthorizationActivity
-import com.gh.gamecenter.common.base.GlobalActivityManager
 import com.gh.gamecenter.common.utils.PackageFlavorHelper
 import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
@@ -30,7 +26,11 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
     override fun onActivityResumed(activity: Activity) {
         // 判断是否需要显示或隐藏返回小浮窗
         if (FloatingBackViewManager.getType().isNotEmpty()) {
-            if (activity is SingletonWebActivity
+            if ((activity::class.java.name == "EnergyCenterActivity")
+                && FloatingBackViewManager.getType() == FloatingBackViewManager.TYPE_TASK
+            ) {
+                FloatingBackViewManager.disableBackView()
+            } else if (activity is SingletonWebActivity
                 && FloatingBackViewManager.getType() == FloatingBackViewManager.TYPE_ACTIVITY
             ) {
                 FloatingBackViewManager.disableBackView()
@@ -55,15 +55,9 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
             DarkModeSwitchHelper.showDarkModeSwitchFloatingView(activity)
         }
 
-        if (activity is AppCompatActivity
-            && activity !is SplashScreenActivity
-            && activity !is SkipActivity
-            && activity !is AuthorizationActivity
-        ) {
+        if (activity is AppCompatActivity && activity !is SplashScreenActivity) {
             VHelper.showFeedbackDialogIfLastSuccessfulLaunchedGameExitUnexpectedly(activity)
         }
-
-        XapkInstaller.updateCurrentInstallStatus()
     }
 
     override fun onActivityPaused(activity: Activity) {

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

@@ -0,0 +1,14 @@
+package com.gh.base
+
+import android.app.Activity
+import java.lang.ref.WeakReference
+
+object GlobalActivityManager {
+    private var mCurrentActivityWeakRef: WeakReference<Activity>? = null
+
+    var currentActivity: Activity?
+        get() = mCurrentActivityWeakRef?.get()
+        set(activity) {
+            mCurrentActivityWeakRef = WeakReference<Activity>(activity)
+        }
+}

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

@@ -12,7 +12,6 @@ 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.exposure.ExposureManager
 import com.gh.common.util.*
 import com.gh.common.util.LogUtils
 import com.gh.download.DownloadManager
@@ -33,13 +32,10 @@ import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.runOnUiThread
 import com.gh.gamecenter.core.utils.*
-import com.gh.gamecenter.entity.SensorsEvent
-import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.energy.EnergyBridge
 import com.gh.gamecenter.eventbus.EBPackage
 import com.gh.gamecenter.feature.entity.Badge
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.feature.exposure.ExposureEvent
-import com.gh.gamecenter.feature.exposure.ExposureSource
 import com.gh.gamecenter.login.user.LoginTag
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.login.user.UserRepository
@@ -54,32 +50,21 @@ import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
 import com.lightgame.download.DownloadStatus.*
 import com.lightgame.utils.Utils
-import org.greenrobot.eventbus.EventBus
-import org.greenrobot.eventbus.Subscribe
-import org.greenrobot.eventbus.ThreadMode
 import org.json.JSONObject
 import java.io.BufferedOutputStream
 import java.io.File
 import java.io.FileOutputStream
 import java.util.*
 
-class DefaultJsApi(
-    var context: Context,
-    val entrance: String = "",
-    private var mFragment: Fragment? = null,
-    private var mBbsId: String? = "",
-    private var mOriginUrl: 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 // 下载的 url 集合
-    private var mDownloadHandler: CompletionHandler<Any>? = null // 下载信息回调
-    private var mExposureEvent: ExposureEvent? = null // 活动曝光实体
+    private var mDownloadWatcher: DataWatcher? = null
+    private var mDownloadUrlSet: HashSet<String>? = null
+    private var mDownloadHandler: CompletionHandler<Any>? = null
 
     init {
         if (mFragment != null) {
-            EventBus.getDefault().register(this)
             autoUnregisterDownloadObserverIfNeeded(mFragment)
         }
     }
@@ -99,19 +84,6 @@ class DefaultJsApi(
         // do nothing, mta is deprecated
     }
 
-    @JavascriptInterface
-    fun logSensorsEvent(event: Any) {
-        val sensorsEvent = event.toString().toObject() ?: SensorsEvent()
-        val trackEvent = JSONObject()
-        tryCatchInRelease {
-            sensorsEvent.kv.split(",").forEach {
-                val kv = it.split(":")
-                trackEvent.put(kv[0], kv[1])
-            }
-        }
-        SensorsBridge.trackEvent(sensorsEvent.name, trackEvent)
-    }
-
     @JavascriptInterface
     fun getUserInfo(msg: Any): String {
         return UserManager.getInstance().userInfoEntity?.toJson() ?: ""
@@ -174,6 +146,7 @@ class DefaultJsApi(
 
                     WechatBindHelper.bindWechat(wechatLoginInfoMap, object : BiCallback<Boolean, Boolean> {
                         override fun onFirst(first: Boolean) {
+                            EnergyBridge.postEnergyTask("bind_wechat")
                             handler.complete(true)
                         }
 
@@ -214,11 +187,11 @@ class DefaultJsApi(
         runOnUiThread {
             // 若畅玩列表中安装了，优先启动畅玩游戏
             if (VHelper.isInstalled(packageName)) {
-                if (!VHelper.showDialogIfVSpaceIsNeeded(context, "", "", "", "")) {
+                if (!VHelper.showDialogIfVSpaceIsNeeded(context)) {
                     VHelper.launch(context, packageName)
                 }
             } else {
-                PackageLauncher.launchApp(context, packageName = packageName)
+                PackageUtils.launchApplicationByPackageName(context, packageName)
             }
         }
     }
@@ -268,24 +241,6 @@ class DefaultJsApi(
         }
     }
 
-    /**
-     * 是否为论坛详情的专区
-     */
-    @JavascriptInterface
-    fun isForumZone(msg: Any): Boolean {
-        return !mBbsId.isNullOrEmpty()
-    }
-
-    /**
-     * 打开论坛搜索页
-     */
-    @JavascriptInterface
-    fun openForumSearch(msg: Any) {
-        runOnUiThread {
-            DirectUtils.directToForumOrUserSearch(context, mBbsId ?: "", entrance.ifBlank { "内部网页" })
-        }
-    }
-
     @JavascriptInterface
     fun exitWebView(msg: Any) {
         runOnUiThread { (context as Activity).finish() }
@@ -294,6 +249,7 @@ class DefaultJsApi(
     @JavascriptInterface
     fun updateRegulationTestStatus(msg: Any) {
         if (msg.toString().toLowerCase(Locale.getDefault()) == "pass") {
+            EnergyBridge.postEnergyTask("finish_etiquette_exam")
             SPUtils.setString(Constants.SP_REGULATION_TEST_PASS_STATUS, "pass")
         }
     }
@@ -369,17 +325,17 @@ class DefaultJsApi(
 
     @JavascriptInterface
     fun postWearBadgeTask(msg: Any) {
-        // do nothing
+        EnergyBridge.postEnergyTask("wear_badge")
     }
 
     @JavascriptInterface
     fun startEnergyCenter(msg: Any) {
-        // do nothing
+        context.startActivity(EnergyBridge.getEnergyCenterIntent(context))
     }
 
     @JavascriptInterface
     fun startEnergyHouse(msg: Any) {
-        // do nothing
+        context.startActivity(EnergyBridge.getEnergyHouseIntent(context, null))
     }
 
     @JavascriptInterface
@@ -629,33 +585,6 @@ class DefaultJsApi(
         }
     }
 
-    @JavascriptInterface
-    fun logExposure(event: Any) {
-        val simpleExposureEvent = event.toString().toObject() ?: SimpleExposureEvent()
-        if (simpleExposureEvent.id.isNotEmpty()) {
-            val sourceKey = if (mOriginUrl?.contains(Constants.URL_QUERY_FROM_FLOATING_WINDOW) == true) {
-                "落地页"
-            } else {
-                "游戏活动"
-            }
-
-            val exposureSource = ExposureSource(sourceKey, "${simpleExposureEvent.title}+${simpleExposureEvent.id}")
-            mExposureEvent = ExposureEvent.createEvent(
-                gameEntity = null,
-                source = arrayListOf(exposureSource),
-            )
-            ExposureManager.log(mExposureEvent!!)
-            ExposureManager.commitSavedExposureEvents(true)
-        }
-    }
-
-    /**
-     * 获取 ExposureEvent，可能为空
-     */
-    fun getExposureEvent(): ExposureEvent? {
-        return mExposureEvent
-    }
-
     private fun autoUnregisterDownloadObserverIfNeeded(fragment: Fragment?) {
         fragment?.parentFragmentManager?.registerFragmentLifecycleCallbacks(
             object : FragmentManager.FragmentLifecycleCallbacks() {
@@ -667,8 +596,6 @@ class DefaultJsApi(
                         if (mDownloadWatcher != null) {
                             DownloadManager.getInstance().removeObserver(mDownloadWatcher)
                         }
-
-                        EventBus.getDefault().unregister(this@DefaultJsApi)
                     }
                 }
 
@@ -691,14 +618,6 @@ class DefaultJsApi(
         )
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    fun onEventMainThread(status: EBDownloadStatus) {
-        // 将下载任务删除事件回调给网页
-        if (mDownloadHandler != null && "delete" == status.status) {
-            mDownloadHandler?.setProgressData(SimpleDownloadEntity(status.url, 0F, "UNKNOWN").toJson())
-        }
-    }
-
     @Keep
     internal class ImageEvent(var imageList: ArrayList<String> = arrayListOf(), var position: Int = 0)
 
@@ -708,9 +627,6 @@ class DefaultJsApi(
     @Keep
     internal class TextShareEvent(var text: String = "", var type: String = "")
 
-    @Keep
-    internal class SimpleExposureEvent(var title: String = "", var id: String = "")
-
     @Keep
     internal class InviteFriendsEvent(
         var type: String = "",

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

@@ -5,8 +5,9 @@ import android.content.Intent
 import android.net.Uri
 import android.text.TextUtils
 import android.util.Base64
-import com.gh.common.util.CheckLoginUtils
-import com.gh.common.util.DirectUtils
+import com.gh.gamecenter.core.utils.CurrentActivityHolder
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.common.util.*
 import com.gh.common.util.DirectUtils.directToFeedback
 import com.gh.common.util.DirectUtils.directToGameDetailVideoStreaming
 import com.gh.common.util.DirectUtils.directToGameServerCalendar
@@ -14,31 +15,22 @@ 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.common.util.PackageUtils
-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.Constants
+import com.gh.gamecenter.*
+import com.gh.gamecenter.core.utils.GsonUtils.gson
 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.entity.SimpleGameEntity
 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.AppExecutor
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.core.utils.GsonUtils.gson
 import com.gh.gamecenter.core.utils.ToastUtils
-import com.gh.gamecenter.entity.ActivityLabelEntity
-import com.gh.gamecenter.entity.SubjectRecommendEntity
-import com.gh.gamecenter.entity.VideoLinkEntity
+import com.gh.gamecenter.entity.*
 import com.gh.gamecenter.eventbus.EBSkip
-import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.feature.exposure.ExposureEvent
-import com.gh.gamecenter.feature.utils.PlatformUtils
 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
@@ -52,21 +44,14 @@ object DefaultUrlHandler {
 
     @JvmStatic
     fun interceptUrl(context: Context, url: String, entrance: String): Boolean {
-        return interceptUrl(context, url, null, entrance, false)
+        return interceptUrl(context, url, entrance, false)
     }
 
     /**
-     * 检查并拦截部分内部处理的 url
-     * @param traceEvent 供一些页面用于登记曝光来源的实体
      * @param bringAppToFront 是否需要在不匹配 host 的时候把 APP 调回到前台 (如微信调起)
-     *
-     * @return 是否已拦截处理
      */
     @JvmStatic
-    fun interceptUrl(context: Context, url: String,
-                     traceEvent: ExposureEvent? = null,
-                     entrance: String,
-                     bringAppToFront: Boolean = false): Boolean {
+    fun interceptUrl(context: Context, url: String, entrance: String, bringAppToFront: Boolean = false): Boolean {
         val uri = Uri.parse(url)
         if ("ghzhushou" == uri.scheme) {
             Utils.log("url = $url")
@@ -90,7 +75,6 @@ object DefaultUrlHandler {
                     id = id,
                     tab = uri.getQueryParameter("to"),
                     autoDownload = uri.getQueryParameter("auto_download") == "true",
-                    traceEvent = traceEvent,
                     entrance = entrance
                 )
 
@@ -99,7 +83,6 @@ object DefaultUrlHandler {
                     id,
                     uri.getQueryParameter("name"),
                     false,
-                    null,
                     entrance
                 )
 
@@ -418,11 +401,10 @@ object DefaultUrlHandler {
                     val packageMd5 = uri.getQueryParameter(EntranceConsts.KEY_PACKAGE_MD5)
                     val isQaFeedback = uri.getQueryParameter(EntranceConsts.KEY_IS_QA_FEEDBACK) == "true"
                     val content = if (TextUtils.isEmpty(gameId) || TextUtils.isEmpty(packageMd5)) String.format(
-                        "%s—V%s—%s（V%s），",
+                        "%s-%s-V%s，",
                         uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME),
-                        uri.getQueryParameter(EntranceConsts.KEY_VERSION),
                         if (TextUtils.isEmpty(platformName)) platform else platformName,
-                        uri.getQueryParameter(EntranceConsts.KEY_PLATFORM_VERSION),
+                        uri.getQueryParameter(EntranceConsts.KEY_VERSION)
                     ) else String.format(
                         "%s-%s-V%s\n游戏ID：%s\n游戏包MD5：%s\n",
                         uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME),
@@ -477,7 +459,7 @@ object DefaultUrlHandler {
                 }
 
                 EntranceConsts.HOST_GAME_COLLECTION_DETAIL -> {
-                    DirectUtils.directToGameCollectionDetail(context, id, entrance, traceEvent = traceEvent)
+                    DirectUtils.directToGameCollectionDetail(context, id, entrance)
                 }
 
                 EntranceConsts.HOST_GAME_COLLECTION_SQUARE -> {

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

@@ -18,10 +18,10 @@ import kotlin.concurrent.fixedRateTimer
 
 object FixedRateJobHelper {
     private const val CHECKER_PERIOD: Long = 15 * 1000L
-    private const val TIME_PERIOD: Long = 10 * 60 * 1000L
-    private const val LOGHUB_PERIOD: Long = 2 * 60 * 1000L
-    private const val EXPOSURE_PERIOD: Long = 1 * 60 * 1000L
-    private const val REGION_SETTING_PERIOD: Long = 60 * 1000L
+    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 = 30 * 1000L
     private const val VIDEO_RECORD_PERIOD: Long = 60 * 1000L
 
     private const val DOWNLOAD_HEARTBEAT_PERIOD: Long = 60 * 1000L
@@ -35,11 +35,9 @@ object FixedRateJobHelper {
     @JvmStatic
     fun begin() {
         doOnMainProcessOnly {
-            // 时间检查，每15秒检查一次
             fixedRateTimer("Global-Fixed-Rate-Timer", initialDelay = 100, period = CHECKER_PERIOD) {
-                val elapsedTime = mExecuteCount * CHECKER_PERIOD
                 // 时间校对，10分钟一次
-                if (elapsedTime % TIME_PERIOD == 0L) {
+                if ((mExecuteCount * CHECKER_PERIOD) % TIME_PERIOD == 0L) {
                     RetrofitManager.getInstance().api.time
                         .subscribeOn(Schedulers.io())
                         .subscribe(object : Response<TimeEntity>() {
@@ -53,12 +51,14 @@ object FixedRateJobHelper {
                 }
 
                 // 提交曝光数据
-                if (elapsedTime % EXPOSURE_PERIOD == 0L) {
-                    ExposureManager.commitSavedExposureEvents(true)
+                if ((mExecuteCount * CHECKER_PERIOD) % EXPOSURE_PERIOD == 0L) {
+                    runOnUiThread {
+                        ExposureManager.commitSavedExposureEvents(true)
+                    }
                 }
 
                 // 分片检测下载进度
-                if (elapsedTime % DOWNLOAD_HEARTBEAT_SHEET_PERIOD == 0L) {
+                if ((mExecuteCount * CHECKER_PERIOD) % DOWNLOAD_HEARTBEAT_SHEET_PERIOD == 0L) {
                     tryCatchInRelease {
                         val upload = (mExecuteCount * CHECKER_PERIOD) % DOWNLOAD_HEARTBEAT_PERIOD == 0L
                         DownloadDataHelper.uploadDownloadHeartbeat(upload)
@@ -66,24 +66,30 @@ object FixedRateJobHelper {
                 }
 
                 // 提交普通 loghub 数据
-                if (elapsedTime % LOGHUB_PERIOD == 0L) {
+                if ((mExecuteCount * CHECKER_PERIOD) % LOGHUB_PERIOD == 0L) {
                     runOnUiThread {
                         LoghubUtils.commitSavedLoghubEvents(true)
                     }
                 }
 
                 // 更新游戏屏蔽信息
-                if (elapsedTime % REGION_SETTING_PERIOD == 0L) {
+                if ((mExecuteCount * CHECKER_PERIOD) % REGION_SETTING_PERIOD == 0L) {
                     if (HaloApp.getInstance().isRunningForeground) {
                         RegionSettingHelper.getRegionSetting()
                     }
                 }
 
                 // 提交视频浏览记录数据
-                if (elapsedTime % VIDEO_RECORD_PERIOD == 0L) {
+                if ((mExecuteCount * CHECKER_PERIOD) % VIDEO_RECORD_PERIOD == 0L) {
                     VideoRecordUtils.commitVideoRecord()
                 }
 
+                // 获取启动广告
+                if ((mExecuteCount * CHECKER_PERIOD) % STARTUP_AD == 0L) {
+                    AdHelper.getSettingAdCache()
+                }
+
+//              ExposureUtils.logADownloadCompleteExposureEvent(GameEntity(id = mExecuteCount.toString(), name = "测试曝光上传"), platform = "", trace = null, downloadType = ExposureUtils.DownloadType.DOWNLOAD)
                 mExecuteCount++
             }
         }

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

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

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

@@ -9,7 +9,7 @@ class CheckDownloadHandler : ChainHandler() {
 
     override fun handleRequest(context: Context, gameEntity: GameEntity) {
         val apk = gameEntity.getApk().safelyGetInRelease(0) ?: return
-        DialogUtils.checkDownload(context, apk.size, gameEntity.id, gameEntity.name) { isSubscribe: Boolean ->
+        DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
             if (hasNext()) {
                 getNext()?.handleRequest(context, gameEntity)
             } else {

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

@@ -1,23 +0,0 @@
-package com.gh.common.chain
-
-import android.content.Context
-import com.gh.common.util.DialogUtils
-import com.gh.common.util.DirectUtils
-import com.gh.gamecenter.feature.entity.GameEntity
-
-class LandPageAddressHandler : ChainHandler() {
-
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
-        if (gameEntity.isLandPageAddressDialog()) {
-            DialogUtils.showLandPageAddressDialog(context, gameEntity) {// 跳转第三方落地页
-                DirectUtils.directToExternalBrowser(context, gameEntity.landPageAddressDialog!!.link!!)
-            }
-        } else {
-            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity)
-            } else {
-                processEndCallback?.invoke(null)
-            }
-        }
-    }
-}

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

@@ -7,15 +7,7 @@ import com.gh.gamecenter.feature.entity.GameEntity
 class OverseaDownloadHandler : ChainHandler() {
 
     override fun handleRequest(context: Context, gameEntity: GameEntity) {
-        if (gameEntity.isOverseaAddressDialog()) {
-            DialogUtils.showOverseaDownloadDialog(context, gameEntity) {// 跳转海外下载地址弹窗
-                if (hasNext()) {
-                    getNext()?.handleRequest(context, gameEntity)
-                } else {
-                    processEndCallback?.invoke(null)
-                }
-            }
-        } else {
+        DialogUtils.showOverseaDownloadDialog(context, gameEntity) {
             if (hasNext()) {
                 getNext()?.handleRequest(context, gameEntity)
             } else {

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

@@ -1,27 +0,0 @@
-package com.gh.common.chain
-
-import android.content.Context
-import com.gh.gamecenter.common.utils.DialogHelper
-import com.gh.gamecenter.feature.entity.GameEntity
-
-class UnsupportedFeatureHandler : ChainHandler() {
-
-    override fun handleRequest(
-        context: Context, gameEntity: GameEntity
-    ) {
-        if (shouldShowUnsupportedFeatureDialog()) {
-            DialogHelper.showUnsupportedFeatureDialog(context)
-        } else {
-            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity)
-            } else {
-                processEndCallback?.invoke(null)
-            }
-        }
-    }
-
-    /**
-     * TODO 检查某个版本是否支持指定的功能
-     */
-    private fun shouldShowUnsupportedFeatureDialog(): Boolean = false
-}

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

@@ -21,7 +21,6 @@ import com.gh.gamecenter.common.utils.DarkModeUtils;
 import com.gh.gamecenter.common.utils.EnvHelper;
 import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.gamecenter.core.utils.SPUtils;
-import com.gh.gamecenter.core.utils.UrlFilterUtils;
 import com.gh.gamecenter.entity.GameGuidePopupEntity;
 import com.gh.gamecenter.entity.NewApiSettingsEntity;
 import com.gh.gamecenter.entity.NewSettingsEntity;
@@ -77,6 +76,8 @@ public class Config {
 
     public static final String FIX_DOWNLOAD_KEY = "isFixDownload";
     public static final String FIX_PLUGIN_KEY = "isFixPlugin";
+    public static final String FIX_ARTICLE_KEY = "isFixArticle";
+    public static final String FIX_COMMUNITY_KEY = "isFixCommunity";
 
     public static final int VIDEO_PAGE_SIZE = 21; // 视频列表大多都是一行3个
 
@@ -123,18 +124,17 @@ public class Config {
     }
 
     /**
-     * VPN 开关选项是否开启
+     * 是否启用畅玩游戏
      */
-    public static boolean isVpnOptionEnabled() {
-        if (mNewApiSettingsEntity == null
-                || mNewApiSettingsEntity.getInstall() == null
-                || mNewApiSettingsEntity.getInstall().getVpnRequired() == null) {
+    public static boolean isVGameEnabled() {
+        if (getSettings() == null) {
             return false;
         }
 
-        return mNewApiSettingsEntity.getInstall().getVpnRequired().getShouldShowVpnOption();
+        return !"off".equals(getSettings().getGameSmooth());
     }
 
+
     public static boolean isShowPlugin(String gameId) {
         SharedPreferences preferences = getPreferences();
         boolean isFixPlugin = preferences.getBoolean(FIX_PLUGIN_KEY, false);
@@ -205,6 +205,9 @@ public class Config {
 
         // 加载完设置后刷新下
         PackageHelper.initList();
+
+        // 初始化畅玩相关的东西
+        VHelper.init(HaloApp.getInstance(), false);
     }
 
     @Nullable
@@ -215,8 +218,6 @@ public class Config {
                 if (!TextUtils.isEmpty(json)) {
                     mSettingsEntity = GsonUtils.fromJson(json, SettingsEntity.class);
                 }
-
-                mSettingsEntity.setGameSmooth("off");
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -305,26 +306,6 @@ public class Config {
         return mVSetting;
     }
 
-    /**
-     * 请求网络数据，尝试刷新畅玩相关配置
-     */
-    @SuppressLint("CheckResult")
-    public static void refreshVSettingEntity() {
-        RetrofitManager.getInstance()
-                .getVApi().getSettings(BuildConfig.VERSION_NAME, Build.VERSION.SDK_INT)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new BiResponse<VSetting>() {
-                    @Override
-                    public void onSuccess(VSetting data) {
-                        mVSetting = data;
-                        SPUtils.setString(Constants.SP_V_SETTINGS, GsonUtils.toJson(data));
-
-                        VHelper.init(HaloApp.getInstance());
-                    }
-                });
-    }
-
     @Nullable
     public static GameGuidePopupEntity getGameGuidePopupEntity() {
         return mGameGuidePopupEntity;
@@ -362,10 +343,6 @@ public class Config {
     @SuppressLint("CheckResult")
     public static void getGhzsSettings() {
         String channel = HaloApp.getInstance().getChannel();
-
-        // 把请求提前，避免请求过多阻塞，首页显示广告时老是用到上一次的缓存
-        getNewSettings(channel);
-
         RetrofitManager.getInstance()
                 .getApi().getSettings(PackageUtils.getGhVersionName(), channel)
                 .subscribeOn(Schedulers.io())
@@ -402,7 +379,39 @@ public class Config {
                     }
                 });
 
-        refreshVSettingEntity();
+        if (mVSetting == null) {
+            RetrofitManager.getInstance()
+                    .getVApi().getSettings(BuildConfig.VERSION_NAME)
+                    .subscribeOn(Schedulers.io())
+                    .subscribe(new BiResponse<VSetting>() {
+                        @Override
+                        public void onSuccess(VSetting data) {
+                            mVSetting = data;
+                            SPUtils.setString(Constants.SP_V_SETTINGS, GsonUtils.toJson(data));
+                        }
+                    });
+        }
+
+        if (mNewApiSettingsEntity == null) {
+            RetrofitManager.getInstance()
+                    .getNewApi().getNewSettings(PackageUtils.getGhVersionName(), channel)
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(new BiResponse<NewApiSettingsEntity>() {
+                        @Override
+                        public void onSuccess(NewApiSettingsEntity data) {
+                            mNewApiSettingsEntity = data;
+                            mNightModeSetting = data.getNightMode();
+                            mNewSimulatorEntity = data.getSimulator();
+                            if (HaloApp.getInstance().isNewForThisVersion && mNightModeSetting != null && mNightModeSetting.getInstall()) {
+                                DarkModeUtils.INSTANCE.updateFollowSystemDarkModeToSp(true);
+                                DarkModeUtils.INSTANCE.initDarkMode();
+                            }
+                            AdHelper.prefetchStartUpAd(mNewApiSettingsEntity);
+                            SPUtils.setString(Constants.SP_NEW_API_SETTINGS, GsonUtils.toJson(data));
+                        }
+                    });
+        }
 
         RetrofitManager.getInstance()
                 .getApi().getGameGuidePopup(Build.MANUFACTURER, Build.VERSION.RELEASE, Build.MODEL, channel, BuildConfig.VERSION_NAME)
@@ -435,33 +444,4 @@ public class Config {
                     });
         }
     }
-
-    @SuppressLint("CheckResult")
-    private static void getNewSettings(String channel) {
-        if (mNewApiSettingsEntity == null) {
-
-            String filterString = UrlFilterUtils.getFilterQuery(
-                    "manufacturer", Build.MANUFACTURER,
-                    "model", Build.MODEL,
-                    "android_sdk_version", String.valueOf(Build.VERSION.SDK_INT));
-
-            RetrofitManager.getInstance()
-                    .getNewApi().getNewSettings(PackageUtils.getGhVersionName(), channel, filterString)
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new BiResponse<NewApiSettingsEntity>() {
-                        @Override
-                        public void onSuccess(NewApiSettingsEntity data) {
-                            mNewApiSettingsEntity = data;
-                            mNightModeSetting = data.getNightMode();
-                            mNewSimulatorEntity = data.getSimulator();
-                            if (HaloApp.getInstance().isNewForThisVersion && mNightModeSetting != null && mNightModeSetting.getInstall()) {
-                                DarkModeUtils.INSTANCE.updateFollowSystemDarkModeToSp(true);
-                                DarkModeUtils.INSTANCE.initDarkMode();
-                            }
-                            SPUtils.setString(Constants.SP_NEW_API_SETTINGS, GsonUtils.toJson(data));
-                        }
-                    });
-        }
-    }
 }

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

@@ -1,6 +1,5 @@
 package com.gh.common.databind;
 
-import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.Typeface;
@@ -25,16 +24,14 @@ import com.gh.common.chain.CertificationHandler;
 import com.gh.common.chain.ChainBuilder;
 import com.gh.common.chain.ChainHandler;
 import com.gh.common.chain.CheckDownloadHandler;
-import com.gh.common.chain.CheckStoragePermissionHandler;
 import com.gh.common.chain.DownloadDialogHelperHandler;
 import com.gh.common.chain.GamePermissionHandler;
-import com.gh.common.chain.LandPageAddressHandler;
 import com.gh.common.chain.OverseaDownloadHandler;
 import com.gh.common.chain.PackageCheckHandler;
-import com.gh.common.chain.UnsupportedFeatureHandler;
 import com.gh.common.chain.ValidateVSpaceHandler;
 import com.gh.common.chain.VersionNumberHandler;
 import com.gh.common.constant.Config;
+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;
@@ -48,41 +45,38 @@ import com.gh.common.util.GameViewUtils;
 import com.gh.common.util.LogUtils;
 import com.gh.common.util.NewsUtils;
 import com.gh.common.util.PackageInstaller;
-import com.gh.common.util.PackageLauncher;
 import com.gh.common.util.PackageUtils;
+import com.gh.gamecenter.feature.utils.PlatformUtils;
 import com.gh.common.util.ReservationHelper;
+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.download.server.BrowserInstallHelper;
 import com.gh.gamecenter.DownloadManagerActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.WebActivity;
 import com.gh.gamecenter.common.baselist.LoadStatus;
 import com.gh.gamecenter.common.callback.OnViewClickListener;
-import com.gh.gamecenter.common.entity.LinkEntity;
-import com.gh.gamecenter.common.eventbus.EBReuse;
-import com.gh.gamecenter.common.utils.DarkModeUtils;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.common.utils.ImageUtils;
+import com.gh.gamecenter.common.utils.DarkModeUtils;
 import com.gh.gamecenter.common.view.DrawableView;
 import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.core.utils.MtaHelper;
 import com.gh.gamecenter.core.utils.NumberUtils;
-import com.gh.gamecenter.core.utils.ToastUtils;
 import com.gh.gamecenter.databinding.KaifuDetailItemRowBinding;
 import com.gh.gamecenter.feature.entity.ApkEntity;
-import com.gh.gamecenter.feature.entity.CommunityVideoEntity;
 import com.gh.gamecenter.feature.entity.GameEntity;
+import com.gh.gamecenter.common.entity.LinkEntity;
 import com.gh.gamecenter.feature.entity.PluginLocation;
 import com.gh.gamecenter.feature.entity.ServerCalendarEntity;
 import com.gh.gamecenter.feature.entity.TagStyleEntity;
 import com.gh.gamecenter.feature.entity.TestEntity;
-import com.gh.gamecenter.feature.exposure.ExposureEvent;
-import com.gh.gamecenter.feature.utils.PlatformUtils;
-import com.gh.gamecenter.feature.view.DownloadButton;
-import com.gh.gamecenter.feature.view.GameIconView;
+import com.gh.gamecenter.common.eventbus.EBReuse;
 import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment;
 import com.gh.gamecenter.manager.PackagesManager;
+import com.gh.gamecenter.feature.entity.CommunityVideoEntity;
 import com.gh.vspace.VDownloadManagerActivity;
 import com.gh.vspace.VHelper;
 import com.lightgame.download.DownloadEntity;
@@ -404,21 +398,18 @@ public class BindingAdapters {
                             }
 
                             ChainBuilder builder = new ChainBuilder();
-                            builder.addHandler(new UnsupportedFeatureHandler());
-                            builder.addHandler(new GamePermissionHandler());
-                            builder.addHandler(new CheckStoragePermissionHandler());
                             builder.addHandler(new ValidateVSpaceHandler());
+                            builder.addHandler(new GamePermissionHandler());
                             builder.addHandler(new BrowserInstallHandler());
                             builder.addHandler(new PackageCheckHandler());
                             builder.addHandler(new DownloadDialogHelperHandler());
                             builder.addHandler(new CertificationHandler());
                             builder.addHandler(new VersionNumberHandler());
-                            builder.addHandler(new LandPageAddressHandler());
                             builder.addHandler(new OverseaDownloadHandler());
                             builder.addHandler(new CheckDownloadHandler());
 
                             builder.setProcessEndCallback(o -> {
-                                download(v.getContext(), progressBar, gameEntity, traceEvent, (boolean) o, entrance, location);
+                                download(progressBar, gameEntity, traceEvent, (boolean) o, entrance, location);
                                 return null;
                             });
                             final ChainHandler chainHandler = builder.buildHandlerChain();
@@ -427,7 +418,6 @@ public class BindingAdapters {
                             }
                         } else {
                             ChainBuilder builder = new ChainBuilder();
-                            builder.addHandler(new UnsupportedFeatureHandler());
                             builder.addHandler(new GamePermissionHandler());
                             builder.addHandler(new CertificationHandler());
                             builder.addHandler(new VersionNumberHandler());
@@ -456,7 +446,7 @@ public class BindingAdapters {
                             if (downloadEntity != null) {
                                 File file = new File(downloadEntity.getPath());
                                 if (!file.exists()) {
-                                    download(v.getContext(), progressBar, gameEntity, traceEvent, false, entrance, location);
+                                    download(progressBar, gameEntity, traceEvent, false, entrance, location);
                                     return;
                                 }
 
@@ -466,11 +456,11 @@ public class BindingAdapters {
                         }
 
                         if (gameEntity.isVGame()) {
-                            VHelper.installOrLaunch((AppCompatActivity) v.getContext(), gameEntity, null);
+                            VHelper.installOrLaunch((AppCompatActivity) v.getContext(), gameEntity.getApk().get(0).getPackageName());
                             return;
                         }
 
-                        PackageLauncher.launchApp(v.getContext(), gameEntity, gameEntity.getApk().get(0).getPackageName());
+                        PackageUtils.launchApplicationByPackageName(v.getContext(), gameEntity.getApk().get(0).getPackageName());
                     } else {
                         DownloadDialog.showDownloadDialog(
                                 v.getContext(),
@@ -484,9 +474,10 @@ public class BindingAdapters {
                 case INSTALL_NORMAL:
                     if (gameEntity.getApk().size() == 1) {
                         DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity);
+                        String packageName = gameEntity.getApk().get(0).getPackageName();
 
                         if (gameEntity.isVGame()) {
-                            VHelper.installOrLaunch(v.getContext(), gameEntity, null);
+                            VHelper.installOrLaunch(v.getContext(), packageName);
                             return;
                         }
 
@@ -498,7 +489,7 @@ public class BindingAdapters {
                 case RESERVABLE:
                     GamePermissionDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity, gameEntity.getInfo(), () -> {
                         CheckLoginUtils.checkLogin(progressBar.getContext(), "", () -> {
-                            ReservationHelper.reserve(v.getContext(), gameEntity.getId(), gameEntity.getName(), () -> {
+                            ReservationHelper.reserve(v.getContext(), gameEntity.getId(), () -> {
                                 LogUtils.logReservation(gameEntity, traceEvent);
                                 updateReservation(progressBar, gameEntity);
                             });
@@ -603,11 +594,9 @@ public class BindingAdapters {
                     case pause:
                     case timeout:
                     case neterror:
-                    case diskisfull:
-                    case diskioerror:
                     case waiting:
                         progressBar.setText(R.string.downloading);
-                        if (downloadEntity.isPluggable() && PackagesManager.isInstalled(downloadEntity.getPackageName())) {
+                        if (downloadEntity.isPluggable() && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
                             progressBar.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN);
                         } else {
                             progressBar.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
@@ -616,7 +605,7 @@ public class BindingAdapters {
                     case done:
                         progressBar.setText(R.string.install);
                         if (downloadEntity.isPluggable()
-                                && PackagesManager.isInstalled(downloadEntity.getPackageName())) {
+                                && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
                             progressBar.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_PLUGIN);
                         } else {
                             progressBar.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
@@ -682,16 +671,12 @@ public class BindingAdapters {
 
 
     // 开始下载
-    private static void download(Context context,
-                                 DownloadButton progressBar,
+    private static void download(DownloadButton progressBar,
                                  GameEntity gameEntity,
                                  ExposureEvent traceEvent,
                                  boolean isSubscribe,
                                  String entrance,
                                  String location) {
-        if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
-            ToastUtils.toast(context.getString(R.string.unsupported_browser_install_hint));
-        }
         String str = progressBar.getText().toString();
         String method;
         if (str.contains("更新")) {
@@ -800,7 +785,7 @@ 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) {

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

@@ -22,7 +22,6 @@ import com.gh.gamecenter.R
 import com.gh.gamecenter.ShellActivity
 import com.gh.gamecenter.common.callback.ConfirmListener
 import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.common.utils.SensorsBridge
 import com.gh.gamecenter.core.utils.GsonUtils
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.feature.entity.AuthDialogEntity
@@ -36,7 +35,7 @@ import com.lightgame.utils.AppManager
 class CertificationDialog(
     context: Context,
     private val authDialogEntity: AuthDialogEntity,
-    val gameEntity: GameEntity,
+    val gameId: String,
     val listener: ConfirmListener
 ) :
     Dialog(context, R.style.GhAlertDialog) {
@@ -70,11 +69,9 @@ class CertificationDialog(
                 actionRightTv.text = "去实名认证"
                 noRemindAgainCb.visibility = View.GONE
                 actionLeftTv.setOnClickListener {
-                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionLeftTv.text.toString())
                     dismiss()
                 }
                 actionRightTv.setOnClickListener {
-                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionRightTv.text.toString())
                     if (UserManager.getInstance().isLoggedIn) {
                         gotoAuthPage()
                     } else {
@@ -87,7 +84,6 @@ class CertificationDialog(
                 actionRightTv.text = "继续下载"
                 noRemindAgainCb.visibility = View.GONE
                 actionLeftTv.setOnClickListener {
-                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionLeftTv.text.toString())
                     if (UserManager.getInstance().isLoggedIn) {
                         gotoAuthPage()
                     } else {
@@ -95,7 +91,6 @@ class CertificationDialog(
                     }
                 }
                 actionRightTv.setOnClickListener {
-                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionRightTv.text.toString())
                     listener.onConfirm()
                     dismiss()
                 }
@@ -105,9 +100,8 @@ class CertificationDialog(
                 actionRightTv.text = "继续下载"
                 noRemindAgainCb.visibility = View.VISIBLE
                 actionLeftTv.setOnClickListener {
-                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionLeftTv.text.toString())
                     if (noRemindAgainCb.isChecked) {
-                        SPUtils.setBoolean(gameEntity.id, true)
+                        SPUtils.setBoolean(gameId, true)
                     }
                     if (UserManager.getInstance().isLoggedIn) {
                         gotoAuthPage()
@@ -116,25 +110,14 @@ class CertificationDialog(
                     }
                 }
                 actionRightTv.setOnClickListener {
-                    SensorsBridge.trackEvent("VerificationPopupClick", "button_name", actionRightTv.text.toString())
                     if (noRemindAgainCb.isChecked) {
-                        SPUtils.getBoolean(gameEntity.id, true)
+                        SPUtils.getBoolean(gameId, true)
                     }
                     listener.onConfirm()
                     dismiss()
                 }
             }
         }
-
-        SensorsBridge.trackEvent(
-            "VerificationDialogShow",
-            "game_id",
-            gameEntity.id,
-            "game_name",
-            gameEntity.name ?: "",
-            "game_type",
-            gameEntity.categoryChinese
-        )
     }
 
     //跳转登录页面
@@ -162,7 +145,7 @@ class CertificationDialog(
                     context,
                     ShellActivity.Type.REAL_NAME_INFO,
                 ).apply {
-                    putExtra(EntranceConsts.KEY_GAME_ID, gameEntity.id)
+                    putExtra(EntranceConsts.KEY_GAME_ID, gameId)
                 }, object : Callback {
                     override fun onActivityResult(resultCode: Int, data: Intent?) {
                         if (resultCode == Activity.RESULT_OK && data != null) {
@@ -211,7 +194,7 @@ class CertificationDialog(
             }
             val isCloseAuthDialog = SPUtils.getBoolean(game.id, false)
             if (authDialog != null && (authDialog.level != AuthDialogLevel.OPTIONAL_HINT.value || !isCloseAuthDialog)) {
-                val dialog = CertificationDialog(context, authDialog, game, listener)
+                val dialog = CertificationDialog(context, authDialog, game.id, listener)
                 dialog.show()
             } else {
                 listener.onConfirm()

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

@@ -13,7 +13,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.FragmentTransaction
 import com.airbnb.lottie.LottieAnimationView
 import com.gh.common.constant.Config
-import com.gh.common.util.NewFlatLogUtils
 import com.gh.common.xapk.XapkInstaller
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
@@ -32,8 +31,6 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
     lateinit var mView: View
     var isXapk = false
     var url: String = ""
-    var gameId: String = ""
-    var gameName: String = ""
     var mCallBack: ((isFromPermissionGrantedCallback: Boolean) -> Unit)? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -53,8 +50,6 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
         switchLottie.setAnimation("lottie/install_permission_switch.json")
         switchLottie.playAnimation()
 
-        if (isXapk) NewFlatLogUtils.logXApkInstallPermissionDialogShowed(gameId, gameName)
-
         val randomNumber = if (isXapk) 1 else Random.nextInt(2)
         closeTv.goneIf(randomNumber == 0)
         closeIv.goneIf(randomNumber != 0)
@@ -65,17 +60,14 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
 
         closeTv.setOnClickListener {
             if (isXapk) {
-                NewFlatLogUtils.logXApkInstallPermissionDialogClick("尝试解压", false, gameId, gameName)
                 mCallBack?.invoke(false)
             }
             dismiss()
         }
         closeIv.setOnClickListener {
-            if (isXapk) NewFlatLogUtils.logXApkInstallPermissionDialogClick("关闭", false, gameId, gameName)
             dismiss()
         }
         activateTv.setOnClickListener {
-            NewFlatLogUtils.logXApkInstallPermissionDialogClick("立即开启", false, gameId, gameName)
             PermissionHelper.toInstallPermissionSetting(requireActivity())
             if (isXapk) {
                 SPUtils.setString(Constants.SP_XAPK_UNZIP_ACTIVITY, requireActivity().javaClass.name)
@@ -87,8 +79,6 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (resultCode == RESULT_OK && requestCode == INSTALL_PERMISSION_CODE) {
-            NewFlatLogUtils.logXApkInstallPermissionDialogClick("立即开启", true, gameId, gameName)
-
             if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
                 SPUtils.setString(Constants.SP_XAPK_UNZIP_ACTIVITY, "")
                 SPUtils.setString(Constants.SP_XAPK_URL, "")
@@ -134,8 +124,6 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
                 installPermissionDialogFragment.mCallBack = callBack
                 installPermissionDialogFragment.isXapk = isXapk
                 installPermissionDialogFragment.url = downloadEntity.url
-                installPermissionDialogFragment.gameId = downloadEntity.gameId
-                installPermissionDialogFragment.gameName = downloadEntity.name
                 val transaction: FragmentTransaction = activity.supportFragmentManager.beginTransaction()
                 transaction.show(installPermissionDialogFragment)
                 transaction.commit()
@@ -144,8 +132,6 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
                     this.mCallBack = callBack
                     this.isXapk = isXapk
                     this.url = downloadEntity.url
-                    this.gameId = downloadEntity.gameId
-                    this.gameName = downloadEntity.name
                 }
                 installPermissionDialogFragment.show(
                     activity.supportFragmentManager,

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

@@ -4,8 +4,6 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.LayoutManager
-import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import io.reactivex.functions.Consumer
 
@@ -20,7 +18,7 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
             Consumer(Throwable::printStackTrace)
         )
     }
-    var layoutManager: LayoutManager? = null
+    var layoutManager: LinearLayoutManager? = null
     var visibleState: ExposureThrottleBus.VisibleState? = null
 
     init {
@@ -49,28 +47,12 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
     override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
         super.onScrolled(recyclerView, dx, dy)
 
-        layoutManager = recyclerView.layoutManager
+        if (layoutManager == null) layoutManager = recyclerView.layoutManager as LinearLayoutManager
 
-        if (layoutManager != null) {
-            if (layoutManager is LinearLayoutManager) {
-                (layoutManager as LinearLayoutManager).run {
-                    visibleState =
-                        ExposureThrottleBus.VisibleState(findFirstVisibleItemPosition(), findLastVisibleItemPosition())
-                    throttleBus.postVisibleState(visibleState!!)
-                }
-            } else if (layoutManager is StaggeredGridLayoutManager) {
-                (recyclerView.layoutManager as StaggeredGridLayoutManager).run {
-                    val firstVisibleItemArray = IntArray(2)
-                    val lastVisibleItemArray = IntArray(2)
-
-                    findFirstVisibleItemPositions(firstVisibleItemArray)
-                    findLastVisibleItemPositions(lastVisibleItemArray)
-
-                    visibleState =
-                        ExposureThrottleBus.VisibleState(firstVisibleItemArray.first(), lastVisibleItemArray.first())
-                    throttleBus.postVisibleState(visibleState!!)
-                }
-            }
+        layoutManager?.run {
+            visibleState =
+                ExposureThrottleBus.VisibleState(findFirstVisibleItemPosition(), findLastVisibleItemPosition())
+            throttleBus.postVisibleState(visibleState!!)
         }
     }
 

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

@@ -5,7 +5,6 @@ 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.core.AppExecutor
 import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.lightgame.utils.Utils
 
@@ -31,13 +30,11 @@ object ExposureManager {
      * Log a single exposure event.
      */
     fun log(event: ExposureEvent) {
-        AppExecutor.logExecutor.execute {
-            if (!exposureCache.contains(event.id)) {
-                exposureSet.add(event)
-                exposureCache.add(event.id)
-            } else {
-                Utils.log("Exposure", "遇到重复曝光事件，自动过滤 （${event.id} - ${event.payload.gameName}）")
-            }
+        if (!exposureCache.contains(event.id)) {
+            exposureSet.add(event)
+            exposureCache.add(event.id)
+        } else {
+            Utils.log("Exposure", "遇到重复曝光事件，自动过滤 （${event.id} - ${event.payload.gameName}）")
         }
     }
 
@@ -45,41 +42,37 @@ object ExposureManager {
      * Log a collection of exposure event.
      */
     fun log(eventList: List<ExposureEvent>) {
-        AppExecutor.logExecutor.execute {
-            for (event in eventList) {
-                if (event != null && !exposureCache.contains(event.id)) {
-                    exposureSet.add(event)
-                    exposureCache.add(event.id)
-                } else {
-                    Utils.log("Exposure", "遇到重复曝光事件，自动过滤 （${event.id} - ${event.payload.gameName}）")
-                }
+        for (event in eventList) {
+            if (!exposureCache.contains(event.id)) {
+                exposureSet.add(event)
+                exposureCache.add(event.id)
+            } else {
+                Utils.log("Exposure", "遇到重复曝光事件，自动过滤 （${event.id} - ${event.payload.gameName}）")
             }
-            commitSavedExposureEvents()
         }
+        commitSavedExposureEvents()
     }
 
     /**
      * @param forcedUpload Ignore all restrictions.
      */
     fun commitSavedExposureEvents(forcedUpload: Boolean = false) {
-        AppExecutor.logExecutor.execute {
-            if (exposureSet.size < STORE_SIZE && !forcedUpload || exposureSet.size == 0) return@execute
+        if (exposureSet.size < STORE_SIZE && !forcedUpload || exposureSet.size == 0) return
 
-            uploadExposures(exposureSet, forcedUpload)
+        uploadExposures(exposureSet.toList(), forcedUpload)
 
-            Utils.log("Exposure", "提交了${exposureSet.size}条曝光记录")
-            exposureSet.clear()
-        }
+        Utils.log("Exposure", "提交了${exposureSet.size}条曝光记录")
+        exposureSet.clear()
     }
 
     private fun eliminateMultipleBrackets(jsonWithMultipleBracket: String): String {
         return jsonWithMultipleBracket.replace("[[", "[").replace("]]", "]")
     }
 
-    private fun uploadExposures(eventSet: HashSet<ExposureEvent>, forced: Boolean) {
-        eventSet.forEach {
+    private fun uploadExposures(eventList: List<ExposureEvent>, forced: Boolean) {
+        eventList.forEach {
             LoghubHelper.uploadLog(buildLog(it), LOG_STORE, forced)
-//            it.recycle()
+            it.recycle()
         }
     }
 
@@ -95,6 +88,7 @@ object ExposureManager {
                 eliminateMultipleBrackets(event.eTrace?.toJson() ?: "")
             } else ""
         )
+        logTime = event.time.toLong()
     }
 
 }

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

@@ -3,7 +3,6 @@ package com.gh.common.exposure
 import android.text.TextUtils
 import com.g00fy2.versioncompare.Version
 import com.gh.common.util.PackageUtils
-import com.gh.common.util.RealNameHelper
 import com.gh.gamecenter.common.utils.FixedSizeLinkedHashSet
 import com.gh.gamecenter.common.utils.toObject
 import com.gh.gamecenter.feature.entity.ApkEntity
@@ -31,9 +30,6 @@ object ExposureUtils {
         } else {
             entity.id
         }
-
-        traceEvent ?: gameEntity.exposureEvent
-
         gameEntity.gameVersion = entity.getApk().elementAtOrNull(0)?.version
             ?: gameEntity.gameVersion
         gameEntity.platform = platform
@@ -43,12 +39,9 @@ object ExposureUtils {
             source = traceEvent?.source ?: ArrayList(),
             eTrace = ExposureTraceUtils.appendTrace(traceEvent),
             event = ExposureType.DOWNLOAD
-        ).apply {
-            this.payload.certification = RealNameHelper.getCertificationStatus()
-        }
+        )
         if (!TextUtils.isEmpty(entity.id)) {
             ExposureManager.log(exposureEvent)
-            ExposureManager.commitSavedExposureEvents(forcedUpload = true)
         }
         return exposureEvent
     }
@@ -82,9 +75,7 @@ object ExposureUtils {
             source = traceEvent?.source ?: ArrayList(),
             eTrace = ExposureTraceUtils.appendTrace(traceEvent),
             event = ExposureType.DOWNLOAD_COMPLETE
-        ).apply {
-            this.payload.certification = RealNameHelper.getCertificationStatus()
-        }
+        )
         exposureEvent.payload.host = host
         exposureEvent.payload.path = path
         exposureEvent.payload.speed = speed

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

@@ -8,8 +8,6 @@ import com.google.gson.annotations.SerializedName
 class RegionSetting(
     @SerializedName("game_mirror")
     var mirrorGameIdSet: HashSet<String>,
-    @SerializedName("game_mirror2")
-    var mirrorGameIdSet2: HashSet<String>?,
     @SerializedName("game_block")
     var filterGameIdSet: HashSet<String>,
     @SerializedName("channel_control")

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

@@ -18,13 +18,9 @@ import io.reactivex.schedulers.Schedulers
 
 object RegionSettingHelper {
 
-    // 是否是初始化调用
-    private var mIsInit = true
-
     private var mChannelControl: RegionSetting.ChannelControl? = null
     private var mFilterGameIdSet: HashSet<String>? = hashSetOf()
-    private var mDisplayMirrorGameIdSet: HashSet<String>? = hashSetOf()
-    private var mDisplayMirrorGameIdSet2: HashSet<String>? = hashSetOf()
+    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
@@ -32,23 +28,8 @@ object RegionSettingHelper {
     private const val SP_SETTING = "region_setting"
     const val SP_SETTING_FAILURE = "region_setting_failure"
 
-    @JvmStatic
     fun shouldThisGameDisplayMirrorInfo(gameId: String): Boolean {
-        return mDisplayMirrorGameIdSet?.contains(gameId) == true
-                || mDisplayMirrorGameIdSet2?.contains(gameId) == true
-    }
-
-    /**
-     * 获取镜像数据的位置，是归属镜像 1 还是镜像 2
-     */
-    fun getMirrorPosition(gameId: String): Int {
-        return if (mDisplayMirrorGameIdSet?.contains(gameId) == true) {
-            1
-        } else if (mDisplayMirrorGameIdSet2?.contains(gameId) == true) {
-            2
-        } else {
-            -1
-        }
+        return mDisplayMirrorIfoGameIdSet?.contains(gameId) ?: false
     }
 
     @JvmStatic
@@ -114,15 +95,6 @@ object RegionSettingHelper {
     @JvmStatic
     fun getRegionSetting() {
         debounceActionWithInterval(R.string.app_name, 5000) {
-
-            // 初始启动时先使用历史数据
-            if (mIsInit) {
-                SPUtils.getString(SP_SETTING).toObject<RegionSetting>()?.let {
-                    updateSettingsInMemory(it)
-                }
-                mIsInit = false
-            }
-
             // 使用默认的 Schdulers.io() 可能会触发 OOM
             RetrofitManager.getInstance()
                 .api
@@ -146,8 +118,7 @@ object RegionSettingHelper {
 
     private fun updateSettingsInMemory(data: RegionSetting) {
         mFilterGameIdSet = data.filterGameIdSet
-        mDisplayMirrorGameIdSet = data.mirrorGameIdSet
-        mDisplayMirrorGameIdSet2 = data.mirrorGameIdSet2
+        mDisplayMirrorIfoGameIdSet = data.mirrorGameIdSet
         mChannelControl = data.channelControl
         mGameH5DownloadList = data.gameH5DownloadList
         mGameSpecialDownloadInfoList = data.gameSpecialDownloadInfoList

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -15,7 +15,7 @@ class DefaultUrlHandlerProviderImpl : IDefaultUrlHandlerProvider {
         entrance: String,
         bringAppToFront: Boolean
     ): Boolean {
-        return DefaultUrlHandler.interceptUrl(context, url, null, entrance, bringAppToFront)
+        return DefaultUrlHandler.interceptUrl(context, url, entrance, bringAppToFront)
     }
 
     override fun init(context: Context?) {

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

@@ -69,56 +69,6 @@ class DirectProviderImpl : IDirectProvider {
         return DirectUtils.directToQqGroup(context, groupNumber)
     }
 
-    override fun directToHomeActivity(context: Context, userId: String?, entrance: String?, path: String?) {
-        DirectUtils.directToHomeActivity(context, userId, entrance, path)
-    }
-
-    override fun directToAnswerDetail(context: Context, id: String, entrance: String?, path: String?) {
-        DirectUtils.directToAnswerDetail(context, id, entrance, path)
-    }
-
-    override fun directToCommunityArticle(
-        context: Context,
-        articleId: String?,
-        communityId: String?,
-        entrance: String?,
-        path: String?
-    ) {
-        DirectUtils.directToCommunityArticle(context, articleId, communityId, entrance, path)
-    }
-
-    override fun directToVideoDetail(context: Context, videoId: String, entrance: String?, path: String?) {
-        DirectUtils.directToVideoDetail(context, videoId, entrance, path)
-    }
-
-    override fun directToAmway(context: Context, fixedTopAmwayCommentId: String?, entrance: String?, path: String?) {
-        DirectUtils.directToAmway(context, fixedTopAmwayCommentId, entrance, path)
-    }
-
-    override fun directToOrderCenter(context: Context) {
-        DirectUtils.directToOrderCenter(context)
-    }
-
-    override fun directToOrderDetail(context: Context, orderId: String) {
-        DirectUtils.directToOrderDetail(context, orderId)
-    }
-
-    override fun directToEnergyRecord(context: Context, position: Int) {
-        DirectUtils.directToEnergyRecord(context, position)
-    }
-
-    override fun directToMyPrizePage(context: Context) {
-        DirectUtils.directToMyPrizePage(context)
-    }
-
-    override fun directToWinOrderDetail(context: Context, orderId: String, activityId: String) {
-        DirectUtils.directToWinOrderDetail(context, orderId, activityId)
-    }
-
-    override fun directToQGame(context: Context) {
-        return DirectUtils.directToQGameHome(context)
-    }
-
     override fun init(context: Context?) {
         // Do nothing
     }

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

@@ -1,119 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.common.util.NewFlatLogUtils
-import com.gh.gamecenter.common.base.GlobalActivityManager
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.entity.GameUpdateEntity
-import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.feature.provider.IDownloadButtonClickedProvider
-import com.gh.gamecenter.feature.view.DownloadButton
-import com.gh.gamecenter.packagehelper.PackageRepository
-import com.lightgame.download.DownloadEntity
-import com.lightgame.utils.Utils
-
-@Route(path = RouteConsts.provider.downloadButtonClickedHandler, name = "DownloadButton点击事件暴露服务")
-class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
-    override fun onClicked(downloadButton: DownloadButton) {
-        var gameId = ""
-        var gameName = ""
-        var gameCategory = ""
-        var gameTypeInChinese = ""
-        var downloadStatus = ""
-        var downloadStatusInChinese = ""
-        var gameSchemaType = ""
-        var packageName = ""
-
-        val boundedObject = downloadButton.getObject()
-
-        Utils.log("DownloadButtonClickedProviderImpl", "$downloadButton onClicked ${boundedObject?.javaClass}")
-
-        if (boundedObject != null) {
-            when (boundedObject) {
-                is GameEntity -> {
-                    gameId = boundedObject.id
-                    gameName = boundedObject.name ?: ""
-                    gameCategory = boundedObject.category ?: ""
-                    downloadStatus = if (boundedObject.isVGame()) {
-                        "畅玩"
-                    } else if (boundedObject.downloadStatus == "demo") {
-                        "试玩"
-                    } else {
-                        "下载"
-                    }
-                    gameTypeInChinese = boundedObject.categoryChinese
-                    downloadStatusInChinese = boundedObject.downloadStatusChinese
-                    gameSchemaType = boundedObject.gameBitChinese
-                    packageName = boundedObject.getUniquePackageName() ?: ""
-                }
-
-                is GameUpdateEntity -> {
-                    gameId = boundedObject.id
-                    gameName = boundedObject.name ?: ""
-                    // 下载管理-更新页面，把下载状态都置为下载
-                    downloadStatus = "下载"
-                    gameTypeInChinese = boundedObject.categoryChinese
-                    downloadStatusInChinese = boundedObject.downloadStatusChinese
-                    packageName = boundedObject.packageName
-                }
-
-                is DownloadEntity -> {
-                    gameId = boundedObject.gameId
-                    gameName = boundedObject.name ?: ""
-                    gameCategory = boundedObject.getGameCategory()
-                    downloadStatus = if (boundedObject.isVGame()) "畅玩" else "下载"
-                    packageName = boundedObject.packageName
-                }
-            }
-
-            // 上报 UI 状态为启动的点击事件 (样式为启动，或者文案包含启动都算能启动)
-            if (downloadButton.buttonStyle == DownloadButton.ButtonStyle.LAUNCH_OR_OPEN
-                || downloadButton.text.contains("启动")) {
-
-                // boundedObject 里找不到游戏类型时，尝试从已安装列表中获取
-                if (gameCategory.isEmpty() && packageName.isNotEmpty()) {
-                    gameCategory = PackageRepository.gameInstalled.find { it.packageName == packageName }?.category ?: ""
-                }
-
-                NewFlatLogUtils.logGameLaunchButtonClicked(
-                    gameId = gameId,
-                    gameName = gameName,
-                    location = downloadButton.getWidgetBusinessName(),
-                    gameCategory = gameCategory,
-                    downloadStatus = downloadStatus
-                )
-            }
-
-            // 预约状态不上报
-            if (downloadButton.buttonStyle != DownloadButton.ButtonStyle.RESERVABLE
-                && downloadButton.buttonStyle != DownloadButton.ButtonStyle.RESERVED
-            ) {
-
-                // 上报神策点击事件
-                SensorsBridge.trackEvent(
-                    "DownLoadbuttonClick",
-                    "game_id", gameId,
-                    "game_name", gameName,
-                    "game_type", gameTypeInChinese,
-                    "download_status", downloadStatusInChinese,
-                    "button_name", downloadButton.text,
-                    "game_schema_type", gameSchemaType,
-                    "page_name", GlobalActivityManager.getCurrentPageEntity().pageName,
-                    "page_id", GlobalActivityManager.getCurrentPageEntity().pageId,
-                    "page_business_id", GlobalActivityManager.getCurrentPageEntity().pageBusinessId,
-                    "last_page_name", GlobalActivityManager.getLastPageEntity().pageName,
-                    "last_page_id", GlobalActivityManager.getLastPageEntity().pageId,
-                    "last_page_business_id", GlobalActivityManager.getLastPageEntity().pageBusinessId
-                )
-            }
-
-        }
-    }
-
-    override fun init(context: Context?) {
-        // do nothing
-    }
-
-}

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

@@ -5,7 +5,6 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.ErrorHelper
 import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IErrorHelperProvider
-import com.gh.gamecenter.login.user.LoginTag
 import retrofit2.HttpException
 
 @Route(path = RouteConsts.provider.errorHelper, name = "ErrorHelper暴露服务")
@@ -19,13 +18,8 @@ class ErrorHelperProviderImpl : IErrorHelperProvider {
         ErrorHelper.handleError(context, errorString, showHighPriorityHint)
     }
 
-    override fun handleLoginError(
-        context: Context,
-        httpException: HttpException?,
-        loginTagChinese: String,
-        isCertificate: Boolean
-    ) {
-        ErrorHelper.handleLoginError(context, httpException, loginTagChinese, isCertificate)
+    override fun handleLoginError(context: Context, httpException: HttpException?) {
+        ErrorHelper.handleLoginError(context, httpException)
     }
 
     override fun init(context: Context?) {

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

@@ -1,20 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.common.exposure.ExposureManager
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.exposure.ExposureEvent
-import com.gh.gamecenter.feature.provider.IExposureManagerProvider
-
-@Route(path = RouteConsts.provider.exposureManager, name = "ExposureManager暴露服务")
-class ExposureManagerProviderImpl: IExposureManagerProvider {
-    override fun logExposure(exposureEvent: ExposureEvent) {
-        ExposureManager.log(exposureEvent)
-    }
-
-    override fun init(context: Context?) {
-        // do nothing
-    }
-
-}

app/src/main/java/com/gh/common/provider/FloatingBackViewManagerProviderImpl.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.FloatingBackViewManager
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IFloatingBackViewManagerProvider
+
+@Route(path = RouteConsts.provider.floatingBackViewManager, name = "FloatingViewBackManager暴露服务")
+class FloatingBackViewManagerProviderImpl : IFloatingBackViewManagerProvider {
+
+    override fun enableBackViewForTaskType() {
+        FloatingBackViewManager.enableBackView(FloatingBackViewManager.TYPE_TASK)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

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

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

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

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

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

@@ -1,18 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.common.util.GameTrendsHelper
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.core.provider.IGameTrendsHelperProvider
-
-@Route(path = RouteConsts.provider.gameTrendsHelper, name = "GameTrendsHelper暴露服务")
-class GameTrendsHelperProviderImpl : IGameTrendsHelperProvider {
-    override fun updateReadPostTime() {
-        GameTrendsHelper.updateReadPostTime()
-    }
-
-    override fun init(context: Context?) {
-        // do nothing
-    }
-}

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

@@ -1,27 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.common.util.LibaoUtils
-import com.gh.common.util.LibaoUtils.PostLibaoListener
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.core.provider.ILibaoUtilsProvider
-
-@Route(path = RouteConsts.provider.libaoUtils, name = "LibaoUtils暴露服务")
-class LibaoUtilsProviderImpl : ILibaoUtilsProvider {
-    override fun getLibaoStatus(ids: String, successCallback: ((Any?) -> Unit)?, failureCallback: (() -> Unit)?) {
-        LibaoUtils.getLibaoStatus(ids, object : PostLibaoListener {
-            override fun postSucceed(response: Any?) {
-                successCallback?.invoke(response)
-            }
-
-            override fun postFailed(error: Throwable?) {
-                failureCallback?.invoke()
-            }
-        })
-    }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}

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

@@ -4,12 +4,10 @@ import android.content.Context
 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.CommunityEntity
 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.feature.exposure.ExposureEvent
-import com.gh.gamecenter.feature.provider.ILinkDirectUtilsProvider
+import com.gh.gamecenter.common.provider.ILinkDirectUtilsProvider
 
 @Route(path = RouteConsts.provider.linkDirectUtils, name = "DirectUtils暴露服务，主要是暴露directToLinkPage方法")
 class LinkDirectUtilsProviderImpl : ILinkDirectUtilsProvider {
@@ -23,16 +21,6 @@ class LinkDirectUtilsProviderImpl : ILinkDirectUtilsProvider {
         DirectUtils.directToLinkPage(context, linkEntity, entrance, path)
     }
 
-    override fun directToLinkPage(
-        context: Context,
-        linkEntity: LinkEntity,
-        entrance: String,
-        path: String,
-        exposureEvent: ExposureEvent?
-    ) {
-        DirectUtils.directToLinkPage(context, linkEntity, entrance, path, exposureEvent)
-    }
-
     override fun directToSuggestion(context: Context, type: SuggestType, requestCode: Int?) {
         DirectUtils.directToSuggestion(context, type, requestCode)
     }
@@ -63,16 +51,6 @@ class LinkDirectUtilsProviderImpl : ILinkDirectUtilsProvider {
         DirectUtils.directToSuggestion(context, type, hiddenHint)
     }
 
-    override fun directToCommunityColumn(
-        context: Context,
-        community: CommunityEntity?,
-        subjectId: String,
-        entrance: String?,
-        path: String?
-    ) {
-        DirectUtils.directToCommunityColumn(context, community, subjectId, entrance, path)
-    }
-
     override fun init(context: Context?) {
         // Do nothing
     }

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

@@ -1,31 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import android.content.Intent
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.MessageDetailActivity
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.entity.ConcernEntity
-import com.gh.gamecenter.feature.provider.IMessageDetailProvider
-
-@Route(path = RouteConsts.provider.messageDetail, name = "MessageDetailActivity暴露服务")
-class MessageDetailProviderImpl : IMessageDetailProvider {
-
-    override fun getIntentById(
-        context: Context,
-        newsId: String,
-        commentNum: Int,
-        openSoftInput: Boolean,
-        entrance: String
-    ): Intent {
-        return MessageDetailActivity.getIntentById(context, newsId, commentNum, openSoftInput, entrance)
-    }
-
-    override fun getIntentByEntity(context: Context, concernEntity: ConcernEntity, entrance: String): Intent? {
-        return MessageDetailActivity.getIntentByEntity(context, concernEntity, entrance)
-    }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}

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

@@ -1,13 +1,9 @@
 package com.gh.common.provider
 
 import android.content.Context
-import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.MutableLiveData
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.entity.MessageUnreadCount
-import com.gh.gamecenter.feature.entity.MessageUnreadEntity
-import com.gh.gamecenter.feature.provider.IMessageUnreadRepositoryProvider
+import com.gh.gamecenter.core.provider.IMessageUnreadRepositoryProvider
 import com.gh.gamecenter.message.MessageUnreadRepository
 
 @Route(path = RouteConsts.provider.messageUnreadRepository, name = "MessageUnreadRepository暴露服务")
@@ -17,22 +13,6 @@ class MessageUnreadRepositoryProviderImpl : IMessageUnreadRepositoryProvider {
         MessageUnreadRepository.loadMessageUnreadData()
     }
 
-    override fun loadMessageUnreadTotal(isRecordData: Boolean) {
-        MessageUnreadRepository.loadMessageUnreadTotal(isRecordData)
-    }
-
-    override fun getUnreadLiveData(): MediatorLiveData<MessageUnreadEntity> {
-        return MessageUnreadRepository.unreadLiveData
-    }
-
-    override fun getZixunConcernLiveData(): MutableLiveData<Boolean> {
-        return MessageUnreadRepository.zixunConcern
-    }
-
-    override fun getMessageUnreadCountLiveData(): MutableLiveData<MessageUnreadCount?> {
-        return MessageUnreadRepository.messageUnreadCountLiveData
-    }
-
     override fun init(context: Context?) {
         // Do nothing
     }

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

@@ -1,83 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import android.content.Intent
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.provider.INewCommentDetailProvider
-import com.gh.gamecenter.qa.comment.NewCommentDetailActivity
-
-@Route(path = RouteConsts.provider.newCommentDetail, name = "NewCommentDetailActivity暴露服务")
-class NewCommentDetailProviderImpl : INewCommentDetailProvider {
-
-    override fun getAnswerCommentIntent(
-        context: Context,
-        commentId: String,
-        questionId: String,
-        topCommentId: String,
-        entrance: String,
-        path: String
-    ): Intent {
-        return NewCommentDetailActivity.getAnswerCommentIntent(
-            context,
-            commentId,
-            questionId,
-            topCommentId,
-            entrance,
-            path
-        )
-    }
-
-    override fun getArticleCommentIntent(
-        context: Context,
-        commentId: String,
-        communityId: String,
-        articleId: String,
-        topCommentId: String,
-        entrance: String,
-        path: String
-    ): Intent {
-        return NewCommentDetailActivity.getArticleCommentIntent(
-            context,
-            commentId,
-            communityId,
-            articleId,
-            topCommentId,
-            entrance,
-            path
-        )
-    }
-
-    override fun getVideoCommentIntent(
-        context: Context,
-        commentId: String,
-        videoId: String,
-        topCommentId: String,
-        entrance: String,
-        path: String
-    ): Intent {
-        return NewCommentDetailActivity.getVideoCommentIntent(context, commentId, videoId, topCommentId, entrance, path)
-    }
-
-    override fun getGameCollectionCommentIntent(
-        context: Context,
-        commentId: String,
-        gameCollectionId: String,
-        topCommentId: String,
-        entrance: String,
-        path: String
-    ): Intent {
-        return NewCommentDetailActivity.getGameCollectionCommentIntent(
-            context,
-            commentId,
-            gameCollectionId,
-            topCommentId,
-            entrance,
-            path
-        )
-    }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}

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

@@ -33,18 +33,6 @@ class PackageUtilsProviderImpl : IPackageUtilsProvider {
         return PackageUtils.getSideLoadedInfo()
     }
 
-    override fun isSignedByGh(context: Context, packageName: String): Boolean {
-        return PackageUtils.isSignedByGh(context, packageName)
-    }
-
-    override fun getInstalledTime(context: Context, packageName: String): Long {
-        return PackageUtils.getInstalledTime(context, packageName)
-    }
-
-    override fun getVersionNameByPackageName(packageName: String): String {
-        return PackageUtils.getVersionNameByPackageName(packageName) ?: ""
-    }
-
     override fun init(context: Context?) {
         // Do nothing
     }

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

@@ -3,8 +3,7 @@ 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.feature.entity.GameInstall
-import com.gh.gamecenter.feature.provider.IPackagesManagerProvider
+import com.gh.gamecenter.core.provider.IPackagesManagerProvider
 import com.gh.gamecenter.manager.PackagesManager
 
 @Route(path = RouteConsts.provider.packagesManager, name = "PackagesManager暴露服务")
@@ -13,10 +12,6 @@ class PackagesManagerProviderImpl: IPackagesManagerProvider {
         return PackagesManager.isCanPluggable(gameId, packageName)
     }
 
-    override fun getFilterSameApkInstalledList(): ArrayList<GameInstall> {
-        return PackagesManager.getFilterSameApkInstalledList()
-    }
-
     override fun init(context: Context?) {
         // Do nothing
     }

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

@@ -14,10 +14,6 @@ class RegionSettingHelperProviderImpl : IRegionSettingHelperProvider {
         return RegionSettingHelper.shouldThisGameDisplayMirrorInfo(gameId)
     }
 
-    override fun getMirrorPosition(gameId: String): Int {
-        return RegionSettingHelper.getMirrorPosition(gameId)
-    }
-
     override fun shouldThisGameShowSpecialDownload(gameId: String): Boolean {
         return RegionSettingHelper.shouldThisGameShowSpecialDownload(gameId)
     }
@@ -30,10 +26,6 @@ class RegionSettingHelperProviderImpl : IRegionSettingHelperProvider {
         return RegionSettingHelper.getIpInfo()
     }
 
-    override fun shouldThisGameBeFiltered(gameId: String?): Boolean {
-        return RegionSettingHelper.shouldThisGameBeFiltered(gameId)
-    }
-
     override fun init(context: Context?) {
         // Do nothing
     }

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

@@ -1,19 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.ShareCardPicActivity
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.entity.ConcernEntity
-import com.gh.gamecenter.feature.provider.IShareCardPicProvider
-
-@Route(path = RouteConsts.provider.shareCardPicActivity, name = "ShareCardPicActivity暴露服务")
-class ShareCardPicProviderImpl : IShareCardPicProvider {
-    override fun startShareCardPicActivity(context: Context, concernEntity: ConcernEntity, entrance: String) {
-        ShareCardPicActivity.startShareCardPicActivity(context, concernEntity, entrance)
-    }
-
-    override fun init(context: Context?) {
-        // do nothing
-    }
-}

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

@@ -1,20 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import android.content.Intent
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.ShareCardActivity
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.entity.ConcernEntity
-import com.gh.gamecenter.feature.provider.IShareCardProvider
-
-@Route(path = RouteConsts.provider.shareCardActivity, name = "ShareCardActivity暴露服务")
-class ShareCardProviderImpl : IShareCardProvider {
-    override fun getIntent(context: Context, concernEntity: ConcernEntity, shareContent: String): Intent {
-        return ShareCardActivity.getIntent(context, concernEntity, shareContent)
-    }
-
-    override fun init(context: Context?) {
-        // do nothing
-    }
-}

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

@@ -1,20 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import android.content.Intent
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.provider.ISimpleAnswerDetailProvider
-import com.gh.gamecenter.qa.answer.detail.SimpleAnswerDetailActivity
-
-@Route(path = RouteConsts.provider.simpleAnswerDetail, name = "SimpleAnswerDetailActivity暴露服务")
-class SimpleAnswerDetailProviderImpl : ISimpleAnswerDetailProvider {
-
-    override fun getIntent(context: Context, answerId: String, entrance: String, path: String): Intent {
-        return SimpleAnswerDetailActivity.getIntent(context, answerId, entrance, path)
-    }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}

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

@@ -1,24 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.feature.provider.ISubjectProvider
-import com.gh.gamecenter.subject.SubjectActivity
-
-@Route(path = RouteConsts.provider.subject, name = "SubjectActivity暴露服务")
-class SubjectProviderImpl : ISubjectProvider {
-    override fun startSubjectActivity(
-        context: Context,
-        id: String?,
-        name: String?,
-        isOrder: Boolean,
-        entrance: String?
-    ) {
-        SubjectActivity.startSubjectActivity(context, id, name, isOrder, null, entrance)
-    }
-
-    override fun init(context: Context?) {
-        // Do nothing
-    }
-}

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

@@ -9,7 +9,7 @@ import com.gh.gamecenter.manager.UpdateManager
 
 @Route(path = RouteConsts.provider.updateManager, name = "UpdateManager暴露服务")
 class UpdateManagerProviderImpl: IUpdateManagerProvider {
-    override fun checkUpdate(context: Context, isAutoCheck: Boolean, handler: Handler?) {
+    override fun checkUpdate(context: Context, isAutoCheck: Boolean, handler: Handler) {
         UpdateManager.getInstance(context).checkUpdate(isAutoCheck, handler)
     }
 

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

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

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

@@ -35,16 +35,6 @@ class WebProviderImpl : IWebProvider {
         return WebActivity.getQAIntent(context, url, title, isWebPageHandleBackPressed, qaType)
     }
 
-    override fun getIntentByNews(
-        context: Context?,
-        concernLink: String?,
-        concernGameName: String,
-        concernId: String?,
-        entrance: String?
-    ): Intent {
-        return WebActivity.getIntentByNews(context, concernLink, concernGameName, concernId, entrance)
-    }
-
     override fun init(context: Context?) {
         // Do nothing
     }

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

@@ -22,12 +22,8 @@ import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.feature.entity.ApkEntity
 import com.gh.gamecenter.feature.entity.SimulatorEntity
 import com.gh.gamecenter.entity.TrackableEntity
-import com.gh.ndownload.NDataChanger
 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.Utils
 import java.lang.ref.WeakReference
 import java.text.DecimalFormat
@@ -99,12 +95,6 @@ class SimulatorDownloadManager private constructor() {
                             downloadDialog?.dismiss()
                         }
                     }
-                    DownloadStatus.diskisfull == downloadEntity.status -> {
-                        ToastUtils.showToast("存储空间已满，下载任务已暂停")
-                    }
-                    DownloadStatus.diskioerror == downloadEntity.status -> {
-                        ToastUtils.showToast("下载 IO 出现异常，下载任务已暂停")
-                    }
                     DownloadStatus.neterror == downloadEntity.status -> {
                         ToastUtils.showToast("网络不稳定，下载任务已暂停")
                     }
@@ -300,17 +290,13 @@ class SimulatorDownloadManager private constructor() {
         HaloApp.put(simulator.name, simulator)
         if (entity != null) {
             when (entity.status) {
-                DownloadStatus.pause,
-                DownloadStatus.subscribe,
-                DownloadStatus.neterror,
-                DownloadStatus.timeout,
-                DownloadStatus.diskioerror,
-                DownloadStatus.diskisfull -> {
+                DownloadStatus.pause, DownloadStatus.subscribe,
+                DownloadStatus.neterror, DownloadStatus.timeout -> {
                     DownloadManager.getInstance().addObserver(dataWatcher)
                     uiExecutor.executeWithDelay(Runnable { DownloadManager.getInstance().resume(entity, true) }, 200)
                     downloadDialog?.show()
                 }
-                DownloadStatus.done -> NDataChanger.notifyDataChanged(entity)
+                DownloadStatus.done -> DataChanger.notifyDataChanged(entity)
 
                 else -> createDownload(apkEntity, simulator)
             }

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

@@ -19,11 +19,44 @@ object AdHelper {
     const val LOCATION_SUGGESTION_FUNCTION = "suggestion_function"
     const val LOCATION_SIMULATOR_GAME = "simulator_game"
 
+    @JvmStatic
+    fun getStartUpAd(): StartupAdEntity? {
+        return Config.getNewApiSettingsEntity()?.startAd
+    }
+
     @JvmStatic
     fun getStartUp(): StartupAdEntity? {
         return Config.getNewApiSettingsEntity()?.startup
     }
 
+    @JvmStatic
+    fun prefetchStartUpAd(settingsEntity: NewApiSettingsEntity) {
+        if (settingsEntity.startAd != null && !settingsEntity.startAd?.img.isNullOrEmpty()) {
+            val screenWidth = DisplayUtils.getScreenWidth()
+            val transformedUrl = ImageUtils.getTransformedUrl(settingsEntity.startAd?.img, screenWidth) ?: return
+            ImageUtils.prefetchToDiskCache(transformedUrl)
+        }
+    }
+
+    fun getSettingAdCache() {
+        RetrofitManager.getInstance().newApi
+            .getSettingAdCache(HaloApp.getInstance().channel)
+            .compose(observableToMain())
+            .subscribe(object : Response<NewApiSettingsEntity>() {
+                override fun onResponse(response: NewApiSettingsEntity?) {
+                    super.onResponse(response)
+                    val settings = Config.getNewApiSettingsEntity()
+                    if (settings != null) {
+                        settings.startAd = response?.startAd
+                        Config.updateNewApiSettings(settings)
+                        if (response != null) {
+                            prefetchStartUpAd(response)
+                        }
+                    }
+                }
+            })
+    }
+
     fun getAd(location: String): SettingsEntity.AD? {
         val adList = Config.getSettings()?.adList ?: return null
 

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

@@ -10,13 +10,15 @@ import com.gh.download.simple.AutoUnregisteredSimpleDownloadListener
 import com.gh.download.simple.DownloadListener
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.eventbus.EBReuse
-import com.gh.gamecenter.common.utils.*
+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
 import com.gh.gamecenter.entity.ArchiveEntity
-import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.vspace.VArchiveHelper
 import com.gh.vspace.VHelper
@@ -38,7 +40,6 @@ object ArchiveDownloadButtonHelper {
         packageName: String,
         archiveEntity: ArchiveEntity,
         downloadBtn: TextView,
-        gameEntity: GameEntity?,
         downloadCompletedListener: (() -> Unit)? = null
     ) {
         downloadBtn.text = if (VArchiveHelper.isArchiveDownloaded(archiveEntity.md5)) {
@@ -49,7 +50,7 @@ object ArchiveDownloadButtonHelper {
         downloadBtn.setOnClickListener {
             when {
                 // 检查是否已安装畅玩助手
-                !VHelper.isVSpaceInstalled(context) -> showVSpaceTipDialog(context, gameEntity)
+                !VHelper.isVSpaceInstalled(context) -> showVspaceTipDialog(context)
                 // 检查是否已安装游戏
                 !VHelper.isInstalled(packageName) -> {
                     // 检查游戏是否在安装中
@@ -64,8 +65,7 @@ object ArchiveDownloadButtonHelper {
                     context,
                     entrance,
                     packageName,
-                    archiveEntity,
-                    gameEntity
+                    archiveEntity
                 )
                 // 检查完毕下载存档
                 else -> downloadArchive(
@@ -75,14 +75,13 @@ object ArchiveDownloadButtonHelper {
                     packageName,
                     archiveEntity,
                     downloadBtn,
-                    gameEntity,
                     downloadCompletedListener
                 )
             }
         }
     }
 
-    private fun showVSpaceTipDialog(context: Context, gameEntity: GameEntity?) {
+    private fun showVspaceTipDialog(context: Context) {
         NewFlatLogUtils.logCloudArchiveVSpaceDownloadDialogShow()
         DialogHelper.showDialog(
             context,
@@ -92,7 +91,7 @@ object ArchiveDownloadButtonHelper {
             R.string.cancel.toResString(),
             {
                 NewFlatLogUtils.logCloudArchiveVSpaceDownloadDialogClick(R.string.archive_vspace_dialog_confirm.toResString())
-                VHelper.showVSpaceDialog(context, gameEntity)
+                VHelper.showVspaceDialog(context)
             },
             {
                 NewFlatLogUtils.logCloudArchiveVSpaceDownloadDialogClick(R.string.cancel.toResString())
@@ -125,8 +124,7 @@ object ArchiveDownloadButtonHelper {
         context: Context,
         entrance: String,
         packageName: String,
-        archiveEntity: ArchiveEntity,
-        gameEntity: GameEntity?
+        archiveEntity: ArchiveEntity
     ) {
         VArchiveHelper.getArchiveFile(archiveEntity.md5)?.run {
 
@@ -146,14 +144,7 @@ object ArchiveDownloadButtonHelper {
             }
         }
 
-        NewFlatLogUtils.logCloudArchiveDownloadOrApply(
-            archiveEntity.name,
-            entrance,
-            gameEntity?.id ?: "",
-            gameEntity?.name ?: "",
-            archiveEntity.id,
-            false
-        )
+        NewFlatLogUtils.logCloudArchiveDownloadOrApply(archiveEntity.name, entrance)
     }
 
     private fun downloadArchive(
@@ -163,7 +154,6 @@ object ArchiveDownloadButtonHelper {
         packageName: String,
         archiveEntity: ArchiveEntity,
         downloadBtn: TextView,
-        gameEntity: GameEntity?,
         downloadCompletedListener: (() -> Unit)? = null
     ) {
         // 执行下载
@@ -197,7 +187,7 @@ object ArchiveDownloadButtonHelper {
                     DownloadStatus.COMPLETED -> {
                         dismissArchiveLoadingDialog(archiveLoadingDialog)
                         downloadBtn.text = R.string.archive_apply.toResString()
-                        showApplyArchiveTipDialog(context, entrance, packageName, archiveEntity, gameEntity)
+                        showApplyArchiveTipDialog(context, entrance, packageName, archiveEntity)
                         downloadCompletedListener?.invoke()
                     }
                     else -> {
@@ -212,22 +202,7 @@ object ArchiveDownloadButtonHelper {
 
         })
 
-        NewFlatLogUtils.logCloudArchiveDownloadOrApply(
-            archiveEntity.name,
-            entrance,
-            gameEntity?.id ?: "",
-            gameEntity?.name ?: "",
-            archiveEntity.id,
-            true
-        )
-
-        SensorsBridge.trackEvent(
-            "CloudSaveDownload",
-            "cloud_save_name", archiveEntity.name,
-            "game_id", gameEntity?.id ?: "",
-            "game_name", gameEntity?.name ?: "",
-            "source_entrance", entrance
-        )
+        NewFlatLogUtils.logCloudArchiveDownloadOrApply(archiveEntity.name, entrance)
     }
 
     private fun showArchiveLoadingDialog(
@@ -251,8 +226,7 @@ object ArchiveDownloadButtonHelper {
         context: Context,
         entrance: String,
         packageName: String,
-        archiveEntity: ArchiveEntity,
-        gameEntity: GameEntity?
+        archiveEntity: ArchiveEntity
     ) {
         DialogHelper.showDialog(
             context,
@@ -261,33 +235,14 @@ object ArchiveDownloadButtonHelper {
             R.string.archive_apply.toResString(),
             R.string.cancel.toResString(),
             {
-                applyArchive(context, entrance, packageName, archiveEntity, gameEntity)
+                applyArchive(context, entrance, packageName, archiveEntity)
                 NewFlatLogUtils.logCloudArchiveApplyDialogRelated("cloud_save_overwrite_dialog_click", "使用")
-                SensorsBridge.trackEvent(
-                    "CloudSaveOverwriteDialogClick",
-                    "game_id", gameEntity?.id ?: "",
-                    "game_name", gameEntity?.name ?: "",
-                    "button_name", "使用"
-                )
-            },
-            {
-                NewFlatLogUtils.logCloudArchiveApplyDialogRelated("cloud_save_overwrite_dialog_click", "取消")
-                SensorsBridge.trackEvent(
-                    "CloudSaveOverwriteDialogClick",
-                    "game_id", gameEntity?.id ?: "",
-                    "game_name", gameEntity?.name ?: "",
-                    "button_name", "取消"
-                )
             },
+            { NewFlatLogUtils.logCloudArchiveApplyDialogRelated("cloud_save_overwrite_dialog_click", "取消") },
             extraConfig = DialogHelper.Config(centerTitle = true)
         )
 
         NewFlatLogUtils.logCloudArchiveApplyDialogRelated("cloud_save_overwrite_dialog_show")
-        SensorsBridge.trackEvent(
-            "CloudSaveOverwriteDialogShow",
-            "game_id", gameEntity?.id ?: "",
-            "game_name", gameEntity?.name ?: ""
-        )
     }
 
     private fun dismissArchiveLoadingDialog(archiveLoadingDialog: Dialog) {

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

@@ -13,7 +13,7 @@ import com.gh.gamecenter.common.json.json
 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.feature.entity.CommentEntity
+import com.gh.gamecenter.entity.CommentEntity
 import com.gh.gamecenter.feature.entity.Permissions
 import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.qa.comment.OnCommentOptionClickListener

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

@@ -3,15 +3,11 @@ package com.gh.common.util;
 import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.content.Context;
-import android.graphics.drawable.ColorDrawable;
 import android.text.TextUtils;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
@@ -23,13 +19,12 @@ import com.gh.gamecenter.adapter.viewholder.CommentViewHolder;
 import com.gh.gamecenter.common.callback.SimpleCallback;
 import com.gh.gamecenter.common.retrofit.BiResponse;
 import com.gh.gamecenter.common.retrofit.Response;
-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.core.utils.DisplayUtils;
 import com.gh.gamecenter.core.utils.NumberUtils;
 import com.gh.gamecenter.core.utils.ToastUtils;
-import com.gh.gamecenter.feature.entity.CommentEntity;
+import com.gh.gamecenter.entity.CommentEntity;
 import com.gh.gamecenter.feature.entity.MeEntity;
 import com.gh.gamecenter.login.entity.UserInfoEntity;
 import com.gh.gamecenter.login.user.UserManager;
@@ -50,7 +45,6 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
-import java.util.Objects;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
@@ -108,27 +102,17 @@ public class CommentUtils {
         }
     }
 
-    public static void showMorePopupWindow(
-            final View anchor,
-            final CommentEntity commentEntity,
-            final boolean showConversation,
-            final String patch,
-            final OnCommentDeleteListener onCommentDeleteListener
-    ) {
-        Context context = anchor.getContext();
-        LayoutInflater inflater = LayoutInflater.from(context);
-        View contentView = inflater.inflate(R.layout.layout_popup_container, null);
-        PopupWindow popupWindow = new PopupWindow(
-                contentView,
-                ViewGroup.LayoutParams.WRAP_CONTENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-        );
-        popupWindow.setBackgroundDrawable(new ColorDrawable(0));
-        popupWindow.setTouchable(true);
-        popupWindow.setFocusable(true);
-        popupWindow.setOutsideTouchable(true);
+    public static void showReportDialog(final CommentEntity commentEntity,
+                                        final Context context,
+                                        final boolean showConversation,
+                                        final String patch) {
+        final 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, 12), 0, DisplayUtils.dip2px(context, 12));
 
-        LinearLayout container = contentView.findViewById(R.id.container);
         List<String> dialogType = new ArrayList<>();
         dialogType.add("复制");
         dialogType.add("投诉");
@@ -137,23 +121,21 @@ public class CommentUtils {
             dialogType.add("查看对话");
         }
 
-        String commentUserId = commentEntity.getUser().getId();
-        String userId = UserManager.getInstance().getUserId();
-        MeEntity me = commentEntity.getMe();
-        boolean isCommentedByUser = Objects.equals(commentUserId, userId);
-        boolean isContentAuthorOrModerator = me != null && (me.isModerator() || me.isContentAuthor());
-        if (isCommentedByUser || isContentAuthorOrModerator) {
-            dialogType.add("删除");
-        }
-
         for (String s : dialogType) {
-            View itemView = inflater.inflate(R.layout.layout_popup_option_item, container, false);
-            TextView reportTv = itemView.findViewById(R.id.hint_text);
+            final TextView reportTv = new TextView(context);
             reportTv.setText(s);
-            container.addView(itemView);
+            reportTv.setTextSize(17);
+            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, 20), DisplayUtils.dip2px(context, 12),
+                    0, DisplayUtils.dip2px(context, 12));
+            container.addView(reportTv);
 
             reportTv.setOnClickListener(v -> {
-                popupWindow.dismiss();
+                dialog.cancel();
                 switch (reportTv.getText().toString()) {
                     case "复制":
                         copyText(commentEntity.getContent(), context);
@@ -161,30 +143,19 @@ public class CommentUtils {
                     case "投诉":
                         CheckLoginUtils.checkLogin(context, patch + "-投诉",
                                 () -> showReportTypeDialog(commentEntity, context));
+
                         break;
                     case "查看对话":
                         context.startActivity(CommentDetailActivity.getIntent(context, commentEntity.getId(), null));
                         break;
-                    case "删除":
-                        DialogHelper.INSTANCE.showDialog(
-                                context,
-                                "提示",
-                                "删除评论后，评论下所有的回复都将被删除",
-                                "删除",
-                                "取消",
-                                () -> {
-                                    deleteComment(context, commentEntity, onCommentDeleteListener);
-                                    return null;
-                                },
-                                null,
-                                new DialogHelper.Config("", false, true, true, false, -1)
-                        );
-                        break;
                 }
             });
         }
 
-        ExtensionsKt.showAutoOrientation(popupWindow, anchor, 0, 0);
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(container);
+        dialog.show();
+
     }
 
     private static void showReportTypeDialog(final CommentEntity commentEntity, final Context context) {
@@ -459,28 +430,6 @@ public class CommentUtils {
         });
     }
 
-    public static void deleteComment(
-            final Context context,
-            final CommentEntity commentEntity,
-            final OnCommentDeleteListener listener
-    ) {
-        Dialog dialog = DialogUtils.showWaitDialog(
-                context,
-                context.getString(R.string.post_dialog_hint)
-        );
-        RetrofitManager.getInstance().getApi()
-                .deleteComment(commentEntity.getId())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .doFinally(dialog::cancel)
-                .subscribe(new Response<ResponseBody>() {
-                    @Override
-                    public void onResponse(@Nullable ResponseBody response) {
-                        listener.onCommentDelete();
-                    }
-                });
-    }
-
 
     // 设置评论item 用户相关的view(点赞/头像/用户名)
     public static void setCommentUserView(Context mContext, CommentViewHolder holder, CommentEntity entity) {
@@ -591,8 +540,4 @@ public class CommentUtils {
     public interface OnVoteListener {
         void onVote();
     }
-
-    public interface OnCommentDeleteListener {
-        void onCommentDelete();
-    }
 }

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

@@ -1,12 +1,10 @@
-package com.gh.gamecenter.feature.utils
+package com.gh.common.util
 
 import android.text.TextUtils
-import com.alibaba.android.arouter.launcher.ARouter
-import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.eventbus.EBConcernChanged
+import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.common.retrofit.Response
-import com.gh.gamecenter.core.provider.IUserManagerProvider
-import com.gh.gamecenter.feature.eventbus.EBConcernChanged
-import com.gh.gamecenter.feature.retrofit.RetrofitManager
+import com.gh.gamecenter.retrofit.RetrofitManager
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import okhttp3.ResponseBody
@@ -19,9 +17,6 @@ import retrofit2.HttpException
  */
 object ConcernUtils {
 
-    private val mUserManager =
-        ARouter.getInstance().build(RouteConsts.provider.userManager).navigation() as? IUserManagerProvider
-
     /**
      * autoConcern:是否自动关注'关联关注'
      */
@@ -32,11 +27,11 @@ object ConcernUtils {
     ) {
         val mode = if (autoConcern) "auto" else "manual"
 
-        val userId = mUserManager?.getUserId()
+        val userId = UserManager.getInstance().userId
         if (TextUtils.isEmpty(userId)) return
 
         RetrofitManager.getInstance().api
-            .postConcern(userId!!, gameId, mode)
+            .postConcern(UserManager.getInstance().userId, gameId, mode)
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(object : Response<ResponseBody>() {
@@ -54,11 +49,8 @@ object ConcernUtils {
     }
 
     fun deleteConcernData(gameId: String, listener: OnConcernListener?) {
-        val userId = mUserManager?.getUserId()
-        if (TextUtils.isEmpty(userId)) return
-
         RetrofitManager.getInstance().api
-            .deleteConcern(userId!!, gameId)
+            .deleteConcern(UserManager.getInstance().userId, gameId)
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(object : Response<ResponseBody>() {

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

@@ -9,14 +9,12 @@ import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.gh.gamecenter.common.base.GlobalActivityManager;
+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;
-import com.gh.gamecenter.common.eventbus.EBReuse;
 import com.gh.gamecenter.common.exposure.meta.MetaUtil;
 import com.gh.gamecenter.common.retrofit.BiResponse;
-import com.gh.gamecenter.common.utils.SensorsBridge;
 import com.gh.gamecenter.core.AppExecutor;
 import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.gamecenter.core.utils.MtaHelper;
@@ -32,8 +30,6 @@ import com.halo.assistant.HaloApp;
 import com.lightgame.config.CommonDebug;
 import com.lightgame.utils.Utils;
 
-import org.greenrobot.eventbus.EventBus;
-
 import io.reactivex.schedulers.Schedulers;
 import io.sentry.Sentry;
 import io.sentry.android.core.SentryAndroid;
@@ -57,7 +53,8 @@ public class DataUtils {
             return;
         }
 
-        initSentry(context, channel);
+        // 初始化 Sentry 约占用 90ms，这里切换到子线程初始化
+        AppExecutor.getIoExecutor().execute(() -> initSentry(context, channel));
     }
 
     private static void initSentry(Context context, String channel) {
@@ -117,13 +114,6 @@ public class DataUtils {
                 String originalGid = HaloApp.getInstance().getGid();
                 HaloApp.getInstance().setGid(gid);
 
-                // gid 变更时上报 gid 变更日志
-                if (!TextUtils.isEmpty(originalGid) && !originalGid.equals(gid)) {
-                    NewFlatLogUtils.logGidChanged(originalGid, gid);
-                }
-
-                SensorsBridge.setGid(gid);
-
                 // 避免重复调用
                 if (!TextUtils.isEmpty(gid) && !gid.equals(originalGid)) {
                     GameSubstituteRepositoryHelper.updateSubstitutableGames();
@@ -170,29 +160,16 @@ public class DataUtils {
                         IdCardEntity idCardEntity = data.getIdCard();
 
                         if (idCardEntity != null) {
-                            boolean isCertificated = !TextUtils.isEmpty(data.getIdCard().getId());
-                            boolean isAdult = data.getIdCard().getMinor() == null || !data.getIdCard().getMinor();
-
-                            values.put(GhContentProvider.KEY_IS_CERTIFICATED, isCertificated); // 是否认证
-                            values.put(GhContentProvider.KEY_IS_ADULT, isAdult); // 是否成年
-
-                            if (!isCertificated) {
-                                RealNameHelper.updateCertificationStatus(0);
-                            } else {
-                                if (isAdult) {
-                                    RealNameHelper.updateCertificationStatus(2);
-                                } else {
-                                    RealNameHelper.updateCertificationStatus(1);
-                                }
-                            }
+                            values.put(GhContentProvider.KEY_IS_CERTIFICATED, !TextUtils.isEmpty(data.getIdCard().getId())); // 是否认证
+                            values.put(GhContentProvider.KEY_IS_ADULT,
+                                    data.getIdCard().getMinor() == null
+                                            || !data.getIdCard().getMinor()
+                            );
                         } else {
                             values.put(GhContentProvider.KEY_IS_CERTIFICATED, false);
                             values.put(GhContentProvider.KEY_IS_ADULT, false);
-                            RealNameHelper.updateCertificationStatus(0);
                         }
 
-                        EventBus.getDefault().post(new EBReuse(Constants.EB_REALNAME_RESULT));
-
 //                     new GhContentProvider().localInsert( HaloApp.getInstance().getApplication(),values);
                         try {
                             // Unknown URL content://com.gh.gamecenter.provider/certification

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

@@ -24,8 +24,6 @@ import com.gh.vspace.VHelper;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.DownloadStatus;
 
-import java.util.Objects;
-
 /**
  * Created by khy on 27/06/17.
  * 详情下载工具类
@@ -44,7 +42,9 @@ public class DetailDownloadUtils {
             viewHolder.mMultiVersionDownloadTv.setVisibility(View.GONE);
         }
 
-        if (viewHolder.gameEntity != null && Config.isShowDownload(viewHolder.gameEntity.getId()) && !"光环助手".equals(viewHolder.gameEntity.getName())) {
+        if (viewHolder.gameEntity != null
+                && Config.isShowDownload(viewHolder.gameEntity.getId())
+                && !"光环助手".equals(viewHolder.gameEntity.getName())) {
             viewHolder.downloadBottom.setVisibility(View.VISIBLE);
         } else {
             viewHolder.downloadBottom.setVisibility(View.GONE);
@@ -114,7 +114,7 @@ public class DetailDownloadUtils {
             if (downloadEntity == null && viewHolder.gameEntity.isVGame()) {
                 String packageName = viewHolder.gameEntity.getUniquePackageName();
                 if (!TextUtils.isEmpty(packageName)) {
-                    downloadEntity = VHelper.getVDownloadEntitySnapshot(viewHolder.gameEntity.getId(), packageName);
+                    downloadEntity = VHelper.getDownloadEntitySnapshot(viewHolder.gameEntity.getId(), packageName);
                 }
             }
 
@@ -214,7 +214,7 @@ public class DetailDownloadUtils {
             if (downloadEntity == null && viewHolder.gameEntity.isVGame()) {
                 String packageName = viewHolder.gameEntity.getUniquePackageName();
                 if (!TextUtils.isEmpty(packageName)) {
-                    downloadEntity = VHelper.getVDownloadEntitySnapshot(viewHolder.gameEntity.getId(), packageName);
+                    downloadEntity = VHelper.getDownloadEntitySnapshot(viewHolder.gameEntity.getId(), packageName);
                 }
             }
 
@@ -233,13 +233,6 @@ public class DetailDownloadUtils {
         DownloadEntity downloadEntity = viewHolder.downloadEntity;
         String xapkStatus = downloadEntity.getMeta().get(XapkInstaller.XAPK_UNZIP_STATUS);
 
-        if (XapkUnzipStatus.SUCCESS.name().equals(xapkStatus) && XapkInstaller.INSTANCE.isInstalling(downloadEntity.getPath())) {
-            viewHolder.mDownloadPb.setText("游戏安装中");
-            viewHolder.mDownloadPb.setProgress(100);
-            viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
-            return;
-        }
-
         if (XapkUnzipStatus.UNZIPPING.name().equals(xapkStatus)) {
             String percent = downloadEntity.getMeta().get(XapkInstaller.XAPK_UNZIP_PERCENT);
             viewHolder.mDownloadPb.setText("游戏解压中 " + percent + "%");
@@ -269,13 +262,11 @@ public class DetailDownloadUtils {
             case downloading:
             case redirected:
             case pause:
-            case diskisfull:
-            case diskioerror:
             case overflow:
                 String downloadingText = "游戏加载中 " + downloadEntity.getPercent() + "%";
                 String resumeText = "继续加载 " + downloadEntity.getPercent() + "%";
                 viewHolder.mDownloadPb.setText((downloadEntity.getStatus() == DownloadStatus.downloading || downloadEntity.getStatus() == DownloadStatus.redirected) ? downloadingText : resumeText);
-                if (downloadEntity.isPluggable() && PackagesManager.isInstalled(downloadEntity.getPackageName())) {
+                if (downloadEntity.isPluggable() && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
                     viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN);
                 } else {
                     viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
@@ -293,7 +284,7 @@ public class DetailDownloadUtils {
                         viewHolder.mDownloadPb.setText(R.string.launch);
                         viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
                     } else {
-                        if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL) && !Objects.equals(Constants.XAPK_APKS_FORMAT, downloadEntity.getFormat())) {
+                        if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL)) {
                             viewHolder.mDownloadPb.setText(R.string.browser_install_install);
                         } else {
                             viewHolder.mDownloadPb.setText(R.string.install);
@@ -314,12 +305,13 @@ public class DetailDownloadUtils {
                         }
                     }
                 } else {
-                    if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL) && !Objects.equals(Constants.XAPK_APKS_FORMAT, downloadEntity.getFormat())) {
+                    if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL)) {
                         viewHolder.mDownloadPb.setText(R.string.browser_install_install);
                     } else {
                         viewHolder.mDownloadPb.setText(R.string.install);
                     }
-                    if (downloadEntity.isPluggable() && PackagesManager.isInstalled(downloadEntity.getPackageName())) {
+                    if (downloadEntity.isPluggable()
+                            && PackagesManager.isInstalled(downloadEntity.getPackageName())) {
                         viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_PLUGIN);
                     } else {
                         viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
@@ -356,8 +348,6 @@ public class DetailDownloadUtils {
             case timeout:
             case neterror:
             case subscribe:
-            case diskisfull:
-            case diskioerror:
             case pause:
                 viewHolder.mDownloadPb.setText("继续加载 " + viewHolder.downloadEntity.getPercent() + "%");
                 viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);

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

@@ -41,7 +41,6 @@ import com.facebook.drawee.generic.GenericDraweeHierarchy;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.gh.common.constant.Config;
 import com.gh.common.filter.RegionSetting;
-import com.gh.common.xapk.XapkDialogHelper;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.ShellActivity;
 import com.gh.gamecenter.adapter.ReportReasonAdapter;
@@ -57,7 +56,6 @@ 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.utils.SensorsBridge;
 import com.gh.gamecenter.common.view.CustomLinkMovementMethod;
 import com.gh.gamecenter.common.view.DrawableView;
 import com.gh.gamecenter.common.view.FixLinearLayoutManager;
@@ -71,8 +69,8 @@ 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.ToastUtils;
-import com.gh.gamecenter.databinding.DialogAddressConfirmationBinding;
 import com.gh.gamecenter.databinding.DialogBindPhoneBinding;
+import com.gh.gamecenter.databinding.DialogOverseaConfirmationBinding;
 import com.gh.gamecenter.databinding.DialogPackageParseErrorBinding;
 import com.gh.gamecenter.databinding.DialogRelievePhoneBinding;
 import com.gh.gamecenter.databinding.DialogReportReasonBinding;
@@ -121,7 +119,7 @@ public class DialogUtils {
         return dialog;
     }
 
-    public static void checkDownload(Context context, String size, String gameId, String gameName, CheckDownloadCallBack callBack) {
+    public static void checkDownload(Context context, String size, CheckDownloadCallBack callBack) {
         if (!NetworkUtils.isNetworkConnected(context)) {
             showNoConnectionDownloadDialog(context, () -> {
                     },
@@ -136,9 +134,7 @@ public class DialogUtils {
 //            MtaHelper.onEvent("移动网络下载", NetworkUtils.getMobileNetworkType(context), "出现弹窗提示");
             showDownloadDialog(context,
                     () -> callBack.onResponse(false),
-                    () -> callBack.onResponse(true),
-                    gameId,
-                    gameName);
+                    () -> callBack.onResponse(true));
         }
     }
 
@@ -167,11 +163,9 @@ public class DialogUtils {
         DialogHelper.showDialog(context, "下载提示", "网络异常，请检查手机网络状态", "知道了", "WiFi自动下载", listener::onConfirm, cancelListener::onCancel, false, "", "");
     }
 
-    public static void showDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener, String gameId, String gameName) {
+    public static void showDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener) {
         context = checkDialogContext(context);
 
-        NewFlatLogUtils.logDownloadMobileDataDialogShow(gameId, gameName);
-
         final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
 
         View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_download_traffic, null);
@@ -181,7 +175,6 @@ public class DialogUtils {
 
         Context finalContext = context;
         allowOnce.setOnClickListener(v -> {
-            NewFlatLogUtils.logDownloadMobileDataDialogClick(gameId, gameName, "允许一次");
             AppExecutor.getUiExecutor().executeWithDelay(() -> {
                 Utils.toast(finalContext, "已使用移动网络下载，请注意流量消耗");
             }, 500);
@@ -190,13 +183,11 @@ public class DialogUtils {
 //            MtaHelper.onEvent("移动网络下载", NetworkUtils.getMobileNetworkType(finalContext), "本次允许");
         });
         wifiAuto.setOnClickListener(v -> {
-            NewFlatLogUtils.logDownloadMobileDataDialogClick(gameId, gameName, "WiFi自动下载");
             cancelListener.onCancel();
             dialog.dismiss();
 //            MtaHelper.onEvent("移动网络下载", NetworkUtils.getMobileNetworkType(finalContext), "连上WiFi后自动下载");
         });
         allowAlways.setOnClickListener(v -> {
-            NewFlatLogUtils.logDownloadMobileDataDialogClick(gameId, gameName, "总是允许");
             SPUtils.setBoolean(getTrafficDownloadHintKey(), false);
             AppExecutor.getUiExecutor().executeWithDelay(() -> {
                 // 显示了弹窗以后，即便下面这个 toast 放在 listener.onConfirm 后调用也是显示 listener.onConfirm 里的 toast
@@ -208,8 +199,6 @@ public class DialogUtils {
 //            MtaHelper.onEvent("移动网络下载", NetworkUtils.getMobileNetworkType(finalContext), "总是允许");
         });
 
-        dialog.setOnCancelListener(downloadDialog -> NewFlatLogUtils.logDownloadMobileDataDialogClick(gameId, gameName, "关闭弹窗"));
-
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         dialog.setContentView(contentView);
         dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
@@ -732,65 +721,40 @@ public class DialogUtils {
     public static void showOverseaDownloadDialog(Context context, GameEntity gameEntity, @NonNull ConfirmListener listener) {
         context = checkDialogContext(context);
 
-        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
-
-        DialogAddressConfirmationBinding binding = DialogAddressConfirmationBinding.inflate(LayoutInflater.from(context), null, false);
-
-        View contentView = binding.getRoot();
-
-        binding.gameIcon.displayGameIcon(gameEntity);
-        binding.gameNameTv.setText(context.getString(R.string.dialog_oversea_hint, gameEntity.getName()));
-        binding.closeIv.setOnClickListener(v -> dialog.dismiss());
-
-        if ("show&download".equals(gameEntity.getOverseasAddressDialog().getStatus())) {
-            gameEntity.getApk().get(0).setUrl(gameEntity.getOverseasAddressDialog().getLink());
-        }
-        binding.urlTv.setText(gameEntity.getOverseasAddressDialog().getLink());
-        binding.downloadBtn.setText("下载（" + gameEntity.getApk().get(0).getSize() + "）");
-        binding.downloadBtn.setOnClickListener(v -> {
+        if (gameEntity.getOverseasAddressDialog() == null
+                || gameEntity.getApk().size() == 0
+                || !gameEntity.getOverseasAddressDialog().isEnable()) {
             listener.onConfirm();
-            dialog.dismiss();
-        });
+        } else {
+            final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
 
-        Window window = dialog.getWindow();
-        if (window != null) {
-            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+            DialogOverseaConfirmationBinding binding = DialogOverseaConfirmationBinding.inflate(LayoutInflater.from(context), null, false);
+
+            View contentView = binding.getRoot();
+
+            binding.gameIcon.displayGameIcon(gameEntity);
+            binding.gameNameTv.setText(context.getString(R.string.dialog_oversea_hint, gameEntity.getName()));
+            binding.closeIv.setOnClickListener(v -> dialog.dismiss());
+
+            if ("show&download".equals(gameEntity.getOverseasAddressDialog().getStatus())) {
+                gameEntity.getApk().get(0).setUrl(gameEntity.getOverseasAddressDialog().getLink());
+            }
+            binding.urlTv.setText(gameEntity.getOverseasAddressDialog().getLink());
+            binding.downloadBtn.setText("下载（" + gameEntity.getApk().get(0).getSize() + "）");
+            binding.downloadBtn.setOnClickListener(v -> {
+                listener.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();
         }
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(contentView);
-        dialog.show();
-    }
-
-    // 跳转第三方落地页下载弹窗
-    public static void showLandPageAddressDialog(Context context, GameEntity gameEntity, @NonNull ConfirmListener listener) {
-        context = checkDialogContext(context);
-
-        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
-
-        DialogAddressConfirmationBinding binding = DialogAddressConfirmationBinding.inflate(LayoutInflater.from(context), null, false);
-
-        View contentView = binding.getRoot();
-
-        binding.gameIcon.displayGameIcon(gameEntity);
-        binding.gameNameTv.setText(context.getString(R.string.dialog_land_page_address_hint, gameEntity.getName()));
-        binding.closeIv.setOnClickListener(v -> dialog.dismiss());
-
-        binding.urlTv.setText(gameEntity.getLandPageAddressDialog().getLink());
-        binding.downloadBtn.setText(context.getString(R.string.dialog_land_page_address_confirm));
-        binding.downloadBtn.setOnClickListener(v -> {
-            listener.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();
     }
 
     public static void showGameH5DownloadDialog(Context context, GameEntity gameEntity, RegionSetting.GameH5Download gameH5Download) {
@@ -798,7 +762,7 @@ public class DialogUtils {
 
         final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
 
-        DialogAddressConfirmationBinding binding = DialogAddressConfirmationBinding.inflate(LayoutInflater.from(context), null, false);
+        DialogOverseaConfirmationBinding binding = DialogOverseaConfirmationBinding.inflate(LayoutInflater.from(context), null, false);
 
         View contentView = binding.getRoot();
 
@@ -946,8 +910,6 @@ public class DialogUtils {
     public static void showRegulationTestDialog(Context context, @NonNull ConfirmListener confirmListener, @NonNull CancelListener cancelListener) {
         context = checkDialogContext(context);
 
-        SensorsBridge.trackEvent("EtiquetteTestDialogShow");
-
         final Dialog dialog = new TrackableDialog(
                 context,
                 R.style.GhAlertDialog,
@@ -973,7 +935,6 @@ public class DialogUtils {
             cancelListener.onCancel();
 
             MtaHelper.onEvent("礼仪考试", "礼仪考试弹窗", "跳过");
-            SensorsBridge.trackEvent("EtiquetteTestDialogClick", "button_name", "跳过");
             dialog.dismiss();
         });
 
@@ -982,7 +943,6 @@ public class DialogUtils {
             Util_System_Keyboard.hideSoftKeyboard((Activity) finalContext1);
 
             MtaHelper.onEvent("礼仪考试", "礼仪考试弹窗", "确定");
-            SensorsBridge.trackEvent("EtiquetteTestDialogClick", "button_name", "进入考试");
             confirmListener.onConfirm();
             dialog.dismiss();
         });
@@ -998,7 +958,33 @@ public class DialogUtils {
     }
 
     public static void showUnzipFailureDialog(Context context, DownloadEntity downloadEntity) {
-        XapkDialogHelper.INSTANCE.showUnzipFailureDialog(context, downloadEntity, false);
+        final Context activityContext = checkDialogContext(context);
+
+        final Dialog dialog = new Dialog(activityContext, R.style.GhAlertDialog);
+        Window window = dialog.getWindow();
+        if (window != null) {
+            window.setBackgroundDrawableResource(android.R.color.transparent);
+        }
+
+        View contentView = LayoutInflater.from(activityContext).inflate(R.layout.dialog_unzip_failure, null);
+
+        View cancelBtn = contentView.findViewById(R.id.cancel);
+        View confirmBtn = contentView.findViewById(R.id.confirm);
+
+
+        cancelBtn.setOnClickListener(v -> {
+            dialog.dismiss();
+        });
+
+        confirmBtn.setOnClickListener(v -> {
+            dialog.dismiss();
+            String hint = "《" + downloadEntity.getName() + "》游戏安装包解压失败，问题反馈：";
+            HelpAndFeedbackBridge.startSuggestionActivity(activityContext, SuggestType.normal, null, hint);
+        });
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(contentView);
+        dialog.show();
     }
 
     public static void showNoticeDialog(Context context, String title, String content, @NonNull ConfirmListener listener) {
@@ -1039,7 +1025,7 @@ public class DialogUtils {
         SimpleDraweeView badgeView = contentView.findViewById(R.id.dialog_badge);
         ImageView badgeLightBg = contentView.findViewById(R.id.dialog_badge_light_bg);
 
-        ImageUtils.display(badgeView, badge.getMIcon());
+        ImageUtils.display(badgeView, badge.getIcon());
         titleTv.setText(badge.getName());
 
         // 领取条件文本超过一行就不显示
@@ -1093,8 +1079,6 @@ public class DialogUtils {
 
         if ("self".equals(badge.getReceive().getType())) {
             receiveTv.setText(R.string.receive_badge);
-        } else if ("auto".equals(badge.getReceive().getType())) {
-            receiveTv.setText(R.string.view_badge);
         } else {
             receiveTv.setText(R.string.apply_badge);
         }
@@ -1318,13 +1302,11 @@ public class DialogUtils {
         return dialog;
     }
 
-    public static void showReserveOrVoteSuccess2WechatBindDialog(Context context, Boolean isReserve, ConfirmListener confirmListener, CancelListener cancelListener) {
+    public static void showReserveSuccess2WechatBindDialog(Context context, ConfirmListener confirmListener, CancelListener cancelListener) {
         context = checkDialogContext(context);
 
         final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
         DialogWechatReserveSuccessBinding binding = DialogWechatReserveSuccessBinding.inflate(LayoutInflater.from(context));
-        binding.titleIv.setImageResource(isReserve ? R.drawable.bg_reserve_success : R.drawable.bg_vote_success);
-        binding.contentTv.setText(isReserve ? "游戏上线时，您将在消息中心收到通知。为了避免错过通知，建议您开启微信公众号提醒": "版本上线时，您将在消息中心收到通知。为了避免错过通知，亦建议您开启微信公众号提醒");
         binding.closeBtn.setOnClickListener(v -> {
             cancelListener.onCancel();
             dialog.dismiss();
@@ -1345,13 +1327,13 @@ public class DialogUtils {
         }
     }
 
-    public static void showReserveOrVoteSuccessDialog(Context context, Boolean isReserve) {
+    public static void showReserveSuccessDialog(Context context) {
         context = checkDialogContext(context);
 
         final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
         DialogAlertDefaultBinding binding = DialogAlertDefaultBinding.inflate(LayoutInflater.from(context));
-        binding.titleTv.setText(isReserve ? "游戏预约成功" : "版本投票成功");
-        binding.contentTv.setText(isReserve ? "游戏上线时，您将在消息中心和微信公众号收到通知，不会错过任何预约的游戏" : "版本上线时，您将在消息中心和微信公众号收到通知，不会错过任何投票的版本");
+        binding.titleTv.setText("游戏预约成功");
+        binding.contentTv.setText("游戏上线时，您将在消息中心和微信公众号收到通知，不会错过任何预约的游戏");
         binding.confirmTv.setText("我知道了");
         binding.centerDivider.setVisibility(View.GONE);
         binding.cancelTv.setVisibility(View.GONE);

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

@@ -1,6 +1,5 @@
 package com.gh.common.util
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.ActivityNotFoundException
 import android.content.Context
@@ -10,7 +9,6 @@ import android.os.Build
 import android.os.Bundle
 import android.text.TextUtils
 import androidx.appcompat.app.AppCompatActivity
-import com.alibaba.android.arouter.launcher.ARouter
 import com.gh.common.constant.Config
 import com.gh.common.exposure.ExposureManager.log
 import com.gh.common.exposure.ExposureTraceUtils.appendTrace
@@ -32,30 +30,24 @@ 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.provider.IQGameProvider
 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.GameDetailServer
 import com.gh.gamecenter.feature.entity.GameEntity
-import com.gh.gamecenter.feature.entity.LibaoEntity
 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.feature.provider.IConcernInfoProvider
 import com.gh.gamecenter.forum.detail.ForumDetailActivity
 import com.gh.gamecenter.forum.home.CommunityHomeFragment
-import com.gh.gamecenter.forum.search.ForumOrUserSearchActivity
 import com.gh.gamecenter.fragment.MainWrapperFragment
 import com.gh.gamecenter.game.columncollection.detail.ColumnCollectionDetailActivity
 import com.gh.gamecenter.game.commoncollection.detail.CommonCollectionDetailActivity
 import com.gh.gamecenter.game.upload.GameSubmissionActivity
 import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailActivity
-import com.gh.gamecenter.gamecollection.hotlist.GameCollectionHotListActivity
 import com.gh.gamecenter.gamecollection.square.GameCollectionSquareActivity
 import com.gh.gamecenter.gamedetail.GameDetailFragment
 import com.gh.gamecenter.gamedetail.fuli.kaifu.ServersCalendarActivity
@@ -72,9 +64,6 @@ import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity
 import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity
 import com.gh.gamecenter.qa.subject.CommunitySubjectActivity
 import com.gh.gamecenter.qa.video.detail.ForumVideoDetailActivity
-import com.gh.gamecenter.qgame.QGameHomeWrapperActivity
-import com.gh.gamecenter.qgame.QGameSearchActivity
-import com.gh.gamecenter.qgame.QGameViewModel
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.servers.GameServerTestActivity
 import com.gh.gamecenter.servers.GameServersActivity
@@ -105,6 +94,53 @@ import kotlin.math.roundToInt
  */
 object DirectUtils {
 
+    /**
+     * 跳转到特定页面，根据 [type] 决定跳转页面，[path] 为跳转前的页面名称
+     */
+    @JvmStatic
+    fun directToSpecificPage(
+        context: Context,
+        type: String,
+        link: String,
+        text: String? = "",
+        entrance: String? = null,
+        path: String? = null
+    ) {
+        when (type) {
+            HOST_ARTICLE -> directToArticle(context, id = link, entrance = entrance)
+
+            HOST_GAME -> directToGameDetail(context, id = link, entrance = entrance)
+
+            HOST_GAME_DOWNLOAD -> directToGameDetail(context, id = link, entrance = entrance, autoDownload = true)
+
+            HOST_COLUMN -> directToSubject(context, id = link, subjectName = text, entrance = entrance)
+
+            HOST_QUESTION -> directToQuestionDetail(context, id = link, entrance = entrance, path = path)
+
+            HOST_ANSWER -> directToAnswerDetail(context, id = link, entrance = entrance, path = path)
+
+            HOST_WEB -> directToWebView(context, url = link, entrance = entrance)
+
+            HOST_DOWNLOAD -> directToDownloadManagerAndStartDownload(
+                context,
+                gameId = link,
+                packageName = text,
+                entrance = entrance
+            )
+
+            HOST_UPDATE -> directToDownloadManagerAndStartUpdate(
+                context,
+                gameId = link,
+                packageName = text,
+                entrance = entrance
+            )
+
+            HOST_LIBAO -> directToGiftDetail(context, giftId = link, entrance = entrance)
+
+            HOST_COMMUNITY -> directToCommunity(context, CommunityEntity(link, text!!))
+        }
+    }
+
     @JvmStatic
     fun directToLinkPage(context: Context, linkEntity: LinkEntity, entrance: String, path: String) {
         directToLinkPage(context, linkEntity, entrance, path, null)
@@ -150,9 +186,7 @@ object DirectUtils {
         "game_list",
         "game_list_detail",
         "bbs_video",
-        "explore_column",
-        "game_explore",
-        "column_test_v2"
+        "explore_column"
     )
 
     fun directToLinkPage(
@@ -180,9 +214,8 @@ object DirectUtils {
                     )
                 } else {
                     directToGameDetail(
-                        context,
-                        linkEntity.link ?: "",
-                        entrance = BaseActivity.mergeEntranceAndPath(entrance, path)
+                        context, linkEntity.link
+                            ?: "", BaseActivity.mergeEntranceAndPath(entrance, path)
                     )
                 }
             }
@@ -220,7 +253,7 @@ object DirectUtils {
                 path
             )
 
-            HOST_WEB, HOST_WEB_INURL, HOST_WEB_AL -> {
+            "web", "inurl", "web链接" -> {
                 when {
                     linkEntity.link!!.contains("v.douyin") && PackageHelper.localPackageNameSet.contains("com.ss.android.ugc.aweme") -> {
                         directDouyin(context, "1402577827140941")
@@ -273,14 +306,13 @@ object DirectUtils {
                         name = linkEntity.name,
                         display = linkEntity.display ?: Display()
                     ),
-                    entrance,
-                    exposureEvent
+                    entrance
                 )
             }
 
-            "column_collection", "专题合集" -> directToColumnCollection(context, linkEntity.link!!, -1, entrance, "", exposureEvent)
+            "column_collection", "专题合集" -> directToColumnCollection(context, linkEntity.link!!, -1, entrance)
 
-            "server", "game_server", "开服表" -> directToGameServers(context, entrance, path, exposureEvent)
+            "server", "game_server", "开服表" -> directToGameServers(context, entrance, path)
 
             "top_game_comment" -> directToAmway(context, null, entrance, path)
 
@@ -300,7 +332,7 @@ object DirectUtils {
 
             "feedback" -> directToFeedback(context, linkEntity.name, linkEntity.text, false, "", entrance)
 
-            "qa", "qa_content", "Q&A" -> directToQa(context, linkEntity.text ?: "", linkEntity.link ?: "")
+            "qa", "Q&A" -> directToQa(context, linkEntity.text ?: "", linkEntity.link ?: "")
 
             "qa_collection", "Q&A合集" -> directToQaCollection(
                 context, linkEntity.text
@@ -316,13 +348,6 @@ object DirectUtils {
 
             "bbs_detail" -> directForumDetail(context, linkEntity.link ?: "", entrance)
 
-            "bbs_section" -> directForumDetailSection(
-                context,
-                linkEntity.community?.id,
-                linkEntity.link ?: "",
-                entrance
-            )
-
             "mobile_bind" -> {
                 CheckLoginUtils.checkLogin(context, entrance) {
                     context.startActivity(SettingBridge.getBindPhoneNormalIntent(context, false))
@@ -372,7 +397,7 @@ object DirectUtils {
             "column_test" -> context.startActivity(
                 GameServerTestActivity.getIntent(
                     context, linkEntity.link
-                        ?: "", linkEntity.text ?: "", entrance, exposureEvent
+                        ?: "", linkEntity.text ?: "", entrance
                 )
             )
 
@@ -400,32 +425,13 @@ object DirectUtils {
 
             //"h5_game_center" -> directLetoGameCenter(context)
 
-            "game_list" -> directToGameCollectionSquare(context, entrance, traceEvent = exposureEvent)
+            "game_list" -> directToGameCollectionSquare(context, entrance, "", "", "")
 
-            "game_list_detail" -> directToGameCollectionDetail(
-                context,
-                linkEntity.link ?: "",
-                entrance,
-                traceEvent = exposureEvent
-            )
+            "game_list_detail" -> directToGameCollectionDetail(context, linkEntity.link ?: "", entrance)
 
-            "explore_column", "game_explore" -> context.startActivity(
-                DiscoveryActivity.getIntent(
-                    context,
-                    entrance,
-                    exposureEvent
-                )
-            )
+            "explore_column" -> context.startActivity(DiscoveryActivity.getIntent(context, entrance))
 
-            "column_test_v2" -> context.startActivity(
-                GameServerTestV2Activity.getIntent(
-                    context,
-                    entrance,
-                    exposureEvent
-                )
-            )
-
-            "qq_mini_game_column" -> directToQGameHome(context)
+            "column_test_v2" -> context.startActivity(GameServerTestV2Activity.getIntent(context, entrance))
 
             "" -> {
                 // do nothing
@@ -477,8 +483,7 @@ object DirectUtils {
         id: String,
         position: Int = -1,
         entrance: String,
-        columnName: String = "",
-        exposureEvent: ExposureEvent? = null
+        columnName: String = ""
     ) {
         if (id.isEmpty()) return
         val bundle = Bundle()
@@ -487,9 +492,6 @@ object DirectUtils {
         bundle.putString(KEY_COLLECTION_ID, id)
         bundle.putString(KEY_COLUMNNAME, columnName)
         bundle.putInt(KEY_POSITION, position)
-        if (exposureEvent != null) {
-            bundle.putParcelableArrayList(EntranceConsts.KEY_EXPOSURE_SOURCE_LIST ,ArrayList(exposureEvent.source))
-        }
         jumpActivity(context, bundle)
     }
 
@@ -542,9 +544,6 @@ object DirectUtils {
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_TO, NewsDetailActivity::class.java.simpleName)
         bundle.putString(KEY_NEWSID, id)
-        if (entrance?.contains("隐私政策") == true) {
-            bundle.putBoolean(KEY_HIDE_USELESS_INFO, true)
-        }
         jumpActivity(context, bundle)
     }
 
@@ -647,10 +646,10 @@ object DirectUtils {
         bundle.putString(KEY_GAMEID, id)
         if (!TextUtils.isEmpty(tab)) {
             when (tab) {
-                "comment" -> bundle.putString(KEY_TARGET, GameDetailFragment.TAB_RATING)
-                "desc" -> bundle.putString(KEY_TARGET, GameDetailFragment.TAB_DESC)
-                "forum" -> bundle.putString(KEY_TARGET, GameDetailFragment.TAB_BBS)
-                "zone" -> bundle.putString(KEY_TARGET, GameDetailFragment.TAB_TRENDS)
+                "comment" -> bundle.putInt(KEY_TARGET, GameDetailFragment.INDEX_RATING)
+                "desc" -> bundle.putInt(KEY_TARGET, GameDetailFragment.INDEX_DESC)
+                "forum" -> bundle.putInt(KEY_TARGET, GameDetailFragment.INDEX_BBS)
+                "zone" -> bundle.putInt(KEY_TARGET, GameDetailFragment.INDEX_TRENDES)
             }
         }
         if (traceEvent != null) {
@@ -690,7 +689,7 @@ object DirectUtils {
         bundle.putString(KEY_ENTRANCE, entrance)
         bundle.putString(KEY_GAMEID, id)
         bundle.putBoolean(KEY_OPEN_VIDEO_STREAMING, true)
-        bundle.putString(KEY_TARGET, GameDetailFragment.TAB_DESC)
+        bundle.putInt(KEY_TARGET, GameDetailFragment.INDEX_DESC)
         jumpActivity(context, bundle)
     }
 
@@ -698,14 +697,14 @@ object DirectUtils {
     fun directToGameDetail(
         context: Context,
         id: String,
-        defaultTab: String = GameDetailFragment.TAB_DESC,
+        defaultTab: Int = GameDetailFragment.INDEX_DESC,
         entrance: String? = null
     ) {
         val bundle = Bundle()
         bundle.putString(KEY_TO, GameDetailActivity::class.java.name)
         bundle.putString(KEY_ENTRANCE, entrance)
         bundle.putString(KEY_GAMEID, id)
-        bundle.putString(KEY_TARGET, defaultTab)
+        bundle.putInt(KEY_TARGET, defaultTab)
         jumpActivity(context, bundle)
     }
 
@@ -716,12 +715,11 @@ object DirectUtils {
         id: String,
         subjectName: String? = "",
         entrance: String? = null,
-        exposureEvent: ExposureEvent? = null,
-        isQQMiniGame: Boolean = false,
+        exposureEvent: ExposureEvent? = null
     ) {
         if (id.isEmpty()) return
         val bundle = Bundle()
-        val subjectData = SubjectData(subjectId = id, subjectName = subjectName, isOrder = false, isQQMiniGame = isQQMiniGame)
+        val subjectData = SubjectData(subjectId = id, subjectName = subjectName, isOrder = false)
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_TO, SubjectActivity::class.java.name)
         bundle.putParcelable(EntranceConsts.KEY_SUBJECT_DATA, subjectData)
@@ -769,11 +767,8 @@ object DirectUtils {
         jumpActivity(context, bundle)
     }
 
-    /**
-     * 畅玩助手反馈跳转
-     */
     @JvmStatic
-    fun directToVGameFeedback(
+    fun directToFeedbackCompat(
         context: Context,
         content: String? = null,
         hintType: String? = null,
@@ -788,14 +783,14 @@ object DirectUtils {
         if (isQaFeedback) {
             bundle.putBoolean(KEY_IS_QA_FEEDBACK, true)
             bundle.putString(KEY_QA_CONTENT_ID, qaContentId)
-            bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.cwzsQuestion)
+            bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.normal)
         } else {
             bundle.putString(KEY_CONTENT, content)
             if (TextUtils.isEmpty(hintType)) {
                 bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.gameQuestion)
                 bundle.putString(KEY_SUGGEST_HINT_TYPE, KEY_PLUGIN)
             } else {
-                bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.cwzsQuestion)
+                bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.normal)
                 bundle.putString(KEY_SUGGEST_HINT_TYPE, hintType)
             }
         }
@@ -1343,17 +1338,11 @@ object DirectUtils {
      * 跳转到板块
      */
     @JvmStatic
-    fun directToBlock(
-        context: Context,
-        blockData: SubjectRecommendEntity,
-        entrance: String,
-        exposureEvent: ExposureEvent? = null
-    ) {
+    fun directToBlock(context: Context, blockData: SubjectRecommendEntity, entrance: String) {
         val bundle = Bundle()
         bundle.putString(KEY_TO, BlockActivity::class.java.name)
         bundle.putParcelable(KEY_BLOCK_DATA, blockData)
         bundle.putString(KEY_ENTRANCE, entrance)
-        exposureEvent?.let { bundle.putParcelableArrayList(KEY_EXPOSURE_SOURCE_LIST, ArrayList(exposureEvent.source)) }
         jumpActivity(context, bundle)
     }
 
@@ -1361,11 +1350,10 @@ object DirectUtils {
      * 跳转到开服表
      */
     @JvmStatic
-    fun directToGameServers(context: Context, entrance: String, path: String, exposureEvent: ExposureEvent? = null) {
+    fun directToGameServers(context: Context, entrance: String, path: String) {
         val bundle = Bundle()
         bundle.putString(KEY_TO, GameServersActivity::class.java.name)
         bundle.putString(KEY_ENTRANCE, ToolBarActivity.mergeEntranceAndPath(entrance, path))
-        exposureEvent?.let { bundle.putParcelableArrayList(KEY_EXPOSURE_SOURCE_LIST, ArrayList(exposureEvent.source)) }
         jumpActivity(context, bundle)
     }
 
@@ -1393,7 +1381,7 @@ object DirectUtils {
                     response?.apply {
                         if (zone.status == "on") {
                             if (zone.style == "link") {
-                                directToGameDetail(context, gameId, GameDetailFragment.TAB_TRENDS, entrance)
+                                directToGameDetail(context, gameId, GameDetailFragment.INDEX_TRENDES, entrance)
                             } else {
                                 directToWebView(context, url, entrance)
                             }
@@ -1426,21 +1414,6 @@ object DirectUtils {
         jumpActivity(context, bundle)
     }
 
-    @JvmStatic
-    fun directForumDetailSection(
-        context: Context,
-        bbsId: String? = "",
-        sectionId: String = "",
-        entrance: String? = null
-    ) {
-        val bundle = Bundle()
-        bundle.putString(KEY_TO, ForumDetailActivity::class.java.name)
-        bundle.putString(KEY_BBS_ID, bbsId)
-        bundle.putString(KEY_BBS_SECTION_ID, sectionId)
-        bundle.putString(KEY_ENTRANCE, entrance)
-        jumpActivity(context, bundle)
-    }
-
     /**
      * 到首页-首页 tab
      */
@@ -1815,8 +1788,7 @@ object DirectUtils {
         collectionId: String,
         blockId: String = "",
         blockName: String = "",
-        entrance: String = "",
-        exposureEvent: ExposureEvent? = null
+        entrance: String = ""
     ) {
         if (collectionId.isEmpty()) return
         val bundle = Bundle()
@@ -1825,7 +1797,6 @@ object DirectUtils {
         bundle.putString(KEY_BLOCK_NAME, blockName)
         bundle.putString(KEY_ENTRANCE, entrance)
         bundle.putString(KEY_COLLECTION_ID, collectionId)
-        exposureEvent?.let { bundle.putParcelableArrayList(KEY_EXPOSURE_SOURCE_LIST, ArrayList(exposureEvent.source)) }
         jumpActivity(context, bundle)
     }
 
@@ -1833,11 +1804,8 @@ object DirectUtils {
      * 跳转到游戏动态，请不要随意修改方法名
      */
     @JvmStatic
-    fun directToConcernInfo(context: Context, entrance: String) {
-        context.startActivity(
-            (ARouter.getInstance().build(RouteConsts.provider.concernInfo)
-                .navigation() as? IConcernInfoProvider)?.getIntent(context, entrance)
-        )
+    fun directToConcernInfo(context: Context) {
+        context.startActivity(ConcernInfoActivity.getIntent(context));
     }
 
     /**
@@ -1849,36 +1817,14 @@ object DirectUtils {
         entrance: String = "",
         forumName: String = "",
         gameCollectionTitle: String = "",
-        gameCollectionId: String = "",
-        collectionName: String = "",
-        collectionId: String = "",
-        traceEvent: ExposureEvent? = null
+        gameCollectionId: String = ""
     ) {
         val bundle = Bundle()
-        val exposureSourceList = traceEvent?.source
         bundle.putString(KEY_TO, GameCollectionSquareActivity::class.java.name)
         bundle.putString(KEY_ENTRANCE, entrance)
         bundle.putString(KEY_FORUM_NAME, forumName)
         bundle.putString(KEY_GAME_COLLECTION_TITLE, gameCollectionTitle)
         bundle.putString(KEY_GAME_COLLECTION_ID, gameCollectionId)
-        bundle.putString(KEY_COLLECTION_ID, collectionId)
-        bundle.putString(KEY_COLLECTION_NAME, collectionName)
-        if (exposureSourceList is ArrayList) {
-            bundle.putParcelableArrayList(KEY_EXPOSURE_SOURCE_LIST, exposureSourceList)
-        } else if (exposureSourceList != null) {
-            bundle.putParcelableArrayList(KEY_EXPOSURE_SOURCE_LIST, ArrayList(exposureSourceList))
-        }
-        jumpActivity(context, bundle)
-    }
-
-    /**
-     * 跳转至游戏单热榜
-     */
-    @JvmStatic
-    fun directToGameCollectionHotList(context: Context, entrance: String = "") {
-        val bundle = Bundle()
-        bundle.putString(KEY_TO, GameCollectionHotListActivity::class.java.name)
-        bundle.putString(KEY_ENTRANCE, entrance)
         jumpActivity(context, bundle)
     }
 
@@ -1886,25 +1832,13 @@ object DirectUtils {
      * 跳转至游戏单详情
      */
     @JvmStatic
-    fun directToGameCollectionDetail(
-        context: Context,
-        id: String,
-        entrance: String? = null,
-        path: String? = null,
-        traceEvent: ExposureEvent? = null,
-    ) {
+    fun directToGameCollectionDetail(context: Context, id: String, entrance: String? = null, path: String? = null) {
         if (id.isEmpty()) return
         val bundle = Bundle()
-        val exposureSourceList = traceEvent?.source
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_PATH, path)
         bundle.putString(KEY_TO, GameCollectionDetailActivity::class.java.name)
         bundle.putString(KEY_GAME_COLLECTION_ID, id)
-        if (exposureSourceList is ArrayList) {
-            bundle.putParcelableArrayList(KEY_EXPOSURE_SOURCE_LIST, exposureSourceList)
-        } else if (exposureSourceList != null) {
-            bundle.putParcelableArrayList(KEY_EXPOSURE_SOURCE_LIST, ArrayList(exposureSourceList))
-        }
         jumpActivity(context, bundle)
     }
 
@@ -1946,15 +1880,6 @@ object DirectUtils {
         }
     }
 
-    /**
-     * 跳转到论坛搜索页
-     * @param bbsId, 为空时搜索全范围的内容，不为空时搜索该 bbsId 对应的内容
-     */
-    @JvmStatic
-    fun directToForumOrUserSearch(context: Context, bbsId: String, entrance: String) {
-        context.startActivity(ForumOrUserSearchActivity.getIntent(context, bbsId, entrance))
-    }
-
     @JvmStatic
     fun directToVGameDownload(context: Context, switchToDownloadingTab: Boolean = false) {
         val bundle = Bundle()
@@ -2029,66 +1954,4 @@ object DirectUtils {
             platform = platform
         )
     }
-
-    @JvmStatic
-    fun directToQGameHome(context: Context) {
-        context.startActivity(QGameHomeWrapperActivity.getIntent(context))
-    }
-
-    @JvmStatic
-    fun directToQGameSearch(
-        context: Context,
-        hint: String,
-        sourceEntrance: String
-    ) {
-        context.startActivity(QGameSearchActivity.getIntent(context, hint, sourceEntrance))
-    }
-
-    @SuppressLint("CheckResult")
-    @JvmStatic
-    fun directToQGameById(
-        activity: Activity,
-        qqGameId: String
-    ) {
-
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            ToastUtils.toast("该游戏仅支持安卓5.0及以上设备")
-            return
-        }
-
-        CheckLoginUtils.checkLogin(
-            activity, null, true, "QQ小游戏-秒开"
-        ) {
-            val userToken = UserManager.getInstance().token
-            val userId = UserManager.getInstance().userId
-            val userName = UserManager.getInstance().userInfoEntity?.name ?: "unknown"
-
-            val qGameProvider = ARouter
-                .getInstance()
-                .build(RouteConsts.provider.qGame)
-                .navigation() as IQGameProvider<*>
-            qGameProvider.setLoginInfo(activity, userId, userName, userToken)
-            qGameProvider.launchGame(activity, qqGameId) { _, _ ->
-                RetrofitManager
-                    .getInstance()
-                    .newApi
-                    .postQGamePlay(qqGameId, userId)
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(
-                        {
-                            QGameViewModel.notifyQGameSubjectUpdate() // 通知QQ小游戏首页列表刷新
-                        },
-                        {}
-                    ) // 秒玩记录上报
-            }
-        }
-    }
-
-    @JvmStatic
-    fun directToMessageCenter(defaultTabIndex: Int) {
-        ARouter.getInstance().build(RouteConsts.activity.messageWrapperActivity)
-            .withInt(BaseActivity_TabLayout.PAGE_INDEX, defaultTabIndex)
-            .navigation()
-    }
 }

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

@@ -29,7 +29,7 @@ object DownloadDialogHelper {
 
     private fun retrieveAvailableDialog(gameEntity: GameEntity, apkEntity: ApkEntity): GameEntity.Dialog? {
         val downloadDialog = if (gameEntity.shouldUseMirrorInfo()) {
-            gameEntity.obtainMirrorData()?.downloadDialog
+            gameEntity.mirrorData?.downloadDialog
         } else {
             gameEntity.downloadDialog
         }

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

@@ -1,6 +1,5 @@
 package com.gh.common.util
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Message
 import android.text.TextUtils
@@ -8,44 +7,36 @@ import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.collection.ArrayMap
 import androidx.recyclerview.widget.RecyclerView
-import com.alibaba.android.arouter.launcher.ARouter
 import com.gh.common.chain.*
 import com.gh.common.constant.Config
 import com.gh.common.dialog.DeviceRemindDialog
+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.gamecenter.feature.view.DownloadButton
 import com.gh.common.xapk.XapkInstaller
 import com.gh.common.xapk.XapkInstaller.cancelUnzipTask
-import com.gh.common.xapk.XapkInstaller.isInstalling
 import com.gh.common.xapk.XapkUnzipStatus
 import com.gh.download.DownloadManager
 import com.gh.download.dialog.DownloadDialog
-import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.R
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.adapter.viewholder.GameViewHolder
-import com.gh.gamecenter.common.base.GlobalActivityManager
 import com.gh.gamecenter.common.callback.CancelListener
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.common.entity.LinkEntity
 import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.AppExecutor
-import com.gh.gamecenter.core.provider.IQGameProvider
 import com.gh.gamecenter.core.utils.*
+import com.gh.gamecenter.energy.EnergyBridge
 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.view.DownloadButton
 import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment
-import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.manager.PackagesManager
-import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.teenagermode.TeenagerModeActivity
 import com.gh.vspace.VHelper
 import com.lightgame.download.DownloadConfig
@@ -172,8 +163,6 @@ object DownloadItemUtils {
         briefStyle: String? = null,
         isShowRecommendStar: Boolean = false
     ) {
-        holder.gameDownloadBtn.putObject(gameEntity)
-
         // 显示预约
         if (gameEntity.isReservable) {
             holder.multiVersionDownloadTv?.visibility = View.GONE
@@ -244,24 +233,6 @@ object DownloadItemUtils {
             }
             return
         }
-        if (gameEntity.isQQMiniGame()) {
-            val isQQMiniGameOffShelve = gameEntity.qqMiniGameAppStatus == 1 // QQ小游戏是否下架
-            if (isQQMiniGameOffShelve) {
-                downloadBtn.apply {
-                    isClickable = false
-                    text = context.getString(R.string.off_shelve)
-                    buttonStyle = DownloadButton.ButtonStyle.NONE
-                }
-            } else {
-                downloadBtn.apply {
-                    isClickable = true
-                    setBackgroundResource(R.drawable.download_button_normal_style)
-                    setTextColor(R.color.white.toColor(context))
-                    text = context.getString(R.string.quick_play)
-                }
-            }
-            return
-        }
         if (gameEntity.getApk().isEmpty() || gameEntity.downloadOffStatus != null) {
             val h5LinkEntity = gameEntity.h5Link
             val offStatus = gameEntity.downloadOffStatus
@@ -273,11 +244,9 @@ object DownloadItemUtils {
                         context.getString(R.string.check)
                     }
                     isClickable = true
-                    buttonStyle = DownloadButton.ButtonStyle.NORMAL
                 } else {
                     if ("dialog" == offStatus) {
                         text = context.getString(R.string.check)
-                        buttonStyle = DownloadButton.ButtonStyle.NORMAL
                     } else if ("updating" == offStatus) {
                         text = context.getString(R.string.updating)
                         buttonStyle = DownloadButton.ButtonStyle.UPDATING
@@ -292,12 +261,18 @@ object DownloadItemUtils {
                 }
             }
         } else if (gameEntity.getApk().size == 1) {
-            // 优先从下载管理获取 downloadEntity
             var downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
 
-            // 找不到时，若类型为畅玩，尝试从畅玩数据库的快照中获取 downloadEntity。若存在，代表游戏已下载并成功安装
             if (downloadEntity == null && gameEntity.isVGame()) {
-                downloadEntity = VHelper.getVDownloadEntitySnapshot(gameEntity.id, gameEntity.getUniquePackageName())
+                downloadEntity = VHelper.getDownloadEntitySnapshot(gameEntity.id, gameEntity.getUniquePackageName())
+            }
+
+            if (downloadEntity == null) {
+                val entryMap: ArrayMap<String, DownloadEntity> = gameEntity.getEntryMap()
+                val apkEntity = gameEntity.getApk()[0]
+                if (entryMap.isNotEmpty()) {
+                    downloadEntity = entryMap[apkEntity.getPlatform()]
+                }
             }
 
             if (downloadEntity != null) {
@@ -320,25 +295,6 @@ object DownloadItemUtils {
                                         DownloadButton.ButtonStyle.LAUNCH_OR_OPEN
                                     }
                             } else {
-                                val xapkStatus = downloadEntity.meta[XapkInstaller.XAPK_UNZIP_STATUS]
-                                if (XapkUnzipStatus.SUCCESS.name == xapkStatus && isInstalling(downloadEntity.path)) {
-                                    progress = 100
-                                    setText(R.string.installing)
-                                    buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
-                                    return
-                                }
-                                if (XapkUnzipStatus.UNZIPPING.name == xapkStatus) {
-                                    val percent = downloadEntity.meta[XapkInstaller.XAPK_UNZIP_PERCENT]
-                                    progress = (java.lang.Float.valueOf(percent) * 10).toInt()
-                                    text = "$percent%"
-                                    buttonStyle = DownloadButton.ButtonStyle.XAPK_UNZIPPING
-                                    return
-                                } else if (XapkUnzipStatus.FAILURE.name == xapkStatus) {
-                                    setText(R.string.install)
-                                    buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
-                                    return
-                                }
-
                                 buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
                                 setText(R.string.install)
                             }
@@ -349,22 +305,17 @@ object DownloadItemUtils {
                                     DownloadButton.ButtonStyle.NORMAL
                                 }
                         }
-
                         DownloadStatus.pause,
                         DownloadStatus.timeout,
                         DownloadStatus.neterror,
                         DownloadStatus.subscribe,
-                        DownloadStatus.diskisfull,
-                        DownloadStatus.diskioerror,
                         DownloadStatus.overflow -> {
                             buttonStyle = DownloadButton.ButtonStyle.NORMAL
                             setText(R.string.resume)
                         }
-
                         DownloadStatus.cancel -> {
                             GameUtils.setDownloadBtnStatus(context, gameEntity, downloadBtn, pluginLocation)
                         }
-
                         else -> {
                             // do nothing
                         }
@@ -386,7 +337,15 @@ object DownloadItemUtils {
         briefStyle: String?,
         isShowRecommendStar: Boolean = false
     ) {
-        val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
+        val entryMap: ArrayMap<String, DownloadEntity> = gameEntity.getEntryMap()
+        val apkEntity = gameEntity.getApk()[0]
+        var downloadEntity: DownloadEntity? = null
+        if (entryMap.isNotEmpty()) {
+            downloadEntity = entryMap[apkEntity.getPlatform()]
+        }
+        if (downloadEntity == null) {
+            downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
+        }
         if (downloadEntity != null) {
             if (downloadEntity.isSimulatorGame()) {
                 if (downloadEntity.status != DownloadStatus.done) {
@@ -433,7 +392,7 @@ object DownloadItemUtils {
     }
 
     // 更改进度条和提示文本的状态
-    private fun changeStatus(
+    fun changeStatus(
         context: Context,
         holder: GameViewHolder,
         downloadEntity: DownloadEntity,
@@ -458,7 +417,6 @@ object DownloadItemUtils {
                     holder.gameDownloadBtn.text = downloadEntity.percent.toString() + "%"
                 }
             }
-
             DownloadStatus.waiting -> {
                 if (isMultiVersion) {
                     holder.gameDownloadTips?.visibility = View.VISIBLE
@@ -467,12 +425,9 @@ object DownloadItemUtils {
                 holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.WAITING
                 holder.gameDownloadBtn.text = context.getString(R.string.waiting)
             }
-
             DownloadStatus.pause,
             DownloadStatus.timeout,
             DownloadStatus.neterror,
-            DownloadStatus.diskioerror,
-            DownloadStatus.diskisfull,
             DownloadStatus.subscribe,
             DownloadStatus.overflow -> {
                 if (isMultiVersion) {
@@ -482,7 +437,6 @@ object DownloadItemUtils {
                 holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.NORMAL
                 holder.gameDownloadBtn.text = context.getString(R.string.resume)
             }
-
             DownloadStatus.done -> {
                 if (isMultiVersion) {
                     holder.gameDownloadTips?.visibility = View.VISIBLE
@@ -502,7 +456,6 @@ object DownloadItemUtils {
                 holder.gameDownloadBtn.progress = 1000
                 holder.gameDownloadBtn.setText(R.string.hundred_percent)
             }
-
             else -> {
                 holder.gameDownloadTips?.visibility = View.GONE
             }
@@ -633,9 +586,6 @@ object DownloadItemUtils {
         refreshCallback: EmptyCallback?,
         allStateClickCallback: EmptyCallback?
     ) {
-        // 为 downloadButton 添加游戏实体，供点击的时候上报用
-        downloadBtn.putObject(gameEntity)
-
         val gamePermissionDialogFragment = (context as AppCompatActivity).supportFragmentManager.findFragmentByTag(
             GamePermissionDialogFragment::class.java.name
         ) as GamePermissionDialogFragment?
@@ -688,25 +638,16 @@ object DownloadItemUtils {
         if (gameEntity.isReservable) {
             if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.id)) {
                 downloadBtn.setOnClickListener {
-                    SensorsBridge.trackEvent(
-                        "AppointmentGame",
-                        "game_name",
-                        gameEntity.name ?: "",
-                        "game_id",
-                        gameEntity.id
-                    )
                     allStateClickCallback?.onCallback()
                     CheckLoginUtils.checkLogin(context, entrance) {
                         clickCallback?.onCallback()
-                        ReservationHelper.reserve(
-                            context,
-                            gameEntity.id,
-                            gameEntity.name ?: ""
-                        ) {
-                            LogUtils.logReservation(gameEntity, traceEvent)
-                            adapter?.notifyItemChanged(position)
-                            refreshCallback?.onCallback()
-                        }
+                        ReservationHelper.reserve(context, gameEntity.id, object : EmptyCallback {
+                            override fun onCallback() {
+                                LogUtils.logReservation(gameEntity, traceEvent)
+                                adapter?.notifyItemChanged(position)
+                                refreshCallback?.onCallback()
+                            }
+                        })
                     }
                 }
             } else {
@@ -752,18 +693,10 @@ object DownloadItemUtils {
             }
             return
         }
-        if (gameEntity.isQQMiniGame()) {
-            downloadBtn.setOnClickListener {
-                NewFlatLogUtils.logQGameClick(gameEntity.qqMiniGameAppId, gameEntity.name)
-                GlobalActivityManager.currentActivity?.let { activity ->
-                    DirectUtils.directToQGameById(activity, gameEntity.qqMiniGameAppId)
-                }
-            }
-            return
-        }
         if (gameEntity.getApk().size == 0 && gameEntity.h5Link != null) {
             downloadBtn.setOnClickListener {
                 allStateClickCallback?.onCallback()
+                MtaHelper.onEvent("H5页面", "入口", "列表页_" + gameEntity.name)
                 val linkEntity = gameEntity.h5Link
                 val isPlay = "play" == linkEntity!!.type // 是否为开始玩
                 if (isPlay) {
@@ -840,7 +773,6 @@ object DownloadItemUtils {
         val apk = gameEntity.getApk().safelyGetInRelease(0) ?: return
         if (str == context.getString(R.string.download)) {
             ChainBuilder().apply {
-                addHandler(UnsupportedFeatureHandler())
                 addHandler(UpdateNewSimulatorHandler())
                 addHandler(GamePermissionHandler())
                 addHandler(BrowserInstallHandler())
@@ -848,7 +780,6 @@ object DownloadItemUtils {
                 addHandler(DownloadDialogHelperHandler())
                 addHandler(CertificationHandler())
                 addHandler(OverseaDownloadHandler())
-                addHandler(LandPageAddressHandler())
                 addHandler(CheckDownloadHandler())
             }
                 .setProcessEndCallback {
@@ -859,7 +790,6 @@ object DownloadItemUtils {
             DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
         } else if (str == context.getString(R.string.attempt)) {
             ChainBuilder().apply {
-                addHandler(UnsupportedFeatureHandler())
                 addHandler(UpdateNewSimulatorHandler())
                 addHandler(GamePermissionHandler())
                 addHandler(BrowserInstallHandler())
@@ -867,7 +797,6 @@ object DownloadItemUtils {
                 addHandler(DownloadDialogHelperHandler())
                 addHandler(CertificationHandler())
                 addHandler(VersionNumberHandler())
-                addHandler(LandPageAddressHandler())
                 addHandler(OverseaDownloadHandler())
                 addHandler(CheckDownloadHandler())
             }
@@ -879,15 +808,12 @@ object DownloadItemUtils {
             DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
         } else if (str == context.getString(R.string.smooth)) {
             ChainBuilder().apply {
-                addHandler(UnsupportedFeatureHandler())
                 addHandler(GamePermissionHandler())
                 addHandler(PackageCheckHandler())
                 addHandler(DownloadDialogHelperHandler())
                 addHandler(CertificationHandler())
                 addHandler(VersionNumberHandler())
-                addHandler(LandPageAddressHandler())
                 addHandler(OverseaDownloadHandler())
-                addHandler(CheckStoragePermissionHandler())
                 addHandler(ValidateVSpaceHandler())
                 addHandler(CheckDownloadHandler())
             }
@@ -897,6 +823,9 @@ object DownloadItemUtils {
                 .buildHandlerChain()
                 ?.handleRequest(context, gameEntity)
         } else if (str.contains("化")) {
+            if (entrance.contains("我的游戏")) {
+                MtaHelper.onEvent("我的游戏_启动", "插件化", gameEntity.name)
+            }
             if (gameEntity.pluggableCollection != null) {
                 DownloadDialog.showDownloadDialog(context, gameEntity, traceEvent, entrance, location)
             } else {
@@ -933,11 +862,12 @@ object DownloadItemUtils {
             }
 
             if (gameEntity.isVGame()) {
-                VHelper.installOrLaunch((context as AppCompatActivity), gameEntity)
+                VHelper.installOrLaunch((context as AppCompatActivity), gameEntity.getUniquePackageName() ?: "")
             } else {
                 install(context, gameEntity, position, adapter, refreshCallback)
             }
         } 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)) {
@@ -958,51 +888,40 @@ object DownloadItemUtils {
             }
 
             if (gameEntity.isVGame()) {
-                VHelper.installOrLaunch((context as AppCompatActivity), gameEntity)
+                VHelper.installOrLaunch((context as AppCompatActivity), gameEntity.getUniquePackageName() ?: "")
                 return
             }
-            PackageLauncher.launchApp(context, gameEntity, gameEntity.getApk()[0].packageName)
+
+            if (entrance.contains("我的游戏")) {
+                MtaHelper.onEvent("我的游戏_启动", "启动", gameEntity.name)
+            }
+            PackageUtils.launchApplicationByPackageName(context, gameEntity.getApk()[0].packageName)
         } else if (str == context.getString(R.string.update)) {
+            if (entrance.contains("我的游戏")) {
+                MtaHelper.onEvent("我的游戏_启动", "更新", gameEntity.name)
+            }
             if (gameEntity.isVGame()) {
                 VHelper.updateOrReDownload(gameEntity)
                 return
             }
-
-            ChainBuilder()
-                .apply {
-                    addHandler(LandPageAddressHandler())
-                }.setProcessEndCallback {
-                    DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk) {
-                        DialogUtils.checkDownload(
-                            context,
-                            apk.size,
-                            gameEntity.id,
-                            gameEntity.name
-                        ) { isSubscribe: Boolean ->
-                            update(context, gameEntity, entrance, location, isSubscribe, traceEvent)
-                        }
+            DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, object : EmptyCallback {
+                override fun onCallback() {
+                    DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
+                        update(context, gameEntity, entrance, location, isSubscribe, traceEvent)
                     }
                 }
-                .buildHandlerChain()
-                ?.handleRequest(context, gameEntity)
+            })
         } else {
             var downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
-
-            // 找不到时，若类型为畅玩，尝试从畅玩数据库的快照中获取 downloadEntity。若存在，代表游戏已下载并成功安装
-            if (downloadEntity == null && gameEntity.isVGame()) {
-                downloadEntity = VHelper.getVDownloadEntitySnapshot(gameEntity.id, gameEntity.getUniquePackageName())
+            if (downloadEntity == null && gameEntity.getApk().size == 1) {
+                val entryMap: ArrayMap<String, DownloadEntity> = gameEntity.getEntryMap()
+                val apkEntity = gameEntity.getApk()[0]
+                if (entryMap.isNotEmpty()) {
+                    downloadEntity = entryMap[apkEntity.getPlatform()]
+                }
             }
-
-            // 还是找不到时，尝试从 gameEntity 里找已绑定的 downloadEntity
-            if (downloadEntity == null) {
-                downloadEntity = gameEntity.getEntryMap().getOrDefault(gameEntity.getUniquePlatform(), null)
-            }
-
             if (downloadEntity != null) {
                 val xapkStatus = downloadEntity.meta[XapkInstaller.XAPK_UNZIP_STATUS]
-                if (XapkUnzipStatus.SUCCESS.name == xapkStatus && isInstalling(downloadEntity.path)) {// 安装过程中避免重复点击
-                    return
-                }
                 if (XapkUnzipStatus.UNZIPPING.name == xapkStatus) {
                     cancelUnzipTask(downloadEntity)
                     return
@@ -1011,11 +930,9 @@ object DownloadItemUtils {
                     context.getString(R.string.resume) -> {
                         DownloadManager.getInstance().resume(downloadEntity, true)
                     }
-
                     context.getString(R.string.waiting) -> {
                         Utils.toast(context, "最多只能同时下载三个任务，请稍等")
                     }
-
                     else -> {
                         DownloadManager.getInstance().pause(downloadEntity.url)
                     }
@@ -1036,7 +953,7 @@ object DownloadItemUtils {
     ) {
         if (gameEntity.getApk().isEmpty()) return
 
-        val msg = FileUtils.isCanDownload(context, gameEntity.getApk()[0].size ?: "")
+        val msg = FileUtils.isCanDownload(context, gameEntity.getApk()[0].size)
         if (TextUtils.isEmpty(msg)) {
             DownloadManager.createDownload(
                 context,
@@ -1047,13 +964,7 @@ object DownloadItemUtils {
                 isSubscribe,
                 traceEvent
             )
-            ToastUtils.toast(gameEntity.name + "已加入下载队列")
-            if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
-                val toast = context.getString(R.string.unsupported_browser_install_hint)
-                AppExecutor.uiExecutor.executeWithDelay({
-                    ToastUtils.toast(toast)
-                }, 1000)
-            }
+            Utils.toast(context, gameEntity.name + "已加入下载队列")
             if (downloadBtn is DownloadButton) {
                 downloadBtn.text = "0%"
                 downloadBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_NORMAL
@@ -1074,16 +985,10 @@ object DownloadItemUtils {
         isSubscribe: Boolean,
         traceEvent: ExposureEvent?
     ) {
-        val msg = FileUtils.isCanDownload(context, gameEntity.getApk()[0].size ?: "")
+        val msg = FileUtils.isCanDownload(context, gameEntity.getApk()[0].size)
         if (TextUtils.isEmpty(msg)) {
             DownloadManager.createDownload(context, gameEntity, "插件化", entrance, location, isSubscribe, traceEvent)
-            ToastUtils.toast(gameEntity.name + "已加入下载队列")
-            if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
-                val toast = context.getString(R.string.unsupported_browser_install_hint)
-                AppExecutor.uiExecutor.executeWithDelay({
-                    ToastUtils.toast(toast)
-                }, 1000)
-            }
+            Utils.toast(context, gameEntity.name + "已加入下载队列")
             if (downloadBtn is DownloadButton) {
                 downloadBtn.setText(R.string.downloading)
                 downloadBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN
@@ -1113,11 +1018,9 @@ object DownloadItemUtils {
                     adapter?.notifyItemChanged(position)
                     refreshCallback?.onCallback()
                 }
-
                 PackageUtils.isCanPluggable(apkEntity) -> {
-                    DialogHelper.showPluginDialog(context, gameEntity.pluginDesc) { PackageInstaller.uninstall(context, path) }
+                    DialogHelper.showPluginDialog(context) { PackageInstaller.uninstall(context, path) }
                 }
-
                 else -> {
                     PackageInstaller.install(context, downloadEntity)
                 }

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

@@ -98,20 +98,18 @@ object DownloadNotificationHelper {
                 DownloadStatus.waiting -> builder.setContentText("等待中")
                 DownloadStatus.subscribe,
                 DownloadStatus.timeout,
-                DownloadStatus.diskisfull,
-                DownloadStatus.diskioerror,
                 DownloadStatus.neterror -> builder.setContentText("已暂停，连接WiFi自动下载")
                 else -> builder.setContentText("暂停中")
             }
             builder.setProgress(PROGRESS_MAX, entity.percent.toInt(), false)
         }
 
-        when (entity.status) {
-            DownloadStatus.done -> {
+        when {
+            entity.status == DownloadStatus.done -> {
                 builder.setSortKey("A")
                 builder.setOngoing(true) // 垃圾华为 sortKey 不起效 priority 也不起效，要将下载完成任务的通知置顶只能设置为 ongoing，喷了
             }
-            DownloadStatus.downloading -> builder.setSortKey("B")
+            entity.status == DownloadStatus.downloading -> builder.setSortKey("B")
             else -> builder.setSortKey("C")
         }
 

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

@@ -8,28 +8,33 @@ 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.common.base.GlobalActivityManager.getCurrentPageEntity
-import com.gh.gamecenter.common.base.GlobalActivityManager.getLastPageEntity
 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.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.pkg.PkgHelper
+import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
 import com.lightgame.download.*
 import com.lightgame.utils.AppManager
 import com.lightgame.utils.Utils
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import okhttp3.MediaType
+import okhttp3.RequestBody
 import org.greenrobot.eventbus.EventBus
+import org.json.JSONObject
 
 object DownloadObserver {
 
@@ -39,10 +44,7 @@ object DownloadObserver {
     // TODO 修复因为更改内存对象造成的双重下载完成事件问题，具体触发代码见 DownloadDao.updateSnapshotList
     private var mDoneDebouncePair: Pair<String, Long>? = null
 
-    private const val TAG = "DownloadObserver"
-    private const val CORE_EVENT_DOWNLOAD_COMPLETE_LOGGED = "CORE_EVENT_DOWNLOAD_COMPLETE_LOGGED"
-
-    private val mRetryableHashMap = hashMapOf<String, Boolean>()
+    private const val TEA_EVENT_DOWNLOAD_COMPLETE = "game_addiction"
 
     // 如果在WIFI状态下,下载自动暂停,则再重试一遍
     @JvmStatic
@@ -73,48 +75,35 @@ object DownloadObserver {
 
                     val currentActivity = AppManager.getInstance().currentActivity() ?: return
 
-                    DialogHelper.showDialog(
-                        currentActivity,
-                        "下载失败",
-                        "下载链接已失效，建议提交反馈",
-                        "立即反馈",
-                        "取消",
-                        {
-                            HelpAndFeedbackBridge.startSuggestionActivity(
-                                currentActivity,
-                                SuggestType.gameQuestion, "notfound",
-                                StringUtils.buildString(downloadEntity.name, "，问题反馈：下载链接失效"),
-                                SimpleGameEntity(gameId, downloadEntity.name, "")
-                            )
-                        },
-                        extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
-                    )
+                    DialogHelper.showDialog(currentActivity, "下载失败", "下载链接已失效，建议提交反馈", "立即反馈", "取消", {
+                        HelpAndFeedbackBridge.startSuggestionActivity(
+                            currentActivity,
+                            SuggestType.gameQuestion, "notfound",
+                            StringUtils.buildString(downloadEntity.name, "，问题反馈：下载链接失效"),
+                            SimpleGameEntity(gameId, downloadEntity.name, "")
+                        )
+                    }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true))
                     return
-                } else if (DownloadStatus.neterror == downloadEntity.status
-                    || DownloadStatus.timeout == downloadEntity.status
-                    || DownloadStatus.diskioerror == downloadEntity.status
-                    || DownloadStatus.diskisfull == downloadEntity.status
-                ) {
-                    if (mRetryableHashMap[downloadEntity.url] == true
+                } else if (DownloadStatus.neterror == downloadEntity.status || DownloadStatus.timeout == downloadEntity.status) {
+                    if (downloadEntity.meta[Constants.MARK_RETRY_DOWNLOAD].isNullOrEmpty()
                         && NetworkUtils.isWifiConnected(HaloApp.getInstance().application)
                     ) {
+                        downloadEntity.meta[Constants.MARK_RETRY_DOWNLOAD] = downloadEntity.progress.toString()
+                        downloadManager.updateDownloadEntity(downloadEntity)
                         downloadManager.resumeDownload(downloadEntity.url)
-                        mRetryableHashMap[downloadEntity.url] = false
-                        Utils.log(TAG, "下载重试->" + downloadEntity.toJson())
-                    } else {
-                        if (DownloadStatus.diskisfull == downloadEntity.status) {
-                            ToastUtils.toast("磁盘已满，请清理空间后重试下载")
-                        } else if (DownloadStatus.diskioerror == downloadEntity.status) {
-                            ToastUtils.toast("磁盘 IO 异常，请稍后重试")
-                        } else {
-                            ToastUtils.toast("网络不稳定，下载任务已暂停")
+                        debugOnly {
+                            Utils.log("DownloadObserver", "下载重试->" + downloadEntity.toJson())
                         }
-
+                    } else {
+                        Utils.toast(mApplication, "网络不稳定，下载任务已暂停")
                         DataLogUtils.uploadNeterrorLog(mApplication, downloadEntity)
-                        Utils.log(TAG, "下载自动暂停->" + downloadEntity.toJson())
+
+                        debugOnly {
+                            Utils.log("DownloadObserver", "下载自动暂停->" + downloadEntity.toJson())
+                        }
                     }
                 } else if (DownloadStatus.redirected == downloadEntity.status) {
-                    Utils.log(TAG, "重定向完毕")
+                    debugOnly { Utils.log("重定向完毕") }
                     DownloadDataHelper.uploadRedirectEvent(downloadEntity)
                 } else if (DownloadStatus.unqualified == downloadEntity.status) {
                     // 未成年
@@ -159,35 +148,40 @@ object DownloadObserver {
                 if (DownloadStatus.done == downloadEntity.status) {
                     if (mDoneDebouncePair?.first != downloadEntity.url) {
                         mDoneDebouncePair = Pair(downloadEntity.url, System.currentTimeMillis())
-                        performDownloadCompleteAction(downloadEntity, downloadManager)
+                        performDownloadCompleteAction(downloadEntity, gameId, downloadManager)
                     } else {
                         if (mDoneDebouncePair?.second == 0L
                             || System.currentTimeMillis() - (mDoneDebouncePair?.second ?: 0) > 500
                         ) {
-                            performDownloadCompleteAction(downloadEntity, downloadManager)
+                            performDownloadCompleteAction(downloadEntity, gameId, downloadManager)
                         }
                     }
+                }
 
-                    mRetryableHashMap.remove(downloadEntity.url)
-
+                if (downloadEntity.status == DownloadStatus.done) {
                     EventBus.getDefault().post(EBDownloadStatus("done", "", "", "", downloadEntity.packageName, ""))
                 }
 
                 DownloadNotificationHelper.addOrUpdateDownloadNotification(downloadEntity)
 
                 // 如果已下载大小发生变化,表示成功恢复下载,则重置重试标记
-                if (downloadEntity.status == DownloadStatus.downloading) {
-                    mRetryableHashMap[downloadEntity.url] = true
+                if (downloadEntity.status == DownloadStatus.downloading &&
+                    downloadEntity.progress.toString() != downloadEntity.meta[Constants.MARK_RETRY_DOWNLOAD]
+                ) {
+                    downloadEntity.meta[Constants.MARK_RETRY_DOWNLOAD] = ""
+                    downloadManager.updateDownloadEntity(downloadEntity)
                 }
             }
         }
 
         // 添加观察者
         DownloadManager.getInstance().addObserver(dataWatcher)
+
     }
 
     private fun performDownloadCompleteAction(
         downloadEntity: DownloadEntity,
+        gameId: String,
         downloadManager: DownloadManager
     ) {
         if (downloadEntity.name.contains(mApplication.getString(R.string.app_name))) {
@@ -205,10 +199,14 @@ object DownloadObserver {
         } else {
             statDoneEvent(downloadEntity)
 
-            logCoreEventIfNeeded(downloadEntity.getGameCategory())
+            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)
             val platform = PlatformUtils.getInstance(mApplication)
                 .getPlatformName(downloadEntity.platform)
             if (platform != null) {
@@ -218,24 +216,25 @@ object DownloadObserver {
                         EventBus.getDefault().post(
                             EBShowDialog(
                                 BaseActivity.PLUGGABLE,
-                                downloadEntity.path,
-                                downloadEntity.pluginDesc
+                                downloadEntity.path
                             )
                         )
-
                     downloadEntity.isPlugin -> Utils.toast(
                         mApplication,
                         downloadEntity.name + " - " + platform + " - 下载完成"
                     )
-
                     else -> {
-                        if (!downloadEntity.isVGame()) {
+                        if (downloadEntity.isVGame()) {
+                            VHelper.showFloatingWindow(downloadEntity.packageName)
+                        } else {
                             Utils.toast(mApplication, downloadEntity.name + " - 下载完成")
                         }
                     }
                 }
             } else {
-                if (!downloadEntity.isVGame()) {
+                if (downloadEntity.isVGame()) {
+                    VHelper.showFloatingWindow(downloadEntity.packageName)
+                } else {
                     Utils.toast(mApplication, downloadEntity.name + " - 下载完成")
                 }
             }
@@ -245,10 +244,15 @@ object DownloadObserver {
                     val gameName = downloadEntity.getMetaExtra(Constants.GAME_NAME)
                     if (simulatorJson.isEmpty()) return
                     var simulator = GsonUtils.fromJson(simulatorJson, SimulatorEntity::class.java)
+                    val isInstalled = PackageUtils.isInstalledFromAllPackage(
+                        HaloApp.getInstance().application,
+                        simulator.apk?.packageName
+                    )
                     val isInstalledNewSimulator =
                         SimulatorGameManager.isNewSimulatorInstalled(HaloApp.getInstance().application)
                     val isInstalledOldSimulator =
                         SimulatorGameManager.isOldSimulatorInstalled(HaloApp.getInstance().application)
+//                    if (!isInstalled && !isInstalledNewSimulator) {
                     val currentActivity = AppManager.getInstance().currentActivity()
                         ?: return
                     val newSimulator = Config.getNewSimulatorEntitySetting()
@@ -259,13 +263,14 @@ object DownloadObserver {
                         currentActivity, simulator,
                         SimulatorDownloadManager.SimulatorLocation.LAUNCH, downloadEntity.gameId, gameName, null
                     )
+//                    }
                     SimulatorGameManager.recordDownloadSimulatorGame(downloadEntity.gameId, simulator.type)
                     SimulatorGameManager.postPlayedGame(downloadEntity.gameId, downloadEntity.packageName)
                 } else {
                     val downloadType = downloadEntity.getMetaExtra(Constants.EXTRA_DOWNLOAD_TYPE)
                     // 是否是自动安装
                     val isAutoInstall = SPUtils.getBoolean(Constants.SP_AUTO_INSTALL, true)
-                    if (downloadType != Constants.VSPACE_32_DOWNLOAD_ONLY && (downloadType == Constants.SIMULATOR_DOWNLOAD || isAutoInstall)) {
+                    if (downloadType == Constants.SIMULATOR_DOWNLOAD || isAutoInstall) {
                         if (FileUtils.isEmptyFile(downloadEntity.path)) {
                             Utils.toast(mApplication, R.string.install_failure_hint)
                             downloadManager.cancel(downloadEntity.url)
@@ -285,8 +290,7 @@ object DownloadObserver {
                                     EventBus.getDefault().post(
                                         EBShowDialog(
                                             BaseActivity.PLUGGABLE,
-                                            downloadEntity.path,
-                                            downloadEntity.pluginDesc
+                                            downloadEntity.path
                                         )
                                     )
                                 } else {
@@ -302,6 +306,9 @@ object DownloadObserver {
                     }
                 }
             }
+
+            // 统计下载完成
+            uploadData(gameId, downloadEntity.platform)
         }
 
         // 下载过程分析统计
@@ -364,41 +371,17 @@ object DownloadObserver {
             type = ExposureUtils.DownloadType.PLUGIN_DOWNLOAD
         }
 
-        if (downloadEntity.isVGame()) {
-            SensorsBridge.trackEvent(
-                "HaloFunGameDownloadDone",
-                "game_name", downloadEntity.name,
-                "game_id", downloadEntity.gameId,
-                "game_schema_type", if (downloadEntity.getMetaExtra(VHelper.KEY_BIT) == "32") "32位" else "64位"
-            )
-        } else if (downloadEntity.gameId == Constants.HALO_FUN_GAME_ID) {
-            SensorsBridge.trackEvent(
-                "HaloFunDownloadDone",
-                "space_schema_type",
-                if (downloadEntity.packageName == VHelper.VSPACE_32BIT_PACKAGENAME) "32位" else "64位"
-            )
-        } else if (downloadEntity.gameId != Constants.GHZS_GAME_ID && downloadEntity.getMetaExtra(Constants.EXTRA_DOWNLOAD_TYPE) != Constants.SIMULATOR_DOWNLOAD) {
-            SensorsBridge.trackEvent(
-                "DownloadProcessFinish",
-                "game_id", downloadEntity.gameId,
-                "game_name", downloadEntity.meta[Constants.GAME_NAME] ?: "",
-                "game_type", downloadEntity.meta[Constants.GAME_CATEGORY_IN_CHINESE] ?: "",
-                "game_schema_type", if (downloadEntity.getMetaExtra(VHelper.KEY_BIT) == "32") "32位" else "64位",
-                "page_name", getCurrentPageEntity().pageName,
-                "page_id", getCurrentPageEntity().pageId,
-                "page_business_id", getCurrentPageEntity().pageBusinessId,
-                "last_page_name", getLastPageEntity().pageName,
-                "last_page_id", getLastPageEntity().pageId,
-                "last_page_business_id", getLastPageEntity().pageBusinessId
-            )
-        }
-
         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
         }
@@ -410,9 +393,7 @@ object DownloadObserver {
                 id = downloadEntity.gameId,
                 mName = downloadEntity.name.removeSuffix(Constants.GAME_NAME_DECORATOR),
                 gameVersion = downloadEntity.versionName ?: "",
-                isPlatformRecommend = isPlatformRecommend,
-                adIconActive = downloadEntity.meta[Constants.AD_ICON_ACTIVE].toBoolean(),
-                isAdData = downloadEntity.meta[Constants.IS_AD_DATA].toBoolean()
+                isPlatformRecommend = isPlatformRecommend
             ),
             downloadEntity.platform,
             downloadEntity.exposureTrace,
@@ -437,21 +418,19 @@ object DownloadObserver {
         DataLogUtils.uploadHijack(mApplication, downloadEntity)
     }
 
-    /**
-     * 根据预设的游戏类型上报关键事件(下载完成事件)
-     */
-    private fun logCoreEventIfNeeded(gameCategory: String) {
-        val category = PkgHelper.getCoreEventGameCategory()
-        val categoryMatched = if (category == "standard" || category.isNullOrEmpty()) {
-            true
-        } else {
-            gameCategory == category
-        }
-
-        if (!SPUtils.getBoolean(CORE_EVENT_DOWNLOAD_COMPLETE_LOGGED) && categoryMatched) {
-            HaloApp.getInstance().flavorProvider.logCoreEvent()
-            SPUtils.setBoolean(CORE_EVENT_DOWNLOAD_COMPLETE_LOGGED, true)
-        }
+    // 统计下载
+    private fun uploadData(id: String, platform: String?) {
+        val params = HashMap<String, String>()
+        params["game"] = id
+        params["platform"] = platform ?: ""
+        val body = RequestBody.create(
+            MediaType.parse("application/json"),
+            JSONObject(params as Map<*, *>).toString()
+        )
+        RetrofitManager.getInstance().api.postDownload(body)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(Response())
     }
 
 }

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

@@ -15,10 +15,11 @@ import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager
 import com.gh.gamecenter.common.avoidcallback.Callback
 import com.gh.gamecenter.common.callback.ConfirmListener
 import com.gh.gamecenter.common.constant.Constants
+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.common.entity.ErrorEntity
-import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.common.utils.SensorsBridge
-import com.gh.gamecenter.login.user.LoginTag
 import com.halo.assistant.fragment.user.UserInfoEditFragment
 import com.halo.assistant.fragment.user.VerifyPhoneFragment
 import com.lightgame.utils.AppManager
@@ -402,50 +403,23 @@ object ErrorHelper {
     }
 
     @JvmStatic
-    fun handleLoginError(
-        context: Context,
-        httpException: HttpException?,
-        loginTagChinese: String,
-        isCertificate: Boolean
-    ) {
+    fun handleLoginError(context: Context, httpException: HttpException?) {
         try {
-            var errorReason = ""
             val errorEntity: ErrorEntity? =
                 httpException?.response()?.errorBody()?.string()?.toObject()
             when {
-                errorEntity?.code == 403099 -> {
-                    errorReason = "当前账号正在注销，禁止登录"
-                    Utils.toast(context, errorReason)
-                }
+                errorEntity?.code == 403099 -> Utils.toast(context, "当前账号正在注销，禁止登录")
 
                 // 用户禁止登录
-                errorEntity?.code == 403401 -> {
-                    errorReason = "您的账号存在违规，不允许登录"
-                    Utils.toast(context, errorReason)
-                }
+                errorEntity?.code == 403401 -> Utils.toast(context, "您的账号存在违规，不允许登录")
 
                 // 设备禁止登录
-                errorEntity?.code == 403404 -> {
-                    errorReason = "您的设备存在违规，不允许登录"
-                    Utils.toast(context, errorReason)
-                }
+                errorEntity?.code == 403404 -> Utils.toast(context, "您的设备存在违规，不允许登录")
 
-                errorEntity?.toast?.isNotEmpty() == true -> {
-                    Utils.toast(context, errorEntity.toast)
-                    errorReason = errorEntity.toast!!
-                }
+                errorEntity?.toast?.isNotEmpty() == true -> Utils.toast(context, errorEntity.toast)
 
                 else -> Utils.toast(context, R.string.login_failure)
             }
-            if (!isCertificate) SensorsBridge.trackEvent(
-                "LoginResult",
-                "login_type",
-                loginTagChinese,
-                "login_result",
-                "失败",
-                "defeated_reason",
-                errorReason
-            )
         } catch (e: Exception) {
             e.printStackTrace()
             Utils.toast(context, R.string.login_failure)

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

@@ -7,6 +7,7 @@ import android.view.View
 import android.widget.TextView
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.dip2px
+import com.gh.gamecenter.energy.EnergyBridge
 import com.lightgame.utils.Util_System_Keyboard
 import com.lzf.easyfloat.EasyFloat
 import com.lzf.easyfloat.enums.ShowPattern
@@ -21,6 +22,7 @@ import com.lzf.easyfloat.enums.SidePattern
 object FloatingBackViewManager {
 
     const val TYPE_ACTIVITY = "type_activity"
+    const val TYPE_TASK = "type_task"
 
     private const val FLOATING_BACK_VIEW = "floating_back_view"
 
@@ -54,6 +56,10 @@ object FloatingBackViewManager {
                             titleView?.text = "返回活动"
 
                             DirectUtils.directToWebView(activity, mActivityUrl, ("返回活动浮窗"))
+                        } else if (mType == TYPE_TASK) {
+                            titleView?.text = "返回任务"
+
+                            activity.startActivity(EnergyBridge.getEnergyCenterIntent(activity))
                         }
 
                         disableBackView()
@@ -105,4 +111,11 @@ object FloatingBackViewManager {
         mActivityUrl = ""
     }
 
+    /**
+     * 返回小浮窗类型是否为活动
+     */
+    fun isTypeActivity(): Boolean {
+        return mType == TYPE_ACTIVITY
+    }
+
 }

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

@@ -15,7 +15,6 @@ import com.gh.common.simulator.SimulatorDownloadManager
 import com.gh.common.simulator.SimulatorGameManager
 import com.gh.download.DownloadManager
 import com.gh.download.dialog.DownloadDialog
-import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.R
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.common.constant.Constants
@@ -27,12 +26,12 @@ import com.gh.gamecenter.common.utils.DialogHelper
 import com.gh.gamecenter.common.utils.observableToMain
 import com.gh.gamecenter.common.utils.singleToMain
 import com.gh.gamecenter.common.view.dsbridge.CompletionHandler
-import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.runOnUiThread
 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.ToastUtils
+import com.gh.gamecenter.energy.EnergyBridge
 import com.gh.gamecenter.feature.entity.ApkEntity
 import com.gh.gamecenter.feature.entity.GameEntity
 import com.gh.gamecenter.feature.entity.PluginLocation
@@ -139,7 +138,7 @@ object GameActivityDownloadHelper {
     ) {
         if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.id)) {
             CheckLoginUtils.checkLogin(context, entrance) {
-                ReservationHelper.reserve(context, gameEntity.id, gameEntity.name ?: "", object : EmptyCallback {
+                ReservationHelper.reserve(context, gameEntity.id, object : EmptyCallback {
                     override fun onCallback() {
                         LogUtils.logReservation(gameEntity, traceEvent)
                         clear()
@@ -185,12 +184,6 @@ object GameActivityDownloadHelper {
             str != context.getString(R.string.launch)
         ) {
             ToastUtils.toast("${gameEntity.name}已加入下载队列")
-            if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
-                val toast = context.getString(R.string.unsupported_browser_install_hint)
-                AppExecutor.uiExecutor.executeWithDelay({
-                    ToastUtils.toast(toast)
-                }, 1000)
-            }
         } else {
             when {
                 str == context.getString(R.string.download) || str == context.getString(R.string.attempt) -> {
@@ -213,12 +206,6 @@ object GameActivityDownloadHelper {
                 }
                 else -> {
                     ToastUtils.toast("${gameEntity.name}已加入下载队列")
-                    if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
-                        val toast = context.getString(R.string.unsupported_browser_install_hint)
-                        AppExecutor.uiExecutor.executeWithDelay({
-                            ToastUtils.toast(toast)
-                        }, 1000)
-                    }
                 }
             }
         }
@@ -235,7 +222,7 @@ object GameActivityDownloadHelper {
     ) {
         GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) {
             CertificationDialog.showCertificationDialog(context, gameEntity) {
-                DialogUtils.checkDownload(context, apk.size, gameEntity.id, gameEntity.name) { isSubscribe: Boolean ->
+                DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
                     download(context, gameEntity, apk, isSubscribe, entrance, location, traceEvent)
                 }
             }
@@ -255,12 +242,7 @@ object GameActivityDownloadHelper {
         VHelper.validateVSpaceBeforeAction(context, gameEntity) {
             GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) {
                 CertificationDialog.showCertificationDialog(context, gameEntity) {
-                    DialogUtils.checkDownload(
-                        context,
-                        apk.size,
-                        gameEntity.id,
-                        gameEntity.name
-                    ) { isSubscribe: Boolean ->
+                    DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
                         download(context, gameEntity, apk, isSubscribe, entrance, location, traceEvent)
                     }
                 }
@@ -281,7 +263,7 @@ object GameActivityDownloadHelper {
             DownloadDialog.showDownloadDialog(context, gameEntity, traceEvent, entrance, location)
         } else {
             CertificationDialog.showCertificationDialog(context, gameEntity) {
-                DialogUtils.checkDownload(context, apk.size, gameEntity.id, gameEntity.name) { isSubscribe: Boolean ->
+                DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
                     plugin(context, gameEntity, apk, entrance, location, isSubscribe, traceEvent)
                 }
             }
@@ -317,7 +299,7 @@ object GameActivityDownloadHelper {
         }
 
         if (gameEntity.isVGame()) {
-            VHelper.installOrLaunch((context as AppCompatActivity), gameEntity)
+            VHelper.installOrLaunch((context as AppCompatActivity), gameEntity.getUniquePackageName() ?: "")
         } else {
             downloadEntity?.run {
                 install(context, gameEntity, apk, this)
@@ -334,6 +316,7 @@ object GameActivityDownloadHelper {
         location: String,
         traceEvent: ExposureEvent
     ) {
+        EnergyBridge.postEnergyTask("play_game", gameEntity.id, gameEntity.getApk()[0].packageName)
         //启动模拟器游戏
         if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
             if (NewSimulatorGameManager.shouldShowUpdateNewSimulatorAlert(context)) {
@@ -355,14 +338,14 @@ object GameActivityDownloadHelper {
         }
 
         if (gameEntity.isVGame()) {
-            VHelper.installOrLaunch((context as AppCompatActivity), gameEntity)
+            VHelper.installOrLaunch((context as AppCompatActivity), gameEntity.getUniquePackageName() ?: "")
             return
         }
 
         if (entrance.contains("我的游戏")) {
             MtaHelper.onEvent("我的游戏_启动", "启动", gameEntity.name)
         }
-        PackageLauncher.launchApp(context, gameEntity, gameEntity.getApk()[0].packageName)
+        PackageUtils.launchApplicationByPackageName(context, gameEntity.getApk()[0].packageName)
     }
 
     // 处理更新状态
@@ -374,7 +357,7 @@ object GameActivityDownloadHelper {
         location: String,
         traceEvent: ExposureEvent
     ) {
-        DialogUtils.checkDownload(context, apk.size, gameEntity.id, gameEntity.name) { isSubscribe: Boolean ->
+        DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
             update(context, gameEntity, apk, entrance, location, isSubscribe, traceEvent)
         }
     }
@@ -438,12 +421,6 @@ object GameActivityDownloadHelper {
                 ), entrance, location, isSubscribe, traceEvent
             )
             ToastUtils.toast("${gameEntity.name}已加入下载队列")
-            if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
-                val toast = context.getString(R.string.unsupported_browser_install_hint)
-                AppExecutor.uiExecutor.executeWithDelay({
-                    ToastUtils.toast(toast)
-                }, 1000)
-            }
         } else {
             ToastUtils.toast(msg)
         }
@@ -463,12 +440,6 @@ object GameActivityDownloadHelper {
         if (TextUtils.isEmpty(msg)) {
             DownloadManager.createDownload(context, apk, gameEntity, "插件化", entrance, location, isSubscribe, traceEvent)
             ToastUtils.toast("${gameEntity.name}已加入下载队列")
-            if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
-                val toast = context.getString(R.string.unsupported_browser_install_hint)
-                AppExecutor.uiExecutor.executeWithDelay({
-                    ToastUtils.toast(toast)
-                }, 1000)
-            }
         } else {
             ToastUtils.toast(msg)
         }
@@ -489,7 +460,7 @@ object GameActivityDownloadHelper {
                 gameEntity.getEntryMap().remove(apkEntity.getPlatform())
             }
             PackageUtils.isCanPluggable(apkEntity) -> {
-                DialogHelper.showPluginDialog(context, gameEntity.pluginDesc) { PackageInstaller.uninstall(context, path) }
+                DialogHelper.showPluginDialog(context) { PackageInstaller.uninstall(context, path) }
             }
             else -> {
                 PackageInstaller.install(context, downloadEntity)
@@ -509,12 +480,6 @@ object GameActivityDownloadHelper {
     ) {
         DownloadManager.createDownload(context, apk, gameEntity, "更新", entrance, location, isSubscribe, traceEvent)
         ToastUtils.toast("${gameEntity.name}已加入下载队列")
-        if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
-            val toast = context.getString(R.string.unsupported_browser_install_hint)
-            AppExecutor.uiExecutor.executeWithDelay({
-                ToastUtils.toast(toast)
-            }, 1000)
-        }
     }
 
     @SuppressLint("CheckResult")

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

@@ -1,18 +0,0 @@
-package com.gh.common.util
-
-import com.gh.gamecenter.db.GameTrendsDao
-import com.gh.gamecenter.login.user.UserManager
-import com.gh.gamecenter.message.MessageUnreadRepository
-import com.halo.assistant.HaloApp
-
-object GameTrendsHelper {
-    private val mGameTrendsDao = GameTrendsDao(HaloApp.getInstance().application)
-
-    fun updateReadPostTime() {
-        mGameTrendsDao.findGameTrendsInfo(UserManager.getInstance().userId)?.let { trendsInfo ->
-            trendsInfo.readPostTime = System.currentTimeMillis()
-            mGameTrendsDao.add(trendsInfo)
-            MessageUnreadRepository.loadMessageUnreadTotal(true)
-        }
-    }
-}

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

@@ -8,7 +8,6 @@ import androidx.annotation.WorkerThread;
 
 import com.gh.common.constant.Config;
 import com.gh.common.simulator.SimulatorGameManager;
-import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.feature.view.DownloadButton;
 import com.gh.download.DownloadManager;
 import com.gh.gamecenter.R;
@@ -108,7 +107,7 @@ public class GameUtils {
 
             // 在下载管理找不到下载实体，并且为畅玩游戏的时候到畅玩数据库里找
             if (downloadEntity == null && gameEntity.isVGame()) {
-                downloadEntity = VHelper.getVDownloadEntitySnapshot(gameEntity.getId(), apkEntity.getPackageName());
+                downloadEntity = VHelper.getDownloadEntitySnapshot(gameEntity.getId(), apkEntity.getPackageName());
             }
 
             if (downloadEntity != null) {
@@ -181,8 +180,7 @@ public class GameUtils {
             if (gameEntity.isVGame()) {
                 return context.getString(R.string.smooth);
             } else {
-                if (Constants.V_GAME.equals(gameEntity.getDownloadStatus())
-                        || Constants.V_GAME_32.equals(gameEntity.getDownloadStatus())) {
+                if ("smooth".equals(gameEntity.getDownloadStatus())) {
                     GameEntity.GameCategory gameCategory = gameEntity.getGameCategory();
                     if (gameCategory.equals(GameEntity.GameCategory.ONLINE_GAME)
                             || gameCategory.equals(GameEntity.GameCategory.INTERNATIONAL_ONLINE_GAME)) {

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

@@ -33,6 +33,94 @@ object IntegralLogHelper {
         log(json, "score", false)
     }
 
+    fun logTask(event: String, location: String, jobId: String, jobName: String, jobType: String) {
+        val json = JSONObject().apply {
+            tryWithDefaultCatch {
+                put("meta", LogUtils.getMetaObject())
+                put("event", event)
+                put("location", location)
+                put("timestamp", System.currentTimeMillis() / 1000)
+                put("launch_id", launchId)
+                put("session_id", sessionId)
+                put("job_id", jobId)
+                put("job_name", jobName)
+                put("job_type", jobType)
+            }
+        }
+
+        debugOnly {
+            Utils.log("LogUtils->$json")
+        }
+        log(json, "score", false)
+    }
+
+    fun logCommodityCategory(
+        event: String,
+        location: String,
+        entrance: String,
+        categoryId: String,
+        categoryName: String
+    ) {
+        val json = JSONObject().apply {
+            tryWithDefaultCatch {
+                put("meta", LogUtils.getMetaObject())
+                put("event", event)
+                put("location", location)
+                put("timestamp", System.currentTimeMillis() / 1000)
+                put("launch_id", launchId)
+                put("session_id", sessionId)
+                put("entrance", entrance)
+                put("goods_species_id", categoryId)
+                put("goods_species_name", categoryName)
+            }
+        }
+
+        debugOnly {
+            Utils.log("LogUtils->$json")
+        }
+        log(json, "score", false)
+    }
+
+    fun logCommodity(event: String, location: String, commodityId: String, categoryId: String, categoryName: String) {
+        val json = JSONObject().apply {
+            tryWithDefaultCatch {
+                put("meta", LogUtils.getMetaObject())
+                put("event", event)
+                put("location", location)
+                put("timestamp", System.currentTimeMillis() / 1000)
+                put("launch_id", launchId)
+                put("session_id", sessionId)
+                put("goods_id", commodityId)
+                put("goods_species_id", categoryId)
+                put("goods_species_name", categoryName)
+            }
+        }
+
+        debugOnly {
+            Utils.log("LogUtils->$json")
+        }
+        log(json, "score", false)
+    }
+
+    fun logEnergyRange(event: String, location: String, range: String) {
+        val json = JSONObject().apply {
+            tryWithDefaultCatch {
+                put("meta", LogUtils.getMetaObject())
+                put("event", event)
+                put("location", location)
+                put("timestamp", System.currentTimeMillis() / 1000)
+                put("launch_id", launchId)
+                put("session_id", sessionId)
+                put("energy_range", range)
+            }
+        }
+
+        debugOnly {
+            Utils.log("LogUtils->$json")
+        }
+        log(json, "score", false)
+    }
+
     fun logPendent(event: String, location: String, pendentId: String, pendentType: String? = null) {
         val json = JSONObject().apply {
             tryWithDefaultCatch {

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

@@ -18,12 +18,11 @@ import com.gh.gamecenter.adapter.LibaoDetailAdapter;
 import com.gh.gamecenter.common.utils.DialogHelper;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.common.utils.NotificationHelper;
-import com.gh.gamecenter.common.utils.SensorsBridge;
 import com.gh.gamecenter.core.utils.ToastUtils;
 import com.gh.gamecenter.core.utils.UrlFilterUtils;
 import com.gh.gamecenter.feature.entity.ApkEntity;
-import com.gh.gamecenter.feature.entity.LibaoEntity;
-import com.gh.gamecenter.feature.entity.LibaoStatusEntity;
+import com.gh.gamecenter.entity.LibaoEntity;
+import com.gh.gamecenter.entity.LibaoStatusEntity;
 import com.gh.gamecenter.feature.entity.MeEntity;
 import com.gh.gamecenter.common.entity.NotificationUgc;
 import com.gh.gamecenter.feature.entity.UserDataLibaoEntity;
@@ -46,6 +45,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -305,7 +305,7 @@ public class LibaoUtils {
 
     public static void initLibaoBtn(final Context context, final TextView libaoBtn, final LibaoEntity libaoEntity,
                                     final boolean isInstallRequired, final LibaoDetailAdapter adapter, boolean shouldUpdateStatus,
-                                    final String entrance, final String sourceEntrance, final OnLibaoStatusChangeListener listener) {
+                                    final String entrance, final OnLibaoStatusChangeListener listener) {
         setLiBaoBtnStatusRound(libaoBtn, libaoEntity, shouldUpdateStatus, context);
         String status = libaoEntity.getStatus();
 
@@ -318,32 +318,6 @@ public class LibaoUtils {
             }
         }
 
-        // 类型为复制的，不需要登录也可以直接复制
-        if ("copy".equals(libaoEntity.getReceiveMethod())) {
-            if ("finish".equals(libaoEntity.getStatus())) {
-                libaoBtn.setText(R.string.libao_finish);
-                libaoBtn.setBackgroundResource(R.drawable.button_border_round_gray);
-                libaoBtn.setTextColor(context.getResources().getColor(R.color.button_gray));
-                libaoBtn.setOnClickListener(v -> ToastUtils.toast("兑换码领取已结束"));
-            } else {
-                libaoBtn.setText(R.string.libao_copy);
-                libaoBtn.setTextColor(ExtensionsKt.toColor(R.color.white, context));
-                libaoBtn.setBackgroundResource(R.drawable.button_normal_round_style);
-                libaoBtn.setOnClickListener(v -> {
-                    LogUtils.uploadReceiveGift(
-                            "game_gift_code_successful",
-                            libaoEntity.getId(),
-                            libaoEntity.getName(),
-                            "游戏详情",
-                            libaoEntity.getGame().getId(),
-                            libaoEntity.getGame().getName()
-                    );
-                    ExtensionsKt.copyTextAndToast(libaoEntity.getCode(), libaoEntity.getToast());
-                });
-            }
-            return;
-        }
-
         libaoBtn.setOnClickListener(v -> {
             String btnStatus = libaoBtn.getText().toString();
             // 领取限制
@@ -406,29 +380,13 @@ public class LibaoUtils {
                         if ("repeatLing".equals(status)) {
                             ToastUtils.showToast("礼包每天0点刷新，明日0点后可再领一个");
                         } else {
-                            libaoLing(context, libaoBtn, libaoEntity, adapter, isInstallRequired, null, entrance, sourceEntrance, listener);
+                            libaoLing(context, libaoBtn, libaoEntity, adapter, isInstallRequired, null, entrance, listener);
                         }
-                        SensorsBridge.trackEvent("GameGiftDraw",
-                                "gift_type", "普通礼包",
-                                "game_name", libaoEntity.getGame().getName(),
-                                "game_id", libaoEntity.getGame().getId(),
-                                "gift_id", libaoEntity.getId(),
-                                "gift_name", libaoEntity.getName(),
-                                "source_entrance", sourceEntrance
-                        );
                         break;
                     case "再淘":
                     case "再淘一个":
                     case "淘号":
-                        libaoTao(context, libaoBtn, libaoEntity, isInstallRequired, adapter, status, entrance, sourceEntrance, listener);
-                        SensorsBridge.trackEvent("GameGiftDraw",
-                                "gift_type", "淘号礼包",
-                                "game_name", libaoEntity.getGame().getName(),
-                                "game_id", libaoEntity.getGame().getId(),
-                                "gift_id", libaoEntity.getId(),
-                                "gift_name", libaoEntity.getName(),
-                                "source_entrance", sourceEntrance
-                        );
+                        libaoTao(context, libaoBtn, libaoEntity, isInstallRequired, adapter, status, entrance, listener);
                         break;
                 }
             });
@@ -436,7 +394,7 @@ public class LibaoUtils {
     }
 
     private static void libaoTao(Context context, TextView libaoBtn, LibaoEntity libaoEntity, boolean isInstallRequired, LibaoDetailAdapter adapter,
-                                 String status, String entrance, String sourceEntrance, final OnLibaoStatusChangeListener listener) {
+                                 String status, String entrance, final OnLibaoStatusChangeListener listener) {
         if ("repeatTao".equals(status)) {
             Utils.toast(context, "没到重复淘号时间, 礼包每天0点刷新");
             return;
@@ -491,16 +449,6 @@ public class LibaoUtils {
                     des = "您已领取过相同的礼包，可能无法成功兑换";
                 }
                 ToastUtils.showToast(des);
-
-                SensorsBridge.trackEvent("GameGiftDrawResult",
-                        "draw_result", "成功",
-                        "gift_type", "淘号礼包",
-                        "game_name", libaoEntity.getGame().getName(),
-                        "game_id", libaoEntity.getGame().getId(),
-                        "gift_id", libaoEntity.getId(),
-                        "gift_name", libaoEntity.getName(),
-                        "source_entrance", sourceEntrance
-                );
             }
 
             @Override
@@ -559,22 +507,12 @@ public class LibaoUtils {
                     }
                 }
                 Utils.toast(context, "发生异常");
-
-                SensorsBridge.trackEvent("GameGiftDrawResult",
-                        "draw_result", "失败",
-                        "gift_type", "淘号礼包",
-                        "game_name", libaoEntity.getGame().getName(),
-                        "game_id", libaoEntity.getGame().getId(),
-                        "gift_id", libaoEntity.getId(),
-                        "gift_name", libaoEntity.getName(),
-                        "source_entrance", sourceEntrance
-                );
             }
         });
     }
 
     private static void libaoLing(final Context context, TextView libaoBtn, final LibaoEntity libaoEntity, final LibaoDetailAdapter adapter,
-                                  final boolean isInstallRequired, String captchaCode, final String entrance, final String sourceEntrance, final OnLibaoStatusChangeListener listener) {
+                                  final boolean isInstallRequired, String captchaCode, final String entrance, final OnLibaoStatusChangeListener listener) {
 
         if (BuildConfig.DEBUG) {
             if (libaoBtn != null) {
@@ -605,15 +543,6 @@ public class LibaoUtils {
                 }
                 if (TextUtils.isEmpty(libaoCode)) {
                     Utils.toast(context, "领取异常");
-                    SensorsBridge.trackEvent("GameGiftDrawResult",
-                            "draw_result", "失败",
-                            "gift_type", "普通礼包",
-                            "game_name", libaoEntity.getGame().getName(),
-                            "game_id", libaoEntity.getGame().getId(),
-                            "gift_id", libaoEntity.getId(),
-                            "gift_name", libaoEntity.getName(),
-                            "source_entrance", sourceEntrance
-                    );
                     return;
                 }
                 libaoEntity.setAvailable(libaoEntity.getAvailable() - 1);
@@ -641,15 +570,6 @@ public class LibaoUtils {
                     }
                     return null;
                 });
-                SensorsBridge.trackEvent("GameGiftDrawResult",
-                        "draw_result", "成功",
-                        "gift_type", "普通礼包",
-                        "game_name", libaoEntity.getGame().getName(),
-                        "game_id", libaoEntity.getGame().getId(),
-                        "gift_id", libaoEntity.getId(),
-                        "gift_name", libaoEntity.getName(),
-                        "source_entrance", sourceEntrance
-                );
             }
 
             @Override
@@ -695,7 +615,7 @@ public class LibaoUtils {
                                     }, false, "", "");
                                     libaoEntity.setStatus("used_up");
                                     if (libaoBtn != null) {
-                                        initLibaoBtn(context, libaoBtn, libaoEntity, isInstallRequired, adapter, false, entrance, sourceEntrance, listener);
+                                        initLibaoBtn(context, libaoBtn, libaoEntity, isInstallRequired, adapter, false, entrance, listener);
                                     }
                                     break;
                                 case "maintaining":
@@ -713,22 +633,13 @@ public class LibaoUtils {
                     } else if (exception.code() == 412) {
                         // 需要验证
                         GeetestUtils.getInstance().showDialog(context, captcha ->
-                                libaoLing(context, libaoBtn, libaoEntity, adapter, isInstallRequired, captcha, entrance, sourceEntrance, listener));
+                                libaoLing(context, libaoBtn, libaoEntity, adapter, isInstallRequired, captcha, entrance, listener));
                         return;
                     } else if (exception.code() == 401) {
                         return;
                     }
                 }
                 Utils.toast(context, "发生异常");
-                SensorsBridge.trackEvent("GameGiftDrawResult",
-                        "draw_result", "失败",
-                        "gift_type", "普通礼包",
-                        "game_name", libaoEntity.getGame().getName(),
-                        "game_id", libaoEntity.getGame().getId(),
-                        "gift_id", libaoEntity.getId(),
-                        "gift_name", libaoEntity.getName(),
-                        "source_entrance", sourceEntrance
-                );
             }
         }, captchaCode);
     }
@@ -785,7 +696,7 @@ public class LibaoUtils {
                 , "关闭", "启动游戏"
                 , () -> {
                     if (LibaoUtils.isAppInstalled(context, libaoEntity.getPackageName())) {
-                        PackageLauncher.launchApp(context, null, libaoEntity.getPackageName());
+                        PackageUtils.launchApplicationByPackageName(context, libaoEntity.getPackageName());
                     } else {
                         Utils.toast(context, "请安装游戏：" + libaoEntity.getGame().getName()
                                 + PlatformUtils.getInstance(context).getPlatformName(libaoEntity.getPlatform()) + "版");