build: suppress warning

# Conflicts:
#	app/src/main/res/values/strings.xml

.gitmodules

@@ -2,9 +2,9 @@
 	path = libraries/LGLibrary
 	url = git@git.shanqu.cc: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
+[submodule "module_common/src/debug/assets/assistant-android-mock"]
+	path = module_common/src/debug/assets/assistant-android-mock
+	url = git@git.shanqu.cc:halo/android/assistant-android-mock.git

app/build.gradle

@@ -77,8 +77,6 @@ android {
         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}\""
     }
 
     // gradle 2.2以上默认同时启用v1和v2（优先用于Android N）
@@ -157,6 +155,8 @@ 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}\""
         }
 
         // publish release host
@@ -166,6 +166,8 @@ 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}\""
         }
 
         tea {
@@ -174,15 +176,12 @@ 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}\""
 
             manifestPlaceholders.put("APPLOG_SCHEME", "rangersapplog.byAx6uYt".toLowerCase())
         }
     }
-
-    lintOptions {
-        // For flutter release build, see https://github.com/flutter/flutter/issues/58247
-        checkReleaseBuilds false
-    }
 }
 
 repositories {
@@ -269,9 +268,13 @@ dependencies {
     implementation(project(':module_login')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
-    implementation(project(':module_energy')) {
+    implementation(project(':module_setting_compose')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
+    // 默认不接入光能模块，提高编译速度
+//    debugImplementation(project(':module_energy')) {
+//        exclude group: 'androidx.swiperefreshlayout'
+//    }
 }
 File propFile = file('sign.properties')
 if (propFile.exists()) {
@@ -362,36 +365,14 @@ andResGuard {
             "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.drawable.ic_selector_selected",
+            "R.drawable.ic_selector_default",
             "R.id.download_speed",
             "R.id.download_percentage",
             "R.id.comment",
@@ -413,7 +394,6 @@ andResGuard {
             "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",

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,20 @@
 -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.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.* {*;}
 
-###
--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);
-}
-
-### easypermission
--keepclassmembers class * {
-    @pub.devrel.easypermissions.AfterPermissionGranted <methods>;
-}
 
 # 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.**
@@ -127,32 +47,12 @@
     public <init>(android.content.Context, android.util.AttributeSet, int);
 }
 
--keep class com.alibaba.sdk.android.*{*;}
--keep class com.ut.*{*;}
--keep class com.ta.*{*;}
-
 ### 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.* { *; }
-
 ### EasyFloat
 -keep class com.lzf.easyfloat.* {*;}
 
-### 避免 WebChromeClient 被混淆
--keepclassmembers class * extends android.webkit.WebChromeClient{
-    public void openFileChooser(...);
-}
-
-### emoji4j
--keep class emoji4j.* {*;}
-
 ### dokit
 -keep class com.didichuxing.** {*;}
 
@@ -166,12 +66,3 @@
     public static void directToSuggestion(...);
 }
 
-# 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/main/AndroidManifest.xml

@@ -28,7 +28,7 @@
     <uses-permission android:name="com.android.permission.GET_INSTALLED_APPS" />
 
     <!-- 前台服务权限-->
-    <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"
@@ -51,7 +51,27 @@
         com.google.android.exoplayer2,
         tv.danmaku.ijk.media.exo2,
         pl.droidsonroids.gif,
-        com.lzf.easyfloat" />
+        com.lzf.easyfloat,
+        com.airbnb.lottie.compose,
+        androidx.compose.ui.platform,
+        androidx.compose.material.icons,
+        androidx.activity.compose,
+        androidx.compose.ui.tooling,
+        androidx.compose.ui.tooling.data,
+        androidx.compose.material.ripple,
+        androidx.compose.foundation,
+        androidx.compose.animation,
+        androidx.compose.foundation.layout,
+        androidx.compose.ui.text,
+        androidx.compose.ui.graphics,
+        androidx.compose.ui.unit,
+        androidx.compose.ui.util,
+        androidx.compose.ui.geometry,
+        androidx.compose.runtime.saveable,
+        androidx.compose.animation.core,
+        androidx.constraintlayout.compose,
+        androidx.compose.ui.test.manifest,
+        androidx.compose.ui.tooling.preview"/>
 
     <!-- 去掉 SDK 一些流氓权限 -->
     <uses-permission
@@ -148,10 +168,6 @@
             android:name="com.gh.gamecenter.NewsDetailActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.SettingActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="com.gh.gamecenter.ConcernActivity"
             android:screenOrientation="portrait" />
@@ -175,7 +191,7 @@
 
         <activity
             android:name="com.gh.gamecenter.WebActivity"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
 
         <activity
             android:name="com.gh.gamecenter.SingletonWebActivity"
@@ -219,18 +235,6 @@
             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"
@@ -291,10 +295,6 @@
             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" />
@@ -348,10 +348,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" />
@@ -380,10 +376,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" />
@@ -517,10 +509,6 @@
             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" />
@@ -574,10 +562,6 @@
             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" />
@@ -602,14 +586,6 @@
             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" />
@@ -719,11 +695,13 @@
             android:name="com.gh.gamecenter.toolbox.ToolBoxBlockActivity"
             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" />
 
@@ -747,6 +725,10 @@
             android:name=".BbsCertificationActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name=".discovery.DiscoveryActivity"
+            android:screenOrientation="portrait" />
+
         <!--        <activity-->
         <!--            android:name="${applicationId}.douyinapi.DouYinEntryActivity"-->
         <!--            android:launchMode="singleTask"-->
@@ -767,19 +749,19 @@
             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="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"

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/java/com/gh/base/BaseRichEditorActivity.kt

@@ -113,7 +113,8 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                 }
             }
             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)
@@ -124,7 +125,9 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
                 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)
@@ -741,7 +744,7 @@ 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 onDarkModeChanged() {
         super.onDarkModeChanged()

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

@@ -57,7 +57,7 @@ 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)
     }
 
     override fun onMenuItemClick(item: MenuItem?): Boolean {
@@ -104,7 +104,9 @@ abstract class DownloadToolbarActivity : ToolBarActivity() {
     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

@@ -9,7 +9,6 @@ import com.gh.download.DownloadManager
 import com.gh.gamecenter.MainActivity
 import com.gh.gamecenter.SplashScreenActivity
 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
@@ -32,7 +31,7 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
     override fun onActivityResumed(activity: Activity) {
         // 判断是否需要显示或隐藏返回小浮窗
         if (FloatingBackViewManager.getType().isNotEmpty()) {
-            if (activity is EnergyCenterActivity
+            if ((activity::class.java.name == "EnergyCenterActivity")
                 && FloatingBackViewManager.getType() == FloatingBackViewManager.TYPE_TASK
             ) {
                 FloatingBackViewManager.disableBackView()

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

@@ -10,7 +10,9 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.FragmentActivity
 import com.gh.common.util.*
 import com.gh.common.util.LogUtils
-import com.gh.gamecenter.*
+import com.gh.gamecenter.BuildConfig
+import com.gh.gamecenter.ImageViewerActivity
+import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.common.callback.BiCallback
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.entity.NotificationUgc
@@ -25,20 +27,19 @@ 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.energy.EnergyBridge
 import com.gh.gamecenter.entity.MtaEvent
 import com.gh.gamecenter.help.QaFeedbackDialogFragment
 import com.gh.gamecenter.login.entity.Badge
 import com.gh.gamecenter.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.compose.activity.ComposeAboutActivity
+import com.gh.gamecenter.setting.compose.activity.ComposeBindPhoneActivity
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
 import org.json.JSONObject
@@ -130,7 +131,7 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
 
                     WechatBindHelper.bindWechat(wechatLoginInfoMap, object : BiCallback<Boolean, Boolean> {
                         override fun onFirst(first: Boolean) {
-                            EnergyTaskHelper.postEnergyTask("bind_wechat")
+                            EnergyBridge.postEnergyTask("bind_wechat")
                             handler.complete(true)
                         }
 
@@ -222,7 +223,7 @@ 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")
+            EnergyBridge.postEnergyTask("finish_etiquette_exam")
             SPUtils.setString(Constants.SP_REGULATION_TEST_PASS_STATUS, "pass")
         }
     }
@@ -269,7 +270,7 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
 
     @JavascriptInterface
     fun bindPhone(msg: Any) {
-        val intent = BindPhoneActivity.getNormalIntent(context, false)
+        val intent = ComposeBindPhoneActivity.getNormalIntent(context, false)
         context.startActivity(intent)
     }
 
@@ -293,22 +294,22 @@ 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")
+        EnergyBridge.postEnergyTask("wear_badge")
     }
 
     @JavascriptInterface
     fun startEnergyCenter(msg: Any) {
-        context.startActivity(EnergyCenterActivity.getIntent(context))
+        context.startActivity(EnergyBridge.getEnergyCenterIntent(context))
     }
 
     @JavascriptInterface
     fun startEnergyHouse(msg: Any) {
-        context.startActivity(EnergyHouseActivity.getIntent(context))
+        context.startActivity(EnergyBridge.getEnergyHouseIntent(context, null))
     }
 
     @JavascriptInterface
@@ -373,7 +374,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)
@@ -400,7 +402,7 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
 
     @JavascriptInterface
     fun openInNewFullWebview(url: Any) {
-        runOnUiThread { DirectUtils.directToFullScreenWebPage(context, url.toString(), true) }
+        runOnUiThread { DirectUtils.directToFullScreenWebPage(context, url.toString(), true, entrance) }
     }
 
     @JavascriptInterface
@@ -414,7 +416,7 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
 
     @JavascriptInterface
     fun checkUpdateGhzs(msg: Any) {
-        context.startActivity(AboutActivity.getIntent(context, true))
+        context.startActivity(ComposeAboutActivity.getIntent(context, true))
     }
 
     @JavascriptInterface

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

@@ -74,7 +74,13 @@ object DefaultUrlHandler {
                     entrance = entrance
                 )
 
-                "column" -> SubjectActivity.startSubjectActivity(context, id, uri.getQueryParameter("name"), false, entrance)
+                "column" -> SubjectActivity.startSubjectActivity(
+                    context,
+                    id,
+                    uri.getQueryParameter("name"),
+                    false,
+                    entrance
+                )
 
                 "libao" -> context.startActivity(LibaoDetailActivity.getIntentById(context, id, entrance))
 
@@ -93,7 +99,7 @@ object DefaultUrlHandler {
                 }
 
                 "inurl" -> {
-                    DirectUtils.directToWebView(context, uri.getQueryParameter("url") ?: "")
+                    DirectUtils.directToWebView(context, uri.getQueryParameter("url") ?: "", entrance)
                 }
 
                 "outurl" -> {
@@ -167,13 +173,26 @@ 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, "")
+                    DirectUtils.directToHomeActivity(
+                        context,
+                        id,
+                        subtype,
+                        if (position.isNullOrEmpty()) -1 else position.toInt(),
+                        entrance,
+                        ""
+                    )
                 }
                 EntranceConsts.HOST_VIDEO_MORE -> {
                     val referer = uri.getQueryParameter("referer") ?: ""
@@ -358,11 +377,16 @@ object DefaultUrlHandler {
                             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(
@@ -402,7 +426,14 @@ object DefaultUrlHandler {
                     if (!TextUtils.isEmpty(qaId)) {
                         directToQa(context, qaTitle, qaId)
                     } else {
-                        directToFeedback(context, content, null, isQaFeedback, qaContentId, EntranceConsts.ENTRANCE_BROWSER)
+                        directToFeedback(
+                            context,
+                            content,
+                            null,
+                            isQaFeedback,
+                            qaContentId,
+                            EntranceConsts.ENTRANCE_BROWSER
+                        )
                     }
                 }
 
@@ -424,7 +455,15 @@ 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()
+                            )
+                        )
                     }
                 }
 
@@ -440,7 +479,15 @@ 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.getIntent(
+                            context,
+                            activityId,
+                            activityName,
+                            gameId,
+                            entrance
+                        )
+                    )
                 }
 
                 else -> {
@@ -523,7 +570,13 @@ 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]
@@ -540,7 +593,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)) {

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

@@ -37,13 +37,15 @@ object FixedRateJobHelper {
                 // 时间校对，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() }
+                        .subscribeOn(Schedulers.io())
+                        .subscribe(object : Response<TimeEntity>() {
+                            override fun onResponse(response: TimeEntity?) {
+                                val serverTime = response?.time
+                                serverTime?.let {
+                                    timeDeltaBetweenServerAndClient = it * 1000 - System.currentTimeMillis()
                                 }
-                            })
+                            }
+                        })
                 }
 
                 // 提交曝光数据

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

@@ -5,7 +5,7 @@ import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.entity.GameEntity
 
-class BrowserInstallHandler:ChainHandler() {
+class BrowserInstallHandler : ChainHandler() {
 
     override fun handleRequest(context: Context, gameEntity: GameEntity) {
         BrowserInstallHelper.showBrowserInstallHintDialog(context, gameEntity.isVGame(), object : EmptyCallback {

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

@@ -4,7 +4,7 @@ import android.content.Context
 import com.gh.common.util.DialogUtils
 import com.gh.gamecenter.entity.GameEntity
 
-class OverseaDownloadHandler:ChainHandler() {
+class OverseaDownloadHandler : ChainHandler() {
 
     override fun handleRequest(context: Context, gameEntity: GameEntity) {
         DialogUtils.showOverseaDownloadDialog(context, gameEntity) {

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

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

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

@@ -22,6 +22,7 @@ import com.gh.gamecenter.entity.NewSettingsEntity;
 import com.gh.gamecenter.entity.NewsEntity;
 import com.gh.gamecenter.entity.SettingsEntity;
 import com.gh.gamecenter.common.eventbus.EBReuse;
+import com.gh.gamecenter.entity.SimulatorEntity;
 import com.gh.gamecenter.entity.VSetting;
 import com.gh.gamecenter.common.retrofit.BiResponse;
 import com.gh.gamecenter.common.retrofit.Response;
@@ -65,6 +66,7 @@ public class Config {
     private static NewSettingsEntity mNewSettingsEntity;
 
     private static NewSettingsEntity.NightMode mNightModeSetting;
+    private static SimulatorEntity mNewSimulatorEntity;
     private static VSetting mVSetting;
     private static GameGuidePopupEntity mGameGuidePopupEntity;
     private static SharedPreferences mDefaultSharedPreferences;
@@ -220,6 +222,18 @@ public class Config {
         return mSettingsEntity;
     }
 
+    //新模拟器
+    @Nullable
+    public static SimulatorEntity getNewSimulatorEntitySetting() {
+        if (mNewSimulatorEntity != null) {
+            return mNewSimulatorEntity;
+        } else if (mNewSettingsEntity != null && mNewSettingsEntity.getSimulator() != null) {
+            return mNewSettingsEntity.getSimulator();
+        } else {
+            return null;
+        }
+    }
+
     @Nullable
     public static NewSettingsEntity.NightMode getNightModeSetting() {
         if (mNightModeSetting != null) {
@@ -295,26 +309,6 @@ public class Config {
         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();
@@ -370,7 +364,7 @@ public class Config {
                     });
         }
 
-        if (mNightModeSetting == null) {
+        if (mNightModeSetting == null && mNewSimulatorEntity == null) {
             RetrofitManager.getInstance()
                     .getNewApi().getNewSettings(PackageUtils.getGhVersionName(), channel)
                     .subscribeOn(Schedulers.io())
@@ -379,6 +373,7 @@ public class Config {
                         @Override
                         public void onSuccess(NewSettingsEntity data) {
                             mNightModeSetting = data.getNightMode();
+                            mNewSimulatorEntity = data.getSimulator();
                             if (HaloApp.getInstance().isNewForThisVersion && mNightModeSetting != null && mNightModeSetting.getInstall()) {
                                 DarkModeUtils.INSTANCE.updateFollowSystemDarkModeToSp(true);
                                 DarkModeUtils.INSTANCE.updateAppDarkModeStatusToSp(true);
@@ -386,6 +381,7 @@ public class Config {
                             }
 
                             if (mNewSettingsEntity != null) {
+                                mNewSettingsEntity.setSimulator(mNewSimulatorEntity);
                                 mNewSettingsEntity.setNightMode(mNightModeSetting);
                                 SPUtils.setString(Constants.SP_NEW_SETTINGS, GsonUtils.toJson(data));
                             }

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

@@ -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+"))
+                )
             }
         }
     }

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

@@ -45,7 +45,13 @@ class ApplyModeratorDialogFragment : BaseDialogFragment() {
         val startText = "版主考核群："
         val text = "$startText$mGroupNumber\n感谢你对论坛建设的支持\n请加入版主考核群并联系群主进行版主资格考核"
         binding.desTv.text = SpanBuilder(text)
-            .click(requireContext(), startText.length, startText.length + mGroupNumber.length, R.color.theme_font,true) {
+            .click(
+                requireContext(),
+                startText.length,
+                startText.length + mGroupNumber.length,
+                R.color.theme_font,
+                true
+            ) {
                 DirectUtils.directToQqGroup(
                     requireContext(),
                     mGroupKey

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

@@ -32,8 +32,13 @@ 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) {
+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
@@ -119,8 +124,10 @@ class CertificationDialog(context: Context, private val authDialogEntity: AuthDi
     private fun gotoLoginPage() {
         val currentActivity = AppManager.getInstance().currentActivity() ?: return
 
-        CheckLoginUtils.checkLogin(currentActivity as AppCompatActivity,
-                null, true, "实名认证弹窗") {
+        CheckLoginUtils.checkLogin(
+            currentActivity as AppCompatActivity,
+            null, true, "实名认证弹窗"
+        ) {
             if (UserManager.getInstance().isAuth) {
                 listener.onConfirm()
                 dismiss()

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

@@ -18,19 +18,19 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import com.facebook.drawee.view.SimpleDraweeView
-import com.gh.gamecenter.common.constant.Constants
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
-import com.gh.gamecenter.core.utils.GsonUtils
-import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.utils.ImageUtils
 import com.gh.gamecenter.common.utils.countDownTimer
 import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.common.utils.ImageUtils
+import com.gh.gamecenter.core.utils.GsonUtils
+import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.databinding.DialogDeviceRemindBinding
 import com.gh.gamecenter.entity.DeviceDialogEntity
 import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.setting.compose.activity.ComposeGameDownloadSettingActivity
 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 +40,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, R.style.GhAlertDialog) {
     private val mBinding: DialogDeviceRemindBinding by lazy { DialogDeviceRemindBinding.inflate(layoutInflater) }
     private var currentPage = 0
     private var mSlideLooperInterval = 3000L
@@ -52,7 +53,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(ComposeGameDownloadSettingActivity.AUTO_INSTALL_SP_KEY, true)
                 if (autoInstall) {
                     dismiss()
                 }
@@ -78,7 +79,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 {
@@ -189,7 +191,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

@@ -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?) {
@@ -52,7 +52,10 @@ 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()
                     }
@@ -61,7 +64,7 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {
                     siteTv.text = site.text
                     siteTv.paintFlags = siteTv.paintFlags or Paint.UNDERLINE_TEXT_FLAG
                     siteTv.setOnClickListener {
-    //                    MtaHelper.onEvent("游戏下载状态按钮", getKey(), site.text)
+                        //                    MtaHelper.onEvent("游戏下载状态按钮", getKey(), site.text)
                         DirectUtils.directToWebView(requireContext(), site.url, "(关闭下载弹窗)")
                         dismissAllowingStateLoss()
                     }

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

@@ -90,7 +90,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)
@@ -114,7 +118,8 @@ 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
@@ -128,7 +133,10 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
                     this.isXapk = isXapk
                     this.url = downloadEntity.url
                 }
-                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

@@ -21,7 +21,7 @@ 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 +41,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 = "《儿童隐私保护声明》"
@@ -86,13 +88,14 @@ class NewPrivacyPolicyDialogFragment: BaseDialogFragment() {
                     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 +143,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()

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

@@ -70,9 +70,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)
                         )
                     }
                 }
@@ -114,7 +119,15 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                     R.color.theme_font,
                     true
                 ) {
-                    LogUtils.uploadPackageCheck("pkg_check_pop_click", "点击链接", gameEntity, link.text, link.title, "", "")
+                    LogUtils.uploadPackageCheck(
+                        "pkg_check_pop_click",
+                        "点击链接",
+                        gameEntity,
+                        link.text,
+                        link.title,
+                        "",
+                        ""
+                    )
                     DirectUtils.directToLinkPage(requireContext(), link, "包名检测弹窗", "")
                 }.build()
                 spanBuilder.append(linkSpan)
@@ -171,7 +184,15 @@ 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,
+                        "",
+                        ""
+                    )
                     DirectUtils.directToLinkPage(requireContext(), packageLink, "包名检测弹窗", "")
                 }
             }
@@ -324,7 +345,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
@@ -371,7 +393,10 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
             }
         }
 
-        private fun checkDetectionsInstalled(allInstalledPackages: List<PackageInfo>, packages: ArrayList<String>): Boolean {
+        private fun checkDetectionsInstalled(
+            allInstalledPackages: List<PackageInfo>,
+            packages: ArrayList<String>
+        ): Boolean {
             var isPackagesInstalled = false
             packages.forEach { packageName ->
                 val isInstalled = allInstalledPackages.find { it.packageName == packageName } != null
@@ -384,7 +409,10 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
         }
 
 
-        fun isAllPackageInstalled(allInstalledPackages: List<PackageInfo>, packageDialogEntity: PackageDialogEntity): Boolean {
+        fun isAllPackageInstalled(
+            allInstalledPackages: List<PackageInfo>,
+            packageDialogEntity: PackageDialogEntity
+        ): Boolean {
             var isAllInstalled = true
             packageDialogEntity.detectionObjects.forEach loop@{ obj ->
                 if (!checkDetectionsInstalled(allInstalledPackages, obj.packages)) {

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

@@ -65,7 +65,8 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
             }
 
             override fun onClick(widget: View) {
-                val intent = WebActivity.getIntent(requireContext(), context!!.getString(R.string.privacy_policy_url), true)
+                val intent =
+                    WebActivity.getIntent(requireContext(), context!!.getString(R.string.privacy_policy_url), true)
                 context?.startActivity(intent)
             }
         }, skipText.length - 6, skipText.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
@@ -106,7 +107,8 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
             }
 
             override fun onClick(widget: View) {
-                val intent = WebActivity.getIntent(requireContext(), context!!.getString(R.string.privacy_policy_url), true)
+                val intent =
+                    WebActivity.getIntent(requireContext(), context!!.getString(R.string.privacy_policy_url), true)
                 context?.startActivity(intent)
             }
         }, skipText.length - 9, skipText.length - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
@@ -164,10 +166,13 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
         const val KEY_DATA = "data"
 
         @JvmStatic
-        fun show(activity: FragmentActivity,
-                 privacyPolicyEntity: DialogEntity.PrivacyPolicyEntity? = null,
-                 callBack: ((isSuccess: Boolean) -> Unit)?) {
-            var privacyDialogFragment = activity.supportFragmentManager.findFragmentByTag(PrivacyPolicyDialogFragment::class.java.name) as? PrivacyPolicyDialogFragment
+        fun show(
+            activity: FragmentActivity,
+            privacyPolicyEntity: DialogEntity.PrivacyPolicyEntity? = null,
+            callBack: ((isSuccess: Boolean) -> Unit)?
+        ) {
+            var privacyDialogFragment =
+                activity.supportFragmentManager.findFragmentByTag(PrivacyPolicyDialogFragment::class.java.name) as? PrivacyPolicyDialogFragment
             if (privacyDialogFragment != null) {
                 privacyDialogFragment.mCallBack = callBack
                 val transaction: FragmentTransaction = activity.supportFragmentManager.beginTransaction()

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

@@ -70,7 +70,8 @@ data class ExposureEvent(
             welcomeDialogId = gameEntity?.welcomeDialogId
                 ?: eTrace?.firstOrNull()?.payload?.welcomeDialogId,
             welcomeDialogLinkTitle = gameEntity?.welcomeDialogTitle
-                ?: eTrace?.firstOrNull()?.payload?.welcomeDialogLinkTitle
+                ?: eTrace?.firstOrNull()?.payload?.welcomeDialogLinkTitle,
+            isAdData = gameEntity?.adIconActive ?: eTrace?.firstOrNull()?.payload?.isAdData ?: false
         )
         this.id = UUID.randomUUID().toString()
         this.timeInMillisecond = System.currentTimeMillis()

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

@@ -11,26 +11,32 @@ import io.reactivex.functions.Consumer
  */
 class ExposureListener(var fragment: Fragment, var exposable: IExposable) : RecyclerView.OnScrollListener() {
 
-    val throttleBus: ExposureThrottleBus by lazy { ExposureThrottleBus(Consumer { commitExposure(it) }, Consumer(Throwable::printStackTrace)) }
+    val throttleBus: ExposureThrottleBus by lazy {
+        ExposureThrottleBus(
+            Consumer { commitExposure(it) },
+            Consumer(Throwable::printStackTrace)
+        )
+    }
     var layoutManager: LinearLayoutManager? = null
     var visibleState: ExposureThrottleBus.VisibleState? = null
 
     init {
         fragment.fragmentManager?.registerFragmentLifecycleCallbacks(
-                object : FragmentManager.FragmentLifecycleCallbacks() {
-                    override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
-                        if (fragment == f) {
-                            visibleState?.let { commitExposure(it) }
-                            throttleBus.clear()
-                        }
+            object : FragmentManager.FragmentLifecycleCallbacks() {
+                override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
+                    if (fragment == f) {
+                        visibleState?.let { commitExposure(it) }
+                        throttleBus.clear()
                     }
+                }
 
-                    override fun onFragmentViewDestroyed(fm: FragmentManager, f: Fragment) {
-                        if (fragment == f) {
-                            fragment.fragmentManager?.unregisterFragmentLifecycleCallbacks(this)
-                        }
+                override fun onFragmentViewDestroyed(fm: FragmentManager, f: Fragment) {
+                    if (fragment == f) {
+                        fragment.fragmentManager?.unregisterFragmentLifecycleCallbacks(this)
                     }
-                }, false)
+                }
+            }, false
+        )
     }
 
     /**
@@ -43,7 +49,8 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
         if (layoutManager == null) layoutManager = recyclerView.layoutManager as LinearLayoutManager
 
         layoutManager?.run {
-            visibleState = ExposureThrottleBus.VisibleState(findFirstVisibleItemPosition(), findLastVisibleItemPosition())
+            visibleState =
+                ExposureThrottleBus.VisibleState(findFirstVisibleItemPosition(), findLastVisibleItemPosition())
             throttleBus.postVisibleState(visibleState!!)
         }
     }

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

@@ -6,4 +6,4 @@ import kotlinx.parcelize.Parcelize
 
 @Keep
 @Parcelize
-data class ExposureSource(var k: String, var v: String = ""): Parcelable
+data class ExposureSource(var k: String, var v: String = "") : Parcelable

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

@@ -23,10 +23,10 @@ class ExposureThrottleBus(var onSuccess: Consumer<VisibleState>, var onError: Co
          *  throttleWithTimeout() to pass a visibleState event with a delay and drop current event if another event arrives before the timeout.
          */
         val disposable = mPublishSubject
-                .distinctUntilChanged()
-                .throttleWithTimeout(THRESHOLD_TIME, TimeUnit.MILLISECONDS)
-                .subscribeOn(Schedulers.io())
-                .subscribe(onSuccess, onError)
+            .distinctUntilChanged()
+            .throttleWithTimeout(THRESHOLD_TIME, TimeUnit.MILLISECONDS)
+            .subscribeOn(Schedulers.io())
+            .subscribe(onSuccess, onError)
         mCompositeDisposable.add(disposable)
     }
 

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

@@ -100,7 +100,10 @@ object ExposureUtils {
 
     private fun getInstallDownloadType(apkEntity: ApkEntity, gameId: String): DownloadType {
         return when {
-            PackageUtils.isSignedByGh(HaloApp.getInstance().application, apkEntity.packageName) -> getUpdateDownloadType(apkEntity, gameId)
+            PackageUtils.isSignedByGh(
+                HaloApp.getInstance().application,
+                apkEntity.packageName
+            ) -> getUpdateDownloadType(apkEntity, gameId)
             !TextUtils.isEmpty(apkEntity.ghVersion) -> DownloadType.PLUGIN_DOWNLOAD
             else -> DownloadType.UPDATE
         }

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

@@ -36,6 +36,7 @@ data class RegionSetting(
         @SerializedName("button_text")
         var buttonText: String,// 按钮文案
     )
+
     data class GameSpecialDownloadInfo(
         @SerializedName("game_id")
         var gameId: String = "",

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

@@ -33,7 +33,8 @@ object RegionSettingHelper {
         return mFilterGameIdSet?.contains(gameId) ?: false
     }
 
-    fun shouldThisGameShowSpecialDownload(gameId: String) = mGameSpecialDownloadInfoList?.any { it.gameId == gameId } ?: false
+    fun shouldThisGameShowSpecialDownload(gameId: String) =
+        mGameSpecialDownloadInfoList?.any { it.gameId == gameId } ?: false
 
     @JvmStatic
     fun getGameSpecialDownloadInfo(gameId: String) = mGameSpecialDownloadInfoList?.find { it.gameId == gameId }

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

@@ -16,24 +16,30 @@ import com.gh.gamecenter.room.converter.*
 import com.gh.gamecenter.room.dao.*
 import com.halo.assistant.HaloApp
 
-@Database(entities = [AnswerEntity::class, ArticleEntity::class, NewsEntity::class, HistoryGameEntity::class, MyVideoEntity::class, GamesCollectionEntity::class], version = 11, exportSchema = false)
-@TypeConverters(CountConverter::class,
-        CommunityConverter::class,
-        TimeConverter::class,
-        AnswerUserConverter::class,
-        ThumbnailConverter::class,
-        TagStyleListConverter::class,
-        StringArrayListConverter::class,
-        ListStringConverter::class,
-        CommunityVideoConverter::class,
-        UserConverter::class,
-        ImageInfoConverter::class,
-        VideoInfoConverter::class,
-        QuestionsConverter::class,
-        MeConverter::class,
-        SimpleGameListConverter::class,
-        TagInfoListConverter::class,
-        ActivityLabelListConverter::class)
+@Database(
+    entities = [AnswerEntity::class, ArticleEntity::class, NewsEntity::class, HistoryGameEntity::class, MyVideoEntity::class, GamesCollectionEntity::class],
+    version = 11,
+    exportSchema = false
+)
+@TypeConverters(
+    CountConverter::class,
+    CommunityConverter::class,
+    TimeConverter::class,
+    AnswerUserConverter::class,
+    ThumbnailConverter::class,
+    TagStyleListConverter::class,
+    StringArrayListConverter::class,
+    ListStringConverter::class,
+    CommunityVideoConverter::class,
+    UserConverter::class,
+    ImageInfoConverter::class,
+    VideoInfoConverter::class,
+    QuestionsConverter::class,
+    MeConverter::class,
+    SimpleGameListConverter::class,
+    TagInfoListConverter::class,
+    ActivityLabelListConverter::class
+)
 
 abstract class HistoryDatabase : RoomDatabase() {
 
@@ -109,7 +115,8 @@ abstract class HistoryDatabase : RoomDatabase() {
 
         val MIGRATION_9_10: Migration = object : Migration(9, 10) {
             override fun migrate(database: SupportSQLiteDatabase) {
-                database.execSQL("CREATE TABLE GamesCollectionEntity (id TEXT NOT NULL PRIMARY KEY, tags TEXT, games TEXT, title TEXT NOT NULL, intro TEXT NOT NULL, cover TEXT NOT NULL, display TEXT NOT NULL, stamp TEXT NOT NULL, count TEXT, user TEXT, me TEXT, orderTag INTEGER NOT NULL)"
+                database.execSQL(
+                    "CREATE TABLE GamesCollectionEntity (id TEXT NOT NULL PRIMARY KEY, tags TEXT, games TEXT, title TEXT NOT NULL, intro TEXT NOT NULL, cover TEXT NOT NULL, display TEXT NOT NULL, stamp TEXT NOT NULL, count TEXT, user TEXT, me TEXT, orderTag INTEGER NOT NULL)"
                 )
             }
         }
@@ -121,17 +128,21 @@ abstract class HistoryDatabase : RoomDatabase() {
         }
 
         val instance by lazy {
-            Room.databaseBuilder(HaloApp.getInstance().application, HistoryDatabase::class.java, "USER_TRACK_HISTORY_DATABASE")
-                    .addMigrations(MIGRATION_2_3)
-                    .addMigrations(MIGRATION_3_4)
-                    .addMigrations(MIGRATION_4_5)
-                    .addMigrations(MIGRATION_5_6)
-                    .addMigrations(MIGRATION_6_7)
-                    .addMigrations(MIGRATION_7_8)
-                    .addMigrations(MIGRATION_8_9)
-                    .addMigrations(MIGRATION_9_10)
-                    .addMigrations(MIGRATION_10_11)
-                    .build()
+            Room.databaseBuilder(
+                HaloApp.getInstance().application,
+                HistoryDatabase::class.java,
+                "USER_TRACK_HISTORY_DATABASE"
+            )
+                .addMigrations(MIGRATION_2_3)
+                .addMigrations(MIGRATION_3_4)
+                .addMigrations(MIGRATION_4_5)
+                .addMigrations(MIGRATION_5_6)
+                .addMigrations(MIGRATION_6_7)
+                .addMigrations(MIGRATION_7_8)
+                .addMigrations(MIGRATION_8_9)
+                .addMigrations(MIGRATION_9_10)
+                .addMigrations(MIGRATION_10_11)
+                .build()
         }
     }
 

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

@@ -26,7 +26,11 @@ object HistoryHelper {
 
     fun insertGamesCollectionEntity(gamesCollectionDetailEntity: GamesCollectionDetailEntity) {
         val gamesCollectionEntity = convertGamesCollectionDetailToGamesCollection(gamesCollectionDetailEntity)
-        runOnIoThread { tryCatchInRelease { HistoryDatabase.instance.gamesCollectionDao().addGamesCollection(gamesCollectionEntity) } }
+        runOnIoThread {
+            tryCatchInRelease {
+                HistoryDatabase.instance.gamesCollectionDao().addGamesCollection(gamesCollectionEntity)
+            }
+        }
     }
 
     @JvmStatic
@@ -78,27 +82,47 @@ object HistoryHelper {
 
     @JvmStatic
     fun deleteNewsEntity(newsId: String) {
-        runOnIoThread { tryCatchInRelease { HistoryDatabase.instance.newsDao().deleteNews(NewsEntity().apply { id = newsId }) } }
+        runOnIoThread {
+            tryCatchInRelease {
+                HistoryDatabase.instance.newsDao().deleteNews(NewsEntity().apply { id = newsId })
+            }
+        }
     }
 
     @JvmStatic
     fun deleteGameEntity(gameId: String) {
-        runOnIoThread { tryCatchInRelease { HistoryDatabase.instance.gameDao().deleteGame(HistoryGameEntity(id = gameId)) } }
+        runOnIoThread {
+            tryCatchInRelease {
+                HistoryDatabase.instance.gameDao().deleteGame(HistoryGameEntity(id = gameId))
+            }
+        }
     }
 
     @JvmStatic
     fun deleteArticleEntity(articleId: String) {
-        runOnIoThread { tryCatchInRelease { HistoryDatabase.instance.articleDao().deleteArticle(ArticleEntity(id = articleId)) } }
+        runOnIoThread {
+            tryCatchInRelease {
+                HistoryDatabase.instance.articleDao().deleteArticle(ArticleEntity(id = articleId))
+            }
+        }
     }
 
     @JvmStatic
     fun deleteAnswerEntity(answerId: String) {
-        runOnIoThread { tryCatchInRelease { HistoryDatabase.instance.answerDao().deleteAnswer(AnswerEntity().apply { primaryKey = answerId }) } }
+        runOnIoThread {
+            tryCatchInRelease {
+                HistoryDatabase.instance.answerDao().deleteAnswer(AnswerEntity().apply { primaryKey = answerId })
+            }
+        }
     }
 
     @JvmStatic
     fun deleteVideoEntity(videoId: String) {
-        runOnIoThread { tryCatchInRelease { HistoryDatabase.instance.videoHistoryDao().deleteVideo(MyVideoEntity().apply { id = videoId }) } }
+        runOnIoThread {
+            tryCatchInRelease {
+                HistoryDatabase.instance.videoHistoryDao().deleteVideo(MyVideoEntity().apply { id = videoId })
+            }
+        }
     }
 
     @JvmStatic
@@ -108,7 +132,12 @@ object HistoryHelper {
 
     @JvmStatic
     fun deleteGamesCollectionEntity(gameCollectionId: String) {
-        runOnIoThread { tryCatchInRelease { HistoryDatabase.instance.gamesCollectionDao().deleteGamesCollection(GamesCollectionEntity(id = gameCollectionId)) } }
+        runOnIoThread {
+            tryCatchInRelease {
+                HistoryDatabase.instance.gamesCollectionDao()
+                    .deleteGamesCollection(GamesCollectionEntity(id = gameCollectionId))
+            }
+        }
     }
 
 
@@ -121,7 +150,9 @@ object HistoryHelper {
         val articleEntity = ArticleEntity()
 
         articleEntity.id = articleDetailEntity.id
-        articleEntity.brief = articleDetailEntity.content.removeVideoContent().removeInsertedContent().clearHtmlFormatCompletely().replace(" +".toRegex(), " ")
+        articleEntity.brief =
+            articleDetailEntity.content.removeVideoContent().removeInsertedContent().clearHtmlFormatCompletely()
+                .replace(" +".toRegex(), " ")
         articleEntity.count = articleDetailEntity.count
         articleDetailEntity.community.id = articleDetailEntity.communityId
         articleEntity.community = articleDetailEntity.community
@@ -146,7 +177,9 @@ object HistoryHelper {
         answerEntity.vote = answerDetailEntity.vote
         answerEntity.user = answerDetailEntity.user
         answerEntity.orderTag = System.currentTimeMillis()
-        answerEntity.brief = answerDetailEntity.content.removeVideoContent().removeInsertedContent().clearHtmlFormatCompletely().replace(" +".toRegex(), " ")
+        answerEntity.brief =
+            answerDetailEntity.content.removeVideoContent().removeInsertedContent().clearHtmlFormatCompletely()
+                .replace(" +".toRegex(), " ")
         answerEntity.time = answerDetailEntity.time
         answerEntity.images = answerDetailEntity.images
         answerEntity.imagesInfo = answerDetailEntity.imagesInfo
@@ -176,7 +209,8 @@ object HistoryHelper {
                 id = id ?: "",
                 name = name ?: "",
                 icon = icon ?: "",
-                badge = badge)
+                badge = badge
+            )
         }
         gamesCollectionEntity.me = gamesCollectionDetailEntity.me
 

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

@@ -33,6 +33,10 @@ class AppProviderImpl : IAppProvider {
         return HaloApp.getInstance().channel ?: ""
     }
 
+    override fun setChannel(channel: String) {
+        HaloApp.getInstance().channel = channel
+    }
+
     override fun getUserAgent(): String {
         return HaloApp.getInstance().userAgent ?: ""
     }

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

@@ -0,0 +1,23 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.download.server.BrowserInstallHelper
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IBrowserInstallHelperProvider
+
+@Route(path = RouteConsts.provider.browserInstallHelper, name = "BrowserInstallHelper暴露服务")
+class BrowserInstallHelperProviderImpl : IBrowserInstallHelperProvider {
+    override fun isUseBrowserToInstallEnabled(): Boolean = BrowserInstallHelper.isUseBrowserToInstallEnabled()
+
+    override fun shouldUseBrowserToInstall(): Boolean = BrowserInstallHelper.shouldUseBrowserToInstall()
+
+    override fun logSwitchInstallSettingEvent() {
+        BrowserInstallHelper.logOrdinaryBrowserEvent(BrowserInstallHelper.Type.SWITCH_INSTALL_SETTING)
+    }
+
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

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

@@ -72,6 +72,10 @@ class ConfigProviderImpl : IConfigProvider {
         return Config.WEIBO_APPKEY
     }
 
+    override fun getNightModeSetting(): Boolean {
+        return Config.getNightModeSetting()?.setting ?: false
+    }
+
     override fun init(context: Context?) {
         // Do nothing
     }

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

@@ -1,5 +1,6 @@
 package com.gh.common.provider
 
+import android.app.Dialog
 import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.gh.common.util.DialogUtils
@@ -15,13 +16,53 @@ class DialogUtilsProviderImpl : IDialogUtilsProvider {
             override fun onConfirm() {
                 confirm.invoke()
             }
-        }, object :CancelListener{
+        }, object : CancelListener {
             override fun onCancel() {
                 cancel.invoke()
             }
         })
     }
 
+    override fun showWaitDialog(context: Context, string: String): Dialog = DialogUtils.showWaitDialog(context, string)
+
+    override fun showForceDialog(
+        context: Context,
+        title: String,
+        message: CharSequence,
+        positive: String,
+        negative: String,
+        confirm: () -> Unit,
+        cancel: () -> Unit
+    ) {
+        DialogUtils.showForceDialog(context, title, message, positive, negative,
+            { confirm.invoke() }, object :CancelListener{
+            override fun onCancel() {
+                cancel.invoke()
+            }
+        })
+    }
+
+    override fun showUsageStatsDialog(context: Context, confirm: () -> Unit, cancel: () -> Unit) {
+        DialogUtils.showUsageStatsDialog(context,
+            { confirm.invoke() }, object :CancelListener{
+            override fun onCancel() {
+                cancel.invoke()
+            }
+        })
+    }
+
+    override fun showNoticeDialog(
+        context: Context,
+        title: String,
+        content: String,
+        confirm: () -> Unit
+    ) {
+        DialogUtils.showNoticeDialog(context, title, content
+        ) { confirm.invoke() }
+    }
+
+    override fun showBindPhoneDialog(context: Context, confirm: () -> Unit): Dialog = DialogUtils.showBindPhoneDialog(context) { confirm.invoke() }
+
     override fun init(context: Context?) {
         // Do nothing
     }

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

@@ -49,6 +49,14 @@ class DirectProviderImpl : IDirectProvider {
         DirectUtils.directToLotteryParadisePage(context)
     }
 
+    override fun directDouyin(context: Context, userId: String) {
+        DirectUtils.directDouyin(context, userId)
+    }
+
+    override fun directToSuggestionFromDiagnosis(context: Context, diagnosis: String) {
+        DirectUtils.directToSuggestion(context, diagnosis = diagnosis)
+    }
+
     override fun init(context: Context?) {
         // Do nothing
     }

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

@@ -8,7 +8,7 @@ import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IEntranceUtilsProvider
 
 @Route(path = RouteConsts.provider.entranceUtils, name = "EntranceUtils暴露服务")
-class EntranceUtilsProviderImpl: IEntranceUtilsProvider {
+class EntranceUtilsProviderImpl : IEntranceUtilsProvider {
     override fun jumpActivity(context: Context, bundle: Bundle) {
         EntranceUtils.jumpActivity(context, bundle)
     }

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

@@ -0,0 +1,18 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.history.HistoryHelper
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IHistoryHelperProvider
+
+@Route(path = RouteConsts.provider.historyHelper, name = "HistoryHelper暴露服务")
+class HistoryHelperProviderImpl : IHistoryHelperProvider {
+    override fun emptyDatabase() {
+        HistoryHelper.emptyDatabase()
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.gh.common.provider
+
+import android.content.Context
+import android.content.Intent
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.gamecenter.MainActivity
+import com.gh.gamecenter.WebActivity
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IMainProvider
+
+@Route(path = RouteConsts.provider.mainActivity, name = "MainActivity暴露服务")
+class MainProviderImpl : IMainProvider {
+    override fun skipToMainActivity(context: Context, position: Int) {
+        MainActivity.skipToMainActivity(context, position)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

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

@@ -0,0 +1,19 @@
+package com.gh.common.provider
+
+import android.content.Context
+import android.content.Intent
+import android.os.Parcelable
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.gamecenter.ShellActivity
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IShellProvider
+
+@Route(path = RouteConsts.provider.shellActivity, name = "ShellActivity暴露服务")
+class ShellProviderImpl : IShellProvider {
+    override fun getSwitchInstallMethodIntent(context: Context, extraParcelable: Parcelable?): Intent =
+        ShellActivity.getIntent(context, ShellActivity.Type.SWITCH_INSTALL_METHOD, extraParcelable)
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

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

@@ -0,0 +1,19 @@
+package com.gh.common.provider
+
+import android.content.Context
+import android.os.Handler
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IUpdateManagerProvider
+import com.gh.gamecenter.manager.UpdateManager
+
+@Route(path = RouteConsts.provider.updateManager, name = "UpdateManager暴露服务")
+class UpdateManagerProviderImpl: IUpdateManagerProvider {
+    override fun checkUpdate(context: Context, isAutoCheck: Boolean, handler: Handler) {
+        UpdateManager.getInstance(context).checkUpdate(isAutoCheck, handler)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

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

@@ -0,0 +1,23 @@
+package com.gh.common.provider
+
+import android.content.Context
+import android.os.Build
+import androidx.annotation.RequiresApi
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.UsageStatsHelper
+import com.gh.common.util.WechatBindHelper
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IUsageStatsHelperProvider
+
+@Route(path = RouteConsts.provider.usageStatsHelper, name = "UsageStatsHelper暴露服务")
+class UsageStatsHelperProviderImpl : IUsageStatsHelperProvider {
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP_MR1)
+    override fun checkForPermission(): Boolean = UsageStatsHelper.checkForPermission()
+    override fun skipToUsageStats(context: Context, requestCode: Int) {
+        UsageStatsHelper.skipToUsageStats(context, requestCode)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

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

@@ -17,6 +17,14 @@ class WebProviderImpl : IWebProvider {
         return WebActivity.getWebIntent(context, title, url)
     }
 
+    override fun getBindWechatIntent(context: Context): Intent {
+        return WebActivity.getBindWechatIntent(context)
+    }
+
+    override fun getSecurityCertificationIntent(context: Context): Intent {
+        return WebActivity.getSecurityCertificationIntent(context)
+    }
+
     override fun init(context: Context?) {
         // Do nothing
     }

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

@@ -8,8 +8,10 @@ import com.gh.gamecenter.core.provider.IWechatBindHelperProvider
 
 @Route(path = RouteConsts.provider.wechatHelper, name = "WechatHelper暴露服务")
 class WechatHelperProviderImpl : IWechatBindHelperProvider {
-    override fun getWechatConfig() {
-        WechatBindHelper.getWechatConfig()
+    override fun getWechatConfig(callback: (() -> Unit)?) {
+        WechatBindHelper.getWechatConfig {
+            callback?.invoke()
+        }
     }
 
     override fun init(context: Context?) {

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

@@ -16,10 +16,10 @@ object RemenkapaiRepository {
     fun getRemenkapai(size: Int): Observable<List<GameEntity>> {
         return if (remenkapaiList.isEmpty()) {
             RetrofitManager.getInstance().api.remenkapai
-                    .map(RegionSettingHelper.filterGame)
-                    .map { gameList -> filterEntityWithoutApk(gameList) }
-                    .map { pickRandomSizeEntity(size) }
-                    .map(ApkActiveUtils.filterMapperList)
+                .map(RegionSettingHelper.filterGame)
+                .map { gameList -> filterEntityWithoutApk(gameList) }
+                .map { pickRandomSizeEntity(size) }
+                .map(ApkActiveUtils.filterMapperList)
         } else {
             Observable.create { emitter -> emitter.onNext(pickRandomSizeEntity(size)) }
         }

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

@@ -40,16 +40,19 @@ object ReservationRepository {
     fun refreshReservations() {
         if (CheckLoginUtils.isLogin()) {
             RetrofitManager.getInstance().api
-                    .getAllTheGameReservations(UserManager.getInstance().userId, Utils.getTime(HaloApp.getInstance().application))
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(object : BiResponse<List<String>>() {
+                .getAllTheGameReservations(
+                    UserManager.getInstance().userId,
+                    Utils.getTime(HaloApp.getInstance().application)
+                )
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(object : BiResponse<List<String>>() {
 
-                        override fun onSuccess(data: List<String>) {
-                            mReservationSet = HashSet(data)
-                        }
+                    override fun onSuccess(data: List<String>) {
+                        mReservationSet = HashSet(data)
+                    }
 
-                    })
+                })
         }
     }
 

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

@@ -0,0 +1,165 @@
+package com.gh.common.simulator
+
+import android.annotation.SuppressLint
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.graphics.Bitmap
+import android.view.Gravity
+import androidx.core.content.FileProvider
+import com.g00fy2.versioncompare.Version
+import com.gh.common.constant.Config
+import com.gh.common.util.DownloadItemUtils
+import com.gh.common.util.LogUtils
+import com.gh.common.util.NewFlatLogUtils
+import com.gh.common.util.PackageUtils
+import com.gh.gamecenter.BuildConfig
+import com.gh.gamecenter.R
+import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.core.utils.EmptyCallback
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.core.utils.TimeUtils
+import com.gh.gamecenter.core.utils.ToastUtils
+import com.gh.gamecenter.entity.GameEntity
+import com.halo.assistant.HaloApp
+import com.lightgame.download.DownloadEntity
+import com.lightgame.utils.AppManager
+import io.reactivex.Single
+import java.io.ByteArrayOutputStream
+import java.io.File
+
+object NewSimulatorGameManager {
+
+    private const val KEY_GAME_ICON = "GAME_ICON"
+    private const val KEY_GAME_ID = "GAME_ID"
+    private const val KEY_GAME_NAME = "GAME_NAME"
+    private const val KEY_GAME_PACKAGE_NAME = "GAME_PACKAGE_NAME"
+    private const val KEY_GAME_PACKAGE_PATH = "GAME_PACKAGE_PATH"
+    private const val KEY_GAME_PACKAGE_LAST_MODIFICATION = "GAME_PACKAGE_LAST_MODIFICATION"
+    private const val KEY_GAME_PACKAGE_EXTENSION = "GAME_PACKAGE_EXTENSION"
+    private const val KEY_GAME_PACKAGE_SDCARD_PATH = "GAME_PACKAGE_SDCARD_PATH" // boolean 是否sdcard文件路径
+    private const val KEY_GAME_EMU_SYSTEM = "GAME_EMU_SYSTEM"
+    private const val KEY_EMU_ID = "EMU_ID"
+    private const val KEY_EMU_NAME = "EMU_NAME"
+    private const val KEY_USE_DEBUG_API = "USE_DEBUG_API"
+    private const val KEY_META = "META"
+
+//    private const val GH_RETRO_EMU_APP_PACKAGE_NAME = "com.gh.retroemu"
+    private const val GH_RETRO_EMU_APP_LAUNCHER_ACTIVITY_NAME = "com.gh.retroemu.ui.SplashActivity"
+
+
+    private const val NEW_SIMULATOR_SHOW_ALERT_TAG = "-news-simulator-show-alert"
+
+    /**
+     * 后台模拟器管理上传新版本模拟器（显示状态），且检测用户有安装旧版本模拟器  每日弹出一次更新弹框
+     */
+    @JvmStatic
+    fun shouldShowUpdateNewSimulatorAlert(context: Context): Boolean {
+        val isUploadNewsSimulator = Config.getNewSimulatorEntitySetting()?.active ?: false
+        val isInstallOld = SimulatorGameManager.isOldSimulatorInstalled(context)
+        val showAlertTag = SPUtils.getString(NEW_SIMULATOR_SHOW_ALERT_TAG, "")
+        val todayIsShow = showAlertTag == TimeUtils.getToday()//当天是否弹出过一次
+        val isInstalledNewSimulator = SimulatorGameManager.isNewSimulatorInstalled(context)
+        return (isUploadNewsSimulator && !todayIsShow && isInstallOld && !isInstalledNewSimulator)
+    }
+
+    /**
+    * 弹出更新弹框
+    */
+    @JvmStatic
+    fun showUpdateNewsSimulator(context: Context, callback: EmptyCallback? = null){
+        NewFlatLogUtils.logSimulatorUpdateAlertShow()
+        DialogHelper.showDialog(
+            context,
+            "更新提示",
+            "光环助手近期对模拟器进行升级，优化游戏体验！\n但更新后可能会导致原先的游戏存档数据无法使用（可在模拟器管理中安装新版本模拟器）",
+            "更新",
+            "取消",
+            confirmClickCallback = {
+                NewFlatLogUtils.logSimulatorUpdateAlertClick("更新")
+                val simulator = Config.getNewSimulatorEntitySetting()
+                if (simulator != null) {
+                    SimulatorDownloadManager.getInstance().showDownloadingDialog(context, simulator)
+                }
+            },
+            cancelClickCallback = {
+                callback?.onCallback()
+                NewFlatLogUtils.logSimulatorUpdateAlertClick("取消")
+            },
+            uiModificationCallback = { binding ->
+                binding.contentTv.gravity = Gravity.START
+                binding.contentTv.setTextColor(R.color.text_subtitle.toColor(context))
+            },
+            extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
+        )
+        SPUtils.setString(NEW_SIMULATOR_SHOW_ALERT_TAG, TimeUtils.getToday())
+    }
+
+
+    /**
+     * 通过模拟器启动游戏
+     */
+    @SuppressLint("CheckResult")
+    @JvmStatic
+    fun launchGameViaSimulator(downloadEntity: DownloadEntity, gameEntity: GameEntity) {
+        val newSimulator = Config.getNewSimulatorEntitySetting() ?: return
+        val gameIcon = gameEntity.icon ?: gameEntity.rawIcon ?: ""
+        Single.just(ImageUtils.getCachedUrl(gameIcon))
+            .flatMap {
+                SimulatorGameManager.getBitmapFormCache(it)
+            }.map {
+                BitmapUtils.compressBitmap(it, 100)
+            }.map {
+                val baos = ByteArrayOutputStream()
+                it.compress(Bitmap.CompressFormat.WEBP, 90, baos)
+                baos.toByteArray()
+            }
+            .compose(singleToMain())
+            .subscribe({
+                val gamePackageFileUri = FileProvider.getUriForFile(
+                    HaloApp.getInstance(),
+                    BuildConfig.APPLICATION_ID,
+                    File(downloadEntity.path)
+                )
+                HaloApp.getInstance().grantUriPermission(
+                    SimulatorGameManager.NEW_SIMULATOR_PACKAGE_NAME,
+                    gamePackageFileUri,
+                    Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION or
+                            Intent.FLAG_GRANT_READ_URI_PERMISSION or
+                            Intent.FLAG_GRANT_WRITE_URI_PERMISSION // 冗余，以备不时之需
+                )
+
+                val intent = Intent()
+                intent.setClassName(SimulatorGameManager.NEW_SIMULATOR_PACKAGE_NAME, GH_RETRO_EMU_APP_LAUNCHER_ACTIVITY_NAME)
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                intent.data = gamePackageFileUri
+                gameEntity.getApk().safelyGetInRelease(0)?.let { apk ->
+                    intent.putExtra(KEY_GAME_PACKAGE_NAME, apk.packageName)
+                    intent.putExtra(KEY_GAME_PACKAGE_EXTENSION, apk.format)
+                }
+                intent.putExtra(KEY_GAME_NAME, downloadEntity.name)
+                intent.putExtra(KEY_GAME_ICON, it)
+                intent.putExtra(KEY_GAME_PACKAGE_PATH, downloadEntity.path) // 游戏包文件路径，冗余参数)
+                intent.putExtra(KEY_GAME_PACKAGE_SDCARD_PATH, true)
+                intent.putExtra(KEY_GAME_PACKAGE_LAST_MODIFICATION, File(downloadEntity.path).lastModified()) // 游戏包文件修改时间
+                intent.putExtra(KEY_GAME_EMU_SYSTEM, gameEntity.simulatorType) // 模拟器类型
+                intent.putExtra(KEY_GAME_ID, gameEntity.id)
+                // TODO 补充光环模拟器的游戏 id
+                intent.putExtra(KEY_EMU_ID, newSimulator.apk?.id) // 光环模拟器.apk gameId
+                intent.putExtra(KEY_EMU_NAME, "光环模拟器") // 光环模拟器.apk name
+                intent.putExtra(KEY_USE_DEBUG_API, EnvHelper.isDevEnv) // // 游戏来源是否为dev后台 (是否来源于测试环境)
+                intent.putExtra(KEY_META, LogUtils.getMetaObject().toString())
+
+                try {
+                    AppManager.getInstance().recentActiveActivity?.startActivity(intent)
+                } catch (e: ActivityNotFoundException) {
+                    ToastUtils.showToast("模拟器安装错误")
+                }
+
+                SimulatorGameManager.recordPlaySimulatorGames(gameEntity.id)
+            }, {
+                ToastUtils.showToast("跳转失败")
+            })
+    }
+
+}

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

@@ -10,6 +10,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.g00fy2.versioncompare.Version
 import com.gh.common.util.LogUtils
+import com.gh.common.util.NewFlatLogUtils
 import com.gh.common.util.PackageInstaller
 import com.gh.common.util.PackageUtils
 import com.gh.download.DownloadManager
@@ -51,8 +52,12 @@ class SimulatorDownloadManager private constructor() {
                 val size = downloadEntity.progress.toFloat() / 1024 / 1024
                 val df = DecimalFormat("0.00")
                 appProgressSize!!.text = "${df.format(size.toDouble())}MB"
-                appProgressRemain!!.text = String.format("剩余%s", SpeedUtils.getRemainSecondTime(downloadEntity.size,
-                        downloadEntity.progress, downloadEntity.speed * 1024))
+                appProgressRemain!!.text = String.format(
+                    "剩余%s", SpeedUtils.getRemainSecondTime(
+                        downloadEntity.size,
+                        downloadEntity.progress, downloadEntity.speed * 1024
+                    )
+                )
                 app_pb_progress!!.progress = (downloadEntity.percent * 10).toInt()
 
                 val width = app_pb_progress!!.width
@@ -70,10 +75,21 @@ class SimulatorDownloadManager private constructor() {
                 appProgressPercent?.text = if (downloadEntity.percent != 100.0) "${downloadEntity.percent}%" else "100%"
                 when {
                     DownloadStatus.done == downloadEntity.status -> {
-                        val locationStr = if (simulatorLocation == SimulatorLocation.LAUNCH) "${simulatorLocation?.value}《${gameName}》" else simulatorLocation?.value
-                        val fileName = downloadEntity.path.substring(downloadEntity.path.lastIndexOf('/') + 1).removeSuffix(".apk")
+                        val locationStr =
+                            if (simulatorLocation == SimulatorLocation.LAUNCH) "${simulatorLocation?.value}《${gameName}》" else simulatorLocation?.value
+                        val fileName =
+                            downloadEntity.path.substring(downloadEntity.path.lastIndexOf('/') + 1).removeSuffix(".apk")
                         val startTime = downloadEntity.getMetaExtra(Constants.SIMULATOR_DOWNLOAD_START_TIME)
-                        LogUtils.uploadSimulatorDownload("simulator_download_complete", fileName, simulator?.id, downloadEntity.name, gameId, locationStr, downloadType, startTime)
+                        LogUtils.uploadSimulatorDownload(
+                            "simulator_download_complete",
+                            fileName,
+                            simulator?.id,
+                            downloadEntity.name,
+                            gameId,
+                            locationStr,
+                            downloadType,
+                            startTime
+                        )
                         DownloadManager.getInstance().cancel(downloadEntity.url, false, true, false)
                         val activity = mContextRef?.get() as? AppCompatActivity
                         if (activity?.isFinishing == false) {
@@ -113,10 +129,16 @@ class SimulatorDownloadManager private constructor() {
         showDownloadDialog(context, simulator, location, "", "", null)
     }
 
-    fun showDownloadDialog(context: Context?, simulator: SimulatorEntity?, location: SimulatorLocation, gameId: String = "", gameName: String = "", cancelCallback: (() -> Unit)? = null) {
+    fun showDownloadDialog(
+        context: Context?,
+        simulator: SimulatorEntity?,
+        location: SimulatorLocation,
+        gameId: String = "",
+        gameName: String = "",
+        cancelCallback: (() -> Unit)? = null
+    ) {
         if (context == null) return
 
-        mContextRef = WeakReference(context)
         this.simulatorLocation = location
         this.simulator = simulator
         this.gameId = gameId
@@ -130,18 +152,30 @@ class SimulatorDownloadManager private constructor() {
                     return
                 }
                 val isInstalled = PackageUtils.isInstalledFromAllPackage(context, simulator?.apk?.packageName)
-                val versionFromInstalledApp = PackageUtils.getVersionNameByPackageName(simulator?.apk?.packageName)
-                val shouldShowUpdate = Version(simulator?.apk?.version).isHigherThan(versionFromInstalledApp)
+//                val versionFromInstalledApp = PackageUtils.getVersionNameByPackageName(simulator?.apk?.packageName)
+                val shouldShowUpdate = PackageUtils.isInstalledApkMatchedMd5(simulator?.apk?.packageName, simulator?.apk?.md5)
+                val showAlertTag = SPUtils.getString(SimulatorGameManager.SIMULATOR_UPDATE_SHOW_ALERT_TAG, "") //当天是否弹过
+                val todayIsShow = showAlertTag == TimeUtils.getToday()
+                downloadType = if (shouldShowUpdate && isInstalled) "update" else "download"
+                if (downloadType == "update" && todayIsShow && location != SimulatorLocation.SIMULATOR_MANAGE){
+                    return
+                }
+                if (downloadType == "download" && isInstalled){
+                    return
+                }
                 val title = if (shouldShowUpdate && isInstalled) "更新模拟器" else "安装模拟器"
                 val message = if (shouldShowUpdate && isInstalled) "检测到模拟器存在更高版本，是否前往更新" else "模拟器游戏需要先下载安装对应的模拟器，才可以运行"
-                val positiveText = if (shouldShowUpdate && isInstalled) "更新（${simulator?.apk?.size}）" else "下载（${simulator?.apk?.size}）"
+                val positiveText =
+                    if (shouldShowUpdate && isInstalled) "更新（${simulator?.apk?.size}）" else "下载（${simulator?.apk?.size}）"
                 val negativeText = if (shouldShowUpdate && isInstalled) "下次再说" else "取消"
-                downloadType = if (shouldShowUpdate && isInstalled) "update" else "download"
-
-                val trackableEntity = TrackableEntity("模拟器下载",
+                val trackableEntity = TrackableEntity(
+                    "模拟器下载",
                     key = if (shouldShowUpdate && isInstalled) "更新弹窗" else "下载弹窗",
                     logShowEvent = true
                 )
+                if (shouldShowUpdate && isInstalled) {
+                    NewFlatLogUtils.logSimulatorUpdateAlertShow()
+                }
                 DialogHelper.showDialog(
                     context,
                     title,
@@ -152,11 +186,13 @@ class SimulatorDownloadManager private constructor() {
                     cancelClickCallback = {
                         if (shouldShowUpdate && isInstalled) {
                             cancelCallback?.invoke()
+                            NewFlatLogUtils.logSimulatorUpdateAlertClick("取消")
                             MtaHelper.onEvent(trackableEntity.event, trackableEntity.key, "点击下次再说")
                         }
                     },
                     confirmClickCallback = {
                         showDownloadingDialog(context, simulator)
+                        NewFlatLogUtils.logSimulatorUpdateAlertClick("更新")
                         MtaHelper.onEvent(
                             trackableEntity.event,
                             trackableEntity.key,
@@ -166,11 +202,15 @@ class SimulatorDownloadManager private constructor() {
                     mtaEvent = trackableEntity.event, mtaKey = trackableEntity.key,
                     extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
                 )
+                if (downloadType == "update" && location != SimulatorLocation.SIMULATOR_MANAGE) {
+                    SPUtils.setString(SimulatorGameManager.SIMULATOR_UPDATE_SHOW_ALERT_TAG, TimeUtils.getToday())
+                }
             }
         })
     }
 
-    private fun showDownloadingDialog(context: Context, simulator: SimulatorEntity?) {
+    fun showDownloadingDialog(context: Context, simulator: SimulatorEntity?) {
+        mContextRef = WeakReference(context)
         val msg = FileUtils.isCanDownload(context, simulator?.apk?.size)
         if (!msg.isNullOrEmpty()) {
             Utils.toast(context, msg)
@@ -230,7 +270,8 @@ class SimulatorDownloadManager private constructor() {
             uiModificationCallback = { binding ->
                 binding.confirmTv.setTextColor(R.color.text_body.toColor(context))
             },
-            extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true))
+            extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
+        )
     }
 
     private fun download(simulator: SimulatorEntity?) {
@@ -267,13 +308,26 @@ class SimulatorDownloadManager private constructor() {
         downloadEntity.versionName = apkEntity.version
 
         downloadEntity.addMetaExtra(Constants.EXTRA_DOWNLOAD_TYPE, Constants.SIMULATOR_DOWNLOAD)
-        downloadEntity.addMetaExtra(Constants.SIMULATOR_DOWNLOAD_START_TIME, (System.currentTimeMillis() / 1000).toString())
+        downloadEntity.addMetaExtra(
+            Constants.SIMULATOR_DOWNLOAD_START_TIME,
+            (System.currentTimeMillis() / 1000).toString()
+        )
         downloadEntity.addMetaExtra(Constants.DOWNLOAD_ID, downloadId)
         uiExecutor.executeWithDelay(Runnable { DownloadManager.getInstance().add(downloadEntity) }, 200)
 
-        val locationStr = if (simulatorLocation == SimulatorLocation.LAUNCH) "${simulatorLocation?.value}《${gameName}》" else simulatorLocation?.value
+        val locationStr =
+            if (simulatorLocation == SimulatorLocation.LAUNCH) "${simulatorLocation?.value}《${gameName}》" else simulatorLocation?.value
         val fileName = downloadEntity.path.substring(downloadEntity.path.lastIndexOf('/') + 1).removeSuffix(".apk")
-        LogUtils.uploadSimulatorDownload("simulator_download", fileName, simulator.id, simulator.name, gameId, locationStr, downloadType, "")
+        LogUtils.uploadSimulatorDownload(
+            "simulator_download",
+            fileName,
+            simulator.id,
+            simulator.name,
+            gameId,
+            locationStr,
+            downloadType,
+            ""
+        )
 
         downloadDialog?.show()
     }

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

@@ -2,11 +2,12 @@ package com.gh.common.simulator
 
 import android.annotation.SuppressLint
 import android.content.ActivityNotFoundException
+import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.net.Uri
 import android.text.TextUtils
-import com.g00fy2.versioncompare.Version
+import com.gh.common.constant.Config
 import com.gh.common.util.ApkActiveUtils
 import com.gh.common.util.LogUtils
 import com.gh.common.util.PackageUtils
@@ -17,6 +18,8 @@ import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.retrofit.EmptyResponse
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.core.utils.TimeUtils
 import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.core.utils.UrlFilterUtils
 import com.gh.gamecenter.entity.GameEntity
@@ -36,13 +39,48 @@ import okhttp3.ResponseBody
 import org.json.JSONArray
 import java.io.ByteArrayOutputStream
 import java.io.File
+import java.util.*
 
 object SimulatorGameManager {
 
-    private val gamePath by lazy { FileUtils.getDownloadPath(HaloApp.getInstance().application, "emulator_game") }
+    private val mGamePath by lazy { FileUtils.getDownloadPath(HaloApp.getInstance().application, "emulator_game") }
+
+    const val SIMULATOR_UPDATE_SHOW_ALERT_TAG = "simulator-update-show-alert"
+
+    private val mSimulatorPackageNames by lazy {
+        listOf(
+            "com.gh.fbnemu",
+            "com.gh.mame4droid",
+            "com.gh.nesemu",
+            "com.gh.ppsspp",
+            "com.gh.gbaemu",
+            "com.gh.gbcemu",
+            "com.gh.snes9xplus"
+        )
+    }
+
+    const val NEW_SIMULATOR_PACKAGE_NAME = "com.gh.retroemu" //新版本模拟器包名
+
 
     @JvmStatic
-    fun getPathByType(type: String) = "${gamePath}/${type}"
+    //是否安装了新模拟器
+    fun isNewSimulatorInstalled(context: Context?): Boolean {
+        return PackageUtils.isInstalledFromAllPackage(context, NEW_SIMULATOR_PACKAGE_NAME)
+    }
+
+    @JvmStatic
+    //是否安装了旧模拟器
+    fun isOldSimulatorInstalled(context: Context?): Boolean {
+        for (packageName in mSimulatorPackageNames) {
+            if (PackageUtils.isInstalledFromAllPackage(context, packageName)) {
+                return true
+            }
+        }
+        return false
+    }
+
+    @JvmStatic
+    fun getPathByType(type: String) = "${mGamePath}/${type}"
 
     @JvmStatic
     fun deleteLocalGames(names: List<String>) {
@@ -90,14 +128,33 @@ object SimulatorGameManager {
 
     @JvmStatic
     fun launchSimulatorGame(downloadEntity: DownloadEntity, gameEntity: GameEntity) {
-        val versionFromInstalledApp = PackageUtils.getVersionNameByPackageName(gameEntity.simulator?.apk?.packageName)
-        val shouldShowUpdate = Version(gameEntity.simulator?.apk?.version).isHigherThan(versionFromInstalledApp)
+        val isInstalledNewSimulator = isNewSimulatorInstalled(HaloApp.getInstance().application)
+        var packageName = gameEntity.simulator?.apk?.packageName
+        var simulator = gameEntity.simulator
 
+        if (isInstalledNewSimulator) {
+            packageName = NEW_SIMULATOR_PACKAGE_NAME
+            if (Config.getNewSimulatorEntitySetting() == null) {
+                return
+            }
+            simulator = Config.getNewSimulatorEntitySetting()
+        }
+//        val version = simulator?.apk?.version
+//        val versionFromInstalledApp = PackageUtils.getVersionNameByPackageName(packageName)
+        val shouldShowUpdate = PackageUtils.isInstalledApkMatchedMd5(packageName, simulator?.apk?.md5)
         updateSimulatorConfigFile(gameId = gameEntity.id)
         if (shouldShowUpdate) {
-            SimulatorDownloadManager.getInstance().showDownloadDialog(AppManager.getInstance().recentActiveActivity, gameEntity.simulator,
+            val showAlertTag = SPUtils.getString(SIMULATOR_UPDATE_SHOW_ALERT_TAG, "")
+            val todayIsShow = showAlertTag == TimeUtils.getToday() //当天是否弹过
+            if (!todayIsShow) {
+                SimulatorDownloadManager.getInstance().showDownloadDialog(
+                    AppManager.getInstance().recentActiveActivity, simulator,
                     SimulatorDownloadManager.SimulatorLocation.LAUNCH, gameEntity.id, gameEntity.name
-                    ?: "") {
+                        ?: ""
+                ) {
+                    jumpToSimulator(downloadEntity, gameEntity)
+                }
+            } else {
                 jumpToSimulator(downloadEntity, gameEntity)
             }
         } else {
@@ -107,50 +164,55 @@ object SimulatorGameManager {
 
     @SuppressLint("CheckResult")
     private fun jumpToSimulator(downloadEntity: DownloadEntity, gameEntity: GameEntity) {
+        val isInstalledNewSimulator = isNewSimulatorInstalled(HaloApp.getInstance().application)
+        if (isInstalledNewSimulator){
+            NewSimulatorGameManager.launchGameViaSimulator(downloadEntity,gameEntity)
+            return
+        }
         val gameIcon = gameEntity.icon ?: gameEntity.rawIcon ?: ""
         Single.just(ImageUtils.getCachedUrl(gameIcon))
-                .flatMap {
-                    getBitmapFormCache(it)
-                }.map {
-                    BitmapUtils.compressBitmap(it, 100)
-                }.map {
-                    val baos = ByteArrayOutputStream()
-                    it.compress(Bitmap.CompressFormat.WEBP, 100, baos)
-                    baos.toByteArray()
+            .flatMap {
+                getBitmapFormCache(it)
+            }.map {
+                BitmapUtils.compressBitmap(it, 100)
+            }.map {
+                val baos = ByteArrayOutputStream()
+                it.compress(Bitmap.CompressFormat.WEBP, 100, baos)
+                baos.toByteArray()
+            }
+            .compose(singleToMain())
+            .subscribe({
+                val intent = Intent()
+                intent.data = Uri.fromFile(File(downloadEntity.path))
+                if (gameEntity.simulatorType == "FBA" || gameEntity.simulatorType == "FBN") {
+                    val apkEntity = gameEntity.getApk()[0]
+                    intent.putExtra("rom_name", apkEntity.packageName)
                 }
-                .compose(singleToMain())
-                .subscribe({
-                    val intent = Intent()
-                    intent.data = Uri.fromFile(File(downloadEntity.path))
-                    if (gameEntity.simulatorType == "FBA" || gameEntity.simulatorType == "FBN") {
-                        val apkEntity = gameEntity.getApk()[0]
-                        intent.putExtra("rom_name", apkEntity.packageName)
-                    }
-                    intent.putExtra("default_path", downloadEntity.path.substring(0, downloadEntity.path.lastIndexOf('/')))
-                    intent.putExtra("game_type", gameEntity.simulatorType)
-                    intent.putExtra("title", downloadEntity.name)
-                    intent.putExtra("icon", gameIcon)
-                    intent.putExtra("iconStream", it)
-                    intent.putExtra("meta", LogUtils.getMetaObject().toString())
-                    intent.putExtra("simulatorId", gameEntity.simulator?.id)
-                    intent.putExtra("simulatorName", gameEntity.simulator?.name)
-                    intent.putExtra("gameId", gameEntity.id)
+                intent.putExtra("default_path", downloadEntity.path.substring(0, downloadEntity.path.lastIndexOf('/')))
+                intent.putExtra("game_type", gameEntity.simulatorType)
+                intent.putExtra("title", downloadEntity.name)
+                intent.putExtra("icon", gameIcon)
+                intent.putExtra("iconStream", it)
+                intent.putExtra("meta", LogUtils.getMetaObject().toString())
+                intent.putExtra("simulatorId", gameEntity.simulator?.id)
+                intent.putExtra("simulatorName", gameEntity.simulator?.name)
+                intent.putExtra("gameId", gameEntity.id)
 
-                    val destActivity = "com.gh.emu.RequestPermissionActivity"
-                    intent.setClassName(gameEntity.simulator?.apk?.packageName ?: "", destActivity)
-                    try {
-                        AppManager.getInstance().recentActiveActivity?.startActivity(intent)
-                    } catch (e: ActivityNotFoundException) {
-                        ToastUtils.showToast("模拟器安装错误")
-                    }
+                val destActivity = "com.gh.emu.RequestPermissionActivity"
+                intent.setClassName(gameEntity.simulator?.apk?.packageName ?: "", destActivity)
+                try {
+                    AppManager.getInstance().recentActiveActivity?.startActivity(intent)
+                } catch (e: ActivityNotFoundException) {
+                    ToastUtils.showToast("模拟器安装错误")
+                }
 
-                    recordPlaySimulatorGames(gameEntity.id)
-                }, {
-                    ToastUtils.showToast("跳转失败")
-                })
+                recordPlaySimulatorGames(gameEntity.id)
+            }, {
+                ToastUtils.showToast("跳转失败")
+            })
     }
 
-    private fun getBitmapFormCache(url: String): Single<Bitmap> {
+    fun getBitmapFormCache(url: String): Single<Bitmap> {
         return Single.create {
             ImageUtils.getBitmap(url, object : BiCallback<Bitmap, Boolean> {
                 override fun onFirst(first: Bitmap) {
@@ -176,13 +238,13 @@ object SimulatorGameManager {
         requestMap["package"] = "-"
         val body = requestMap.createRequestBodyAny()
         RetrofitManager.getInstance().api
-                .downloadSimulatorGames(HaloApp.getInstance().gid, body)
-                .compose(singleToMain())
-                .subscribe(object : BiResponse<ResponseBody>() {
-                    override fun onSuccess(data: ResponseBody) {
-                        refreshSimulatorGame(gameId, type)
-                    }
-                })
+            .downloadSimulatorGames(HaloApp.getInstance().gid, body)
+            .compose(singleToMain())
+            .subscribe(object : BiResponse<ResponseBody>() {
+                override fun onSuccess(data: ResponseBody) {
+                    refreshSimulatorGame(gameId, type)
+                }
+            })
     }
 
     /**
@@ -205,28 +267,28 @@ object SimulatorGameManager {
         if (gameArray.length() == 0) return
 
         RetrofitManager.getInstance().api
-                .putDownloadSimulatorGames(HaloApp.getInstance().gid, gameArray.toRequestBody())
-                .compose(singleToMain())
-                .subscribe(EmptyResponse())
+            .putDownloadSimulatorGames(HaloApp.getInstance().gid, gameArray.toRequestBody())
+            .compose(singleToMain())
+            .subscribe(EmptyResponse())
     }
 
     @SuppressLint("CheckResult")
     private fun refreshSimulatorGame(gameId: String, type: String) {
         val simulatorGameDao = AppDatabase.getInstance().simulatorGameDao()
         RetrofitManager.getInstance().api
-                .getSimulatorGames(HaloApp.getInstance().gid, 1, getFilter(type))
-                .compose(singleToMain())
-                .subscribe(object : BiResponse<List<GameEntity>>() {
-                    override fun onSuccess(data: List<GameEntity>) {
-                        val simulatorGameRecordList = ArrayList<SimulatorGameRecordEntity>()
-                        data.forEach {
-                            val entity = it.convertSimulatorGameRecordEntity()
-                            entity.isRecentlyPlayed = it.id == gameId
-                            simulatorGameRecordList.add(entity)
-                        }
-                        simulatorGameDao.addSimulatorGameList(simulatorGameRecordList)
+            .getSimulatorGames(HaloApp.getInstance().gid, 1, getFilter(type))
+            .compose(singleToMain())
+            .subscribe(object : BiResponse<List<GameEntity>>() {
+                override fun onSuccess(data: List<GameEntity>) {
+                    val simulatorGameRecordList = ArrayList<SimulatorGameRecordEntity>()
+                    data.forEach {
+                        val entity = it.convertSimulatorGameRecordEntity()
+                        entity.isRecentlyPlayed = it.id == gameId
+                        simulatorGameRecordList.add(entity)
                     }
-                })
+                    simulatorGameDao.addSimulatorGameList(simulatorGameRecordList)
+                }
+            })
     }
 
     private fun getFilter(type: String): String {
@@ -244,9 +306,9 @@ object SimulatorGameManager {
             requestMap["package"] = packageName
             val body = requestMap.toRequestBody()
             RetrofitManager.getInstance().api
-                    .postPlayedGame(UserManager.getInstance().userId, body)
-                    .compose(singleToMain())
-                    .subscribe(EmptyResponse())
+                .postPlayedGame(UserManager.getInstance().userId, body)
+                .compose(singleToMain())
+                .subscribe(EmptyResponse())
         }
     }
 
@@ -261,10 +323,10 @@ object SimulatorGameManager {
         requestMap["package"] = "-"
         val body = requestMap.createRequestBodyAny()
         RetrofitManager.getInstance().api
-                .playedSimulatorGames(HaloApp.getInstance().gid, body)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(EmptyResponse())
+            .playedSimulatorGames(HaloApp.getInstance().gid, body)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(EmptyResponse())
     }
 
     /**
@@ -273,14 +335,14 @@ object SimulatorGameManager {
     @SuppressLint("CheckResult")
     fun deleteSimulatorGame(gameId: String, callback: () -> Unit) {
         RetrofitManager.getInstance().api
-                .deleteSimulatorGame(HaloApp.getInstance().gid, gameId)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(object : BiResponse<ResponseBody>() {
-                    override fun onSuccess(data: ResponseBody) {
-                        callback.invoke()
-                    }
-                })
+            .deleteSimulatorGame(HaloApp.getInstance().gid, gameId)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(object : BiResponse<ResponseBody>() {
+                override fun onSuccess(data: ResponseBody) {
+                    callback.invoke()
+                }
+            })
     }
 
     /**
@@ -292,14 +354,14 @@ object SimulatorGameManager {
         val requestMap = hashMapOf<String, Any>()
         requestMap["game_ids"] = gameIds
         RetrofitManager.getInstance().api
-                .deleteSimulatorGames(HaloApp.getInstance().gid, requestMap.toRequestBody())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(object : BiResponse<ResponseBody>() {
-                    override fun onSuccess(data: ResponseBody) {
-                        callback.invoke()
-                    }
-                })
+            .deleteSimulatorGames(HaloApp.getInstance().gid, requestMap.toRequestBody())
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(object : BiResponse<ResponseBody>() {
+                override fun onSuccess(data: ResponseBody) {
+                    callback.invoke()
+                }
+            })
     }
 
     /**
@@ -309,27 +371,29 @@ object SimulatorGameManager {
     @SuppressLint("CheckResult")
     fun deleteAllSimulatorGame() {
         RetrofitManager.getInstance().api
-                .deleteAllSimulatorGame(HaloApp.getInstance().gid)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(EmptyResponse())
+            .deleteAllSimulatorGame(HaloApp.getInstance().gid)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(EmptyResponse())
     }
 
     private fun updateSimulatorConfigFile(gameId: String) {
         RetrofitManager.getInstance()
-                .api
-                .getGameDigest(gameId)
-                .map(ApkActiveUtils.filterMapper)
-                .subscribeOn(Schedulers.io())
-                .subscribe(object : Response<GameEntity>() {
-                    override fun onResponse(game: GameEntity?) {
-                        game?.let {
-                            if (!TextUtils.isEmpty(game.simulatorGameConfig)) {
-                                val configFilePath = getPathByType(game.simulatorType + "/cheat/" + game.getApk().firstOrNull()?.packageName + ".ini")
-                                FileUtils.downloadAndUpdateFile(game.simulatorGameConfig, configFilePath)
-                            }
+            .api
+            .getGameDigest(gameId)
+            .map(ApkActiveUtils.filterMapper)
+            .subscribeOn(Schedulers.io())
+            .subscribe(object : Response<GameEntity>() {
+                override fun onResponse(game: GameEntity?) {
+                    game?.let {
+                        if (!TextUtils.isEmpty(game.simulatorGameConfig)) {
+                            val configFilePath = getPathByType(
+                                game.simulatorType + "/cheat/" + game.getApk().firstOrNull()?.packageName + ".ini"
+                            )
+                            FileUtils.downloadAndUpdateFile(game.simulatorGameConfig, configFilePath)
                         }
                     }
-                })
+                }
+            })
     }
 }

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

@@ -22,16 +22,16 @@ object ActivationHelper {
     fun sendActivationInfo() {
         if (!mHasSentActivatedInfo) {
             RetrofitManager.getInstance()
-                    .api.postActivationInfo()
-                    .subscribeOn(Schedulers.io())
-                    .subscribe(object : Response<ResponseBody>() {
-                        override fun onResponse(response: ResponseBody?) {
-                            super.onResponse(response)
+                .api.postActivationInfo()
+                .subscribeOn(Schedulers.io())
+                .subscribe(object : Response<ResponseBody>() {
+                    override fun onResponse(response: ResponseBody?) {
+                        super.onResponse(response)
 
-                            mHasSentActivatedInfo = true
-                            SPUtils.setBoolean(HAS_SENT_ACTIVATED_INFO, true)
-                        }
-                    })
+                        mHasSentActivatedInfo = true
+                        SPUtils.setBoolean(HAS_SENT_ACTIVATED_INFO, true)
+                    }
+                })
         }
     }
 

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

@@ -0,0 +1,78 @@
+package com.gh.common.util
+
+import android.net.Uri
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.utils.EnvHelper
+import com.gh.gamecenter.common.utils.tryWithDefaultCatch
+import com.gh.gamecenter.core.GHThreadFactory
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+
+/**
+ * 活动相关数据统计辅助类
+ */
+object ActivityCountHelper {
+
+    private val ACTIVITY_URL_COMMON_PREF =
+        if (EnvHelper.isDevEnv) Constants.ACTIVITY_DETAIL_ADDRESS_DEV else Constants.ACTIVITY_DETAIL_ADDRESS
+    private var mStayTimeCount = 0
+    private var mIsStayTimeCountEnabled = false
+    private var mStayTimeArray = arrayOf(5, 10, 20, 40, 80, 160)
+    private const val MAX_STAY_TIME = 320
+    private val mThreadService: ExecutorService by lazy {
+        Executors.newSingleThreadExecutor(GHThreadFactory("STAY_TIME_THREAD"))
+    }
+
+    @JvmStatic
+    fun postActivityPageEnter(url: String?, entrance: String) {
+        if (url?.contains(ACTIVITY_URL_COMMON_PREF) == true) {
+            val uri = Uri.parse(url)
+            val activityId = uri.getQueryParameter("id") ?: return
+            NewFlatLogUtils.logActivityPageEnter(transformEntrance(entrance), activityId)
+        }
+    }
+
+    private fun transformEntrance(originalEntrance: String): String {
+        return when {
+            originalEntrance.contains("(启动广告)") -> "开屏页"
+            originalEntrance.contains(EntranceConsts.ENTRANCE_WELCOME) -> "首页弹窗"
+            originalEntrance.contains("首页tab") -> "首页二级导航"
+            originalEntrance.contains("论坛-活动") -> "活动tab"
+            originalEntrance.contains("新首页-轮播图") -> "首页banner"
+            originalEntrance.contains("资讯") -> "资讯广场"
+            else -> originalEntrance
+        }
+    }
+
+    fun startCountStayTime(url: String) {
+        if (url.contains(ACTIVITY_URL_COMMON_PREF)) {
+            val uri = Uri.parse(url)
+            val activityId = uri.getQueryParameter("id") ?: return
+            mIsStayTimeCountEnabled = true
+            mThreadService.execute {
+                while (mIsStayTimeCountEnabled) {
+                    tryWithDefaultCatch {
+                        mStayTimeCount++
+                        when {
+                            mStayTimeCount % MAX_STAY_TIME == 0 -> NewFlatLogUtils.logActivityPageView(
+                                MAX_STAY_TIME,
+                                activityId
+                            )
+                            mStayTimeArray.contains(mStayTimeCount) -> NewFlatLogUtils.logActivityPageView(
+                                mStayTimeCount,
+                                activityId
+                            )
+                        }
+                    }
+                    Thread.sleep(1000)
+                }
+            }
+        }
+    }
+
+    fun endCountStayTime() {
+        mIsStayTimeCountEnabled = false
+        mStayTimeCount = 0
+    }
+}

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

@@ -31,14 +31,14 @@ object AdHelper {
         }
 
         RetrofitManager.getInstance()
-                .api
-                .getSplashAd(HaloApp.getInstance().channel)
-                .subscribeOn(Schedulers.io())
-                .subscribe(object : BiResponse<StartupAdEntity>() {
-                    override fun onSuccess(data: StartupAdEntity) {
-                        startupAd.postValue(data)
-                    }
-                })
+            .api
+            .getSplashAd(HaloApp.getInstance().channel)
+            .subscribeOn(Schedulers.io())
+            .subscribe(object : BiResponse<StartupAdEntity>() {
+                override fun onSuccess(data: StartupAdEntity) {
+                    startupAd.postValue(data)
+                }
+            })
     }
 
     fun getAd(location: String): SettingsEntity.AD? {
@@ -54,7 +54,7 @@ object AdHelper {
         val adList = Config.getSettings()?.adList ?: return null
 
         var result: SettingsEntity.AD? = null
-        run outside@ {
+        run outside@{
             for (ad in adList) {
                 if (ad.location == location) {
                     result = ad

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

@@ -120,7 +120,10 @@ object BbsReportHelper {
                 override fun onFailure(exception: Exception) {
                     super.onFailure(exception)
                     if (exception is HttpException) {
-                        ErrorHelper.handleError(HaloApp.getInstance().application, exception.response().errorBody()?.string())
+                        ErrorHelper.handleError(
+                            HaloApp.getInstance().application,
+                            exception.response().errorBody()?.string()
+                        )
                     }
                 }
             })

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

@@ -114,18 +114,18 @@ object BbsStayTimeHelper {
     @SuppressLint("CheckResult")
     private fun postExploreFinish() {
         RetrofitManager.getInstance()
-                .api
-                .postExplorerFinish()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(object : BiResponse<ResponseBody>() {
-                    override fun onSuccess(data: ResponseBody) {
-                        if (!isPublishEnv()) {
-                            ToastUtils.toast("完成了论坛停留任务（仅测试环境有这个 toast 不要慌）")
-                        }
-                        disableStayTimeCount()
+            .api
+            .postExplorerFinish()
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(object : BiResponse<ResponseBody>() {
+                override fun onSuccess(data: ResponseBody) {
+                    if (!isPublishEnv()) {
+                        ToastUtils.toast("完成了论坛停留任务（仅测试环境有这个 toast 不要慌）")
                     }
-                })
+                    disableStayTimeCount()
+                }
+            })
     }
 
 }

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

@@ -18,7 +18,10 @@ object CertificationSwitchHelper {
             .compose(singleToMain())
             .subscribe(object : BiResponse<JsonObject>() {
                 override fun onSuccess(data: JsonObject) {
-                    SPUtils.setBoolean(Constants.SP_CERTIFICATION_SWITCH, data["authentication_display_switch"].asString == "on")
+                    SPUtils.setBoolean(
+                        Constants.SP_CERTIFICATION_SWITCH,
+                        data["authentication_display_switch"].asString == "on"
+                    )
                 }
             })
     }

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

@@ -25,64 +25,70 @@ object CollectionUtils {
     fun postCollection(context: Context, content: String, type: CollectionType, listener: OnCollectionListener) {
 
         val postCollection = when (type) {
-            CollectionType.article -> RetrofitManager.getInstance().getApi().postCollectionArticle(UserManager.getInstance().userId, content)
-            CollectionType.toolkit -> RetrofitManager.getInstance().getApi().postCollectionTools(UserManager.getInstance().userId, content)
-            CollectionType.answer -> RetrofitManager.getInstance().getApi().postCollectionAnswer(UserManager.getInstance().userId, content)
+            CollectionType.article -> RetrofitManager.getInstance().getApi()
+                .postCollectionArticle(UserManager.getInstance().userId, content)
+            CollectionType.toolkit -> RetrofitManager.getInstance().getApi()
+                .postCollectionTools(UserManager.getInstance().userId, content)
+            CollectionType.answer -> RetrofitManager.getInstance().getApi()
+                .postCollectionAnswer(UserManager.getInstance().userId, content)
             else -> return
         }
         postCollection
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(object : Response<ResponseBody>() {
-                    override fun onResponse(response: ResponseBody?) {
-                        super.onResponse(response)
-                        listener.onSuccess()
-                        EventBus.getDefault().post(EBCollectionChanged(content, true, type))
-                    }
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(object : Response<ResponseBody>() {
+                override fun onResponse(response: ResponseBody?) {
+                    super.onResponse(response)
+                    listener.onSuccess()
+                    EventBus.getDefault().post(EBCollectionChanged(content, true, type))
+                }
 
-                    override fun onFailure(e: HttpException?) {
-                        super.onFailure(e)
-                        if (e != null) {
-                            try {
-                                val string = e.response()?.errorBody()?.string()
-                                val errorBody = JSONObject(string)
-                                if (errorBody.getInt("code") == 403009) {
-                                    listener.onSuccess()
-                                    return
-                                }
-                            } catch (e: Exception) {
-                                e.printStackTrace()
+                override fun onFailure(e: HttpException?) {
+                    super.onFailure(e)
+                    if (e != null) {
+                        try {
+                            val string = e.response()?.errorBody()?.string()
+                            val errorBody = JSONObject(string)
+                            if (errorBody.getInt("code") == 403009) {
+                                listener.onSuccess()
+                                return
                             }
+                        } catch (e: Exception) {
+                            e.printStackTrace()
                         }
-                        listener.onError()
                     }
-                })
+                    listener.onError()
+                }
+            })
     }
 
     fun deleteCollection(context: Context, id: String, type: CollectionType, listener: OnCollectionListener) {
 
         val postCollection: Observable<ResponseBody>
         when (type) {
-            CollectionType.article -> postCollection = RetrofitManager.getInstance().getApi().deletaCollectionArticle(UserManager.getInstance().userId, id)
-            CollectionType.toolkit -> postCollection = RetrofitManager.getInstance().getApi().deleteCollectionTools(UserManager.getInstance().userId, id)
-            CollectionType.answer -> postCollection = RetrofitManager.getInstance().getApi().deleteCollectionAnswer(UserManager.getInstance().userId, id)
+            CollectionType.article -> postCollection =
+                RetrofitManager.getInstance().getApi().deletaCollectionArticle(UserManager.getInstance().userId, id)
+            CollectionType.toolkit -> postCollection =
+                RetrofitManager.getInstance().getApi().deleteCollectionTools(UserManager.getInstance().userId, id)
+            CollectionType.answer -> postCollection =
+                RetrofitManager.getInstance().getApi().deleteCollectionAnswer(UserManager.getInstance().userId, id)
             else -> return
         }
         postCollection
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(object : Response<ResponseBody>() {
-                    override fun onResponse(response: ResponseBody?) {
-                        super.onResponse(response)
-                        listener.onSuccess()
-                        EventBus.getDefault().post(EBCollectionChanged(id, false, type))
-                    }
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(object : Response<ResponseBody>() {
+                override fun onResponse(response: ResponseBody?) {
+                    super.onResponse(response)
+                    listener.onSuccess()
+                    EventBus.getDefault().post(EBCollectionChanged(id, false, type))
+                }
 
-                    override fun onFailure(e: HttpException?) {
-                        super.onFailure(e)
-                        listener.onError()
-                    }
-                })
+                override fun onFailure(e: HttpException?) {
+                    super.onFailure(e)
+                    listener.onError()
+                }
+            })
     }
 
 

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

@@ -162,7 +162,8 @@ object CommentHelper {
         }
         if (questionId != null &&
             commentEntity.me?.isModerator == true &&
-            (commentEntity.me?.moderatorPermissions?.highlightAnswer ?: Permissions.GUEST) > Permissions.GUEST && !commentEntity.choiceness
+            (commentEntity.me?.moderatorPermissions?.highlightAnswer
+                ?: Permissions.GUEST) > Permissions.GUEST && !commentEntity.choiceness
         ) {
             dialogOptions.add("加精选")
         }

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

@@ -24,127 +24,120 @@ object ConcernUtils {
     /**
      * autoConcern:是否自动关注'关联关注'
      */
-    fun postConcernGameId(context: Context, gameId: String, listener: onConcernListener?, autoConcern: Boolean = false) {
+    fun postConcernGameId(
+        context: Context,
+        gameId: String,
+        listener: onConcernListener?,
+        autoConcern: Boolean = false
+    ) {
         val mode = if (autoConcern) "auto" else "manual"
 
         val userId = UserManager.getInstance().userId
         if (TextUtils.isEmpty(userId)) return
 
         RetrofitManager.getInstance().api
-                .postConcern(UserManager.getInstance().userId, gameId, mode)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(object : Response<ResponseBody>() {
-                    override fun onResponse(response: ResponseBody?) {
-                        super.onResponse(response)
-                        listener?.onSuccess()
-                        EventBus.getDefault().post(EBConcernChanged(gameId, true))
-                        dispatchFollowChangeEventToFlutter(gameId, true)
-                    }
+            .postConcern(UserManager.getInstance().userId, gameId, mode)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(object : Response<ResponseBody>() {
+                override fun onResponse(response: ResponseBody?) {
+                    super.onResponse(response)
+                    listener?.onSuccess()
+                    EventBus.getDefault().post(EBConcernChanged(gameId, true))
+                }
 
-                    override fun onFailure(e: HttpException?) {
-                        super.onFailure(e)
-                        listener?.onError()
-                    }
-                })
+                override fun onFailure(e: HttpException?) {
+                    super.onFailure(e)
+                    listener?.onError()
+                }
+            })
     }
 
     fun deleteConcernData(context: Context, gameId: String, listener: onConcernListener?) {
         RetrofitManager.getInstance().api
-                .deleteConcern(UserManager.getInstance().userId, gameId)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(object : Response<ResponseBody>() {
-                    override fun onResponse(response: ResponseBody?) {
-                        super.onResponse(response)
-                        listener?.onSuccess()
-                        EventBus.getDefault().post(EBConcernChanged(gameId, false))
-                        dispatchFollowChangeEventToFlutter(gameId, false)
-                    }
+            .deleteConcern(UserManager.getInstance().userId, gameId)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(object : Response<ResponseBody>() {
+                override fun onResponse(response: ResponseBody?) {
+                    super.onResponse(response)
+                    listener?.onSuccess()
+                    EventBus.getDefault().post(EBConcernChanged(gameId, false))
+                }
 
-                    override fun onFailure(e: HttpException?) {
-                        super.onFailure(e)
-                        listener?.onError()
-                    }
-                })
+                override fun onFailure(e: HttpException?) {
+                    super.onFailure(e)
+                    listener?.onError()
+                }
+            })
     }
 
     fun updateConcernData(context: Context, data: JSONArray) {
-        val body = RequestBody.create(MediaType.parse("application/json"),
-                data.toString())
+        val body = RequestBody.create(
+            MediaType.parse("application/json"),
+            data.toString()
+        )
         RetrofitManager.getInstance().api
-                .putConcern(UserManager.getInstance().userId, body)
-                .subscribeOn(Schedulers.io())
-                .observeOn(Schedulers.io())
-                .subscribe(object : Response<ResponseBody>() {
-                    override fun onResponse(response: ResponseBody?) {
-                        EventBus.getDefault().post(EBConcernChanged())
-                    }
-                })
+            .putConcern(UserManager.getInstance().userId, body)
+            .subscribeOn(Schedulers.io())
+            .observeOn(Schedulers.io())
+            .subscribe(object : Response<ResponseBody>() {
+                override fun onResponse(response: ResponseBody?) {
+                    EventBus.getDefault().post(EBConcernChanged())
+                }
+            })
     }
 
     fun deleteConcernQuestions(context: Context, questionsId: String, listener: onConcernListener?) {
         RetrofitManager.getInstance().api
-                .deleteConcernQuestions(UserManager.getInstance().userId, questionsId)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(object : Response<ResponseBody>() {
-                    override fun onResponse(response: ResponseBody?) {
-                        super.onResponse(response)
-                        listener?.onSuccess()
-                    }
+            .deleteConcernQuestions(UserManager.getInstance().userId, questionsId)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(object : Response<ResponseBody>() {
+                override fun onResponse(response: ResponseBody?) {
+                    super.onResponse(response)
+                    listener?.onSuccess()
+                }
 
-                    override fun onFailure(e: HttpException?) {
-                        super.onFailure(e)
-                        listener?.onError()
-                        var errorString: String? = null
-                        try {
-                            errorString = e?.response()?.errorBody()?.string()
-                        } catch (e1: Exception) {
-                            e1.printStackTrace()
-                        }
-                        ErrorHelper.handleError(context, errorString, false)
+                override fun onFailure(e: HttpException?) {
+                    super.onFailure(e)
+                    listener?.onError()
+                    var errorString: String? = null
+                    try {
+                        errorString = e?.response()?.errorBody()?.string()
+                    } catch (e1: Exception) {
+                        e1.printStackTrace()
                     }
-                })
+                    ErrorHelper.handleError(context, errorString, false)
+                }
+            })
     }
 
     fun postConcernQuestions(context: Context, questionsId: String, listener: onConcernListener?) {
         RetrofitManager.getInstance().api
-                .postConcernQuestions(UserManager.getInstance().userId, questionsId)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(object : Response<ResponseBody>() {
-                    override fun onResponse(response: ResponseBody?) {
-                        super.onResponse(response)
-                        listener?.onSuccess()
+            .postConcernQuestions(UserManager.getInstance().userId, questionsId)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(object : Response<ResponseBody>() {
+                override fun onResponse(response: ResponseBody?) {
+                    super.onResponse(response)
+                    listener?.onSuccess()
+                }
+
+                override fun onFailure(e: HttpException?) {
+                    super.onFailure(e)
+                    listener?.onError()
+                    var errorString: String? = null
+                    try {
+                        errorString = e?.response()?.errorBody()?.string()
+                    } catch (e1: Exception) {
+                        e1.printStackTrace()
                     }
-
-                    override fun onFailure(e: HttpException?) {
-                        super.onFailure(e)
-                        listener?.onError()
-                        var errorString: String? = null
-                        try {
-                            errorString = e?.response()?.errorBody()?.string()
-                        } catch (e1: Exception) {
-                            e1.printStackTrace()
-                        }
-                        ErrorHelper.handleError(context, errorString, false)
-                    }
-                })
+                    ErrorHelper.handleError(context, errorString, false)
+                }
+            })
     }
 
-    /**
-     * 通知Flutter游戏关注状态发生变化
-     * 请不要随意修改方法名
-     * @param gameId 游戏ID
-     * @param follow 关注状态
-     */
-    @JvmStatic
-    fun dispatchFollowChangeEventToFlutter(gameId: String, follow: Boolean) {
-
-    }
-
-
     interface onConcernListener {
         fun onSuccess()
         fun onError()

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

@@ -55,11 +55,11 @@ public class DataUtils {
         if (CommonDebug.IS_DEBUG) {
             return;
         }
-    
+
         // 初始化 Sentry 约占用 90ms，这里切换到子线程初始化
         AppExecutor.getIoExecutor().execute(() -> initSentry(context, channel));
     }
-    
+
     private static void initSentry(Context context, String channel) {
         SentryAndroid.init(context, options -> {
             // Sentry 疯狂报 ANR (很大一部分还是莫名奇妙的 ANR)严重影响到其它闪退日志的收集
@@ -76,7 +76,7 @@ public class DataUtils {
             options.setEnvironment(BuildConfig.FLAVOR);
             options.setEnableSystemEventBreadcrumbs(false);
             options.setDsn("https://6b1caf0d17c1408e8680f3f73ff80bd0@sentry.shanqu.cc/22");
-        
+
             options.setBeforeSend((event, hint) -> {
                 if (BuildConfig.DEBUG) {
                     return null;
@@ -96,7 +96,7 @@ public class DataUtils {
                 return breadcrumb;
             }));
         });
-    
+
         Sentry.configureScope(scope -> {
             if (com.gh.gamecenter.common.BuildConfig.BUILD_TIME != 0L) {
                 scope.setTag("alias", "内测版" + BuildConfig.VERSION_NAME);

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

@@ -248,7 +248,8 @@ public class DetailDownloadUtils {
             case done:
                 if (SimulatorGameManager.isSimulatorGame(viewHolder.gameEntity)) {
                     boolean isInstalled = PackageUtils.isInstalledFromAllPackage(viewHolder.context, viewHolder.gameEntity.getSimulator().getApk().getPackageName());
-                    if (isInstalled) {
+                    boolean isInstalledNewSimulator = SimulatorGameManager.isNewSimulatorInstalled(viewHolder.context);
+                    if (isInstalled || isInstalledNewSimulator) {
                         viewHolder.mDownloadPb.setText(R.string.launch);
                         viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
                     } else {

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

@@ -24,18 +24,18 @@ object DeviceTokenUtils {
     fun syncServerTime(context: Context) {
         val sp = PreferenceManager.getDefaultSharedPreferences(context)
         RetrofitManager.getInstance().api.time
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(object : Response<TimeEntity>() {
-                    override fun onResponse(response: TimeEntity?) {
-                        val editor = sp.edit()
-                        response?.time?.let {
-                            editor.putLong("server_time", it)
-                            editor.putLong("client_time", System.currentTimeMillis() / 1000)
-                            editor.apply()
-                        }
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(object : Response<TimeEntity>() {
+                override fun onResponse(response: TimeEntity?) {
+                    val editor = sp.edit()
+                    response?.time?.let {
+                        editor.putLong("server_time", it)
+                        editor.putLong("client_time", System.currentTimeMillis() / 1000)
+                        editor.apply()
                     }
-                })
+                }
+            })
     }
 
     @JvmStatic

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

@@ -6,13 +6,11 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.CountDownTimer;
-import android.preference.PreferenceManager;
 import android.provider.Settings;
 import android.text.Html;
 import android.text.Spannable;
@@ -95,8 +93,8 @@ import com.gh.gamecenter.entity.SettingsEntity;
 import com.gh.gamecenter.entity.SimpleGameEntity;
 import com.gh.gamecenter.entity.TrackableEntity;
 import com.gh.gamecenter.login.entity.Badge;
-import com.gh.gamecenter.security.BindPhoneActivity;
-import com.gh.gamecenter.setting.GameDownloadSettingFragment;
+import com.gh.gamecenter.setting.compose.activity.ComposeBindPhoneActivity;
+import com.gh.gamecenter.setting.compose.activity.ComposeGameDownloadSettingActivity;
 import com.gh.gamecenter.suggest.SuggestType;
 import com.lightgame.adapter.BaseRecyclerAdapter;
 import com.lightgame.download.DownloadEntity;
@@ -218,7 +216,7 @@ public class DialogUtils {
         } else if (NetworkUtils.isWifiConnected(context)
                 || filter4GorSize(context, size)) {
             callBack.onResponse(false);
-        } else if (!SPUtils.getBoolean(GameDownloadSettingFragment.getTrafficDownloadHintKey(), true)) {
+        } else if (!SPUtils.getBoolean(ComposeGameDownloadSettingActivity.getTrafficDownloadHintKey(), true)) {
             AppExecutor.getUiExecutor().executeWithDelay(() -> Utils.toast(context, "当前使用移动网络下载，请注意流量消耗"), 500);
             callBack.onResponse(false);
         } else {
@@ -290,7 +288,7 @@ public class DialogUtils {
 //            MtaHelper.onEvent("移动网络下载", NetworkUtils.getMobileNetworkType(finalContext), "连上WiFi后自动下载");
         });
         allowAlways.setOnClickListener(v -> {
-            SPUtils.setBoolean(GameDownloadSettingFragment.getTrafficDownloadHintKey(), false);
+            SPUtils.setBoolean(ComposeGameDownloadSettingActivity.getTrafficDownloadHintKey(), false);
             AppExecutor.getUiExecutor().executeWithDelay(() -> {
                 // 显示了弹窗以后，即便下面这个 toast 放在 listener.onConfirm 后调用也是显示 listener.onConfirm 里的 toast
                 // 喷了，延时包治疑难杂症
@@ -1325,6 +1323,7 @@ public class DialogUtils {
             dialog.show();
         }
     }
+
     public static void showGameH5DownloadDialog(Context context, GameEntity gameEntity, RegionSetting.GameH5Download gameH5Download) {
         context = checkDialogContext(context);
 
@@ -1868,24 +1867,6 @@ public class DialogUtils {
         return dialog;
     }
 
-    public static void showEnergyDialog(Context context, String userName, long energy) {
-        context = checkDialogContext(context);
-
-        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
-
-        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_energy, null);
-        ((TextView) contentView.findViewById(R.id.userName)).setText("\"" + userName + "\"");
-        ((TextView) contentView.findViewById(R.id.energy)).setText(energy + "");
-
-        contentView.findViewById(R.id.dialog_positive).setOnClickListener(v -> {
-            dialog.dismiss();
-        });
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(contentView);
-        dialog.show();
-    }
-
     public static void showSimulatorParseErrorDialog(Context context, String gameId, String gameName, ConfirmListener confirmListener) {
         context = checkDialogContext(context);
         final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
@@ -1924,13 +1905,21 @@ public class DialogUtils {
         }
     }
 
-    @SuppressLint("SetTextI18n")
     public static void showReportReasonDialog(Context context, ArrayList<String> items, ReportReasonCallBack callBack) {
+        showReportReasonDialog(context, items, "", callBack);
+    }
+
+    @SuppressLint("SetTextI18n")
+    public static void showReportReasonDialog(Context context, ArrayList<String> items, String title, ReportReasonCallBack callBack) {
         context = checkDialogContext(context);
 
         final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
         DialogReportReasonBinding binding = DialogReportReasonBinding.inflate(LayoutInflater.from(context));
 
+        if (!title.isEmpty()) {
+            binding.reasonTitle.setText(title);
+        }
+
         ReportReasonAdapter reportReasonAdapter = new ReportReasonAdapter(context, items, reason -> {
             if (reason.equals("其他原因")) {
                 binding.reasonTitle.setText(R.string.report_reason_other_title);
@@ -1976,19 +1965,6 @@ public class DialogUtils {
         dialog.show();
     }
 
-    public static void showSignRuleDialog(Context context) {
-        context = checkDialogContext(context);
-
-        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
-
-        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_sign_rule, null);
-        contentView.findViewById(R.id.dialog_ok).setOnClickListener(v -> dialog.dismiss());
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(contentView);
-        dialog.show();
-    }
-
     public static Dialog showBindPhoneDialog(Context context, ConfirmListener listener) {
         context = checkDialogContext(context);
 
@@ -2104,7 +2080,7 @@ public class DialogUtils {
 
         binding.bindPhoneBtn.setOnClickListener(v -> {
             dialog.dismiss();
-            Intent intent = BindPhoneActivity.getNormalIntent(finalContext, false);
+            Intent intent = ComposeBindPhoneActivity.getNormalIntent(finalContext, false);
             finalContext.startActivity(intent);
         });
 

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

@@ -9,32 +9,33 @@ import android.os.Build
 import android.os.Bundle
 import android.text.TextUtils
 import androidx.appcompat.app.AppCompatActivity
-import com.gh.gamecenter.common.base.activity.BaseActivity
-import com.gh.gamecenter.common.base.activity.BaseActivity_TabLayout
-import com.gh.gamecenter.common.base.activity.ToolBarActivity
-import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout
-import com.gh.gamecenter.core.AppExecutor
 import com.gh.common.constant.Config
-import com.gh.gamecenter.common.constant.Constants
 import com.gh.common.exposure.ExposureEvent
 import com.gh.common.exposure.ExposureEvent.Companion.createEvent
 import com.gh.common.exposure.ExposureManager.log
 import com.gh.common.exposure.ExposureTraceUtils.appendTrace
 import com.gh.common.exposure.ExposureType
-import com.gh.gamecenter.common.constant.EntranceConsts.*
-import com.gh.common.util.EntranceUtils.*
+import com.gh.common.util.EntranceUtils.jumpActivity
 import com.gh.gamecenter.*
 import com.gh.gamecenter.amway.AmwayActivity
 import com.gh.gamecenter.catalog.CatalogActivity
 import com.gh.gamecenter.category.CategoryDirectoryActivity
 import com.gh.gamecenter.category2.CategoryV2Activity
+import com.gh.gamecenter.common.base.activity.BaseActivity
+import com.gh.gamecenter.common.base.activity.BaseActivity_TabLayout
+import com.gh.gamecenter.common.base.activity.ToolBarActivity
+import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout
+import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.constant.EntranceConsts.*
 import com.gh.gamecenter.common.entity.CommunityEntity
 import com.gh.gamecenter.common.entity.Display
 import com.gh.gamecenter.common.entity.LinkEntity
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.core.utils.ToastUtils
+import com.gh.gamecenter.discovery.DiscoveryActivity
 import com.gh.gamecenter.download.DownloadFragment.Companion.INDEX_UPDATE
 import com.gh.gamecenter.entity.*
 import com.gh.gamecenter.eventbus.EBSkip
@@ -62,9 +63,10 @@ import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity
 import com.gh.gamecenter.qa.subject.CommunitySubjectActivity
 import com.gh.gamecenter.qa.video.detail.ForumVideoDetailActivity
 import com.gh.gamecenter.retrofit.RetrofitManager
-import com.gh.gamecenter.security.BindPhoneActivity
 import com.gh.gamecenter.servers.GameServerTestActivity
 import com.gh.gamecenter.servers.GameServersActivity
+import com.gh.gamecenter.setting.compose.activity.ComposeBindPhoneActivity
+import com.gh.gamecenter.setting.compose.activity.ComposeSettingActivity
 import com.gh.gamecenter.subject.SubjectActivity
 import com.gh.gamecenter.suggest.SuggestType
 import com.gh.gamecenter.tag.TagsActivity
@@ -95,7 +97,14 @@ object DirectUtils {
      * 跳转到特定页面，根据 [type] 决定跳转页面，[path] 为跳转前的页面名称
      */
     @JvmStatic
-    fun directToSpecificPage(context: Context, type: String, link: String, text: String? = "", entrance: String? = null, path: String? = null) {
+    fun directToSpecificPage(
+        context: Context,
+        type: String,
+        link: String,
+        text: String? = "",
+        entrance: String? = null,
+        path: String? = null
+    ) {
         when (type) {
             HOST_ARTICLE -> directToArticle(context, id = link, entrance = entrance)
 
@@ -111,9 +120,19 @@ object DirectUtils {
 
             HOST_WEB -> directToWebView(context, url = link, entrance = entrance)
 
-            HOST_DOWNLOAD -> directToDownloadManagerAndStartDownload(context, gameId = link, packageName = text, entrance = entrance)
+            HOST_DOWNLOAD -> directToDownloadManagerAndStartDownload(
+                context,
+                gameId = link,
+                packageName = text,
+                entrance = entrance
+            )
 
-            HOST_UPDATE -> directToDownloadManagerAndStartUpdate(context, gameId = link, packageName = text, entrance = entrance)
+            HOST_UPDATE -> directToDownloadManagerAndStartUpdate(
+                context,
+                gameId = link,
+                packageName = text,
+                entrance = entrance
+            )
 
             HOST_LIBAO -> directToGiftDetail(context, giftId = link, entrance = entrance)
 
@@ -126,7 +145,13 @@ object DirectUtils {
         directToLinkPage(context, linkEntity, entrance, path, null)
     }
 
-    fun directToLinkPage(context: Context, linkEntity: LinkEntity, entrance: String, path: String, exposureEvent: ExposureEvent? = null) {
+    fun directToLinkPage(
+        context: Context,
+        linkEntity: LinkEntity,
+        entrance: String,
+        path: String,
+        exposureEvent: ExposureEvent? = null
+    ) {
         directToLinkPage(context, linkEntity, entrance, path, exposureEvent, null)
     }
 
@@ -158,7 +183,8 @@ object DirectUtils {
         "common_collection",
         "game_list",
         "game_list_detail",
-        "bbs_video"
+        "bbs_video",
+        "explore_column"
     )
 
     fun directToLinkPage(
@@ -209,9 +235,21 @@ object DirectUtils {
                 directToCommunity(context, CommunityEntity(linkEntity.link!!, linkEntity.text!!))
             }
 
-            "community_article", "社区文章" -> directToCommunityArticle(context, linkEntity.community!!, linkEntity.link!!, entrance, path)
+            "community_article", "社区文章" -> directToCommunityArticle(
+                context,
+                linkEntity.community!!,
+                linkEntity.link!!,
+                entrance,
+                path
+            )
 
-            "community_column", "社区专题" -> directToCommunityColumn(context, linkEntity.community, linkEntity.link!!, entrance, path)
+            "community_column", "社区专题" -> directToCommunityColumn(
+                context,
+                linkEntity.community,
+                linkEntity.link!!,
+                entrance,
+                path
+            )
 
             "community_special_column" -> directAskColumnDetail(
                 context, linkEntity.link
@@ -223,7 +261,11 @@ object DirectUtils {
                     linkEntity.link!!.contains("v.douyin") && PackageHelper.localPackageNameSet.contains("com.ss.android.ugc.aweme") -> {
                         directDouyin(context, "1402577827140941")
                     }
-                    else -> directToWebView(context, url = linkEntity.link!!, entrance = BaseActivity.mergeEntranceAndPath(entrance, path))
+                    else -> directToWebView(
+                        context,
+                        url = linkEntity.link!!,
+                        entrance = BaseActivity.mergeEntranceAndPath(entrance, path)
+                    )
                 }
             }
 
@@ -233,7 +275,16 @@ object DirectUtils {
 
             "qqqun", "QQ群" -> directToQqGroup(context, linkEntity.link!!)
 
-            "tag" -> context.startActivity(TagsActivity.getIntent(context, linkEntity.text!!, linkEntity.title, entrance, path, exposureEvent?.source))
+            "tag" -> context.startActivity(
+                TagsActivity.getIntent(
+                    context,
+                    linkEntity.text!!,
+                    linkEntity.title,
+                    entrance,
+                    path,
+                    exposureEvent?.source
+                )
+            )
 
             "all_community_article" -> directSimpleArticleList(
                 context, linkEntity.link
@@ -244,7 +295,14 @@ object DirectUtils {
 
             "catalog" -> directCatalog(context, linkEntity.link!!, linkEntity.text!!, entrance, path)
 
-            "category_v2" -> directCategoryV2(context, linkEntity.link!!, linkEntity.text!!, entrance, path, exposureEvent)
+            "category_v2" -> directCategoryV2(
+                context,
+                linkEntity.link!!,
+                linkEntity.text!!,
+                entrance,
+                path,
+                exposureEvent
+            )
 
             "block", "版块" -> {
                 if (linkEntity.link.isNullOrEmpty()) return
@@ -300,7 +358,7 @@ object DirectUtils {
 
             "mobile_bind" -> {
                 CheckLoginUtils.checkLogin(context, entrance) {
-                    context.startActivity(BindPhoneActivity.getNormalIntent(context, false))
+                    context.startActivity(ComposeBindPhoneActivity.getNormalIntent(context, false))
                 }
             }
 
@@ -330,7 +388,7 @@ object DirectUtils {
 
             "etiquette_exam" -> directToRegulationTestPage(context)
 
-            "setting" -> context.startActivity(SettingActivity.getIntent(context, false, entrance))
+            "setting" -> context.startActivity(ComposeSettingActivity.getIntent(context, false, entrance))
 
             "index_page" -> directToHomeTab(context)
 
@@ -365,7 +423,13 @@ object DirectUtils {
 
             "halo_tab" -> directToPersonalTab(context)
 
-            "common_collection" -> directToCommonCollectionDetail(context, linkEntity.link ?: "", linkEntity.blockId, linkEntity.blockName, entrance)
+            "common_collection" -> directToCommonCollectionDetail(
+                context,
+                linkEntity.link ?: "",
+                linkEntity.blockId,
+                linkEntity.blockName,
+                entrance
+            )
 
             //"h5_game_center" -> directLetoGameCenter(context)
 
@@ -373,6 +437,8 @@ object DirectUtils {
 
             "game_list_detail" -> directToGameCollectionDetail(context, linkEntity.link ?: "", entrance)
 
+            "explore_column" -> context.startActivity(DiscoveryActivity.getIntent(context, entrance))
+
             "" -> {
                 // do nothing
             }
@@ -416,7 +482,13 @@ object DirectUtils {
      * 跳转至专题合集
      */
     @JvmStatic
-    fun directToColumnCollection(context: Context, id: String, position: Int = -1, entrance: String, columnName: String = "") {
+    fun directToColumnCollection(
+        context: Context,
+        id: String,
+        position: Int = -1,
+        entrance: String,
+        columnName: String = ""
+    ) {
         if (id.isEmpty()) return
         val bundle = Bundle()
         bundle.putString(KEY_TO, ColumnCollectionDetailActivity::class.java.name)
@@ -594,7 +666,12 @@ object DirectUtils {
      *  跳转到游戏评分详情
      */
     @JvmStatic
-    fun directToGameRatingDetail(context: Context, gameId: String? = "", commentId: String? = "", entrance: String? = null) {
+    fun directToGameRatingDetail(
+        context: Context,
+        gameId: String? = "",
+        commentId: String? = "",
+        entrance: String? = null
+    ) {
         val bundle = Bundle()
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_GAMEID, gameId)
@@ -618,7 +695,12 @@ object DirectUtils {
     }
 
     @JvmStatic
-    fun directToGameDetail(context: Context, id: String, defaultTab: Int = GameDetailFragment.INDEX_DESC, entrance: String? = null) {
+    fun directToGameDetail(
+        context: Context,
+        id: String,
+        defaultTab: Int = GameDetailFragment.INDEX_DESC,
+        entrance: String? = null
+    ) {
         val bundle = Bundle()
         bundle.putString(KEY_TO, GameDetailActivity::class.java.name)
         bundle.putString(KEY_ENTRANCE, entrance)
@@ -634,14 +716,23 @@ object DirectUtils {
 
     // 专栏
     @JvmStatic
-    fun directToSubject(context: Context, id: String, subjectName: String? = "", entrance: String? = null, exposureEvent: ExposureEvent? = null) {
+    fun directToSubject(
+        context: Context,
+        id: String,
+        subjectName: String? = "",
+        entrance: String? = null,
+        exposureEvent: ExposureEvent? = null
+    ) {
         if (id.isEmpty()) return
         val bundle = Bundle()
         val subjectData = SubjectData(subjectId = id, subjectName = subjectName, isOrder = false)
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_TO, SubjectActivity::class.java.name)
         bundle.putParcelable(EntranceConsts.KEY_SUBJECT_DATA, subjectData)
-        if (exposureEvent != null) bundle.putParcelableArrayList(KEY_EXPOSURE_SOURCE_LIST, ArrayList(exposureEvent.source))
+        if (exposureEvent != null) bundle.putParcelableArrayList(
+            KEY_EXPOSURE_SOURCE_LIST,
+            ArrayList(exposureEvent.source)
+        )
         jumpActivity(context, bundle)
     }
 
@@ -693,7 +784,12 @@ object DirectUtils {
      * 跳转到下载管理器并开始下载 [gameId] 和 [packageName] 用于唯一确定一个下载文件
      */
     @JvmStatic
-    fun directToDownloadManagerAndStartDownload(context: Context, gameId: String? = "", packageName: String? = "", entrance: String? = null) {
+    fun directToDownloadManagerAndStartDownload(
+        context: Context,
+        gameId: String? = "",
+        packageName: String? = "",
+        entrance: String? = null
+    ) {
         DownloadHelper.createABrandNewDownloadTaskQuietly(gameId, packageName) {
             val bundle = Bundle()
             bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
@@ -706,7 +802,12 @@ object DirectUtils {
     }
 
     @JvmStatic
-    fun directToDownloadManagerAndStartUpdate(context: Context, gameId: String? = "", packageName: String? = "", entrance: String? = null) {
+    fun directToDownloadManagerAndStartUpdate(
+        context: Context,
+        gameId: String? = "",
+        packageName: String? = "",
+        entrance: String? = null
+    ) {
         val bundle = Bundle()
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_TO, DownloadManagerActivity.TAG)
@@ -892,7 +993,13 @@ object DirectUtils {
     }
 
     @JvmStatic
-    fun directToCommunityArticle(context: Context, articleId: String?, communityId: String?, entrance: String?, path: String?) {
+    fun directToCommunityArticle(
+        context: Context,
+        articleId: String?,
+        communityId: String?,
+        entrance: String?,
+        path: String?
+    ) {
         val bundle = Bundle()
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_PATH, path)
@@ -903,7 +1010,13 @@ object DirectUtils {
     }
 
     @JvmStatic
-    fun directToCommunityArticle(context: Context, community: CommunityEntity?, articleId: String?, entrance: String?, path: String?) {
+    fun directToCommunityArticle(
+        context: Context,
+        community: CommunityEntity?,
+        articleId: String?,
+        entrance: String?,
+        path: String?
+    ) {
         if (articleId.isNullOrEmpty()) return
         val bundle = Bundle()
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
@@ -918,7 +1031,13 @@ object DirectUtils {
      * 跳转到社区专题
      */
     @JvmStatic
-    fun directToCommunityColumn(context: Context, community: CommunityEntity?, subjectId: String, entrance: String?, path: String?) {
+    fun directToCommunityColumn(
+        context: Context,
+        community: CommunityEntity?,
+        subjectId: String,
+        entrance: String?,
+        path: String?
+    ) {
         if (subjectId.isEmpty()) return
         val bundle = Bundle()
         bundle.putString(KEY_PATH, path)
@@ -1008,7 +1127,12 @@ object DirectUtils {
      * @param fixedTopAmwayCommentId 需要置顶的安利Id
      */
     @JvmStatic
-    fun directToAmway(context: Context, fixedTopAmwayCommentId: String? = null, entrance: String? = null, path: String? = "") {
+    fun directToAmway(
+        context: Context,
+        fixedTopAmwayCommentId: String? = null,
+        entrance: String? = null,
+        path: String? = ""
+    ) {
         val bundle = Bundle()
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_TO, AmwayActivity::class.java.name)
@@ -1083,8 +1207,14 @@ object DirectUtils {
     }
 
     @JvmStatic
-    fun directToFullScreenWebPage(context: Context, url: String, webViewHandleBackPressed: Boolean = false) {
-        context.startActivity(FullScreenWebActivity.getIntent(context, url, webViewHandleBackPressed))
+    @JvmOverloads
+    fun directToFullScreenWebPage(
+        context: Context,
+        url: String,
+        webViewHandleBackPressed: Boolean = false,
+        entrance: String? = null
+    ) {
+        context.startActivity(FullScreenWebActivity.getIntent(context, url, webViewHandleBackPressed, entrance))
     }
 
     @JvmStatic
@@ -1149,7 +1279,13 @@ object DirectUtils {
      * 跳转分类
      */
     @JvmStatic
-    fun directCategoryDirectory(context: Context, categoryId: String, categoryTitle: String, entrance: String? = null, path: String? = "") {
+    fun directCategoryDirectory(
+        context: Context,
+        categoryId: String,
+        categoryTitle: String,
+        entrance: String? = null,
+        path: String? = ""
+    ) {
         if (categoryId.isEmpty()) return
         val bundle = Bundle()
         bundle.putString(KEY_TO, CategoryDirectoryActivity::class.java.name)
@@ -1198,7 +1334,10 @@ object DirectUtils {
         bundle.putString(KEY_CATEGORY_ID, categoryId)
         bundle.putString(KEY_CATEGORY_TITLE, categoryTitle)
         bundle.putString(KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path))
-        if (exposureEvent != null) bundle.putParcelableArrayList(KEY_EXPOSURE_SOURCE_LIST, ArrayList(exposureEvent.source))
+        if (exposureEvent != null) bundle.putParcelableArrayList(
+            KEY_EXPOSURE_SOURCE_LIST,
+            ArrayList(exposureEvent.source)
+        )
         jumpActivity(context, bundle)
     }
 
@@ -1206,7 +1345,13 @@ object DirectUtils {
      * 跳转到问题标签详情
      */
     @JvmStatic
-    fun directAskColumnLabelDetail(context: Context, tag: String, community: CommunityEntity, entrance: String? = null, path: String? = "") {
+    fun directAskColumnLabelDetail(
+        context: Context,
+        tag: String,
+        community: CommunityEntity,
+        entrance: String? = null,
+        path: String? = ""
+    ) {
 //        val bundle = Bundle()
 //        bundle.putString(KEY_TO, AskColumnDetailActivity::class.java.name)
 //        bundle.putString(KEY_ASK_TAG, tag)
@@ -1220,7 +1365,13 @@ object DirectUtils {
      * 跳转到专栏详情
      */
     @JvmStatic
-    fun directAskColumnDetail(context: Context, columnId: String, community: CommunityEntity, entrance: String? = null, path: String? = "") {
+    fun directAskColumnDetail(
+        context: Context,
+        columnId: String,
+        community: CommunityEntity,
+        entrance: String? = null,
+        path: String? = ""
+    ) {
 //        if (columnId.isEmpty()) return
 //        val bundle = Bundle()
 //        bundle.putString(KEY_TO, AskColumnDetailActivity::class.java.name)
@@ -1430,7 +1581,13 @@ object DirectUtils {
             Constants.COMMODITY_DETAIL_ADDRESS
         }
 
-        url = String.format(Locale.CHINA, "%s&shopid=%s&timestamp=%d", url, commodityId, (Date().time / 1000 / 1000.toFloat()).roundToInt())
+        url = String.format(
+            Locale.CHINA,
+            "%s&shopid=%s&timestamp=%d",
+            url,
+            commodityId,
+            (Date().time / 1000 / 1000.toFloat()).roundToInt()
+        )
         directToFullScreenWebPage(context, url, true)
     }
 
@@ -1450,7 +1607,13 @@ object DirectUtils {
             Constants.ENERGY_RECORD_ADDRESS
         }
 
-        url = String.format(Locale.CHINA, "%s&position=%s&timestamp=%d", url, position, (Date().time / 1000 / 1000.toFloat()).roundToInt())
+        url = String.format(
+            Locale.CHINA,
+            "%s&position=%s&timestamp=%d",
+            url,
+            position,
+            (Date().time / 1000 / 1000.toFloat()).roundToInt()
+        )
         directToFullScreenWebPage(context, url, true)
     }
 
@@ -1478,7 +1641,13 @@ object DirectUtils {
             Constants.ORDER_DETAIL_ADDRESS
         }
 
-        url = String.format(Locale.CHINA, "%s&order_id=%s&timestamp=%d", url, orderId, (Date().time / 1000 / 1000.toFloat()).roundToInt())
+        url = String.format(
+            Locale.CHINA,
+            "%s&order_id=%s&timestamp=%d",
+            url,
+            orderId,
+            (Date().time / 1000 / 1000.toFloat()).roundToInt()
+        )
         directToFullScreenWebPage(context, url, true)
     }
 
@@ -1665,7 +1834,7 @@ object DirectUtils {
 
         url = String.format(
             Locale.CHINA,
-            "%s&id=%s&category_id=%s&timestamp=%d",
+            "%s?from=ghzs&id=%s&category_id=%s&timestamp=%d",
             url,
             activityId,
             categoryId,

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

@@ -13,7 +13,12 @@ object DownloadDialogHelper {
      * [callback] 执行点击关闭以后会执行的代码块，没有弹窗也会执行这个代码块
      */
     @JvmStatic
-    fun findAvailableDialogAndShow(context: Context, gameEntity: GameEntity, apkEntity: ApkEntity, callback: EmptyCallback) {
+    fun findAvailableDialogAndShow(
+        context: Context,
+        gameEntity: GameEntity,
+        apkEntity: ApkEntity,
+        callback: EmptyCallback
+    ) {
         val dialog = retrieveAvailableDialog(gameEntity, apkEntity)
         if (dialog != null) {
             showDownloadDialog(context, dialog, callback)
@@ -37,57 +42,65 @@ object DownloadDialogHelper {
                 // 共有 8 种可能
                 // 1. 不指定包名、机型和系统版本
                 if (dialog.rule.packageName.isEmpty()
-                        && dialog.rule.models.isEmpty()
-                        && dialog.rule.systemVersions.isEmpty()) {
+                    && dialog.rule.models.isEmpty()
+                    && dialog.rule.systemVersions.isEmpty()
+                ) {
                     return dialog
                 }
 
                 // 2. 指定包名不管机型和系统
                 if (dialog.rule.packageName == apkEntity.packageName
-                        && dialog.rule.models.isEmpty()
-                        && dialog.rule.systemVersions.isEmpty()) {
+                    && dialog.rule.models.isEmpty()
+                    && dialog.rule.systemVersions.isEmpty()
+                ) {
                     return dialog
                 }
 
                 // 3. 指定机型不管包名和系统
                 if (dialog.rule.models.contains(Build.MODEL)
-                        && dialog.rule.packageName.isEmpty()
-                        && dialog.rule.systemVersions.isEmpty()) {
+                    && dialog.rule.packageName.isEmpty()
+                    && dialog.rule.systemVersions.isEmpty()
+                ) {
                     return dialog
                 }
 
                 // 4. 指定系统不管包名和机型
                 if (dialog.rule.systemVersions.contains(Build.VERSION.RELEASE)
-                        && dialog.rule.packageName.isEmpty()
-                        && dialog.rule.models.isEmpty()) {
+                    && dialog.rule.packageName.isEmpty()
+                    && dialog.rule.models.isEmpty()
+                ) {
                     return dialog
                 }
 
                 // 5. 指定包名和机型不管系统
                 if (dialog.rule.packageName == apkEntity.packageName
-                        && dialog.rule.models.contains(Build.MODEL)
-                        && dialog.rule.systemVersions.isEmpty()) {
+                    && dialog.rule.models.contains(Build.MODEL)
+                    && dialog.rule.systemVersions.isEmpty()
+                ) {
                     return dialog
                 }
 
                 // 6. 指定包名和系统不管机型
                 if (dialog.rule.packageName == apkEntity.packageName
-                        && dialog.rule.systemVersions.contains(Build.VERSION.RELEASE)
-                        && dialog.rule.models.isEmpty()) {
+                    && dialog.rule.systemVersions.contains(Build.VERSION.RELEASE)
+                    && dialog.rule.models.isEmpty()
+                ) {
                     return dialog
                 }
 
                 // 7. 指定机型和系统不管包名
                 if (dialog.rule.systemVersions.contains(Build.VERSION.RELEASE)
-                        && dialog.rule.models.contains(Build.MODEL)
-                        && dialog.rule.packageName.isEmpty()) {
+                    && dialog.rule.models.contains(Build.MODEL)
+                    && dialog.rule.packageName.isEmpty()
+                ) {
                     return dialog
                 }
 
                 // 8.指定包名、机型和系统版本
                 if (dialog.rule.packageName == apkEntity.packageName
-                        && dialog.rule.models.contains(Build.MODEL)
-                        && dialog.rule.systemVersions.contains(Build.VERSION.RELEASE)) {
+                    && dialog.rule.models.contains(Build.MODEL)
+                    && dialog.rule.systemVersions.contains(Build.VERSION.RELEASE)
+                ) {
                     return dialog
                 }
             } else return null

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

@@ -25,34 +25,38 @@ object DownloadHelper {
         }
 
         RetrofitManager.getInstance()
-                .api
-                .getGameDigest(gameId)
-                .map(ApkActiveUtils.filterMapper)
-                .subscribeOn(Schedulers.io())
-                .subscribe(object : Response<GameEntity>() {
-                    override fun onResponse(response: GameEntity?) {
-                        response?.let {
-                            if (response.getApk().size > 1) {
-                                for (apk in response.getApk()) {
-                                    if (packageName == apk.packageName) {
-                                        DownloadManager.createDownload(HaloApp.getInstance().application,
-                                                apk, response, "", EntranceConsts.ENTRANCE_RECOMMEND, "", false, null)
-                                        block.invoke()
-                                    }
+            .api
+            .getGameDigest(gameId)
+            .map(ApkActiveUtils.filterMapper)
+            .subscribeOn(Schedulers.io())
+            .subscribe(object : Response<GameEntity>() {
+                override fun onResponse(response: GameEntity?) {
+                    response?.let {
+                        if (response.getApk().size > 1) {
+                            for (apk in response.getApk()) {
+                                if (packageName == apk.packageName) {
+                                    DownloadManager.createDownload(
+                                        HaloApp.getInstance().application,
+                                        apk, response, "", EntranceConsts.ENTRANCE_RECOMMEND, "", false, null
+                                    )
+                                    block.invoke()
                                 }
-                            } else if (response.getApk().size == 1) {
-                                DownloadManager.createDownload(HaloApp.getInstance().application,
-                                        response, "", EntranceConsts.ENTRANCE_RECOMMEND, "", false, null)
-                                block.invoke()
                             }
+                        } else if (response.getApk().size == 1) {
+                            DownloadManager.createDownload(
+                                HaloApp.getInstance().application,
+                                response, "", EntranceConsts.ENTRANCE_RECOMMEND, "", false, null
+                            )
+                            block.invoke()
                         }
                     }
+                }
 
-                    override fun onFailure(e: HttpException?) {
-                        e?.printStackTrace()
-                        block.invoke()
-                    }
-                })
+                override fun onFailure(e: HttpException?) {
+                    e?.printStackTrace()
+                    block.invoke()
+                }
+            })
     }
 
 }

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

@@ -14,6 +14,7 @@ import com.gh.common.exposure.ExposureEvent
 import com.gh.common.filter.RegionSettingHelper
 import com.gh.common.history.HistoryHelper
 import com.gh.common.repository.ReservationRepository
+import com.gh.common.simulator.NewSimulatorGameManager
 import com.gh.common.simulator.SimulatorDownloadManager
 import com.gh.common.simulator.SimulatorGameManager
 import com.gh.common.view.DownloadButton
@@ -32,7 +33,7 @@ import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.entity.GameEntity
 import com.gh.gamecenter.common.entity.LinkEntity
-import com.gh.gamecenter.energy.utils.EnergyTaskHelper
+import com.gh.gamecenter.energy.EnergyBridge
 import com.gh.gamecenter.entity.PluginLocation
 import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment
 import com.gh.gamecenter.manager.PackagesManager
@@ -80,7 +81,13 @@ object DownloadItemUtils {
             if (!queue.contains(platform) && !TextUtils.isEmpty(platform)) {
                 queue.offer(platform)
                 if (AppDebugConfig.IS_DEBUG) {
-                    AppDebugConfig.logMethodWithParams(DownloadItemUtils::class.java, queue.size, gameEntity.brief, downloadEntity.platform, index)
+                    AppDebugConfig.logMethodWithParams(
+                        DownloadItemUtils::class.java,
+                        queue.size,
+                        gameEntity.brief,
+                        downloadEntity.platform,
+                        index
+                    )
                 }
                 // 有两个平台同时下载的时候启用
                 if (queue.size == 2) {
@@ -127,7 +134,15 @@ object DownloadItemUtils {
         context: Context, gameEntity: GameEntity, holder: GameViewHolder,
         isShowPlatform: Boolean, hideDownloadBtnIfNoAvailableContent: Boolean
     ) {
-        updateItem(context, gameEntity, holder, isShowPlatform, PluginLocation.only_game, hideDownloadBtnIfNoAvailableContent, null)
+        updateItem(
+            context,
+            gameEntity,
+            holder,
+            isShowPlatform,
+            PluginLocation.only_game,
+            hideDownloadBtnIfNoAvailableContent,
+            null
+        )
     }
 
     fun updateItem(
@@ -152,7 +167,13 @@ object DownloadItemUtils {
         // 显示预约
         if (gameEntity.isReservable) {
             updateItemViewStatus(holder, false, briefStyle, gameEntity.columnRecommend, isShowRecommendStar)
-            updateDownloadButton(context, holder.gameDownloadBtn, gameEntity, hideDownloadBtnIfNoAvailableContent, pluginLocation)
+            updateDownloadButton(
+                context,
+                holder.gameDownloadBtn,
+                gameEntity,
+                hideDownloadBtnIfNoAvailableContent,
+                pluginLocation
+            )
             return
         }
         if (gameEntity.getApk().isEmpty() || gameEntity.downloadOffStatus != null) {
@@ -162,7 +183,13 @@ object DownloadItemUtils {
         } else {
             updatePluginItem(context, holder, gameEntity, isShowPlatform, briefStyle, isShowRecommendStar)
         }
-        updateDownloadButton(context, holder.gameDownloadBtn, gameEntity, hideDownloadBtnIfNoAvailableContent, pluginLocation)
+        updateDownloadButton(
+            context,
+            holder.gameDownloadBtn,
+            gameEntity,
+            hideDownloadBtnIfNoAvailableContent,
+            pluginLocation
+        )
     }
 
     fun updateDownloadButton(
@@ -265,11 +292,12 @@ object DownloadItemUtils {
                         } else {
                             setText(R.string.install)
                         }
-                        buttonStyle = if (downloadEntity.isPluggable && PackagesManager.isInstalled(downloadEntity.packageName)) {
-                            DownloadButton.ButtonStyle.PLUGIN
-                        } else {
-                            DownloadButton.ButtonStyle.NORMAL
-                        }
+                        buttonStyle =
+                            if (downloadEntity.isPluggable && PackagesManager.isInstalled(downloadEntity.packageName)) {
+                                DownloadButton.ButtonStyle.PLUGIN
+                            } else {
+                                DownloadButton.ButtonStyle.NORMAL
+                            }
                     }
                 }
             } else {
@@ -350,12 +378,20 @@ object DownloadItemUtils {
                     holder.gameDownloadSpeed.text = String.format(
                         "%s - %s(剩%s)", platform,
                         SpeedUtils.getSpeed(downloadEntity.speed),
-                        SpeedUtils.getRemainTime(downloadEntity.size, downloadEntity.progress, downloadEntity.speed * 1024)
+                        SpeedUtils.getRemainTime(
+                            downloadEntity.size,
+                            downloadEntity.progress,
+                            downloadEntity.speed * 1024
+                        )
                     )
                 } else {
                     holder.gameDownloadSpeed.text = String.format(
                         "%s(剩%s)", SpeedUtils.getSpeed(downloadEntity.speed),
-                        SpeedUtils.getRemainTime(downloadEntity.size, downloadEntity.progress, downloadEntity.speed * 1024)
+                        SpeedUtils.getRemainTime(
+                            downloadEntity.size,
+                            downloadEntity.progress,
+                            downloadEntity.speed * 1024
+                        )
                     )
                 }
                 holder.gameDownloadPercentage.text = downloadEntity.percent.toString() + "%"
@@ -380,7 +416,8 @@ object DownloadItemUtils {
             val xapkStatus = downloadEntity.meta[XapkInstaller.XAPK_UNZIP_STATUS]
             if (XapkUnzipStatus.UNZIPPING.name == xapkStatus) {
                 val percent = downloadEntity.meta[XapkInstaller.XAPK_UNZIP_PERCENT]
-                holder.gameProgressbar.progressDrawable = context.resources.getDrawable(R.drawable.progressbar_xapk_style)
+                holder.gameProgressbar.progressDrawable =
+                    context.resources.getDrawable(R.drawable.progressbar_xapk_style)
                 holder.gameDownloadSpeed.setText(R.string.unzipping)
                 holder.gameProgressbar.progress = (java.lang.Float.valueOf(percent) * 10).toInt()
                 holder.gameDownloadPercentage.text = "$percent%"
@@ -504,7 +541,19 @@ object DownloadItemUtils {
         traceEvent: ExposureEvent?,
         clickCallback: EmptyCallback?
     ) {
-        setOnClickListener(context, downloadBtn, gameEntity, position, adapter, entrance, location, traceEvent, clickCallback, null, null)
+        setOnClickListener(
+            context,
+            downloadBtn,
+            gameEntity,
+            position,
+            adapter,
+            entrance,
+            location,
+            traceEvent,
+            clickCallback,
+            null,
+            null
+        )
     }
 
     /**
@@ -618,7 +667,7 @@ object DownloadItemUtils {
                                     }
                                 })
                             }
-                        },object : CancelListener {
+                        }, object : CancelListener {
                             override fun onCancel() {
                                 NewFlatLogUtils.logMyGameCancelReserveDialogClick(
                                     "关闭弹窗",
@@ -648,7 +697,13 @@ object DownloadItemUtils {
                 if (isPlay) {
                     HistoryHelper.insertGameEntity(gameEntity)
                 }
-                val i = WebActivity.getIntentForWebGame(context, gameEntity.h5Link!!.link, gameEntity.name, isPlay, linkEntity.closeButton)
+                val i = WebActivity.getIntentForWebGame(
+                    context,
+                    gameEntity.h5Link!!.link,
+                    gameEntity.name,
+                    isPlay,
+                    linkEntity.closeButton
+                )
                 context.startActivity(i)
             }
         } else if (gameEntity.getApk().size == 1) {
@@ -657,7 +712,17 @@ object DownloadItemUtils {
                     override fun onCallback() {
                         allStateClickCallback?.onCallback()
                         clickCallback?.onCallback()
-                        onNormalClick(context, downloadBtn, gameEntity, position, adapter, entrance, location, traceEvent, refreshCallback)
+                        onNormalClick(
+                            context,
+                            downloadBtn,
+                            gameEntity,
+                            position,
+                            adapter,
+                            entrance,
+                            location,
+                            traceEvent,
+                            refreshCallback
+                        )
                     }
                 }
 
@@ -705,6 +770,7 @@ object DownloadItemUtils {
         val apk = gameEntity.getApk().safelyGetInRelease(0) ?: return
         if (str == context.getString(R.string.download)) {
             ChainBuilder().apply {
+                addHandler(UpdateNewSimulatorHandler())
                 addHandler(GamePermissionHandler())
                 addHandler(BrowserInstallHandler())
                 addHandler(PackageCheckHandler())
@@ -773,10 +839,17 @@ object DownloadItemUtils {
         } else if (str == context.getString(R.string.install)) {
             val downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(apk.url)
             if (gameEntity.simulator != null) {
-                val isInstalled = PackageUtils.isInstalledFromAllPackage(context, gameEntity.simulator!!.apk!!.packageName)
-                if (downloadEntity != null && SimulatorGameManager.isSimulatorGame(gameEntity) && !isInstalled) {
+                val isInstalled =
+                    PackageUtils.isInstalledFromAllPackage(context, gameEntity.simulator!!.apk!!.packageName)
+                val isInstalledNewSimulator = SimulatorGameManager.isNewSimulatorInstalled(context)
+                val isInstalledOldSimulator = SimulatorGameManager.isOldSimulatorInstalled(context)
+                var simulator = gameEntity.simulator
+                if (!isInstalledOldSimulator) {
+                    simulator = Config.getNewSimulatorEntitySetting()
+                }
+                if (downloadEntity != null && SimulatorGameManager.isSimulatorGame(gameEntity) && !isInstalled && !isInstalledNewSimulator) {
                     SimulatorDownloadManager.getInstance().showDownloadDialog(
-                        context, gameEntity.simulator,
+                        context, simulator,
                         SimulatorDownloadManager.SimulatorLocation.LAUNCH, gameEntity.id, gameEntity.name!!, null
                     )
                     return
@@ -789,10 +862,13 @@ object DownloadItemUtils {
                 install(context, gameEntity, position, adapter, refreshCallback)
             }
         } else if (str == context.getString(R.string.launch)) {
-            EnergyTaskHelper.postEnergyTask("play_game", gameEntity.id, gameEntity.getApk()[0].packageName)
-
+            EnergyBridge.postEnergyTask("play_game", gameEntity.id, gameEntity.getApk()[0].packageName)
             //启动模拟器游戏
             if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
+                if (NewSimulatorGameManager.shouldShowUpdateNewSimulatorAlert(context)) {
+                    NewSimulatorGameManager.showUpdateNewsSimulator(context, null)
+                    return
+                }
                 val downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(gameEntity.getApk()[0].url)
                 if (downloadEntity != null) {
                     val file = File(downloadEntity.path)
@@ -800,6 +876,7 @@ object DownloadItemUtils {
                         download(context, gameEntity, downloadBtn, entrance, location, false, traceEvent)
                         return
                     }
+                    NewFlatLogUtils.logSimulatorGameCardClick("启动")
                     SimulatorGameManager.launchSimulatorGame(downloadEntity, gameEntity)
                 }
                 return
@@ -857,7 +934,15 @@ object DownloadItemUtils {
 
         val msg = FileUtils.isCanDownload(context, gameEntity.getApk()[0].size)
         if (TextUtils.isEmpty(msg)) {
-            DownloadManager.createDownload(context, gameEntity, context.getString(R.string.download), entrance, location, isSubscribe, traceEvent)
+            DownloadManager.createDownload(
+                context,
+                gameEntity,
+                context.getString(R.string.download),
+                entrance,
+                location,
+                isSubscribe,
+                traceEvent
+            )
             Utils.toast(context, gameEntity.name + "已加入下载队列")
             downloadBtn.setText(R.string.downloading)
             downloadBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_NORMAL

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

@@ -62,31 +62,38 @@ object DownloadNotificationHelper {
         } else {
             intent.action = ACTION_DOWNLOAD
         }
-        val pendingIntent = PendingIntent.getBroadcast(HaloApp.getInstance().application,
-                downloadNotificationId,
-                intent,
-                PendingIntent.FLAG_UPDATE_CURRENT)
+        val pendingIntent = PendingIntent.getBroadcast(
+            HaloApp.getInstance().application,
+            downloadNotificationId,
+            intent,
+            PendingIntent.FLAG_UPDATE_CURRENT
+        )
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val channel = NotificationChannel(DOWNLOAD_CHANNEL_ID, DOWNLOAD_CHANNEL_ID, NotificationManager.IMPORTANCE_LOW)
+            val channel =
+                NotificationChannel(DOWNLOAD_CHANNEL_ID, DOWNLOAD_CHANNEL_ID, NotificationManager.IMPORTANCE_LOW)
             notificationManager.createNotificationChannel(channel)
         }
 
         val whenTime = 1000 * 60 * (System.currentTimeMillis() / 1000 / 60)
         val builder = NotificationCompat.Builder(HaloApp.getInstance().application, DOWNLOAD_CHANNEL_ID)
-                .setContentTitle(entity.name)
-                .setSmallIcon(getNotificationIcon())
-                .setContentIntent(pendingIntent)
-                .setGroup(DOWNLOAD_GROUP_KEY)
-                .setWhen(whenTime)
+            .setContentTitle(entity.name)
+            .setSmallIcon(getNotificationIcon())
+            .setContentIntent(pendingIntent)
+            .setGroup(DOWNLOAD_GROUP_KEY)
+            .setWhen(whenTime)
 
         if (xapkStatus == XapkUnzipStatus.FAILURE.name) {
             builder.setContentText("《" + entity.name + "》解压失败，点击查看详情~")
         } else {
             when (entity.status) {
-                DownloadStatus.downloading -> builder.setContentText(String.format("%s(剩%s)",
+                DownloadStatus.downloading -> builder.setContentText(
+                    String.format(
+                        "%s(剩%s)",
                         SpeedUtils.getSpeed(entity.speed),
-                        SpeedUtils.getRemainTime(entity.size, entity.progress, entity.speed * 1024)))
+                        SpeedUtils.getRemainTime(entity.size, entity.progress, entity.speed * 1024)
+                    )
+                )
                 DownloadStatus.done -> builder.setContentText("下载完成，点击立即安装")
                 DownloadStatus.waiting -> builder.setContentText("等待中")
                 DownloadStatus.subscribe,
@@ -116,18 +123,19 @@ object DownloadNotificationHelper {
             }
 
             if (entity.status == DownloadStatus.delete
-                    || entity.status == DownloadStatus.cancel
-                    || entity.status == DownloadStatus.hijack
-                    || entity.status == DownloadStatus.unqualified
-                    || entity.status == DownloadStatus.unavailable
-                    || entity.status == DownloadStatus.banned
-                    || entity.status == DownloadStatus.uncertificated
-                    || entity.status == DownloadStatus.notfound
-                    || entity.status == DownloadStatus.overflow
-                    || (entity.status == DownloadStatus.done // 触发安装事件以后也 cancel 掉通知
-                            && !entity.meta[Constants.MARK_ALREADY_TRIGGERED_INSTALLATION].isNullOrEmpty()
-                            && xapkStatus != XapkUnzipStatus.FAILURE.name)
-                    || entity.status == DownloadStatus.done && entity.isSimulatorGame()) {//模拟器游戏下载完需要cancel掉通知
+                || entity.status == DownloadStatus.cancel
+                || entity.status == DownloadStatus.hijack
+                || entity.status == DownloadStatus.unqualified
+                || entity.status == DownloadStatus.unavailable
+                || entity.status == DownloadStatus.banned
+                || entity.status == DownloadStatus.uncertificated
+                || entity.status == DownloadStatus.notfound
+                || entity.status == DownloadStatus.overflow
+                || (entity.status == DownloadStatus.done // 触发安装事件以后也 cancel 掉通知
+                        && !entity.meta[Constants.MARK_ALREADY_TRIGGERED_INSTALLATION].isNullOrEmpty()
+                        && xapkStatus != XapkUnzipStatus.FAILURE.name)
+                || entity.status == DownloadStatus.done && entity.isSimulatorGame()
+            ) {//模拟器游戏下载完需要cancel掉通知
                 requireUpdateNotificationGroupDelay = true
                 notificationManager.cancel(entity.path, DOWNLOAD_NOTIFICATION_ID)
             } else {
@@ -174,7 +182,8 @@ object DownloadNotificationHelper {
                     // 删除组可能会把组内所有通知一并删除
                     notificationManager.cancel(DOWNLOAD_NOTIFICATION_FOLD_ID)
                 } else if (downloadNotificationSize != 0 && downloadGroupNotificationSize == 0) {
-                    val groupBuilder = NotificationCompat.Builder(HaloApp.getInstance().application, DOWNLOAD_CHANNEL_ID)
+                    val groupBuilder =
+                        NotificationCompat.Builder(HaloApp.getInstance().application, DOWNLOAD_CHANNEL_ID)
                             .setSmallIcon(getNotificationIcon())
                             .setGroup(DOWNLOAD_GROUP_KEY)
                             .setGroupSummary(true)

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

@@ -1,6 +1,6 @@
 package com.gh.common.util
 
-import android.preference.PreferenceManager
+import com.gh.common.constant.Config
 import com.gh.common.exposure.ExposureUtils
 import com.gh.common.simulator.SimulatorDownloadManager
 import com.gh.common.simulator.SimulatorGameManager
@@ -16,13 +16,13 @@ import com.gh.gamecenter.common.eventbus.EBShowDialog
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.utils.*
-import com.gh.gamecenter.energy.utils.EnergyTaskHelper
+import com.gh.gamecenter.energy.EnergyBridge
 import com.gh.gamecenter.entity.GameEntity
 import com.gh.gamecenter.entity.SimpleGameEntity
 import com.gh.gamecenter.entity.SimulatorEntity
 import com.gh.gamecenter.eventbus.EBDownloadStatus
 import com.gh.gamecenter.retrofit.RetrofitManager
-import com.gh.gamecenter.setting.GameDownloadSettingFragment
+import com.gh.gamecenter.setting.compose.activity.ComposeGameDownloadSettingActivity
 import com.gh.gamecenter.suggest.SuggestType
 import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
@@ -139,7 +139,7 @@ object DownloadObserver {
                     // 删除任务
                     downloadEntity.status = DownloadStatus.cancel
                     downloadManager.cancel(downloadEntity.url)
-                }else if (DownloadStatus.banned == downloadEntity.status) {
+                } else if (DownloadStatus.banned == downloadEntity.status) {
                     ToastUtils.showToast("网络异常")
                     // 删除任务
                     downloadEntity.status = DownloadStatus.cancel
@@ -202,11 +202,7 @@ object DownloadObserver {
 
             GameActivityDownloadHelper.clear()
 
-            EnergyTaskHelper.postEnergyTask(
-                "download_game",
-                downloadEntity.gameId,
-                downloadEntity.packageName
-            )
+            EnergyBridge.postEnergyTask("download_game", downloadEntity.gameId, downloadEntity.packageName)
             val platform = PlatformUtils.getInstance(mApplication)
                 .getPlatformName(downloadEntity.platform)
             if (platform != null) {
@@ -219,7 +215,10 @@ object DownloadObserver {
                                 downloadEntity.path
                             )
                         )
-                    downloadEntity.isPlugin -> Utils.toast(mApplication, downloadEntity.name + " - " + platform + " - 下载完成")
+                    downloadEntity.isPlugin -> Utils.toast(
+                        mApplication,
+                        downloadEntity.name + " - " + platform + " - 下载完成"
+                    )
                     else -> {
                         if (downloadEntity.isVGame()) {
                             VHelper.showFloatingWindow(downloadEntity.packageName)
@@ -240,29 +239,39 @@ object DownloadObserver {
                     val simulatorJson = downloadEntity.getMetaExtra(Constants.SIMULATOR)
                     val gameName = downloadEntity.getMetaExtra(Constants.GAME_NAME)
                     if (simulatorJson.isEmpty()) return
-                    val simulator = GsonUtils.fromJson(simulatorJson, SimulatorEntity::class.java)
+                    var simulator = GsonUtils.fromJson(simulatorJson, SimulatorEntity::class.java)
                     val isInstalled = PackageUtils.isInstalledFromAllPackage(HaloApp.getInstance().application, simulator.apk?.packageName)
-                    if (!isInstalled) {
-                        val currentActivity = AppManager.getInstance().currentActivity()
-                            ?: return
-
-                        SimulatorDownloadManager.getInstance().showDownloadDialog(
-                            currentActivity, simulator,
-                            SimulatorDownloadManager.SimulatorLocation.LAUNCH, downloadEntity.gameId, gameName, null
-                        )
+                    val isInstalledNewSimulator = SimulatorGameManager.isNewSimulatorInstalled(HaloApp.getInstance().application)
+                    val isInstalledOldSimulator = SimulatorGameManager.isOldSimulatorInstalled(HaloApp.getInstance().application)
+//                    if (!isInstalled && !isInstalledNewSimulator) {
+                    val currentActivity = AppManager.getInstance().currentActivity()
+                        ?: return
+                    if (!isInstalledOldSimulator || isInstalledNewSimulator) { //如果没有安装任一旧的模拟器 或者下载了新模拟器 则使用新版本模拟器
+                        Config.getNewSimulatorEntitySetting().let {
+                            simulator = it!!
+                        }
                     }
+                    SimulatorDownloadManager.getInstance().showDownloadDialog(
+                        currentActivity, simulator,
+                        SimulatorDownloadManager.SimulatorLocation.LAUNCH, downloadEntity.gameId, gameName, null
+                    )
+//                    }
                     SimulatorGameManager.recordDownloadSimulatorGame(downloadEntity.gameId, simulator.type)
                     SimulatorGameManager.postPlayedGame(downloadEntity.gameId, downloadEntity.packageName)
                 } else {
                     val downloadType = downloadEntity.getMetaExtra(Constants.EXTRA_DOWNLOAD_TYPE)
                     // 是否是自动安装
-                    val isAutoInstall = SPUtils.getBoolean(GameDownloadSettingFragment.AUTO_INSTALL_SP_KEY, true)
+                    val isAutoInstall = SPUtils.getBoolean(ComposeGameDownloadSettingActivity.AUTO_INSTALL_SP_KEY, true)
                     if (downloadType == Constants.SIMULATOR_DOWNLOAD || isAutoInstall) {
                         if (FileUtils.isEmptyFile(downloadEntity.path)) {
                             Utils.toast(mApplication, R.string.install_failure_hint)
                             downloadManager.cancel(downloadEntity.url)
                         } else {
-                            if (PackageUtils.isCanLaunchSetup(mApplication, downloadEntity.path) || downloadType == Constants.SMOOTH_GAME) {
+                            if (PackageUtils.isCanLaunchSetup(
+                                    mApplication,
+                                    downloadEntity.path
+                                ) || downloadType == Constants.SMOOTH_GAME
+                            ) {
                                 downloadEntity.meta[Constants.MARK_ALREADY_TRIGGERED_INSTALLATION] = "YES"
                                 tryWithDefaultCatch {
                                     PackageInstaller.install(mApplication, downloadEntity, false)
@@ -309,15 +318,23 @@ object DownloadObserver {
             if (downloadType == Constants.SIMULATOR_DOWNLOAD) {
                 val currentActivity = AppManager.getInstance().currentActivity()
                     ?: return
-                DialogUtils.showSimulatorParseErrorDialog(currentActivity, downloadEntity.gameId, downloadEntity.name,object :ConfirmListener{
-                    override fun onConfirm() {
-                        val simulator = HaloApp.get(downloadEntity.name, true) as? SimulatorEntity
-                            ?: return
-                        DownloadManager.getInstance().cancel(downloadEntity.url, true, true, false)
-                        SimulatorDownloadManager.getInstance()
-                            .showDownloadDialog(currentActivity, simulator, SimulatorDownloadManager.SimulatorLocation.SIMULATOR_GAME)
-                    }
-                })
+                DialogUtils.showSimulatorParseErrorDialog(
+                    currentActivity,
+                    downloadEntity.gameId,
+                    downloadEntity.name,
+                    object : ConfirmListener {
+                        override fun onConfirm() {
+                            val simulator = HaloApp.get(downloadEntity.name, true) as? SimulatorEntity
+                                ?: return
+                            DownloadManager.getInstance().cancel(downloadEntity.url, true, true, false)
+                            SimulatorDownloadManager.getInstance()
+                                .showDownloadDialog(
+                                    currentActivity,
+                                    simulator,
+                                    SimulatorDownloadManager.SimulatorLocation.SIMULATOR_GAME
+                                )
+                        }
+                    })
             }
         }
     }
@@ -345,7 +362,8 @@ object DownloadObserver {
         if (downloadEntity.isPluggable) {
             type = ExposureUtils.DownloadType.PLUGIN_DOWNLOAD
         }
-        val isPlatformRecommend = java.lang.Boolean.parseBoolean(downloadEntity.getMetaExtra(Constants.IS_PLATFORM_RECOMMEND))
+        val isPlatformRecommend =
+            java.lang.Boolean.parseBoolean(downloadEntity.getMetaExtra(Constants.IS_PLATFORM_RECOMMEND))
         ExposureUtils.logADownloadCompleteExposureEvent(
             GameEntity(
                 id = downloadEntity.gameId,

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

@@ -90,6 +90,7 @@ public class EntranceUtils {
             context.startActivity(SplashScreenActivity.getSplashScreenIntent(context, bundle));
         }
     }
+
     public static void saveShortcut(String activityName, @Nullable Bundle bundle) {
         if (BuildConfig.DEBUG) {
             if (activityName.contains("MainActivity")) {

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

@@ -67,7 +67,14 @@ object ErrorHelper {
      * [showHighPriorityHint] 用来标识有同样错误码可以触发两种处理时，为 true 时选择重要的
      */
     @JvmStatic
-    fun handleError(context: Context, errorString: String?, showHighPriorityHint: Boolean = false, realNameConfirmListener: ConfirmListener? = null) {
+    @JvmOverloads
+    fun handleError(
+        context: Context,
+        errorString: String?,
+        showHighPriorityHint: Boolean = false,
+        realNameConfirmListener: ConfirmListener? = null,
+        entrance: String = ""
+    ) {
         val errorEntity = errorString?.toObject<ErrorEntity>()
 
         if (errorEntity == null) {
@@ -80,7 +87,7 @@ object ErrorHelper {
             return
         }
 
-        handleError(context, showHighPriorityHint, errorEntity, realNameConfirmListener)
+        handleError(context, showHighPriorityHint, errorEntity, realNameConfirmListener, entrance)
     }
 
     /***
@@ -104,7 +111,8 @@ object ErrorHelper {
         context: Context,
         showHighPriorityHint: Boolean = false,
         errorEntity: ErrorEntity,
-        realNameConfirmListener: ConfirmListener? = null
+        realNameConfirmListener: ConfirmListener? = null,
+        entrance: String = ""
     ) {
         when (errorEntity.code) {
             403050,
@@ -173,7 +181,7 @@ object ErrorHelper {
 
             403209 -> handleRealNameError(context, errorEntity, realNameConfirmListener)
 
-            403210 -> handleVerifyPhoneError(context, errorEntity, realNameConfirmListener)
+            403210 -> handleVerifyPhoneError(context, errorEntity, realNameConfirmListener, entrance)
 
             else -> Utils.toast(context, R.string.post_failure_hint)
         }
@@ -193,7 +201,11 @@ object ErrorHelper {
         }
     }
 
-    private fun handleRealNameError(context: Context, errorEntity: ErrorEntity, realNameConfirmListener: ConfirmListener?) {
+    private fun handleRealNameError(
+        context: Context,
+        errorEntity: ErrorEntity,
+        realNameConfirmListener: ConfirmListener?
+    ) {
         DialogHelper.showDialog(
             context,
             "实名提醒",
@@ -202,9 +214,23 @@ object ErrorHelper {
             uiModificationCallback = { binding ->
                 binding.hintTv.visibility = View.VISIBLE
                 binding.hintTv.layoutParams =
-                    (binding.hintTv.layoutParams as ViewGroup.MarginLayoutParams).apply { setMargins(0, 8F.dip2px(), 0, 0) }
+                    (binding.hintTv.layoutParams as ViewGroup.MarginLayoutParams).apply {
+                        setMargins(
+                            0,
+                            8F.dip2px(),
+                            0,
+                            0
+                        )
+                    }
                 binding.lineView.layoutParams =
-                    (binding.lineView.layoutParams as ViewGroup.MarginLayoutParams).apply { setMargins(0, 23F.dip2px(), 0, 0) }
+                    (binding.lineView.layoutParams as ViewGroup.MarginLayoutParams).apply {
+                        setMargins(
+                            0,
+                            23F.dip2px(),
+                            0,
+                            0
+                        )
+                    }
                 binding.hintTv.text = errorEntity.data?.text
                 binding.hintTv.setTextColor(R.color.theme_font.toColor(context))
                 binding.hintTv.setOnClickListener {
@@ -235,7 +261,12 @@ object ErrorHelper {
         )
     }
 
-    private fun handleVerifyPhoneError(context: Context, errorEntity: ErrorEntity, realNameConfirmListener: ConfirmListener?) {
+    private fun handleVerifyPhoneError(
+        context: Context,
+        errorEntity: ErrorEntity,
+        realNameConfirmListener: ConfirmListener?,
+        entrance: String
+    ) {
         DialogHelper.showDialog(
             context,
             "手机号验证",
@@ -244,14 +275,29 @@ object ErrorHelper {
             uiModificationCallback = { binding ->
                 binding.hintTv.visibility = View.VISIBLE
                 binding.hintTv.layoutParams =
-                    (binding.hintTv.layoutParams as ViewGroup.MarginLayoutParams).apply { setMargins(0, 8F.dip2px(), 0, 0) }
+                    (binding.hintTv.layoutParams as ViewGroup.MarginLayoutParams).apply {
+                        setMargins(
+                            0,
+                            8F.dip2px(),
+                            0,
+                            0
+                        )
+                    }
                 binding.lineView.layoutParams =
-                    (binding.lineView.layoutParams as ViewGroup.MarginLayoutParams).apply { setMargins(0, 23F.dip2px(), 0, 0) }
+                    (binding.lineView.layoutParams as ViewGroup.MarginLayoutParams).apply {
+                        setMargins(
+                            0,
+                            23F.dip2px(),
+                            0,
+                            0
+                        )
+                    }
                 binding.hintTv.text = errorEntity.data?.text
                 binding.hintTv.setTextColor(R.color.theme_font.toColor(context))
                 binding.hintTv.setOnClickListener {
                     errorEntity.data?.toLinkEntity()?.let { entity ->
                         DirectUtils.directToLinkPage(context, entity, "手机号验证", "")
+                        NewFlatLogUtils.logPhoneNumberVerifyDialogClick(entrance, "点击了解更多")
                     }
                 }
             },
@@ -270,6 +316,11 @@ object ErrorHelper {
                                 }
                             }
                         })
+                NewFlatLogUtils.logPhoneNumberVerifyDialogClick(entrance, "前往手机号验证")
+                NewFlatLogUtils.logPhoneNumberVerifyDialogShow("手机号验证弹窗-前往验证")
+            },
+            cancelClickCallback = {
+                NewFlatLogUtils.logPhoneNumberVerifyDialogClick(entrance, "以后再说")
             }
         )
     }

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

@@ -7,7 +7,7 @@ import android.widget.TextView
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.energy.view.EnergyCenterActivity
+import com.gh.gamecenter.energy.EnergyBridge
 import com.lightgame.utils.Util_System_Keyboard
 import com.lzf.easyfloat.EasyFloat
 import com.lzf.easyfloat.enums.ShowPattern
@@ -38,55 +38,55 @@ object FloatingBackViewManager {
         if (Build.VERSION.SDK_INT == Build.VERSION_CODES.JELLY_BEAN) return
 
         EasyFloat.with(activity)
-                .setLayout(R.layout.layout_task_back)
-                .setTag(FLOATING_BACK_VIEW)
-                .setAnimator(null)
-                .setGravity(Gravity.TOP.xor(Gravity.START), 0, mLastPositionY)
-                .setSidePattern(SidePattern.LEFT)
-                .setShowPattern(ShowPattern.CURRENT_ACTIVITY)
-                .registerCallback {
-                    createResult { _, _, view ->
-                        val titleView = view?.findViewById<TextView>(R.id.titleTv)
+            .setLayout(R.layout.layout_task_back)
+            .setTag(FLOATING_BACK_VIEW)
+            .setAnimator(null)
+            .setGravity(Gravity.TOP.xor(Gravity.START), 0, mLastPositionY)
+            .setSidePattern(SidePattern.LEFT)
+            .setShowPattern(ShowPattern.CURRENT_ACTIVITY)
+            .registerCallback {
+                createResult { _, _, view ->
+                    val titleView = view?.findViewById<TextView>(R.id.titleTv)
 
-                        view?.setOnClickListener {
-                            // 先收起键盘
-                            Util_System_Keyboard.hideSoftKeyboard(activity)
+                    view?.setOnClickListener {
+                        // 先收起键盘
+                        Util_System_Keyboard.hideSoftKeyboard(activity)
 
-                            if (mType == TYPE_ACTIVITY) {
-                                titleView?.text = "返回活动"
+                        if (mType == TYPE_ACTIVITY) {
+                            titleView?.text = "返回活动"
 
-                                DirectUtils.directToWebView(activity, mActivityUrl, ("返回活动浮窗"))
-                            } else if (mType == TYPE_TASK) {
-                                titleView?.text = "返回任务"
+                            DirectUtils.directToWebView(activity, mActivityUrl, ("返回活动浮窗"))
+                        } else if (mType == TYPE_TASK) {
+                            titleView?.text = "返回任务"
 
-                                activity.startActivity(EnergyCenterActivity.getIntent(activity))
-                            }
-
-                            disableBackView()
-                        }
-                    }
-
-                    dragEnd { view ->
-                        val statusBarHeight = DisplayUtils.getStatusBarHeight(activity.resources)
-
-                        // 记录停止拖动的最后位置
-                        val outLocation = IntArray(2)
-                        view.getLocationInWindow(outLocation)
-                        val yOffset = outLocation[1]
-
-                        if (yOffset <= statusBarHeight) {
-                            // 判断状态栏是否被消费
-                            if (yOffset == view.y.toInt()) {
-                                view.y = statusBarHeight.toFloat()
-                            } else {
-                                view.y = 0F
-                            }
+                            activity.startActivity(EnergyBridge.getEnergyCenterIntent(activity))
                         }
 
-                        mLastPositionY = yOffset
+                        disableBackView()
                     }
                 }
-                .show()
+
+                dragEnd { view ->
+                    val statusBarHeight = DisplayUtils.getStatusBarHeight(activity.resources)
+
+                    // 记录停止拖动的最后位置
+                    val outLocation = IntArray(2)
+                    view.getLocationInWindow(outLocation)
+                    val yOffset = outLocation[1]
+
+                    if (yOffset <= statusBarHeight) {
+                        // 判断状态栏是否被消费
+                        if (yOffset == view.y.toInt()) {
+                            view.y = statusBarHeight.toFloat()
+                        } else {
+                            view.y = 0F
+                        }
+                    }
+
+                    mLastPositionY = yOffset
+                }
+            }
+            .show()
     }
 
     /**
@@ -125,7 +125,7 @@ object FloatingBackViewManager {
     /**
      * 返回小浮窗类型是否为活动
      */
-    fun isTypeActivity() : Boolean {
+    fun isTypeActivity(): Boolean {
         return mType == TYPE_ACTIVITY
     }
 

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

@@ -264,8 +264,11 @@ object GameActivityDownloadHelper {
     ) {
         val msg = FileUtils.isCanDownload(context, apk.size)
         if (TextUtils.isEmpty(msg)) {
-            DownloadManager.createDownload(context, apk, gameEntity, context.getString(
-                R.string.download), entrance, location, isSubscribe, traceEvent)
+            DownloadManager.createDownload(
+                context, apk, gameEntity, context.getString(
+                    R.string.download
+                ), entrance, location, isSubscribe, traceEvent
+            )
             ToastUtils.toast("${gameEntity.name}已加入下载队列")
         } else {
             ToastUtils.toast(msg)
@@ -369,7 +372,8 @@ object GameActivityDownloadHelper {
                 if (PackageUtils.isInstalled(context, apk.packageName)) {
                     // 是否可更新
                     if (PackageUtils.isCanUpdate(apk, event.gameId)
-                        || PackageUtils.isNonPluginUpdatable(apk, gameEntity)) {
+                        || PackageUtils.isNonPluginUpdatable(apk, gameEntity)
+                    ) {
                         handler.complete(false)
                     } else {
                         // 已安装且无更新

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

@@ -40,7 +40,7 @@ object GameCollectionSquareBrowseTaskHelper {
     private var mBrowseTimeCount = 0
     private var mIsBrowseTimeCountEnabled = false // 游戏单广场浏览时间统计是否开启
     private var mBrowseTimeTimeout = 15
-    private var mIsBrowseTimeCountValid  = false // 游戏单广场浏览时间统计是否有效
+    private var mIsBrowseTimeCountValid = false // 游戏单广场浏览时间统计是否有效
     private var mBrowsePro: ProgressBar? = null
     private var mIsFinished = false
     private var mNeedShowFloatView = false
@@ -161,7 +161,8 @@ object GameCollectionSquareBrowseTaskHelper {
     private fun isTopActivityGameCollectionRelated(activity: Activity): Boolean {
         return isGameCollectionSquare(activity)
                 || (activity is GameCollectionDetailActivity
-                && activity.intent.getBundleExtra(ToolBarActivity.NORMAL_FRAGMENT_BUNDLE)?.getBoolean(KEY_IS_FORM_BROWSE_TASK) == true)
+                && activity.intent.getBundleExtra(ToolBarActivity.NORMAL_FRAGMENT_BUNDLE)
+            ?.getBoolean(KEY_IS_FORM_BROWSE_TASK) == true)
     }
 
     private fun isGameCollectionSquare(activity: Activity, checkIsFromTask: Boolean = true): Boolean {

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

@@ -40,14 +40,14 @@ object GameSubstituteRepositoryHelper {
     @JvmStatic
     fun updateGameSubstituteRepository() {
         mApi.reserveColumns
-                .subscribeOn(Schedulers.io())
-                .subscribe(object : Response<List<SubjectEntity>>() {
-                    override fun onResponse(response: List<SubjectEntity>?) {
-                        super.onResponse(response)
+            .subscribeOn(Schedulers.io())
+            .subscribe(object : Response<List<SubjectEntity>>() {
+                override fun onResponse(response: List<SubjectEntity>?) {
+                    super.onResponse(response)
 
-                        updateGameRepository(response)
-                    }
-                })
+                    updateGameRepository(response)
+                }
+            })
     }
 
     @JvmStatic
@@ -116,10 +116,12 @@ object GameSubstituteRepositoryHelper {
     /**
      * 替换游戏，包括 已安装，历史下载，历史已安装等类型
      */
-    fun replaceGames(gameList: MutableList<GameEntity>,
-                     alreadyDisplayedGameIdSet: HashSet<String>,
-                     relatedCollectionId: String,
-                     shouldLogReplaceEvent: Boolean) {
+    fun replaceGames(
+        gameList: MutableList<GameEntity>,
+        alreadyDisplayedGameIdSet: HashSet<String>,
+        relatedCollectionId: String,
+        shouldLogReplaceEvent: Boolean
+    ) {
         val positionOfTheGameToReplaceList = arrayListOf<Int>()
 
         // 标记需要替换的已安装游戏

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

@@ -89,7 +89,7 @@ public class GameUtils {
         int installCount = 0;   // 已安装数量
 
         boolean isRelatedEmulatorInstalled = false; // 若该游戏是模拟器游戏时其对应的模拟器是否已经安装
-
+        boolean isInstalledNewSimulator = false;// 是否安装新模拟器
         DownloadEntity downloadEntity = null;
         Object gh_id;
         apkFor:
@@ -138,6 +138,7 @@ public class GameUtils {
                 }
             }
             if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
+                isInstalledNewSimulator = SimulatorGameManager.isNewSimulatorInstalled(context);
                 DownloadEntity simulatorDownloadEntity = SimulatorGameManager.findDownloadEntityByUrl(apkEntity.getUrl());
                 if (simulatorDownloadEntity != null && gameEntity.getSimulator() != null) {
                     boolean isInstalled = PackageUtils.isInstalledFromAllPackage(context, gameEntity.getSimulator().getApk().getPackageName());
@@ -150,8 +151,7 @@ public class GameUtils {
                 }
             }
         }
-
-        if (isRelatedEmulatorInstalled && doneCount != 0) {
+        if ((isRelatedEmulatorInstalled || isInstalledNewSimulator) && doneCount != 0) {
             return context.getString(R.string.launch);
         }
 

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

@@ -14,9 +14,10 @@ class GhMatisseVideoApplyFilter : ApplyFilter() {
             Utils.toast(context, "网络异常，请检查手机网络状态")
         } else if (!NetworkUtils.isWifiConnected(context)) {
             DialogHelper.showDialog(context, "提示",
-                    "您当前正在使用移动网络上传视频，确定继续上传吗？",
-                    "继续上传", "暂时不了",
-                    { callBack.onApply() }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true))
+                "您当前正在使用移动网络上传视频，确定继续上传吗？",
+                "继续上传", "暂时不了",
+                { callBack.onApply() }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
+            )
         } else {
             callBack.onApply()
         }

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

@@ -4,7 +4,7 @@ import com.contrarywind.adapter.WheelAdapter;
 
 /**
  * 注意：选择后的数据其实是dates的position，需要在回调时对返回的date数据进行转换
- *
+ * <p>
  * 例子请见：
  * {@link com.gh.gamecenter.servers.add.AddKaiFuActivity}
  */

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

@@ -21,17 +21,19 @@ object HomeBottomBarHelper {
 
         }
         val animationCode = HaloApp.getInstance().application.assets
-                .open("lottie/tab_game.json")
-                .bufferedReader().use { it.readText() }
-        return SubjectRecommendEntity(link = "5de21b5d75e6fa054f784882",
-                type = "block",
-                text = "游戏库",
-                name = "游戏库",
-                iconSelect = "https://resource.ghzs.com/image/game/library/entrance/5e183202913fbd002c75f247.png",
-                iconUnselect = "https://resource.ghzs.com/image/game/library/entrance/5e1831fd913fbd003024641e.png",
-                animationCode = animationCode,
-                default = false,
-                display = Display())
+            .open("lottie/tab_game.json")
+            .bufferedReader().use { it.readText() }
+        return SubjectRecommendEntity(
+            link = "5de21b5d75e6fa054f784882",
+            type = "block",
+            text = "游戏库",
+            name = "游戏库",
+            iconSelect = "https://resource.ghzs.com/image/game/library/entrance/5e183202913fbd002c75f247.png",
+            iconUnselect = "https://resource.ghzs.com/image/game/library/entrance/5e1831fd913fbd003024641e.png",
+            animationCode = animationCode,
+            default = false,
+            display = Display()
+        )
     }
 
     @JvmStatic

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

@@ -19,7 +19,15 @@ object HomePluggableHelper {
         if (apkList.isNotEmpty()) {
             val apk = apkList.first()
             val tag = if (isNever) "never" else apk.version ?: ""
-            tryCatchInRelease { mHomePluggableFilterDao.addData(HomePluggableFilterEntity(pkgName = apk.packageName, tag = tag, active = isNever)) }
+            tryCatchInRelease {
+                mHomePluggableFilterDao.addData(
+                    HomePluggableFilterEntity(
+                        pkgName = apk.packageName,
+                        tag = tag,
+                        active = isNever
+                    )
+                )
+            }
         }
     }
 

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

@@ -54,7 +54,13 @@ object IntegralLogHelper {
         log(json, "score", false)
     }
 
-    fun logCommodityCategory(event: String, location: String, entrance: String, categoryId: String, categoryName: String) {
+    fun logCommodityCategory(
+        event: String,
+        location: String,
+        entrance: String,
+        categoryId: String,
+        categoryName: String
+    ) {
         val json = JSONObject().apply {
             tryWithDefaultCatch {
                 put("meta", LogUtils.getMetaObject())

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

@@ -356,7 +356,9 @@ public class LibaoUtils {
                         break;
                     case "查看":
                         if (!TextUtils.isEmpty(libaoEntity.getDes())) {
-                            DialogHelper.showCenterDialog(v.getContext(), "使用说明", Html.fromHtml(libaoEntity.getDes()), "关闭", "", () -> {}, () -> {});
+                            DialogHelper.showCenterDialog(v.getContext(), "使用说明", Html.fromHtml(libaoEntity.getDes()), "关闭", "", () -> {
+                            }, () -> {
+                            });
                         }
                         break;
                     case "再领":
@@ -424,7 +426,9 @@ public class LibaoUtils {
                     break;
                 case "check":
                     if (!TextUtils.isEmpty(libaoEntity.getDes())) {
-                        DialogHelper.showDialog(context, "使用说明", Html.fromHtml(libaoEntity.getDes()), "关闭", "", () -> {}, () -> {}, false, "", "");
+                        DialogHelper.showDialog(context, "使用说明", Html.fromHtml(libaoEntity.getDes()), "关闭", "", () -> {
+                        }, () -> {
+                        }, false, "", "");
                     }
                     break;
                 case "repeatLing":
@@ -490,7 +494,6 @@ public class LibaoUtils {
                 initLibaoCode(libaoEntity, me);
                 if (adapter != null) adapter.initLibaoCode(me);
                 EventBus.getDefault().post(new EBReuse("libaoChanged"));
-                dispatchLiBaoChangeEventToFlutter(libaoEntity.getId(), "linged", GsonUtils.toJson(me));
                 if (listener != null) listener.onLibaoStatusChange();
                 uploadEvent(libaoEntity, true, entrance);
                 String des;
@@ -601,7 +604,6 @@ public class LibaoUtils {
                 initLibaoCode(libaoEntity, me);
                 if (listener != null) listener.onLibaoStatusChange();
                 EventBus.getDefault().post(new EBReuse("libaoChanged"));
-                dispatchLiBaoChangeEventToFlutter(libaoEntity.getId(), "linged", GsonUtils.toJson(me));
                 uploadEvent(libaoEntity, false, entrance);
 
                 if (adapter != null) {
@@ -694,15 +696,6 @@ public class LibaoUtils {
         }, captchaCode);
     }
 
-    /**
-     * 发送礼包领取状态变化事件给Flutter
-     * 请不要随意修改方法名
-     * @param libaoId 礼包ID
-     * @param status 礼包状态
-     * @param meJson 礼包领取信息
-     */
-    public static void dispatchLiBaoChangeEventToFlutter(String libaoId, String status, String meJson) {}
-
     public static void initLibaoCode(LibaoEntity libaoEntity, UserDataLibaoEntity userDataLibaoEntity) {
         MeEntity userData = libaoEntity.getMe();
         if (userData == null) {

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

@@ -11,6 +11,7 @@ import com.gh.common.exposure.ExposureEvent;
 import com.gh.common.exposure.ExposureSource;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.common.constant.Constants;
+import com.gh.gamecenter.common.entity.CommunityEntity;
 import com.gh.gamecenter.common.entity.ExposureEntity;
 import com.gh.gamecenter.common.exposure.meta.Meta;
 import com.gh.gamecenter.common.exposure.meta.MetaUtil;
@@ -18,7 +19,6 @@ import com.gh.gamecenter.common.loghub.LoghubUtils;
 import com.gh.gamecenter.common.loghub.SimpleLogContainerEntity;
 import com.gh.gamecenter.common.utils.DeviceUtils;
 import com.gh.gamecenter.core.utils.GsonUtils;
-import com.gh.gamecenter.common.entity.CommunityEntity;
 import com.gh.gamecenter.entity.DetectionObjectEntity;
 import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.entity.PackageDialogEntity;
@@ -484,31 +484,6 @@ public class LogUtils {
         return metaObject;
     }
 
-    public static JSONObject getNewMetaObject() {
-        Meta meta = MetaUtil.INSTANCE.getMeta();
-        JSONObject metaObject = new JSONObject();
-        try {
-            metaObject.put("dia", MetaUtil.getBase64EncodedAndroidId());
-            metaObject.put("android_sdk", meta.getAndroid_sdk());
-            metaObject.put("android_version", meta.getAndroid_version());
-            metaObject.put("app_version", meta.getAppVersion());
-            metaObject.put("channel", meta.getChannel());
-            metaObject.put("gid", meta.getGid());
-            metaObject.put("jnfj", MetaUtil.getBase64EncodedIMEI());
-            metaObject.put("mac", meta.getMac());
-            metaObject.put("manufacturer", meta.getManufacturer());
-            metaObject.put("model", meta.getModel());
-            metaObject.put("network", meta.getNetwork());
-            metaObject.put("os", meta.getOs());
-            metaObject.put("user_id", meta.getUserId());
-            metaObject.put("oaid", HaloApp.getInstance().getOAID());
-
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        return metaObject;
-    }
-
     private static void uploadCommunity(JSONObject object) {
         try {
             object.put("meta", getMetaObject());
@@ -578,7 +553,7 @@ public class LogUtils {
     }
 
     public static void uploadSearchGame(String event, String location, String key, String searchType) {
-        uploadSearchClick(event, location, key, searchType, "", "", false);
+        uploadSearchClick(event, location, key, searchType, "", "", false, false);
     }
 
     public static void uploadSearchClick(String event,
@@ -587,7 +562,8 @@ public class LogUtils {
                                          String searchType,
                                          String gameId,
                                          String gameName,
-                                         Boolean isMirrorData) {
+                                         Boolean isMirrorData,
+                                         Boolean isAdData) {
         JSONObject object = new JSONObject();
         JSONObject payload = new JSONObject();
         try {
@@ -601,6 +577,7 @@ public class LogUtils {
             payload.put("game_id", gameId); //event为search_click才取值
             payload.put("game_name", gameName); //event为search_click才取值
             payload.put("is_mirror_data", isMirrorData);
+            payload.put("is_ad_data", isAdData);
             object.put("payload", payload);
         } catch (JSONException e) {
             e.printStackTrace();

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

@@ -3,6 +3,7 @@ package com.gh.common.util
 import com.gh.gamecenter.common.json.JsonObjectBuilder
 import com.gh.gamecenter.common.json.json
 import com.gh.gamecenter.common.loghub.LoghubUtils
+import com.gh.gamecenter.common.utils.LogUtils
 import com.lightgame.utils.Utils
 import org.json.JSONArray
 import org.json.JSONObject
@@ -275,6 +276,19 @@ object NewFlatLogUtils {
         log(json, "event", false)
     }
 
+    //玩过tab清除游戏记录弹窗点击事件
+    @JvmStatic
+    fun logMyGamePlayedTabClearGameDialogClick(text: String, gameId: String, gameName: String) {
+        val json = json {
+            "event" to "game_self_played_history_clear_dialog_click"
+            "text" to text
+            "game_id" to gameId
+            "game_name" to gameName
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
     //关注tab关注游戏 我的游戏-关注 ，点击热门游戏推荐时上报
     @JvmStatic
     fun logMyGameFollowTabHotGameClick(content: String, gameId: String, gameName: String) {
@@ -447,17 +461,6 @@ object NewFlatLogUtils {
         log(json, "event", false)
     }
 
-    //设置点击深色模式跟随系统切换开关
-    @JvmStatic
-    fun logHaloSelfNightModeOsSwitch(isOn: Boolean) {
-        val json = json {
-            "event" to "halo_self_night_mode_os_switch"
-            "is_on" to isOn
-            parseAndPutMeta().invoke(this)
-        }
-        log(json, "event", false)
-    }
-
     //触发关闭深色模式跟随系统切换弹窗
     @JvmStatic
     fun logHaloSelfNightModeOsDialog(buttonText: String) {
@@ -529,4 +532,285 @@ object NewFlatLogUtils {
         }
         log(json, "event", false)
     }
+
+    //进入游戏详情/离开游戏详情
+    fun logGameDetailEnterOrExit(event: String, gameName: String, gameId: String) {
+        val json = json {
+            "event" to event
+            "game_name" to gameName
+            "game_id" to gameId
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    //手机号验证弹窗点击事件
+    fun logPhoneNumberVerifyDialogClick(entrance: String, text: String) {
+        val json = json {
+            "event" to "publish_phone_number_verify_dialog_click"
+            "entrance" to entrance
+            "text" to text
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    //手机号验证界面展示事件
+    fun logPhoneNumberVerifyDialogShow(entrance: String) {
+        val json = json {
+            "event" to "publish_phone_number_verify_dialog_show"
+            "entrance" to entrance
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+
+    //完成手机号验证
+    fun logPhoneNumberVerifyDialogSuccess() {
+        val json = json {
+            "event" to "publish_phone_number_verify_dialog_success"
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    // 进入活动页面
+    fun logActivityPageEnter(entrance: String, activityId: String) {
+        val json = json {
+            "event" to "activity_page_enter"
+            "entrance" to entrance
+            "activity_id" to activityId
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    // 活动页面浏览
+    fun logActivityPageView(interval: Int, activityId: String) {
+        val json = json {
+            "event" to "activity_page_view"
+            "interval" to interval
+            "activity_id" to activityId
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    //模拟器更新弹窗展示事件
+    @JvmStatic
+    fun logSimulatorUpdateAlertShow() {
+        val json = json {
+            "event" to "simulator_update_pop_show"
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    //模拟器更新弹窗按钮点击事件
+    @JvmStatic
+    fun logSimulatorUpdateAlertClick(buttonText: String) {
+        val json = json {
+            "event" to "simulator_update_pop_click"
+            "button_type" to buttonText
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    //模拟器游戏页面展示事件
+    @JvmStatic
+    fun logSimulatorGamePageShow() {
+        val json = json {
+            "event" to "simulator_game_page_show"
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    //模拟器游戏类型Tab展示事件
+    @JvmStatic
+    fun logSimulatorGamePageTabClick(tabName: String) {
+        val json = json {
+            "event" to "simulator_game_tag_show"
+            "tab_name" to tabName
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    //模拟器游戏卡片点击事件
+    @JvmStatic
+    fun logSimulatorGameCardClick(buttonText: String) {
+        val json = json {
+            "event" to "simulator_game_card_click"
+            "button_type" to buttonText
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    //模拟器游戏合集点击事件
+    @JvmStatic
+    fun logSimulatorGameCollectionClick() {
+        val json = json {
+            "event" to "simulator_game_collection_click"
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    //游戏删除提示弹窗展示事件
+    @JvmStatic
+    fun logSimulatorGameDeleteAlertShow() {
+        val json = json {
+            "event" to "simulator_delete_game_pop_show"
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    //游戏删除提示弹窗点击事件
+    @JvmStatic
+    fun logSimulatorGameDeleteAlertClick(buttonText: String) {
+        val json = json {
+            "event" to "simulator_delete_game_pop_click"
+            "button_type" to buttonText
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    //模拟器管理页面展示事件
+    @JvmStatic
+    fun logSimulatorManagerClick() {
+        val json = json {
+            "event" to "simulator_manger_page_show"
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    //模拟器列表相关点击事件
+    fun logSimulatorListClick(buttonText: String, simulatorType: String) {
+        val json = json {
+            "event" to "simulator_list_click"
+            "button_type" to buttonText
+            "simulator_name" to simulatorType
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    //模拟器卸载提示弹窗展示事件
+    fun logSimulatorUninstallAlertShow(simulatorType: String) {
+        val json = json {
+            "event" to "simulator_uninstall_pop_show"
+            "simulator_name" to simulatorType
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    //模拟器卸载提示弹窗展示事件
+    fun logSimulatorUninstallAlertClick(buttonText: String) {
+        val json = json {
+            "event" to "simulator_uninstall_pop_click"
+            "button_type" to buttonText
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    //进入发现页面
+    fun logDiscoverPageEnter() {
+        val json = json {
+            "event" to "discover_page_enter"
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    //离开发现页面
+    fun logDiscoverPageQuit(sequence: Int) {
+        val json = json {
+            "event" to "discover_page_quit"
+            "sequence" to sequence
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    //发现页面可见事件
+    fun logDiscoverPageVisible() {
+        val json = json {
+            "event" to "discover_page_visible"
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    //发现页面不可见事件
+    fun logDiscoverPageInvisible(sequence: Int) {
+        val json = json {
+            "event" to "discover_page_invisible"
+            "sequence" to sequence
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    //页面顶部露出
+    fun logDiscoverPageTopVisible(countNum: Int) {
+        val json = json {
+            "event" to "discover_page_top_visible"
+            "count_num" to countNum
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    //页面底部停留
+    fun logDiscoverPageBottomStay(countNum: Int) {
+        val json = json {
+            "event" to "discover_page_bottom_stay"
+            "count_num" to countNum
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    //点击兴趣推荐卡片
+    fun logDiscoverPageRecommendedInterestCardClick(sequence: Int, linkText: String, linkType: String, linkId: String) {
+        val json = json {
+            "event" to "discover_page_recommended_interest_card_click"
+            "sequence" to sequence
+            "link_text" to linkText
+            "link_type" to linkType
+            "link_id" to linkId
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    //点击跳转游戏库
+    fun logDiscoverPageJumpGamesLibraries() {
+        val json = json {
+            "event" to "discover_page_jump_games_libraries"
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
+    //触发不感兴趣
+    fun logDiscoverPageNotInterest(gameId: String, gameName: String) {
+        val json = json {
+            "event" to "discover_page_not_interest"
+            "game_id" to gameId
+            "game_name" to gameName
+            parseAndPutMeta().invoke(this)
+        }
+        log(json, "event", false)
+    }
+
 }

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

@@ -1,6 +1,7 @@
 package com.gh.common.util
 
 import android.annotation.SuppressLint
+import com.gh.gamecenter.common.entity.WechatConfigEntity
 import com.gh.gamecenter.common.json.JsonObjectBuilder
 import com.gh.gamecenter.common.json.json
 import com.gh.gamecenter.common.loghub.LoghubUtils
@@ -8,12 +9,10 @@ import com.gh.gamecenter.common.retrofit.EmptyResponse
 import com.gh.gamecenter.common.tracker.Tracker
 import com.gh.gamecenter.common.utils.toRequestBody
 import com.gh.gamecenter.entity.QuoteCountEntity
-import com.gh.gamecenter.entity.WechatConfigEntity
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.lightgame.utils.Utils
 import io.reactivex.schedulers.Schedulers
 import okhttp3.ResponseBody
-import org.json.JSONArray
 import org.json.JSONObject
 
 object NewLogUtils {
@@ -1896,20 +1895,6 @@ object NewLogUtils {
         log(json, "appointment", false)
     }
 
-    //点击微信提醒
-    @JvmStatic
-    fun logWechatRemindConfigClick(wechatConfigEntity: WechatConfigEntity) {
-        val json = json {
-            "event" to "appointment_wechat_remind_config_click"
-            "wechat_is_bind" to wechatConfigEntity.bind
-            "wechat_is_follow" to wechatConfigEntity.follow
-            "wechat_is_remind" to wechatConfigEntity.notice
-            "timestamp" to System.currentTimeMillis() / 1000
-            parseAndPutMeta().invoke(this)
-        }
-        log(json, "appointment", false)
-    }
-
     //选择图片上传方式
     @JvmStatic
     fun logShowGameCollectionCoverTypeDialog() {

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

@@ -54,7 +54,8 @@ object PackageHelper {
     }
 
     private fun updateValidPackageNameList() {
-        validLocalPackageNameSet = localPackageNameSet.filterNot { p -> downloadPackageNameBlackList.contains(p) }.toHashSet()
+        validLocalPackageNameSet =
+            localPackageNameSet.filterNot { p -> downloadPackageNameBlackList.contains(p) }.toHashSet()
     }
 
     /*

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

@@ -123,8 +123,8 @@ object PackageInstaller {
 //                if (downloadEntity != null) {
 //                    showCertificateDialogIfNeededBeforeInstall(app, downloadEntity, pkgPath)
 //                } else {
-                    val installIntent = getInstallIntent(context, pkgPath)
-                    context.startActivity(installIntent)
+                val installIntent = getInstallIntent(context, pkgPath)
+                context.startActivity(installIntent)
 //                }
             } else {
                 if (isPluggin) {

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

@@ -28,6 +28,8 @@ import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.common.utils.PackageFlavorHelper;
+import com.gh.gamecenter.core.AppExecutor;
+import com.gh.gamecenter.core.utils.MD5Utils;
 import com.gh.gamecenter.core.utils.SentryHelper;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
@@ -55,6 +57,7 @@ import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
@@ -72,6 +75,36 @@ public class PackageUtils {
 
     private static final String TAG = "PackageUtils";
 
+    public static String getInstallPackageInfoSourceDir(String packageName) {
+        try {
+            return HaloApp.getInstance().getApplication().getPackageManager().getPackageInfo(packageName,
+                    PackageManager.COMPONENT_ENABLED_STATE_DEFAULT).applicationInfo.sourceDir;
+        } catch (NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 根据packageName和模拟器apk文件的MD5去判断目标文件是否需要更新
+     *
+     * @param packageName 包名
+     * @param MD5Str      文件MD5
+     */
+    public static boolean isInstalledApkMatchedMd5(String packageName, String MD5Str) {
+        if (MD5Str == null){
+            Utils.log("MD5Str is null");
+            return false;
+        }
+        String path = getInstallPackageInfoSourceDir(packageName);
+        if (path == null){
+            Utils.log("File path null");
+            return false;
+        }
+       File file = new File(path);
+       return !(MD5Str.equals(MD5Utils.calculateMD5(file)));
+    }
+
     /*
      * 判断是否可以更新，只判断gh_version的大小
      */

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

@@ -32,27 +32,28 @@ import java.util.Set;
 
 import androidx.collection.ArrayMap;
 import androidx.core.content.ContextCompat;
+
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 import retrofit2.HttpException;
 
 public class PlatformUtils {
-    
+
     private static PlatformUtils mInstance;
-    
+
     private Context context;
-    
+
     private ArrayMap<String, String> platformMap;
     private ArrayMap<String, String> platformPicUrlMap;
     private ArrayMap<String, String> platformColorMap;
     private boolean isCheck = false;
     private boolean isUpdate = false;
-    
+
     private PlatformUtils(Context con) {
         this.context = con.getApplicationContext();
         initMap();
     }
-    
+
     private void initMap() {
         ArrayMap<String, String> platformColorMap = new ArrayMap<>();
         platformColorMap.put("360", "#218FA4");
@@ -72,10 +73,10 @@ public class PlatformUtils {
         platformColorMap.put("pps", "#FF8C27");
         platformColorMap.put("vivo", "#3FA5E3");
         platformColorMap.put("wdj", "#5ABA3F");
-        
+
         ArrayMap<String, String> platformMap = new ArrayMap<>();
         ArrayMap<String, String> platformPicUrlMap = new ArrayMap<>();
-        
+
         SharedPreferences sharedPreferences = context.getSharedPreferences("gh_platform", Context.MODE_PRIVATE);
         Set<String> set = sharedPreferences.getStringSet("platform", null);
         if (set == null) {
@@ -110,10 +111,10 @@ public class PlatformUtils {
 //                checkPlatformPic(urls);
             }
         }
-        
+
         updatePlatform(platformMap, platformPicUrlMap, platformColorMap);
     }
-    
+
     private void checkPlatformPic(final ArrayList<String> urls) {
         isCheck = true;
         File file = new File(FileUtils.getPlatformPicDir(context));
@@ -135,7 +136,7 @@ public class PlatformUtils {
                 for (int i = 0; i < urls.size(); i++) {
                     String url = urls.get(i);
                     String savePath = FileUtils.getPlatformPicDir(context) + File.separator + url
-                        .substring(url.lastIndexOf("/") + 1);
+                            .substring(url.lastIndexOf("/") + 1);
                     int code = FileUtils.downloadFile(url, savePath);
                     if (code == HttpURLConnection.HTTP_OK) {
                         success++;
@@ -151,20 +152,20 @@ public class PlatformUtils {
             isCheck = false;
         }
     }
-    
+
     private void updatePlatform(ArrayMap<String, String> pMap, ArrayMap<String, String> pUMap, ArrayMap<String, String> pCMap) {
         platformMap = pMap;
         platformPicUrlMap = pUMap;
         platformColorMap = pCMap;
     }
-    
+
     public static PlatformUtils getInstance(Context context) {
         if (mInstance == null) {
             mInstance = new PlatformUtils(context);
         }
         return mInstance;
     }
-    
+
     public String getPlatformColor(String platform) {
         if ("".equals(platform) || "官方版".equals(platform)) {
             return "#BB3D42";
@@ -173,16 +174,16 @@ public class PlatformUtils {
         if (color != null) {
             return color;
         }
-        
+
         int themeColor = ContextCompat.getColor(HaloApp.getInstance()
-            .getApplication(), R.color.theme);
+                .getApplication(), R.color.theme);
         return String.format("#%06X", 0xFFFFFF & themeColor);
     }
-    
+
     public String getPlatformPicUrl(String platform) {
         return platformPicUrlMap.get(platform);
     }
-    
+
     public String getPlatformName(String platform) {
         if ("".equals(platform) || "官方版".equals(platform)) {
             return "官方版";
@@ -201,40 +202,40 @@ public class PlatformUtils {
         }
         return platform;
     }
-    
+
     public void getPlatform() {
         if (isUpdate) {
             return;
         }
         isUpdate = true;
         RetrofitManager.getInstance()
-            .getApi()
-            .getGamePlatform()
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(new Response<List<PlatformEntity>>() {
-                @Override
-                public void onResponse(List<PlatformEntity> response) {
-                    Set<String> platformSet = new HashSet<>();
-                    for (PlatformEntity platformEntity : response) {
-                        platformSet.add(platformEntity.toString());
+                .getApi()
+                .getGamePlatform()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Response<List<PlatformEntity>>() {
+                    @Override
+                    public void onResponse(List<PlatformEntity> response) {
+                        Set<String> platformSet = new HashSet<>();
+                        for (PlatformEntity platformEntity : response) {
+                            platformSet.add(platformEntity.toString());
+                        }
+                        SharedPreferences sp = context.getSharedPreferences("gh_platform", Context.MODE_PRIVATE);
+                        sp.edit().putStringSet("platform", platformSet).apply();
+                        initMap();
+                        EventBus.getDefault().post(new EBReuse("PlatformChanged"));
+
+                        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
+                        String today = format.format(new Date());
+                        sp.edit().putString("refresh_time", today).apply();
+                        isUpdate = false;
                     }
-                    SharedPreferences sp = context.getSharedPreferences("gh_platform", Context.MODE_PRIVATE);
-                    sp.edit().putStringSet("platform", platformSet).apply();
-                    initMap();
-                    EventBus.getDefault().post(new EBReuse("PlatformChanged"));
-                    
-                    SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
-                    String today = format.format(new Date());
-                    sp.edit().putString("refresh_time", today).apply();
-                    isUpdate = false;
-                }
-                
-                @Override
-                public void onFailure(HttpException e) {
-                    isUpdate = false;
-                }
-            });
+
+                    @Override
+                    public void onFailure(HttpException e) {
+                        isUpdate = false;
+                    }
+                });
     }
-    
+
 }

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

@@ -63,7 +63,8 @@ object RealNameHelper {
 
         val currentActivity = CurrentActivityHolder.getCurrentActivity()
         if (currentActivity == null
-            || currentActivity.isFinishing) {
+            || currentActivity.isFinishing
+        ) {
             ToastUtils.toast("为保护未成年身心健康成长，根据相关政策要求，该游戏不对未成年人开放")
         } else {
             NewLogUtils.logCertificationHintDialogAppearance()

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

@@ -94,7 +94,7 @@ object RecommendPopupHelper {
         }
     }
 
-     fun checkFrequencyIsMatch(entity: RecommendPopupEntity): Boolean {
+    fun checkFrequencyIsMatch(entity: RecommendPopupEntity): Boolean {
         //判断是否符合通知频率 一次once, 累计次数count, 每周一次weekly, 每天一次daily, 每次always
         val plan = entity.notice.plan
         val times = entity.notice.times
@@ -102,7 +102,7 @@ object RecommendPopupHelper {
         val recordStr = SPUtils.getString(Constants.SP_RECOMMEND_POPUP)
         val type = object : TypeToken<ArrayList<RecommendRecord>>() {}.type
         val records = GsonUtils.gson.fromJson<ArrayList<RecommendRecord>>(recordStr, type)
-                ?: arrayListOf()
+            ?: arrayListOf()
         val recommendRecord = records.find { it.popupId == entity.id }
         val showTime = recommendRecord?.showTime ?: 0L
         val count = recommendRecord?.count ?: 0
@@ -131,7 +131,7 @@ object RecommendPopupHelper {
         val recordStr = SPUtils.getString(Constants.SP_RECOMMEND_POPUP)
         val type = object : TypeToken<ArrayList<RecommendRecord>>() {}.type
         val records = GsonUtils.gson.fromJson<ArrayList<RecommendRecord>>(recordStr, type)
-                ?: arrayListOf()
+            ?: arrayListOf()
         val recommendRecord = records.find { it.popupId == popup.id }
         if (recommendRecord == null) {
             records.add(RecommendRecord(popup.id, System.currentTimeMillis(), 1))

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

@@ -4,16 +4,15 @@ import android.annotation.SuppressLint
 import android.content.Context
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.common.repository.ReservationRepository
+import com.gh.gamecenter.R
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.common.callback.CancelListener
 import com.gh.gamecenter.common.callback.ConfirmListener
-import com.gh.gamecenter.common.utils.createRequestBody
-import com.gh.gamecenter.common.utils.singleToMain
-import com.gh.gamecenter.common.utils.toObject
+import com.gh.gamecenter.common.entity.WechatConfigEntity
 import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.entity.WechatConfigEntity
 import com.gh.gamecenter.common.retrofit.BiResponse
+import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
@@ -34,7 +33,11 @@ object ReservationHelper {
     }
 
     @SuppressLint("CheckResult")
-    private fun deleteOrCancelReservation(game: GameEntity, deleteReservation: Boolean, refreshCallback: EmptyCallback) {
+    private fun deleteOrCancelReservation(
+        game: GameEntity,
+        deleteReservation: Boolean,
+        refreshCallback: EmptyCallback
+    ) {
         val retrofit = RetrofitManager.getInstance()
         val requestMap = hashMapOf<String, String>()
         requestMap["game_id"] = game.id
@@ -122,39 +125,21 @@ object ReservationHelper {
 
     @JvmStatic
     fun showCancelReservationDialog(context: Context, emptyCallback: EmptyCallback) {
-        DialogUtils.showCancelOrDeleteReservationDialog(
-            context,
-            "取消预约",
-            "取消之后你将无法收到游戏上线的通知，确定取消预约吗？",
-            "确定取消",
-            "暂不取消", object : ConfirmListener {
-                override fun onConfirm() {
-                    emptyCallback.onCallback()
-                }
-
-            }, object : CancelListener {
-                override fun onCancel() {
-                }
-            }
-        )
+        showCancelReservationDialog(context, emptyCallback, null)
     }
+
     @JvmStatic
-    fun showCancelReservationDialog(context: Context, emptyCallback: EmptyCallback ,cancelListener: CancelListener) {
-        DialogUtils.showCancelOrDeleteReservationDialog(
-            context,
-            "取消预约",
+    fun showCancelReservationDialog(context: Context, emptyCallback: EmptyCallback, cancelListener: CancelListener?) {
+        DialogHelper.showDialog(context, "取消预约",
             "取消之后你将无法收到游戏上线的通知，确定取消预约吗？",
             "确定取消",
-            "暂不取消", object : ConfirmListener {
-                override fun onConfirm() {
-                    emptyCallback.onCallback()
-                }
-
-            }, object : CancelListener {
-                override fun onCancel() {
-                    cancelListener.onCancel()
-                }
-            }
+            "暂不取消", confirmClickCallback = {
+                emptyCallback.onCallback()
+            }, cancelClickCallback = {
+                cancelListener?.onCancel()
+            }, uiModificationCallback = {
+                it.confirmTv.setTextColor(R.color.theme_red.toColor(context))
+            }, extraConfig = DialogHelper.Config(centerContent = true, centerTitle = true)
         )
     }
 

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

@@ -22,17 +22,17 @@ object SimpleRequestHelper {
         val map = HashMap<String, String>()
         map["reason"] = type
         mApi.reportGameComment(gameId, commentId, map.createRequestBody())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(object : Response<ResponseBody>() {
-                    override fun onResponse(response: ResponseBody?) {
-                        Utils.toast(HaloApp.getInstance().application, "举报成功")
-                    }
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(object : Response<ResponseBody>() {
+                override fun onResponse(response: ResponseBody?) {
+                    Utils.toast(HaloApp.getInstance().application, "举报成功")
+                }
 
-                    override fun onFailure(e: HttpException?) {
-                        ErrorHelper.handleError(HaloApp.getInstance().application,e?.response()?.errorBody()?.string())
-                    }
-                })
+                override fun onFailure(e: HttpException?) {
+                    ErrorHelper.handleError(HaloApp.getInstance().application, e?.response()?.errorBody()?.string())
+                }
+            })
 
     }
 
@@ -40,17 +40,17 @@ object SimpleRequestHelper {
         val map = HashMap<String, String>()
         map["reason"] = type
         mApi.reportGameCommentReply(gameId, commentId, replyId, map.createRequestBody())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(object : Response<ResponseBody>() {
-                    override fun onResponse(response: ResponseBody?) {
-                        Utils.toast(HaloApp.getInstance().application, "举报成功")
-                    }
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(object : Response<ResponseBody>() {
+                override fun onResponse(response: ResponseBody?) {
+                    Utils.toast(HaloApp.getInstance().application, "举报成功")
+                }
 
-                    override fun onFailure(e: HttpException?) {
-                        ErrorHelper.handleError(HaloApp.getInstance().application,e?.response()?.errorBody()?.string())
-                    }
-                })
+                override fun onFailure(e: HttpException?) {
+                    ErrorHelper.handleError(HaloApp.getInstance().application, e?.response()?.errorBody()?.string())
+                }
+            })
 
     }
 
@@ -63,7 +63,7 @@ object SimpleRequestHelper {
                 }
 
                 override fun onFailure(e: HttpException?) {
-                    ErrorHelper.handleError(HaloApp.getInstance().application,e?.response()?.errorBody()?.string())
+                    ErrorHelper.handleError(HaloApp.getInstance().application, e?.response()?.errorBody()?.string())
                 }
             })
     }
@@ -77,7 +77,7 @@ object SimpleRequestHelper {
                 }
 
                 override fun onFailure(e: HttpException?) {
-                    ErrorHelper.handleError(HaloApp.getInstance().application,e?.response()?.errorBody()?.string())
+                    ErrorHelper.handleError(HaloApp.getInstance().application, e?.response()?.errorBody()?.string())
                 }
             })
     }

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

@@ -45,7 +45,11 @@ object SyncDataBetweenPageHelper {
         fragment.startActivityForResult(intent, requestCode)
     }
 
-    fun <T : Parcelable> setResultAndFinish(context: Context, syncData: T?, resultCode: Int = Activity.RESULT_OK): Boolean {
+    fun <T : Parcelable> setResultAndFinish(
+        context: Context,
+        syncData: T?,
+        resultCode: Int = Activity.RESULT_OK
+    ): Boolean {
         if (context is Activity) {
             val requestCode = context.intent.getIntExtra(REQUEST_CODE_TAG, DEFAULT_NUMBER)
             val dataPosition = context.intent.getIntExtra(DATA_POSITION_TAG, DEFAULT_NUMBER)

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

@@ -3,6 +3,7 @@ package com.gh.common.util;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+
 import androidx.collection.ArrayMap;
 
 import com.gh.gamecenter.entity.TagEntity;

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

@@ -61,12 +61,13 @@ object UsageStatsHelper {
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP_MR1)
     private fun getDataByUsageStats(lastPostTime: Long): JSONArray? {
         val usageStatsManager = HaloApp
-                .getInstance().application
-                .getSystemService(Context.USAGE_STATS_SERVICE) as UsageStatsManager
+            .getInstance().application
+            .getSystemService(Context.USAGE_STATS_SERVICE) as UsageStatsManager
 
         val usageStatsMap = usageStatsManager.queryAndAggregateUsageStats(
-                lastPostTime,
-                System.currentTimeMillis()) ?: return null
+            lastPostTime,
+            System.currentTimeMillis()
+        ) ?: return null
 
         val postBody = JSONArray()
         for (entry in usageStatsMap) {
@@ -93,9 +94,9 @@ object UsageStatsHelper {
     private fun getDataByUsageEvents(startTime: Long): JSONArray? {
 
         val mUsageStatsManager = HaloApp
-                .getInstance()
-                .application
-                .getSystemService(Context.USAGE_STATS_SERVICE) as UsageStatsManager
+            .getInstance()
+            .application
+            .getSystemService(Context.USAGE_STATS_SERVICE) as UsageStatsManager
 
         val usageEvents = mUsageStatsManager.queryEvents(startTime, System.currentTimeMillis())
         val allEvents = ArrayList<UsageEvents.Event>()
@@ -107,7 +108,8 @@ object UsageStatsHelper {
             currentEvent = UsageEvents.Event()
             usageEvents.getNextEvent(currentEvent)
             if (currentEvent.eventType == UsageEvents.Event.MOVE_TO_FOREGROUND
-                    || currentEvent.eventType == UsageEvents.Event.MOVE_TO_BACKGROUND) {
+                || currentEvent.eventType == UsageEvents.Event.MOVE_TO_BACKGROUND
+            ) {
                 allEvents.add(currentEvent)
             }
         }
@@ -118,8 +120,9 @@ object UsageStatsHelper {
             val nextEvent = allEvents[i + 1]
 
             if (curEvent.eventType == UsageEvents.Event.MOVE_TO_FOREGROUND
-                    && nextEvent.eventType == UsageEvents.Event.MOVE_TO_BACKGROUND
-                    && curEvent.className == nextEvent.className) {
+                && nextEvent.eventType == UsageEvents.Event.MOVE_TO_BACKGROUND
+                && curEvent.className == nextEvent.className
+            ) {
                 val diff = nextEvent.timeStamp - curEvent.timeStamp
 
                 if (pakAndTime[curEvent.packageName] == null) {
@@ -174,25 +177,26 @@ object UsageStatsHelper {
 
         val body = RequestBody.create(MediaType.parse("application/json"), postBody.toString())
         mApi.postUsageStatus(body, UserManager.getInstance().userId)
-                .subscribe(object : BiResponse<ResponseBody>() {
-                    override fun onSuccess(data: ResponseBody) {
-                        debugOnly {
-                            Utils.log("UsageStats: 数据上传成功")
-                        }
+            .subscribe(object : BiResponse<ResponseBody>() {
+                override fun onSuccess(data: ResponseBody) {
+                    debugOnly {
+                        Utils.log("UsageStats: 数据上传成功")
                     }
-                })
+                }
+            })
     }
 
     @JvmStatic
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP_MR1)
     fun checkForPermission(): Boolean {
         val appOps = HaloApp
-                .getInstance().application
-                .getSystemService(Context.APP_OPS_SERVICE) as AppOpsManager
+            .getInstance().application
+            .getSystemService(Context.APP_OPS_SERVICE) as AppOpsManager
         val mode = appOps.checkOpNoThrow(
-                OPSTR_GET_USAGE_STATS,
-                Process.myUid(),
-                HaloApp.getInstance().application.packageName)
+            OPSTR_GET_USAGE_STATS,
+            Process.myUid(),
+            HaloApp.getInstance().application.packageName
+        )
 
         return mode == MODE_ALLOWED
     }
@@ -220,19 +224,19 @@ object UsageStatsHelper {
         }
 
         mApi.getUsageStatusUpdateTime(HaloApp.getInstance().gid)
-                .subscribe(object : BiResponse<ResponseBody>() {
-                    override fun onSuccess(data: ResponseBody) {
-                        val body = JSONObject(data.string())
-                        val lastPostTime = body.getLong("update_time") * 1000
+            .subscribe(object : BiResponse<ResponseBody>() {
+                override fun onSuccess(data: ResponseBody) {
+                    val body = JSONObject(data.string())
+                    val lastPostTime = body.getLong("update_time") * 1000
 
-                        val beginTime = if (lastPostTime == 0L) {
-                            getDefaultBeginTime()
-                        } else {
-                            lastPostTime
-                        }
-                        postUsageStats(beginTime)
+                    val beginTime = if (lastPostTime == 0L) {
+                        getDefaultBeginTime()
+                    } else {
+                        lastPostTime
                     }
-                })
+                    postUsageStats(beginTime)
+                }
+            })
     }
 
     private fun isSameDay(timeA: Long, timeB: Long): Boolean {