重构数据解析，ui组件刷新逻辑

feat: 游戏详情UI优化-客户端 https://jira.shanqu.cc/browse/GHZSCY-8049

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

.gitignore

@@ -9,4 +9,6 @@ build/
 release-app/
 test-app/
 scripts/apk-channel/
-app/src/test/java/com/gh/gamecenter
+app/src/test/java/com/gh/gamecenter
+app/src/main/assets-debug/
+app/src/main/assets-release/

.gitlab-ci.yml

@@ -1,44 +1,160 @@
-stages:
-  - analysis
-  - sendmail
+# commit_sha 文件记录上一次成功流水线的commit sha，用于定时计划检测是否有新代码提交，有就执行流水线，没有就终止流水线
+cache:
+# 不同的分支采用不同的 cache，防止分支之间相互影响
+   key: "${CI_COMMIT_REF_SLUG}_commit_sha"
+   paths:
+     - commit_sha
+   policy: pull
 
-## 代码检查
-sonarqube_analysis:
+# 将打包&发送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:
   tags:
+    # - local-runner
     - offline-test
-  stage: analysis
-  image: sonarsource/sonar-scanner-cli:latest
-  dependencies: []    #禁止传递来的artifact
+  stage: build&analyze
+  image: hub.shanqu.cc/library/ci-android:jdk11-sdk31-33
+  resource_group: android_build
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
+    KUBERNETES_CPU_LIMIT: "10"
   script:
-    ## 获取项目的一级组和二级组和项目名作为projectKey，例如projectKey=platform-backend-eci-monitor
-    - group=`echo $CI_PROJECT_PATH | sed 's#/#-#g'`
-    - sonar-scanner
-      -Dsonar.host.url=http://sonarqube-server.sonarqube:9000/
-      -Dsonar.login=be43de7264ce4c4766eb0c020373c3e74e6df257
-      -Dsonar.jacoco.reportPaths=target/jacoco.exec
-      -Dsonar.projectKey=$group
-      -Dsonar.projectName=$CI_PROJECT_PATH
-      -Dsonar.sourceEncoding=UTF-8
-      -Dsonar.exclusions=**/vendor/**,**/errcode/**
-      -Dsonar.gitlab.project_id=$CI_PROJECT_ID
-      -Dsonar.gitlab.commit_sha=$CI_COMMIT_SHA
-      -Dsonar.gitlab.ref_name=$CI_COMMIT_REF_NAME
-      -Dsonar.gitlab.ci_merge_request_iid=$CI_MERGE_REQUEST_IID
-      -Dsonar.gitlab.merge_request_discussion=true
-      -Dsonar.java.binaries=.                 # 如果不使用Maven或Gradle进行分析，则必须手动提供测试二进制文件
+    - export GRADLE_USER_HOME=/home/gitlab-runner/ci-build-cache/$CI_PROJECT_PATH/.gradle
+    - chmod +x ./gradlew
+    - ./scripts/jenkins_build.sh $CI_COMMIT_REF_NAME $BEFORE_COMMIT_SHA $CI_COMMIT_SHA
+  #设置打包后的产物，用于job之间共享
+  artifacts:
+      paths:
+          - app/build/tmp/*.apk
+      expire_in: 48 hrs       # 指定附件上载后保存的时间24h，默认永久在Gitlab保存
+  allow_failure:
+    exit_codes: 137
   only:
     - dev
- 
+    - release
+
+# 代码检查
+sonarqube_analysis:
+   tags:
+     - offline-test
+   stage: build&analyze
+   image: hub.shanqu.cc/library/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
+     - release
+
 ## 发送简易检测结果报告
 send_sonar_report:
-  tags:
-    - offline-test
-  stage: sendmail
-  image: hub.shanqu.cc/library/docker:latest
-  dependencies: []    #禁止传递来的artifact
-  script:
-    - group=`echo $CI_PROJECT_PATH | sed 's#/#-#g'`
-    - docker login -u "${HARBOR_REGISTRY_USERNAME}" -p "${HARBOR_REGISTRY_PASSWORD}" "${HARBOR_REGISTRY}"
-    - docker run -e PROJECTKEY=$group -e EMAIL=$GITLAB_USER_EMAIL --name send-email --rm hub.shanqu.cc/platform/send-sonar-report:latest
-  only:
-    - dev
+   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
+     - release
+
+oss-upload&send-email:
+    tags:
+        - sysadm-devops
+    stage: oss-upload&send-email
+    image: hub.shanqu.cc/devops/android-apk-oss-upload:latest
+    id_tokens:
+      VAULT_ID_TOKEN:
+        aud: https://vault.shanqu.cc
+    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: "tos-cn-guangzhou.ivolces.com"                    # 固定值
+        BUCKET: "sysadm-public"                                     # 固定值
+        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-jira-comment.py
+    only:
+        - dev
+        - release
+

.gitmodules

@@ -1,10 +1,13 @@
 [submodule "libraries/LGLibrary"]
 	path = libraries/LGLibrary
-	url = git@git.shanqu.cc:android/common-library.git
+	url = ../../../android/common-library.git
 	branch = master
-[submodule "assistant_flutter"]
-	path = assistant_flutter
-	url = git@git.shanqu.cc:halo/android/flutter-module.git
 [submodule "vspace-bridge"]
 	path = vspace-bridge
-	url = git@git.shanqu.cc:cwzs/android/vspace-bridge.git
+	url = ../../../cwzs/android/vspace-bridge.git
+[submodule "ndownload"]
+	path = ndownload
+	url = ../../../android/ndownload.git
+[submodule "vasdk"]
+	path = vasdk
+	url = ../../../sdg/android/vasdk.git

Dockerfile

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

README.md

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

app/build.gradle

@@ -2,19 +2,30 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android' // kotlin
 apply plugin: 'kotlin-parcelize'
+apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'AndResGuard'
+apply plugin: 'therouter'
 
 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
     }
 
     compileOptions {
+        coreLibraryDesugaringEnabled true
+
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -42,6 +53,10 @@ android {
         }
     }
 
+    ksp {
+        arg("ROUTER_MODULE_NAME", project.getName())
+    }
+
     defaultConfig {
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
@@ -65,20 +80,42 @@ android {
         versionName rootProject.ext.versionName
         applicationId rootProject.ext.applicationId
 
-        proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt', 'proguard-fresco.txt'
+        proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt', 'proguard-fresco.txt', rootProject.ext.va_proguard_rules
 
-        /**
-         * All third-party appid/appkey
-         */
+        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
+        buildConfigField "boolean", "IS_GAT_APP", "false"
         buildConfigField "String", "API_HOST", "\"${API_HOST}\""
         buildConfigField "String", "NEW_API_HOST", "\"${NEW_API_HOST}\""
+        buildConfigField "String", "LOG_HUB_PROJECT", "\"${LOG_HUB_PROJECT}\""
         buildConfigField "String", "VAPI_HOST", "\"${VAPI_HOST}\""
+        buildConfigField "String", "WGAME_CPM_BUSIAPPID", "\"${WGAME_CPM_BUSIAPPID}\""
+        buildConfigField "String", "WGAME_CPM_API_HOST", "\"${WGAME_CPM_API_HOST}\""
         buildConfigField "String", "WECHAT_APPID", "\"${WECHAT_APPID}\""
         buildConfigField "String", "WECHAT_SECRET", "\"${WECHAT_SECRET}\""
         buildConfigField "String", "TENCENT_APPID", "\"${TENCENT_APPID}\""
         buildConfigField "String", "WEIBO_APPKEY", "\"${WEIBO_APPKEY}\""
-        buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
-        buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
+        buildConfigField "String", "DSP_API_HOST","\"${DSP_API_HOST}\""
+        // 一体包的32位畅玩游戏助手包名
+        buildConfigField "String", "EXT_PACKAGE_NAME", "\"${rootProject.ext.EXT_PACKAGE_NAME}\""
     }
 
     // gradle 2.2以上默认同时启用v1和v2（优先用于Android N）
@@ -93,10 +130,21 @@ android {
         }
     }
 
-    kapt {
-        arguments {
-            arg("AROUTER_MODULE_NAME", project.name)
-        }
+    packagingOptions {
+        // exclude 部分冗余的文件
+        exclude 'META-INF/gradle/incremental.annotation.processors'
+        exclude 'darwin/x86_64/liblz4-java.dylib'
+
+        exclude 'assets/libwbsafeedit_x86'
+        exclude 'assets/libwbsafeedit_x86_64'
+
+        exclude 'lib/armeabi-v7a/libRSSupport.so'
+        exclude 'lib/arm64-v8a/libRSSupport.so'
+        exclude 'lib/armeabi-v7a/librsjni.so'
+        exclude 'lib/arm64-v8a/librsjni.so'
+
+        resources.excludes += "com/j256/*"
+        resources.excludes += "org/apache/commons/codec/language/bm/*"
     }
 
     buildTypes {
@@ -106,7 +154,7 @@ android {
             zipAlignEnabled false
             signingConfig signingConfigs.debug
 
-            buildConfigField "String", "EXPOSURE_REPO", "\"test\""
+            buildConfigField "String", "EXPOSURE_REPO", "\"exposure\""
             buildConfigField "String", "EXPOSURE_VERSION", "\"E4\""
 
             multiDexKeepProguard file("tinker_multidexkeep.pro")
@@ -129,27 +177,51 @@ android {
     variantFilter { variant ->
         def names = variant.flavors*.name
         def isDebugType = variant.buildType.name == "debug"
-        if ((names.contains("tea")) && isDebugType) {
+        if ((names.contains("tea") || name.contains("kuaishou") || name.contains("gdt")) && isDebugType) {
             setIgnore(true)
         }
     }
 
-    flavorDimensions("env")
+    flavorDimensions("env", "region")
 
     sourceSets {
+
+        debug {
+            assets.srcDirs += 'src/main/assets-debug'
+        }
+
+        release {
+            assets.srcDirs += 'src/main/assets-release'
+        }
+
         publish {
             java.srcDirs = ['src/main/java', "src/default/java"]
         }
         internal {
-            java.srcDirs = ['src/main/java', "src/default/java"]
+            java.srcDirs = ['src/main/java', "src/default/java", "src/internal/java"]
         }
         tea {
             java.srcDirs = ['src/main/java', 'src/tea/java']
         }
+        kuaishou {
+            java.srcDirs = ['src/main/java', 'src/kuaishou/java']
+        }
+        gdt {
+            java.srcDirs = ['src/main/java', 'src/gdt/java']
+        }
+        gat {
+            java.srcDirs = ['src/main/java', 'src/gat/java']
+        }
+        cn {
+            java.srcDirs = ['src/main/java', 'src/cn/java']
+        }
+        sm {
+            java.srcDirs = ['src/main/java', 'src/sm/java']
+        }
     }
 
     productFlavors {
-        // internal test dev host
+        // internal， 内部测试包使用的 flavor，接口包含包括测试和正式环境
         internal {
             dimension "env"
             versionNameSuffix "-debug"
@@ -157,15 +229,29 @@ android {
             buildConfigField "String", "DEV_API_HOST", "\"${DEV_API_HOST}\""
             buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_DEV_API_HOST}\""
             buildConfigField "String", "DEV_VAPI_HOST", "\"${DEV_VAPI_HOST}\""
+            buildConfigField "String", "QUICK_LOGIN_APPID", "\"${DEV_QUICK_LOGIN_APPID}\""
+            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${DEV_QUICK_LOGIN_APPKEY}\""
+            buildConfigField "String", "DEV_CSJ_APPID", "\"${DEV_CSJ_APPID}\""
+            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
+
+            buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}-debug\""
+            manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}-debug")
         }
 
-        // publish release host
+        // publish， 发布时候使用的 flavor，接口仅包含正式环境
         publish {
             dimension "env"
 
             buildConfigField "String", "DEV_API_HOST", "\"${API_HOST}\""
             buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_API_HOST}\""
             buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
+            buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
+            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
+            buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
+            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
+
+            buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}\""
+            manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}")
         }
 
         tea {
@@ -174,14 +260,80 @@ android {
             buildConfigField "String", "DEV_API_HOST", "\"${API_HOST}\""
             buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_API_HOST}\""
             buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
+            buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
+            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
+            buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
+            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
+
+            buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}\""
 
             manifestPlaceholders.put("APPLOG_SCHEME", "rangersapplog.byAx6uYt".toLowerCase())
+            manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}")
         }
-    }
 
-    lintOptions {
-        // For flutter release build, see https://github.com/flutter/flutter/issues/58247
-        checkReleaseBuilds false
+        kuaishou {
+            dimension "env"
+
+            buildConfigField "String", "DEV_API_HOST", "\"${API_HOST}\""
+            buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_API_HOST}\""
+            buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
+            buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
+            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
+            buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
+            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
+
+            buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}\""
+            manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}")
+        }
+
+        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", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
+            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
+
+            buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}\""
+            manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}")
+        }
+
+        sm {
+            dimension "env"
+
+            buildConfigField "String", "DEV_API_HOST", "\"${API_HOST}\""
+            buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_API_HOST}\""
+            buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
+            buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
+            buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
+            buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
+            buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
+
+            buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}\""
+            manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}")
+        }
+
+        // 港澳台
+        gat {
+            dimension "region"
+
+            applicationId rootProject.ext.applicationIdGat
+
+            // 支持繁体
+            resConfigs "zh", "zh-rTW"
+
+            buildConfigField "boolean", "IS_GAT_APP", "true"
+            buildConfigField "String", "LOG_HUB_PROJECT", "\"${LOG_HUB_PROJECT_GAT}\""
+            buildConfigField "String", "API_HOST", "\"${API_HOST_GAT}\""
+            buildConfigField "String", "NEW_API_HOST", "\"${NEW_API_HOST_GAT}\""
+        }
+
+        cn {
+            dimension "region"
+        }
     }
 }
 
@@ -191,19 +343,35 @@ repositories {
     }
 }
 
+// 删除不需要的 assets
+android.applicationVariants.configureEach { variant ->
+    variant.mergeAssets.doLast {
+        def assetDir = variant.mergeAssetsProvider.get().outputDir.get()
+        def unwantedAssets = ['1832823466', 'gdt_plugin/gdtadv2.jar']
+
+        unwantedAssets.each { assetPath ->
+            def file = new File([assetDir, assetPath].join(File.separator))
+            if (file.exists()) {
+                file.delete()
+            }
+        }
+    }
+}
+
 dependencies {
 
     implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
 
     teaImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/tea/libs')
-    testImplementation 'junit:junit:4.12'
+    kuaishouImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/kuaishou/libs')
+    gdtImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/gdt/libs')
+    smImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/sm/libs')
 
     debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakcanary}"
+    debugImplementation "com.squareup.leakcanary:leakcanary-android-process:${leakcanary}"
 
 //    debugImplementation "com.gu.android:toolargetool:${toolargetool}" // 需要使用调试时才启用
     debugImplementation "com.github.nichbar:WhatTheStack:${whatTheStack}"
-    debugImplementation "io.github.didi.dokit:dokitx:${dokit}"
-
 
     implementation "androidx.multidex:multidex:${multiDex}"
     implementation "androidx.fragment:fragment-ktx:${fragment}"
@@ -211,11 +379,10 @@ dependencies {
     implementation "androidx.annotation:annotation:${annotation}"
 
     implementation "androidx.viewpager2:viewpager2:${viewpager2}"
-    kapt "androidx.room:room-compiler:${room}"
+    ksp("androidx.room:room-compiler:${room}")
 
-    implementation "com.kyleduo.switchbutton:library:${switchButton}"
-
-    implementation "com.leon.channel:helper:${apkChannelPackage}"
+    implementation "com.tencent.vasdolly:helper:${apkChannelPackage}"
+    implementation "com.tencent.vasdolly:writer:${apkChannelPackage}"
 
     implementation "com.j256.ormlite:ormlite-android:${ormlite}"
     implementation "com.j256.ormlite:ormlite-core:${ormlite}"
@@ -236,13 +403,14 @@ dependencies {
         exclude module: "gsyvideoplayer-androidvideocache"
         exclude group: "tv.danmaku.ijk.media"
     })
-    implementation "com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-exo_player2:$gsyVideo"
-
-//    implementation "androidx.work:work-runtime:${workManager}"
+    implementation("com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-exo_player2:$gsyVideo") {
+        exclude group: 'com.google.android.exoplayer', module: 'extension-rtmp'
+    }
 
     implementation "com.llew.huawei:verifier:${verifier}"
 
     teaImplementation "com.bytedance.applog:RangersAppLog-Lite-cn:${bytedanceApplog}"
+    teaImplementation "com.bytedance.ads:AppConvert:${bytedanceAppConvert}"
 
     implementation "net.lingala.zip4j:zip4j:${zip4j}"
 
@@ -251,27 +419,130 @@ dependencies {
 
     implementation "com.lg:easyfloat:${easyFloat}"
 
-    implementation "io.github.florent37:shapeofview:${shapeOfView}"
-
-    implementation "com.lg:apksig:${apksig}"
+    implementation("com.lg:apksig:${apksig}") {
+        exclude group: 'com.google.protobuf'
+    }
 
     implementation "com.lg:gid:${gid}"
 
-    compileOnly "com.github.axen1314.lancet:lancet-base:${lancet_version}"
-    kapt "com.alibaba:arouter-compiler:$arouterVersion"
+    implementation "com.lg:shortcut:${shortcut}"
 
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${desugarJdkLibs}"
+
+    kapt "com.google.auto.service:auto-service:${autoServiceVersion}"
+    ksp "cn.therouter:apt:${routerVersion}"
+
+    implementation project(':ndownload')
     implementation project(':vspace-bridge:vspace')
+    implementation(project(':feature:xapk-installer'))
 
-    implementation (project(':module_common')) {
+    implementation(project(':module_common')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
+
     implementation(project(':module_login')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
-    implementation(project(':module_energy')) {
+
+    implementation(project(':module_core_feature')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
+
+    implementation(project(':module_setting')) {
+        exclude group: 'androidx.swiperefreshlayout'
+    }
+
+//    implementation(project(':module_setting_compose')) {
+//        exclude group: 'androidx.swiperefreshlayout'
+//    }
+
+    if (!gradle.ext.excludeOptionalModules || gradle.ext.enablePkg) {
+        implementation(project(':feature:pkg'))
+    }
+
+    if (!gradle.ext.excludeOptionalModules || gradle.ext.enableFeedback) {
+        implementation(project(':feature:new_feedback')) {
+            exclude group: 'androidx.swiperefreshlayout'
+        }
+    }
+
+    if (!gradle.ext.excludeOptionalModules || gradle.ext.enableMessage) {
+        implementation(project(':module_message')) {
+            exclude group: 'androidx.swiperefreshlayout'
+        }
+    }
+
+    if (!gradle.ext.excludeOptionalModules || gradle.ext.enableOaid) {
+        implementation(project(':feature:oaid'))
+    }
+
+    if (!gradle.ext.excludeOptionalModules || gradle.ext.enableFloatingWindow) {
+        implementation(project(':feature:floating-window'))
+    }
+
+    if (!gradle.ext.excludeOptionalModules || gradle.ext.enableSensorData) {
+        implementation(project(':module_sensors_data')) {
+            exclude group: 'androidx.swiperefreshlayout'
+        }
+    }
+
+    if (!gradle.ext.excludeOptionalModules || gradle.ext.enableCsjAd) {
+        implementation(project(':feature:csj_ad'))
+    }
+
+    if (!gradle.ext.excludeOptionalModules || gradle.ext.enableQQGame) {
+        implementation(project(':feature:qq_game')) {
+            exclude group: 'androidx.swiperefreshlayout'
+        }
+    }
+
+    if (!gradle.ext.excludeOptionalModules || gradle.ext.enablePush) {
+        def pushProperty = findProperty('BUILD_PUSH_TYPE')
+        // 根据BUILD_PUSH_TYPE决定使用哪个推送SDK，目前默认使用极光推送
+        def pushProject = (pushProperty == null || pushProperty == 'jg')
+                ? project(':feature:jg_push') : project(':feature:acloud_push')
+
+        implementation(pushProject) {
+            exclude group: 'androidx.swiperefreshlayout'
+        }
+    }
+
+    if (!gradle.ext.excludeOptionalModules || gradle.ext.enableSentry) {
+        implementation(project(':feature:sentry'))
+    }
+
+    if (gradle.ext.enableRouteDoc) {
+        ksp project(":feature:route_doc")
+    }
+
+    implementation(project(':feature:media_select'))
+
+    implementation(project(":module_va_api"))
+    implementation(project(":va-archive-common"))
+    if (!gradle.ext.excludeOptionalModules || gradle.ext.enableVa) {
+        implementation(project(":module_va_impl"))
+    }
+    debugImplementation "com.bytedance.tools.codelocator:codelocator-core:2.0.3"
+    internalImplementation(project(':module_internal_test'))
+
+    debugImplementation 'com.bytedance.android:shadowhook:1.0.9'
+    debugImplementation 'io.github.shiqos:wytrace:1.0.1'
+
+    if (!gradle.ext.excludeOptionalModules || gradle.ext.enableAccelerator) {
+        implementation(project(":feature:accelerator"))
+    }
+
+    if (!gradle.ext.excludeOptionalModules || gradle.ext.enableAliPay) {
+        implementation(project(":feature:ali_pay"))
+    }
+
+    if(!gradle.ext.excludeOptionalModules || gradle.ext.enableWechatPay){
+        implementation(project(":feature:wechat_pay"))
+    }
+
+    implementation "me.xdrop:fuzzywuzzy:${fuzzyVersion}"
 }
+
 File propFile = file('sign.properties')
 if (propFile.exists()) {
     Properties props = new Properties()
@@ -329,124 +600,6 @@ if (propFile.exists()) {
 //    }.each { t -> t.dependsOn generateMetaJson }
 //}
 
-andResGuard {
-    mappingFile = null
-    use7zip = true
-    useSign = true
-    // 打开这个开关，会keep住所有资源的原始路径，只混淆资源的名字
-    keepRoot = false
-    // 设置这个值，会把arsc name列混淆成相同的名字，减少string常量池的大小
-    fixedResName = "arg"
-    // 打开这个开关会合并所有哈希值相同的资源，但请不要过度依赖这个功能去除去冗余资源
-    mergeDuplicatedRes = true
-    whiteList = [
-            "R.drawable.icon",
-            "R.drawable.ic_bar_back",
-            "R.drawable.toolbar_search_icon",
-            "R.drawable.bg_notification_answer_style_1",
-            "R.drawable.bg_notification_answer_style_2",
-            "R.drawable.bg_notification_article_style_1",
-            "R.drawable.bg_notification_article_style_2",
-            "R.drawable.bg_notification_feedback_style_1",
-            "R.drawable.bg_notification_feedback_style_2",
-            "R.drawable.bg_notification_gift_style_1",
-            "R.drawable.bg_notification_gift_style_2",
-            "R.drawable.bg_notification_login_style_1",
-            "R.drawable.bg_notification_login_style_2",
-            "R.drawable.bg_notification_question_style_1",
-            "R.drawable.bg_notification_question_style_2",
-            "R.drawable.bg_notification_rating_style_1",
-            "R.drawable.bg_notification_rating_style_2",
-            "R.drawable.bg_notification_reserve_game_style_1",
-            "R.drawable.bg_notification_reserve_game_style_2",
-            "R.drawable.bg_notification_video_style_1",
-            "R.drawable.bg_notification_video_style_2",
-            "R.drawable.ic_search_no_1",
-            "R.drawable.ic_search_no_2",
-            "R.drawable.ic_search_no_3",
-            "R.drawable.ic_search_no_4",
-            "R.drawable.ic_search_no_5",
-            "R.drawable.ic_search_no_6",
-            "R.drawable.ic_search_no_7",
-            "R.drawable.ic_search_no_8",
-            "R.drawable.ic_search_no_9",
-            "R.drawable.ic_search_no_10",
-            "R.drawable.ic_search_no_11",
-            "R.drawable.ic_search_no_12",
-            "R.drawable.ic_search_no_13",
-            "R.drawable.ic_search_no_14",
-            "R.drawable.ic_search_no_15",
-            "R.drawable.ic_search_no_16",
-            "R.drawable.ic_search_no_17",
-            "R.drawable.ic_search_no_18",
-            "R.drawable.ic_search_no_19",
-            "R.drawable.ic_search_no_20",
-            "R.drawable.ic_recommend_activity",
-            "R.drawable.ic_recommend_discount",
-            "R.drawable.ic_recommend_function",
-            "R.drawable.ic_recommend_gift",
-            "R.drawable.ic_recommend_role",
-            "R.drawable.download_button_normal_style",
-            "R.drawable.ic_quick_login_check",
-            "R.drawable.ic_quick_login_uncheck",
-            "R.anim.anim_auth_in",
-            "R.anim.anim_auth_out",
-            "R.id.download_speed",
-            "R.id.download_percentage",
-            "R.id.comment",
-            "R.id.vote",
-            "R.id.watermark_hint",
-            "R.id.watermark_sb",
-            "R.id.bottomShareIv",
-            "R.id.bottomShareTv",
-            "R.id.recommendStarPref",
-            "R.id.recommendStar",
-            "R.id.iv_vmode_badge",
-            "R.id.tv_vmode",
-            "R.id.iv_vmode",
-            "R.drawable.help_search_delete",
-            "R.drawable.suggest_type_normal",
-            "R.drawable.suggest_type_crash",
-            "R.drawable.suggest_type_game_question",
-            "R.drawable.suggest_type_game_collect",
-            "R.drawable.suggest_type_function_suggest",
-            "R.drawable.suggest_type_article_collect",
-            "R.drawable.suggest_type_copyright",
-            "R.drawable.help_result_empty",
-            "R.drawable.news_comment_detail_read",
-            "R.drawable.news_comment_detail_comment",
-            "R.drawable.news_comment_detail_share",
-            "R.drawable.ic_libao",
-            "R.drawable.ic_link",
-            "R.drawable.concern_message_icon",
-            "R.drawable.reuse_blank_hint",
-            "R.drawable.ic_concern",
-            "R.drawable.concern_down",
-            "R.drawable.concern_up",
-            "R.drawable.ic_libao_more",
-            "R.drawable.ic_libao_delete",
-            "R.drawable.ic_dialog_close",
-            "R.drawable.occupy2",
-            "R.drawable.kc_checkbox_unselect",
-            "R.drawable.kc_checkbox_select",
-            "R.drawable.ic_type_unselect",
-            "R.drawable.ic_type_selected",
-            "R.drawable.suggest_add_pic_icon",
-            "R.drawable.icon_pic_add",
-            "R.drawable.ask_search_input_delete",
-            "R.drawable.suggest_pic_delete"
-    ]
-    compressFilePattern = [
-            "*.png",
-            "*.jpg",
-            "*.jpeg",
-            "*.gif",
-    ]
-    sevenzip {
-        artifact = 'com.tencent.mm:SevenZip:1.2.20'
-    }
-}
-
 project.afterEvaluate {
     def variants = null
     try {

app/proguard-rules-legacy.txt

@@ -1,266 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in C:\Android\sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-#--------- remove logs start  ----------------
--assumenosideeffects class com.lightgame.config.CommonDebug {
-   private static String getLogTag(...);
-   private static String getMethodName();
-   public static void logMethodName(...);
-   public static void logParams(...);
-   public static void logFields(...);
-   public static void logMethodWithParams(...);
-}
-#-assumenosideeffects class com.lightgame.config.CommonDebug {*;}
-
-#-dontoptimize
-#--------- remove logs end  ----------------
-
--keepattributes *Annotation*,Signature,InnerClasses,EnclosingMethod
--dontwarn InnerClasses
-
-# OrmLite uses reflection
--keep class com.j256.**
--keepclassmembers class com.j256.** { *; }
--keep enum com.j256.**
--keepclassmembers enum com.j256.** { *; }
--keep interface com.j256.**
--keepclassmembers interface com.j256.** { *; }
--dontwarn com.j256.**
-
-#okhttp3
--dontwarn com.squareup.okhttp3.**
--dontwarn okio.**
--keep class com.squareup.okhttp3.** { *;}
-
-# stetho
--keep class com.facebook.stetho.** { *; }
--dontwarn com.facebook.stetho.**
-
-# Retrofit 2.2
-# Platform calls Class.forName on types which do not exist on Android to determine platform.
--dontnote retrofit2.Platform
-# Platform used when running on Java 8 VMs. Will not be used at runtime.
--dontwarn retrofit2.Platform$Java8
-# Retain generic type information for use by reflection by converters and adapters.
--keepattributes Signature
-# Retain declared checked exceptions for use by a Proxy instance.
--keepattributes Exceptions
-
-# Retrofit 2.X
-## https://square.github.io/retrofit/ ##
-
--dontwarn retrofit2.**
--keep class retrofit2.** { *; }
--keepattributes Signature
--keepattributes Exceptions
-
--keepclasseswithmembers class * {
-    @retrofit2.http.* <methods>;
-}
-
-
-# rxjava
--keep class rx.schedulers.Schedulers {
-    public static <methods>;
-}
--keep class rx.schedulers.ImmediateScheduler {
-    public <methods>;
-}
--keep class rx.schedulers.TestScheduler {
-    public <methods>;
-}
--keep class rx.schedulers.Schedulers {
-    public static ** test();
-}
--keepclassmembers class rx.internal.util.unsafe.*ArrayQueue*Field* {
-    long producerIndex;
-    long consumerIndex;
-}
--keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueProducerNodeRef {
-    long producerNode;
-    long consumerNode;
-}
--dontwarn rx.internal.util.**
-
-## AutoScrollViewPager
--keep class cn.trinea.android.** { *; }
--keepclassmembers class cn.trinea.android.** { *; }
--dontwarn cn.trinea.android.**
-
-## butterknife
-# Retain generated class which implement Unbinder.
-#-keep public class * implements butterknife.Unbinder { public <init>(**, android.view.View); }
-#
-## Prevent obfuscation of types which use ButterKnife annotations since the simple name
-## is used to reflectively look up the generated ViewBinding.
-#-keep class butterknife.*
-#-keepclasseswithmembernames class * { @butterknife.* <methods>; }
-#-keepclasseswithmembernames class * { @butterknife.* <fields>; }
-
--dontwarn butterknife.internal.**
--keep class **$$ViewInjector { *; }
--keepnames class * { @butterknife.InjectView *;}
--dontwarn butterknife.Views$InjectViewProcessor
--dontwarn com.gc.materialdesign.views.**
-
-# eventbus
--keepattributes *Annotation*
--keepclassmembers class ** {
-    @org.greenrobot.eventbus.Subscribe <methods>;
-}
--keep enum org.greenrobot.eventbus.ThreadMode { *; }
-
-# Only required if you use AsyncExecutor
--keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent {
-    <init>(java.lang.Throwable);
-}
-
-# weiboSdk
--keep class com.sina.weibo.sdk.** { *; }
--dontwarn android.webkit.WebView
--dontwarn android.webkit.WebViewClient
-
-# app models
--keep class com.gh.common.view.** {*;}
--keep class com.gh.gamecenter.db.info.** {*;}
--keep class com.gh.gamecenter.entity.** {*;}
--keep class com.gh.gamecenter.qa.entity.** {*;}
--keep class com.gh.gamecenter.retrofit.** {*;}
--keep class com.gh.gamecenter.eventbus.** {*;}
--keep class com.gh.gamecenter.video.detail.** {*;}
--keep class * extends rx.Subscriber
-
-#---------------------------------webview------------------------------------
--keepclassmembers class * extends android.webkit.WebViewClient {
-    public void *(android.webkit.WebView, java.lang.String, android.graphics.Bitmap);
-    public boolean *(android.webkit.WebView, java.lang.String);
-}
--keepclassmembers class * extends android.webkit.WebViewClient {
-    public void *(android.webkit.WebView, java.lang.String);
-}
-#----------------------------------------------------------------------------
-
-
-##---------------Begin: proguard configuration for Gson  ----------
-# Gson uses generic type information stored in a class file when working with fields. Proguard
-# removes such information by default, so configure it to keep all of it.
--keepattributes Signature
-
-# For using GSON @Expose annotation
--keepattributes *Annotation*
-
-# Gson specific classes
--keep class sun.misc.Unsafe { *; }
-#-keep class com.google.gson.stream.** { *; }
-
-# Prevent proguard from stripping interface information from TypeAdapterFactory,
-# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
--keep class * implements com.google.gson.TypeAdapterFactory
--keep class * implements com.google.gson.JsonSerializer
--keep class * implements com.google.gson.JsonDeserializer
-
--keepclassmembers enum * { *; }
-
-##---------------End: proguard configuration for Gson  ----------
-
-# ------ bugly ---------
--dontwarn com.tencent.bugly.**
--keep public class com.tencent.bugly.**{*;}
-
-# easypermission
--keepclassmembers class * {
-    @pub.devrel.easypermissions.AfterPermissionGranted <methods>;
-}
-
-# 重命名文件为SourceFile，再配合mapping符号表，可以拿到真实的类名
--renamesourcefileattribute SourceFile
-# 保留源文件行号
--keepattributes SourceFile,LineNumberTable
-
--ignorewarnings
-
--keep @androidx.annotation.Keep class *
--keepclassmembers class ** {
-    @androidx.annotation.Keep *;
-}
-
--keep class com.gh.loghub.** { *; }
-
-### greenDAO 3
--keepclassmembers class * extends org.greenrobot.greendao.AbstractDao {
-    public static java.lang.String TABLENAME;
-}
--keep class **$Properties
--keep class org.greenrobot.greendao.** { *; }
-# If you do not use SQLCipher:
--dontwarn org.greenrobot.greendao.database.**
-# If you do not use RxJava:
--dontwarn rx.**
--dontwarn org.greenrobot.greendao.rx.**
--dontwarn org.greenrobot.greendao.**
-
-### fastJson
--dontwarn com.alibaba.fastjson.**
--keep class com.alibaba.fastjson.** { *; }
--keepattributes Signature
--keepattributes Annotation
-
-### AndroidX
--keep class androidx.core.app.CoreComponentFactory { *; }
-
-#阿里云上传
--keep class com.alibaba.sdk.android.oss.** { *; }
--dontwarn okio.**
--dontwarn org.apache.commons.codec.binary.**
-
-#视频相关
--keep class com.shuyu.gsyvideoplayer.video.** { *; }
--dontwarn com.shuyu.gsyvideoplayer.video.**
--keep class com.shuyu.gsyvideoplayer.video.base.** { *; }
--dontwarn com.shuyu.gsyvideoplayer.video.base.**
--keep class com.shuyu.gsyvideoplayer.utils.** { *; }
--dontwarn com.shuyu.gsyvideoplayer.utils.**
--keep class tv.danmaku.ijk.** { *; }
--dontwarn tv.danmaku.ijk.**
--keep public class * extends android.view.View{
-    *** get*();
-    void set*(***);
-    public <init>(android.content.Context);
-    public <init>(android.content.Context, android.util.AttributeSet);
-    public <init>(android.content.Context, android.util.AttributeSet, int);
-}
-
-#穿山甲
--keep class com.bytedance.sdk.openadsdk.** { *; }
--keep public interface com.bytedance.sdk.openadsdk.downloadnew.** {*;}
--keep class com.pgl.sys.ces.* {*;}
-
--keep class com.gyf.immersionbar.* {*;}
--dontwarn com.gyf.immersionbar.**
-
--keep class com.taobao.securityjni.**{*;}
--keep class com.taobao.wireless.security.**{*;}
--keep class com.ut.secbody.**{*;}
--keep class com.taobao.dp.**{*;}
--keep class com.alibaba.wireless.security.**{*;}
-
--keep class com.alibaba.sdk.android.**{*;}
--keep class com.ut.**{*;}
--keep class com.ta.**{*;}
-
--keep class com.gh.gamecenter.TeaHelper { *; }

app/proguard-rules.txt

@@ -1,30 +1,7 @@
 
-#--------- remove logs start  ----------------
--assumenosideeffects class com.lightgame.config.CommonDebug {
-   private static String getLogTag(...);
-   private static String getMethodName();
-   public static void logMethodName(...);
-   public static void logParams(...);
-   public static void logFields(...);
-   public static void logMethodWithParams(...);
-}
-
--assumenosideeffects class com.lightgame.utils.Utils {
-   public static void log(...);
-}
-#--------- remove logs end  ----------------
-
 # inline getter method
 -allowaccessmodification
 
-#--------- remove useless mtahelper class --------
--assumenosideeffects class com.gh.gamecenter.core.utils.MtaHelper {
-    public static void onEvent(...);
-    public static void onEventWithTime(...);
-    public static void onEventWithBasicDeviceInfo(...);
-}
-#--------- remove useless mta class end ----
-
 # TODO Dicard sourceFile in final release build but remain in internal build.
 -renamesourcefileattribute SourceFile
 # Keep Attribute
@@ -39,77 +16,38 @@
 -keepclassmembers interface com.j256.* { *; }
 -dontwarn com.j256.**
 
-# 避免 gson 找不到 enum
--keepclassmembers enum * { *; }
-
-### AutoScrollViewPager
--keep class cn.trinea.android.* { *; }
--keepclassmembers class cn.trinea.android.* { *; }
--dontwarn cn.trinea.android.**
-
-### eventbus
--keepclassmembers class * {
-    @org.greenrobot.eventbus.Subscribe <methods>;
-}
--keep enum org.greenrobot.eventbus.ThreadMode { *; }
-
-### Only required if you use AsyncExecutor
--keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent {
-    <init>(java.lang.Throwable);
-}
-
-### weiboSdk
--keep class com.sina.weibo.sdk.** { *; }
--dontwarn android.webkit.WebView
--dontwarn android.webkit.WebViewClient
-
-### wechatSdk
-### TODO 这里用 com.tencent.*{*;} 不起效？但其它地方可以？
--keep class com.tencent.**{*;}
-
 ### app models
--keep class com.gh.common.view.* {*;}
 -keep class com.gh.gamecenter.db.info.* {*;}
--keep class com.gh.gamecenter.entity.* {*;}
--keep class com.gh.gamecenter.common.entity.* {*;}
--keep class com.gh.gamecenter.qa.entity.* {*;}
--keep class com.gh.gamecenter.login.entity.* {*;}
--keep class com.gh.gamecenter.energy.entity.* {*;}
+-keep class com.gh.gamecenter.entity.** {<fields>;}
+-keep class com.gh.gamecenter.qa.entity.** {<fields>;}
+-keep class com.gh.gamecenter.gamedetail.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.common.eventbus.* {*;}
--keep class com.gh.gamecenter.energy.eventbus.* {*;}
--keep class com.gh.gamecenter.video.detail.* {*;}
--keep class com.gh.gamecenter.home.gamecollection.* {*;}
+-keep class com.gh.gamecenter.home.gamecollection.carousel.GameCollectionStackLayout {*;}
+-keep class com.gh.gamecenter.home.gamecollection.carousel.GameCollectionStackAnimation {*;}
 
-###
--keepclassmembers class * extends android.webkit.WebViewClient {
-    public void *(android.webkit.WebView, java.lang.String, android.graphics.Bitmap);
-    public boolean *(android.webkit.WebView, java.lang.String);
-}
--keepclassmembers class * extends android.webkit.WebViewClient {
-    public void *(android.webkit.WebView, java.lang.String);
+# Prevent R8 from leaving Data object members always null
+-keepclassmembers,allowobfuscation class * {
+  @com.google.gson.annotations.SerializedName <fields>;
 }
 
-### easypermission
--keepclassmembers class * {
-    @pub.devrel.easypermissions.AfterPermissionGranted <methods>;
-}
+# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
+# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
+-keep class * extends com.google.gson.TypeAdapter
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+
+# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher.
+-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
+-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
 
 # TODO What's this ?
 -ignorewarnings
 
-### Keep Annotation
--keep @androidx.annotation.Keep class *
--keepclassmembers class * {
-    @androidx.annotation.Keep *;
-}
-
-### 阿里云上传
--keep class com.alibaba.sdk.android.oss.* { *; }
--dontwarn okio.**
--dontwarn org.apache.commons.codec.binary.**
-
 ### 视频相关
 -keep class com.shuyu.gsyvideoplayer.video.* { *; }
 -dontwarn com.shuyu.gsyvideoplayer.video.**
@@ -119,7 +57,7 @@
 -dontwarn com.shuyu.gsyvideoplayer.utils.**
 -keep class tv.danmaku.ijk.* { *; }
 -dontwarn tv.danmaku.ijk.**
--keep public class * extends android.view.View{
+-keep public class * extends android.view.View {
     *** get*();
     void set*(***);
     public <init>(android.content.Context);
@@ -127,51 +65,36 @@
     public <init>(android.content.Context, android.util.AttributeSet, int);
 }
 
--keep class com.alibaba.sdk.android.*{*;}
--keep class com.ut.*{*;}
--keep class com.ta.*{*;}
+### 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 { *; }
-
-### 阿里云日志
--keep class com.aliyun.sls.android.producer.* { *; }
--keep interface com.aliyun.sls.android.producer.* { *; }
-
-### 中国移动一键登录
--dontwarn com.cmic.sso.sdk.**
--keep class com.cmic.sso.sdk.* { *; }
+-keep class com.bytedance.ads.convert.broadcast.common.EncryptionTools {*;}
 
 ### EasyFloat
 -keep class com.lzf.easyfloat.* {*;}
 
-### 避免 WebChromeClient 被混淆
--keepclassmembers class * extends android.webkit.WebChromeClient{
-    public void openFileChooser(...);
+### 广点通SDK
+-dontwarn com.qq.gdt.action.**
+-keep class com.qq.gdt.action.** {*;}
+-keep public class com.tencent.turingfd.sdk.**
+
+### 神马 SDK
+-dontwarn com.gism.**
+
+-keepclasseswithmembers class * {
+native <methods>;
 }
 
-### emoji4j
--keep class emoji4j.* {*;}
-
-### dokit
--keep class com.didichuxing.** {*;}
-
-# Flutter模块
--keep class com.gh.common.util.DirectUtils {
-    public static void directToQa(...);
-    public static void directToQaCollection(...);
-    public static void directToGift(...);
-    public static void directToConcernInfo(...);
-    public static void directToFeedback(...);
-    public static void directToSuggestion(...);
+-keepclassmembernames class com.contrarywind.view.WheelView {
+    private int itemsVisible;
 }
 
-# ARouter
--keep public class com.alibaba.android.arouter.routes.**{*;}
--keep public class com.alibaba.android.arouter.facade.**{*;}
--keep class * implements com.alibaba.android.arouter.facade.template.ISyringe{*;}
-# 如果使用了 byType 的方式获取 Service，需添加下面规则，保护接口
--keep interface * implements com.alibaba.android.arouter.facade.template.IProvider
-# 如果使用了 单类注入，即不定义接口实现 IProvider，需添加下面规则，保护实现
--keep class * implements com.alibaba.android.arouter.facade.template.IProvider
-

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

@@ -1,26 +0,0 @@
-package com.gh.gamecenter.provider
-
-import android.app.Application
-import android.text.TextUtils
-import com.gh.gamecenter.common.constant.Config
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.utils.PackageFlavorHelper
-import com.gh.gamecenter.core.utils.SPUtils
-import com.leon.channel.helper.ChannelReaderUtil
-
-class ChannelProviderImp : ChannelProvider {
-    override fun getChannelStr(application: Application): String {
-        var channel = ChannelReaderUtil.getChannel(application)
-        if (channel == null || TextUtils.isEmpty(channel.trim())) {
-            channel = if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-                Config.DEFAULT_CHANNEL
-            } else {
-                Config.DEFAULT_CHANNEL_FOR_RELEASE
-            }
-        }
-        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-            channel = SPUtils.getString(Constants.SP_TEST_FLAVOR_CHANNEL, channel)
-        }
-        return channel
-    }
-}

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

@@ -0,0 +1,40 @@
+package com.gh.gamecenter.provider
+
+import android.app.Activity
+import android.app.Application
+import android.text.TextUtils
+import com.gh.gamecenter.common.constant.Config
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.utils.PackageFlavorHelper
+import com.gh.gamecenter.core.provider.IFlavorProvider
+import com.gh.gamecenter.core.utils.SPUtils
+import com.tencent.vasdolly.helper.ChannelReaderUtil
+
+class FlavorProviderImp : IFlavorProvider {
+    override fun getChannelStr(application: Application): String {
+        var channel = ChannelReaderUtil.getChannel(application)
+        if (channel == null || TextUtils.isEmpty(channel.trim())) {
+            channel = if (PackageFlavorHelper.IS_TEST_FLAVOR) {
+                Config.DEFAULT_CHANNEL
+            } else {
+                Config.DEFAULT_CHANNEL_FOR_RELEASE
+            }
+        }
+        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
+            channel = SPUtils.getString(Constants.SP_TEST_FLAVOR_CHANNEL, channel)
+        }
+        return channel
+    }
+
+    override fun init(application: Application, activity: Activity, activateRatio: Int) {
+        // do nothing
+    }
+
+    override fun logEvent(content: String) {
+        // do nothing
+    }
+
+    override fun logCoreEvent() {
+        // do nothing
+    }
+}

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

@@ -0,0 +1,47 @@
+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 com.qq.gdt.action.PrivateController
+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) {
+        GDTAction.setPrivateController(object : PrivateController() {
+            override fun isCanUsePhoneState(): Boolean {
+                return false
+            }
+        })
+
+        if (channel == "KS_GDT_GHZS_MC01") {
+            GDTAction.init(application, KS_USER_ACTION_SET_ID, KS_APP_SECRET_ID, channel)
+        } else {
+            GDTAction.init(application, USER_ACTION_SET_ID, APP_SECRET_ID, channel)
+        }
+
+        GDTAction.start()
+
+        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

@@ -0,0 +1,52 @@
+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.tencent.vasdolly.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/java/com/gh/vspace/ExternalGameUsage.kt

@@ -0,0 +1,42 @@
+package com.gh.vspace
+
+import android.content.Intent
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.Keep
+import com.gh.gamecenter.R
+import com.gh.gamecenter.core.utils.ToastUtils
+import com.gh.gamecenter.databinding.LayoutPersonalOtherItemBinding
+import com.gh.vspace.installexternalgames.InstallExternalGameActivity
+import com.lightgame.utils.Utils
+import java.io.File
+
+@Keep
+class ExternalGameUsage : ITestCase {
+
+    private fun buttonTemplate(viewParent: ViewGroup, id: Int, fn: (LayoutPersonalOtherItemBinding) -> Unit) {
+        val context = viewParent.context
+        viewParent.findViewById<View>(id) ?: run {
+            val binding = LayoutPersonalOtherItemBinding.inflate(LayoutInflater.from(context)).apply {
+                root.id = id
+                fn(this)
+            }
+            viewParent.addView(binding.root, 0)
+        }
+    }
+
+    override fun addInstallExternalGameButton(viewParent: ViewGroup) {
+        val context = viewParent.context
+        buttonTemplate(viewParent, R.id.install_game_from_external) {
+            it.titleTv.text = context.getString(R.string.title_install_external_game)
+            it.iconIv.setImageResource(R.drawable.ic_personal_my_game)
+            it.root.setOnClickListener {
+                context.startActivity(
+                    InstallExternalGameActivity.getIntent(context)
+                        .apply { flags = flags or Intent.FLAG_ACTIVITY_NEW_TASK })
+            }
+        }
+    }
+
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,231 @@
+package com.gh.vspace.installexternalgames
+
+import android.Manifest
+import android.app.Dialog
+import android.content.ComponentName
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Bundle
+import android.os.Environment
+import android.provider.Settings
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AlertDialog
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.gh.common.util.DialogUtils
+import com.gh.gamecenter.common.base.fragment.ToolbarFragment
+import com.gh.gamecenter.common.exposure.meta.MetaUtil
+import com.gh.gamecenter.common.utils.dip2px
+import com.gh.gamecenter.common.utils.toColor
+import com.gh.gamecenter.common.utils.viewModelProvider
+import com.gh.gamecenter.common.view.divider.HorizontalDividerItemDecoration
+import com.gh.gamecenter.core.AppExecutor
+import com.gh.gamecenter.databinding.FragmentInstallExternalGamesBinding
+import com.gh.vspace.VHelper
+import com.halo.assistant.HaloApp
+import com.lg.vspace.VirtualAppManager
+import com.lightgame.download.DownloadEntity
+import io.reactivex.Single
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.Disposable
+import io.reactivex.schedulers.Schedulers
+
+class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
+
+    private val mViewModel: InstallExternalGameViewModel by lazy { viewModelProvider() }
+
+    private lateinit var mBinding: FragmentInstallExternalGamesBinding
+
+    private val games = mutableListOf<ExternalGameUiState>()
+    private var adapter = ExternalGameAdapter(games, this)
+
+    private var uninstallDisposable: Disposable? = null
+
+
+    private var shouldScan = false
+
+    override fun getLayoutId() = 0
+
+    override fun getInflatedLayout() =
+        FragmentInstallExternalGamesBinding.inflate(layoutInflater).apply { mBinding = this }.root
+
+    private lateinit var dialog: Dialog
+
+
+    private val requestPermissionLauncher = registerForActivityResult<String, Boolean>(
+        ActivityResultContracts.RequestPermission()
+    ) { result ->
+        if (result == true) {
+            // grant
+            mViewModel.scanPaths()
+        } else {
+            // not grant
+        }
+    }
+
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setNavigationTitle(getString(com.gh.gamecenter.R.string.title_install_external_game))
+        initView()
+        mViewModel.gamesList.observe(this) {
+            if (dialog.isShowing) {
+                dialog.dismiss()
+            }
+            games.clear()
+            games.addAll(
+                it.map {
+                    ExternalGameUiState(it, VHelper.isInstalled(it.apkPackageName))
+                }
+            )
+            adapter.notifyDataSetChanged()
+        }
+
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            if (!Environment.isExternalStorageManager()) {
+                shouldScan = true
+                AlertDialog.Builder(requireContext()).setMessage("请在设置页面允许光环助手")
+                    .setNegativeButton("去") { dialog, which ->
+                        val intent = Intent(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION)
+                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        startActivity(intent)
+                    }.show()
+            } else {
+                mViewModel.scanPaths()
+            }
+        } else {
+            requestStoragePermission()
+        }
+
+
+    }
+
+    private fun requestStoragePermission() {
+        when {
+            ContextCompat.checkSelfPermission(
+                requireContext(),
+                Manifest.permission.READ_EXTERNAL_STORAGE
+            ) == PackageManager.PERMISSION_GRANTED -> {
+                mViewModel.scanPaths()
+            }
+
+            shouldShowRequestPermissionRationale(Manifest.permission.READ_EXTERNAL_STORAGE) -> {
+                requestPermissionLauncher.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
+            }
+
+            else -> {
+                requestPermissionLauncher.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
+            }
+        }
+    }
+
+    override fun onStart() {
+        super.onStart()
+        if (shouldScan) {
+            mViewModel.scanPaths()
+        }
+    }
+
+    private fun initView() {
+        dialog = DialogUtils.showWaitDialog(requireContext(), "")
+        mBinding.externalGamesList.let {
+            it.adapter = adapter
+            it.layoutManager = LinearLayoutManager(requireContext())
+            val itemDecoration = HorizontalDividerItemDecoration.Builder(requireContext())
+                .size(2F.dip2px())
+                .color(com.gh.gamecenter.common.R.color.ui_divider.toColor(requireContext()))
+                .build()
+            if (it.itemDecorationCount != 0) {
+                it.removeItemDecorationAt(0)
+            }
+            it.addItemDecoration(itemDecoration)
+
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        if (dialog.isShowing) {
+            dialog.dismiss()
+        }
+        if (uninstallDisposable?.isDisposed != true) {
+            uninstallDisposable?.dispose()
+        }
+    }
+
+
+    override fun onItemClick(externalGameUiState: ExternalGameUiState, clickType: OnItemClickListener.ClickType) {
+        when (clickType) {
+            OnItemClickListener.ClickType.CLICK_INSTALL -> {
+                install(externalGameUiState)
+            }
+
+            OnItemClickListener.ClickType.CLICK_UNINSTALL -> {
+                uninstall(externalGameUiState)
+            }
+
+            OnItemClickListener.ClickType.CLICK_START -> {
+                start(externalGameUiState)
+            }
+        }
+    }
+
+    private fun install(externalGameUiState: ExternalGameUiState) {
+
+        VHelper.disableLaunchGameAfterInstallation()
+        VHelper.install(requireContext(), DownloadEntity().apply {
+            externalGameUiState.externalGameEntity.apply {
+                packageName = apkPackageName
+                path = apkPath
+            }
+        }, true)
+
+        VHelper.newCwValidateVspaceBeforeAction(
+            requireContext(), null,
+        ) {
+            dialog.show()
+        }
+
+    }
+
+    private fun uninstall(externalGameUiState: ExternalGameUiState) {
+        dialog.show()
+        uninstallDisposable = Single.create<Void> {
+            VHelper.uninstall(externalGameUiState.externalGameEntity.apkPackageName)
+        }.subscribeOn(Schedulers.from(AppExecutor.lightWeightIoExecutor)).observeOn(AndroidSchedulers.mainThread())
+            .subscribe { t1, t2 ->
+                if (dialog.isShowing) {
+                    dialog.dismiss()
+                }
+            }
+    }
+
+
+    private fun start(externalGameUiState: ExternalGameUiState) {
+        val intent = VirtualAppManager.get().getStartGameIntent(
+            externalGameUiState.externalGameEntity.apkPackageName,
+            "",
+            externalGameUiState.externalGameEntity.appName,
+            "",
+            MetaUtil.getBase64EncodedAndroidId(),
+            HaloApp.getInstance().gid,
+            com.gh.gamecenter.BuildConfig.VERSION_NAME,
+            HaloApp.getInstance().channel,
+            "",
+            "",
+            com.gh.gamecenter.BuildConfig.VA_VERSION_NAME,
+            HaloApp.getInstance().oaid
+        )
+        intent.setComponent(
+            ComponentName(
+                com.gh.gamecenter.BuildConfig.APPLICATION_ID,
+                VirtualAppManager.AIDL_SERVER_REMOTE_GUIDE_ACTIVITY
+            )
+        )
+        requireActivity().startActivity(intent)
+    }
+
+
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,10 @@
+<?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

@@ -0,0 +1,30 @@
+package com.gh.gamecenter
+
+import android.content.Context
+import com.kwai.monitor.log.TurboAgent
+import com.kwai.monitor.log.TurboConfig
+
+object KuaishouHelper {
+    private val mAppId by lazy { BuildConfig.SDK_APP_ID.ifEmpty { "81537" } }
+    private val mAppName by lazy { BuildConfig.SDK_APP_NAME.ifEmpty { "guanghuanzhushou_1" } }
+
+    @JvmStatic
+    fun init(context: Context, channel: String) {
+        TurboAgent.init(
+            TurboConfig.TurboConfigBuilder.create(context)
+                .setAppId(mAppId)
+                .setAppName(mAppName)
+                .setAppChannel(channel)
+                .build()
+        )
+    }
+
+    @JvmStatic
+    fun onEvent(type: String) {
+        when (type) {
+            "EVENT_ACTIVE" -> TurboAgent.onAppActive()
+            "active_register" -> TurboAgent.onRegister()
+            "EVENT_NEXTDAY_STAY" -> TurboAgent.onNextDayStay()
+        }
+    }
+}

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

@@ -0,0 +1,65 @@
+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.tencent.vasdolly.helper.ChannelReaderUtil
+
+class FlavorProviderImp : IFlavorProvider {
+
+    override fun init(application: Application, activity: Activity, activateRatio: Int) {
+        KuaishouHelper.init(application, getChannelStr(application))
+
+        if (HaloApp.getInstance().isBrandNewInstall) {
+            logEvent("EVENT_ACTIVE")
+            SPUtils.setLong("TIME_OF_BRAND_NEW_INSTALL", System.currentTimeMillis() / 1000)
+        } else {
+            val shouldSendRetentionLogEvent =
+                SPUtils.getBoolean("SHOULD_SEND_RETENTION_EVENT", true)
+            val installTimeNotToday =
+                !TimeUtils.isToday(SPUtils.getLong("TIME_OF_BRAND_NEW_INSTALL", System.currentTimeMillis() / 1000))
+            if (shouldSendRetentionLogEvent && installTimeNotToday) {
+                logEvent("EVENT_NEXTDAY_STAY")
+                SPUtils.setBoolean("SHOULD_SEND_RETENTION_EVENT", false)
+            }
+        }
+    }
+
+    override fun getChannelStr(application: Application): String {
+        var channel = if (BuildConfig.USE_DEFAULT_CHANNEL_SDK) {
+            ChannelReaderUtil.getChannel(application)
+        } else {
+            TurboHelper.getChannel(application)
+        }
+        if (channel == null || TextUtils.isEmpty(channel.trim())) {
+            channel = KUAISHOU_CHANNEL
+        }
+        return channel
+    }
+
+    override fun logEvent(content: String) {
+        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

@@ -6,6 +6,30 @@
     <queries>
         <package android:name="com.gh.gamecenter" />
     </queries>
+
+    <queries>
+        <package android:name="com.gh.toolmap" />
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="ghtoolmap" />
+        </intent>
+    </queries>
+
+    <queries>
+        <package android:name="com.lg.vspace" />
+        <package android:name="com.gh.gamecenter.addon" />
+    </queries>
+
+    <!-- 华为/荣耀角标 -->
+    <uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE " />
+    <uses-permission android:name="com.hihonor.android.launcher.permission.CHANGE_BADGE" />
+    <!-- vivo角标 -->
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
+
+    <uses-permission
+        android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
+        tools:ignore="ScopedStorage" />
     <!-- 允许应用程序访问网络连接 -->
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- 允许应用程序写入外部存储，如SD卡上写文件 -->
@@ -26,9 +50,9 @@
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
     <!-- 应用安装相关 -->
     <uses-permission android:name="com.android.permission.GET_INSTALLED_APPS" />
-
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
     <!-- 前台服务权限-->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <uses-permission
         android:name="android.permission.PACKAGE_USAGE_STATS"
@@ -41,7 +65,18 @@
     <!-- 如果有视频相关的广告且使用textureView播放，请务必添加，否则黑屏 -->
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
-    <uses-sdk tools:overrideLibrary="com.shuyu.gsyvideoplayer,
+    <!-- 悬浮窗 -->
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+
+    <!-- 适配 双开/分身 游戏授权登录 -->
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
+
+    <!--  日历  -->
+    <uses-permission android:name="android.permission.READ_CALENDAR" />
+    <uses-permission android:name="android.permission.WRITE_CALENDAR" />
+
+    <uses-sdk tools:overrideLibrary="
+        com.shuyu.gsyvideoplayer,
         com.shuyu.gsyvideoplayer.lib,
         com.haroldadmin.whatthestack,
         com.shuyu.gsyvideoplayer.armv7a,
@@ -51,7 +86,60 @@
         com.google.android.exoplayer2,
         tv.danmaku.ijk.media.exo2,
         pl.droidsonroids.gif,
-        com.lzf.easyfloat" />
+        com.lzf.easyfloat,
+        com.airbnb.lottie.compose,
+        androidx.compose.ui.platform,
+        androidx.compose.material.icons,
+        androidx.activity.compose,
+        androidx.compose.ui.tooling,
+        androidx.compose.ui.tooling.data,
+        androidx.compose.material.ripple,
+        androidx.compose.foundation,
+        androidx.compose.animation,
+        androidx.compose.foundation.layout,
+        androidx.compose.ui.text,
+        androidx.compose.ui.graphics,
+        androidx.compose.ui.unit,
+        androidx.compose.ui.util,
+        androidx.compose.ui.geometry,
+        androidx.compose.runtime.saveable,
+        androidx.compose.animation.core,
+        androidx.constraintlayout.compose,
+        androidx.compose.ui.test.manifest,
+        com.bytedance.sdk.openadsdk,
+        com.bykv.vk.openvk,
+        com.bytedance.tools,
+        androidx.compose.ui.tooling.preview,
+        com.tencent.qqmini,
+        com.tencent.qqmini.minigame.external,
+        com.tencent.qqmini.minigame.opensdk,
+        com.tencent.qqmini.union.ad,
+        com.lg.vspace,
+        io.lg.va.common,
+        com.va.floating,
+        com.lg.cloud,
+        com.lg.archive,
+        com.lg.vclient,
+        com.va.realname,
+        com.lg.vspace.flavor,
+        com.lg.update,
+        com.lg.login,
+        com.lg.accelerator,
+        com.lody.virtual,
+        com.lg.core,
+        com.lg.ads,
+        com.lg.common,
+        com.lg.vspace.network,
+        com.lody.virtual.lib.res,
+        com.va.host,
+        com.lg.vspace.plugin.host,
+        com.lg.plugin.constant,
+        com.bytedance.tools.codelocator,
+        org.chickenhook.restrictionbypass,
+        com.lody.virtual.sandhook,
+        com.lg.vspace.common,
+        com.lg.vspace.archive.common,
+        com.wy.lib.wytrace" />
 
     <!-- 去掉 SDK 一些流氓权限 -->
     <uses-permission
@@ -66,6 +154,18 @@
         android:name="android.permission.GET_TASKS"
         tools:node="remove" />
 
+    <uses-permission
+        android:name="android.permission.ACCESS_COARSE_LOCATION"
+        tools:node="remove" />
+
+    <uses-permission
+        android:name="android.permission.ACCESS_BACKGROUND_LOCATION"
+        tools:node="remove" />
+
+    <uses-permission
+        android:name="android.permission.ACCESS_FINE_LOCATION"
+        tools:node="remove" />
+
     <supports-screens
         android:anyDensity="true"
         android:largeScreens="true"
@@ -80,10 +180,17 @@
         android:icon="@mipmap/logo"
         android:label="@string/app_name"
         android:largeHeap="true"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:preserveLegacyExternalStorage="true"
+        android:requestLegacyExternalStorage="true"
         android:resizeableActivity="true"
         android:theme="@style/AppCompatTheme.APP"
         tools:replace="android:name,android:allowBackup"
-        tools:targetApi="n">
+        tools:targetApi="r">
+
+        <meta-data
+            android:name="EasyGoClient"
+            android:value="true" />
 
         <meta-data
             android:name="io.sentry.auto-init"
@@ -94,6 +201,12 @@
             android:name="io.sentry.breadcrumbs.system-events"
             android:value="false" />
 
+        <meta-data
+            android:name="module_version"
+            android:value="${VA_VERSION_NAME}" />
+
+        <service android:name="com.gh.ndownload.NDownloadService" />
+
         <activity
             android:name="com.gh.gamecenter.SplashScreenActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -110,10 +223,15 @@
         <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" />
+            android:windowSoftInputMode="stateAlwaysHidden|adjustResize">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+            </intent-filter>
+        </activity>
 
         <activity
             android:name="com.gh.gamecenter.DownloadManagerActivity"
@@ -145,11 +263,7 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="com.gh.gamecenter.NewsDetailActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.SettingActivity"
+            android:name="com.gh.gamecenter.newsdetail.NewsDetailActivity"
             android:screenOrientation="portrait" />
 
         <activity
@@ -175,7 +289,7 @@
 
         <activity
             android:name="com.gh.gamecenter.WebActivity"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
 
         <activity
             android:name="com.gh.gamecenter.SingletonWebActivity"
@@ -204,7 +318,7 @@
             android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name="com.gh.gamecenter.LibaoDetailActivity"
+            android:name="com.gh.gamecenter.libao.LibaoDetailActivity"
             android:screenOrientation="portrait" />
 
         <activity
@@ -215,22 +329,6 @@
             android:name="com.gh.gamecenter.CleanApkActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.SelectUserIconActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.AboutActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.security.SecurityActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.security.BindPhoneActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.gh.gamecenter.CommentDetailActivity"
             android:screenOrientation="portrait"
@@ -245,27 +343,16 @@
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.SuggestionActivity"
-            android:screenOrientation="portrait" />
         <activity
             android:name="com.gh.gamecenter.VoteActivity"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
+            android:windowSoftInputMode="stateAlwaysHidden|adjustPan" />
 
         <activity
             android:name="com.gh.gamecenter.WeiBoShareActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden" />
 
-        <activity
-            android:name=".category.CategoryDirectoryActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".category.CategoryListActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.gh.gamecenter.UserInfoActivity"
             android:screenOrientation="portrait" />
@@ -278,55 +365,19 @@
             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"
             android:windowSoftInputMode="stateHidden" />
 
-        <activity
-            android:name="com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".qa.answer.fold.AnswerFoldActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            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" />
 
-        <activity
-            android:name="com.gh.gamecenter.qa.myqa.MyAskActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.gh.gamecenter.qa.questions.edit.QuestionEditActivity"
             android:screenOrientation="portrait" />
@@ -348,10 +399,6 @@
             android:name="com.gh.gamecenter.amway.AmwayActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.NetworkDiagnosisActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.gh.gamecenter.personalhome.fans.FansActivity"
             android:screenOrientation="portrait" />
@@ -368,10 +415,6 @@
             android:name="com.gh.gamecenter.qa.article.edit.ArticleEditActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.qa.article.MyArticleActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.gh.gamecenter.qa.article.draft.ArticleDraftActivity"
             android:screenOrientation="portrait" />
@@ -380,10 +423,6 @@
             android:name="com.gh.gamecenter.qa.article.detail.ArticleDetailActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.qa.article.detail.comment.ArticleDetailCommentActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.gh.gamecenter.qa.draft.CommunityDraftWrapperActivity"
             android:screenOrientation="portrait" />
@@ -414,10 +453,6 @@
             android:name="com.gh.gamecenter.history.HistoryActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.personalhome.rating.RatingActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.gh.gamecenter.gamedetail.rating.logs.CommentLogsActivity"
             android:screenOrientation="portrait" />
@@ -439,13 +474,6 @@
             android:name="com.gh.gamecenter.video.game.GameVideoActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.qa.editor.LocalMediaActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.gh.gamecenter.mygame.PlayedGameActivity"
-            android:screenOrientation="portrait" />
 
         <activity
             android:name="com.gh.gamecenter.servers.GameServersActivity"
@@ -463,15 +491,6 @@
             android:name="com.halo.assistant.fragment.user.UserPortraitCropImageActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.HelpAndFeedbackActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden" />
-
-        <activity
-            android:name="com.gh.gamecenter.help.HelpDetailActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.gh.gamecenter.qa.comment.CommentActivity"
             android:theme="@style/Theme.Transparent"
@@ -487,21 +506,19 @@
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:screenOrientation="portrait"
             android:theme="@style/TransparentStatusBarAndNavigationBar" />
-        <activity
-            android:name=".gamedetail.myrating.MyRatingActivity"
-            android:screenOrientation="portrait" />
 
         <activity
             android:name="com.gh.gamecenter.gamedetail.fuli.kaifu.ServersCalendarActivity"
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="com.gh.gamecenter.QaActivity"
+            android:name=".gamedetail.fuli.kaifu.ServersCalendarManagementActivity"
             android:screenOrientation="portrait" />
 
         <activity
-            android:name=".qa.answer.draft.AnswerDraftActivity"
+            android:name=".gamedetail.fuli.kaifu.ServersSubscribedGameListActivity"
             android:screenOrientation="portrait" />
+
         <activity
             android:name=".gamedetail.rating.RatingFoldActivity"
             android:screenOrientation="portrait" />
@@ -509,18 +526,6 @@
             android:name=".video.data.VideoDataActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name=".video.poster.PosterEditActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".video.poster.PosterClipActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".forum.select.ForumSelectActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name=".forum.detail.ForumDetailActivity"
             android:screenOrientation="portrait" />
@@ -562,22 +567,10 @@
             android:name=".simulatorgame.SimulatorManagementActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name=".catalog.CatalogActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".catalog.NewCatalogListActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name=".forum.search.ForumOrUserSearchActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name=".personal.NewPersonalActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name=".qa.questions.draft.QuestionDraftActivity"
             android:screenOrientation="portrait" />
@@ -594,22 +587,10 @@
             android:name=".personal.DeliveryInfoActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name=".qa.editor.PreviewVideoActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name=".qa.video.publish.VideoPublishActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name=".setting.GameDownloadSettingActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".setting.VideoSettingActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name=".qa.video.detail.ForumVideoDetailActivity"
             android:screenOrientation="portrait" />
@@ -638,6 +619,10 @@
             android:name=".game.commoncollection.detail.CommonCollectionDetailActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name=".game.commoncollection.detail.CustomCommonCollectionDetailActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name=".gamecollection.detail.GameCollectionDetailActivity"
             android:screenOrientation="portrait" />
@@ -658,8 +643,9 @@
         <!--            android:theme="@android:style/Theme.Translucent" />-->
 
         <activity
+            android:name="com.gh.gamecenter.SkipCompatActivity"
             android:exported="true"
-            android:name="com.gh.gamecenter.SkipActivity"
+            android:launchMode="singleTask"
             android:theme="@style/Theme.AppCompat.Light.Fullscreen.Transparent">
             <intent-filter>
                 <data android:scheme="ghzhushou" />
@@ -678,6 +664,20 @@
             </intent-filter>
         </activity>
 
+        <!--    光环助手授权登陆页面    -->
+        <activity
+            android:name=".authorization.AuthorizationActivity"
+            android:exported="true"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:taskAffinity=".auth">
+            <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" />
@@ -716,14 +716,16 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="com.gh.gamecenter.toolbox.ToolBoxBlockActivity"
+            android:name="com.gh.gamecenter.toolbox.ToolBoxActivity"
             android:screenOrientation="portrait" />
 
-        <activity android:name="com.gh.vspace.VDownloadManagerActivity"
+        <activity
+            android:name="com.gh.vspace.VDownloadManagerActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
 
-        <activity android:name="com.gh.vspace.VSpaceLoadingActivity"
+        <activity
+            android:name="com.gh.vspace.VSpaceLoadingActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
 
@@ -735,6 +737,93 @@
             android:name=".qa.comment.NewCommentDetailActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="com.gh.gamecenter.mypost.MyPostActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".VerifyPhoneActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".BbsCertificationActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".discovery.DiscoveryActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".cloudarchive.CloudArchiveManagerActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".savegame.GameArchiveListActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".discovery.interestedgame.InterestedGameActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".servers.gametest2.GameServerTestV2Activity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.gamecollection.hotlist.GameCollectionHotListActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.minigame.qq.QGameHomeWrapperActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.minigame.MiniGameSearchActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.gamecollection.hotlist.GameCollectionListDetailActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.UserAuthActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.SplashAdActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.wrapper.ToolbarWrapperActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".forum.home.CommunityActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".forum.home.follow.FollowDynamicActivity"
+            android:theme="@style/Theme.Transparent" />
+
+        <activity
+            android:name=".forum.home.follow.AllFollowedActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppCompatTheme.APP" />
+
+        <activity
+            android:name=".search.SearchTabActivity"
+            android:configChanges="keyboardHidden"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppCompatTheme.APP" />
+
+        <activity
+            android:name=".video.poster.PosterEditActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.halo.assistant.accelerator.MyAssetsActivity"
+            android:screenOrientation="portrait" />
+
         <!--        <activity-->
         <!--            android:name="${applicationId}.douyinapi.DouYinEntryActivity"-->
         <!--            android:launchMode="singleTask"-->
@@ -745,7 +834,8 @@
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}"
             android:exported="false"
-            android:grantUriPermissions="true">
+            android:grantUriPermissions="true"
+            tools:replace="android:authorities">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/provider_paths" />
@@ -755,19 +845,39 @@
             android:name="com.gh.gamecenter.provider.GhContentProvider"
             android:authorities="${applicationId}.provider"
             android:enabled="true"
-            android:exported="true"/>
+            android:exported="true" />
 
-<!--        <provider-->
-<!--            android:name="androidx.startup.InitializationProvider"-->
-<!--            android:authorities="${applicationId}.androidx-startup"-->
-<!--            android:exported="false"-->
-<!--            tools:node="merge">-->
-<!--            &lt;!&ndash; If you are using androidx.startup to initialize other components &ndash;&gt;-->
-<!--            <meta-data-->
-<!--                android:name="androidx.work.WorkManagerInitializer"-->
-<!--                android:value="androidx.startup"-->
-<!--                tools:node="remove" />-->
-<!--        </provider>-->
+        <provider
+            android:name="com.gh.vspace.VFileProvider"
+            android:authorities="${applicationId}.virtual_file_provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths" />
+        </provider>
+
+
+        <service
+            android:name=".aidl.CommunicationService"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.gh.gamecenter.aidl.CommunicationService" />
+            </intent-filter>
+        </service>
+
+        <!--        <provider-->
+        <!--            android:name="androidx.startup.InitializationProvider"-->
+        <!--            android:authorities="${applicationId}.androidx-startup"-->
+        <!--            android:exported="false"-->
+        <!--            tools:node="merge">-->
+        <!--            &lt;!&ndash; If you are using androidx.startup to initialize other components &ndash;&gt;-->
+        <!--            <meta-data-->
+        <!--                android:name="androidx.work.WorkManagerInitializer"-->
+        <!--                android:value="androidx.startup"-->
+        <!--                tools:node="remove" />-->
+        <!--        </provider>-->
 
         <receiver
             android:name="com.gh.gamecenter.receiver.DownloadReceiver"
@@ -784,6 +894,11 @@
             </intent-filter>
         </receiver>
 
+        <activity
+            android:name="com.gh.common.xapk.XapkInstallReceiver"
+            android:exported="false"
+            android:theme="@style/Theme.Transparent" />
+
         <receiver
             android:name="com.gh.gamecenter.receiver.ActivitySkipReceiver"
             android:exported="true">
@@ -791,40 +906,6 @@
                 <action android:name="com.gh.gamecenter.ACTIVITYSKIP" />
             </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

@@ -0,0 +1,27 @@
+{
+    "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/editor.html

@@ -6,8 +6,6 @@
     <link rel="stylesheet" type="text/css" href="normalize.css">
     <link rel="stylesheet" type="text/css" href="style.css">
     <link rel="stylesheet" type="text/css" href="video-js.min.css">
-<!--    <link rel="stylesheet" href="https://static-web.ghzs.com/website-static/lib/video-js.min.css">--> <!--在web页面播放视频-->
-    <!--<link rel="stylesheet" type="text/css" href="https://resource.ghzs.com/css/halo_app.css">-->
 </head>
 
 <body style="overflow-x: hidden; word-break: break-all;">
@@ -15,8 +13,5 @@
 <script type="text/javascript" src="zepto.min.js"></script>
 <script type="text/javascript" src="rich_editor.js"></script>
 <script type="text/javascript" src="video.min.js"></script>
-<!--<script src="https://static-web.ghzs.com/website-static/lib/video.min.js"></script>--> <!--在web页面播放视频-->
-<!--<script type="text/javascript" src="content.js"></script>-->
-<!--<script type="text/javascript" src="https://resource.ghzs.com/js/halo_app.js"></script>-->
 </body>
 </html>

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

@@ -1 +0,0 @@
-{"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

@@ -1 +0,0 @@
-{"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/downloadtips_dark.json

@@ -0,0 +1 @@
+{"v":"5.9.1","fr":60,"ip":0,"op":100,"w":64,"h":64,"nm":"多版本下载提示_dark","ddd":0,"assets":[{"id":"comp_0","nm":"arrow 合成_dark","fr":60,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"arrow","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.333],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":24,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":76,"s":[100]},{"t":100,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.333,"y":1},"o":{"x":0.364,"y":0},"t":0,"s":[28,-12,0],"to":[0,6.382,0],"ti":[0,-0.284,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":24,"s":[28,28,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.667,"y":0},"t":76,"s":[28,28,0],"to":[0,6.667,0],"ti":[0,-6.667,0]},{"t":100,"s":[28,68,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":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0,2],[0,-2]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2,0],[0,2]],"c":false},"ix":2},"nm":"路径 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[2,0],[0,2]],"c":false},"ix":2},"nm":"路径 3","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.333,0.333],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":0,"s":[80,120]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":24,"s":[100,100]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":76,"s":[100,100]},{"t":100,"s":[80,120]}],"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":"组 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.156862750649,0.533333361149,0.878431379795,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"stroke","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[400,400],"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":"Vector 97","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":100,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"arrow 合成_dark","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[32,32,0],"ix":2,"l":2},"a":{"a":0,"k":[28,28,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":56,"h":56,"ip":0,"op":100,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"base","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[32,32,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":[{"d":1,"ty":"el","s":{"a":0,"k":[15,15],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.156862750649,0.533333361149,0.878431379795,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"stroke","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.137254908681,0.137254908681,0.137254908681,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"filling","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":[400,400],"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":"Ellipse 44","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":100,"st":0,"bm":0}],"markers":[]}

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

@@ -0,0 +1 @@
+{"v":"5.9.1","fr":60,"ip":0,"op":100,"w":64,"h":64,"nm":"多版本下载提示_light","ddd":0,"assets":[{"id":"comp_0","nm":"arrow 合成_light","fr":60,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"arrow","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.333],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":24,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":76,"s":[100]},{"t":100,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.333,"y":1},"o":{"x":0.364,"y":0},"t":0,"s":[28,-12,0],"to":[0,6.382,0],"ti":[0,-0.284,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":24,"s":[28,28,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.667,"y":0},"t":76,"s":[28,28,0],"to":[0,6.667,0],"ti":[0,-6.667,0]},{"t":100,"s":[28,68,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":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0,2],[0,-2]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2,0],[0,2]],"c":false},"ix":2},"nm":"路径 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[2,0],[0,2]],"c":false},"ix":2},"nm":"路径 3","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.333,0.333],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":0,"s":[80,120]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":24,"s":[100,100]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":76,"s":[100,100]},{"t":100,"s":[80,120]}],"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":"组 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.141176477075,0.588235318661,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"stroke","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[400,400],"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":"Vector 97","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":100,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"arrow 合成_light","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[32,32,0],"ix":2,"l":2},"a":{"a":0,"k":[28,28,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":56,"h":56,"ip":0,"op":100,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"base","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[32,32,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":[{"d":1,"ty":"el","s":{"a":0,"k":[15,15],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.141176477075,0.588235318661,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"stroke","mn":"ADBE Vector Graphic - Stroke","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":"filling","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":[400,400],"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":"Ellipse 44","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":100,"st":0,"bm":0}],"markers":[]}

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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1 @@
+{"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

@@ -1 +0,0 @@
-{"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/assets/lottie/switch_turnoff.json

@@ -1 +0,0 @@
-{"v":"5.6.9","fr":60,"ip":0,"op":36,"w":120,"h":66,"nm":"开关动画-关闭","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"按钮手柄","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.667,"y":0},"t":0,"s":[87,33,0],"to":[7.682,0,0],"ti":[-13.443,0,0]},{"i":{"x":0.333,"y":1},"o":{"x":0.333,"y":0},"t":18,"s":[31,33,0],"to":[2.306,0,0],"ti":[-1.318,0,0]},{"t":24,"s":[33,33,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":[16,16],"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":37,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"指示器-on","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[100]},{"t":18,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,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":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":0,"s":[6.5,6.5]},{"t":18,"s":[4.5,4.5]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.966666666667,0.966666666667,0.966666666667,0.420000005762],"ix":3},"o":{"a":0,"k":40,"ix":4},"w":{"a":0,"k":1.5,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","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":37,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"指示器-off","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[87,33,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":[{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":0,"s":[1.5,4]},{"t":18,"s":[1.5,6]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0.75,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":5,"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":90,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[0]},{"t":18,"s":[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":37,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"按钮背景","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[60,33,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"sy":[{"c":{"a":0,"k":[0,0,0,1],"ix":2},"o":{"a":0,"k":5,"ix":3},"a":{"a":0,"k":120,"ix":5},"s":{"a":0,"k":1,"ix":8},"d":{"a":0,"k":0,"ix":6},"ch":{"a":0,"k":100,"ix":7},"bm":{"a":0,"k":5,"ix":1},"no":{"a":0,"k":0,"ix":9},"ty":2,"nm":"内阴影"}],"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[40,22],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":12,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[0.141176477075,0.588235318661,1,1]},{"t":18,"s":[0.933333337307,0.933333337307,0.933333337307,1]}],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"filling","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0.118,0.006],"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":37,"st":0,"bm":0}],"markers":[]}

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

@@ -1 +0,0 @@
-{"v":"5.6.9","fr":30,"ip":0,"op":20,"w":66,"h":66,"nm":"bottom bar tab/论坛/选中/E","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"白-修正","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,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.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":4,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":9,"s":[110,110,100]},{"t":13,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":1,"y":0},"t":0,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.5,-1.3],[2.5,0],[0,2.5],[-2.5,0],[-2.5,-1.3],[-1.3,-2.5],[1.3,-2.5]],"c":true}]},{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":4,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.5,-0.102],[2.5,0],[0,2.109],[-2.5,0],[-2.5,-0.102],[-1.3,-1.302],[1.3,-1.302]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":1,"y":0},"t":9,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.498,-1.845],[2.5,0],[0,2.734],[-2.5,0],[-2.502,-1.845],[-1.302,-3.045],[1.298,-3.045]],"c":true}]},{"t":13,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.5,-1.3],[2.5,0],[0,2.5],[-2.5,0],[-2.5,-1.3],[-1.3,-2.5],[1.3,-2.5]],"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":150,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"蓝","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33.76,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":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.8,0.42],[-3.44,-0.79],[-0.09,-1.71],[0,0],[0,0],[1.98,-0.1],[0,0],[0,0],[0,0],[0.62,0.57],[0,0],[0,0],[0,0],[0,0],[0,0],[0.2,1.89],[0,0],[0,0],[0,0]],"o":[[3.44,-0.79],[1.74,0.41],[0,0],[0,0],[0,2],[0,0],[0,0],[0,0],[-0.69,0.52],[0,0],[0,0],[0,0],[0,0],[0,0],[-1.94,0],[0,0],[0,0],[0,0],[0,-1.8]],"v":[[-6.39,-8.971],[6.39,-8.971],[9.49,-5.471],[9.5,-5.271],[9.5,3.249],[5.95,6.989],[5.75,6.999],[3.25,6.999],[0.3,9.209],[-1.95,9.089],[-2.06,8.969],[-2.17,8.849],[-2.21,8.779],[-3.4,6.999],[-5.75,6.999],[-9.48,3.639],[-9.49,3.449],[-9.5,3.249],[-9.5,-5.271]],"c":true},"ix":2},"nm":"路径 1","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,0.266,0.638,1,0.5,0.242,0.595,1,1,0.217,0.552,1],"ix":9}},"s":{"a":0,"k":[-9.5,-9.561],"ix":5},"e":{"a":0,"k":[9.5,9.561],"ix":6},"t":1,"nm":"color","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}],"ip":0,"op":150,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"预合成 1","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2},"a":{"a":0,"k":[33,33,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":0,"s":[100,100,100]},{"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":4,"s":[70,70,100]},{"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":9,"s":[110,110,100]},{"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":13,"s":[90,90,100]},{"t":16,"s":[100,100,100]}],"ix":6}},"ao":0,"w":66,"h":66,"ip":0,"op":20,"st":0,"bm":0}],"markers":[]}

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

@@ -0,0 +1 @@
+{"v":"5.12.2","fr":60,"ip":0,"op":40,"w":66,"h":66,"nm":"icon_tab_my","ddd":0,"assets":[{"id":"comp_0","nm":"icon","fr":60,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"highlight","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33.134,34.5,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":1,"k":[{"i":{"x":0.667,"y":0.733},"o":{"x":0.333,"y":0},"t":0,"s":[{"i":[[0,-0.004],[0.493,0],[0,0.004],[-0.493,0]],"o":[[0,0.004],[-0.493,0],[0,-0.004],[0.493,0]],"v":[[0.893,1.488],[0,1.496],[-0.893,1.488],[0,1.483]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0.267},"t":10,"s":[{"i":[[0,-1.018],[1.793,0],[0,1.018],[-1.793,0]],"o":[[0,1.018],[-1.793,0],[0,-1.018],[1.793,0]],"v":[[2.914,-0.344],[0,1.5],[-2.914,-0.344],[0,-1.5]],"c":true}]},{"i":{"x":0.333,"y":1},"o":{"x":0.667,"y":0},"t":18,"s":[{"i":[[0,-1.181],[1.407,0],[0,1.181],[-1.407,0]],"o":[[0,1.181],[-1.407,0],[0,-1.181],[1.407,0]],"v":[[2.226,-0.341],[0,1.74],[-2.211,-0.341],[0,-1.74]],"c":true}]},{"i":{"x":0.333,"y":1},"o":{"x":0.667,"y":0},"t":26,"s":[{"i":[[0,-0.905],[1.381,0],[0,0.905],[-1.381,0]],"o":[[0,0.905],[-1.381,0],[0,-0.905],[1.381,0]],"v":[[2.5,-0.306],[0,1.333],[-2.5,-0.306],[0,-1.333]],"c":true}]},{"t":32,"s":[{"i":[[0,-1.018],[1.381,0],[0,1.018],[-1.381,0]],"o":[[0,1.018],[-1.381,0],[0,-1.018],[1.381,0]],"v":[[2.5,-0.344],[0,1.5],[-2.5,-0.344],[0,-1.5]],"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":"color","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":60,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"body","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,34.204,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":[[-3.866,0],[0,3.866],[3.866,0],[0,-3.866]],"o":[[3.866,0],[0,-3.866],[-3.866,0],[0,3.866]],"v":[[0,4.599],[7,-2.401],[0,-9.401],[-7,-2.401]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.207,0.359],[2.438,0],[1.189,-2.104],[-0.361,-0.204],[-0.204,0.361],[-1.915,0],[-0.932,-1.613],[-0.359,0.207]],"o":[[-1.198,-2.072],[-2.462,0],[-0.204,0.361],[0.361,0.204],[0.925,-1.638],[1.897,0],[0.207,0.359],[0.359,-0.207]],"v":[[5.848,8.225],[0,4.849],[-5.88,8.282],[-5.596,9.304],[-4.574,9.02],[0,6.349],[4.549,8.976],[5.574,9.25]],"c":true},"ix":2},"nm":"路径 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"合并路径 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.267,0.639,1,0.5,0.241,0.596,1,1,0.216,0.553,1],"ix":9}},"s":{"a":0,"k":[-3.812,-4.384],"ix":5},"e":{"a":0,"k":[6.345,8.129],"ix":6},"t":1,"nm":"color","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":"Union","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"ct":1,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"icon","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2,"l":2},"a":{"a":0,"k":[33,33,0],"ix":1,"l":2},"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":0,"s":[100,100,100]},{"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":8,"s":[70,70,100]},{"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":18,"s":[110,110,100]},{"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":26,"s":[90,90,100]},{"t":32,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"w":66,"h":66,"ip":0,"op":60,"st":0,"bm":0}],"markers":[],"props":{}}

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

@@ -1 +0,0 @@
-{"v":"5.5.9","fr":30,"ip":0,"op":20,"w":66,"h":66,"nm":"tab_video","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"形状图层 1","parent":2,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.771],"y":[0]},"t":0,"s":[0]},{"t":5,"s":[100]}],"ix":11},"r":{"a":0,"k":90,"ix":10},"p":{"a":0,"k":[-3.742,6.835,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[30.937,31.042,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"sr","sy":2,"d":1,"pt":{"a":0,"k":3,"ix":3},"p":{"a":0,"k":[0,0],"ix":4},"r":{"a":0,"k":0,"ix":5},"or":{"a":0,"k":29.286,"ix":7},"os":{"a":0,"k":75,"ix":9},"ix":1,"nm":"多边星形路径 1","mn":"ADBE Vector Shape - Star","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":13,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-20.75,-13.25],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[102.743,88.578],"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":"多边星形 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.657],"y":[0]},"t":0,"s":[0]},{"t":8,"s":[100]}],"ix":2},"o":{"a":0,"k":-115,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":60,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"路径 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33.004,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.508,0.508,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.488,0.488,0.333],"y":[0,0,0]},"t":4,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.502,0.502,0.333],"y":[0,0,0]},"t":9,"s":[110,110,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.534,0.534,0.333],"y":[0,0,0]},"t":13,"s":[95,95,100]},{"t":16,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[2.16,0.38],[3.22,-0.55],[0.38,-2.16],[-0.55,-3.22],[-2.16,-0.38],[-1.63,0],[-1.61,0.27],[-0.38,2.16],[0.55,3.22]],"o":[[-0.38,-2.16],[-3.22,-0.55],[-2.16,0.38],[-0.55,3.22],[0.38,2.16],[1.61,0.27],[1.63,0],[2.16,-0.38],[0.55,-3.22],[0,0]],"v":[[9.09,-4.86],[4.86,-9.09],[-4.86,-9.09],[-9.09,-4.86],[-9.09,4.86],[-4.86,9.09],[0,9.5],[4.86,9.09],[9.09,4.86],[9.09,-4.86]],"c":true},"ix":2},"nm":"路径 1","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,0.266,0.638,1,0.5,0.242,0.595,1,1,0.217,0.552,1],"ix":9}},"s":{"a":0,"k":[-5.174,-4.43],"ix":5},"e":{"a":0,"k":[8.612,8.214],"ix":6},"t":1,"nm":"Gradient Fill 3","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}],"ip":0,"op":60,"st":0,"bm":0}],"markers":[]}

app/src/main/assets/rich_editor.js

@@ -34,18 +34,18 @@ try {
 var script = document.createElement("script")
 document.body.appendChild(script)
 if (isDebug) {
-    script.src = "https://resource.ghzs.com/js/halo_app_test.js" + "?timestamp=" + Math.round(new Date().getTime() / 1000)
+    script.src = "https://dev-and-static.ghzs66.com/web/js/halo.js" + "?timestamp=" + Math.round(new Date().getTime() / 1000)
 } else {
-    script.src = "https://resource.ghzs.com/js/halo.js" + "?timestamp=" + Math.round(new Date().getTime() / 1000 / 1000)
+    script.src = "https://and-static.ghzs66.com/web/js/halo.js" + "?timestamp=" + Math.round(new Date().getTime() / 1000 / 1000)
 }
 
 var style = document.createElement("link")
 style.rel = "stylesheet"
 style.type = "text/css"
 if (isDebug) {
-    style.href = "https://resource.ghzs.com/css/halo_app_test.css" + "?timestamp=" + Math.round(new Date().getTime() / 1000)
+    style.href = "https://dev-and-static.ghzs66.com/web/css/halo.css" + "?timestamp=" + Math.round(new Date().getTime() / 1000)
 } else {
-    style.href = "https://resource.ghzs.com/css/halo.css" + "?timestamp=" + Math.round(new Date().getTime() / 1000 / 1000)
+    style.href = "https://and-static.ghzs66.com/web/css/halo.css" + "?timestamp=" + Math.round(new Date().getTime() / 1000 / 1000)
 }
 
 document.head.appendChild(style)
@@ -205,14 +205,17 @@ RE.setOutdent = function() {
 
 RE.setJustifyLeft = function() {
     document.execCommand('justifyLeft', false, null);
+    RE.enabledEditingItems()
 }
 
 RE.setJustifyCenter = function() {
     document.execCommand('justifyCenter', false, null);
+    RE.enabledEditingItems()
 }
 
 RE.setJustifyRight = function() {
     document.execCommand('justifyRight', false, null);
+    RE.enabledEditingItems()
 }
 
 RE.setBlockquote = function() {
@@ -227,6 +230,16 @@ RE.insertImage = function(url) {
     RE.insertHTML(html);
 }
 
+// 设置分割线
+RE.insertHorizontalRule = function() {
+    document.execCommand('insertHorizontalRule', false, null);
+}
+
+// 设置编辑器默认换行符
+RE.setDefaultParagraphSeparator = function(separator) {
+    document.execCommand('defaultParagraphSeparator', false, separator);
+}
+
 // 替换成缩略图
 RE.replaceTbImage = function(imgRuleFlag, gifRuleFlag) {
     var imgs = document.getElementsByTagName("img");
@@ -574,6 +587,10 @@ document.addEventListener("selectionchange", function(e) {
    RE.sendElementNameToNative()
 });
 
+document.addEventListener("selectionchange", function(e) {
+   setTimeout(() => RE.enabledEditingItems(e), 10)
+});
+
 RE.recursion = function(dom) {
     var parenDom = dom.parentElement
     if (parenDom && parenDom instanceof Element &&
@@ -616,7 +633,6 @@ RE.sendElementNameToNative = function() {
 // android function to open link
 function customLinkgo(self) {
   var datas = self.dataset.datas
-  // console.log(datas)
   window.OnLinkClickListener.onClick(datas)
 }
 

app/src/main/assets/style.css

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

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

@@ -0,0 +1,811 @@
+package com.gh.ad
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.content.Context
+import android.content.SharedPreferences
+import android.graphics.drawable.Animatable
+import android.os.Build
+import android.os.Message
+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.therouter.TheRouter
+import com.facebook.drawee.controller.BaseControllerListener
+import com.facebook.drawee.view.SimpleDraweeView
+import com.facebook.imagepipeline.image.ImageInfo
+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
+import com.gh.common.util.PackageUtils
+import com.gh.gamecenter.BuildConfig
+import com.gh.gamecenter.MainActivity
+import com.gh.gamecenter.R
+import com.gh.gamecenter.common.base.activity.BaseActivity
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.exposure.ExposureSource
+import com.gh.gamecenter.common.exposure.meta.MetaUtil
+import com.gh.gamecenter.common.retrofit.BiResponse
+import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.core.AppExecutor
+import com.gh.gamecenter.core.provider.ICsjAdProvider
+import com.gh.gamecenter.core.utils.CurrentActivityHolder
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.core.utils.TimeUtils.getToday
+import com.gh.gamecenter.entity.AdConfig
+import com.gh.gamecenter.entity.StartupAdEntity
+import com.gh.gamecenter.feature.exposure.ExposureEvent.Companion.createEvent
+import com.gh.gamecenter.feature.exposure.ExposureType
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.halo.assistant.HaloApp
+import io.reactivex.schedulers.Schedulers
+import java.util.Locale
+
+/**
+ * 广告实现代理类
+ *
+ * 由它来分发功能实现到具体的实现
+ *
+ * 以开屏广告为例，有两种实现（1. 自有的广告实现 2. 穿山甲的开屏广告实现 ）
+ */
+object AdDelegateHelper {
+
+    private var mCsjAdImpl: ICsjAdProvider? = null
+
+    private val mAdConfigList: ArrayList<AdConfig> by lazy { arrayListOf() }
+
+    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 ownerSplashAdLoadTime = 0L
+
+    val vGameLaunchAd: AdConfig?
+        get() = mVGameLaunchAd
+
+    val splashAdDisplayInterval: Int
+        get() = mSplashAd?.ownerAd?.startAd?.displayInterval ?: 3
+
+    private const val AD_SDK_CSJ = "穿山甲"
+    const val AD_TYPE_SDK = "third_party_ads" // 第三方 SDK 广告
+    const val AD_TYPE_OWNER = "owner_ads" // 自有广告
+
+    private const val KEY_CACHE_CONFIG = "cache_config" // 放在 SP 里的广告缓存（避免接口加载问题）
+
+    private val mAdConfigSp: SharedPreferences by lazy {
+        HaloApp.getInstance().getSharedPreferences("AdConfig", Context.MODE_PRIVATE)
+    }
+
+    var isShowingSplashAd = false // 是否正在显示开屏广告
+    var isOwnerSplashAdShown = false // 自有开屏广告是否展示
+    var gameSearchKeyword = ""
+
+    fun initAdSdk(context: Context) {
+        if (AdPluginDownloadHelper.isCsjPluginDownloaded()) {
+            initAdSdkInternal(context)
+        } else {
+            // 首次启动，为了不影响首页加载，延迟 3 秒再下载广告插件并初始化
+            AppExecutor.uiExecutor.executeWithDelay({
+                AdPluginDownloadHelper.downloadPluginIfNeeded(isCsj = true) {
+                    initAdSdkInternal(context)
+                }
+            }, 3000L)
+        }
+    }
+
+    private fun initAdSdkInternal(context: Context) {
+        // 初始化穿山甲
+        if (mCsjAdImpl == null) {
+            mCsjAdImpl = TheRouter.get(ICsjAdProvider::class.java)
+            val csjAppId = if (EnvHelper.isDevEnv) BuildConfig.DEV_CSJ_APPID else BuildConfig.CSJ_APPID
+            mCsjAdImpl?.initSDK(context, csjAppId, HaloApp.getInstance().oaid)
+            // 监听亮色/暗色模式切换
+            DarkModeUtils.registerModeChangeListener {
+                val topActivity = CurrentActivityHolder.getCurrentActivity() ?: return@registerModeChangeListener
+                updateThemeStatus(context, DarkModeUtils.isDarkModeOn(topActivity))
+            }
+        }
+    }
+
+    /**
+     * 请求接口获取广告相关配置
+     */
+    @SuppressLint("CheckResult")
+    fun requestAdConfig(isFromRetry: Boolean, keyword: String = "", callback: (() -> Unit)? = null) {
+        // mAdConfigList 不为空不需要重试
+        if (isFromRetry && mAdConfigList.isNotEmpty()) {
+            return
+        }
+
+        val paramsMap = if (keyword.isNotEmpty()) {
+            mapOf("keyword" to keyword, "android_sdk_version" to Build.VERSION.SDK_INT)
+        } else {
+            mapOf("android_sdk_version" to Build.VERSION.SDK_INT)
+        }
+        RetrofitManager.getInstance()
+            .newApi
+            .getAdConfig(paramsMap)
+            .subscribeOn(Schedulers.io())
+            .subscribe(object : BiResponse<List<AdConfig>>() {
+                override fun onSuccess(data: List<AdConfig>) {
+                    gameSearchKeyword = keyword
+                    handleAdConfig(data)
+                    callback?.invoke()
+
+                    // 缓存数据到 SP 供接口请求失败用
+                    SPUtils.setString(mAdConfigSp, KEY_CACHE_CONFIG, data.toJson())
+                }
+
+                override fun onFailure(exception: Exception) {
+                    super.onFailure(exception)
+
+                    // 若接口请求失败时，从 SP 里获取上次缓存的数据
+                    val cachedConfig: List<AdConfig>? = SPUtils.getString(mAdConfigSp, KEY_CACHE_CONFIG).toObject()
+                    if (cachedConfig != null && mAdConfigList.isEmpty()) {
+                        handleAdConfig(cachedConfig)
+                    }
+
+                    callback?.invoke()
+                }
+            })
+    }
+
+    /**
+     * 获取搜索页的广告列表
+     */
+    fun getGameSearchAdList(): ArrayList<AdConfig> {
+        return mGameSearchAdList
+    }
+
+    /**
+     * 获取下载管理页的广告
+     */
+    fun getDownloadManagerAd(): AdConfig? {
+        return mDownloadManagerAd
+    }
+
+    /**
+     * 处理广告配置
+     */
+    fun handleAdConfig(configList: List<AdConfig>) {
+        mAdConfigList.clear()
+        mGameSearchAdList.clear()
+        mSplashAd = null
+        mDownloadManagerAd = null
+        mVGameLaunchAd = null
+        for (config in configList) {
+            mAdConfigList.add(config)
+            // 处理返回的数据
+            when (config.location) {
+                "halo_launch" -> {
+                    config.ownerAd?.startAd?.let { it.id = config.ownerAd.id }
+
+                    // HarmonyOS 2.2.0 版本不展示第三方开屏广告 (因为会引起奇怪的闪退)
+                    if (MetaUtil.getRom().name == "HarmonyOS"
+                        && MetaUtil.getRom().versionName == "2.2.0"
+                        && config.displayRule.adSource == AD_TYPE_SDK) {
+
+                        return
+                    }
+
+                    // 华为系 Android 10 不展示第三方开屏广告 (因为会引起奇怪的闪退)
+                    if (isBuggyHuaweiDevice() && config.displayRule.adSource == AD_TYPE_SDK) {
+                        return
+                    }
+
+                    mSplashAd = config
+                }
+
+                "download_manager" -> mDownloadManagerAd = config
+                "game_search" -> config.let { mGameSearchAdList.add(it) }
+                "helper_launch" -> mVGameLaunchAd = config
+            }
+        }
+    }
+
+    /**
+     * 是否需要显示开屏广告
+     * @param isHotLaunch 是否为热启动
+     */
+    fun shouldShowStartUpAd(isHotLaunch: Boolean): Boolean {
+        return mSplashAd != null
+                && !isShowingSplashAd
+                && (!isHotLaunch || shouldShowStartUpAdWhenHotLaunch())
+                && !isMatchAdFreeRule(mSplashAd)
+                && isMatchStartUpAdDisplayRule()
+    }
+
+    /**
+     * 热启动是否需要显示开屏广告(目前只展示第三方广告)
+     */
+    private fun shouldShowStartUpAdWhenHotLaunch() = (mCsjAdImpl != null)
+            && mSplashAd?.displayRule?.hotStartSplashAd?.type == AD_TYPE_SDK
+            && mSplashAd?.hotStartThirdPartyAd != null
+            && !isBuggyHuaweiDevice()
+
+    /**
+     * 是否需要显示下载管理广告
+     */
+    fun shouldShowDownloadManagerAd(): Boolean {
+        return mDownloadManagerAd != null && !isMatchAdFreeRule(mDownloadManagerAd) && isMatchDownloadManagerAdDisplayRule()
+    }
+
+    fun shouldShowHelperLaunchAd(): Boolean {
+        return mVGameLaunchAd != null && !isMatchAdFreeRule(mVGameLaunchAd) && isMatchAdDisplayRule(mVGameLaunchAd, Constants.SP_LAST_HELPER_LAUNCH_AD_SHOW_TIME)
+    }
+
+    /**
+     * 是否需要显示游戏搜索广告
+     */
+    fun shouldShowGameSearchAd(adConfig: AdConfig): Boolean {
+        return !isMatchAdFreeRule(adConfig) && isMatchGameSearchAdDisplayRule(adConfig)
+    }
+
+    /**
+     * 是否在免广告时长内
+     */
+    private fun isMatchAdFreeRule(adConfig: AdConfig?): Boolean {
+        adConfig?.displayRule?.run {
+            if (adFreeDuration > 0) {
+                val ghInstalledDurationInHours = (System.currentTimeMillis() - PackageUtils.getInstalledTime(
+                    HaloApp.getInstance(),
+                    BuildConfig.APPLICATION_ID
+                )).toFloat() / 1000 / 3600
+                return ghInstalledDurationInHours < adFreeDuration
+            } else {
+                return false
+            }
+        }
+        return false
+    }
+
+    /**
+     * 是否大于开屏广告展示间隔时长
+     */
+    private fun isMatchStartUpAdDisplayRule(): Boolean = isMatchAdDisplayRule(mSplashAd, Constants.SP_LAST_SPLASH_AD_SHOW_TIME)
+
+    /**
+     * 是否大于广告管理展示间隔时长
+     */
+    private fun isMatchDownloadManagerAdDisplayRule(): Boolean = isMatchAdDisplayRule(mDownloadManagerAd, Constants.SP_LAST_DOWNLOAD_MANAGER_AD_SHOW_TIME)
+    private fun isMatchAdDisplayRule(adConfig: AdConfig?, spKey: String): Boolean {
+        adConfig?.displayRule?.run {
+            if (adDisplayInterval > 0) {
+                val lastShowTime = SPUtils.getLong(spKey, 0L)
+                val durationInMinutes = (System.currentTimeMillis() - lastShowTime).toFloat() / 1000 / 60
+                return durationInMinutes > adDisplayInterval
+            } else {
+                return true
+            }
+        }
+        return true
+    }
+
+    /**
+     * 是否大于游戏搜索展示间隔时长
+     */
+    private fun isMatchGameSearchAdDisplayRule(adConfig: AdConfig?): Boolean {
+        adConfig?.displayRule?.run {
+            if (adDisplayInterval > 0) {
+                val lastShowTime = SPUtils.getLong(Constants.SP_LAST_GAME_SEARCH_AD_SHOW_TIME + adConfig.position, 0L)
+                val durationInMinutes = (System.currentTimeMillis() - lastShowTime).toFloat() / 1000 / 60
+                return durationInMinutes > adDisplayInterval
+            } else {
+                return true
+            }
+        }
+        return true
+    }
+
+    /**
+     * 更新主题样式
+     */
+    private fun updateThemeStatus(context: Context, isDarkMode: Boolean) {
+        mCsjAdImpl?.updateThemeStatus(context, isDarkMode)
+    }
+
+    /**
+     * 请求开屏广告
+     */
+    @JvmStatic
+    fun requestSplashAd(
+        activity: Activity,
+        adViewWidthInPx: Int,
+        adViewHeightInPx: Int,
+        adViewWidthInDp: Float,
+        adViewHeightInDp: Float,
+        startAdContainer: ViewGroup,
+        sdkStartAdContainer: ViewGroup,
+        sdkJumpBtn: TextView,
+        adsViewGroup: FrameLayout,
+        handler: BaseActivity.BaseHandler,
+        isHotLaunch: Boolean,
+        hideAction: () -> Unit
+    ) {
+        val hideCallback = {
+            isShowingSplashAd = false
+            isOwnerSplashAdShown = false
+            hideAction.invoke()
+        }
+        if (mSplashAd != null) {
+            when (if (isHotLaunch) mSplashAd!!.displayRule.hotStartSplashAd?.type else mSplashAd!!.displayRule.adSource) {
+                AD_TYPE_SDK -> {
+                    isShowingSplashAd = true
+                    requestThirdPartySplashAd(
+                        activity,
+                        adViewWidthInPx,
+                        adViewHeightInPx,
+                        adViewWidthInDp,
+                        adViewHeightInDp,
+                        startAdContainer,
+                        sdkStartAdContainer,
+                        sdkJumpBtn,
+                        adsViewGroup,
+                        handler,
+                        isHotLaunch,
+                        hideCallback
+                    )
+                }
+
+                AD_TYPE_OWNER -> {
+                    isShowingSplashAd = true
+                    requestStandardSplashAd(
+                        activity,
+                        adViewWidthInPx,
+                        adViewHeightInPx,
+                        adViewWidthInDp,
+                        adViewHeightInDp,
+                        startAdContainer,
+                        sdkStartAdContainer,
+                        sdkJumpBtn,
+                        adsViewGroup,
+                        handler,
+                        isHotLaunch,
+                        hideCallback
+                    )
+                }
+            }
+        } else {
+            hideCallback.invoke()
+        }
+    }
+
+    /**
+     * 获取第三方开屏广告
+     */
+    private fun requestThirdPartySplashAd(
+        activity: Activity,
+        adViewWidthInPx: Int,
+        adViewHeightInPx: Int,
+        adViewWidthInDp: Float,
+        adViewHeightInDp: Float,
+        startAdContainer: ViewGroup,
+        sdkStartAdContainer: ViewGroup,
+        sdkJumpBtn: TextView,
+        adsViewGroup: FrameLayout,
+        handler: BaseActivity.BaseHandler,
+        isHotLaunch: Boolean,
+        hideCallback: () -> Unit
+    ) {
+        // 第三方开屏广告回调，失败时根据接口配置选项决定是否显示自有开屏广告
+        val sdkSplashCallback: (isSuccess: Boolean) -> Unit = { isSuccess ->
+            if (isSuccess) {
+                hideCallback.invoke()
+                SPUtils.setLong(Constants.SP_LAST_SPLASH_AD_SHOW_TIME, System.currentTimeMillis())
+            } else {
+                if (mSplashAd?.displayRule?.adSource == AD_TYPE_SDK && mSplashAd?.displayRule?.onFailedAction == "show" && !isHotLaunch) {
+                    sdkStartAdContainer.visibility = View.GONE
+                    requestStandardSplashAd(
+                        activity,
+                        adViewWidthInPx,
+                        adViewHeightInPx,
+                        adViewWidthInDp,
+                        adViewHeightInDp,
+                        startAdContainer,
+                        sdkStartAdContainer,
+                        sdkJumpBtn,
+                        adsViewGroup,
+                        handler,
+                        isHotLaunch,
+                        hideCallback
+                    )
+                } else {
+                    hideCallback.invoke()
+                }
+            }
+        }
+
+        val thirdPartyAd = if (isHotLaunch) mSplashAd?.hotStartThirdPartyAd else mSplashAd?.thirdPartyAd
+
+        // 第三方广告的数据为空，按加载失败处理
+        if (mSplashAd == null || thirdPartyAd == null) {
+            sdkSplashCallback.invoke(false)
+            return
+        }
+
+        val timeout = if (isHotLaunch) {
+            ((mSplashAd?.displayRule?.hotStartSplashAd?.timeout ?: 3.5F) * 1000).toInt()
+        } else {
+            ((mSplashAd?.displayRule?.timeout ?: 3.5F) * 1000).toInt()
+        }
+
+        if (thirdPartyAd.sourceName == AD_SDK_CSJ) {
+            sdkStartAdContainer.visibility = View.VISIBLE
+            requestCsjSplashAd(
+                activity,
+                adViewWidthInPx,
+                adViewHeightInPx,
+                adViewWidthInDp,
+                adViewHeightInDp,
+                sdkStartAdContainer,
+                sdkJumpBtn,
+                timeout,
+                isHotLaunch,
+                sdkSplashCallback
+            )
+        }
+    }
+
+    /**
+     * 获取穿山甲的开屏广告
+     */
+    private fun requestCsjSplashAd(
+        activity: Activity,
+        adViewWidthInPx: Int,
+        adViewHeightInPx: Int,
+        adViewWidthInDp: Float,
+        adViewHeightInDp: Float,
+        startAdContainer: ViewGroup,
+        sdkJumpBtn: TextView,
+        timeout: Int,
+        isHotLaunch: Boolean,
+        callback: (isSuccess: Boolean) -> Unit,
+    ) {
+        val thirdPartyAd = if (isHotLaunch) mSplashAd?.hotStartThirdPartyAd else mSplashAd?.thirdPartyAd
+        if (mCsjAdImpl == null || thirdPartyAd == null) {
+            callback.invoke(false)
+        } else {
+            sdkJumpBtn.setOnClickListener {
+                callback.invoke(true)
+                if (activity is BaseActivity) {
+                    activity.baseHandler.removeMessages(MainActivity.COUNTDOWN_SDK_AD)
+                }
+            }
+
+            val onAdShowAction = {
+                sdkJumpBtn.visibility = View.VISIBLE
+                if (activity is BaseActivity) {
+                    activity.baseHandler.sendEmptyMessageDelayed(MainActivity.COUNTDOWN_SDK_AD, 1000)
+                }
+                SensorsBridge.trackEvent("ThirdPartyAdShow",
+                    "ad_source", thirdPartyAd.sourceName,
+                    "ad_id", thirdPartyAd.slotId,
+                    "ad_format", mSplashAd?.typeChinese ?: "",
+                    "ad_placement", "光环启动",
+                    "launch_type", if (isHotLaunch) "热启动" else "冷启动",
+                    "ad_space_id", mSplashAd?.id ?: "",
+                    "ad_space_name", mSplashAd?.name ?: ""
+                )
+            }
+            val onAdClickAction = {
+                callback.invoke(true)
+                SensorsBridge.trackEvent("ThirdPartyAdClick",
+                    "ad_source", thirdPartyAd.sourceName,
+                    "ad_id", thirdPartyAd.slotId,
+                    "ad_format", mSplashAd?.typeChinese ?: "",
+                    "ad_placement", "光环启动",
+                    "launch_type", if (isHotLaunch) "热启动" else "冷启动",
+                    "ad_space_id", mSplashAd?.id ?: "",
+                    "ad_space_name", mSplashAd?.name ?: ""
+                )
+            }
+            mCsjAdImpl?.requestSplashAd(
+                activity,
+                thirdPartyAd.slotId,
+                adViewWidthInPx,
+                adViewHeightInPx,
+                adViewWidthInDp,
+                adViewHeightInDp,
+                startAdContainer,
+                timeout,
+                onAdShowAction,
+                onAdClickAction,
+                callback,
+            )
+        }
+    }
+
+    /**
+     * 显示自有的开屏广告
+     */
+    private fun requestStandardSplashAd(
+        activity: Activity,
+        adViewWidthInPx: Int,
+        adViewHeightInPx: Int,
+        adViewWidthInDp: Float,
+        adViewHeightInDp: Float,
+        startAdContainer: ViewGroup,
+        sdkStartAdContainer: ViewGroup,
+        sdkJumpBtn: TextView,
+        adsViewGroup: FrameLayout,
+        handler: BaseActivity.BaseHandler,
+        isHotLaunch: Boolean,
+        hideCallback: () -> Unit
+    ) {
+        val splashAd = mSplashAd?.ownerAd?.startAd
+        val onEmptyCallback = {
+            if (mSplashAd?.displayRule?.adSource == AD_TYPE_OWNER && mSplashAd?.displayRule?.onFailedAction == "show" && mSplashAd?.thirdPartyAd != null) {
+                // 自有广告为空时，显示第三方广告
+                requestThirdPartySplashAd(
+                    activity,
+                    adViewWidthInPx,
+                    adViewHeightInPx,
+                    adViewWidthInDp,
+                    adViewHeightInDp,
+                    startAdContainer,
+                    sdkStartAdContainer,
+                    sdkJumpBtn,
+                    adsViewGroup,
+                    handler,
+                    isHotLaunch,
+                    hideCallback
+                )
+            } else {
+                hideCallback.invoke()
+            }
+        }
+        if (splashAd == null) {
+            onEmptyCallback.invoke()
+            return
+        }
+
+        if (!TextUtils.isEmpty(splashAd.img)) {
+            val showedTodayTimestamp = SPUtils.getString(Constants.SP_STARTUP_AD_TIMESTAMP, "") ?: ""
+            when (splashAd.rule) {
+                "each" -> showStandardSplashAd(splashAd, startAdContainer, handler, hideCallback)
+                "once" -> if (TextUtils.isEmpty(showedTodayTimestamp)
+                    || !showedTodayTimestamp.contains(splashAd.id)
+                ) {
+                    showStandardSplashAd(splashAd, startAdContainer, handler, hideCallback)
+                } else {
+                    onEmptyCallback.invoke()
+                }
+
+                "everyday" -> {
+                    val today = getToday()
+                    if (TextUtils.isEmpty(showedTodayTimestamp)
+                        || !showedTodayTimestamp.contains(today)
+                        || !showedTodayTimestamp.contains(splashAd.id)
+                    ) {
+                        showStandardSplashAd(splashAd, startAdContainer, handler, hideCallback)
+                    } else {
+                        onEmptyCallback.invoke()
+                    }
+                }
+
+                else -> hideCallback.invoke()
+            }
+            SPUtils.setString(Constants.SP_STARTUP_AD_TIMESTAMP, splashAd.id + getToday())
+        } else {
+            hideCallback.invoke()
+        }
+    }
+
+    private fun showStandardSplashAd(
+        ad: StartupAdEntity,
+        startAdContainer: ViewGroup,
+        handler: BaseActivity.BaseHandler,
+        hideCallback: () -> Unit
+    ) {
+        isOwnerSplashAdShown = false
+
+        val jumpBtn = startAdContainer.findViewById<TextView>(R.id.jumpBtn)
+        val jumpDetailBtn: TextView = startAdContainer.findViewById(R.id.jumpDetailBtn)
+        val adImage: SimpleDraweeView = startAdContainer.findViewById(R.id.adImage)
+        val adVideo = startAdContainer.findViewById<SplashAdVideoView>(R.id.ad_video)
+        val icpContainer: View? = startAdContainer.findViewById(R.id.startAdIcpContainer)
+        startAdContainer.visibility = View.VISIBLE
+        icpContainer?.visibility = View.VISIBLE
+        jumpBtn.text = startAdContainer.context.getString(R.string.splash_jump, splashAdDisplayInterval)
+
+        jumpDetailBtn.text = ad.desc
+        jumpDetailBtn.setDrawableEnd(
+            AppCompatResources.getDrawable(
+                startAdContainer.context,
+                R.drawable.ic_startup_ad_arrow
+            ), null, null
+        )
+
+        if (ad.isImageType) {
+            adVideo.visibleIf(false)
+            adImage.visibleIf(true)
+            ImageUtils.displayWithCallback(adImage, ad.img, true, object : BaseControllerListener<ImageInfo>() {
+                override fun onSubmit(id: String?, callerContext: Any?) {
+                    super.onSubmit(id, callerContext)
+                    adImage.post {
+                        ownerSplashAdLoadTime = System.currentTimeMillis()
+                        NewFlatLogUtils.logSplashAdLoad(ad.id)
+                    }
+                }
+
+                override fun onFinalImageSet(id: String?, imageInfo: ImageInfo?, animatable: Animatable?) {
+                    isOwnerSplashAdShown = true
+                    adImage.post {
+                        NewFlatLogUtils.logSplashAdShow(ad.id, System.currentTimeMillis() - ownerSplashAdLoadTime)
+                    }
+                }
+
+                override fun onFailure(id: String?, throwable: Throwable?) {
+                    super.onFailure(id, throwable)
+                    NewFlatLogUtils.logSplashAdFail(ad.id, "启动广告图加载失败")
+                }
+            })
+        } else {
+            adImage.visibleIf(false)
+            adVideo.startPlay(ad.video.url)
+        }
+        startAdContainer.setOnClickListener {
+            // 拦截点击事件传递
+        }
+        jumpBtn.setOnClickListener {
+            it.debounceActionWithInterval(1000L) {
+                if (!isOwnerSplashAdShown) {
+                    NewFlatLogUtils.logSplashAdFail(ad.id, "加载过程中点击跳过广告")
+                }
+                handler.removeMessages(MainActivity.COUNTDOWN_AD)
+                hideCallback.invoke()
+                val linkEntity = ad.jump
+                NewFlatLogUtils.logOpenScreenAdSkip(
+                    ad.id,
+                    (if (linkEntity.text != null) linkEntity.text else "")!!,
+                    (if (linkEntity.type != null) linkEntity.type else "")!!,
+                    (if (linkEntity.link != null) linkEntity.link else "")!!
+                )
+                SensorsBridge.trackEvent(
+                    "SplashAdOwnSkip",
+                    "splash_ad_id",
+                    ad.id,
+                    "link_type",
+                    linkEntity.type ?: "",
+                    "link_id",
+                    linkEntity.link ?: "",
+                    "link_text",
+                    linkEntity.text ?: ""
+                )
+            }
+        }
+        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 ->
+                val linkEntity = ad.jump
+                directToLinkPage(v.context, linkEntity, "(启动广告)", "", event)
+                SensorsBridge.trackEvent(
+                    "SplashAdOwnClick",
+                    "splash_ad_id",
+                    ad.id,
+                    "link_type",
+                    linkEntity.type ?: "",
+                    "link_id",
+                    linkEntity.link ?: "",
+                    "link_text",
+                    linkEntity.text ?: ""
+                )
+                v.postDelayed({
+                    handler.removeMessages(MainActivity.COUNTDOWN_AD)
+                    hideCallback.invoke()
+                }, 1000)
+            }
+            jumpDetailBtn.visibility = View.VISIBLE
+            LogUtils.logStartAd("watch_start_ads", ad)
+        } else {
+            LogUtils.logStartAd("start_ads", ad)
+        }
+        SPUtils.setLong(Constants.SP_LAST_SPLASH_AD_SHOW_TIME, System.currentTimeMillis())
+        val msg = Message.obtain()
+        msg.what = MainActivity.COUNTDOWN_AD
+        msg.obj = ad
+        handler.sendMessageDelayed(msg, 1000)
+    }
+
+    /**
+     * 获取第三方信息流广告
+     */
+    fun requestThirdPartyFlowAd(
+        fragment: Fragment,
+        slotId: String,
+        adContainerView: ViewGroup,
+        expressViewWidth: Float,
+        onAdShowAction: () -> Unit,
+        onAdClickAction: () -> Unit,
+        callback: (isSuccess: Boolean) -> Unit,
+    ) {
+        mCsjAdImpl?.requestFlowAd(fragment, adContainerView, slotId, expressViewWidth, onAdShowAction, onAdClickAction, callback)
+    }
+
+    /**
+     * 获取第三方 Banner 广告
+     */
+    fun requestThirdPartyBannerAd(
+        fragment: Fragment,
+        containerView: ViewGroup,
+        ad: AdConfig.ThirdPartyAd,
+        expressViewWidthInDp: Float,
+        onAdShowAction: () -> Unit,
+        onAdClickAction: () -> Unit,
+        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,
+            onAdShowAction,
+            onAdClickAction,
+            callback
+        )
+    }
+
+    /**
+     * 获取第三方 全屏/插屏 广告
+     */
+    fun requestFullScreenAd(
+        fragment: Fragment,
+        ad: AdConfig.ThirdPartyAd,
+        onAdShowAction: () -> Unit,
+        onAdClickAction: () -> Unit,
+        callback: (isSuccess: Boolean) -> Unit
+    ) {
+        val slotId = ad.slotId
+        mCsjAdImpl?.requestFullScreenAd(
+            fragment,
+            slotId,
+            onAdShowAction,
+            onAdClickAction,
+            callback
+        )
+    }
+
+    /**
+     * 取消开屏广告
+     */
+    fun cancelSplashAd(context: Context) {
+        mCsjAdImpl?.cancelSplashAd(context)
+    }
+
+    /**
+     * 是否为有问题的华为系 Android 10 设备
+     */
+    private fun isBuggyHuaweiDevice(): Boolean {
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q) {
+            val manufacturer = Build.MANUFACTURER.lowercase(Locale.CHINA) ?: ""
+            return manufacturer == "huawei" || manufacturer == "honor"
+        } else {
+            return false
+        }
+    }
+
+}

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

@@ -0,0 +1,149 @@
+package com.gh.ad
+
+import com.gh.download.simple.DownloadMessageHandler
+import com.gh.download.simple.SimpleDownloadDatabase
+import com.gh.download.simple.SimpleDownloadManager
+import com.gh.gamecenter.core.runOnIoThread
+import com.gh.gamecenter.core.utils.PluginRedirectHelper
+import com.gh.gamecenter.core.utils.SPUtils
+import com.lg.download.DownloadError
+import com.lg.download.DownloadStatus
+import com.lg.download.httpclient.DefaultHttpClient
+import com.lg.download.listener.InnerDownloadListener
+import com.lg.ndownload.DownloadConfig
+import com.lg.ndownload.DownloadConfigBuilder
+import com.lg.ndownload.DownloadIoExecutor
+import com.lightgame.utils.Utils
+import java.lang.Exception
+import java.net.URLConnection
+
+object AdPluginDownloadHelper : InnerDownloadListener {
+
+    private const val CSJ_FILE_NAME = "1832823466"
+    private const val GDT_FILE_NAME = "gdt_plugin/gdtadv2.jar"
+
+    private const val CSJ_PLUGIN_URL = "https://and-static.ghzs66.com/android/static/1832823466"
+    private const val GDT_PLUGIN_URL = "https://and-static.ghzs66.com/android/static/gdtadv2.jar"
+
+    private var csjDownloadedCallback: (() -> Unit)? = null
+
+    /**
+     * 是否已经下载了广告插件
+     */
+    fun isCsjPluginDownloaded(): Boolean {
+        return SPUtils.getBoolean(CSJ_FILE_NAME, false)
+    }
+
+    /**
+     * 下载广告插件并初始化 （初始化限定穿山甲）
+     */
+    fun downloadPluginIfNeeded(isCsj: Boolean = false, isGdt: Boolean = false, csjCallback: (() -> Unit)? = null) {
+        val isCsjPluginDownloaded = SPUtils.getBoolean(CSJ_FILE_NAME, false)
+        val isGdtPluginDownloaded = SPUtils.getBoolean(GDT_FILE_NAME, false)
+
+        if (isCsj && isCsjPluginDownloaded) {
+            csjCallback?.invoke()
+            return
+        }
+
+        if (isGdt && isGdtPluginDownloaded) {
+            return
+        }
+
+        runOnIoThread {
+            csjDownloadedCallback = csjCallback
+
+            DownloadMessageHandler.init(SimpleDownloadDatabase.instance.downloadDao())
+
+            if (!isCsjPluginDownloaded && isCsj) {
+                val csjPluginConfig = DownloadConfigBuilder()
+                    .setUniqueId(CSJ_FILE_NAME)
+                    .setUrl(CSJ_PLUGIN_URL)
+                    .setFileName(CSJ_FILE_NAME)
+                    .setHttpClient(DefaultHttpClient())
+                    .setDownloadThreadSize(2)
+                    .setPathToStore(PluginRedirectHelper.getAssetDir())
+                    .setDownloadExecutor(DownloadIoExecutor.getInstance())
+                    .setDownloadListener(this).build()
+
+                SimpleDownloadManager.download(csjPluginConfig)
+            }
+
+            if (!isGdtPluginDownloaded && isGdt) {
+                val gdtPluginConfig = DownloadConfigBuilder()
+                    .setUniqueId(GDT_FILE_NAME)
+                    .setUrl(GDT_PLUGIN_URL)
+                    .setFileName(GDT_FILE_NAME)
+                    .setHttpClient(DefaultHttpClient())
+                    .setDownloadThreadSize(2)
+                    .setPathToStore(PluginRedirectHelper.getAssetDir())
+                    .setDownloadExecutor(DownloadIoExecutor.getInstance())
+                    .setDownloadListener(this).build()
+
+                SimpleDownloadManager.download(gdtPluginConfig)
+            }
+        }
+    }
+
+    override fun onError(id: String?, error: DownloadError?, exception: Exception?) {
+        Utils.log("下载广告插件失败 $id")
+        id?.let {
+            if (it == CSJ_FILE_NAME) {
+                csjDownloadedCallback = null
+            }
+            SimpleDownloadManager.cancel(it)
+        }
+    }
+
+    override fun onProgress(id: String?, progress: Float) {
+        Utils.log("下载广告插件进度 $id $progress")
+    }
+
+    override fun onProgressWithoutThrottle(id: String?, progress: Float) {
+        // do nothing
+    }
+
+    override fun onSizeReceived(id: String?, fileSize: Long) {
+        // do nothing
+    }
+
+    override fun onReadyToDownload(id: String?, actualThreadSize: Int) {
+        // do nothing
+    }
+
+    override fun onStatusChanged(id: String?, status: DownloadStatus?) {
+        // do nothing
+    }
+
+    override fun onDownloadComplete(id: String?, elapsedTime: Long) {
+        id?.let {
+            // id 即为插件名
+            SPUtils.setBoolean(it, true)
+            if (it == CSJ_FILE_NAME) {
+                csjDownloadedCallback?.invoke()
+                csjDownloadedCallback = null
+            }
+        }
+    }
+
+    override fun onSpeedChanged(id: String?, speed: Float) {
+        // do nothing
+    }
+
+    override fun onRedirectingUrl(
+        id: String?,
+        connection: URLConnection?,
+        config: DownloadConfig?
+    ) {
+        // do nothing
+    }
+
+    override fun onRedirectedUrl(
+        id: String?,
+        connection: URLConnection?,
+        redirectedUrl: String?
+    ) {
+        // do nothing
+    }
+
+}

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

@@ -0,0 +1,102 @@
+package com.gh.ad
+
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewStub
+import androidx.fragment.app.Fragment
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.provider.ILaunchAd
+import com.gh.gamecenter.common.utils.SensorsBridge
+import com.gh.gamecenter.common.utils.goneIf
+import com.gh.gamecenter.core.utils.DisplayUtils
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.entity.AdConfig
+
+@com.therouter.inject.ServiceProvider
+class LaunchAdImpl : ILaunchAd {
+
+    override fun requestAd(fragment: Fragment, container: ViewGroup, maskView: View, topViewStub: ViewStub, bottomViewStub: ViewStub, adClickAction: () -> Unit): View {
+        if (AdDelegateHelper.shouldShowHelperLaunchAd()) {
+            val launchAd = AdDelegateHelper.vGameLaunchAd
+            val showThirdPartyAd = launchAd?.displayRule?.adSource == AdDelegateHelper.AD_TYPE_SDK
+            val thirdPartyAd = launchAd?.thirdPartyAd
+            if (showThirdPartyAd && thirdPartyAd != null) {
+                val onAdShowAction = {
+                    SensorsBridge.trackEvent("ThirdPartyAdShow",
+                        "ad_source", thirdPartyAd.sourceName,
+                        "ad_id", thirdPartyAd.slotId,
+                        "ad_format", launchAd.typeChinese,
+                        "ad_placement", AD_PLACEMENT,
+                        "ad_space_id", launchAd.id,
+                        "ad_space_name", launchAd.name
+                    )
+                }
+                val onAdClickAction = {
+                    SensorsBridge.trackEvent("ThirdPartyAdClick",
+                        "ad_source", thirdPartyAd.sourceName,
+                        "ad_id", thirdPartyAd.slotId,
+                        "ad_format", launchAd.typeChinese,
+                        "ad_placement", AD_PLACEMENT,
+                        "ad_space_id", launchAd.id,
+                        "ad_space_name", launchAd.name
+                    )
+                    adClickAction.invoke()
+                }
+
+                if (launchAd.type == AdConfig.TYPE_BANNER) {
+                    requestBannerAd(fragment, container, maskView, thirdPartyAd, onAdShowAction, onAdClickAction)
+                    return topViewStub.inflate()
+                } else if (launchAd.type == AdConfig.TYPE_INTERSTITIAL) {
+                    requestFullScreenAd(fragment, thirdPartyAd, onAdShowAction, onAdClickAction)
+                    return bottomViewStub.inflate()
+                }
+            }
+        }
+        return bottomViewStub.inflate()
+    }
+
+    private fun requestBannerAd(
+        fragment: Fragment,
+        container: ViewGroup,
+        maskView: View,
+        thirdPartyAd: AdConfig.ThirdPartyAd,
+        onAdShowAction: () -> Unit,
+        onAdClickAction: () -> Unit,
+    ) {
+        AdDelegateHelper.requestThirdPartyBannerAd(
+            fragment,
+            container,
+            thirdPartyAd,
+            DisplayUtils.getScreenWidthInDp(fragment.requireActivity()),
+            onAdShowAction,
+            onAdClickAction
+        ) { isSuccess ->
+            maskView.goneIf(!isSuccess)
+            if (isSuccess) {
+                SPUtils.setLong(Constants.SP_LAST_HELPER_LAUNCH_AD_SHOW_TIME, System.currentTimeMillis())
+            }
+        }
+    }
+
+    private fun requestFullScreenAd(
+        fragment: Fragment,
+        thirdPartyAd: AdConfig.ThirdPartyAd,
+        onAdShowAction: () -> Unit,
+        onAdClickAction: () -> Unit
+    ) {
+        AdDelegateHelper.requestFullScreenAd(
+            fragment,
+            thirdPartyAd,
+            onAdShowAction,
+            onAdClickAction
+        ) { isSuccess ->
+            if (isSuccess) {
+                SPUtils.setLong(Constants.SP_LAST_HELPER_LAUNCH_AD_SHOW_TIME, System.currentTimeMillis())
+            }
+        }
+    }
+
+    companion object {
+        private const val AD_PLACEMENT = "畅玩启动"
+    }
+}

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

@@ -0,0 +1,88 @@
+package com.gh.ad
+
+import android.app.Activity
+import android.content.Context
+import android.util.AttributeSet
+import android.view.WindowManager
+import com.gh.gamecenter.R
+import com.gh.gamecenter.video.detail.CustomManager
+import com.shuyu.gsyvideoplayer.utils.GSYVideoType
+import com.shuyu.gsyvideoplayer.utils.GSYVideoType.SCREEN_TYPE_FULL
+import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer
+import com.shuyu.gsyvideoplayer.video.base.GSYVideoViewBridge
+
+class SplashAdVideoView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null
+) :
+    StandardGSYVideoPlayer(context, attrs) {
+
+    fun startPlay(url: String) {
+        GSYVideoType.setShowType(SCREEN_TYPE_FULL)
+        GSYVideoType.setRenderType(GSYVideoType.SUFRACE)
+        CustomManager.getCustomManager(getKey()).isNeedMute = true
+
+        setUp(url, true, "")
+
+        setNeedAutoAdaptation(false)
+        startPlayLogic()
+    }
+
+    override fun getGSYVideoManager(): GSYVideoViewBridge {
+        CustomManager.getCustomManager(getKey()).initContext(context.applicationContext)
+        return CustomManager.getCustomManager(getKey())
+    }
+
+    private fun getKey() = "splash_ad"
+
+    /**
+     * 覆盖父类方法，防止在是视频 Preparing 阶段封面图被隐藏，导致白屏
+     */
+    override fun changeUiToPreparingShow() = Unit
+
+    override fun getLayoutId(): Int {
+        return R.layout.layout_splash_ad_video
+    }
+
+    override fun touchSurfaceMoveFullLogic(absDeltaX: Float, absDeltaY: Float) {
+        // no nothing
+    }
+
+    override fun onPrepared() {
+        super.onPrepared()
+
+        visibility = VISIBLE
+    }
+
+    override fun onAutoCompletion() {
+        setStateAndUi(CURRENT_STATE_AUTO_COMPLETE);
+
+        mSaveChangeViewTIme = 0
+        mCurrentPosition = 0
+
+        if (!mIfCurrentIsFullscreen) {
+            getGSYVideoManager().setLastListener(null)
+        }
+        mAudioManager.abandonAudioFocus(onAudioFocusChangeListener);
+        if (mContext is Activity) {
+            try {
+                (mContext as Activity).getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+        releaseNetWorkState()
+
+        if (mVideoAllCallBack != null && isCurrentMediaListener()) {
+            mVideoAllCallBack.onAutoComplete(mOriginUrl, mTitle, this)
+        }
+        mHadPlay = false
+    }
+
+    fun clearAll() {
+        GSYVideoType.setShowType(GSYVideoType.SCREEN_TYPE_DEFAULT)
+        GSYVideoType.setRenderType(GSYVideoType.TEXTURE)
+        release()
+        CustomManager.removeManager(getKey())
+    }
+}

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

@@ -6,6 +6,7 @@ import android.app.Activity
 import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
+import android.graphics.Color
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.View
@@ -20,29 +21,38 @@ import com.gh.common.view.RichEditor
 import com.gh.gamecenter.CropImageActivity
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.activity.ToolBarActivity
+import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.common.entity.LocalVideoEntity
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.utils.*
-import com.gh.gamecenter.entity.*
+import com.gh.gamecenter.entity.GamesCollectionEntity
+import com.gh.gamecenter.entity.MyVideoEntity
+import com.gh.gamecenter.entity.VideoEntity
+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.selector.ChooseType
+import com.gh.gamecenter.feature.selector.LocalMediaActivity
 import com.gh.gamecenter.qa.editor.*
-import com.gh.gamecenter.qa.entity.AnswerEntity
-import com.gh.gamecenter.qa.entity.ArticleEntity
 import com.gh.gamecenter.qa.entity.EditorInsertEntity
-import com.gh.gamecenter.video.poster.PosterEditActivity
+import com.gh.gamecenter.video.poster.video.VideoPosterFragment
 import com.gh.gamecenter.video.upload.UploadManager
 import com.google.gson.JsonObject
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Util_System_Keyboard
 import com.lightgame.utils.Utils
 import com.lightgame.view.CheckableImageView
+import com.therouter.TheRouter
 import io.reactivex.disposables.Disposable
 import org.json.JSONArray
 import org.json.JSONObject
 import java.io.File
 
 // TODO: 移动到module_bbs模块
-abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarActivity(),
+abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> constructor() : ToolBarActivity(),
     KeyboardHeightObserver, UploadVideoListener {
 
     lateinit var mRichEditor: RichEditor
@@ -55,11 +65,16 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
     private lateinit var mEditorFontItalic: CheckableImageView
     private lateinit var mEditorFontStrikeThrough: CheckableImageView
     private lateinit var mEditorFontUnderline: CheckableImageView
+    private lateinit var mEditorParagraphDivider: CheckableImageView
     private lateinit var mEditorParagraphH1: CheckableImageView
     private lateinit var mEditorParagraphH2: CheckableImageView
     private lateinit var mEditorParagraphH3: CheckableImageView
     private lateinit var mEditorParagraphH4: CheckableImageView
     private lateinit var mEditorParagraphQuote: CheckableImageView
+    private lateinit var mEditorAlignLeft: CheckableImageView
+    private lateinit var mEditorAlignCenter: CheckableImageView
+    private lateinit var mEditorAlignRight: CheckableImageView
+    private lateinit var mEditorAlignContainer: View
     private lateinit var mEditorFontContainer: View
     private lateinit var mEditorParagraphContainer: View
     private lateinit var mEditorLinkContainer: View
@@ -95,6 +110,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                     mRichEditor.insertCustomStyleLink(insertData)
                 }
             }
+
             INSERT_ARTICLE_CODE -> {
                 val article =
                     data?.getParcelableExtra<ArticleEntity>(ArticleEntity::class.java.simpleName)
@@ -104,6 +120,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                     mRichEditor.insertCustomStyleLink(insertData)
                 }
             }
+
             INSERT_GAME_CODE -> {
                 val game = data?.getParcelableExtra<GameEntity>(GameEntity::class.java.simpleName)
                 if (game != null) {
@@ -112,30 +129,38 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                     mRichEditor.insertCustomStyleLink(insertData)
                 }
             }
+
             INSERT_GAME_COLLECTION_CODE -> {
-                val gameCollectionEntity = data?.getParcelableExtra<GamesCollectionEntity>(GamesCollectionEntity::class.java.simpleName)
+                val gameCollectionEntity =
+                    data?.getParcelableExtra<GamesCollectionEntity>(GamesCollectionEntity::class.java.simpleName)
                 if (gameCollectionEntity != null) {
                     mRichEditor.focusEditor()
                     insertData = EditorInsertEntity.transform(gameCollectionEntity)
                     mRichEditor.insertCustomStyleLink(insertData)
                 }
             }
+
             REQUEST_CODE_IMAGE -> {
                 if (data != null) mViewModel.uploadPic(data)
             }
+
             INSERT_MEDIA_VIDEO_CODE -> {
-                val localVideoList = data?.getParcelableArrayListExtra<LocalVideoEntity>(LocalVideoEntity::class.java.name) ?: arrayListOf()
+                val localVideoList =
+                    data?.getParcelableArrayListExtra<LocalVideoEntity>(LocalVideoEntity::class.java.name)
+                        ?: arrayListOf()
                 if (localVideoList.isNotEmpty()) {
                     mRichEditor.focusEditor()
                     uploadVideo(localVideoList)
                 }
             }
+
             REQUEST_CODE_IMAGE_CROP -> {
                 val imagePath = data?.getStringExtra(CropImageActivity.RESULT_CLIP_PATH)
                 if (!imagePath.isNullOrEmpty()) {
                     mViewModel.uploadPoster(imagePath)
                 }
             }
+
             INSERT_VIDEO_CODE -> {
                 val videoEntity = data?.getParcelableExtra<MyVideoEntity>(MyVideoEntity::class.java.simpleName)
                 if (videoEntity != null) {
@@ -189,7 +214,12 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
         mEditorParagraphH2 = findViewById(R.id.editor_paragraph_h2)
         mEditorParagraphH3 = findViewById(R.id.editor_paragraph_h3)
         mEditorParagraphH4 = findViewById(R.id.editor_paragraph_h4)
+        mEditorParagraphDivider = findViewById(R.id.editor_paragraph_divider)
         mEditorParagraphQuote = findViewById(R.id.editor_paragraph_quote)
+        mEditorAlignLeft = findViewById(R.id.editor_align_left)
+        mEditorAlignCenter = findViewById(R.id.editor_align_center)
+        mEditorAlignRight = findViewById(R.id.editor_align_right)
+        mEditorAlignContainer = findViewById(R.id.editor_align_container)
         mEditorFontContainer = findViewById(R.id.editor_font_container)
         mEditorParagraphContainer = findViewById(R.id.editor_paragraph_container)
         mEditorLinkContainer = findViewById(R.id.editor_link_container)
@@ -204,13 +234,16 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
     @SuppressLint("AddJavascriptInterface", "ClickableViewAccessibility")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        VideoPosterFragment.createVideoCoverFile(this)
         findView()
         onRichClick()
         mViewModel = provideViewModel()
         mViewModel.setUploadVideoListener(this)
         mKeyboardHeightProvider = KeyboardHeightProvider(this)
         mRichEditor.post { mKeyboardHeightProvider?.start() }
-        mRichEditor.enableForceDark(NightModeUtils.isNightMode(this))
+        mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this))
+        mRichEditor.setEditorBackgroundColor(com.gh.gamecenter.common.R.color.ui_surface.toColor(this))
+        mRichEditor.setEditorFontColor(if (mIsDarkModeOn) Color.parseColor("#C2C2C2") else Color.parseColor("#4A4A4A"))
         // 防止个别手机在Js里无法获取粘贴内容
         mRichEditor.addJavascriptInterface(OnPasteListener(), "onPasteListener")
         mRichEditor.addJavascriptInterface(OnCursorChangeListener(), "OnCursorChangeListener")
@@ -234,6 +267,13 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                 mRichEditor.hasFocus()
             } else false
         }
+
+        mRichEditor.setOnDecorationChangeListener { _, types ->
+            mEditorAlignLeft.isChecked = types.contains(RichEditor.Type.JUSTIFYLEFT)
+            mEditorAlignCenter.isChecked = types.contains(RichEditor.Type.JUSTIFYCENTER)
+            mEditorAlignRight.isChecked = types.contains(RichEditor.Type.JUSTIFYRIGHT)
+        }
+
         mOriginalCb.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 mOriginalTipsContainer.alpha = 0f
@@ -318,6 +358,9 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                 MtaHelper.onEvent(mtaEventName(), "文字样式", "文字样式-下滑线")
             }
         }
+        mEditorParagraphDivider.setOnClickListener {
+            mRichEditor.insertDivider()
+        }
         mEditorParagraphH1.setOnClickListener {
             if (mEditorParagraphH1.isChecked) {
                 mRichEditor.formatBlock()
@@ -363,6 +406,27 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
             }
             mEditorParagraphQuote.isChecked = !mEditorParagraphQuote.isChecked
         }
+        mEditorAlignLeft.setOnClickListener {
+            if (!mEditorAlignLeft.isChecked) {
+                mRichEditor.setAlignLeft()
+                MtaHelper.onEvent(mtaEventName(), "文本对齐选项", "文本对齐选项-靠左")
+                mEditorAlignLeft.isChecked = !mEditorAlignLeft.isChecked
+            }
+        }
+        mEditorAlignCenter.setOnClickListener {
+            if (!mEditorAlignCenter.isChecked) {
+                mRichEditor.setAlignCenter()
+                MtaHelper.onEvent(mtaEventName(), "文本对齐选项", "文本对齐选项-靠中")
+                mEditorAlignCenter.isChecked = !mEditorAlignCenter.isChecked
+            }
+        }
+        mEditorAlignRight.setOnClickListener {
+            if (!mEditorAlignRight.isChecked) {
+                mRichEditor.setAlignRight()
+                MtaHelper.onEvent(mtaEventName(), "文本对齐选项", "文本对齐选项-靠右")
+                mEditorAlignRight.isChecked = !mEditorAlignRight.isChecked
+            }
+        }
         findViewById<View>(R.id.editor_link_answer).setOnClickListener {
             MtaHelper.onEvent(mtaEventName(), "插入链接", "插入链接-回答")
             startActivityForResult(
@@ -442,25 +506,22 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
             return
         }
         try {
-            PermissionHelper.checkStoragePermissionBeforeAction(this,
-                object : EmptyCallback {
-                    override fun onCallback() {
-                        val maxChooseCount = if (videoCount + 3 <= MAX_MEDIA_COUNT) 3 else MAX_MEDIA_COUNT - videoCount
-                        startActivityForResult(
-                            LocalMediaActivity.getIntent(
-                                this@BaseRichEditorActivity,
-                                LocalMediaActivity.ChooseType.VIDEO,
-                                maxChooseCount,
-                                if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
-                            ), INSERT_MEDIA_VIDEO_CODE
-                        )
-                        NewLogUtils.logChooseMedia(
-                            "view_media",
-                            if (mtaEventName() == "提问帖") "提问帖" else "帖子",
-                            "视频"
-                        )
-                    }
-                })
+            PermissionHelper.checkStoragePermissionBeforeAction(this) {
+                val maxChooseCount = if (videoCount + 3 <= MAX_MEDIA_COUNT) 3 else MAX_MEDIA_COUNT - videoCount
+                startActivityForResult(
+                    LocalMediaActivity.getIntent(
+                        this@BaseRichEditorActivity,
+                        ChooseType.VIDEO,
+                        maxChooseCount,
+                        if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
+                    ), INSERT_MEDIA_VIDEO_CODE
+                )
+                NewLogUtils.logChooseMedia(
+                    "view_media",
+                    if (mtaEventName() == "提问帖") "提问帖" else "帖子",
+                    "视频"
+                )
+            }
         } catch (e: Exception) {
             toast(R.string.media_image_hint)
             e.printStackTrace()
@@ -470,23 +531,21 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
     private fun chooseImage() {
         MtaHelper.onEvent(mtaEventName(), "插入图片", "插入图片")
         val imageCount = mViewModel.quoteCountEntity.imageCount
-        if (imageCount >= MAX_MEDIA_COUNT) {
+        if (imageCount >= MAX_IMAGE_COUNT) {
             toast(R.string.answer_edit_max_img_hint)
             return
         }
         try {
-            PermissionHelper.checkStoragePermissionBeforeAction(this, object : EmptyCallback {
-                override fun onCallback() {
-                    val maxChooseCount = if (imageCount + 10 <= MAX_MEDIA_COUNT) 10 else MAX_MEDIA_COUNT - imageCount
-                    val intent = LocalMediaActivity.getIntent(
-                        this@BaseRichEditorActivity,
-                        LocalMediaActivity.ChooseType.IMAGE,
-                        maxChooseCount,
-                        if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
-                    )
-                    startActivityForResult(intent, REQUEST_CODE_IMAGE)
-                }
-            })
+            PermissionHelper.checkStoragePermissionBeforeAction(this) {
+                val maxChooseCount = if (imageCount + 10 <= MAX_IMAGE_COUNT) 10 else MAX_IMAGE_COUNT - imageCount
+                val intent = LocalMediaActivity.getIntent(
+                    this@BaseRichEditorActivity,
+                    ChooseType.IMAGE,
+                    maxChooseCount,
+                    if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
+                )
+                startActivityForResult(intent, REQUEST_CODE_IMAGE)
+            }
         } catch (e: Exception) {
             toast(R.string.media_image_hint)
             e.printStackTrace()
@@ -509,6 +568,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
             mEditorFontContainer.visibility = if (mEditorFont.isChecked) View.VISIBLE else View.GONE
             mEditorParagraphContainer.visibility =
                 if (mEditorFont.isChecked) View.VISIBLE else View.GONE
+            mEditorAlignContainer.visibility = if (mEditorFont.isChecked) View.VISIBLE else View.GONE
             mEditorLinkContainer.visibility = View.GONE
             mTagsContainer.visibility = View.GONE
             mIsExtendedKeyboardShow = mEditorFont.isChecked
@@ -530,6 +590,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                 if (mEditorLink.isChecked) View.VISIBLE else View.GONE
             mEditorLinkContainer.visibility = if (mEditorLink.isChecked) View.VISIBLE else View.GONE
             mEditorFontContainer.visibility = View.GONE
+            mEditorAlignContainer.visibility = View.GONE
             mEditorParagraphContainer.visibility = View.GONE
             mTagsContainer.visibility = View.GONE
             mIsExtendedKeyboardShow = mEditorLink.isChecked
@@ -684,9 +745,9 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
             mViewModel.id = id
             mViewModel.videoId = videoId
             val videoEntity = VideoEntity(url = url)
-            val intent =
-                PosterEditActivity.getIntentByVideo(this@BaseRichEditorActivity, videoEntity)
-            startActivityForResult(intent, REQUEST_CODE_IMAGE_CROP)
+            TheRouter.build(RouteConsts.activity.videoCoverEditActivity)
+                .withParcelable(EntranceConsts.KEY_VIDEO_ENTITY, videoEntity)
+                .navigation(this@BaseRichEditorActivity, REQUEST_CODE_IMAGE_CROP)
         }
 
         @JavascriptInterface
@@ -741,12 +802,14 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
     abstract fun provideViewModel(): VM
     abstract fun getVideoGuideKey(): String
 
-    override fun isAutoResetViewBackgroundEnabled(): Boolean =true
+    override fun isAutoResetViewBackgroundEnabled(): Boolean = true
 
-    override fun onNightModeChange() {
-        super.onNightModeChange()
-        updateStatusBarColor(R.color.background_white, R.color.background_white)
-        mRichEditor.enableForceDark(NightModeUtils.isNightMode(this))
+    override fun onDarkModeChanged() {
+        super.onDarkModeChanged()
+        updateStatusBarColor(com.gh.gamecenter.common.R.color.ui_surface, com.gh.gamecenter.common.R.color.ui_surface)
+        mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this))
+        mRichEditor.setEditorBackgroundColor(com.gh.gamecenter.common.R.color.ui_surface.toColor(this))
+        mRichEditor.setEditorFontColor(if (mIsDarkModeOn) Color.parseColor("#C2C2C2") else Color.parseColor("#4A4A4A"))
     }
 
     companion object {
@@ -767,6 +830,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
         const val INSERT_VIDEO_CODE = 415
         const val MAX_INPUT_TEXT_NUM = 10000
         const val MAX_MEDIA_COUNT = 20
+        const val MAX_IMAGE_COUNT = 70
 
         const val REQUEST_CODE_IMAGE = 120
         const val INSERT_MEDIA_VIDEO_CODE = 121

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

@@ -1,5 +1,6 @@
 package com.gh.base
 
+import android.annotation.SuppressLint
 import android.app.Application
 import android.content.Intent
 import android.graphics.Bitmap
@@ -10,15 +11,17 @@ import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
 import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment
-import com.gh.gamecenter.core.runOnUiThread
-import com.gh.gamecenter.R
+import com.gh.gamecenter.common.entity.ErrorEntity
+import com.gh.gamecenter.common.retrofit.BiResponse
+import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.utils.*
-import com.gh.gamecenter.entity.ErrorEntity
-import com.gh.gamecenter.entity.LocalVideoEntity
+import com.gh.gamecenter.core.runOnUiThread
+import com.gh.gamecenter.core.utils.MD5Utils
+import com.gh.gamecenter.core.utils.ToastUtils
+import com.gh.gamecenter.entity.ForumDetailEntity
+import com.gh.gamecenter.common.entity.LocalVideoEntity
 import com.gh.gamecenter.entity.QuoteCountEntity
 import com.gh.gamecenter.qa.BbsType
-import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.retrofit.service.ApiService
 import com.gh.gamecenter.video.upload.OnUploadListener
@@ -27,25 +30,22 @@ 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
 import java.io.FileOutputStream
 import java.util.*
-import kotlin.collections.HashMap
 import kotlin.collections.LinkedHashMap
-import kotlin.collections.List
-import kotlin.collections.Map
-import kotlin.collections.find
-import kotlin.collections.forEach
 import kotlin.collections.set
 
 // TODO: 移动到module_bbs模块
 abstract class BaseRichEditorViewModel(application: Application) : AndroidViewModel(application) {
     val mApi: ApiService = RetrofitManager.getInstance().api
+    val mNewApi: ApiService = RetrofitManager.getInstance().newApi
     val processDialog = MediatorLiveData<WaitingDialogFragment.WaitingDialogData>()
-    val uploadingImage = ArrayList<LinkedHashMap<String, String>>()
     val chooseImagesUpload = MutableLiveData<LinkedHashMap<String, String>>()
     val chooseImagesUploadSuccess = MutableLiveData<LinkedHashMap<String, String>>()
     var uploadImageSubscription: Disposable? = null
@@ -58,10 +58,11 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
     val TITLE_MIN_LENGTH = 6
     val MIN_TEXT_LENGTH = 6
     val MAX_TEXT_LENGTH = 10000
-    val FILE_HOST = "file:///"
     var id = ""//视频标记
     var videoId = ""//更改封面视频id
     val quoteCountEntity = QuoteCountEntity()//数据上报用
+    val sectionListLiveData = MutableLiveData<List<ForumDetailEntity.Section>>()
+    var isModerator = false
 
     fun setUploadVideoListener(uploadVideoListener: UploadVideoListener) {
         this.mUploadVideoListener = uploadVideoListener
@@ -70,7 +71,10 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
     //检查图片是否符合规则并上传图片
     fun uploadPic(data: Intent) {
         val uris = Matisse.obtainResult(data)
-        val pictureList = ArrayList<String>()
+        val rawImgUrlList = ArrayList<String>() // 需要上传图片的原始地址列表
+        val uploadingImgList = ArrayList<String>() // 正在上传图片的地址列表（已压缩处理）
+        val compressedImgUrlList = ArrayList<String>() // 压缩处理后图片的地址列表
+
         for (uri in uris) {
             val picturePath = PathUtils.getPath(getApplication(), uri)
             if (picturePath != null) {
@@ -79,17 +83,17 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
                     val application: Application = getApplication()
                     Utils.toast(
                         getApplication(),
-                        application.getString(R.string.pic_max_hint, count)
+                        application.getString(com.gh.gamecenter.common.R.string.pic_max_hint, count)
                     )
                     continue
                 }
                 Utils.log("picturePath = $picturePath")
-                pictureList.add(picturePath)
+                rawImgUrlList.add(picturePath)
             } else {
                 Utils.log("picturePath is null")
             }
         }
-        if (pictureList.size == 0) return
+        if (rawImgUrlList.size == 0) return
         val imageType = when (getRichType()) {
             RichType.ARTICLE -> UploadImageUtils.UploadType.community_article
             RichType.QUESTION -> UploadImageUtils.UploadType.question
@@ -97,7 +101,7 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
         }
         uploadImageSubscription = UploadImageUtils.compressAndUploadImageList(
             imageType,
-            pictureList,
+            rawImgUrlList,
             false,
             object : UploadImageUtils.OnUploadImageListListener {
                 override fun onProgress(total: Long, progress: Long) {}
@@ -107,87 +111,115 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
                     imageUrls.forEach {
                         chooseImageMd5Map[MD5Utils.getUrlMD5(it)] = ""
                     }
-                    uploadingImage.add(chooseImageMd5Map)
+                    uploadingImgList.addAll(imageUrls)
+                    compressedImgUrlList.addAll(imageUrls)
                     chooseImagesUpload.postValue(chooseImageMd5Map)
                 }
 
-                override fun onSingleSuccess(imageUrl: Map<String, String>) {
-                    val map = LinkedHashMap<String, String>()
-                    for (key in imageUrl.keys) {
-                        map[MD5Utils.getUrlMD5(key)] = FILE_HOST + key.decodeURI()
-                        mapImages[TextUtils.htmlEncode(key).decodeURI()] = imageUrl[key] ?: ""
+                override fun onSingleSuccess(imageUrlMap: Map<String, String>) {
+                    imageUrlMap.forEach {
+                        if (uploadingImgList.contains(it.key)) {
+                            uploadingImgList.remove(it.key)
+                        }
                     }
-                    chooseImagesUploadSuccess.postValue(map)
+                    val map = LinkedHashMap<String, String>()
+                    for (key in imageUrlMap.keys) {
+                        // 文件格式为 HEIC 时，使用经 OSS 转码的图片作为预览图片
+                        if (FileUtils.getFileMimeType(getApplication(), key.decodeURI())?.lowercase(Locale.CHINA)?.contains("heic") == true) {
+                            val transformedImgUrl = ImageUtils.getIdealImageUrl(imageUrlMap[key], 5000) ?: ""
+                            map[MD5Utils.getUrlMD5(key)] = transformedImgUrl
+                            mapImages[transformedImgUrl.decodeURI()] = imageUrlMap[key] ?: ""
+                        } else {
+                            map[MD5Utils.getUrlMD5(key)] = imageUrlMap[key] ?: ""
+                            mapImages[TextUtils.htmlEncode(key).decodeURI()] = imageUrlMap[key] ?: ""
+                        }
+                    }
+                    chooseImagesUploadSuccess.value = map
                 }
 
-                override fun onSuccess(
-                    imageUrl: LinkedHashMap<String, String>,
-                    errorMap: Map<String, Exception>
-                ) {
-                    val uploadMap = uploadingImage.find {
-                        it.containsKey(
-                            MD5Utils.getUrlMD5(
-                                imageUrl.entries.iterator().next().key
-                            )
-                        )
-                    }
-                    uploadMap?.let {
-                        uploadingImage.remove(uploadMap)
-                    }
-
-                    val errorSize = pictureList.size - imageUrl.size
-                    if (errorSize > 0) {
-                        val map = LinkedHashMap<String, String>()
-                        for (key in errorMap.keys) {
-                            map[MD5Utils.getUrlMD5(key)] = ""
+                override fun onSuccess(imageUrlMap: LinkedHashMap<String, String>, errorMap: Map<String, Exception>) {
+                    imageUrlMap.forEach {
+                        if (uploadingImgList.contains(it.key)) {
+                            uploadingImgList.remove(it.key)
                         }
-                        //value为空会删除PlaceholderImage
-                        chooseImagesUploadSuccess.postValue(map)
+                    }
 
-                        for (error in errorMap.values) {
-                            if (error is HttpException && error.code() == 403) {
-                                Utils.toast(getApplication(), errorSize.toString() + "张违规图片上传失败")
-                                return
+                    var errorSize = compressedImgUrlList.size - imageUrlMap.size
+                    if (errorSize > 0 || uploadingImgList.isNotEmpty()) {
+                        val errorImageMap = LinkedHashMap<String, String>()
+                        for (key in errorMap.keys) {
+                            errorImageMap[MD5Utils.getUrlMD5(key)] = ""
+                        }
+
+                        for (rawImgUrl in compressedImgUrlList) {
+                            if (!imageUrlMap.containsKey(rawImgUrl)) {
+                                errorImageMap[MD5Utils.getUrlMD5(rawImgUrl)] = ""
                             }
                         }
-                        Utils.toast(getApplication(), errorSize.toString() + "张图片上传失败")
+                        errorSize = if (errorMap.isEmpty()) {
+                            errorImageMap.size
+                        } else {
+                            errorMap.size + errorImageMap.size
+                        }
+
+                        // value为空会删除PlaceholderImage
+                        chooseImagesUploadSuccess.value = errorImageMap
+
+                        if (handleUploadError(errorSize, errorMap)) return
+
+                        if (errorSize > 0) {
+                            ToastUtils.showToast(errorSize.toString() + "张图片上传失败")
+                        }
                     }
                 }
 
                 override fun onError(errorMap: Map<String, Exception>) {
-                    val errorSize = errorMap.size
-                    if (errorSize > 0) {
+                    val errorSize = uploadingImgList.size
+                    if (uploadingImgList.size > 0) {
                         val map = LinkedHashMap<String, String>()
-                        for (key in errorMap.keys) {
+                        for (key in uploadingImgList) {
                             map[MD5Utils.getUrlMD5(key)] = ""
                         }
-                        //value为空会删除PlaceholderImage
-                        chooseImagesUploadSuccess.postValue(map)
+                        // value为空会删除PlaceholderImage
+                        chooseImagesUploadSuccess.value = map
                     }
 
-                    for (error in errorMap.values) {
-                        if (error is HttpException && error.code() == 403) {
-                            val e = error.response()?.errorBody()?.string()?.toObject<ErrorEntity>()
-                            if (e != null && e.code == 403017) {
-                                Utils.toast(
-                                    getApplication(),
-                                    errorSize.toString() + "张图片的宽或高超过限制，请裁剪后上传"
-                                )
-                            } else {
-                                Utils.toast(getApplication(), errorSize.toString() + "张违规图片上传失败")
-                            }
-                            return
-                        }
-                    }
+                    if (handleUploadError(errorSize, errorMap)) return
+
+                    if (errorSize == 0) return
+
                     if (errorSize == 1) {
-                        Utils.toast(getApplication(), "图片上传失败")
+                        ToastUtils.showToast("图片上传失败")
                     } else {
-                        Utils.toast(getApplication(), errorSize.toString() + "张图片上传失败")
+                        ToastUtils.showToast(errorSize.toString() + "张图片上传失败")
                     }
                 }
             })
     }
 
+    /**
+     * 处理上传错误 (包括超时 cancel 的异常)
+     * @return 如果 toast 过了就返回 true
+     */
+    private fun handleUploadError(
+        errorSize: Int,
+        errorMap: Map<String, Exception>
+    ): Boolean {
+        for (error in errorMap.values) {
+            if (error is HttpException && error.code() == 403) {
+                val e = error.response()?.errorBody()?.string()?.toObject<ErrorEntity>()
+                if (e != null && e.code == 403017) {
+                    ToastUtils.showToast(errorSize.toString() + "张图片的宽或高超过限制，请裁剪后上传")
+                } else {
+                    ToastUtils.showToast(errorSize.toString() + "张违规图片上传失败")
+                }
+                return true
+            }
+        }
+
+        return false
+    }
+
     fun uploadPoster(picturePath: String) {
         processDialog.postValue(WaitingDialogFragment.WaitingDialogData("封面上传中...", true))
         uploadImageSubscription =
@@ -391,6 +423,30 @@ 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/DarkModeSwitchHelper.kt

@@ -0,0 +1,86 @@
+package com.gh.base
+
+import android.view.Gravity
+import androidx.appcompat.app.AppCompatActivity
+import com.gh.gamecenter.R
+import com.gh.gamecenter.common.utils.DarkModeUtils
+import com.gh.gamecenter.common.utils.DialogHelper
+import com.gh.gamecenter.common.utils.PackageFlavorHelper
+import com.gh.gamecenter.common.utils.dip2px
+import com.lzf.easyfloat.EasyFloat
+import com.lzf.easyfloat.enums.ShowPattern
+import com.lzf.easyfloat.enums.SidePattern
+
+object DarkModeSwitchHelper {
+
+    fun showDarkModeSwitchFloatingView(activity: AppCompatActivity) {
+        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
+            EasyFloat.with(activity)
+                .setLayout(R.layout.layout_day_mode_night_mode_switch)
+                .setTag("night_mode_switch_floating_view")
+                .setAnimator(null)
+                .setGravity(Gravity.TOP.xor(Gravity.END), 0, 114F.dip2px())
+                .setSidePattern(SidePattern.RESULT_SIDE)
+                .setDragEnable(true)
+                .setShowPattern(ShowPattern.CURRENT_ACTIVITY)
+                .registerCallback {
+                    createResult { _, _, view ->
+                        view?.setOnClickListener {
+                            showDarkModeSwitchDialog(activity)
+                        }
+                    }
+                }
+                .show()
+        }
+    }
+
+    fun dismissDarkModeSwitchFloatingView() {
+        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
+            EasyFloat.dismiss("night_mode_switch_floating_view")
+        }
+    }
+
+    private fun showDarkModeSwitchDialog(activity: AppCompatActivity) {
+        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
+            //切换深色模式
+            var mode = "普通模式"
+            var positive = "跟随系统模式"
+            var negative = "深色模式"
+            if (DarkModeUtils.isFollowSystemDarkModeFromSp()) {
+                mode = "跟随系统模式"
+                positive = "普通模式"
+                negative = "深色模式"
+            } else if (DarkModeUtils.isAppDarkModeEnabledFromSp()) {
+                mode = "深色模式"
+                positive = "跟随系统模式"
+                negative = "普通模式"
+            }
+            DialogHelper.showDialog(
+                context = activity,
+                title = "选择模式",
+                content = "当前为 $mode",
+                confirmText = positive,
+                cancelText = negative,
+                confirmClickCallback = {
+                    if (DarkModeUtils.isFollowSystemDarkModeFromSp()) {
+                        DarkModeUtils.updateAppDarkModeStatusToSp(false)
+                        DarkModeUtils.updateFollowSystemDarkModeToSp(false)
+                    } else {
+                        DarkModeUtils.updateFollowSystemDarkModeToSp(true)
+                    }
+                    DarkModeUtils.initDarkMode()
+                },
+                cancelClickCallback = {
+                    if (DarkModeUtils.isFollowSystemDarkModeFromSp()) {
+                        DarkModeUtils.updateAppDarkModeStatusToSp(true)
+                    } else {
+                        DarkModeUtils.updateAppDarkModeStatusToSp(!DarkModeUtils.isAppDarkModeEnabledFromSp())
+                    }
+                    DarkModeUtils.updateFollowSystemDarkModeToSp(false)
+                    DarkModeUtils.initDarkMode()
+                },
+                extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
+            )
+        }
+    }
+}

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

@@ -1,19 +1,20 @@
 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.core.content.ContextCompat
+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
@@ -45,7 +46,7 @@ abstract class DownloadToolbarActivity : ToolBarActivity() {
 
     override fun inflateMenu(res: Int) {
         super.inflateMenu(res)
-        if (showDownloadMenu()) {
+        if (!getBoolean(Constants.SP_TEENAGER_MODE) && showDownloadMenu()) {
             createDownloadMenu(res)
         }
     }
@@ -58,7 +59,8 @@ abstract class DownloadToolbarActivity : ToolBarActivity() {
             updateDownloadCountHint(mPackageViewModel?.filterSameUpdateLiveData?.value)
         }
         val downloadMenuView = mActionMenuView.menu.findItem(R.id.menu_download).actionView
-        mDownloadCountHint = downloadMenuView.findViewById(R.id.menu_download_count_hint)
+        mDownloadCountHint = downloadMenuView?.findViewById(R.id.menu_download_count_hint)
+        mDownloadCountHint?.typeface = Typeface.createFromAsset(assets, Constants.DIN_FONT_PATH)
     }
 
     override fun onMenuItemClick(item: MenuItem?): Boolean {
@@ -72,22 +74,30 @@ abstract class DownloadToolbarActivity : ToolBarActivity() {
     }
 
     private fun updateDownloadCountHint(updateList: List<GameUpdateEntity>?) {
-        if (mDownloadCountHint == null || updateList.isNullOrEmpty()) return
+        if (mDownloadCountHint == null) return
         val count = DownloadManager.getInstance().getDownloadOrUpdateCount(updateList)
         if (count != null) {
-            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
+            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
         } else {
-            mDownloadCountHint!!.visibility = View.GONE
+            mDownloadCountHint?.visibility = View.GONE
         }
     }
 
@@ -102,10 +112,12 @@ abstract class DownloadToolbarActivity : ToolBarActivity() {
         }
     }
 
-    override fun onNightModeChange() {
-        super.onNightModeChange()
+    override fun onDarkModeChanged() {
+        super.onDarkModeChanged()
         if (showDownloadMenu() && getMenuItem(R.id.menu_download) != null) {
-            (getMenuItem(R.id.menu_download).actionView.findViewById(R.id.menu_download_iv) as ImageView).setImageResource(R.drawable.toolbar_download)
+            (getMenuItem(R.id.menu_download).actionView?.findViewById(R.id.menu_download_iv) as ImageView).setImageResource(
+                R.drawable.toolbar_download
+            )
         }
     }
 }

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

@@ -2,24 +2,50 @@ package com.gh.base
 
 import android.app.Activity
 import android.app.Application
+import android.content.res.Configuration
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import com.gh.ad.AdDelegateHelper
 import com.gh.common.util.FloatingBackViewManager
+import com.gh.common.xapk.XapkInstaller
 import com.gh.download.DownloadManager
-import com.gh.gamecenter.MainActivity
+import com.gh.gamecenter.SingletonWebActivity
+import com.gh.gamecenter.SkipActivity
+import com.gh.gamecenter.SplashAdActivity
 import com.gh.gamecenter.SplashScreenActivity
+import com.gh.gamecenter.authorization.AuthorizationActivity
+import com.gh.gamecenter.common.base.GlobalActivityManager
+import com.gh.gamecenter.common.provider.IHelpAndFeedbackProvider
 import com.gh.gamecenter.common.utils.PackageFlavorHelper
-import com.gh.gamecenter.energy.view.EnergyCenterActivity
-import com.gh.gamecenter.forum.detail.ForumDetailActivity
-import com.gh.gamecenter.forum.list.ForumListActivity
-import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity
-import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity
-import com.gh.gamecenter.qa.video.detail.ForumVideoDetailActivity
+import com.gh.gamecenter.core.provider.IPushProvider
+import com.gh.gamecenter.login.utils.QuickLoginHelper
+import com.gh.gamecenter.login.view.LoginActivity
+import com.gh.gamecenter.va.VCore
 import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
+import com.therouter.TheRouter
 
 // TODO：移动到对应的模块
 class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
+    private var isFromBackgroundToForeground = false // 是否后台回到前台
+
+    override fun onActivityPreCreated(activity: Activity, savedInstanceState: Bundle?) {
+        if (QuickLoginHelper.isLoginAuthPage(activity)) {
+            try {
+                val resources = activity.resources
+                val config = Configuration(resources.configuration)
+                config.fontScale = 1.0f
+
+                // 更新Resources配置
+                val metrics = resources.displayMetrics
+                metrics.scaledDensity = metrics.density
+                resources.updateConfiguration(config, metrics)
+
+            } catch (e: Exception) {
+                // 设置字体失败
+            }
+        }
+    }
 
     override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
         // do nothing
@@ -27,16 +53,37 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
 
     override fun onActivityStarted(activity: Activity) {
         GlobalActivityManager.currentActivity = activity
+        GlobalActivityManager.activityCount++
+        if (GlobalActivityManager.activityCount == 1 && isFromBackgroundToForeground) {
+            if (AdDelegateHelper.shouldShowStartUpAd(true)
+                && !HaloApp.getInstance().isDisableSplashAdTemporarily
+                && activity !is SplashScreenActivity
+                && activity !is SkipActivity
+                && activity !is AuthorizationActivity
+                && activity !is SplashAdActivity
+                && !isSuggestionActivity(activity)
+            ) {
+                activity.startActivity(SplashAdActivity.getIntent(activity))
+            }
+            isFromBackgroundToForeground = false
+        }
+
+        if (GlobalActivityManager.activityCount == 1) {
+            // 清除桌面角标
+            if (activity !is SplashScreenActivity && activity !is AuthorizationActivity) {
+                val pushProvider = TheRouter.get(IPushProvider::class.java)
+                pushProvider?.cleanBadgeNumber(activity.applicationContext)
+            }
+        }
+        if (QuickLoginHelper.isLoginAuthPage(activity)) {
+            QuickLoginHelper.addCustomViewToLoginAuthPage(activity)
+        }
     }
 
     override fun onActivityResumed(activity: Activity) {
         // 判断是否需要显示或隐藏返回小浮窗
         if (FloatingBackViewManager.getType().isNotEmpty()) {
-            if (activity is EnergyCenterActivity
-                && FloatingBackViewManager.getType() == FloatingBackViewManager.TYPE_TASK
-            ) {
-                FloatingBackViewManager.disableBackView()
-            } else if (!shouldShowActivityBackView(activity)
+            if (activity is SingletonWebActivity
                 && FloatingBackViewManager.getType() == FloatingBackViewManager.TYPE_ACTIVITY
             ) {
                 FloatingBackViewManager.disableBackView()
@@ -58,32 +105,32 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
         }
 
         if (PackageFlavorHelper.IS_TEST_FLAVOR && activity is AppCompatActivity) {
-            NightModeSwitchHelper.showNightModeSwitchFloatingView(activity)
+            DarkModeSwitchHelper.showDarkModeSwitchFloatingView(activity)
         }
 
-        if (activity is AppCompatActivity && activity !is SplashScreenActivity) {
+        if (activity is AppCompatActivity
+            && !VCore.getInstance().isLaunchActivity(activity)
+            && activity !is LoginActivity
+            && activity !is SplashScreenActivity
+            && activity !is SkipActivity
+            && activity !is AuthorizationActivity
+        ) {
             VHelper.showFeedbackDialogIfLastSuccessfulLaunchedGameExitUnexpectedly(activity)
         }
-    }
 
-    private fun shouldShowActivityBackView(activity: Activity): Boolean {
-        return (activity is MainActivity
-                || activity is ArticleDetailActivity
-                || activity is ForumVideoDetailActivity
-                || activity is ForumDetailActivity
-                || activity is ForumListActivity
-                || activity is NewQuestionDetailActivity)
+        XapkInstaller.updateCurrentInstallStatus()
     }
 
     override fun onActivityPaused(activity: Activity) {
         FloatingBackViewManager.dismissBackView()
         if (PackageFlavorHelper.IS_TEST_FLAVOR && activity is AppCompatActivity) {
-            NightModeSwitchHelper.dismissNightModeSwitchFloatingView()
+            DarkModeSwitchHelper.dismissDarkModeSwitchFloatingView()
         }
     }
 
     override fun onActivityStopped(activity: Activity) {
-        // do nothing
+        GlobalActivityManager.activityCount--
+        isFromBackgroundToForeground = GlobalActivityManager.activityCount <= 0
     }
 
     override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
@@ -91,7 +138,14 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
     }
 
     override fun onActivityDestroyed(activity: Activity) {
-        // do nothing
+        if (QuickLoginHelper.isLoginAuthPage(activity)) {
+            QuickLoginHelper.release()
+        }
+    }
+
+    private fun isSuggestionActivity(activity: Activity): Boolean {
+        val helpAndFeedbackProvider = TheRouter.get(IHelpAndFeedbackProvider::class.java)
+        return helpAndFeedbackProvider?.isSuggestionActivity(activity) ?: false
     }
 
 }

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

@@ -1,14 +0,0 @@
-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/base/NightModeSwitchHelper.kt

@@ -1,107 +0,0 @@
-package com.gh.base
-
-import android.os.Build
-import android.view.Gravity
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.app.AppCompatDelegate
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.utils.DialogHelper
-import com.gh.gamecenter.common.utils.NightModeUtils
-import com.gh.gamecenter.common.utils.PackageFlavorHelper
-import com.gh.gamecenter.common.utils.dip2px
-import com.lzf.easyfloat.EasyFloat
-import com.lzf.easyfloat.enums.ShowPattern
-import com.lzf.easyfloat.enums.SidePattern
-
-object NightModeSwitchHelper {
-
-    fun showNightModeSwitchFloatingView(activity: AppCompatActivity) {
-        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-            EasyFloat.with(activity)
-                .setLayout(R.layout.layout_day_mode_night_mode_switch)
-                .setTag("night_mode_switch_floating_view")
-                .setAnimator(null)
-                .setGravity(Gravity.TOP.xor(Gravity.END), 0, 114F.dip2px())
-                .setSidePattern(SidePattern.RESULT_SIDE)
-                .setDragEnable(true)
-                .setShowPattern(ShowPattern.CURRENT_ACTIVITY)
-                .registerCallback {
-                    createResult { _, _, view ->
-//                        val url = "https://ps.w.org/dark-mode-for-wp-dashboard/assets/icon-128x128.png"
-//                        view?.findViewById<ImageView>(R.id.iconIv)?.let {
-//                            Picasso.with(activity).load(url).into(it)
-//                        }
-                        view?.setOnClickListener {
-                            showNightModeSwitchDialog(activity)
-                        }
-                    }
-                }
-                .show()
-        }
-    }
-
-    fun dismissNightModeSwitchFloatingView() {
-        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-            EasyFloat.dismiss("night_mode_switch_floating_view")
-        }
-    }
-
-    private fun showNightModeSwitchDialog(activity: AppCompatActivity) {
-        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-            //切换深色模式
-            var mode = "普通模式"
-            var positive = "跟随系统模式"
-            var negative ="深色模式"
-            if (NightModeUtils.getSystemMode()) {
-                mode = "跟随系统模式"
-                positive = "普通模式"
-                negative = "深色模式"
-            } else if (NightModeUtils.getNightMode()) {
-                mode = "深色模式"
-                positive = "跟随系统模式"
-                negative = "普通模式"
-            }
-            DialogHelper.showDialog(
-                context = activity,
-                title = "选择模式",
-                content = "当前为 $mode",
-                confirmText = positive,
-                cancelText = negative,
-                confirmClickCallback = {
-                    if (NightModeUtils.getSystemMode()) {
-                        NightModeUtils.setNightMode(false)
-                        NightModeUtils.setSystemMode(false)
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                            activity.delegate.localNightMode = AppCompatDelegate.MODE_NIGHT_NO
-                        }
-                    } else {
-                        NightModeUtils.setSystemMode(true)
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                            activity.delegate.localNightMode =
-                                AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
-                        }
-                    }
-                    NightModeUtils.initNightMode()
-                },
-                cancelClickCallback = {
-                    if (NightModeUtils.getSystemMode()) {
-                        NightModeUtils.setNightMode(true)
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                            activity.delegate.localNightMode = AppCompatDelegate.MODE_NIGHT_YES
-                        }
-                    } else {
-                        val nightMode = NightModeUtils.getNightMode()
-                        NightModeUtils.setNightMode(!NightModeUtils.getNightMode())
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                            activity.delegate.localNightMode =
-                                if (nightMode) AppCompatDelegate.MODE_NIGHT_NO else AppCompatDelegate.MODE_NIGHT_YES
-                        }
-                    }
-                    NightModeUtils.setSystemMode(false)
-                    NightModeUtils.initNightMode()
-                },
-                extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
-            )
-        }
-    }
-}

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

@@ -3,53 +3,115 @@ package com.gh.common
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
+import android.os.Handler
+import android.os.Looper
 import android.util.Base64
+import android.view.View
 import android.webkit.JavascriptInterface
 import androidx.annotation.Keep
 import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
+import androidx.fragment.app.FragmentManager
+import androidx.lifecycle.Lifecycle
+import com.gh.common.exposure.ExposureManager
 import com.gh.common.util.*
 import com.gh.common.util.LogUtils
-import com.gh.gamecenter.*
+import com.gh.download.DownloadManager
+import com.gh.download.PackageObserver
+import com.gh.gamecenter.BuildConfig
+import com.gh.gamecenter.ImageViewerActivity
+import com.gh.gamecenter.R
+import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.common.callback.BiCallback
 import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.constant.Constants.SP_MEMBER_PAYMENT_BUTTON_CLICK
+import com.gh.gamecenter.common.constant.Constants.SP_MEMBER_RECHARGE_BUTTON_CLICK
 import com.gh.gamecenter.common.entity.NotificationUgc
+import com.gh.gamecenter.common.exposure.ExposureSource
 import com.gh.gamecenter.common.loghub.LoghubUtils
+import com.gh.gamecenter.common.provider.IHelpAndFeedbackProvider
 import com.gh.gamecenter.common.tracker.Tracker
 import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.common.utils.NewFlatLogUtils
+import com.gh.gamecenter.common.utils.SensorsBridge.EVENT_MEMBER_RECHARGE_BUTTON_CLICK
+import com.gh.gamecenter.common.utils.SensorsBridge.EVENT_NAME
+import com.gh.gamecenter.common.utils.SensorsBridge.KEY_IS_FIRST_TIME
 import com.gh.gamecenter.common.view.dsbridge.CompletionHandler
 import com.gh.gamecenter.core.AppExecutor
+import com.gh.gamecenter.core.provider.IAcceleratorProvider
+import com.gh.gamecenter.core.provider.IPushProvider
 import com.gh.gamecenter.core.runOnIoThread
 import com.gh.gamecenter.core.runOnUiThread
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.core.utils.MtaHelper
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.energy.utils.EnergyTaskHelper
-import com.gh.gamecenter.energy.view.EnergyCenterActivity
-import com.gh.gamecenter.energy.view.EnergyHouseActivity
-import com.gh.gamecenter.entity.MtaEvent
-import com.gh.gamecenter.help.QaFeedbackDialogFragment
-import com.gh.gamecenter.login.entity.Badge
+import com.gh.gamecenter.core.utils.*
+import com.gh.gamecenter.entity.SensorsEvent
+import com.gh.gamecenter.eventbus.EBDownloadStatus
+import com.gh.gamecenter.eventbus.EBPackage
+import com.gh.gamecenter.feature.entity.AcctRecordEntity
+import com.gh.gamecenter.feature.entity.Badge
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.entity.OrderEntity
+import com.gh.gamecenter.feature.exposure.ExposureEvent
 import com.gh.gamecenter.login.user.LoginTag
-import com.gh.gamecenter.login.view.LoginActivity
 import com.gh.gamecenter.login.user.UserManager
-import com.gh.gamecenter.personalhome.border.AvatarBorderActivity
-import com.gh.gamecenter.security.BindPhoneActivity
 import com.gh.gamecenter.login.user.UserRepository
 import com.gh.gamecenter.login.utils.LoginHelper
 import com.gh.gamecenter.login.utils.QuickLoginHelper
+import com.gh.gamecenter.login.view.LoginActivity
+import com.gh.gamecenter.personalhome.border.AvatarBorderActivity
+import com.gh.gamecenter.setting.SettingBridge
+import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
+import com.halo.assistant.accelerator.repository.AccelerationRepository.Companion.PAYMENT_TYPE_ALIPAY
+import com.halo.assistant.accelerator.repository.AccelerationRepository.Companion.PAYMENT_TYPE_WECHAT
+import com.halo.assistant.accelerator.repository.AcceleratorDataHolder
+import com.lightgame.download.DataWatcher
+import com.lightgame.download.DownloadEntity
+import com.lightgame.download.DownloadStatus.*
 import com.lightgame.utils.Utils
+import com.therouter.TheRouter
+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 = "") {
+class DefaultJsApi(
+    var context: Context,
+    val entrance: String = "",
+    private val mFragment: Fragment? = null,
+    private var mBbsId: String? = "",
+    private var mOriginUrl: String? = "",
+    private val mForumName: String? = "",
+    private val listener: OnWebClickListener? = null
+) {
+
+    companion object {
+        private const val SOURCE_ENTRANCE = "webView"
+    }
 
     private var mLoginHandler: CompletionHandler<Any>? = null
+    private var mDownloadWatcher: DataWatcher? = null // 下载观察者
+    private var mDownloadUrlSet: HashSet<String>? = null // 下载的 url 集合
+    private var mDownloadHandler: CompletionHandler<Any>? = null // 下载信息回调
+    private var mExposureEvent: ExposureEvent? = null // 活动曝光实体
+
+    private val handler = Handler(Looper.getMainLooper())
+
+    init {
+        if (mFragment != null) {
+            EventBus.getDefault().register(this)
+            autoUnregisterDownloadObserverIfNeeded(mFragment)
+        }
+    }
+
+    @JavascriptInterface
+    fun isEnableForceDark(msg: Any): Boolean {
+        return DarkModeUtils.isWebViewForceDarkEnabled
+    }
 
     @JavascriptInterface
     fun isGhzs(msg: Any): String {
@@ -63,9 +125,20 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
 
     @JavascriptInterface
     fun logMtaEvent(event: Any) {
-        val mtaEvent = event.toString().toObject() ?: MtaEvent()
+        // do nothing, mta is deprecated
+    }
 
-        MtaHelper.onEvent(mtaEvent.name, mtaEvent.key, mtaEvent.value)
+    @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
@@ -80,7 +153,7 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
 
     @JavascriptInterface
     fun login(msg: Any) {
-        if (SPUtils.getBoolean(Constants.SP_HAS_GET_PHONE_INFO) || NetworkUtils.isOpenMobileData(context)) {
+        if (NetworkUtils.isQuickLoginEnabled(context)) {
             QuickLoginHelper.startLogin(context, "浏览器")
         } else {
             val intent = LoginActivity.getIntent(context, "浏览器")
@@ -130,7 +203,6 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
 
                     WechatBindHelper.bindWechat(wechatLoginInfoMap, object : BiCallback<Boolean, Boolean> {
                         override fun onFirst(first: Boolean) {
-                            EnergyTaskHelper.postEnergyTask("bind_wechat")
                             handler.complete(true)
                         }
 
@@ -166,7 +238,24 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
     @JavascriptInterface
     fun startApp(msg: Any) {
         val packageName = msg.toString()
-        PackageUtils.launchApplicationByPackageName(HaloApp.getInstance().application, packageName)
+        val context = HaloApp.getInstance().application
+
+        runOnUiThread {
+            // 若畅玩列表中安装了，优先启动畅玩游戏
+            if (VHelper.isInstalled(packageName)) {
+                VHelper.validateVSpaceBeforeAction(context, packageName, null) {
+                    VHelper.launch(context, packageName)
+                }
+            } else {
+                val wechatPkgName = "com.tencent.mm"
+                if (packageName == wechatPkgName && !PackageUtils.isInstalled(context, wechatPkgName)) {
+                    // 如果是微信客户端，需要检查是否安装微信
+                    ToastUtils.showToast(R.string.wechat_app_not_install_tips.toResString())
+                    return@runOnUiThread
+                }
+                PackageLauncher.launchApp(context, packageName = packageName)
+            }
+        }
     }
 
     @JavascriptInterface
@@ -175,12 +264,19 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
 
         val context = CurrentActivityHolder.getCurrentActivity()
 
-        context?.startActivity(ImageViewerActivity.getIntent(context, imageEvent.imageList, imageEvent.position, "浏览器"))
+        context?.startActivity(
+            ImageViewerActivity.getIntent(
+                context,
+                imageEvent.imageList,
+                imageEvent.position,
+                "浏览器"
+            )
+        )
     }
 
     @JavascriptInterface
     fun isInstalled(event: Any): String {
-        val localInstalledPackageList = PackageUtils.getAllPackageName(HaloApp.getInstance().application)
+        val localInstalledPackageList = PackageHelper.getInstalledPackageNameList(HaloApp.getInstance().application, 0)
         val packageNameList: ArrayList<String> = event.toString().toObject() ?: ArrayList()
 
         for (packageName in packageNameList) {
@@ -214,6 +310,31 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
         }
     }
 
+    /**
+     * 是否为论坛详情的专区
+     */
+    @JavascriptInterface
+    fun isForumZone(msg: Any): Boolean {
+        return !mBbsId.isNullOrEmpty()
+    }
+
+    /**
+     * 打开论坛搜索页
+     * 如果用户是从 webView跳转到论坛搜索页，则sourceEntrance为空
+     */
+    @JavascriptInterface
+    fun openForumSearch(msg: Any) {
+        runOnUiThread {
+            DirectUtils.directToForumOrUserSearch(
+                context,
+                mBbsId ?: "",
+                entrance.ifBlank { "内部网页" },
+                SOURCE_ENTRANCE,
+                mForumName ?: ""
+            )
+        }
+    }
+
     @JavascriptInterface
     fun exitWebView(msg: Any) {
         runOnUiThread { (context as Activity).finish() }
@@ -222,7 +343,6 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
     @JavascriptInterface
     fun updateRegulationTestStatus(msg: Any) {
         if (msg.toString().toLowerCase(Locale.getDefault()) == "pass") {
-            EnergyTaskHelper.postEnergyTask("finish_etiquette_exam")
             SPUtils.setString(Constants.SP_REGULATION_TEST_PASS_STATUS, "pass")
         }
     }
@@ -238,6 +358,17 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
         return HaloApp.getInstance().gid
     }
 
+    @JavascriptInterface
+    fun getOaid(msg: Any): String {
+        return HaloApp.getInstance().oaid
+    }
+
+    @JavascriptInterface
+    fun getPushId(): String {
+        val pushProvider = TheRouter.get(IPushProvider::class.java)
+        return pushProvider?.getRegistrationId(HaloApp.getInstance()) ?: "unknown"
+    }
+
     @JavascriptInterface
     fun showIncompatibleVersionDialog(msg: Any) {
         DialogHelper.showUpgradeDialog(context)
@@ -269,7 +400,7 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
 
     @JavascriptInterface
     fun bindPhone(msg: Any) {
-        val intent = BindPhoneActivity.getNormalIntent(context, false)
+        val intent = SettingBridge.getBindPhoneNormalIntent(context, false)
         context.startActivity(intent)
     }
 
@@ -293,27 +424,28 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
 
     @JavascriptInterface
     fun openInNewWebview(url: Any) {
-        runOnUiThread { DirectUtils.directToWebView(context, url.toString(), "内部网页") }
+        runOnUiThread { DirectUtils.directToWebView(context, url.toString(), entrance.ifBlank { "内部网页" }) }
     }
 
     @JavascriptInterface
     fun postWearBadgeTask(msg: Any) {
-        EnergyTaskHelper.postEnergyTask("wear_badge")
+        // do nothing
     }
 
     @JavascriptInterface
     fun startEnergyCenter(msg: Any) {
-        context.startActivity(EnergyCenterActivity.getIntent(context))
+        // do nothing
     }
 
     @JavascriptInterface
     fun startEnergyHouse(msg: Any) {
-        context.startActivity(EnergyHouseActivity.getIntent(context))
+        // do nothing
     }
 
     @JavascriptInterface
     fun showQaFeedbackDialog(msg: Any) {
-        QaFeedbackDialogFragment.show(context as AppCompatActivity, msg.toString())
+        val mHelpAndFeedbackHelp = TheRouter.get(IHelpAndFeedbackProvider::class.java)
+        mHelpAndFeedbackHelp?.showQaFeedbackDialogFragment(context as AppCompatActivity, msg.toString())
     }
 
     @JavascriptInterface
@@ -360,11 +492,6 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
         FloatingBackViewManager.enableBackView(FloatingBackViewManager.TYPE_ACTIVITY, msg.toString())
     }
 
-    @JavascriptInterface
-    fun startBBSStayTimeCount(msg: Any) {
-        BbsStayTimeHelper.enableStayTimeCount(msg.toString().toInt())
-    }
-
     @JavascriptInterface
     fun saveBase64ImageToGallery(msg: Any) {
         val base64StringData = msg.toString()
@@ -373,7 +500,8 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
                 runOnIoThread {
                     val base64String = base64StringData.replace("data:image/png;base64", "")
                     tryWithDefaultCatch {
-                        val imageFile = File(HaloApp.getInstance().cacheDir.absolutePath + File.separator + System.currentTimeMillis() + ".png")
+                        val imageFile =
+                            File(HaloApp.getInstance().cacheDir.absolutePath + File.separator + System.currentTimeMillis() + ".png")
                         val decodedString = Base64.decode(base64String, Base64.DEFAULT)
                         val bos = BufferedOutputStream(FileOutputStream(imageFile))
                         bos.write(decodedString)
@@ -387,6 +515,44 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
         }
     }
 
+    @JavascriptInterface
+    fun saveWechatQRCode(msg: Any) {
+        val base64StringData = msg.toString()
+        runOnUiThread {
+            (context as? FragmentActivity)?.checkStoragePermissionBeforeAction {
+                runOnIoThread {
+                    val base64String = base64StringData.replace("data:image/png;base64", "")
+                    tryWithDefaultCatch {
+                        val imageFile =
+                            File(HaloApp.getInstance().cacheDir.absolutePath + File.separator + System.currentTimeMillis() + ".png")
+                        val decodedString = Base64.decode(base64String, Base64.DEFAULT)
+                        val bos = BufferedOutputStream(FileOutputStream(imageFile))
+                        bos.write(decodedString)
+                        bos.flush()
+                        bos.close()
+
+                        ImageUtils.saveImageToFile(imageFile, "", true) {
+                            // 这里是 ui 线程
+                            // 保存微信二维码成功，1s 以后跳转微信
+                            if (mFragment != null && mFragment.lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) {
+                                handler.removeCallbacksAndMessages(null)
+                                handler.postDelayed({
+                                    val wechatPkgName = "com.tencent.mm"
+                                    if (!PackageUtils.isInstalled(context, wechatPkgName)) {
+                                        ToastUtils.showToast(R.string.wechat_app_not_install_tips.toResString())
+                                        return@postDelayed
+                                    }
+                                    PackageLauncher.launchApp(context, packageName = wechatPkgName)
+                                }, 1000)
+                            }
+
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     @JavascriptInterface
     fun loginWithCallback(msg: Any, handler: CompletionHandler<Any>) {
         mLoginHandler = handler
@@ -400,21 +566,12 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
 
     @JavascriptInterface
     fun openInNewFullWebview(url: Any) {
-        runOnUiThread { DirectUtils.directToFullScreenWebPage(context, url.toString(), true) }
-    }
-
-    @JavascriptInterface
-    fun startGameCollectionSquareBrowseTask(event: Any) {
-        val browseTimeEvent = event.toString().toObject() ?: BrowseTaskEvent()
-        GameCollectionSquareBrowseTaskHelper.enableBrowseTimeCount(
-            browseTimeEvent.timeout.toInt(),
-            browseTimeEvent.isFinished == "true"
-        )
+        runOnUiThread { DirectUtils.directToFullScreenWebPage(context, url.toString(), true, entrance) }
     }
 
     @JavascriptInterface
     fun checkUpdateGhzs(msg: Any) {
-        context.startActivity(AboutActivity.getIntent(context, true))
+        context.startActivity(SettingBridge.getAboutIntent(context, true))
     }
 
     @JavascriptInterface
@@ -437,17 +594,315 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
 
     @JavascriptInterface
     fun getEntrance(msg: Any): String {
-        return entrance
+        return when {
+            entrance.contains("论坛-活动") -> "社区-活动tab-活动banner"
+            entrance.contains("启动弹窗") -> "首页_弹窗"
+            entrance.contains("新首页-轮播图") -> "首页banner"
+            entrance.contains("论坛banner") -> "社区banner"
+            entrance.contains("启动广告") -> "app_开屏文案"
+//            entrance.contains("资讯广场-轮播图") -> "资讯_活动banner"
+            entrance.contains("通用链接合集") -> "资讯_活动banner"
+            entrance.contains("视频流广告位") -> "视频流_广告位"
+            entrance.contains("我的光环banner") -> "我的光环_banner"
+            entrance.contains("论坛详情页置顶栏") -> "社区_论坛置顶"
+
+            else -> entrance
+        }
+    }
+
+    @JavascriptInterface
+    fun getInstallStatus(event: Any): String {
+        val localInstalledPackageList = PackageHelper.getInstalledPackageNameList(HaloApp.getInstance().application, 0)
+        val packageNameList: ArrayList<String> = event.toString().toObject() ?: ArrayList()
+        val installStatusMap: HashMap<String, Boolean> = hashMapOf()
+
+        for (packageName in packageNameList) {
+            installStatusMap[packageName] =
+                localInstalledPackageList.contains(packageName) || VHelper.isInstalled(packageName)
+        }
+
+        return installStatusMap.toJson()
+    }
+
+    @JavascriptInterface
+    fun installDownloadedGame(event: Any) {
+        val url = event.toString()
+
+        val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(url, null)
+            ?: DownloadManager.getInstance().getDownloadEntitySnapshot(url, null)
+
+        NewFlatLogUtils.logGameInstall(
+            gameId = downloadEntity?.gameId ?: "",
+            gameName = downloadEntity?.name ?: "",
+            trigger = "主动安装"
+        )
+
+        SensorsBridge.trackInstallGameClick(
+            gameId = downloadEntity?.gameId ?: "",
+            gameName = downloadEntity?.name ?: "",
+            action = "主动安装"
+        )
+
+        downloadEntity?.let {
+            PackageInstaller.install(context, it, showUnzipToast = false, ignoreAsVGame = false)
+        }
+    }
+
+    @JavascriptInterface
+    fun registerDownloadCallback(msg: Any, handler: CompletionHandler<Any>) {
+        val downloadUrlSet: HashSet<String> = msg.toString().toObject() ?: return
+
+        mDownloadHandler = handler
+        mDownloadUrlSet = downloadUrlSet
+
+        if (mDownloadWatcher == null) {
+            mDownloadWatcher = object : DataWatcher() {
+                override fun onDataInit(downloadEntity: DownloadEntity) {
+                    onDataChanged(downloadEntity)
+                }
+
+                override fun onDataChanged(downloadEntity: DownloadEntity?) {
+                    val url = VHelper.getOriginalUrl(downloadEntity?.url)
+
+                    if (downloadEntity != null && mDownloadUrlSet?.contains(url) == true) {
+                        mDownloadHandler?.setProgressData(
+                            SimpleDownloadEntity.fromDownloadEntity(downloadEntity).toJson()
+                        )
+                    }
+                }
+            }
+            DownloadManager.getInstance().addObserver(mDownloadWatcher)
+        }
+    }
+
+    @JavascriptInterface
+    fun registerPackageChangesCallback(msg: Any, handler: CompletionHandler<Any>) {
+        PackageObserver.registerPackageChangeChangeListener(object : PackageObserver.PackageChangeListener {
+            override fun onChanged(data: EBPackage) {
+                handler.setProgressData(data.toJson())
+            }
+        })
+    }
+
+    @JavascriptInterface
+    fun startDownload(msg: Any) {
+        val gameEntity: GameEntity? = msg.toString().toObject()
+
+        if (gameEntity == null) {
+            ToastUtils.toast("下载异常，请稍后重试")
+            return
+        }
+
+        runOnUiThread {
+            // 用一个假的 view 来当 downloadView
+            val stubView = View(context)
+            DownloadItemUtils.setOnClickListener(
+                position = 0,
+                context = context,
+                downloadBtn = stubView,
+                gameEntity = gameEntity,
+                adapter = null,
+                entrance = "(网页活动)",
+                location = "",
+                traceEvent = null,
+                clickCallback = null,
+                refreshCallback = null,
+                allStateClickCallback = null
+            )
+
+            stubView.performClick()
+        }
+    }
+
+    @JavascriptInterface
+    fun resumeDownload(msg: Any) {
+        val url = msg.toString()
+
+        DownloadManager.getInstance().resumeDownload(url)
+    }
+
+    @JavascriptInterface
+    fun pauseDownload(msg: Any) {
+        val url = msg.toString()
+
+        DownloadManager.getInstance().pause(url)
+    }
+
+    @JavascriptInterface
+    fun shareText(event: Any) {
+        val textShareEvent = event.toString().toObject() ?: TextShareEvent()
+        if (textShareEvent.text.isNotEmpty() && textShareEvent.type.isNotEmpty()) {
+            val activity = CurrentActivityHolder.getCurrentActivity()
+            MessageShareUtils.getInstance(activity).shareTextFromWeb(activity, textShareEvent.text, textShareEvent.type)
+        }
+    }
+
+    @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)
+        }
+    }
+
+    @JavascriptInterface
+    fun preOrderWithAli(json: Any) {
+        val order = json.toString().toObject<OrderEntity>() ?: return
+        trackMemberPaymentButtonClick(order, PAYMENT_TYPE_ALIPAY)
+        listener?.onPreOrderWithAli(order)
+    }
+
+    @JavascriptInterface
+    fun preOrderWithWechat(json: Any) {
+        val order = json.toString().toObject<OrderEntity>() ?: return
+        trackMemberPaymentButtonClick(order, PAYMENT_TYPE_WECHAT)
+        listener?.onPreOrderWithWechat(order)
+    }
+
+    private fun trackMemberPaymentButtonClick(order: OrderEntity, paymentType: String) {
+        val isFirstTime = SPUtils.getBoolean(SP_MEMBER_PAYMENT_BUTTON_CLICK, true)
+        SPUtils.setBoolean(SP_MEMBER_PAYMENT_BUTTON_CLICK, false)
+        SensorsBridge.trackMemberPaymentButtonClick(
+            isFirstTime,
+            paymentType,
+            order.setMenuName,
+            order.paymentAmount
+        )
+    }
+
+    @JavascriptInterface
+    fun startGameAccelerate(acctJson: Any) {
+        if (acctJson is String) {
+            val acctRecord = GsonUtils.fromJson(acctJson, AcctRecordEntity::class.java)
+            val accInfo = acctRecord.accInfo
+            listener?.onStartGameAccelerate(accInfo)
+        }
+    }
+
+    @JavascriptInterface
+    fun getCurAcctGameId(): String {
+        return AcceleratorDataHolder.instance.getAcceleratingGameId()
+    }
+
+    @JavascriptInterface
+    fun stopGameAccelerate() {
+        listener?.onStopGameAccelerate()
+    }
+
+    @JavascriptInterface
+    fun getDurationRemainingTime(msg: Any, handler: CompletionHandler<Any>) {
+        TheRouter.get(IAcceleratorProvider::class.java)?.loadQyUserPermissionData {
+            val durationExpiredMinute = AcceleratorDataHolder.instance.vipEntity?.durationExpiredTime ?: 0L
+            handler.complete(durationExpiredMinute)
+        }
+    }
+
+    @JavascriptInterface
+    fun refreshToken(token: Any, handler: CompletionHandler<Any>) {
+        val accessToken = token.toString()
+        UserManager.getInstance().refreshToken(accessToken, object : UserManager.refreshCallBack {
+            override fun onLogin() {
+                handler.complete(true)
+            }
+
+            override fun onLoginFailure(errorMessage: String?) {
+                handler.complete(false)
+            }
+
+        })
+    }
+
+    @JavascriptInterface
+    fun trackSensorsAnalytics(json: Any) {
+        val hashMap = json.toString().toObject<HashMap<String, Any>>() ?: return
+        val eventName = hashMap.remove(EVENT_NAME) ?: return
+        when (eventName) {
+            EVENT_MEMBER_RECHARGE_BUTTON_CLICK -> {
+                hashMap[KEY_IS_FIRST_TIME] = SPUtils.getBoolean(SP_MEMBER_RECHARGE_BUTTON_CLICK, true)
+                SPUtils.setBoolean(SP_MEMBER_RECHARGE_BUTTON_CLICK, false)
+            }
+        }
+        SensorsBridge.trackSensorsAnalyticsFromWeb(eventName.toString(), hashMap)
+    }
+
+    /**
+     * 获取 ExposureEvent，可能为空
+     */
+    fun getExposureEvent(): ExposureEvent? {
+        return mExposureEvent
+    }
+
+    private fun autoUnregisterDownloadObserverIfNeeded(fragment: Fragment?) {
+        fragment?.parentFragmentManager?.registerFragmentLifecycleCallbacks(
+            object : FragmentManager.FragmentLifecycleCallbacks() {
+                override fun onFragmentViewDestroyed(fm: FragmentManager, f: Fragment) {
+                    super.onFragmentViewDestroyed(fm, f)
+                    if (f === fragment) {
+                        fragment.parentFragmentManager.unregisterFragmentLifecycleCallbacks(this)
+
+                        if (mDownloadWatcher != null) {
+                            DownloadManager.getInstance().removeObserver(mDownloadWatcher)
+                        }
+
+                        EventBus.getDefault().unregister(this@DefaultJsApi)
+
+                        handler.removeCallbacksAndMessages(null)
+                    }
+                }
+
+                override fun onFragmentResumed(fm: FragmentManager, f: Fragment) {
+                    super.onFragmentResumed(fm, f)
+
+                    if (f === fragment && mDownloadWatcher != null) {
+                        DownloadManager.getInstance().addObserver(mDownloadWatcher)
+                    }
+                }
+
+                override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
+                    super.onFragmentPaused(fm, f)
+
+                    if (f === fragment && mDownloadWatcher != null) {
+                        DownloadManager.getInstance().removeObserver(mDownloadWatcher)
+                    }
+                }
+            }, false
+        )
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onEventMainThread(status: EBDownloadStatus) {
+        // 将下载任务删除事件回调给网页
+        if (mDownloadHandler != null && "delete" == status.status) {
+            mDownloadHandler?.setProgressData(SimpleDownloadEntity(status.url, 0F, "UNKNOWN").toJson())
+        }
     }
 
     @Keep
-    internal data class ImageEvent(var imageList: ArrayList<String> = arrayListOf(), var position: Int = 0)
+    internal class ImageEvent(var imageList: ArrayList<String> = arrayListOf(), var position: Int = 0)
 
     @Keep
-    internal data class ImageShareEvent(var image: String = "", var type: String = "")
+    internal class ImageShareEvent(var image: String = "", var type: String = "")
 
     @Keep
-    internal data class InviteFriendsEvent(
+    internal class TextShareEvent(var text: String = "", var type: String = "")
+
+    @Keep
+    internal class SimpleExposureEvent(var title: String = "", var id: String = "")
+
+    @Keep
+    internal class InviteFriendsEvent(
         var type: String = "",
         var way: String = "",
         var url: String = "",
@@ -455,16 +910,60 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
     )
 
     @Keep
-    internal data class LogEvent(var jsonString: String = "", var logStore: String = "")
+    internal class LogEvent(var jsonString: String = "", var logStore: String = "")
 
     @Keep
-    internal data class BrowseTaskEvent(var timeout: String = "", var isFinished: String = "")
-
-    @Keep
-    data class GameActivityEvent(
+    class GameActivityEvent(
         var gameId: String = "",
         var activityTitle: String = "",
         var activityId: String = "",
         var platform: String = ""
     )
+
+    @Keep
+    class SimpleDownloadEntity(
+        var url: String = "",
+        var progress: Float = 0F,
+        var status: String = "" // DOWNLOADING, PAUSED, DOWNLOADED, ERROR, UNKNOWN
+    ) {
+        companion object {
+
+            fun fromDownloadEntity(downloadEntity: DownloadEntity): SimpleDownloadEntity {
+                val status: String = when (downloadEntity.status) {
+                    add,
+                    download,
+                    downloading -> "DOWNLOADING"
+
+                    done -> "DOWNLOADED"
+
+                    pause,
+                    resume,
+                    subscribe,
+                    waiting -> "PAUSED"
+
+                    cancel,
+                    delete -> "UNKNOWN"
+
+                    else -> "ERROR"
+                }
+
+                return SimpleDownloadEntity(
+                    url = VHelper.getOriginalUrl(downloadEntity.url),
+                    progress = downloadEntity.percent.toFloat(),
+                    status = status
+                )
+            }
+        }
+    }
+
+    interface OnWebClickListener {
+
+        fun onPreOrderWithAli(order: OrderEntity)
+
+        fun onPreOrderWithWechat(order: OrderEntity)
+
+        fun onStartGameAccelerate(accInfo: AcctRecordEntity.AccInfo)
+
+        fun onStopGameAccelerate()
+    }
 }

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

@@ -5,9 +5,8 @@ import android.content.Intent
 import android.net.Uri
 import android.text.TextUtils
 import android.util.Base64
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.common.util.*
+import com.gh.common.util.CheckLoginUtils
+import com.gh.common.util.DirectUtils
 import com.gh.common.util.DirectUtils.directToFeedback
 import com.gh.common.util.DirectUtils.directToGameDetailVideoStreaming
 import com.gh.common.util.DirectUtils.directToGameServerCalendar
@@ -15,40 +14,63 @@ import com.gh.common.util.DirectUtils.directToGameVideo
 import com.gh.common.util.DirectUtils.directToLegacyVideoDetail
 import com.gh.common.util.DirectUtils.directToLinkPage
 import com.gh.common.util.DirectUtils.directToQa
-import com.gh.gamecenter.core.utils.GsonUtils.gson
-import com.gh.gamecenter.LibaoDetailActivity
-import com.gh.gamecenter.MainActivity
-import com.gh.gamecenter.NewsDetailActivity
+import com.gh.common.util.PackageUtils
+import com.gh.gamecenter.SkipCompatActivity
 import com.gh.gamecenter.WebActivity
+import com.gh.gamecenter.common.constant.Constants
 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.core.AppExecutor
+import com.gh.gamecenter.common.entity.SimpleGameEntity
+import com.gh.gamecenter.common.eventbus.EBReuse
 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.*
+import com.gh.gamecenter.entity.ActivityLabelEntity
+import com.gh.gamecenter.entity.SubjectRecommendEntity
+import com.gh.gamecenter.entity.VideoLinkEntity
+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.gamecollection.publish.GameCollectionEditActivity
+import com.gh.gamecenter.libao.LibaoDetailActivity
+import com.gh.gamecenter.newsdetail.NewsDetailActivity
 import com.gh.gamecenter.qa.BbsType
 import com.gh.gamecenter.qa.video.publish.VideoPublishActivity
 import com.gh.gamecenter.subject.SubjectActivity
 import com.gh.gamecenter.video.detail.VideoDetailContainerViewModel
 import com.lightgame.utils.Utils
+import org.greenrobot.eventbus.EventBus
 import java.nio.charset.Charset
 
 object DefaultUrlHandler {
 
     @JvmStatic
-    fun interceptUrl(context: Context, url: String, entrance: String): Boolean {
-        return interceptUrl(context, url, entrance, false)
+    fun interceptUrl(context: Context, url: String, entrance: String, sourceEntrance: String = ""): Boolean {
+        return interceptUrl(context, url, null, entrance, false, sourceEntrance)
     }
 
     /**
+     * 检查并拦截部分内部处理的 url
+     * @param traceEvent 供一些页面用于登记曝光来源的实体
      * @param bringAppToFront 是否需要在不匹配 host 的时候把 APP 调回到前台 (如微信调起)
+     *
+     * @return 是否已拦截处理
      */
     @JvmStatic
-    fun interceptUrl(context: Context, url: String, entrance: String, bringAppToFront: Boolean = false): Boolean {
+    fun interceptUrl(context: Context, url: String,
+                     traceEvent: ExposureEvent? = null,
+                     entrance: String,
+                     bringAppToFront: Boolean = false,
+                     sourceEntrance: String = ""): Boolean {
         val uri = Uri.parse(url)
+
+        // 优先交给新的路由拦截处理
+        if (SkipCompatActivity.handleSkip(context, uri)) return true
+
         if ("ghzhushou" == uri.scheme) {
             Utils.log("url = $url")
             Utils.log("url = " + uri.scheme!!)
@@ -71,10 +93,18 @@ object DefaultUrlHandler {
                     id = id,
                     tab = uri.getQueryParameter("to"),
                     autoDownload = uri.getQueryParameter("auto_download") == "true",
+                    traceEvent = traceEvent,
                     entrance = entrance
                 )
 
-                "column" -> SubjectActivity.startSubjectActivity(context, id, uri.getQueryParameter("name"), false, entrance)
+                "column" -> SubjectActivity.startSubjectActivity(
+                    context,
+                    id,
+                    uri.getQueryParameter("name"),
+                    false,
+                    null,
+                    entrance
+                )
 
                 "libao" -> context.startActivity(LibaoDetailActivity.getIntentById(context, id, entrance))
 
@@ -93,7 +123,7 @@ object DefaultUrlHandler {
                 }
 
                 "inurl" -> {
-                    DirectUtils.directToWebView(context, uri.getQueryParameter("url") ?: "")
+                    DirectUtils.directToWebView(context, uri.getQueryParameter("url") ?: "", entrance)
                 }
 
                 "outurl" -> {
@@ -108,7 +138,7 @@ object DefaultUrlHandler {
                     }
 
                 }
-                "question" -> DirectUtils.directToQuestionDetail(context, id, entrance, "文章链接")
+                "question" -> DirectUtils.directToQuestionDetail(context, id, entrance, "文章链接", sourceEntrance)
 
                 "real_name" -> DirectUtils.directToRealName(context)
 
@@ -151,7 +181,7 @@ object DefaultUrlHandler {
                     if ("articles" == type) {
                         DirectUtils.directToCommunityArticle(
                             context, typeId, communityId,
-                            entrance, "文章链接"
+                            entrance, "文章链接", sourceEntrance
                         )
                     }
                 }
@@ -167,13 +197,28 @@ object DefaultUrlHandler {
                     val linkEntity = VideoLinkEntity(title, categoryId, link, tagActivityId, tagActivityName)
                     val simpleGameEntity = SimpleGameEntity(gameId, gameName)
                     CheckLoginUtils.checkLogin(context, null, true, EntranceConsts.ENTRANCE_BROWSER) {
-                        DirectUtils.directToVideoManager(context, linkEntity, simpleGameEntity, EntranceConsts.ENTRANCE_BROWSER, "")
+                        DirectUtils.directToVideoManager(
+                            context,
+                            linkEntity,
+                            simpleGameEntity,
+                            EntranceConsts.ENTRANCE_BROWSER,
+                            ""
+                        )
                     }
                 }
                 EntranceConsts.HOST_USERHOME -> {
                     val position = uri.getQueryParameter("position")
                     val subtype = uri.getQueryParameter("sub_type") ?: ""
-                    DirectUtils.directToHomeActivity(context, id, subtype, if (position.isNullOrEmpty()) -1 else position.toInt(), entrance, "")
+                    val subGameType = uri.getQueryParameter("sub_game_type") ?: "game_collection"
+                    DirectUtils.directToHomeActivity(
+                        context,
+                        id,
+                        subtype,
+                        subGameType,
+                        if (position.isNullOrEmpty()) -1 else position.toInt(),
+                        entrance,
+                        ""
+                    )
                 }
                 EntranceConsts.HOST_VIDEO_MORE -> {
                     val referer = uri.getQueryParameter("referer") ?: ""
@@ -204,24 +249,22 @@ object DefaultUrlHandler {
                         act,
                         paginationType,
                         fieldId,
-                        sectionName
+                        sectionName,
+                        sourceEntrance = sourceEntrance
                     )
                 }
                 EntranceConsts.HOST_VIDEO_DETAIL -> {
-                    DirectUtils.directToVideoDetail(context, id, entrance, path)
+                    DirectUtils.directToVideoDetail(context, id, entrance, path, sourceEntrance)
                 }
                 EntranceConsts.HOST_VIDEO_SINGLE -> {
                     val referer = uri.getQueryParameter("referer") ?: ""
                     DirectUtils.directToVideoDetail(
                         context, id, VideoDetailContainerViewModel.Location.SINGLE_VIDEO.value,
-                        false, "", entrance, "", if (TextUtils.isEmpty(referer)) "" else referer
+                        false, "", entrance, "", if (TextUtils.isEmpty(referer)) "" else referer, sourceEntrance
                     )
                 }
                 EntranceConsts.HOST_VIDEO_STREAMING_HOME -> {
-                    intent = Intent(context, MainActivity::class.java)
-                    intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
-                    intent.putExtra(MainActivity.SWITCH_TO_VIDEO, true)
-                    context.startActivity(intent)
+                    DirectUtils.directToHomeVideoTab(context)
                 }
                 EntranceConsts.HOST_VIDEO_STREAMING_DESC -> {
                     directToGameDetailVideoStreaming(context, id, entrance)
@@ -230,10 +273,6 @@ object DefaultUrlHandler {
                     directToGameVideo(context, id, entrance, "")
                 }
 
-                EntranceConsts.HOST_CATEGORY -> {
-                    val title = uri.getQueryParameter("title")
-                    DirectUtils.directCategoryDirectory(context, id, title ?: "", entrance, "")
-                }
                 EntranceConsts.HOST_COLUMN_COLLECTION -> {
                     val name = uri.getQueryParameter("name")
                     DirectUtils.directToColumnCollection(context, id, -1, entrance, name ?: "")
@@ -241,21 +280,6 @@ object DefaultUrlHandler {
                 EntranceConsts.HOST_COLUMN -> {
                     DirectUtils.directToSubject(context, id, uri.getQueryParameter(EntranceConsts.KEY_NAME), entrance)
                 }
-                EntranceConsts.HOST_COMMUNITY_QUESTION_LABEL_DETAIL -> {
-                    val community = CommunityEntity()
-                    community.id = uri.getQueryParameter("community_id") ?: ""
-                    community.name = uri.getQueryParameter("community_name") ?: ""
-                    val tag = uri.getQueryParameter("tag") ?: ""
-                    DirectUtils.directAskColumnLabelDetail(context, tag, community, entrance, "")
-                }
-                EntranceConsts.HOST_COMMUNITY_COLUMN_DETAIL -> {
-                    val community = CommunityEntity()
-                    community.id = uri.getQueryParameter("community_id") ?: ""
-                    community.name = uri.getQueryParameter("community_name") ?: ""
-                    val columnId = uri.getQueryParameter("column_id") ?: ""
-                    DirectUtils.directAskColumnDetail(context, columnId, community, entrance, "")
-                }
-
                 EntranceConsts.HOST_BLOCK -> {
                     val name = uri.getQueryParameter("name")
                         ?: ""
@@ -298,7 +322,7 @@ object DefaultUrlHandler {
                             val linkData = Base64.decode(dataString, Base64.DEFAULT)
                             val linkDataString = String(linkData, Charset.defaultCharset())
                             val le = gson.fromJson(linkDataString, LinkEntity::class.java)
-                            directToLinkPage(context, le, entrance, "")
+                            directToLinkPage(context, le, entrance, sourceEntrance, "")
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()
@@ -323,7 +347,8 @@ object DefaultUrlHandler {
                 }
 
                 EntranceConsts.HOST_FORUM_DETAIL -> {
-                    DirectUtils.directForumDetail(context, id, entrance)
+                    val sectionId = uri.getQueryParameter("section_id") ?: ""
+                    DirectUtils.directForumDetailSection(context, id, sectionId, entrance)
                 }
 
                 EntranceConsts.HOST_GAME_RATING_DETAIL -> {
@@ -336,9 +361,8 @@ object DefaultUrlHandler {
                 }
 
                 EntranceConsts.HOST_FORUM -> {
-                    val position = uri.getQueryParameter(EntranceConsts.KEY_POSITION)?.toInt()
 
-                    DirectUtils.directToForum(context, position ?: 0)
+                    DirectUtils.directToHomeCommunityTab(context)
                 }
 
                 EntranceConsts.HOST_UPLOAD_VIDEO_NEW -> {
@@ -355,14 +379,19 @@ object DefaultUrlHandler {
                     val iconSubscript = uri.getQueryParameter("game_icon_subscript") ?: ""
                     val gameEntity =
                         if (forumType == BbsType.OFFICIAL_BBS.value && gameId.isNotEmpty() && gameName.isNotEmpty() && icon.isNotEmpty()) {
-                            GameEntity(id = gameId, mName = gameName, mIcon = icon, mIconSubscript = iconSubscript)
+                            GameEntity(_id = gameId, mName = gameName, mIcon = icon, mIconSubscript = iconSubscript)
                         } else null
                     val activityLabelEntity = if (activityId.isNotEmpty() && activityName.isNotEmpty()) {
-                        ActivityLabelEntity(id = activityId, name = activityName, original = original.ifEmpty { "false" }.toBoolean())
-                    } else null
-                    val communityEntity = if (forumId.isNotEmpty() && forumName.isNotEmpty() && forumIcon.isNotEmpty()) {
-                        CommunityEntity(id = forumId, name = forumName, icon = forumIcon)
+                        ActivityLabelEntity(
+                            id = activityId,
+                            name = activityName,
+                            original = original.ifEmpty { "false" }.toBoolean()
+                        )
                     } else null
+                    val communityEntity =
+                        if (forumId.isNotEmpty() && forumName.isNotEmpty() && forumIcon.isNotEmpty()) {
+                            CommunityEntity(id = forumId, name = forumName, icon = forumIcon)
+                        } else null
 
                     context.startActivity(
                         VideoPublishActivity.getIntent(
@@ -386,10 +415,11 @@ 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-%s-V%s，",
+                        "%s—V%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_VERSION)
+                        uri.getQueryParameter(EntranceConsts.KEY_PLATFORM_VERSION),
                     ) else String.format(
                         "%s-%s-V%s\n游戏ID：%s\n游戏包MD5：%s\n",
                         uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME),
@@ -402,13 +432,20 @@ object DefaultUrlHandler {
                     if (!TextUtils.isEmpty(qaId)) {
                         directToQa(context, qaTitle, qaId)
                     } else {
-                        directToFeedback(context, content, null, isQaFeedback, qaContentId, EntranceConsts.ENTRANCE_BROWSER)
+                        directToFeedback(
+                            context,
+                            content,
+                            isQaFeedback,
+                            qaContentId,
+                            isPlugin = false,
+                            isSmoothGame = false,
+                            EntranceConsts.ENTRANCE_BROWSER
+                        )
                     }
                 }
 
                 EntranceConsts.HOST_HELP_AND_FEEDBACK -> {
-                    val position = uri.getQueryParameter("position") ?: ""
-                    DirectUtils.directToHelpAndFeedback(context, position.toInt())
+                    DirectUtils.directToHelpAndFeedback(context)
                 }
 
                 EntranceConsts.HOST_HELP_DETAIL -> {
@@ -424,12 +461,20 @@ object DefaultUrlHandler {
                         val id = uri.getQueryParameter("id")
                         val name = uri.getQueryParameter("name")
                         val qaCollectionId = uri.getQueryParameter("collection_id")
-                        context.startActivity(WebActivity.getIntent(context, "$url$id", name, true, !qaCollectionId.isNullOrEmpty()))
+                        context.startActivity(
+                            WebActivity.getIntent(
+                                context,
+                                "$url$id",
+                                name,
+                                true,
+                                !qaCollectionId.isNullOrEmpty()
+                            )
+                        )
                     }
                 }
 
                 EntranceConsts.HOST_GAME_COLLECTION_DETAIL -> {
-                    DirectUtils.directToGameCollectionDetail(context, id, entrance)
+                    DirectUtils.directToGameCollectionDetail(context, id, entrance, traceEvent = traceEvent)
                 }
 
                 EntranceConsts.HOST_GAME_COLLECTION_SQUARE -> {
@@ -440,7 +485,26 @@ object DefaultUrlHandler {
                     val activityId = uri.getQueryParameter("activity_id") ?: ""
                     val activityName = uri.getQueryParameter("activity_name") ?: ""
                     val gameId = uri.getQueryParameter("game_id") ?: ""
-                    context.startActivity(GameCollectionEditActivity.getIntent(context, activityId, activityName, gameId, entrance))
+                    context.startActivity(
+                        GameCollectionEditActivity.getCreateIntent(
+                            context,
+                            activityId,
+                            activityName,
+                            gameId,
+                            entrance,
+                            "其他"
+                        )
+                    )
+                }
+
+                EntranceConsts.HOST_GAME_LIBRARY -> {
+                    DirectUtils.directToMainActivity(context)
+                }
+
+                EntranceConsts.HOST_HOME_GAME_COLLECTION_SQUARE -> {
+                    DirectUtils.directToMainActivity(context)
+                    DirectUtils.directToHomeDefaultTab(context)
+                    EventBus.getDefault().post(EBReuse(host))
                 }
 
                 else -> {
@@ -494,7 +558,7 @@ object DefaultUrlHandler {
         }
 
         // 处理内部页面逻辑
-        if (transformNormalScheme(context, url, entrance)) {
+        if (transformNormalScheme(context, url, entrance, sourceEntrance)) {
             return true
         }
 
@@ -503,14 +567,14 @@ object DefaultUrlHandler {
     }
 
     @JvmStatic
-    fun transformNormalScheme(context: Context, url: String, entrance: String): Boolean {
-        val b = transformNewNormalScheme(context, url, entrance)
+    fun transformNormalScheme(context: Context, url: String, entrance: String, sourceEntrance: String): Boolean {
+        val b = transformNewNormalScheme(context, url, entrance, sourceEntrance)
         if (b) return b
-        return transformOldNormalScheme(context, url, entrance)
+        return transformOldNormalScheme(context, url, entrance, sourceEntrance)
     }
 
     @JvmStatic
-    fun transformOldNormalScheme(context: Context, url: String, entrance: String): Boolean {
+    fun transformOldNormalScheme(context: Context, url: String, entrance: String, sourceEntrance: String): Boolean {
         val uri = Uri.parse(url)
         if (uri.host == "www.ghzs666.com"
             || uri.host == "www.ghzs.com"
@@ -523,13 +587,20 @@ object DefaultUrlHandler {
                 when {
                     contains("game") -> {
                         val gameId = uri.getQueryParameter("gameId") ?: uri.pathSegments.last() ?: ""
-                        DirectUtils.directToGameDetail(context, gameId, entrance, autoDownload = false, traceEvent = null)
+                        DirectUtils.directToGameDetail(
+                            context,
+                            gameId,
+                            "",
+                            entrance,
+                            autoDownload = false,
+                            traceEvent = null
+                        )
                     }
                     contains("question") -> {
                         val questionId = split("/")[2]
                         val answerId = uri.getQueryParameter("answer")
                         if (answerId.isNullOrEmpty()) {
-                            DirectUtils.directToQuestionDetail(context, questionId, entrance, "")
+                            DirectUtils.directToQuestionDetail(context, questionId, entrance, "", sourceEntrance)
                         } else {
                             DirectUtils.directToAnswerDetail(context, answerId, entrance, "")
                         }
@@ -540,7 +611,8 @@ object DefaultUrlHandler {
                         var type = ""
                         var typeId = ""
                         val split =
-                            replace("/communities", "").replace("/bbs", "").replace(".html", "").split("/".toRegex()).dropLastWhile { it.isEmpty() }
+                            replace("/communities", "").replace("/bbs", "").replace(".html", "").split("/".toRegex())
+                                .dropLastWhile { it.isEmpty() }
                                 .toTypedArray()
                         for (text in split) {
                             if (TextUtils.isEmpty(communityId)) {
@@ -558,7 +630,7 @@ object DefaultUrlHandler {
                         if ("articles" == type || "article" == type) {
                             DirectUtils.directToCommunityArticle(
                                 context, typeId, communityId,
-                                entrance, "文章链接"
+                                entrance, "文章链接", sourceEntrance
                             )
                         }
                     }
@@ -589,7 +661,7 @@ object DefaultUrlHandler {
     }
 
     @JvmStatic
-    fun transformNewNormalScheme(context: Context, url: String, entrance: String): Boolean {
+    fun transformNewNormalScheme(context: Context, url: String, entrance: String, sourceEntrance: String): Boolean {
         val uri = Uri.parse(url)
         if (uri.host == "www.ghzs666.com"
             || uri.host == "www.ghzs.com"
@@ -607,7 +679,7 @@ object DefaultUrlHandler {
                         val articleId = splits[2].substring(7)
                         DirectUtils.directToCommunityArticle(
                             context, articleId, "",
-                            entrance, "文章链接"
+                            entrance, "文章链接", sourceEntrance
                         )
                     }
                     //https://m.ghzs666.com/article/文章ID
@@ -627,7 +699,7 @@ object DefaultUrlHandler {
                     //https://m.ghzs666.com/bbs/video-视频ID
                     splits.size >= 3 && splits[1] == "bbs" && splits[2].startsWith("video-") -> {
                         val videoId = splits[2].substring(6)
-                        DirectUtils.directToVideoDetail(context, videoId, entrance)
+                        DirectUtils.directToVideoDetail(context, videoId, entrance, sourceEntrance)
                     }
                     else -> return false
                 }

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

@@ -2,25 +2,25 @@ package com.gh.common
 
 import com.gh.common.exposure.ExposureManager
 import com.gh.common.filter.RegionSettingHelper
-import com.gh.gamecenter.common.loghub.LoghubUtils
-import com.gh.gamecenter.common.utils.doOnMainProcessOnly
-import com.gh.gamecenter.common.utils.tryCatchInRelease
 import com.gh.common.videolog.VideoRecordUtils
 import com.gh.download.DownloadDataHelper
-import com.gh.gamecenter.entity.TimeEntity
+import com.gh.gamecenter.common.loghub.LoghubUtils
 import com.gh.gamecenter.common.retrofit.Response
+import com.gh.gamecenter.common.utils.tryCatchInRelease
 import com.gh.gamecenter.core.runOnUiThread
+import com.gh.gamecenter.entity.TimeEntity
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
+import com.lightgame.utils.Utils
 import io.reactivex.schedulers.Schedulers
 import kotlin.concurrent.fixedRateTimer
 
 object FixedRateJobHelper {
     private const val CHECKER_PERIOD: Long = 15 * 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 = 300 * 1000L
+    private const val TIME_PERIOD: Long = 24 * 60 * 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 VIDEO_RECORD_PERIOD: Long = 60 * 1000L
 
     private const val DOWNLOAD_HEARTBEAT_PERIOD: Long = 60 * 1000L
@@ -32,57 +32,56 @@ object FixedRateJobHelper {
 
     @JvmStatic
     fun begin() {
-        doOnMainProcessOnly {
-            fixedRateTimer("Global-Fixed-Rate-Timer", initialDelay = 100, period = CHECKER_PERIOD) {
-                // 时间校对，10分钟一次
-                if ((mExecuteCount * CHECKER_PERIOD) % TIME_PERIOD == 0L) {
-                    RetrofitManager.getInstance().api.time
-                            .subscribeOn(Schedulers.io())
-                            .subscribe(object : Response<TimeEntity>() {
-                                override fun onResponse(response: TimeEntity?) {
-                                    val serverTime = response?.time
-                                    serverTime?.let { timeDeltaBetweenServerAndClient = it * 1000 - System.currentTimeMillis() }
-                                }
-                            })
-                }
-
-                // 提交曝光数据
-                if ((mExecuteCount * CHECKER_PERIOD) % EXPOSURE_PERIOD == 0L) {
-                    runOnUiThread {
-                        ExposureManager.commitSavedExposureEvents(true)
-                    }
-                }
-
-                // 分片检测下载进度
-                if ((mExecuteCount * CHECKER_PERIOD) % DOWNLOAD_HEARTBEAT_SHEET_PERIOD == 0L) {
-                    tryCatchInRelease {
-                        val upload = (mExecuteCount * CHECKER_PERIOD) % DOWNLOAD_HEARTBEAT_PERIOD == 0L
-                        DownloadDataHelper.uploadDownloadHeartbeat(upload)
-                    }
-                }
-
-                // 提交普通 loghub 数据
-                if ((mExecuteCount * CHECKER_PERIOD) % LOGHUB_PERIOD == 0L) {
-                    runOnUiThread {
-                        LoghubUtils.commitSavedLoghubEvents(true)
-                    }
-                }
-
-                // 更新游戏屏蔽信息
-                if ((mExecuteCount * CHECKER_PERIOD) % REGION_SETTING_PERIOD == 0L) {
-                    if (HaloApp.getInstance().isRunningForeground) {
-                        RegionSettingHelper.getRegionSetting()
-                    }
-                }
-
-                // 提交视频浏览记录数据
-                if ((mExecuteCount * CHECKER_PERIOD) % VIDEO_RECORD_PERIOD == 0L) {
-                    VideoRecordUtils.commitVideoRecord()
-                }
-
-//              ExposureUtils.logADownloadCompleteExposureEvent(GameEntity(id = mExecuteCount.toString(), name = "测试曝光上传"), platform = "", trace = null, downloadType = ExposureUtils.DownloadType.DOWNLOAD)
-                mExecuteCount++
+        // 时间检查，每15秒检查一次
+        fixedRateTimer("Global-Fixed-Rate-Timer", initialDelay = 100, period = CHECKER_PERIOD) {
+            val elapsedTime = mExecuteCount * CHECKER_PERIOD
+            // 时间校对，24 小时一次
+            if (elapsedTime % TIME_PERIOD == 0L) {
+                RetrofitManager.getInstance().api.time
+                    .subscribeOn(Schedulers.io())
+                    .subscribe(object : Response<TimeEntity>() {
+                        override fun onResponse(response: TimeEntity?) {
+                            val serverTime = response?.time
+                            serverTime?.let {
+                                timeDeltaBetweenServerAndClient = it * 1000 - System.currentTimeMillis()
+                            }
+                        }
+                    })
             }
+
+            // 提交曝光数据
+            if (elapsedTime % EXPOSURE_PERIOD == 0L) {
+                ExposureManager.commitSavedExposureEvents(true)
+            }
+
+            // 分片检测下载进度
+            if (elapsedTime % DOWNLOAD_HEARTBEAT_SHEET_PERIOD == 0L) {
+                tryCatchInRelease {
+                    val upload = (mExecuteCount * CHECKER_PERIOD) % DOWNLOAD_HEARTBEAT_PERIOD == 0L
+                    DownloadDataHelper.uploadDownloadHeartbeat(upload)
+                }
+            }
+
+            // 提交普通 loghub 数据
+            if (elapsedTime % LOGHUB_PERIOD == 0L) {
+                runOnUiThread {
+                    LoghubUtils.commitSavedLoghubEvents(true)
+                }
+            }
+
+            // 更新游戏屏蔽信息
+            if (elapsedTime % REGION_SETTING_PERIOD == 0L) {
+                if (HaloApp.getInstance().isRunningForeground) {
+                    RegionSettingHelper.getRegionSetting()
+                }
+            }
+
+            // 提交视频浏览记录数据
+            if (elapsedTime % VIDEO_RECORD_PERIOD == 0L) {
+                VideoRecordUtils.commitVideoRecord()
+            }
+
+            mExecuteCount++
         }
     }
 }

app/src/main/java/com/gh/common/browse/BrowseTimer.kt

@@ -0,0 +1,351 @@
+package com.gh.common.browse
+
+import android.os.Handler
+import android.os.Looper
+import android.os.Message
+import androidx.lifecycle.*
+import androidx.lifecycle.Lifecycle.Event
+
+/**
+ * 浏览时长计时器核心接口类，用于页面浏览时长相关埋点上报
+ */
+interface IBrowseTimerCore {
+    /**
+     * 开始计时
+     */
+    fun start()
+
+    /**
+     * 结束计时
+     */
+    fun stop()
+}
+
+/**
+ * 浏览时长计时器核心实现类
+ */
+class BrowseTimerCore internal constructor() : IBrowseTimerCore {
+
+    /**
+     * 延迟执行的时间
+     */
+    var delayInMills: Long = 3000L
+
+    /**
+     * 开始计时函数回调
+     */
+    var onStart: (() -> Unit)? = null
+
+    /**
+     * 结束计时函数回调
+     */
+    var onResult: ((Long) -> Unit)? = null
+
+    /**
+     * 开始计时的时间点
+     */
+    private var startTimeInMills: Long = 0L
+
+    /**
+     * Handler操作类
+     */
+    private val handler = object : Handler(Looper.getMainLooper()) {
+        override fun handleMessage(msg: Message) {
+            if (msg.what == MESSAGE_START) {
+                dispatchOnStart()
+            }
+        }
+    }
+
+    /**
+     * 延迟执行开始计时
+     * @see delayInMills
+     * @see onStart
+     */
+    override fun start() {
+        if (delayInMills <= 0) {
+            dispatchOnStart()
+        } else {
+            handler.sendEmptyMessageDelayed(MESSAGE_START, delayInMills)
+        }
+    }
+
+    /**
+     * 结束计时，统计浏览时长并回调结束计时函数
+     * @see onResult
+     */
+    override fun stop() {
+        handler.removeMessages(MESSAGE_START)
+        if (startTimeInMills > 0L) {
+            onResult?.invoke(System.currentTimeMillis() - startTimeInMills)
+            startTimeInMills = 0L
+        }
+    }
+
+    /**
+     * 开始计时，回调开始计时函数
+     */
+    private fun dispatchOnStart() {
+        startTimeInMills = System.currentTimeMillis()
+        onStart?.invoke()
+    }
+
+    companion object {
+        private const val MESSAGE_START = 1
+    }
+}
+
+/**
+ * 无数据浏览计时器接口类
+ */
+interface IBrowseTimer : IBrowseTimerCore {
+
+    fun withDelayInMills(delayInMills: Long): IBrowseTimer
+
+    fun withStart(onStart: () -> Unit): IBrowseTimer
+
+    fun withResult(onResult: (Long) -> Unit): IBrowseTimer
+}
+
+/**
+ * 无数据的浏览计时器实现类
+ */
+class BrowseTimer : IBrowseTimer {
+
+    private val core = BrowseTimerCore()
+
+    private var isStarted: Boolean = false
+
+    override fun withDelayInMills(delayInMills: Long): IBrowseTimer {
+        core.delayInMills = delayInMills
+        return this
+    }
+
+    override fun withStart(onStart: () -> Unit): IBrowseTimer {
+        core.onStart = onStart
+        return this
+    }
+
+    override fun withResult(onResult: (Long) -> Unit): IBrowseTimer {
+        core.onResult = onResult
+        return this
+    }
+
+    override fun start() {
+        if (isStarted) return
+
+        isStarted = true
+        core.start()
+    }
+
+    override fun stop() {
+        if (!isStarted) return
+
+        core.stop()
+        isStarted = false
+    }
+
+}
+
+/**
+ * 支持Lifecycle的无数据的浏览计时器
+ */
+class LifecycleBoundBrowseTimer internal constructor(
+    private val base: IBrowseTimer,
+    private val onStateChanged: (IBrowseTimer, Event) -> Unit
+) : IBrowseTimer, LifecycleEventObserver {
+    override fun withDelayInMills(delayInMills: Long): IBrowseTimer {
+        return base.withDelayInMills(delayInMills)
+    }
+
+    override fun withStart(onStart: () -> Unit): IBrowseTimer {
+        return base.withStart(onStart)
+    }
+
+    override fun withResult(onResult: (Long) -> Unit): IBrowseTimer {
+        return base.withResult(onResult)
+    }
+
+    override fun start() {
+        base.start()
+    }
+
+    override fun stop() {
+        base.stop()
+    }
+
+    override fun onStateChanged(source: LifecycleOwner, event: Event) {
+        onStateChanged.invoke(this, event)
+    }
+
+}
+
+fun IBrowseTimer.withLifecycle(
+    owner: LifecycleOwner,
+    onStateChanged: (IBrowseTimer, Event) -> Unit = { timer, event ->
+        when(event) {
+            Event.ON_START -> timer.start()
+            Event.ON_STOP -> timer.stop()
+            else -> {}
+        }
+    }
+): LifecycleBoundBrowseTimer = LifecycleBoundBrowseTimer(this, onStateChanged).apply {
+    owner.lifecycle.addObserver(this)
+}
+
+/**
+ * 带数据的浏览计时器接口类
+ */
+interface IValueBrowseTimer<T> : IBrowseTimerCore {
+
+    fun withDelayInMills(delayInMills: Long): IValueBrowseTimer<T>
+
+    fun withStart(onStart: (T?) -> Unit): IValueBrowseTimer<T>
+
+    fun withResult(onResult: (T?, Long) -> Unit): IValueBrowseTimer<T>
+
+    fun dispatchValue(value: T?)
+}
+
+/**
+ * 带数据的浏览计时器实现类
+ */
+class ValueBrowseTimer<T> : IValueBrowseTimer<T> {
+
+    private val core = BrowseTimerCore()
+
+    private var isDispatchValue: Boolean = false
+
+    private var isStarted: Boolean = false
+
+    private var value: T? = null
+
+    override fun withDelayInMills(delayInMills: Long): IValueBrowseTimer<T> {
+        core.delayInMills = delayInMills
+        return this
+    }
+
+    override fun withStart(onStart: (T?) -> Unit): IValueBrowseTimer<T> {
+        core.onStart = { onStart.invoke(value) }
+        return this
+    }
+
+    override fun withResult(onResult: (T?, Long) -> Unit): IValueBrowseTimer<T> {
+        core.onResult = { onResult.invoke(value, it) }
+        return this
+    }
+
+    override fun start() {
+        if (isStarted) return
+
+        isStarted = true
+
+        if (isDispatchValue) {
+            core.start()
+        }
+    }
+
+    override fun stop() {
+        if (!isStarted) return
+
+        core.stop()
+        isStarted = false
+    }
+
+    override fun dispatchValue(value: T?) {
+        this.value = value
+
+        if (isStarted && !isDispatchValue) {
+            core.start()
+        }
+        isDispatchValue = true
+    }
+
+}
+
+/**
+ * 支持LiveData的带数据的浏览计时器
+ */
+class ObserverBoundValueBrowseTimer<T> internal constructor(private val base: IValueBrowseTimer<T>) : IValueBrowseTimer<T>, Observer<T> {
+    override fun withDelayInMills(delayInMills: Long): IValueBrowseTimer<T> {
+        return base.withDelayInMills(delayInMills)
+    }
+
+    override fun withResult(onResult: (T?, Long) -> Unit): IValueBrowseTimer<T> {
+        return base.withResult(onResult)
+    }
+
+    override fun withStart(onStart: (T?) -> Unit): IValueBrowseTimer<T> {
+        return base.withStart(onStart)
+    }
+
+    override fun start() {
+        base.start()
+    }
+
+    override fun stop() {
+        base.stop()
+    }
+
+    override fun dispatchValue(value: T?) {
+        base.dispatchValue(value)
+    }
+
+    override fun onChanged(t: T) {
+        dispatchValue(t)
+    }
+}
+
+
+/**
+ * 支持Lifecycle的带数据的浏览计时器
+ */
+class LifecycleBoundValueBrowseTimer<T> internal constructor(
+    private val base: IValueBrowseTimer<T>,
+    private val onStateChanged: (IValueBrowseTimer<T>, Event) -> Unit
+) : IValueBrowseTimer<T>, LifecycleEventObserver {
+    override fun withDelayInMills(delayInMills: Long): IValueBrowseTimer<T> {
+        return base.withDelayInMills(delayInMills)
+    }
+
+    override fun withResult(onResult: (T?, Long) -> Unit): IValueBrowseTimer<T> {
+        return base.withResult(onResult)
+    }
+
+    override fun withStart(onStart: (T?) -> Unit): IValueBrowseTimer<T> {
+        return base.withStart(onStart)
+    }
+
+    override fun start() {
+        base.start()
+    }
+
+    override fun stop() {
+        base.stop()
+    }
+
+    override fun dispatchValue(value: T?) {
+        base.dispatchValue(value)
+    }
+
+    override fun onStateChanged(source: LifecycleOwner, event: Event) {
+        onStateChanged.invoke(this, event)
+    }
+
+}
+
+fun <T> IValueBrowseTimer<T>.asObserver(): ObserverBoundValueBrowseTimer<T> = ObserverBoundValueBrowseTimer(this)
+
+fun <T> IValueBrowseTimer<T>.withLifecycle(
+    owner: LifecycleOwner,
+    onStateChanged: (IValueBrowseTimer<T>, Event) -> Unit = { timer, event ->
+        when(event) {
+            Event.ON_START -> timer.start()
+            Event.ON_STOP -> timer.stop()
+            else -> {}
+        }
+    }
+): LifecycleBoundValueBrowseTimer<T> = LifecycleBoundValueBrowseTimer(this, onStateChanged).apply {
+    owner.lifecycle.addObserver(this)
+}
+

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

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

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

@@ -1,18 +0,0 @@
-package com.gh.common.chain
-
-import android.content.Context
-import com.gh.common.dialog.CertificationDialog
-import com.gh.gamecenter.entity.GameEntity
-
-class CertificationHandler : ChainHandler() {
-
-    override fun handleRequest(context: Context, gameEntity: GameEntity) {
-        CertificationDialog.showCertificationDialog(context, gameEntity) {
-            if (hasNext()) {
-                getNext()?.handleRequest(context, gameEntity)
-            } else {
-                processEndCallback?.invoke(null)
-            }
-        }
-    }
-}

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,28 @@
+package com.gh.common.chain
+
+class DownloadChainBuilder {
+
+    private val handlers: MutableList<DownloadChainHandler> = ArrayList()
+
+    private var processEndCallback: ((asVGame: Boolean, Any?) -> Unit)? = null
+
+    fun setProcessEndCallback(gameId: String, callback: (asVGame: Boolean, Any?) -> Unit): DownloadChainBuilder {
+        processEndCallback = VaPluginDownloadWrapper(gameId = gameId, callback = callback) // 其他需要添加行为的装饰者可以一直包装A(B(C(callback))), 执行顺序 A->B->C->callback
+        return this
+    }
+
+    fun addHandler(handler: DownloadChainHandler): DownloadChainBuilder {
+        handlers.add(handler)
+        return this
+    }
+
+    fun buildHandlerChain(): DownloadChainHandler? {
+        for (i in handlers.indices) {
+            handlers[i].processEndCallback = processEndCallback
+            if (i + 1 < handlers.size) {
+                handlers[i].setNext(handlers[i + 1])
+            }
+        }
+        return if (handlers.isEmpty()) null else handlers[0]
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,29 @@
+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 : DownloadChainHandler() {
+
+    override fun handleRequest(
+        context: Context,
+        gameEntity: GameEntity,
+        asVGame: Boolean
+    ) {
+        if (shouldShowUnsupportedFeatureDialog()) {
+            DialogHelper.showUnsupportedFeatureDialog(context)
+        } else {
+            if (hasNext()) {
+                getNext()?.handleRequest(context, gameEntity, asVGame)
+            } else {
+                processEndCallback?.invoke(asVGame, null)
+            }
+        }
+    }
+
+    /**
+     * TODO 检查某个版本是否支持指定的功能
+     */
+    private fun shouldShowUnsupportedFeatureDialog(): Boolean = false
+}

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

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

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

@@ -0,0 +1,12 @@
+package com.gh.common.chain
+
+import com.gh.vspace.VHelper
+
+class VaPluginDownloadWrapper(val gameId: String, val callback: (Boolean, Any?) -> Unit) : (Boolean, Any?) -> Unit {
+    override fun invoke(asVGame: Boolean, any: Any?) {
+        callback.invoke(asVGame, any)
+        if (asVGame) {
+            VHelper.initVaPlugin(gameId)
+        }
+    }
+}

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

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

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

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

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

@@ -1,44 +1,59 @@
 package com.gh.common.constant;
 
 import android.annotation.SuppressLint;
+import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.gh.gamecenter.common.utils.EnvHelper;
-import com.gh.gamecenter.common.constant.Constants;
-import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.common.util.PackageHelper;
 import com.gh.common.util.PackageUtils;
 import com.gh.gamecenter.BuildConfig;
-import com.gh.gamecenter.SuggestionActivity;
-import com.gh.gamecenter.core.utils.SPUtils;
-import com.gh.gamecenter.entity.GameGuidePopupEntity;
-import com.gh.gamecenter.entity.NewSettingsEntity;
-import com.gh.gamecenter.entity.NewsEntity;
-import com.gh.gamecenter.entity.SettingsEntity;
+import com.gh.gamecenter.common.constant.CommonConsts;
+import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.eventbus.EBReuse;
-import com.gh.gamecenter.entity.VSetting;
+import com.gh.gamecenter.common.exposure.meta.MetaUtil;
 import com.gh.gamecenter.common.retrofit.BiResponse;
 import com.gh.gamecenter.common.retrofit.Response;
+import com.gh.gamecenter.common.utils.DarkModeUtils;
+import com.gh.gamecenter.common.utils.EnvHelper;
+import com.gh.gamecenter.core.AppExecutor;
+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.AppEntity;
+import com.gh.gamecenter.entity.FloatWindowSettingEntity;
+import com.gh.gamecenter.entity.GameGuidePopupEntity;
+import com.gh.gamecenter.entity.NewApiSettingsEntity;
+import com.gh.gamecenter.entity.NewSettingsEntity;
+import com.gh.gamecenter.entity.VNewSetting;
+import com.gh.gamecenter.entity.VSetting;
+import com.gh.gamecenter.feature.entity.SettingsEntity;
+import com.gh.gamecenter.feature.entity.SimulatorEntity;
+import com.gh.gamecenter.feature.utils.ContentBlockedHelper;
+import com.gh.gamecenter.receiver.PackageChangeBroadcastReceiver;
 import com.gh.gamecenter.retrofit.RetrofitManager;
+import com.gh.gamecenter.retrofit.service.VApiService;
 import com.gh.vspace.VHelper;
 import com.halo.assistant.HaloApp;
-import com.lightgame.utils.Utils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.Locale;
 
-import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.Observable;
+import io.reactivex.Single;
+import io.reactivex.SingleSource;
+import io.reactivex.functions.Function;
 import io.reactivex.schedulers.Schedulers;
+import io.reactivex.subjects.BehaviorSubject;
 import okhttp3.ResponseBody;
 
 public class Config {
@@ -48,6 +63,11 @@ public class Config {
     public static final String NEW_API_HOST = EnvHelper.getNewHost();
     public static final String VAPI_HOST = EnvHelper.getVHost();
 
+    public static final String WGAME_CPM_BUSIAPPID = BuildConfig.WGAME_CPM_BUSIAPPID;
+    public static final String WGAME_CPM_API_HOST = EnvHelper.getWGameCPMHost();
+
+    public static final String DSP_API_HOST = EnvHelper.getDspHost();
+
     // Third-Party confs
     public static final String WECHAT_APPID = BuildConfig.WECHAT_APPID;
     public static final String WECHAT_SECRET = BuildConfig.WECHAT_SECRET;
@@ -55,151 +75,37 @@ public class Config {
     public static final String WEIBO_APPKEY = BuildConfig.WEIBO_APPKEY;
     public static final String QUICK_LOGIN_APPID = BuildConfig.QUICK_LOGIN_APPID;
     public static final String QUICK_LOGIN_APPKEY = BuildConfig.QUICK_LOGIN_APPKEY;
-    // http://www.ghzs666.com/article/${articleId}.html
-    public static final String URL_ARTICLE = "http://www.ghzs666.com/article/"; // ghzs/ghzs666 统一
+    public static final String URL_ARTICLE = "www.ghzs666.com/article/"; // ghzs/ghzs666 统一
 
     private static final String SETTINGS_KEY = "settingsKey";
 
     private static SettingsEntity mSettingsEntity;
     private static NewSettingsEntity mNewSettingsEntity;
+    private static NewApiSettingsEntity mNewApiSettingsEntity;
+
+    private static NewApiSettingsEntity.NightMode mNightModeSetting;
+    private static SimulatorEntity mNewSimulatorEntity;
     private static VSetting mVSetting;
+    private volatile static VNewSetting mVNewSetting;
+
+    private static FloatWindowSettingEntity mFloatWindowSetting;
+
+    private static AppEntity mNew32UpdateEntity;
+    private static BehaviorSubject<VNewSetting> vNewSettingSubject = BehaviorSubject.create();
     private static GameGuidePopupEntity mGameGuidePopupEntity;
     private static SharedPreferences mDefaultSharedPreferences;
 
-    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个
 
     public static boolean isShow() {
-        if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE)) return false;
-
-        if (getPreferences().getBoolean(FIX_DOWNLOAD_KEY, false)) return true;
-
-        if (!isExistDownloadFilter()) return false;
-
-        for (SettingsEntity.Download entity : getSettings().getDownload()) {
-            if ("all".equals(entity.getGame())) {
-                if (entity.getPluginfy() && "normal".equals(entity.getPolicy()) && filterTime(entity.getTime())) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-
-
-    public static boolean isShowDownload(String gameId) {
-
-        if (getPreferences().getBoolean(FIX_DOWNLOAD_KEY, false)) return true;
-
-        if (TextUtils.isEmpty(gameId) || !isExistDownloadFilter())
-            return false;
-
-        for (SettingsEntity.Download entity : getSettings().getDownload()) {
-            if (gameId.equals(entity.getGame())) {
-                if ("normal".equals(entity.getPolicy()) && filterTime(entity.getTime())) {
-                    return true;
-                } else {
-                    return false;
-                }
-            } else if ("all".equals(entity.getGame())) {
-                if ("normal".equals(entity.getPolicy()) && filterTime(entity.getTime())) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * 是否启用畅玩游戏
-     */
-    public static boolean isVGameEnabled() {
-        if (getSettings() == null) {
-            return false;
-        }
-
-        return !"off".equals(getSettings().getGameSmooth());
-    }
-
-
-    public static boolean isShowPlugin(String gameId) {
-        SharedPreferences preferences = getPreferences();
-        boolean isFixPlugin = preferences.getBoolean(FIX_PLUGIN_KEY, false);
-        if (isFixPlugin) return true;
-
-        if (TextUtils.isEmpty(gameId) || !isExistDownloadFilter())
-            return false;
-
-        for (SettingsEntity.Download entity : getSettings().getDownload()) {
-            if (gameId.equals(entity.getGame())) {
-                if (entity.getPluginfy() && filterTime(entity.getTime())) {
-                    return true;
-                } else {
-                    return false;
-                }
-            }
-
-            if ("all".equals(entity.getGame())) {
-                if (entity.getPluginfy() && filterTime(entity.getTime())) {
-                    preferences.edit().putBoolean(FIX_PLUGIN_KEY, true).apply();
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    public static boolean isShowPlugin() {
-        SharedPreferences preferences = getPreferences();
-        boolean isFixPlugin = preferences.getBoolean(FIX_PLUGIN_KEY, false);
-        if (isFixPlugin) return true;
-
-        if (!isExistDownloadFilter())
-            return false;
-
-        for (SettingsEntity.Download entity : getSettings().getDownload()) {
-            if ("all".equals(entity.getGame())) {
-                if (entity.getPluginfy() && filterTime(entity.getTime())) {
-                    preferences.edit().putBoolean(FIX_PLUGIN_KEY, true).apply();
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    private static boolean filterTime(SettingsEntity.Download.TimeEntity timeEntity) {
-        long end = timeEntity.getEnd();
-        long start = timeEntity.getStart();
-        long curTime = Utils.getTime(HaloApp.getInstance().getApplication());
-
-        if ((start == 0 || curTime >= start) && (end == 0 || curTime <= end)) {
-            return true;
-        }
-
-        return false;
+        return !SPUtils.getBoolean(Constants.SP_TEENAGER_MODE);
     }
 
     public static void setSettings(SettingsEntity settingsEntity) {
         getPreferences().edit().putString(SETTINGS_KEY, GsonUtils.toJson(settingsEntity)).apply();
         mSettingsEntity = settingsEntity;
 
-        // 更新 FIX_ARTICLE_KEY 状态
-        mSettingsEntity.showArticleEntrance();
-
-        // 加载完设置后刷新下
-        PackageHelper.initList();
-
-        // 初始化畅玩相关的东西
-        VHelper.init(HaloApp.getInstance());
+        PackageHelper.refreshPackageNameList();
     }
 
     @Nullable
@@ -217,6 +123,37 @@ public class Config {
         return mSettingsEntity;
     }
 
+    //新模拟器
+    @Nullable
+    public static SimulatorEntity getNewSimulatorEntitySetting() {
+        if (mNewSimulatorEntity != null) {
+            return mNewSimulatorEntity;
+        } else if (mNewApiSettingsEntity != null && mNewApiSettingsEntity.getSimulator() != null) {
+            return mNewApiSettingsEntity.getSimulator();
+        } else {
+            return null;
+        }
+    }
+
+    @Nullable
+    public static NewApiSettingsEntity.NightMode getNightModeSetting() {
+        if (mNightModeSetting != null) {
+            return mNightModeSetting;
+        } else if (mNewApiSettingsEntity != null && mNewApiSettingsEntity.getNightMode() != null) {
+            return mNewApiSettingsEntity.getNightMode();
+        } else {
+            return null;
+        }
+    }
+
+    public static boolean getUserInterestedGame() {
+        if (mNewApiSettingsEntity != null) {
+            return mNewApiSettingsEntity.getUserInterestedGame();
+        } else {
+            return false;
+        }
+    }
+
     @Nullable
     public static NewSettingsEntity getNewSettingsEntity() {
         if (mNewSettingsEntity == null) {
@@ -232,6 +169,26 @@ public class Config {
         return mNewSettingsEntity;
     }
 
+    @Nullable
+    public static NewApiSettingsEntity getNewApiSettingsEntity() {
+        if (mNewApiSettingsEntity == null) {
+            try {
+                String json = SPUtils.getString(Constants.SP_NEW_API_SETTINGS);
+                if (!TextUtils.isEmpty(json)) {
+                    mNewApiSettingsEntity = GsonUtils.fromJson(json, NewApiSettingsEntity.class);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return mNewApiSettingsEntity;
+    }
+
+    public static void updateNewApiSettings(NewApiSettingsEntity settingsEntity) {
+        mNewApiSettingsEntity = settingsEntity;
+        SPUtils.setString(Constants.SP_NEW_API_SETTINGS, GsonUtils.toJson(settingsEntity));
+    }
+
     @Nullable
     public static VSetting getVSettingEntity() {
         if (mVSetting == null) {
@@ -247,67 +204,122 @@ public class Config {
         return mVSetting;
     }
 
+    @Nullable
+    public static VNewSetting getVNewSettingEntity() {
+        if (mVNewSetting == null) {
+            try {
+                String json = SPUtils.getString(Constants.SP_V_NEW_SETTINGS);
+                if (!TextUtils.isEmpty(json)) {
+                    mVNewSetting = GsonUtils.fromJson(json, VNewSetting.class);
+                    vNewSettingSubject.onNext(mVNewSetting);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return mVNewSetting;
+    }
+    @Nullable
+    public static FloatWindowSettingEntity getFloatWindowSettingEntity() {
+        if (mFloatWindowSetting == null) {
+            try {
+                String json = SPUtils.getString(Constants.SP_FLOAT_WINDOW_SETTINGS);
+                if (!TextUtils.isEmpty(json)) {
+                    mFloatWindowSetting = GsonUtils.fromJson(json, FloatWindowSettingEntity.class);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return mFloatWindowSetting;
+    }
+
+
+    @NonNull
+    public static Observable<VNewSetting> getVNewSettingObservable() {
+        if (mVNewSetting != null) {
+            return Observable.just(mVNewSetting);
+        } else {
+            return vNewSettingSubject.hide();
+        }
+    }
+
+
+    @Nullable
+    public static AppEntity getNew32UpdateEntity() {
+        return mNew32UpdateEntity;
+    }
+
+    /**
+     * 请求网络数据，尝试刷新畅玩相关配置
+     */
+    @SuppressLint("CheckResult")
+    public static void refreshVSettingEntity() {
+        RetrofitManager.getInstance()
+                .getVApi().getSettings(BuildConfig.VERSION_NAME, Build.VERSION.SDK_INT)
+                .subscribeOn(Schedulers.io())
+                .subscribe(new BiResponse<VSetting>() {
+                    @Override
+                    public void onSuccess(VSetting data) {
+                        mVSetting = data;
+                        SPUtils.setString(Constants.SP_V_SETTINGS, GsonUtils.toJson(data));
+                        VHelper.checkVspaceUpdate(HaloApp.getInstance());
+                    }
+                });
+    }
+
+    @SuppressLint("CheckResult")
+    public static void getNewSetting() {
+        VApiService vApi = RetrofitManager.getInstance().getVApi();
+        vApi.getNewSettings(BuildConfig.VERSION_NAME, Build.VERSION.SDK_INT).flatMap(new Function<VNewSetting, SingleSource<AppEntity>>() {
+                    @Override
+                    public SingleSource<AppEntity> apply(VNewSetting data) throws Exception {
+                        mVNewSetting = data;
+                        vNewSettingSubject.onNext(mVNewSetting);
+                        SPUtils.setString(Constants.SP_V_NEW_SETTINGS, GsonUtils.toJson(data));
+                        if (data.getVa() != null && data.getVa().getArch32() != null) {
+                            String versionNameByPackageName = PackageUtils.getVersionNameByPackageName(data.getVa().getArch32().getPackageName());
+                            return vApi.getNewPackageUpdate(
+                                    BuildConfig.VERSION_NAME,
+                                    versionNameByPackageName != null ? versionNameByPackageName : "",
+                                    HaloApp.getInstance().getChannel()
+                            );
+                        }
+                        return Single.error(new IllegalStateException("VNewSetting entity is not expected"));
+                    }
+                })
+                .subscribeOn(Schedulers.io())
+                .subscribe(new BiResponse<AppEntity>() {
+                    @Override
+                    public void onSuccess(AppEntity data) {
+                        mNew32UpdateEntity = data;
+                    }
+                });
+    }
+
     @Nullable
     public static GameGuidePopupEntity getGameGuidePopupEntity() {
         return mGameGuidePopupEntity;
     }
 
-    private static boolean isExistDownloadFilter() {
-        if (getSettings() == null || getSettings().getDownload() == null || getSettings().getDownload().size() == 0) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    public static void filterPluginArticle(List<NewsEntity> list) {
-        if (isShowPlugin() || list == null) return;
-
-        for (int i = 0; i < list.size(); i++) {
-            NewsEntity newsEntity = list.get(i);
-            String title = newsEntity.getTitle();
-            if (!TextUtils.isEmpty(title) && title.contains("插件")) {
-                list.remove(i);
-                i--;
-            }
-        }
-    }
-
     public static SharedPreferences getPreferences() {
         if (mDefaultSharedPreferences == null) {
-            mDefaultSharedPreferences =  PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication());
+            mDefaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication());
         }
 
         return mDefaultSharedPreferences;
     }
 
-    public static boolean isExistHideFunction() {
-        SharedPreferences preferences = getPreferences();
-        if (!preferences.getBoolean(FIX_DOWNLOAD_KEY, false)) return true;
-        if (!preferences.getBoolean(FIX_PLUGIN_KEY, false)) return true;
-        if (!preferences.getBoolean(FIX_COMMUNITY_KEY, false)) return true;
-        if (!preferences.getBoolean(FIX_ARTICLE_KEY, false)) return true;
-        return false;
-    }
-
-    public static void fixHideFunction() {
-        SharedPreferences preferences = PreferenceManager.
-                getDefaultSharedPreferences(HaloApp.getInstance().getApplication());
-        SharedPreferences.Editor editor = preferences.edit();
-        editor.putBoolean(Config.FIX_DOWNLOAD_KEY, true);
-        editor.putBoolean(Config.FIX_ARTICLE_KEY, true);
-        editor.putBoolean(Config.FIX_COMMUNITY_KEY, true);
-        editor.putBoolean(Config.FIX_PLUGIN_KEY, true);
-        editor.apply();
-    }
-
     @SuppressLint("CheckResult")
     public static void getGhzsSettings() {
         String channel = HaloApp.getInstance().getChannel();
+
+        // 把请求提前，避免请求过多阻塞，首页显示广告时老是用到上一次的缓存
+        getNewSettings(channel);
+
         RetrofitManager.getInstance()
                 .getApi().getSettings(PackageUtils.getGhVersionName(), channel)
                 .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Response<SettingsEntity>() {
                     @Override
                     public void onResponse(SettingsEntity response) {
@@ -315,15 +327,12 @@ public class Config {
 
                         // 意见反馈
                         SharedPreferences.Editor edit = getPreferences().edit();
-                        edit.putString(SuggestionActivity.SUGGESTION_HINT_TYPE,
+                        edit.putString(CommonConsts.SUGGESTION_HINT_TYPE,
                                 GsonUtils.toJson(response.getSuggestion()));
                         edit.apply();
 
-                        if (!getPreferences().getBoolean(Config.FIX_DOWNLOAD_KEY, false) && Config.isShow()) {
-                            getPreferences().edit().putBoolean(Config.FIX_DOWNLOAD_KEY, true).apply();
-                        }
                         if (!SPUtils.getBoolean(Constants.SP_TEENAGER_MODE)) {
-                            EventBus.getDefault().post(new EBReuse("Refresh"));
+                            AppExecutor.getUiExecutor().execute(() -> EventBus.getDefault().post(new EBReuse("Refresh")));
                         }
                     }
                 });
@@ -331,7 +340,6 @@ public class Config {
         RetrofitManager.getInstance()
                 .getApi().getNewSettings(Build.MANUFACTURER, Build.MODEL, channel, Build.VERSION.SDK_INT, BuildConfig.VERSION_NAME)
                 .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new BiResponse<NewSettingsEntity>() {
                     @Override
                     public void onSuccess(NewSettingsEntity data) {
@@ -340,21 +348,13 @@ public class Config {
                     }
                 });
 
-        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));
-                    }
-                });
+        refreshVSettingEntity();
+        getNewSetting();
+        getFloatWindowSetting();
 
         RetrofitManager.getInstance()
                 .getApi().getGameGuidePopup(Build.MANUFACTURER, Build.VERSION.RELEASE, Build.MODEL, channel, BuildConfig.VERSION_NAME)
                 .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new BiResponse<GameGuidePopupEntity>() {
                     @Override
                     public void onSuccess(GameGuidePopupEntity data) {
@@ -366,7 +366,6 @@ public class Config {
         if (manufacturer.equals("OPPO") || manufacturer.equals("VIVO")) {
             RetrofitManager.getInstance().getNewApi().getBrowserHintUrl(manufacturer)
                     .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(new BiResponse<ResponseBody>() {
                         @Override
                         public void onSuccess(ResponseBody data) {
@@ -382,4 +381,76 @@ 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),
+                    "rom", MetaUtil.INSTANCE.getRom().name() + " " + MetaUtil.INSTANCE.getRom().getVersionName()
+            );
+
+            RetrofitManager.getInstance()
+                    .getNewApi().getNewSettings(PackageUtils.getGhVersionName(), channel, filterString)
+                    .subscribeOn(Schedulers.io())
+                    .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);
+                                AppExecutor.getUiExecutor().execute(DarkModeUtils.INSTANCE::initDarkMode);
+                            }
+                            SPUtils.setString(Constants.SP_NEW_API_SETTINGS, GsonUtils.toJson(data));
+
+                            // 刷新屏蔽字段
+                            if (mNewApiSettingsEntity.getGameShieldContents() != null) {
+                                ContentBlockedHelper.INSTANCE.init(mNewApiSettingsEntity.getGameShieldContents());
+                            }
+
+                            // 更新安装列表是否开启的配置
+                            if (mNewApiSettingsEntity.getInstalledComplianceSwitch() != null) {
+                                PackageHelper.INSTANCE.updateIsGetInstalledPackagesApiAgreedRequired(mNewApiSettingsEntity.getInstalledComplianceSwitch());
+                            } else {
+                                PackageHelper.INSTANCE.updateIsGetInstalledPackagesApiAgreedRequired(false);
+                            }
+
+                            // 更新包名监听是否开启
+                            if (mNewApiSettingsEntity.isPackageObserveEnable()) {
+                                AppExecutor.getUiExecutor().execute(() -> observePackageChange(mNewApiSettingsEntity.getPackageObserveActions()));
+                            }
+                        }
+                    });
+        }
+    }
+
+    @SuppressLint("CheckResult")
+    private static void getFloatWindowSetting() {
+        RetrofitManager.getInstance().getNewApi()
+                .getFloatWindowSettings()
+                .subscribeOn(Schedulers.io())
+                .subscribe(new BiResponse<FloatWindowSettingEntity>() {
+                    @Override
+                    public void onSuccess(FloatWindowSettingEntity data) {
+                        mFloatWindowSetting = data;
+                        SPUtils.setString(Constants.SP_FLOAT_WINDOW_SETTINGS, GsonUtils.toJson(data));
+                    }
+                });
+    }
+
+    public static void observePackageChange(NewApiSettingsEntity.PackageObserveActions packageObserveActions) {
+        PackageChangeBroadcastReceiver receiver = new PackageChangeBroadcastReceiver(packageObserveActions);
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(packageObserveActions.getAdd());
+        intentFilter.addAction(packageObserveActions.getRem());
+        intentFilter.addAction(packageObserveActions.getRep());
+        intentFilter.addDataScheme("package");
+        HaloApp.getInstance().registerReceiver(receiver, intentFilter);
+    }
+
 }

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

@@ -13,15 +13,15 @@ import android.widget.PopupWindow
 import androidx.core.content.ContextCompat
 import androidx.databinding.BindingAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.gh.gamecenter.R
 import com.gh.gamecenter.common.callback.OnViewClickListener
+import com.gh.gamecenter.common.databinding.LayoutPopupContainerBinding
 import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.toDrawable
 import com.gh.gamecenter.common.view.BugFixedPopupWindow
-import com.gh.gamecenter.R
 import com.gh.gamecenter.databinding.KaifuAddItemBinding
 import com.gh.gamecenter.databinding.LayoutAddKaifuPopupBinding
-import com.gh.gamecenter.databinding.LayoutPopupContainerBinding
-import com.gh.gamecenter.entity.ServerCalendarEntity
+import com.gh.gamecenter.feature.entity.ServerCalendarEntity
 import com.gh.gamecenter.servers.add.AddKaiFuPopupAdapter
 import java.text.SimpleDateFormat
 import java.util.*
@@ -67,7 +67,7 @@ object AddKaiFuBindingAdapter {
                     binding.kaifuAddServerName.hint = "点击填写"
                 }
             }
-            binding.kaifuAddFirstName.addTextChangedListener(object :TextWatcher{
+            binding.kaifuAddFirstName.addTextChangedListener(object : TextWatcher {
                 override fun beforeTextChanged(
                     s: CharSequence?,
                     start: Int,
@@ -77,7 +77,7 @@ object AddKaiFuBindingAdapter {
                 }
 
                 override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                    if (!s.isNullOrEmpty()){
+                    if (!s.isNullOrEmpty()) {
                         popupWindow?.dismiss()
                     }
                 }
@@ -104,12 +104,14 @@ object AddKaiFuBindingAdapter {
             val format = SimpleDateFormat(pattern, Locale.CHINA)
             view.setText(format.format(time * 1000))
             if (position == 0) {
-                view.append(if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) Html.fromHtml(
-                    String.format(
-                        "<font color='#2496FF'>%1\$s</font>",
-                        "&nbsp+"
-                    ), Html.FROM_HTML_MODE_LEGACY
-                ) else Html.fromHtml(String.format("<font color='#2496FF'>%1\$s</font>", "&nbsp+")))
+                view.append(
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) Html.fromHtml(
+                        String.format(
+                            "<font color='#2496FF'>%1\$s</font>",
+                            "&nbsp+"
+                        ), Html.FROM_HTML_MODE_LEGACY
+                    ) else Html.fromHtml(String.format("<font color='#2496FF'>%1\$s</font>", "&nbsp+"))
+                )
             }
         }
     }
@@ -118,14 +120,14 @@ object AddKaiFuBindingAdapter {
     @BindingAdapter("kaiFuTextColor", "kaiFuTextPosition")
     fun kaiFuTextColor(view: EditText, dataMark: Int, position: Int) {
         if (dataMark == 1 && view.id == R.id.kaifu_add_time || dataMark == 2 && view.id == R.id.kaifu_add_first_name || dataMark == 3 && view.id == R.id.kaifu_add_server_name || dataMark == 4) {
-            view.setTextColor(ContextCompat.getColor(view.context, R.color.theme_red))
-            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.theme_red))
+            view.setTextColor(ContextCompat.getColor(view.context, com.gh.gamecenter.common.R.color.secondary_red))
+            view.setHintTextColor(ContextCompat.getColor(view.context, com.gh.gamecenter.common.R.color.secondary_red))
         } else if (position == 0) {
-            view.setTextColor(ContextCompat.getColor(view.context, R.color.hint))
-            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.hint))
+            view.setTextColor(ContextCompat.getColor(view.context, com.gh.gamecenter.common.R.color.hint))
+            view.setHintTextColor(ContextCompat.getColor(view.context, com.gh.gamecenter.common.R.color.hint))
         } else {
-            view.setTextColor(ContextCompat.getColor(view.context, R.color.text_title))
-            view.setHintTextColor(ContextCompat.getColor(view.context, R.color.hint))
+            view.setTextColor(ContextCompat.getColor(view.context, com.gh.gamecenter.common.R.color.text_primary))
+            view.setHintTextColor(ContextCompat.getColor(view.context, com.gh.gamecenter.common.R.color.hint))
         }
     }
 
@@ -174,7 +176,7 @@ object AddKaiFuBindingAdapter {
             popupWindow.isTouchable = true
             popupWindow.inputMethodMode = PopupWindow.INPUT_METHOD_NEEDED
             popupWindow.isOutsideTouchable = true
-            popupWindow.animationStyle = R.style.popwindow_option_anim_style
+            popupWindow.animationStyle = com.gh.gamecenter.common.R.style.popwindow_option_anim_style
 
             // 设置偏移
             windowPos[1] = windowPos[1] - 12F.dip2px()

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

@@ -1,37 +1,40 @@
 package com.gh.common.databind;
 
+import static com.gh.gamecenter.entity.SubjectEntity.SUBJECT_TAG_SELLING_POINT;
+import static com.gh.gamecenter.entity.SubjectEntity.SUBJECT_TAG_TEST;
+import static com.gh.gamecenter.entity.SubjectEntity.SUBJECT_TAG_TYPE;
+import static com.gh.gamecenter.entity.SubjectEntity.SUBJECT_TAG_UPDATE;
+
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
-import android.graphics.Typeface;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewParent;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.content.ContextCompat;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintSet;
 
-import com.facebook.drawee.view.SimpleDraweeView;
 import com.gh.common.chain.BrowserInstallHandler;
-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.DownloadChainBuilder;
+import com.gh.common.chain.DownloadChainHandler;
 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.common.exposure.ExposureEvent;
 import com.gh.common.filter.RegionSetting;
 import com.gh.common.filter.RegionSettingHelper;
 import com.gh.common.history.HistoryHelper;
@@ -43,182 +46,52 @@ import com.gh.common.util.DialogUtils;
 import com.gh.common.util.GameUtils;
 import com.gh.common.util.GameViewUtils;
 import com.gh.common.util.LogUtils;
-import com.gh.common.util.NewsUtils;
 import com.gh.common.util.PackageInstaller;
+import com.gh.common.util.PackageLauncher;
 import com.gh.common.util.PackageUtils;
-import com.gh.common.util.PlatformUtils;
 import com.gh.common.util.ReservationHelper;
-import com.gh.common.view.DownloadButton;
-import com.gh.common.view.GameIconView;
 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.utils.ExtensionsKt;
-import com.gh.gamecenter.common.utils.ImageUtils;
-import com.gh.gamecenter.common.utils.NightModeUtils;
-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.databinding.KaifuDetailItemRowBinding;
-import com.gh.gamecenter.entity.ApkEntity;
-import com.gh.gamecenter.entity.GameEntity;
+import com.gh.gamecenter.common.databinding.LayoutGameItemSellingPointBinding;
 import com.gh.gamecenter.common.entity.LinkEntity;
-import com.gh.gamecenter.entity.PluginLocation;
-import com.gh.gamecenter.entity.ServerCalendarEntity;
-import com.gh.gamecenter.entity.TagStyleEntity;
-import com.gh.gamecenter.entity.TestEntity;
-import com.gh.gamecenter.common.eventbus.EBReuse;
+import com.gh.gamecenter.common.utils.DarkModeUtils;
+import com.gh.gamecenter.common.utils.ExtensionsKt;
+import com.gh.gamecenter.common.utils.FileUtils;
+import com.gh.gamecenter.common.utils.NewFlatLogUtils;
+import com.gh.gamecenter.common.utils.SensorsBridge;
+import com.gh.gamecenter.core.utils.MtaHelper;
+import com.gh.gamecenter.core.utils.TimeUtils;
+import com.gh.gamecenter.core.utils.ToastUtils;
+import com.gh.gamecenter.feature.entity.ApkEntity;
+import com.gh.gamecenter.feature.entity.GameEntity;
+import com.gh.gamecenter.feature.entity.PluginLocation;
+import com.gh.gamecenter.feature.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.gamedetail.dialog.GamePermissionDialogFragment;
 import com.gh.gamecenter.manager.PackagesManager;
-import com.gh.gamecenter.qa.entity.CommunityVideoEntity;
-import com.gh.vspace.VDownloadManagerActivity;
 import com.gh.vspace.VHelper;
 import com.lightgame.download.DownloadEntity;
-import com.lightgame.download.FileUtils;
 import com.lightgame.utils.Utils;
 
-import org.greenrobot.eventbus.EventBus;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
+import kotlin.collections.CollectionsKt;
+
 /**
  * Created by khy on 12/02/18.
  */
-
 public class BindingAdapters {
 
-    public static void loadIcon(SimpleDraweeView view, String imageUrl) {
-        ImageUtils.displayIcon(view, imageUrl);
-    }
-
-    public static void loadImage(SimpleDraweeView view, String imageUrl) {
-        ImageUtils.display(view, imageUrl);
-    }
-
-    public static void setTextSize(TextView view, int number) {
-        view.setTextSize(number);
-    }
-
-    public static void setTypeface(TextView view, String type) {
-        if (type == null) return;
-
-        switch (type) {
-            case "bold":
-                view.setTypeface(null, Typeface.BOLD);
-                break;
-            case "italic":
-                view.setTypeface(null, Typeface.ITALIC);
-                break;
-            case "bold_italic":
-                view.setTypeface(null, Typeface.BOLD_ITALIC);
-                break;
-            default:
-                view.setTypeface(null, Typeface.NORMAL);
-                break;
-        }
-    }
-
-    public static void addDetailKaiFuView(LinearLayout view, List<ServerCalendarEntity> list
-            , OnViewClickListener listener, Boolean isReadyPatch) {
-        if (list == null) return;
-        view.removeAllViews();
-        for (int i = 0; i < list.size() + 1; i++) { // 1 is Title
-            View inflate = LayoutInflater.from(view.getContext()).inflate(R.layout.kaifu_detail_item_row, null);
-            KaifuDetailItemRowBinding binding = KaifuDetailItemRowBinding.bind(inflate);
-            binding.getRoot().setBackgroundColor(isReadyPatch != null && isReadyPatch ? ExtensionsKt.toColor(R.color.theme) : ExtensionsKt.toColor(R.color.white));
-            binding.getRoot().setPadding(DisplayUtils.dip2px(1), DisplayUtils.dip2px(1), DisplayUtils.dip2px(1), i == list.size() ? DisplayUtils.dip2px(1) : 0);
-            ServerCalendarEntity serverEntity = list.get(i - 1);
-            binding.timeTv.setText(i == 0 ? "时间" : serverEntity.getFormatTime("HH:mm"));
-            binding.remarkTv.setText(i == 0 ? "备注" : serverEntity.getRemark());
-            binding.nameTv.setText(i == 0 ? "名字" : (TextUtils.isEmpty(serverEntity.getNote()) ? "-" : serverEntity.getNote()));
-            if (i != 0) {
-                binding.getRoot().setOnClickListener(v -> {
-                    listener.onClick(v, isReadyPatch != null && isReadyPatch ? serverEntity : null);
-                });
-
-                // 滑动冲突处理
-                binding.getRoot().setOnTouchListener((v, event) -> {
-                    if (list.size() > 5) {
-                        if (event.getAction() == MotionEvent.ACTION_DOWN) {
-                            EventBus.getDefault().post(new EBReuse("CalenderDown"));
-                        } else if (event.getAction() == MotionEvent.ACTION_UP || event.getAction() == MotionEvent.ACTION_CANCEL) {
-                            EventBus.getDefault().post(new EBReuse("CalenderCancel"));
-                        }
-                    }
-                    return false;
-                });
-            }
-            view.addView(inflate);
-        }
-    }
-
-    // 如果超过10000，则转换为1.0W
-    public static void transSimpleCount(TextView view, int count) {
-        view.setText(NumberUtils.transSimpleCount(count));
-    }
-
-    public static void textColorFromString(TextView tv, String hexString) {
-        if (TextUtils.isEmpty(hexString)) return;
-
-        try {
-            tv.setTextColor(Color.parseColor(hexString));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static void showHide(View view, Boolean show) {
-        if (show != null && show) {
-            view.setVisibility(View.VISIBLE);
-        } else {
-            view.setVisibility(View.GONE);
-        }
-    }
-
-    public static void goneIf(View view, Boolean gone) {
-        if (gone != null && gone) {
-            view.setVisibility(View.GONE);
-        } else {
-            view.setVisibility(View.VISIBLE);
-        }
-    }
-
-    /**
-     * lazy 的 paddingTop
-     */
-    public static void lazyPaddingLeft(View view, int paddingLeftInDp) {
-        view.setPadding(DisplayUtils.dip2px(paddingLeftInDp), view.getPaddingTop(), view.getPaddingRight(), view.getPaddingBottom());
-    }
-
-    /**
-     * lazy 的 paddingTop
-     */
-    public static void lazyPaddingTop(View view, int paddingTopInDp) {
-        view.setPadding(view.getPaddingLeft(), DisplayUtils.dip2px(paddingTopInDp), view.getPaddingRight(), view.getPaddingBottom());
-    }
-
-    /**
-     * lazy 的 paddingBottom
-     */
-    public static void lazyPaddingBottom(View view, int paddingBottomInDp) {
-        view.setPadding(view.getPaddingLeft(), view.getPaddingTop(), view.getPaddingRight(), DisplayUtils.dip2px(paddingBottomInDp));
-    }
-
-    public static void visibleInvisible(View view, Boolean show) {
-        if (show != null && show) {
-            view.setVisibility(View.VISIBLE);
-        } else {
-            view.setVisibility(View.INVISIBLE);
-        }
-    }
-
     public static void setMessageUnread(TextView view, int unreadCount) {
         if (unreadCount < 100) {
             view.setText(String.valueOf(unreadCount));
@@ -227,117 +100,19 @@ public class BindingAdapters {
         }
     }
 
-    public static void setServerTypePadding(TextView view, String serverType) {
-        int paddRight = 0;
-        if (TextUtils.isEmpty(serverType)) {
-        } else {
-            if ("删档内测".equals(serverType) || "不删档内测".equals(serverType)) {
-                if ("删档内测".equals(serverType)) {
-                    paddRight = DisplayUtils.dip2px(view.getContext(), 50);
-                } else {
-                    paddRight = DisplayUtils.dip2px(view.getContext(), 60);
-                }
-            } else {
-                paddRight = DisplayUtils.dip2px(view.getContext(), 30);
-            }
-        }
-        view.setPadding(0, 0, paddRight, 0);
-    }
-
-    public static void setServerType(TextView view, String serverType) {
-        view.setText(serverType);
-        if ("删档内测".equals(serverType) || "不删档内测".equals(serverType)) {
-            view.setBackgroundResource(R.drawable.textview_server_tag);
-        } else {
-            view.setBackgroundResource(R.drawable.textview_orange_up);
-        }
-    }
-
     public static void setGame(View view, GameEntity gameEntity) {
         if (gameEntity != null && view instanceof GameIconView) {
             ((GameIconView) view).displayGameIcon(gameEntity);
         }
     }
 
-    public static void setGameIcon(View view, GameEntity gameEntity) {
-        if (gameEntity != null && view instanceof GameIconView) {
-            ((GameIconView) view).displayGameIcon(gameEntity.getIcon(), gameEntity.getIconSubscript());
-        }
-    }
-
-    public static void setArticleType(TextView view, String articleType) {
-        NewsUtils.setNewsType(view, articleType, 0, 0);
-    }
-
-    public static void setDetailDownloadText(TextView view, GameEntity gameEntity) {
-        if (gameEntity == null || gameEntity.getApk().isEmpty()) {
-            view.setBackgroundResource(R.drawable.game_item_btn_pause_style);
-            view.setTextColor(0xFF999999);
-            view.setClickable(false);
-        }
-    }
-
-    public static void setLiBaoBtn(TextView view, String status) {
-        if (TextUtils.isEmpty(status)) return;
-        switch (status) {
-            case "coming":
-                view.setText(R.string.libao_coming);
-                view.setBackgroundResource(R.drawable.textview_blue_style);
-                break;
-            case "ling":
-                view.setText(R.string.libao_ling);
-                view.setBackgroundResource(R.drawable.textview_green_style);
-                break;
-            case "tao":
-                view.setText(R.string.libao_tao);
-                view.setBackgroundResource(R.drawable.textview_orange_style);
-                break;
-            case "used_up":
-                view.setText(R.string.libao_used_up);
-                view.setBackgroundResource(R.drawable.textview_cancel_up);
-                break;
-            case "finish":
-                view.setText(R.string.libao_finish);
-                view.setBackgroundResource(R.drawable.textview_cancel_up);
-                break;
-            case "linged":
-                view.setText(R.string.libao_linged);
-                view.setBackgroundResource(R.drawable.libao_linged_style);
-                view.setTextColor(ContextCompat.getColorStateList(view.getContext(), R.color.libao_linged_selector));
-                break;
-            case "taoed":
-                view.setText(R.string.libao_taoed);
-                view.setBackgroundResource(R.drawable.libao_taoed_style);
-                view.setTextColor(ContextCompat.getColorStateList(view.getContext(), R.color.libao_taoed_selector));
-                break;
-            case "copy":
-                view.setText(R.string.libao_copy);
-                view.setBackgroundResource(R.drawable.textview_blue_style);
-                break;
-            case "repeatLing":
-                view.setText(R.string.libao_repeat_ling);
-                view.setBackgroundResource(R.drawable.textview_cancel_up);
-                break;
-            case "repeatLinged":
-                view.setText(R.string.libao_repeat_ling);
-                view.setBackgroundResource(R.drawable.textview_green_style);
-                break;
-            case "repeatTao":
-                view.setText(R.string.libao_repeat_tao);
-                view.setBackgroundResource(R.drawable.textview_cancel_up);
-                break;
-            case "repeatTaoed":
-                view.setText(R.string.libao_repeat_tao);
-                view.setBackgroundResource(R.drawable.textview_orange_style);
-                break;
-            case "unshelve":
-                view.setBackgroundResource(R.drawable.textview_cancel_style);
-                view.setText(R.string.libao_unshelve);
-                break;
-            default:
-                view.setBackgroundResource(R.drawable.textview_cancel_style);
-                view.setText("异常");
-        }
+    public static void setDownloadButton(DownloadButton progressBar,
+                                         GameEntity gameEntity,
+                                         ExposureEvent traceEvent,
+                                         @Nullable View.OnClickListener clickCallBack,
+                                         @Nullable String entrance,
+                                         @Nullable String location) {
+        setDownloadButton(progressBar, gameEntity, traceEvent, clickCallBack, entrance, location, "其他");
     }
 
     // 大图下的进度条
@@ -346,14 +121,14 @@ public class BindingAdapters {
                                          ExposureEvent traceEvent,
                                          @Nullable View.OnClickListener clickCallBack,
                                          @Nullable String entrance,
-                                         @Nullable String location) {
+                                         @Nullable String location,
+                                         String sourceEntrance) {
 
         // 恢复DialogFragment
         restoreDialogFragment(progressBar);
 
         // 判断是否显示按钮
         if (gameEntity != null
-                && Config.isShowDownload(gameEntity.getId())
                 && !"光环助手".equals(gameEntity.getName())) {
             progressBar.setVisibility(View.VISIBLE);
         } else {
@@ -367,13 +142,9 @@ public class BindingAdapters {
             switch (progressBar.getButtonStyle()) {
                 case DOWNLOADING_PLUGIN:
                 case DOWNLOADING_NORMAL:
-                    if (gameEntity.isVGame()) {
-                        v.getContext().startActivity(VDownloadManagerActivity.getIntent(v.getContext(), true));
-                    } else {
-                        Intent intent = DownloadManagerActivity.getDownloadMangerIntent(v.getContext(),
-                                gameEntity.getApk().get(0).getUrl(), entrance);
-                        v.getContext().startActivity(intent);
-                    }
+                    Intent intent = DownloadManagerActivity.getDownloadMangerIntent(v.getContext(),
+                            gameEntity.getApk().isEmpty() ? "" : gameEntity.getApk().get(0).getUrl(), entrance);
+                    v.getContext().startActivity(intent);
                     break;
                 case NONE:
                     Utils.toast(v.getContext(), "该游戏已关闭下载");
@@ -391,48 +162,66 @@ public class BindingAdapters {
                                 boolean isInstalled = PackageUtils.isInstalledFromAllPackage(v.getContext(), gameEntity.getSimulator().getApk().getPackageName());
                                 if (downloadEntity != null && SimulatorGameManager.isSimulatorGame(gameEntity) && !isInstalled) {
                                     SimulatorDownloadManager.getInstance().showDownloadDialog(v.getContext(), gameEntity.getSimulator(),
-                                            SimulatorDownloadManager.SimulatorLocation.LAUNCH, gameEntity.getId(), gameEntity.getName(), null);
+                                            SimulatorDownloadManager.SimulatorLocation.LAUNCH, gameEntity.getId(), gameEntity.getName(), gameEntity.getCategoryChinese(), null);
                                     return;
                                 }
                             }
 
-                            ChainBuilder builder = new ChainBuilder();
-                            builder.addHandler(new ValidateVSpaceHandler());
+                            DownloadChainBuilder builder = new DownloadChainBuilder();
+                            builder.addHandler(new UnsupportedFeatureHandler());
                             builder.addHandler(new GamePermissionHandler());
+                            builder.addHandler(new CheckStoragePermissionHandler());
+                            builder.addHandler(new ValidateVSpaceHandler());
                             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(progressBar, gameEntity, traceEvent, (boolean) o, entrance, location);
+                            builder.setProcessEndCallback(gameEntity.getId(), (asVGame, isSubscribe) -> {
+                                download(v.getContext(),
+                                        progressBar,
+                                        gameEntity,
+                                        traceEvent,
+                                        asVGame,
+                                        (boolean) isSubscribe,
+                                        entrance,
+                                        location);
                                 return null;
                             });
-                            final ChainHandler chainHandler = builder.buildHandlerChain();
+                            final DownloadChainHandler chainHandler = builder.buildHandlerChain();
                             if (chainHandler != null) {
-                                chainHandler.handleRequest(v.getContext(), gameEntity);
+                                chainHandler.handleRequest(
+                                        v.getContext(),
+                                        gameEntity,
+                                        GameUtils.shouldPerformAsVGame(gameEntity)
+                                );
                             }
                         } else {
-                            ChainBuilder builder = new ChainBuilder();
+                            DownloadChainBuilder builder = new DownloadChainBuilder();
+                            builder.addHandler(new UnsupportedFeatureHandler());
                             builder.addHandler(new GamePermissionHandler());
-                            builder.addHandler(new CertificationHandler());
                             builder.addHandler(new VersionNumberHandler());
 
-                            builder.setProcessEndCallback(o -> {
+                            builder.setProcessEndCallback(gameEntity.getId(), (asVGame, isSubscribe) -> {
                                 DownloadDialog.showDownloadDialog(
                                         v.getContext(),
                                         gameEntity,
                                         traceEvent,
                                         entrance,
-                                        location + ":" + gameEntity.getName());
+                                        location + ":" + gameEntity.getName(),
+                                        null);
                                 return null;
                             });
-                            final ChainHandler chainHandler = builder.buildHandlerChain();
+                            final DownloadChainHandler chainHandler = builder.buildHandlerChain();
                             if (chainHandler != null) {
-                                chainHandler.handleRequest(v.getContext(), gameEntity);
+                                chainHandler.handleRequest(
+                                        v.getContext(),
+                                        gameEntity,
+                                        GameUtils.shouldPerformAsVGame(gameEntity)
+                                );
                             }
                         }
                     }
@@ -441,11 +230,18 @@ public class BindingAdapters {
                     if (gameEntity.getApk().size() == 1) {
                         //启动模拟器游戏
                         if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
-                            DownloadEntity downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(gameEntity.getApk().get(0).getUrl());
+                            DownloadEntity downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(gameEntity.getApk().isEmpty() ? "" : gameEntity.getApk().get(0).getUrl());
                             if (downloadEntity != null) {
                                 File file = new File(downloadEntity.getPath());
                                 if (!file.exists()) {
-                                    download(progressBar, gameEntity, traceEvent, false, entrance, location);
+                                    download(v.getContext(),
+                                            progressBar,
+                                            gameEntity,
+                                            traceEvent,
+                                            false,
+                                            false,
+                                            entrance,
+                                            location);
                                     return;
                                 }
 
@@ -454,41 +250,50 @@ public class BindingAdapters {
                             return;
                         }
 
-                        if (gameEntity.isVGame()) {
-                            VHelper.installOrLaunch((AppCompatActivity) v.getContext(), gameEntity.getApk().get(0).getPackageName());
-                            return;
-                        }
-
-                        PackageUtils.launchApplicationByPackageName(v.getContext(), gameEntity.getApk().get(0).getPackageName());
+                        PackageLauncher.launch(v.getContext(), gameEntity, null);
                     } else {
                         DownloadDialog.showDownloadDialog(
                                 v.getContext(),
                                 gameEntity,
                                 traceEvent,
                                 entrance,
-                                location + ":" + gameEntity.getName());
+                                location + ":" + gameEntity.getName(),
+                                null);
                     }
                     break;
                 case INSTALL_PLUGIN:
                 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(), packageName);
-                            return;
-                        }
+                        NewFlatLogUtils.INSTANCE.logGameInstall(
+                                gameEntity.getId(),
+                                gameEntity.getName() != null ? gameEntity.getName() : "",
+                                "主动安装"
+                        );
+
+                        SensorsBridge.trackInstallGameClick(
+                                gameEntity.getId(),
+                                gameEntity.getName() != null ? gameEntity.getName() : "",
+                                "主动安装",
+                                gameEntity.isDspGame(),
+                                gameEntity.getDspAdId()
+                        );
+
+                        DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity);
 
                         if (downloadEntity != null) {
-                            PackageInstaller.install(v.getContext(), downloadEntity);
+                            if (ExtensionsKt.isLocalDownloadInDualDownloadMode(downloadEntity)) {
+                                PackageInstaller.install(v.getContext(), downloadEntity);
+                            } else {
+                                VHelper.installOrLaunch(v.getContext(), gameEntity, null);
+                            }
                         }
                     }
                     break;
                 case RESERVABLE:
                     GamePermissionDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity, gameEntity.getInfo(), () -> {
                         CheckLoginUtils.checkLogin(progressBar.getContext(), "", () -> {
-                            ReservationHelper.reserve(v.getContext(), gameEntity.getId(), () -> {
+                            ReservationHelper.reserve(v.getContext(), gameEntity, sourceEntrance, () -> {
                                 LogUtils.logReservation(gameEntity, traceEvent);
                                 updateReservation(progressBar, gameEntity);
                             });
@@ -496,19 +301,11 @@ public class BindingAdapters {
                     });
                     break;
                 case RESERVED:
-                    if ("download".equals(gameEntity.getReserveStatus())) {
-                        ReservationHelper.showDeleteReservationDialog(progressBar.getContext(), () -> {
-                            ReservationHelper.deleteReservation(gameEntity, () -> {
-                                updateReservation(progressBar, gameEntity);
-                            });
+                    ReservationHelper.showCancelReservationDialog(progressBar.getContext(), gameEntity, () -> {
+                        ReservationHelper.cancelReservation(gameEntity, () -> {
+                            updateReservation(progressBar, gameEntity);
                         });
-                    } else {
-                        ReservationHelper.showCancelReservationDialog(progressBar.getContext(), () -> {
-                            ReservationHelper.cancelReservation(gameEntity, () -> {
-                                updateReservation(progressBar, gameEntity);
-                            });
-                        });
-                    }
+                    });
                     break;
                 case H5_GAME:
                     LinkEntity linkEntity = gameEntity.getH5Link();
@@ -554,9 +351,9 @@ public class BindingAdapters {
                 }
                 progressBar.setButtonStyle(DownloadButton.ButtonStyle.H5_GAME);
             } else {
-                if (offStatus != null && "dialog".equals(offStatus)) {
+                if (("dialog".equals(offStatus) || "third_party".equals(offStatus))) {
                     progressBar.setText("查看");
-                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.NONE);
+                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.NONE_WITH_HINT);
                 } else if ("updating".equals(offStatus)) {
                     progressBar.setText("更新中");
                     progressBar.setButtonStyle(DownloadButton.ButtonStyle.UPDATING);
@@ -567,7 +364,7 @@ public class BindingAdapters {
             }
 
         } else {
-            String status = GameUtils.getDownloadBtnText(progressBar.getContext(), gameEntity, PluginLocation.only_game);
+            String status = GameUtils.getDownloadBtnText(progressBar.getContext(), gameEntity, true, false, PluginLocation.only_game);
             switch (status) {
                 case "插件化":
                     progressBar.setButtonStyle(DownloadButton.ButtonStyle.PLUGIN);
@@ -593,18 +390,20 @@ public class BindingAdapters {
                     case pause:
                     case timeout:
                     case neterror:
+                    case diskisfull:
+                    case diskioerror:
                     case waiting:
-                        progressBar.setText(R.string.downloading);
-                        if (downloadEntity.isPluggable() && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
+                        progressBar.setText(com.gh.gamecenter.feature.R.string.downloading);
+                        if (downloadEntity.isPluggable() && PackagesManager.isInstalled(downloadEntity.getPackageName())) {
                             progressBar.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN);
                         } else {
                             progressBar.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
                         }
                         break;
                     case done:
-                        progressBar.setText(R.string.install);
+                        progressBar.setText(com.gh.gamecenter.feature.R.string.install);
                         if (downloadEntity.isPluggable()
-                                && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
+                                && PackagesManager.isInstalled(downloadEntity.getPackageName())) {
                             progressBar.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_PLUGIN);
                         } else {
                             progressBar.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
@@ -637,24 +436,6 @@ public class BindingAdapters {
         }
     }
 
-    /*private static void download(DownloadProgressBar progressBar, GameEntity gameEntity, ExposureEvent traceEvent, @Nullable String entrance, @Nullable String location, View v) {
-        if (gameEntity.getApk().size() == 1) {
-            ApkEntity apk = gameEntity.getApk().get(0);
-            DownloadDialogHelper.findAvailableDialogAndShow(
-                    v.getContext(),
-                    gameEntity,
-                    apk,
-                    () -> {
-                        DialogUtils.checkDownload(v.getContext(), apk.getSize(),
-                                isSubscribe -> download(progressBar, gameEntity, traceEvent, isSubscribe, entrance, location));
-                    });
-        } else {
-            DownloadDialog.getInstance(v.getContext()).showPopupWindow(v, gameEntity,
-                    entrance, location + gameEntity.getName(), traceEvent);
-        }
-    }*/
-
-
     private static void updateReservation(DownloadButton progressBar, GameEntity gameEntity) {
         // 显示预约
         if (gameEntity.isReservable()) {
@@ -670,78 +451,70 @@ public class BindingAdapters {
 
 
     // 开始下载
-    private static void download(DownloadButton progressBar,
+    private static void download(Context context,
+                                 DownloadButton progressBar,
                                  GameEntity gameEntity,
                                  ExposureEvent traceEvent,
+                                 boolean asVGame,
                                  boolean isSubscribe,
                                  String entrance,
                                  String location) {
-        String str = progressBar.getText().toString();
-        String method;
-        if (str.contains("更新")) {
-            method = "更新";
-        } else if (str.contains("插件化")) {
-            method = "插件化";
-        } else {
-            method = progressBar.getContext().getString(R.string.download);
+        if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
+            ToastUtils.toast(context.getString(R.string.unsupported_browser_install_hint));
         }
-        ApkEntity apkEntity = gameEntity.getApk().get(0);
-        String msg = FileUtils.isCanDownload(progressBar.getContext(), apkEntity.getSize());
-        if (TextUtils.isEmpty(msg)) {
+        String buttonText = progressBar.getText();
+        ApkEntity apkEntity = CollectionsKt.firstOrNull(gameEntity.getApk());
+        String msg = FileUtils.isCanDownload(progressBar.getContext(), apkEntity == null ? "" : apkEntity.getSize());
+        if (apkEntity != null && TextUtils.isEmpty(msg)) {
             DownloadManager.createDownload(progressBar.getContext(),
                     apkEntity,
                     gameEntity,
-                    method,
+                    asVGame,
+                    gameEntity.isDualBtnModeEnabled(),
                     entrance,
                     location + gameEntity.getName(),
                     isSubscribe,
                     traceEvent);
 
             progressBar.setProgress(0);
-            progressBar.setButtonStyle("插件化".equals(method) ?
+            progressBar.setButtonStyle(buttonText.contains("插件化") ?
                     DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN : DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
         } else {
             Utils.toast(progressBar.getContext(), msg);
         }
     }
 
-    public static void setGameLabelList(LinearLayout layout, List<TagStyleEntity> tagStyle) {
-        GameViewUtils.setLabelList(layout.getContext(), layout, tagStyle);
-    }
-
-    // 包含测试开服标签
-    public static void setGameTags(LinearLayout layout, GameEntity gameEntity) {
+    /**
+     * 包含测试开服标签
+     *
+     * @param layout
+     * @param gameEntity
+     * @param subjectTag 默认为 “”，只有游戏专题可以配置subjectTag
+     */
+    public static void setGameTags(LinearLayout layout, GameEntity gameEntity, String subjectTag) {
         try {
             if (layout.getVisibility() == View.GONE) return;
             ArrayList<TagStyleEntity> tagStyle = new ArrayList<>();
             TestEntity test = gameEntity.getTest();
-            if (test != null
-                    // 这个判断用于开测表列表
-                    && !"type_tag".equals(test.getGameTag())) {
-                if ("custom".equals(test.getGameTag())) {
-                    TagStyleEntity typeTag = new TagStyleEntity();
-                    if (!TextUtils.isEmpty(test.getText())) {
-                        typeTag.setName(test.getText() != null ? test.getText() : "");
-                    } else {
-                        typeTag.setName(test.getType() != null ? test.getType() : "");
-                    }
-                    typeTag.setBackground("E8F3FF");
-                    typeTag.setColor("1383EB");
-                    tagStyle.add(typeTag);
-                } else {
-                    TagStyleEntity typeTag = new TagStyleEntity();
-                    boolean isNightMode = NightModeUtils.INSTANCE.isNightMode(layout.getContext());
-                    typeTag.setName(test.getType() != null ? test.getType() : "");
-                    typeTag.setBackground("1AFFA142");
-                    typeTag.setColor(isNightMode ? "EB9238" : "FFA142");
-                    tagStyle.add(typeTag);
+            if (test != null && subjectTag.equals(SUBJECT_TAG_TEST)) {
+                // 显示开测表标签
+                TagStyleEntity typeTag = new TagStyleEntity();
+                boolean isDarkModeOn = DarkModeUtils.INSTANCE.isDarkModeOn(layout.getContext());
+                typeTag.setName(test.getType() != null ? test.getType() : "");
+                typeTag.setBackground("1AFFA142");
+                typeTag.setColor(isDarkModeOn ? "EB9238" : "FFA142");
+                tagStyle.add(typeTag);
 
-                    TagStyleEntity timeTag = new TagStyleEntity();
+                TagStyleEntity timeTag = new TagStyleEntity();
+                if (test.getStartPending()) {
+                    timeTag.setName(test.getStartText());
+                } else {
                     timeTag.setName(GameViewUtils.getGameTestDate(test.getStart()));
-                    timeTag.setBackground("1A06CEA8");
-                    timeTag.setColor(isNightMode ? "07A385" : "06CEA8");
-                    tagStyle.add(timeTag);
                 }
+                timeTag.setBackground("1A06CEA8");
+                timeTag.setColor(isDarkModeOn ? "07A385" : "06CEA8");
+                tagStyle.add(timeTag);
+
             } else {
                 tagStyle = gameEntity.getTagStyle();
             }
@@ -751,6 +524,68 @@ public class BindingAdapters {
         }
     }
 
+    public static void setGameTagsWithSellingPoint(LinearLayout layout, LayoutGameItemSellingPointBinding binding, GameEntity gameEntity, String subjectTag) {
+        if (subjectTag.equals(SUBJECT_TAG_SELLING_POINT)) {
+            layout.setVisibility(View.GONE);
+            binding.getRoot().setVisibility(View.VISIBLE);
+            GameEntity.SellingPoints sellingPoints = gameEntity.getSellingPoints();
+            if (sellingPoints != null) {
+                binding.tvSellingPoints.setVisibility(View.VISIBLE);
+                binding.tvSellingPoints.setText(sellingPoints.getText());
+            } else {
+                binding.tvSellingPoints.setVisibility(View.GONE);
+            }
+
+            ArrayList<TagStyleEntity> tagStyle = gameEntity.getTagStyle();
+            StringBuilder tagText = new StringBuilder();
+            for (int i = 0; i < tagStyle.size(); i++) {
+                if (i < 3) {
+                    tagText.append(i == 0 ? "" : "·").append(tagStyle.get(i).getName());
+                }
+            }
+            binding.gtcvTags.setText(tagText);
+        } else {
+            layout.setVisibility(View.VISIBLE);
+            binding.getRoot().setVisibility(View.GONE);
+            switch (subjectTag) {
+                case SUBJECT_TAG_UPDATE:
+                    List<TagStyleEntity> updateTags = new ArrayList<>();
+                    TagStyleEntity updateTag = new TagStyleEntity(
+                            "local_generated",
+                            TimeUtils.getFormatTime(gameEntity.getUpdateTime(), "MM-dd") + " 更新",
+                            "",
+                            "1383EB",
+                            "E8F3FF",
+                            "1383EB",
+                            false
+                    );
+                    updateTags.add(updateTag);
+                    GameViewUtils.setLabelList(layout.getContext(), layout, updateTags);
+                    break;
+                case SUBJECT_TAG_TYPE:
+                    GameViewUtils.setLabelList(layout.getContext(), layout, gameEntity.getTagStyle());
+                    break;
+                default:
+                    setGameTags(layout, gameEntity, subjectTag);
+                    break;
+            }
+        }
+
+        ViewParent parent = binding.getRoot().getParent();
+        if (parent instanceof ConstraintLayout) {
+            ConstraintLayout constraintLayout = (ConstraintLayout) parent;
+            ConstraintSet constraintSet = new ConstraintSet();
+            constraintSet.clone(constraintLayout);
+            constraintSet.clear(R.id.gameDesSpace, ConstraintSet.BOTTOM);
+            if (subjectTag.equals(SUBJECT_TAG_SELLING_POINT)) {
+                constraintSet.connect(R.id.gameDesSpace, ConstraintSet.BOTTOM, R.id.layout_selling_points, ConstraintSet.TOP);
+            } else {
+                constraintSet.connect(R.id.gameDesSpace, ConstraintSet.BOTTOM, R.id.label_list, ConstraintSet.TOP);
+            }
+            constraintSet.applyTo(constraintLayout);
+        }
+    }
+
     public static void setVideoDetailGameTags(LinearLayout layout, GameEntity gameEntity) {
         try {
             ArrayList<TagStyleEntity> tagStyle = new ArrayList<>();
@@ -778,48 +613,26 @@ public class BindingAdapters {
         }
     }
 
-    public static void isRefreshing(SwipeRefreshLayout layout, LoadStatus status) {
-        if (status != LoadStatus.INIT_LOADING && status != LoadStatus.LIST_LOADING) {
-            layout.setRefreshing(false);
-        }
-    }
-
-    public static void setGameName(TextView view, GameEntity game, boolean isShowPlatform, @Nullable Boolean isShowSuffix) {
-        if (isShowSuffix == null) isShowSuffix = true; // 默认显示
+    public static void setGameName(TextView view, GameEntity game, boolean isShowPlatform) {
+        String gameName;
         if (isShowPlatform && game.getApk().size() > 0) {
-            view.setText(String.format("%s - %s", !isShowSuffix ? game.getNameWithoutSuffix() : game.getName(),
+            gameName = String.format("%s - %s", game.getName(),
                     PlatformUtils.getInstance(view.getContext()).getPlatformName(
-                            game.getApk().get(0).getPlatform())));
+                            game.getApk().get(0).getPlatform()));
+            if (!gameName.equals((String) view.getTag(com.gh.gamecenter.common.R.string.tag_game_name_id))) {
+                view.setText(gameName);
+                view.setTag(com.gh.gamecenter.common.R.string.tag_game_name_id, gameName);
+            }
         } else {
-            view.setText(!isShowSuffix ? game.getNameWithoutSuffix() : game.getName());
+            gameName = game.getName();
+            if (gameName != null && !gameName.equals((String) view.getTag(com.gh.gamecenter.common.R.string.tag_game_name_id))) {
+                view.setText(gameName);
+                view.setTag(com.gh.gamecenter.common.R.string.tag_game_name_id, gameName);
+            }
         }
 
     }
 
-    public static void setCommunityImage(SimpleDraweeView imageView, List<String> images, List<CommunityVideoEntity> videos) {
-        if (videos.size() > 0) {
-            CommunityVideoEntity videoEntity = videos.get(0);
-            ImageUtils.display(imageView, videoEntity.getPoster());
-            imageView.setVisibility(View.VISIBLE);
-        } else if (images.size() > 0) {
-            imageView.setVisibility(View.VISIBLE);
-            ImageUtils.display(imageView, images.get(0));
-        } else {
-            imageView.setVisibility(View.GONE);
-        }
-    }
-
-    public static void setCommunityVideoDuration(TextView mVideoDuration, List<CommunityVideoEntity> videos) {
-        if (videos != null && videos.size() > 0) {
-            CommunityVideoEntity videoEntity = videos.get(0);
-            mVideoDuration.setBackground(DrawableView.getOvalDrawable(R.color.black_alpha_50, 999F));
-            mVideoDuration.setText(videoEntity.getDuration());
-            mVideoDuration.setVisibility(View.VISIBLE);
-        } else {
-            mVideoDuration.setVisibility(View.GONE);
-        }
-    }
-
     public static void setGameTags(TextView view, List<TagStyleEntity> tags, int maxTags) {
         if (tags == null) {
             view.setText("");
@@ -842,21 +655,9 @@ public class BindingAdapters {
             int start = index;
             int end = start + tag.getName().length() + ((i != showCount - 1) ? 1 : 0);
             index = end;
-            span.setSpan(new ForegroundColorSpan(Color.parseColor("#" + tag.getColor())),
+            span.setSpan(new ForegroundColorSpan(ExtensionsKt.hexStringToIntColor("#" + tag.getColor(), Color.WHITE)),
                     start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         }
         view.setText(span);
     }
-
-    public static void setVideoData(TextView view, int count) {
-        if (count > 0) {
-            view.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(view.getContext(), R.drawable.ic_video_data_up), null, null, null);
-            view.setTextColor(ContextCompat.getColor(view.getContext(), R.color.text_EA3333));
-            view.setText(count + "");
-        } else {
-            view.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
-            view.setTextColor(ContextCompat.getColor(view.getContext(), R.color.text_subtitleDesc));
-            view.setText("-");
-        }
-    }
 }

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

@@ -0,0 +1,294 @@
+package com.gh.common.dialog
+
+import android.content.Context
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import com.gh.common.util.DirectUtils
+import com.gh.gamecenter.R
+import com.gh.gamecenter.common.HaloApp
+import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.utils.SensorsBridge
+import com.gh.gamecenter.common.utils.dip2px
+import com.gh.gamecenter.core.utils.CurrentActivityHolder
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.databinding.DialogFragmentAccelerateExporationBinding
+import kotlinx.parcelize.Parcelize
+
+public class AccelerateExpirationDialogFragment : BaseDialogFragment() {
+
+    private lateinit var binding: DialogFragmentAccelerateExporationBinding
+
+    private var _reminder: ExpirationReminder? = null
+
+    override fun onBack(): Boolean {
+        return true
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        _reminder = arguments?.getParcelable(KEY_EXPIRATION_REMINDER)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return DialogFragmentAccelerateExporationBinding.inflate(inflater, container, false)
+            .also {
+                binding = it
+            }.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val reminder = _reminder ?: return
+        val (title, content) = when (reminder) {
+            is ExpirationReminder.UserExpired -> {
+                SensorsBridge.trackMonthlyPackageExpiresDialogShow(
+                    reminder.gameId, reminder.gameName, reminder.pkgName, reminder.sourceEntrance
+                )
+                getString(
+                    R.string.membership_expiration_reminder_title,
+                    "${reminder.days}"
+                ) to getString(R.string.membership_expiration_reminder_content)
+            }
+
+            is ExpirationReminder.InsufficientDuration -> {
+                SensorsBridge.trackInsufficientDurationDialogShow(
+                    reminder.gameId,
+                    reminder.gameName,
+                    reminder.pkgName,
+                    reminder.sourceEntrance
+                )
+                getString(
+                    R.string.duration_time_out_reminder_title,
+                    "${reminder.hours}"
+                ) to getString(R.string.duration_time_out_reminder_content)
+            }
+
+            is ExpirationReminder.DurationExpired -> {
+                SensorsBridge.trackTimedPackageExpiresDialogShow(
+                    reminder.gameId,
+                    reminder.gameName,
+                    reminder.pkgName,
+                    reminder.sourceEntrance
+                )
+                getString(
+                    R.string.duration_expiration_reminder_title,
+                    "${reminder.days}"
+                ) to getString(R.string.duration_expiration_reminder_content)
+            }
+
+            is ExpirationReminder.TimeRunsOut -> {
+                SensorsBridge.trackDurationExhaustedDialogShow()
+                getString(R.string.accelerator_member_expired_title) to getString(R.string.accelerator_member_expired_content)
+            }
+        }
+
+        binding.tvTitle.text = title
+        binding.tvContent.text = content
+        binding.tvCancel.setOnClickListener {
+            when (reminder) {
+                is ExpirationReminder.UserExpired -> {
+                    SensorsBridge.trackMonthlyPackageExpiresDialogClick(
+                        reminder.gameId, reminder.gameName, reminder.pkgName, reminder.sourceEntrance, BUTTON_NAME_KNOW
+                    )
+                }
+
+                is ExpirationReminder.InsufficientDuration -> {
+                    SensorsBridge.trackInsufficientDurationDialogClick(
+                        reminder.gameId, reminder.gameName, reminder.pkgName, reminder.sourceEntrance, BUTTON_NAME_KNOW
+                    )
+                }
+
+                is ExpirationReminder.DurationExpired -> {
+                    SensorsBridge.trackTimedPackageExpiresDialogClick(
+                        reminder.gameId, reminder.gameName, reminder.pkgName, reminder.sourceEntrance, BUTTON_NAME_KNOW
+                    )
+                }
+
+                is ExpirationReminder.TimeRunsOut -> {
+                    SensorsBridge.trackDurationExhaustedDialogClick(BUTTON_NAME_KNOW)
+                }
+            }
+            dismissAllowingStateLoss()
+        }
+        binding.tvSubmit.setOnClickListener {
+            when (reminder) {
+                is ExpirationReminder.UserExpired -> {
+                    SensorsBridge.trackMonthlyPackageExpiresDialogClick(
+                        reminder.gameId, reminder.gameName, reminder.pkgName, reminder.sourceEntrance, BUTTON_NAME_BUY
+                    )
+                }
+
+                is ExpirationReminder.InsufficientDuration -> {
+                    SensorsBridge.trackInsufficientDurationDialogClick(
+                        reminder.gameId, reminder.gameName, reminder.pkgName, reminder.sourceEntrance, BUTTON_NAME_BUY
+                    )
+                }
+
+                is ExpirationReminder.DurationExpired -> {
+                    SensorsBridge.trackTimedPackageExpiresDialogClick(
+                        reminder.gameId, reminder.gameName, reminder.pkgName, reminder.sourceEntrance, BUTTON_NAME_BUY
+                    )
+                }
+
+                is ExpirationReminder.TimeRunsOut -> {
+                    SensorsBridge.trackDurationExhaustedDialogClick(BUTTON_NAME_BUY)
+                }
+            }
+            SensorsBridge.trackMyAssetsPageShow(
+                reminder.pkgName,
+                reminder.gameId,
+                reminder.gameName,
+                reminder.dialogName
+            )
+            dismissAllowingStateLoss()
+
+            DirectUtils.navigateToMyAssetsPage(requireContext(), reminder.sourceEntrance)
+        }
+    }
+
+    override fun onStart() {
+        super.onStart()
+        val width = HaloApp.getInstance().resources.displayMetrics.widthPixels - 60F.dip2px()
+        val height = dialog?.window?.attributes?.height ?: ViewGroup.LayoutParams.WRAP_CONTENT
+        dialog?.window?.setLayout(width, height)
+    }
+
+    companion object {
+        const val KEY_EXPIRATION_REMINDER = "key_expiration_reminder"
+
+        private const val BUTTON_NAME_KNOW = "知道了"
+        private const val BUTTON_NAME_BUY = "前往购买"
+
+        fun checkDialogShown(context: Context, reminder: ExpirationReminder, callback: ((Boolean) -> Unit)? = null) {
+
+            when (reminder) {
+                is ExpirationReminder.UserExpired -> {
+                    val days = SPUtils.getLong(Constants.SP_ACCELERATOR_USER_REMAINING_REMIND)
+                    if (reminder.days != days) {
+                        SPUtils.setLong(Constants.SP_ACCELERATOR_USER_REMAINING_REMIND, reminder.days)
+                        show(context, reminder)
+                        callback?.invoke(true)
+                    } else {
+                        callback?.invoke(false)
+                    }
+                }
+
+                is ExpirationReminder.InsufficientDuration -> {
+                    val hours = SPUtils.getLong(Constants.SP_ACCELERATOR_DURATION_REMAINING_HOURS)
+                    if (reminder.hours != hours) {
+                        SPUtils.setLong(Constants.SP_ACCELERATOR_DURATION_REMAINING_HOURS, reminder.hours)
+                        show(context, reminder)
+                        callback?.invoke(true)
+                    } else {
+                        callback?.invoke(false)
+                    }
+                }
+
+                is ExpirationReminder.DurationExpired -> {
+                    val days = SPUtils.getLong(Constants.SP_ACCELERATOR_DURATION_REMAINING_DAYS)
+                    if (reminder.days != days) {
+                        SPUtils.setLong(Constants.SP_ACCELERATOR_DURATION_REMAINING_DAYS, reminder.days)
+                        show(context, reminder)
+                        callback?.invoke(true)
+                    } else {
+                        callback?.invoke(false)
+                    }
+                }
+
+                is ExpirationReminder.TimeRunsOut -> {
+                    val hasShow = SPUtils.getBoolean(Constants.SP_ACCELERATOR_MEMBERSHIP_EXPIRED)
+                    if (!hasShow) {
+                        SPUtils.setBoolean(Constants.SP_ACCELERATOR_MEMBERSHIP_EXPIRED, true)
+                        show(context, reminder)
+                        callback?.invoke(true)
+                    } else {
+                        callback?.invoke(false)
+                    }
+                }
+            }
+        }
+
+        fun show(context: Context, reminder: ExpirationReminder) {
+            if (context is AppCompatActivity) {
+                context.supportFragmentManager
+            } else {
+                (CurrentActivityHolder.getCurrentActivity() as? AppCompatActivity)?.supportFragmentManager
+            }?.let {
+                val fragment = AccelerateExpirationDialogFragment().apply {
+                    arguments = Bundle().apply {
+                        putParcelable(KEY_EXPIRATION_REMINDER, reminder)
+                    }
+                }
+                fragment.show(it, AcceleratorPermissionGuideDialogFragment::class.java.name)
+            }
+        }
+    }
+
+    sealed class ExpirationReminder(
+        val gameId: String,
+        val gameName: String,
+        val pkgName: String,
+        val sourceEntrance: String
+    ) :
+        Parcelable {
+
+        abstract val dialogName: String
+
+        @Parcelize
+        data class InsufficientDuration(
+            val hours: Long,
+            private val _gameId: String,
+            private val _gameName: String,
+            private val _pkgName: String,
+            private val _sourceEntrance: String,
+        ) :
+            ExpirationReminder(_gameId, _gameName, _pkgName, _sourceEntrance) {
+
+            override val dialogName: String
+                get() = "时长不足提示弹窗"
+        }
+
+        @Parcelize
+        data class DurationExpired(
+            val days: Long,
+            private val _gameId: String,
+            private val _gameName: String,
+            private val _pkgName: String,
+            private val _sourceEntrance: String,
+        ) :
+            ExpirationReminder(_gameId, _gameName, _pkgName, _sourceEntrance) {
+
+            override val dialogName: String
+                get() = "计时套餐临期提示弹窗"
+        }
+
+        @Parcelize
+        data class UserExpired(
+            val days: Long,
+            private val _gameId: String,
+            private val _gameName: String,
+            private val _pkgName: String,
+            private val _sourceEntrance: String,
+        ) :
+            ExpirationReminder(_gameId, _gameName, _pkgName, _sourceEntrance) {
+
+            override val dialogName: String
+                get() = "包月套餐临期提示弹窗"
+        }
+
+        @Parcelize
+        data class TimeRunsOut(
+            private val _sourceEntrance: String,
+        ) : ExpirationReminder("", "", "", _sourceEntrance) {
+
+            override val dialogName: String
+                get() = "时长耗尽提示弹窗"
+        }
+    }
+}

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

@@ -0,0 +1,68 @@
+package com.gh.common.dialog
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import com.gh.gamecenter.common.HaloApp
+import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.utils.dip2px
+import com.gh.gamecenter.core.utils.CurrentActivityHolder
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.databinding.DialogFragmentAcceleratorPermissionGuideBinding
+
+class AcceleratorPermissionGuideDialogFragment : BaseDialogFragment() {
+
+    private lateinit var binding: DialogFragmentAcceleratorPermissionGuideBinding
+
+    private var callback: (() -> Unit)? = null
+
+    override fun onBack(): Boolean {
+        return true
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return DialogFragmentAcceleratorPermissionGuideBinding.inflate(inflater, container, false)
+            .also {
+                binding = it
+            }.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        SPUtils.setBoolean(Constants.SP_ACCELERATOR_PERMISSION_GUIDE_SHOW, true)
+        binding.tvSubmit.setOnClickListener {
+            dismiss()
+            callback?.invoke()
+        }
+    }
+
+    fun setOnCallback(block: () -> Unit) {
+        this.callback = block
+    }
+
+    override fun onStart() {
+        super.onStart()
+        val width = HaloApp.getInstance().resources.displayMetrics.widthPixels - 60F.dip2px()
+        val height = dialog?.window?.attributes?.height ?: ViewGroup.LayoutParams.WRAP_CONTENT
+        dialog?.window?.setLayout(width, height)
+    }
+
+    companion object {
+
+        fun show(context: Context, callback: () -> Unit) {
+            if (context is AppCompatActivity) {
+                context.supportFragmentManager
+            } else {
+                (CurrentActivityHolder.getCurrentActivity() as? AppCompatActivity)?.supportFragmentManager
+            }?.let {
+                val fragment = AcceleratorPermissionGuideDialogFragment()
+                fragment.setOnCallback(callback)
+                fragment.show(it, AcceleratorPermissionGuideDialogFragment::class.java.name)
+            }
+        }
+    }
+}

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

@@ -6,13 +6,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
 import com.gh.common.util.DirectUtils
+import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
 import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.core.utils.SpanBuilder
 import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.view.CustomLinkMovementMethod
-import com.gh.gamecenter.R
+import com.gh.gamecenter.core.utils.SpanBuilder
 import com.gh.gamecenter.databinding.DialogApplyModeratorBinding
 
 
@@ -45,7 +44,13 @@ class ApplyModeratorDialogFragment : BaseDialogFragment() {
         val startText = "版主考核群："
         val text = "$startText$mGroupNumber\n感谢你对论坛建设的支持\n请加入版主考核群并联系群主进行版主资格考核"
         binding.desTv.text = SpanBuilder(text)
-            .click(startText.length, startText.length + mGroupNumber.length, R.color.theme_font,true) {
+            .click(
+                requireContext(),
+                startText.length,
+                startText.length + mGroupNumber.length,
+                com.gh.gamecenter.common.R.color.text_theme,
+                true
+            ) {
                 DirectUtils.directToQqGroup(
                     requireContext(),
                     mGroupKey

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

@@ -1,197 +0,0 @@
-package com.gh.common.dialog
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.app.Dialog
-import android.content.Context
-import android.content.Intent
-import android.graphics.Color
-import android.graphics.Paint
-import android.graphics.drawable.ColorDrawable
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.widget.CheckBox
-import android.widget.TextView
-import androidx.appcompat.app.AppCompatActivity
-import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager
-import com.gh.gamecenter.common.avoidcallback.Callback
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.common.util.*
-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.core.utils.GsonUtils
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.entity.AuthDialogEntity
-import com.gh.gamecenter.entity.AuthDialogLevel
-import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.login.user.UserManager
-import com.google.gson.reflect.TypeToken
-import com.halo.assistant.fragment.user.UserInfoEditFragment
-import com.lightgame.utils.AppManager
-
-class CertificationDialog(context: Context, private val authDialogEntity: AuthDialogEntity, val gameId: String, val listener: ConfirmListener) :
-        Dialog(context, R.style.GhAlertDialog) {
-
-    private lateinit var view: View
-    private lateinit var detailedDesTv: TextView
-    private lateinit var noRemindAgainCb: CheckBox
-    private lateinit var actionLeftTv: TextView
-    private lateinit var actionRightTv: TextView
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        view = LayoutInflater.from(context).inflate(R.layout.dialog_sertification, null)
-        setContentView(view)
-        detailedDesTv = view.findViewById(R.id.detailedDesTv)
-        noRemindAgainCb = view.findViewById(R.id.noRemindAgainCb)
-        actionLeftTv = view.findViewById(R.id.actionLeftTv)
-        actionRightTv = view.findViewById(R.id.actionRightTv)
-
-        detailedDesTv.paint.flags = Paint.UNDERLINE_TEXT_FLAG
-        detailedDesTv.paint.isAntiAlias = true
-
-        detailedDesTv.setOnClickListener {
-            DirectUtils.directToWebView(context, authDialogEntity.link)
-        }
-
-        when (authDialogEntity.level) {
-            AuthDialogLevel.MUST_PASS.value -> {
-                actionLeftTv.text = "暂不下载"
-                actionRightTv.text = "去实名认证"
-                noRemindAgainCb.visibility = View.GONE
-                actionLeftTv.setOnClickListener {
-                    dismiss()
-                }
-                actionRightTv.setOnClickListener {
-                    if (UserManager.getInstance().isLoggedIn) {
-                        gotoAuthPage()
-                    } else {
-                        gotoLoginPage()
-                    }
-                }
-            }
-            AuthDialogLevel.ALWAYS_HINT.value -> {
-                actionLeftTv.text = "去实名认证"
-                actionRightTv.text = "继续下载"
-                noRemindAgainCb.visibility = View.GONE
-                actionLeftTv.setOnClickListener {
-                    if (UserManager.getInstance().isLoggedIn) {
-                        gotoAuthPage()
-                    } else {
-                        gotoLoginPage()
-                    }
-                }
-                actionRightTv.setOnClickListener {
-                    listener.onConfirm()
-                    dismiss()
-                }
-            }
-            AuthDialogLevel.OPTIONAL_HINT.value -> {
-                actionLeftTv.text = "去实名认证"
-                actionRightTv.text = "继续下载"
-                noRemindAgainCb.visibility = View.VISIBLE
-                actionLeftTv.setOnClickListener {
-                    if (noRemindAgainCb.isChecked) {
-                        SPUtils.setBoolean(gameId, true)
-                    }
-                    if (UserManager.getInstance().isLoggedIn) {
-                        gotoAuthPage()
-                    } else {
-                        gotoLoginPage()
-                    }
-                }
-                actionRightTv.setOnClickListener {
-                    if (noRemindAgainCb.isChecked) {
-                        SPUtils.getBoolean(gameId, true)
-                    }
-                    listener.onConfirm()
-                    dismiss()
-                }
-            }
-        }
-    }
-
-    //跳转登录页面
-    private fun gotoLoginPage() {
-        val currentActivity = AppManager.getInstance().currentActivity() ?: return
-
-        CheckLoginUtils.checkLogin(currentActivity as AppCompatActivity,
-                null, true, "实名认证弹窗") {
-            if (UserManager.getInstance().isAuth) {
-                listener.onConfirm()
-                dismiss()
-            }
-        }
-    }
-
-    //跳转实名认证页面
-    private fun gotoAuthPage() {
-        val currentActivity = AppManager.getInstance().currentActivity() ?: return
-
-        AvoidOnResultManager.getInstance(currentActivity as AppCompatActivity)
-            .startForResult(
-                ShellActivity.getIntent(
-                    context,
-                    ShellActivity.Type.REAL_NAME_INFO,
-                ).apply {
-                    putExtra(EntranceConsts.KEY_GAME_ID, gameId)
-                }, object : Callback {
-                    override fun onActivityResult(resultCode: Int, data: Intent?) {
-                        if (resultCode == Activity.RESULT_OK && data != null) {
-                            val isAuthSuccess =
-                                data.getBooleanExtra(UserInfoEditFragment.AUTH_SUCCESS, false)
-                            if (isAuthSuccess) {
-                                listener.onConfirm()
-                                dismiss()
-                            }
-                        }
-                    }
-                })
-    }
-
-
-    companion object {
-        @JvmStatic
-        fun showCertificationDialog(context: Context, game: GameEntity, listener: ConfirmListener) {
-            //1.先判断是否登录 是执行2 否执行3
-            //2.判断是否实名认证 是终止 否执行3
-            //3.判断是否需要弹出认证弹窗接口
-            if (UserManager.getInstance().isLoggedIn) {
-                if (UserManager.getInstance().isAuth) {//已实名认证
-                    listener.onConfirm()
-                } else {
-                    authDialog(context, game, listener)
-                }
-            } else {
-                authDialog(context, game, listener)
-            }
-        }
-
-        @SuppressLint("CheckResult")
-        private fun authDialog(context: Context, game: GameEntity, listener: ConfirmListener) {
-            var authDialog: AuthDialogEntity? = null
-            if (game.authDialog != null) {
-                authDialog = game.authDialog
-            }
-            if (authDialog == null) {
-                val datas = SPUtils.getString(Constants.SP_AUTH_DIALOG)
-                val type = object : TypeToken<List<AuthDialogEntity>>() {}.type
-                val authDialogs = GsonUtils.gson.fromJson<List<AuthDialogEntity>>(datas, type)
-                if (!authDialogs.isNullOrEmpty()) {
-                    authDialog = authDialogs.find { it.gameCategory == game.category }
-                }
-            }
-            val isCloseAuthDialog = SPUtils.getBoolean(game.id, false)
-            if (authDialog != null && (authDialog.level != AuthDialogLevel.OPTIONAL_HINT.value || !isCloseAuthDialog)) {
-                val dialog = CertificationDialog(context, authDialog, game.id, listener)
-                dialog.show()
-            } else {
-                listener.onConfirm()
-            }
-        }
-    }
-}

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

@@ -18,19 +18,18 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import com.facebook.drawee.view.SimpleDraweeView
-import com.gh.gamecenter.common.constant.Constants
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
-import com.gh.gamecenter.core.utils.GsonUtils
-import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.utils.ImageUtils
 import com.gh.gamecenter.common.utils.countDownTimer
 import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.common.utils.ImageUtils
+import com.gh.gamecenter.core.utils.GsonUtils
+import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.databinding.DialogDeviceRemindBinding
 import com.gh.gamecenter.entity.DeviceDialogEntity
-import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.feature.entity.GameEntity
 import com.google.gson.reflect.TypeToken
-import com.gh.gamecenter.setting.GameDownloadSettingFragment.Companion.AUTO_INSTALL_SP_KEY
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
 import com.lightgame.download.DownloadStatus
@@ -40,7 +39,8 @@ import java.lang.ref.WeakReference
 /**
  * 设备提醒弹窗
  */
-class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val gameEntity: GameEntity) : Dialog(context, R.style.GhAlertDialog) {
+class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val gameEntity: GameEntity) :
+    Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog) {
     private val mBinding: DialogDeviceRemindBinding by lazy { DialogDeviceRemindBinding.inflate(layoutInflater) }
     private var currentPage = 0
     private var mSlideLooperInterval = 3000L
@@ -52,7 +52,7 @@ class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val g
     private val dataWatcher = object : DataWatcher() {
         override fun onDataChanged(downloadEntity: DownloadEntity) {
             if (downloadEntity.status == DownloadStatus.done && downloadEntity.name == gameEntity.name) {
-                val autoInstall = SPUtils.getBoolean(AUTO_INSTALL_SP_KEY, true)
+                val autoInstall = SPUtils.getBoolean(Constants.SP_AUTO_INSTALL, true)
                 if (autoInstall) {
                     dismiss()
                 }
@@ -78,7 +78,8 @@ class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val g
                 val type = object : TypeToken<List<DeviceDialogEntity>>() {}.type
                 val entities = GsonUtils.gson.fromJson<List<DeviceDialogEntity>>(datas, type)
                 //1.判断设备是否匹配
-                val entity = entities.find { it.manufacturer.toLowerCase().startsWith(Build.MANUFACTURER.toLowerCase()) }
+                val entity =
+                    entities.find { it.manufacturer.toLowerCase().startsWith(Build.MANUFACTURER.toLowerCase()) }
                         ?: return Pair(false, null)
                 //2.判断游戏不含剔除标签
                 gameEntity.tagStyle.forEach {
@@ -135,13 +136,13 @@ class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val g
         val isFirst = SPUtils.getBoolean(Constants.SP_FIRST_DEVICE_REMIND, false)
         if (!isFirst) {
             mBinding.cancelTv.isEnabled = false
-            mBinding.cancelTv.background = ContextCompat.getDrawable(context, R.drawable.button_round_f5f5f5)
+            mBinding.cancelTv.background = ContextCompat.getDrawable(context, com.gh.gamecenter.common.R.drawable.button_round_f5f5f5)
             disposable = countDownTimer(3) { finish, time ->
                 if (finish) {
                     mBinding.cancelTv.isEnabled = true
-                    mBinding.cancelTv.background = ContextCompat.getDrawable(context, R.drawable.button_blue_oval)
+                    mBinding.cancelTv.background = ContextCompat.getDrawable(context, com.gh.gamecenter.common.R.drawable.button_blue_oval)
                     mBinding.cancelTv.text = "我知道了"
-                    mBinding.cancelTv.setTextColor(ContextCompat.getColor(context, R.color.white))
+                    mBinding.cancelTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.white))
                 } else {
                     mBinding.cancelTv.text = "我知道了(${time}S)"
                 }
@@ -152,8 +153,8 @@ class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val g
             mBinding.noRemindAgainCb.visibility = View.VISIBLE
             mBinding.cancelTv.text = "我知道了"
             mBinding.cancelTv.isEnabled = true
-            mBinding.cancelTv.setTextColor(ContextCompat.getColor(context, R.color.white))
-            mBinding.cancelTv.background = ContextCompat.getDrawable(context, R.drawable.button_blue_oval)
+            mBinding.cancelTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.white))
+            mBinding.cancelTv.background = ContextCompat.getDrawable(context, com.gh.gamecenter.common.R.drawable.button_blue_oval)
         }
         mBinding.cancelTv.setOnClickListener {
             SPUtils.setBoolean(Constants.SP_NO_REMIND_AGAIN, mBinding.noRemindAgainCb.isChecked)
@@ -189,7 +190,9 @@ class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val g
 
     inner class BannerAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-            return object : RecyclerView.ViewHolder(LayoutInflater.from(context).inflate(R.layout.item_device_remind_banner, parent, false)) {}
+            return object : RecyclerView.ViewHolder(
+                LayoutInflater.from(context).inflate(R.layout.item_device_remind_banner, parent, false)
+            ) {}
         }
 
         override fun getItemCount(): Int = if (mDatas.size == 1) mDatas.size else Int.MAX_VALUE

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

@@ -14,15 +14,15 @@ import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
 import com.gh.common.util.DirectUtils
 import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.utils.toColor
-import com.gh.gamecenter.R
 import com.gh.gamecenter.databinding.DialogGameOffServiceBinding
-import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.feature.entity.GameEntity
 
 // 游戏关闭下载弹窗
 class GameOffServiceDialogFragment : BaseDialogFragment() {
 
     private var mDialog: GameEntity.Dialog? = null
     private var mBinding: DialogGameOffServiceBinding? = null
+    private var mCallback: (() -> Unit)? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -31,9 +31,9 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return DialogGameOffServiceBinding
-                .inflate(inflater)
-                .apply { mBinding = this }
-                .root
+            .inflate(inflater)
+            .apply { mBinding = this }
+            .root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -44,6 +44,7 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {
                 titleTv.text = title
                 contentTv.text = HtmlCompat.fromHtml(content, HtmlCompat.FROM_HTML_MODE_LEGACY)
                 okTv.setOnClickListener {
+                    mCallback?.invoke()
                     dismissAllowingStateLoss()
                 }
 
@@ -52,16 +53,18 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {
 
                 notEmptySite.forEachIndexed { index, site ->
                     val siteTv = TextView(context)
-                    siteTv.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply {
+                    siteTv.layoutParams = LinearLayout.LayoutParams(
+                        ViewGroup.LayoutParams.WRAP_CONTENT,
+                        ViewGroup.LayoutParams.WRAP_CONTENT
+                    ).apply {
                         topMargin = 24F.dip2px()
                         if (index == notEmptySite.size - 1) bottomMargin = 8F.dip2px()
                     }
                     siteTv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14F)
-                    siteTv.setTextColor(R.color.theme_font.toColor())
+                    siteTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(requireContext()))
                     siteTv.text = site.text
                     siteTv.paintFlags = siteTv.paintFlags or Paint.UNDERLINE_TEXT_FLAG
                     siteTv.setOnClickListener {
-    //                    MtaHelper.onEvent("游戏下载状态按钮", getKey(), site.text)
                         DirectUtils.directToWebView(requireContext(), site.url, "(关闭下载弹窗)")
                         dismissAllowingStateLoss()
                     }
@@ -80,11 +83,13 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {
         const val KEY_DIALOG = "dialog"
 
         @JvmStatic
-        fun getInstance(dialog: GameEntity.Dialog) = GameOffServiceDialogFragment().apply {
-            arguments = Bundle().apply {
-                putParcelable(KEY_DIALOG, dialog)
+        fun getInstance(dialog: GameEntity.Dialog, callback: (() -> Unit)? = null) =
+            GameOffServiceDialogFragment().apply {
+                arguments = Bundle().apply {
+                    putParcelable(KEY_DIALOG, dialog)
+                }
+                mCallback = callback
             }
-        }
     }
 
 }

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

@@ -1,6 +1,7 @@
 package com.gh.common.dialog
 
 import android.app.Activity.RESULT_OK
+import android.content.DialogInterface
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
@@ -13,17 +14,15 @@ 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
 import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.utils.PermissionHelper
+import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.common.utils.PermissionHelper.INSTALL_PERMISSION_CODE
-import com.gh.gamecenter.common.utils.getExtension
-import com.gh.gamecenter.common.utils.goneIf
 import com.gh.gamecenter.core.utils.SPUtils
 import com.lightgame.download.DownloadEntity
-import com.lightgame.utils.Utils
 import kotlin.random.Random
 
 class InstallPermissionDialogFragment : BaseDialogFragment() {
@@ -31,8 +30,13 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
     lateinit var mView: View
     var isXapk = false
     var url: String = ""
+    var gameId: String = ""
+    var gameName: String = ""
+    var gameType: String = ""
     var mCallBack: ((isFromPermissionGrantedCallback: Boolean) -> Unit)? = null
 
+    private var dismissByTouchInside = false
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         mView = inflater.inflate(R.layout.dialog_install_permission, null, false)
         return mView
@@ -50,6 +54,14 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
         switchLottie.setAnimation("lottie/install_permission_switch.json")
         switchLottie.playAnimation()
 
+        if (isXapk) NewFlatLogUtils.logXApkInstallPermissionDialogShowed(gameId, gameName)
+
+        SensorsBridge.trackInstallPermissionDialogShow(
+            gameId = gameId,
+            gameName = gameName,
+            gameType = gameType
+        )
+
         val randomNumber = if (isXapk) 1 else Random.nextInt(2)
         closeTv.goneIf(randomNumber == 0)
         closeIv.goneIf(randomNumber != 0)
@@ -59,15 +71,38 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
         }
 
         closeTv.setOnClickListener {
+            dismissByTouchInside = true
             if (isXapk) {
+                NewFlatLogUtils.logXApkInstallPermissionDialogClick("尝试解压", false, gameId, gameName)
                 mCallBack?.invoke(false)
             }
+            SensorsBridge.trackInstallPermissionDialogClick(
+                buttonName = "尝试解压",
+                gameId = gameId,
+                gameName = gameName,
+                gameType = gameType
+            )
             dismiss()
         }
         closeIv.setOnClickListener {
+            dismissByTouchInside = true
+            if (isXapk) NewFlatLogUtils.logXApkInstallPermissionDialogClick("关闭", false, gameId, gameName)
+            SensorsBridge.trackInstallPermissionDialogClick(
+                buttonName = "关闭",
+                gameId = gameId,
+                gameName = gameName,
+                gameType = gameType
+            )
             dismiss()
         }
         activateTv.setOnClickListener {
+            NewFlatLogUtils.logXApkInstallPermissionDialogClick("立即开启", false, gameId, gameName)
+            SensorsBridge.trackInstallPermissionDialogClick(
+                buttonName = "立即开启",
+                gameId = gameId,
+                gameName = gameName,
+                gameType = gameType
+            )
             PermissionHelper.toInstallPermissionSetting(requireActivity())
             if (isXapk) {
                 SPUtils.setString(Constants.SP_XAPK_UNZIP_ACTIVITY, requireActivity().javaClass.name)
@@ -76,9 +111,25 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
         }
     }
 
+    override fun onDismiss(dialog: DialogInterface) {
+        if (!dismissByTouchInside) {
+            SensorsBridge.trackInstallPermissionDialogClick(
+                buttonName = "关闭弹窗",
+                gameId = gameId,
+                gameName = gameName,
+                gameType = gameType
+            )
+        }
+        super.onDismiss(dialog)
+    }
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (resultCode == RESULT_OK && requestCode == INSTALL_PERMISSION_CODE) {
+            dismissByTouchInside = true
+
+            NewFlatLogUtils.logXApkInstallPermissionDialogClick("立即开启", true, gameId, gameName)
+
             if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
                 SPUtils.setString(Constants.SP_XAPK_UNZIP_ACTIVITY, "")
                 SPUtils.setString(Constants.SP_XAPK_URL, "")
@@ -90,7 +141,11 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
 
     companion object {
         @JvmStatic
-        fun show(activity: AppCompatActivity, downloadEntity: DownloadEntity, callBack: ((isFromPermissionGrantedCallback: Boolean) -> Unit)?) {
+        fun show(
+            activity: AppCompatActivity,
+            downloadEntity: DownloadEntity,
+            callBack: ((isFromPermissionGrantedCallback: Boolean) -> Unit)?
+        ) {
             val isXapk = XapkInstaller.XAPK_EXTENSION_NAME == downloadEntity.path.getExtension()
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
                 callBack?.invoke(false)
@@ -103,7 +158,7 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
             }
             if (isXapk) {
                 val xapkUnzipVersions = Config.getSettings()?.permissionPopupAppliedVersions?.xapkUnzip
-                if (xapkUnzipVersions?.contains(Build.VERSION.SDK_INT.toString()) == false) {
+                if (xapkUnzipVersions?.contains(Build.VERSION.SDK_INT.toString()) == false || XapkInstaller.systemHasFlaw) {
                     callBack?.invoke(false)
                     return
                 }
@@ -114,11 +169,15 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
                     return
                 }
             }
-            var installPermissionDialogFragment = activity.supportFragmentManager.findFragmentByTag(InstallPermissionDialogFragment::class.java.name) as? InstallPermissionDialogFragment
+            var installPermissionDialogFragment =
+                activity.supportFragmentManager.findFragmentByTag(InstallPermissionDialogFragment::class.java.name) as? InstallPermissionDialogFragment
             if (installPermissionDialogFragment != null) {
                 installPermissionDialogFragment.mCallBack = callBack
                 installPermissionDialogFragment.isXapk = isXapk
                 installPermissionDialogFragment.url = downloadEntity.url
+                installPermissionDialogFragment.gameId = downloadEntity.gameId
+                installPermissionDialogFragment.gameName = downloadEntity.name
+                installPermissionDialogFragment.gameType = downloadEntity.categoryChinese
                 val transaction: FragmentTransaction = activity.supportFragmentManager.beginTransaction()
                 transaction.show(installPermissionDialogFragment)
                 transaction.commit()
@@ -127,8 +186,14 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
                     this.mCallBack = callBack
                     this.isXapk = isXapk
                     this.url = downloadEntity.url
+                    this.gameId = downloadEntity.gameId
+                    this.gameName = downloadEntity.name
+                    this.gameType = downloadEntity.categoryChinese
                 }
-                installPermissionDialogFragment.show(activity.supportFragmentManager, InstallPermissionDialogFragment::class.java.name)
+                installPermissionDialogFragment.show(
+                    activity.supportFragmentManager,
+                    InstallPermissionDialogFragment::class.java.name
+                )
             }
         }
     }

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

@@ -13,15 +13,13 @@ import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentTransaction
 import com.gh.common.util.DirectUtils
 import com.gh.gamecenter.R
-import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
 import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.view.CustomLinkMovementMethod
 import com.gh.gamecenter.databinding.DialogPrivacyProtocolNewBinding
 import com.gh.gamecenter.entity.DialogEntity
-import splitties.bundle.put
 
-class NewPrivacyPolicyDialogFragment: BaseDialogFragment() {
+class NewPrivacyPolicyDialogFragment : BaseDialogFragment() {
 
     private var mCallBack: ((isSuccess: Boolean) -> Unit)? = null
     private val mBinding by lazy { DialogPrivacyProtocolNewBinding.inflate(layoutInflater) }
@@ -41,10 +39,12 @@ class NewPrivacyPolicyDialogFragment: BaseDialogFragment() {
     }
 
     private fun updateView() {
-        val contentText = SpannableStringBuilder("1.您可以通过《光环助手隐私政策》以及《儿童隐私保护声明》，了解我们如何收集、使用、存储、保护、对外提供您的个人信息以及您享有的权利\n" +
-                "2.您可以通过《接入第三方SDK目录》了解本产品接入的第三方SDK的具体信息\n" +
-                "3.您可以通过《应用权限列表》了解权限申请与使用情况说明\n" +
-                "4.如果您是14周岁以下的未成年人，您需要和您监护人一起仔细阅读《儿童隐私保护声明》，并在征得您监护人同意后，使用我们的产品、服务或向我们提供信息")
+        val contentText = SpannableStringBuilder(
+            "1.您可以通过《光环助手隐私政策》以及《儿童隐私保护声明》，了解我们如何收集、使用、存储、保护、对外提供您的个人信息以及您享有的权利\n" +
+                    "2.您可以通过《接入第三方SDK目录》了解本产品接入的第三方SDK的具体信息\n" +
+                    "3.您可以通过《应用权限列表》了解权限申请与使用情况说明\n" +
+                    "4.如果您是14周岁以下的未成年人，您需要和您监护人一起仔细阅读《儿童隐私保护声明》，并在征得您监护人同意后，使用我们的产品、服务或向我们提供信息"
+        )
 
         val privacyPolicyText = "《光环助手隐私政策》"
         val childrenPrivacyPolicyText = "《儿童隐私保护声明》"
@@ -76,23 +76,24 @@ class NewPrivacyPolicyDialogFragment: BaseDialogFragment() {
             contentText.setSpan(object : ClickableSpan() {
                 override fun updateDrawState(ds: TextPaint) {
                     super.updateDrawState(ds)
-                    ds.color = ContextCompat.getColor(requireContext(), R.color.theme_font)
+                    ds.color = ContextCompat.getColor(requireContext(), com.gh.gamecenter.common.R.color.text_theme)
                     ds.isUnderlineText = false
                 }
 
                 override fun onClick(widget: View) {
-                    val privacyPolicyUrl = requireContext().getString(R.string.privacy_policy_url)
+                    val privacyPolicyUrl = requireContext().getString(com.gh.gamecenter.common.R.string.privacy_policy_url)
                     val childrenPrivacyPolicyUrl = requireContext().getString(R.string.children_policy_url)
                     val thirdPartySdkUrl = requireContext().getString(R.string.sdk_list_url)
                     val permissionListUrl = requireContext().getString(R.string.permission_and_usage_url)
 
-                    val selectedUrl = when (contentText.substring(hypertextPositionPair.first, hypertextPositionPair.second)) {
-                        privacyPolicyText -> privacyPolicyUrl
-                        childrenPrivacyPolicyText -> childrenPrivacyPolicyUrl
-                        thirdPartySdkText -> thirdPartySdkUrl
-                        permissionListText -> permissionListUrl
-                        else -> ""
-                    }
+                    val selectedUrl =
+                        when (contentText.substring(hypertextPositionPair.first, hypertextPositionPair.second)) {
+                            privacyPolicyText -> privacyPolicyUrl
+                            childrenPrivacyPolicyText -> childrenPrivacyPolicyUrl
+                            thirdPartySdkText -> thirdPartySdkUrl
+                            permissionListText -> permissionListUrl
+                            else -> ""
+                        }
 
                     DirectUtils.directToExternalBrowser(requireContext(), selectedUrl)
                 }
@@ -140,10 +141,13 @@ class NewPrivacyPolicyDialogFragment: BaseDialogFragment() {
         const val KEY_DATA = "data"
 
         @JvmStatic
-        fun show(activity: FragmentActivity,
-                 privacyPolicyEntity: DialogEntity.PrivacyPolicyEntity? = null,
-                 callBack: ((isSuccess: Boolean) -> Unit)?) {
-            var privacyDialogFragment = activity.supportFragmentManager.findFragmentByTag(NewPrivacyPolicyDialogFragment::class.java.name) as? NewPrivacyPolicyDialogFragment
+        fun show(
+            activity: FragmentActivity,
+            privacyPolicyEntity: DialogEntity.PrivacyPolicyEntity? = null,
+            callBack: ((isSuccess: Boolean) -> Unit)?
+        ) {
+            var privacyDialogFragment =
+                activity.supportFragmentManager.findFragmentByTag(NewPrivacyPolicyDialogFragment::class.java.name) as? NewPrivacyPolicyDialogFragment
             if (privacyDialogFragment != null) {
                 privacyDialogFragment.mCallBack = callBack
                 val transaction: FragmentTransaction = activity.supportFragmentManager.beginTransaction()
@@ -155,7 +159,7 @@ class NewPrivacyPolicyDialogFragment: BaseDialogFragment() {
                 }
             }
             privacyDialogFragment.arguments = Bundle().apply {
-                put(KEY_DATA, privacyPolicyEntity)
+                putParcelable(KEY_DATA, privacyPolicyEntity)
             }
             privacyDialogFragment.show(
                 activity.supportFragmentManager,

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

@@ -2,7 +2,7 @@ package com.gh.common.dialog
 
 import android.animation.ValueAnimator
 import android.content.Context
-import android.content.pm.PackageInfo
+import android.content.DialogInterface
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -11,26 +11,29 @@ import android.view.animation.LinearInterpolator
 import android.widget.LinearLayout
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentTransaction
 import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.common.util.*
+import com.gh.common.util.DirectUtils
 import com.gh.common.util.LogUtils
-import com.gh.gamecenter.common.view.CustomLinkMovementMethod
+import com.gh.common.util.PackageUtils
 import com.gh.download.DownloadManager
-import com.gh.gamecenter.R
+import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
 import com.gh.gamecenter.common.callback.ConfirmListener
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.entity.LinkEntity
 import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.utils.*
+import com.gh.gamecenter.common.view.CustomLinkMovementMethod
+import com.gh.gamecenter.core.utils.DisplayUtils
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.core.utils.SpanBuilder
 import com.gh.gamecenter.databinding.FragmentPackageCheckBinding
 import com.gh.gamecenter.databinding.PackageCheckItemBinding
-import com.gh.gamecenter.entity.DetectionObjectEntity
-import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.common.entity.LinkEntity
-import com.gh.gamecenter.entity.PackageDialogEntity
+import com.gh.gamecenter.feature.entity.DetectionObjectEntity
+import com.gh.gamecenter.feature.entity.GameEntity
+import com.gh.gamecenter.feature.entity.PackageDialogEntity
 import com.gh.gamecenter.eventbus.EBPackage
 import com.halo.assistant.HaloApp
 import com.lightgame.adapter.BaseRecyclerAdapter
@@ -54,10 +57,11 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
     private val mDuration = 3000
     private var mDisposable: Disposable? = null
     private var mAdapter: PackageCheckAdapter? = null
-    private var mAllInstalledPackages = PackageUtils.getInstalledPackages(HaloApp.getInstance().application, 0)
     var gameEntity: GameEntity? = null
     var callBack: ConfirmListener? = null
 
+    private var mDismissByTouchInside = false
+
     private val dataWatcher = object : DataWatcher() {
         override fun onDataChanged(downloadEntity: DownloadEntity) {
             val packageName = downloadEntity.packageName
@@ -67,9 +71,14 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                     if (detectionObject.packages.contains(packageName)) {
                         val packageLink = gameEntity?.packageDialog?.links?.find { it.buttonLink }
                         LogUtils.uploadPackageCheck(
-                            "pkg_check_pop_download", if (DownloadStatus.add == downloadEntity.status) "下载开始" else "下载完成",
-                            gameEntity, packageLink?.text ?: "", packageLink?.title
-                                ?: "", downloadEntity.gameId, downloadEntity.getMetaExtra(Constants.GAME_NAME)
+                            "pkg_check_pop_download",
+                            if (DownloadStatus.add == downloadEntity.status) "下载开始" else "下载完成",
+                            gameEntity,
+                            packageLink?.text ?: "",
+                            packageLink?.title
+                                ?: "",
+                            downloadEntity.gameId,
+                            downloadEntity.getMetaExtra(Constants.GAME_NAME)
                         )
                     }
                 }
@@ -82,6 +91,11 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
         EventBus.getDefault().register(this)
         gameEntity?.let {
             LogUtils.uploadPackageCheck("pkg_check_pop_click", "出现弹窗", it, "", "", "", "")
+            SensorsBridge.trackPkgCheckDialogShow(
+                gameId = it.id,
+                gameName = it.name ?: "",
+                gameType = it.categoryChinese
+            )
         }
     }
 
@@ -105,10 +119,33 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
             val spanBuilder = SpanBuilder(it.linkHintText).build()
             it.links.forEachIndexed { index, link ->
                 val linkSpan = SpanBuilder(link.title ?: "").click(
-                    0, (link.title
-                        ?: "").length, R.color.theme_font, true
+                    requireContext(),
+                    0,
+                    (link.title ?: "").length,
+                    com.gh.gamecenter.common.R.color.text_theme,
+                    true
                 ) {
-                    LogUtils.uploadPackageCheck("pkg_check_pop_click", "点击链接", gameEntity, link.text, link.title, "", "")
+                    LogUtils.uploadPackageCheck(
+                        "pkg_check_pop_click",
+                        "点击链接",
+                        gameEntity,
+                        link.text,
+                        link.title,
+                        "",
+                        ""
+                    )
+                    SensorsBridge.trackPkgCheckDialogClick(
+                        buttonName = "点击链接",
+                        gameId = gameEntity?.id ?: "",
+                        gameName = gameEntity?.name ?: "",
+                        gameType = gameEntity?.categoryChinese ?: "",
+                        isNotPrompt = if (binding.noRemindAgainCb.isVisible) {
+                            binding.noRemindAgainCb.isChecked
+                        } else null,
+                        linkId = link.link ?: "",
+                        linkType = link.type ?: "",
+                        linkText = link.linkText ?: ""
+                    )
                     DirectUtils.directToLinkPage(requireContext(), link, "包名检测弹窗", "")
                 }.build()
                 spanBuilder.append(linkSpan)
@@ -155,8 +192,9 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
             if (binding.noRemindAgainCb.isChecked) {
                 saveRecord(entity)
             }
-            val isAllPackageInstalled = isAllPackageInstalled(mAllInstalledPackages, entity)
+            val isAllPackageInstalled = isAllPackageInstalled(entity)
             if (isAllPackageInstalled) {
+                mDismissByTouchInside = true
                 callBack?.onConfirm()
                 dismissAllowingStateLoss()
             } else {
@@ -165,7 +203,24 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                     packageLink = entity.links.find { it.buttonLink }
                 }
                 if (packageLink != null) {
-                    LogUtils.uploadPackageCheck("pkg_check_pop_click", "点击前往下载", gameEntity, packageLink.text, packageLink.title, "", "")
+                    LogUtils.uploadPackageCheck(
+                        "pkg_check_pop_click",
+                        "点击前往下载",
+                        gameEntity,
+                        packageLink.text,
+                        packageLink.title,
+                        "",
+                        ""
+                    )
+                    SensorsBridge.trackPkgCheckDialogClick(
+                        buttonName = "点击前往下载",
+                        gameId = gameEntity?.id ?: "",
+                        gameName = gameEntity?.name ?: "",
+                        gameType = gameEntity?.categoryChinese ?: "",
+                        isNotPrompt = if (binding.noRemindAgainCb.isVisible) {
+                            binding.noRemindAgainCb.isChecked
+                        } else null
+                    )
                     DirectUtils.directToLinkPage(requireContext(), packageLink, "包名检测弹窗", "")
                 }
             }
@@ -179,6 +234,19 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                 saveRecord(entity)
                 LogUtils.uploadPackageCheck("pkg_check_pop_click", "不再提示", gameEntity, "", "", "", "")
             }
+
+            mDismissByTouchInside = true
+
+            SensorsBridge.trackPkgCheckDialogClick(
+                buttonName = binding.cancelTv.text.toString(),
+                gameId = gameEntity?.id ?: "",
+                gameName = gameEntity?.name ?: "",
+                gameType = gameEntity?.categoryChinese ?: "",
+                isNotPrompt = if (binding.noRemindAgainCb.isVisible) {
+                    binding.noRemindAgainCb.isChecked
+                } else null
+            )
+
             dismissAllowingStateLoss()
         }
     }
@@ -213,7 +281,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
             if (it >= mDuration) {
                 mDisposable?.dispose()
                 binding.downloadBtn.isEnabled = true
-                binding.downloadBtn.background = R.drawable.bg_notification_open_btn_style_2.toDrawable()
+                binding.downloadBtn.background = com.gh.gamecenter.common.R.drawable.bg_notification_open_btn_style_2.toDrawable()
             }
         }
         val animator = ValueAnimator.ofInt(0, 100)
@@ -228,7 +296,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
     private fun getNotInstalledLink(packageDialogEntity: PackageDialogEntity): LinkEntity? {
         val links = LinkedHashSet<LinkEntity>()
         packageDialogEntity.detectionObjects.forEach { obj ->
-            if (!checkDetectionsInstalled(mAllInstalledPackages, obj.packages)) {
+            if (!checkDetectionsInstalled(obj.packages)) {
                 obj.assignDownload.forEach {
                     links.add(packageDialogEntity.links[it])
                 }
@@ -254,9 +322,8 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
 
     override fun onResume() {
         super.onResume()
-        mAllInstalledPackages = PackageUtils.getInstalledPackages(HaloApp.getInstance().application, 0)
         gameEntity?.packageDialog?.let {
-            if (isAllPackageInstalled(mAllInstalledPackages, it)) {
+            if (isAllPackageInstalled(it)) {
                 callBack?.onConfirm()
                 dismissAllowingStateLoss()
             }
@@ -273,11 +340,25 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
         DownloadManager.getInstance().removeObserver(dataWatcher)
     }
 
+    override fun onDismiss(dialog: DialogInterface) {
+        if (!mDismissByTouchInside) {
+            SensorsBridge.trackPkgCheckDialogClick(
+                buttonName = "关闭弹窗",
+                gameId = gameEntity?.id ?: "",
+                gameName = gameEntity?.name ?: "",
+                gameType = gameEntity?.categoryChinese ?: "",
+                isNotPrompt = if (binding.noRemindAgainCb.isVisible) {
+                    binding.noRemindAgainCb.isChecked
+                } else null
+            )
+        }
+        super.onDismiss(dialog)
+    }
+
     //安装、卸载事件
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onEventMainThread(busFour: EBPackage) {
-        if ("安装" == busFour.type || "卸载" == busFour.type) {
-            mAllInstalledPackages = PackageUtils.getInstalledPackages(HaloApp.getInstance().application, 0)
+        if (busFour.isInstalledOrUninstalled()) {
             mAdapter?.notifyDataSetChanged()
         }
     }
@@ -302,13 +383,13 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                 val entity = entities[position]
                 holder.binding.gameNameTv.text = entity.text
                 if (position <= index) {
-                    val isAllInstalled = checkDetectionsInstalled(mAllInstalledPackages, entity.packages)
+                    val isAllInstalled = checkDetectionsInstalled(entity.packages)
                     if (isAllInstalled) {
                         holder.binding.statusTv.text = "已安装"
-                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font))
+                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_theme))
                     } else {
                         holder.binding.statusTv.text = "未安装"
-                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.theme_red))
+                        holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.secondary_red))
                     }
                     holder.binding.statusTv.visibility = View.VISIBLE
                 } else {
@@ -318,7 +399,8 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
         }
     }
 
-    class PackageCheckViewHolder(val binding: PackageCheckItemBinding) : BaseRecyclerViewHolder<DetectionObjectEntity>(binding.root)
+    class PackageCheckViewHolder(val binding: PackageCheckItemBinding) :
+        BaseRecyclerViewHolder<DetectionObjectEntity>(binding.root)
 
     companion object {
         @JvmStatic
@@ -329,8 +411,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                 return
             }
 
-            val allInstalledPackages = PackageUtils.getInstalledPackages(HaloApp.getInstance().application, 0)
-            if (isAllPackageInstalled(allInstalledPackages, packageDialogEntity)) {
+            if (isAllPackageInstalled(packageDialogEntity)) {
                 callBack.onConfirm()
                 return
             }
@@ -365,11 +446,12 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
             }
         }
 
-        private fun checkDetectionsInstalled(allInstalledPackages: List<PackageInfo>, packages: ArrayList<String>): Boolean {
+        private fun checkDetectionsInstalled(
+            packages: ArrayList<String>
+        ): Boolean {
             var isPackagesInstalled = false
             packages.forEach { packageName ->
-                val isInstalled = allInstalledPackages.find { it.packageName == packageName } != null
-                if (isInstalled) {
+                if (PackageUtils.isInstalledFromAllPackage(HaloApp.getInstance(), packageName)) {
                     isPackagesInstalled = true
                     return@forEach
                 }
@@ -378,15 +460,15 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
         }
 
 
-        fun isAllPackageInstalled(allInstalledPackages: List<PackageInfo>, packageDialogEntity: PackageDialogEntity): Boolean {
-            var isAllInstalled = true
+        fun isAllPackageInstalled(
+            packageDialogEntity: PackageDialogEntity
+        ): Boolean {
             packageDialogEntity.detectionObjects.forEach loop@{ obj ->
-                if (!checkDetectionsInstalled(allInstalledPackages, obj.packages)) {
-                    isAllInstalled = false
-                    return isAllInstalled
+                if (!checkDetectionsInstalled(obj.packages)) {
+                    return false
                 }
             }
-            return isAllInstalled
+            return true
         }
     }
 }