版本升级到 4.9.3

Hotfix v4.9.2 332 crash

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

.gitignore

@@ -7,5 +7,6 @@ local.properties
 captures/
 build/
 release-app/
+test-app/
 scripts/apk-channel/
 app/src/test/java/com/gh/gamecenter

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "libraries/LGLibrary"]
 	path = libraries/LGLibrary
-	url = git@gitlab.ghzs.com:android/common-library.git
+	url = git@git.ghzs.com:android/common-library.git
 	branch = master

app/build.gradle

@@ -2,26 +2,20 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android' // kotlin
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
-
-// apkChannelPackage
-apply plugin: 'channel'
+//apply plugin: 'io.sentry.android.gradle'
+apply plugin: 'AndResGuard'
 
 import groovy.xml.XmlUtil
 
-//apply from: 'tinker-support.gradle'
-
 android {
 
     androidExtensions {
         experimental = true
     }
 
-    dataBinding {
-        enabled = true
-    }
-
-    viewBinding {
-        enabled = true
+    buildFeatures {
+        viewBinding = true
+        dataBinding = true
     }
 
     compileOptions {
@@ -38,6 +32,10 @@ android {
         javaMaxHeapSize "4g"
     }
 
+    aaptOptions {
+        additionalParameters "--no-version-vectors"
+    }
+
     defaultConfig {
 
         multiDexEnabled true
@@ -48,7 +46,7 @@ android {
         }
 
         ndk {
-            abiFilters "armeabi-v7a"
+            abiFilters "armeabi-v7a", "x86"
         }
 
         renderscriptTargetApi 18
@@ -78,6 +76,8 @@ android {
         buildConfigField "String", "TTAD_APPID", "\"${TTAD_APPID}\""
         buildConfigField "String", "DOUYIN_CLIENTKEY", "\"${DOUYIN_CLIENTKEY}\""
         buildConfigField "String", "DOUYIN_CLIENTSECRET", "\"${DOUYIN_CLIENTSECRET}\""
+        buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
+        buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
 
         buildConfigField "String", "MIPUSH_APPID", "\"${MIPUSH_APPID}\""
         buildConfigField "String", "MIPUSH_APPKEY", "\"${MIPUSH_APPKEY}\""
@@ -184,6 +184,8 @@ android {
             buildConfigField "String", "UMENG_APPKEY", "\"${UMENG_APPKEY}\""
             buildConfigField "String", "UMENG_MESSAGE_SECRET", "\"${UMENG_MESSAGE_SECRET}\""
             buildConfigField "String", "BUGLY_APPID", "\"${BUGLY_APPID}\""
+
+            manifestPlaceholders.put("APPLOG_SCHEME", "rangersapplog.byAx6uYt".toLowerCase())
         }
 
         gdt {
@@ -200,23 +202,6 @@ android {
     }
 }
 
-// apkChannelPackage
-channel {
-    //多渠道包的输出目录，默认为new File(project.buildDir,"channel")
-    baseOutputDir = new File(project.buildDir, "channel")
-    //多渠道包的命名规则，默认为：${appName}-${versionName}-${versionCode}-${flavorName}-${buildType}
-    apkNameFormat = '${appName}-${versionName}-${versionCode}-${flavorName}-${buildType}'
-}
-
-rebuildChannel {
-//    baseDebugApk = 已有Debug APK
-//    baseReleaseApk = 已有Release APK
-//    //默认为new File(project.buildDir, "rebuildChannel/debug")
-//    debugOutputDir = Debug渠道包输出目录
-//    //默认为new File(project.buildDir, "rebuildChannel/release")
-//    releaseOutputDir = Release渠道包输出目录
-}
-
 repositories {
     flatDir {
         dirs 'libs', 'libs/aars'
@@ -237,8 +222,8 @@ dependencies {
     debugImplementation "com.gu.android:toolargetool:${toolargetool}"
     debugImplementation "com.github.nichbar:WhatTheStack:$whatTheStack"
 
-    implementation "androidx.core:core:${core}"
-    implementation "androidx.fragment:fragment:${fragment}"
+    implementation "androidx.core:core-ktx:${core}"
+    implementation "androidx.fragment:fragment-ktx:${fragment}"
     implementation "androidx.multidex:multidex:${multiDex}"
     implementation "androidx.appcompat:appcompat:${appCompat}"
     implementation "androidx.cardview:cardview:${cardView}"
@@ -259,8 +244,10 @@ dependencies {
     implementation "com.kyleduo.switchbutton:library:${switchButton}"
 
     implementation "com.facebook.fresco:fresco:${fresco}"
-    implementation "com.facebook.fresco:animated-gif:${fresco}"
+    implementation "com.facebook.fresco:animated-gif-lite:${fresco}"
     implementation "com.facebook.fresco:animated-drawable:${fresco}"
+    implementation "com.facebook.fresco:animated-webp:${fresco}"
+    implementation "com.facebook.fresco:webpsupport:${fresco}"
 
     implementation "com.squareup.okhttp3:okhttp:${okHttp}"
 
@@ -328,7 +315,7 @@ dependencies {
     implementation "com.ethanhua:skeleton:${skeleton}"
     implementation "io.supercharge:shimmerlayout:${shimmerlayout}"
     implementation "com.tencent.mm.opensdk:wechat-sdk-android-without-mta:${mta}"
-    implementation "com.walkud.rom.checker:RomChecker:${romChecker}"
+    implementation "com.github.nichbar:AndroidRomChecker:${romChecker}"
 
     debugImplementation "com.github.nichbar.chucker:library:$chucker"
     releaseImplementation "com.github.nichbar.chucker:library-no-op:$chucker"
@@ -342,15 +329,22 @@ dependencies {
 
     implementation "net.lingala.zip4j:zip4j:${zip4j}"
 
-    implementation "io.sentry:sentry-android:$sentry"
+    // plugin 需要字符串，故不能用值
+    implementation "io.sentry:sentry-android:3.2.0"
 
     implementation("com.github.piasy:BigImageViewer:$bigImageViewer", {
         exclude group: 'com.squareup.okhttp3'
         exclude group: 'androidx.swiperefreshlayout'
         exclude group: 'com.github.bumptech.glide'
+        exclude group: 'com.facebook.fresco'
     })
     implementation "com.github.PhilJay:MPAndroidChart:${chart}"
 
+    implementation "com.github.hsiafan:apk-parser:$apkParser"
+    implementation "org.nanohttpd:nanohttpd:$nanohttpd"
+
+    implementation "com.aliyun.openservices:aliyun-log-android-sdk:$aliyunLog"
+
     implementation project(':libraries:LGLibrary')
 //    implementation project(':libraries:MTA')
     implementation project(':libraries:QQShare')
@@ -417,6 +411,72 @@ if (propFile.exists()) {
 //    }.each { t -> t.dependsOn generateMetaJson }
 //}
 
+andResGuard {
+    mappingFile = null
+    use7zip = true
+    useSign = true
+    // 打开这个开关，会keep住所有资源的原始路径，只混淆资源的名字
+    keepRoot = false
+    // 设置这个值，会把arsc name列混淆成相同的名字，减少string常量池的大小
+    fixedResName = "arg"
+    // 打开这个开关会合并所有哈希值相同的资源，但请不要过度依赖这个功能去除去冗余资源
+    mergeDuplicatedRes = true
+    whiteList = [
+            "R.drawable.icon",
+            "R.drawable.bg_notification_answer_style_1",
+            "R.drawable.bg_notification_answer_style_2",
+            "R.drawable.bg_notification_article_style_1",
+            "R.drawable.bg_notification_article_style_2",
+            "R.drawable.bg_notification_feedback_style_1",
+            "R.drawable.bg_notification_feedback_style_2",
+            "R.drawable.bg_notification_gift_style_1",
+            "R.drawable.bg_notification_gift_style_2",
+            "R.drawable.bg_notification_login_style_1",
+            "R.drawable.bg_notification_login_style_2",
+            "R.drawable.bg_notification_question_style_1",
+            "R.drawable.bg_notification_question_style_2",
+            "R.drawable.bg_notification_rating_style_1",
+            "R.drawable.bg_notification_rating_style_2",
+            "R.drawable.bg_notification_reserve_game_style_1",
+            "R.drawable.bg_notification_reserve_game_style_2",
+            "R.drawable.bg_notification_video_style_1",
+            "R.drawable.bg_notification_video_style_2",
+            "R.drawable.ic_search_no_1",
+            "R.drawable.ic_search_no_2",
+            "R.drawable.ic_search_no_3",
+            "R.drawable.ic_search_no_4",
+            "R.drawable.ic_search_no_5",
+            "R.drawable.ic_search_no_6",
+            "R.drawable.ic_search_no_7",
+            "R.drawable.ic_search_no_8",
+            "R.drawable.ic_search_no_9",
+            "R.drawable.ic_search_no_10",
+            "R.drawable.ic_search_no_11",
+            "R.drawable.ic_search_no_12",
+            "R.drawable.ic_search_no_13",
+            "R.drawable.ic_search_no_14",
+            "R.drawable.ic_search_no_15",
+            "R.drawable.ic_search_no_16",
+            "R.drawable.ic_search_no_17",
+            "R.drawable.ic_search_no_18",
+            "R.drawable.ic_search_no_19",
+            "R.drawable.ic_search_no_20",
+            "R.drawable.login_btn_bg",
+            "R.drawable.ic_quick_login_check",
+            "R.drawable.ic_quick_login_uncheck",
+            "R.anim.anim_auth_in",
+            "R.anim.anim_auth_out",
+    ]
+    compressFilePattern = [
+            "*.png",
+            "*.jpg",
+            "*.jpeg",
+            "*.gif",
+    ]
+    sevenzip {
+        artifact = 'com.tencent.mm:SevenZip:1.2.20'
+    }
+}
 
 project.afterEvaluate {
     def variants = null
@@ -448,36 +508,46 @@ project.afterEvaluate {
                     if (manifestFile == null || !manifestFile.exists()) {
                         return
                     }
+
+                    String[] configChanges = [
+                            "density",
+                            "fontScale",
+                            "keyboard",
+                            "keyboardHidden",
+                            "layoutDirection",
+                            "locale",
+                            "mcc",
+                            "mnc",
+                            "navigation",
+                            "orientation",
+                            "screenLayout",
+                            "screenSize",
+                            "smallestScreenSize",
+                            "touchscreen",
+                            "uiMode"]
+
                     def parser = new XmlSlurper(false, true)
                     def manifest = parser.parse(manifestFile)
                     def app = manifest.'application'[0]
                     app.'activity'.each { act ->
                         String value = act.attributes()['android:configChanges']
                         if (value == null || value.isEmpty()) {
-                            value = "keyboardHidden|orientation|screenSize|screenLayout|density|fontScale|locale"
+                            if (value == null) value = ""
+                            configChanges.eachWithIndex { config, index ->
+                                if (index != configChanges.length - 1) {
+                                    value += config + "|"
+                                } else {
+                                    value += config
+                                }
+                            }
                             act.attributes()['androidconfigChanges'] = value
                         } else {
                             String[] valueSplit = value.split("\\|")
-                            if (!valueSplit.contains("keyboardHidden")) {
-                                value += "|keyboardHidden"
-                            }
-                            if (!valueSplit.contains("orientation")) {
-                                value += "|orientation"
-                            }
-                            if (!valueSplit.contains("screenSize")) {
-                                value += "|screenSize"
-                            }
-                            if (!valueSplit.contains("screenLayout")) {
-                                value += "|screenLayout"
-                            }
-                            if (!valueSplit.contains("density")) {
-                                value += "|density"
-                            }
-                            if (!valueSplit.contains("fontScale")) {
-                                value += "|fontScale"
-                            }
-                            if (!valueSplit.contains("locale")) {
-                                value += "|locale"
+                            println configChanges
+                            configChanges.eachWithIndex { config, index ->
+                                if (!valueSplit.contains(config)) {
+                                    value += ("|" + config)
+                                }
                             }
                             act.attributes()['android:configChanges'] = value
                         }

app/proguard-rules-legacy.txt

@@ -0,0 +1,271 @@
+# 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
+
+### 广点通
+-dontwarn com.qq.gdt.action.**
+-keep class com.qq.gdt.action.** {*;}
+
+### 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.GdtHelper { *; }
+-keep class com.gh.gamecenter.TeaHelper { *; }

app/proguard-rules.txt

@@ -1,20 +1,3 @@
-# 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 {
@@ -26,126 +9,66 @@
    public static void logMethodWithParams(...);
 }
 
-#-assumenosideeffects class com.lightgame.config.CommonDebug {*;}
-
-#-dontoptimize
+-assumenosideeffects class com.lightgame.utils.Utils {
+   public static void log(...);
+}
 #--------- remove logs end  ----------------
 
--keepattributes *Annotation*,Signature,InnerClasses,EnclosingMethod
--dontwarn InnerClasses
+# TODO Dicard sourceFile in final release build but remain in internal build.
+-renamesourcefileattribute SourceFile
+# Keep Attribute
+-keepattributes *Annotation*,Signature,InnerClasses,EnclosingMethod,SourceFile,LineNumberTable
 
-# 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.** { *; }
+# OrmLite
+-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.** { *; }
+### 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>; }
+### Butterknife
+-keep public class * implements butterknife.Unbinder { public <init>(**, android.view.View); }
+-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 ** {
+### eventbus
+-keepclassmembers class * {
     @org.greenrobot.eventbus.Subscribe <methods>;
 }
 -keep enum org.greenrobot.eventbus.ThreadMode { *; }
 
-# Only required if you use AsyncExecutor
+### 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.** { *; }
+### 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 * extends rx.Subscriber
+### wechatSdk
+### TODO 这里用 com.tencent.*{*;} 不起效？但其它地方可以？
+-keep class com.tencent.**{*;}
 
-#---------------------------------webview------------------------------------
+### 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.* {*;}
+
+###
 -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);
@@ -153,93 +76,38 @@
 -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
+### easypermission
 -keepclassmembers class * {
     @pub.devrel.easypermissions.AfterPermissionGranted <methods>;
 }
 
-# 重命名文件为SourceFile，再配合mapping符号表，可以拿到真实的类名
--renamesourcefileattribute SourceFile
-# 保留源文件行号
--keepattributes SourceFile,LineNumberTable
-
+# TODO What's this ?
 -ignorewarnings
 
+### Keep Annotation
 -keep @androidx.annotation.Keep class *
--keepclassmembers 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
-
 ### 广点通
 -dontwarn com.qq.gdt.action.**
--keep class com.qq.gdt.action.** {*;}
+-keep class com.qq.gdt.action.* {*;}
 
-### AndroidX
--keep class androidx.core.app.CoreComponentFactory { *; }
-
-#阿里云上传
--keep class com.alibaba.sdk.android.oss.** { *; }
+### 阿里云上传
+-keep class com.alibaba.sdk.android.oss.* { *; }
 -dontwarn okio.**
 -dontwarn org.apache.commons.codec.binary.**
 
-#视频相关
--keep class com.shuyu.gsyvideoplayer.video.** { *; }
+### 视频相关
+-keep class com.shuyu.gsyvideoplayer.video.* { *; }
 -dontwarn com.shuyu.gsyvideoplayer.video.**
--keep class com.shuyu.gsyvideoplayer.video.base.** { *; }
+-keep class com.shuyu.gsyvideoplayer.video.base.* { *; }
 -dontwarn com.shuyu.gsyvideoplayer.video.base.**
--keep class com.shuyu.gsyvideoplayer.utils.** { *; }
+-keep class com.shuyu.gsyvideoplayer.utils.* { *; }
 -dontwarn com.shuyu.gsyvideoplayer.utils.**
--keep class tv.danmaku.ijk.** { *; }
+-keep class tv.danmaku.ijk.* { *; }
 -dontwarn tv.danmaku.ijk.**
 -keep public class * extends android.view.View{
     *** get*();
@@ -249,23 +117,18 @@
     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.alibaba.sdk.android.*{*;}
+-keep class com.ut.*{*;}
+-keep class com.ta.*{*;}
 
+### GDT & TEA
 -keep class com.gh.gamecenter.GdtHelper { *; }
--keep class com.gh.gamecenter.TeaHelper { *; }
+-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.* { *; }

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

@@ -31,6 +31,8 @@ object GdtHelper {
                 GDTAction.init(application, "1111012969", "9d3d9da5b0948a317c03d08f14d445dc")
             } else if (channel == "GH_729") {
                 GDTAction.init(application, "1111013063", "f53dabf458a356b101d99fc4069eb7f1")
+            } else if (channel == "GH_765") {
+                GDTAction.init(application, "1111327925", "588d503f0990f98f9b2394fbb795c570")
             } else {
                 GDTAction.init(application, "1110680399", "f5ddaafbf520d7d7385499232a408d0a")
             }

app/src/main/AndroidManifest.xml

@@ -21,9 +21,9 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <!-- 允许应用程序改变Wi-Fi连接状态 -->
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <!-- 允许应用程序打开系统窗口，显示其他应用程序 -->
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    <!-- 创建快捷方式的权限 -->
+    <!-- 允许应用程序改变网络连接状态 -->
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <!-- 允许应用程序快捷方式 -->
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 
     <uses-permission
@@ -72,6 +72,7 @@
         android:largeHeap="true"
         android:resizeableActivity="true"
         android:theme="@style/AppCompatTheme.APP"
+        android:networkSecurityConfig="@xml/network_security_config"
         tools:replace="android:allowBackup"
         tools:targetApi="n">
 
@@ -79,6 +80,11 @@
             android:name="io.sentry.auto-init"
             android:value="false" />
 
+        <!-- 不让 sentry 读取系统事件 -->
+        <meta-data
+            android:name="io.sentry.breadcrumbs.system-events"
+            android:value="false" />
+
         <!--android:launchMode = "singleTask"-->
         <activity
             android:name="com.gh.gamecenter.SplashScreenActivity"
@@ -603,6 +609,48 @@
             android:name=".forum.search.ForumOrUserSearchActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name=".energy.EnergyCenterActivity"
+            android:screenOrientation="portrait"
+            android:launchMode="singleTask" />
+
+        <activity
+            android:name=".energy.EnergyHouseActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".personal.NewPersonalActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".qa.questions.draft.QuestionDraftActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".servers.GameServerTestActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".category2.CategoryV2Activity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".personal.DeliveryInfoActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.cmic.sso.sdk.activity.LoginAuthActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:theme="@android:style/Theme.Dialog"
+            android:screenOrientation="portrait"
+            android:launchMode="singleTop">
+        </activity>
+
+
+        <activity
+            android:name=".home.skip.PackageSkipActivity"
+            android:screenOrientation="portrait" />
+
         <!--        &lt;!&ndash; 使用小米/华为推送弹窗功能提高推送成功率&ndash;&gt;-->
         <!--        <activity-->
         <!--            android:name="com.gh.gamecenter.PushProxyActivity"-->
@@ -654,6 +702,11 @@
                 android:resource="@xml/provider_paths" />
         </provider>
 
+        <provider
+            android:name="androidx.work.impl.WorkManagerInitializer"
+            android:authorities="${applicationId}.workmanager-init"
+            tools:node="remove" />
+
         <receiver
             android:name="com.gh.gamecenter.receiver.DownloadReceiver"
             android:exported="false">

app/src/main/java/com/gh/base/AppUncaughtHandler.java

@@ -5,6 +5,7 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.os.Looper;
 import android.preference.PreferenceManager;
 import android.util.Log;
@@ -25,8 +26,9 @@ import java.lang.Thread.UncaughtExceptionHandler;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
+import java.util.concurrent.TimeoutException;
 
-import io.sentry.core.Sentry;
+import io.sentry.Sentry;
 
 public class AppUncaughtHandler implements UncaughtExceptionHandler {
 
@@ -38,22 +40,26 @@ public class AppUncaughtHandler implements UncaughtExceptionHandler {
     }
 
     @Override
-    public void uncaughtException(Thread thread, Throwable ex) {
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
+    public void uncaughtException(Thread t, Throwable e) {
+        if (("FinalizerWatchdogDaemon").equals(t.getName())
+            && e instanceof TimeoutException) {
+            // ignore timeoutException
+            // detail can be found in this didi tech blog post https://mp.weixin.qq.com/s?__biz=MzU1ODEzNjI2NA==&mid=2247487185&idx=2&sn=cf2d9e10053f625bde0f61d246f14870&source=41#wechat_redirect
+        } else {
+            new Thread(() -> {
                 Looper.prepare();
                 Utils.toast(mContext.getApplicationContext(), "\"光环助手\"发生错误");
                 Looper.loop();
-            }
-        });
-
-        saveLocalLog(mContext, ex);
-        Sentry.captureException(ex);
-        restart(mContext);
+            });
+            saveLocalLog(mContext, e);
+            restart(mContext);
+            Sentry.captureException(e);
+        }
     }
 
     public static void restart(final Context context) {
+        // S450 这机器会无限重启循环 : (
+        if ("S450".equals(Build.MODEL)) return;
 
         // 防止重复奔溃，导致助手一直重启，20秒内不做处理
         SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);

app/src/main/java/com/gh/base/BaseActivity.java

@@ -1,16 +1,21 @@
 package com.gh.base;
 
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Color;
+import android.graphics.PixelFormat;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.os.Parcel;
+import android.os.TransactionTooLargeException;
 import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.Gravity;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -25,12 +30,16 @@ import androidx.lifecycle.Lifecycle;
 
 import com.gh.base.fragment.BaseFragment;
 import com.gh.common.constant.Constants;
+import com.gh.common.tracker.IBusiness;
+import com.gh.common.util.DialogHelper;
 import com.gh.common.util.DialogUtils;
 import com.gh.common.util.DisplayUtils;
 import com.gh.common.util.EntranceUtils;
 import com.gh.common.util.ExtensionsKt;
 import com.gh.common.util.MtaHelper;
+import com.gh.common.util.NetworkUtils;
 import com.gh.common.util.PackageInstaller;
+import com.gh.common.util.QuickLoginHelper;
 import com.gh.common.util.RunningUtils;
 import com.gh.common.util.SPUtils;
 import com.gh.common.util.ShareUtils;
@@ -40,10 +49,12 @@ import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.LoginActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.SplashScreenActivity;
+import com.gh.gamecenter.energy.EnergyCenterActivity;
 import com.gh.gamecenter.eventbus.EBShowDialog;
 import com.lightgame.BaseAppCompatActivity;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.FileUtils;
+import com.lightgame.utils.Util_System_Keyboard;
 import com.lightgame.utils.Utils;
 import com.tencent.tauth.Tencent;
 
@@ -56,6 +67,7 @@ import java.lang.ref.WeakReference;
 import java.util.List;
 
 import butterknife.ButterKnife;
+import kotlin.Pair;
 import pub.devrel.easypermissions.EasyPermissions;
 
 import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE;
@@ -66,17 +78,24 @@ import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE;
  * 需要工具栏的页面请继承{@link ToolBarActivity}
  */
 
-public abstract class BaseActivity extends BaseAppCompatActivity implements EasyPermissions.PermissionCallbacks {
+public abstract class BaseActivity extends BaseAppCompatActivity implements EasyPermissions.PermissionCallbacks, IBusiness {
 
     // global dialog key
     public final static String DOWNLOAD_HIJACK = "hijack";
     public final static String LOGIN_EXCEPTION = "loginException";
     public final static String PLUGGABLE = "plugin";
+    public final static String SIGNATURE_CONFLICT = "signature_conflict";
+    public final static int ID_ROOT_INDICATOR = 999;
+    public final int MAX_BUNDLE_SIZE = 300;
 
     @NonNull
     protected String mEntrance;
 
     private boolean mIsExistLogoutDialog;
+    private boolean mHasAddTaskFloat = false;
+    private View mTaskBackView;
+    private WindowManager mWM;
+    private WindowManager.LayoutParams mWmParams;
 
     protected final Handler mBaseHandler = new BaseHandler(this);
 
@@ -116,6 +135,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
         if (useEventBus()) EventBus.getDefault().register(this);
         if (useButterKnife()) ButterKnife.bind(this);
         mEntrance = getIntent().getStringExtra(KEY_ENTRANCE);
@@ -143,6 +163,10 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
                 SPUtils.setString(Constants.SP_XAPK_URL, "");
             }
         }
+
+        if (this.getClass().getName().equals(EnergyCenterActivity.class.getName())) {
+            SPUtils.setBoolean(Constants.SP_SHOW_TASK_FLOAT, false);
+        }
     }
 
     @SuppressWarnings("ConstantConditions")
@@ -206,6 +230,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
         tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 13);
         tv.measure(0, 0);
         tv.setAlpha(0.15F);
+        tv.setId(ID_ROOT_INDICATOR);
         int height = tv.getMeasuredHeight();
         int width = tv.getMeasuredWidth();
         tv.setPadding(DisplayUtils.dip2px(20), 0, DisplayUtils.dip2px(20), 0);
@@ -237,13 +262,19 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
             if (DOWNLOAD_HIJACK.equals(showDialog.getType())) {
                 DialogUtils.showQqSessionDialog(this);// 建议用户联系客服
             } else if (PLUGGABLE.equals(showDialog.getType())) {
-                DialogUtils.showPluginDialog(this, () -> {
+                DialogHelper.showPluginDialog(this, () -> {
                     if (FileUtils.isEmptyFile(showDialog.getPath())) {
                         toast(R.string.install_failure_hint);
                     } else {
                         PackageInstaller.uninstall(BaseActivity.this, showDialog.getPath());
                     }
+                    return null;
                 });
+            } else if (SIGNATURE_CONFLICT.equals(showDialog.getType())) {
+                DialogHelper.showSignatureConflictDialog(this, () -> {
+                            PackageInstaller.uninstall(BaseActivity.this, showDialog.getPath());
+                            return null;
+                        });
             } else if (LOGIN_EXCEPTION.equals(showDialog.getType())) {
                 if (mIsExistLogoutDialog) return;
                 mIsExistLogoutDialog = true;
@@ -255,8 +286,14 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
                             , StringUtils.buildString("（", model, "）")
                             , "知道了", "重新登录"
                             , null
-                            , () -> startActivity(LoginActivity.getIntent(BaseActivity.this,
-                                    "你的账号已在另外一台设备登录多设备-重新登录"))
+                            , () -> {
+                                if (SPUtils.getBoolean(Constants.SP_HAS_GET_PHONE_INFO) || NetworkUtils.isOpenMobileData(BaseActivity.this)) {
+                                    QuickLoginHelper.startLogin(BaseActivity.this, "你的账号已在另外一台设备登录多设备-重新登录");
+                                } else {
+                                    startActivity(LoginActivity.getIntent(BaseActivity.this,
+                                            "你的账号已在另外一台设备登录多设备-重新登录"));
+                                }
+                            }
                     );
                     mBaseHandler.postDelayed(() -> mIsExistLogoutDialog = false, 5000);
                 } catch (Exception e) {
@@ -269,6 +306,11 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
     @Override
     protected void onPause() {
         super.onPause();
+        if (mWM != null && mTaskBackView != null && mHasAddTaskFloat) {
+            mWM.removeView(mTaskBackView);
+            mHasAddTaskFloat = false;
+        }
+
         if (isFinishing()) {
             onFinish();
             for (Fragment fragment : getSupportFragmentManager().getFragments()) {
@@ -282,8 +324,87 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
     @Override
     protected void onResume() {
         super.onResume();
+
+        if (SPUtils.getBoolean(Constants.SP_SHOW_TASK_FLOAT) && !this.getClass().getName().equals(EnergyCenterActivity.class.getName())) {
+            addTaskBackView();
+            mHasAddTaskFloat = true;
+        }
     }
 
+    private void addTaskBackView() {
+        mWM = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
+        mWmParams = new WindowManager.LayoutParams();
+        mWmParams.type = WindowManager.LayoutParams.TYPE_APPLICATION;
+        mWmParams.format = PixelFormat.RGBA_8888;
+        mWmParams.gravity = Gravity.LEFT | Gravity.BOTTOM;
+        mWmParams.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
+        mWmParams.width = DisplayUtils.dip2px(76F);
+        mWmParams.height = DisplayUtils.dip2px(36F);
+        mWmParams.y = SPUtils.getInt(Constants.SP_TASK_FLOAT_LAST_Y, DisplayUtils.dip2px(114F));
+        mTaskBackView = View.inflate(this, R.layout.layout_task_back, null);
+        mTaskBackView.setOnClickListener(v -> {
+            // 如果当前是在键盘输入时，点击"返回任务"要先收起键盘
+            Util_System_Keyboard.hideSoftKeyboard(this);
+            startActivity(EnergyCenterActivity.Companion.getIntent(this));
+            SPUtils.setBoolean(Constants.SP_SHOW_TASK_FLOAT, false);
+            mWM.removeView(mTaskBackView);
+            mHasAddTaskFloat = false;
+        });
+        setFloatTouchListener();
+        mWM.addView(mTaskBackView, mWmParams);
+    }
+
+    private void setFloatTouchListener() {
+        int screenHeight = getResources().getDisplayMetrics().heightPixels;
+
+        mTaskBackView.setOnTouchListener(new View.OnTouchListener() {
+
+            private int intervalY;
+            private int startY;
+
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                final int y = (int) event.getRawY();
+
+                switch (event.getAction()) {
+                    case MotionEvent.ACTION_DOWN:
+                        intervalY = y;
+                        startY = y;
+                        break;
+
+                    case MotionEvent.ACTION_MOVE:
+                        mWmParams.y -= (y - intervalY);
+                        if (mWmParams.y < 0) {
+                            mWmParams.y = 0;
+                        }
+
+                        if (mWmParams.y > screenHeight) {
+                            mWmParams.y = screenHeight;
+                        }
+
+                        if (mWM != null && mTaskBackView != null && mHasAddTaskFloat) {
+                            mWM.updateViewLayout(mTaskBackView, mWmParams);
+                        }
+
+                        intervalY = y;
+                        return true;
+
+                    case MotionEvent.ACTION_UP:
+                        // 滑动距离少于10视为点击，返回false，否则视为拖动，返回true
+                        if (Math.abs(y - startY) <= 10) {
+                            return false;
+                        } else {
+                            // 记录位置
+                            SPUtils.setInt(Constants.SP_TASK_FLOAT_LAST_Y, mWmParams.y);
+                            return true;
+                        }
+                }
+                return false;
+            }
+        });
+    }
+
+
     /**
      * 此回调可用于确认当前 activity 已经执行了 finish() 方法并处于 isFinishing 状态
      */
@@ -359,4 +480,54 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
         }
         return resources;
     }
+
+
+    /**
+     * ActivityThread每次调用onSaveInstanceState时outState大小都会累加，最终会导致{@link TransactionTooLargeException}异常
+     * 解决方案：判断每次获取到的outState大小，当达到300k时手动clear掉
+     */
+    @Override
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        if (preventRecreateFragmentByFragmentManager()) {
+            outState = discardFragmentFromSaveInstanceState(outState);
+        }
+
+        long bundleSize = getBundleSize(outState);
+        if (bundleSize > MAX_BUNDLE_SIZE * 1024) {
+            outState.clear();
+        }
+    }
+
+    /**
+     * 是否停用 Activity 重建时 FragmentManager 根据 saveState 自动重建保存的 Fragment 的功能
+     */
+    protected boolean preventRecreateFragmentByFragmentManager() {
+        return false;
+    }
+
+    private Bundle discardFragmentFromSaveInstanceState(Bundle outState) {
+        if (outState != null) {
+            outState.remove("android:support:fragments");
+        }
+        return outState;
+    }
+
+    private long getBundleSize(Bundle bundle) {
+        long dataSize;
+        Parcel obtain = Parcel.obtain();
+        try {
+            obtain.writeBundle(bundle);
+            dataSize = obtain.dataSize();
+        } finally {
+            obtain.recycle();
+        }
+        return dataSize;
+    }
+
+    @Override
+    public Pair<String, String> getBusinessId() {
+        return null;
+    }
 }

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

@@ -9,15 +9,18 @@ import android.os.Bundle
 import android.text.TextUtils
 import android.view.View
 import android.webkit.JavascriptInterface
+import android.widget.FrameLayout
+import android.widget.ImageView
 import android.widget.TextView
+import androidx.core.content.ContextCompat
 import butterknife.OnClick
-import com.gh.common.util.DialogUtils
-import com.gh.common.util.MtaHelper
+import com.gh.common.AppExecutor
+import com.gh.common.util.*
 import com.gh.common.view.RichEditor
 import com.gh.gamecenter.R
 import com.gh.gamecenter.entity.GameEntity
 import com.gh.gamecenter.entity.MyVideoEntity
-import com.gh.gamecenter.qa.answer.edit.AnswerEditActivity
+import com.gh.gamecenter.qa.article.edit.ArticleEditActivity
 import com.gh.gamecenter.qa.editor.GameActivity
 import com.gh.gamecenter.qa.editor.InsertAnswerWrapperActivity
 import com.gh.gamecenter.qa.editor.InsertArticleWrapperActivity
@@ -26,6 +29,7 @@ import com.gh.gamecenter.qa.entity.AnswerEntity
 import com.gh.gamecenter.qa.entity.ArticleEntity
 import com.gh.gamecenter.qa.entity.EditorInsertEntity
 import com.halo.assistant.HaloApp
+import com.lightgame.utils.Util_System_Keyboard
 import com.lightgame.utils.Utils
 import com.lightgame.view.CheckableImageView
 import kotterknife.bindView
@@ -33,15 +37,15 @@ import kotterknife.bindView
 abstract class BaseRichEditorActivity : ToolBarActivity() {
 
     val mRichEditor by bindView<RichEditor>(R.id.rich_editor)
-    val mDraftBtn by bindView<TextView>(R.id.draft_btn)
 
     private val mEditorTextNumTv by bindView<TextView>(R.id.editorTextNumTv)
     private val mEditorFont by bindView<CheckableImageView>(R.id.editor_font)
     private val mEditorLink by bindView<CheckableImageView>(R.id.editor_link)
-    private val mEditorParagraph by bindView<CheckableImageView>(R.id.editor_paragraph)
+
     private val mEditorFontBold by bindView<CheckableImageView>(R.id.editor_font_bold)
     private val mEditorFontItalic by bindView<CheckableImageView>(R.id.editor_font_italic)
     private val mEditorFontStrikeThrough by bindView<CheckableImageView>(R.id.editor_font_strikethrough)
+    private val mEditorFontUnderline by bindView<CheckableImageView>(R.id.editor_font_underline)
     private val mEditorParagraphH1 by bindView<CheckableImageView>(R.id.editor_paragraph_h1)
     private val mEditorParagraphH2 by bindView<CheckableImageView>(R.id.editor_paragraph_h2)
     private val mEditorParagraphH3 by bindView<CheckableImageView>(R.id.editor_paragraph_h3)
@@ -50,9 +54,15 @@ abstract class BaseRichEditorActivity : ToolBarActivity() {
     private val mEditorFontContainer by bindView<View>(R.id.editor_font_container)
     private val mEditorParagraphContainer by bindView<View>(R.id.editor_paragraph_container)
     private val mEditorLinkContainer by bindView<View>(R.id.editor_link_container)
-    private val mEditorInsertDetail by bindView<View>(R.id.editor_insert_detail)
+    private val mEditorInsertDetailContainer by bindView<View>(R.id.editor_insert_detail_container)
+    val mAddLabelContainer by bindView<View>(R.id.add_label_container)
+    val mAddLabelTv by bindView<TextView>(R.id.add_label_tv)
+    val mLabelNumTv by bindView<TextView>(R.id.label_num_tv)
+    val mLabelArrowIv by bindView<ImageView>(R.id.label_arrow)
+    val mTagsContainer by bindView<FrameLayout>(R.id.tagsContainer)
 
     private var mCurrentParagraphStyle = ""
+    private var mIsExtendedKeyboardShow = false
 
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -63,29 +73,47 @@ abstract class BaseRichEditorActivity : ToolBarActivity() {
         when (requestCode) {
             INSERT_ANSWER_CODE -> {
                 val answer = data?.getParcelableExtra<AnswerEntity>(AnswerEntity::class.java.simpleName)
-                if (answer != null) insertData = EditorInsertEntity.transform(answer)
+                if (answer != null) {
+                    mRichEditor.focusEditor()
+                    insertData = EditorInsertEntity.transform(answer)
+                    mRichEditor.insertCustomStyleLink(insertData)
+                }
             }
             INSERT_ARTICLE_CODE -> {
                 val article = data?.getParcelableExtra<ArticleEntity>(ArticleEntity::class.java.simpleName)
-                if (article != null) insertData = EditorInsertEntity.transform(article)
+                if (article != null) {
+                    mRichEditor.focusEditor()
+                    insertData = EditorInsertEntity.transform(article)
+                    mRichEditor.insertCustomStyleLink(insertData)
+                }
             }
             INSERT_GAME_CODE -> {
                 val game = data?.getParcelableExtra<GameEntity>(GameEntity::class.java.simpleName)
-                if (game != null) insertData = EditorInsertEntity.transform(game)
+                if (game != null) {
+                    mRichEditor.focusEditor()
+                    insertData = EditorInsertEntity.transform(game)
+                    mRichEditor.insertCustomStyleLink(insertData)
+                }
             }
             VideoActivity.INSERT_VIDEO_CODE -> {
                 val video = data?.getParcelableExtra<MyVideoEntity>(MyVideoEntity::class.java.simpleName)
-                if (video != null) mRichEditor.insertCustomVideo(video)
-                return
+                if (video != null) {
+                    mRichEditor.focusEditor()
+                    mRichEditor.insertCustomVideo(video)
+                }
             }
         }
+        closeExtendedKeyboard()
+        AppExecutor.uiExecutor.executeWithDelay(Runnable {
+            Util_System_Keyboard.showSoftKeyboard(this)
+        }, 100)
 
-        mRichEditor.insertCustomStyleLink(insertData)
     }
 
-    @SuppressLint("AddJavascriptInterface")
+    @SuppressLint("AddJavascriptInterface", "ClickableViewAccessibility")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        mAddLabelContainer.visibility = if (this is ArticleEditActivity) View.VISIBLE else View.GONE
         mRichEditor.setPadding(20, 15, 20, 15)
         // 防止个别手机在Js里无法获取粘贴内容
         mRichEditor.addJavascriptInterface(OnPasteListener(), "onPasteListener")
@@ -93,12 +121,59 @@ abstract class BaseRichEditorActivity : ToolBarActivity() {
         mRichEditor.addJavascriptInterface(OnEditorTextChangeListener(), "OnEditorTextChangeListener")
         mRichEditor.setInputEnabled(true)
 
-        mDraftBtn.text = if (this is AnswerEditActivity) {
-            "回答草稿"
-        } else "帖子草稿"
+        mRichEditor.setOnTouchListener { _, _ ->
+            if (mIsExtendedKeyboardShow) {
+                closeExtendedKeyboard()
+                Util_System_Keyboard.showSoftKeyboard(this)
+                //是否消费事件根据mRichEditor是否含有焦点决定，mRichEditor没有焦点则不消费事件
+                mRichEditor.hasFocus()
+            } else false
+        }
     }
 
-    @OnClick(R.id.editor_image, R.id.editor_font, R.id.editor_link, R.id.editor_paragraph,
+
+    fun closeExtendedKeyboard() {
+        mEditorInsertDetailContainer.visibility = View.GONE
+        mEditorFont.isChecked = false
+        mEditorLink.isChecked = false
+        mAddLabelContainer.isSelected = false
+        mIsExtendedKeyboardShow = false
+    }
+
+    protected fun controlEditorInsertContainerEnabled(isEnabled: Boolean) {
+        mEditorFont.isEnabled = isEnabled
+    }
+
+    fun changeAddLabel(isLabelContainerShow: Boolean) {
+        if (isLabelContainerShow) {
+            mLabelNumTv.visibility = View.GONE
+            mLabelArrowIv.visibility = View.VISIBLE
+            mAddLabelTv.setTextColor(ContextCompat.getColor(this, R.color.theme_font))
+            mAddLabelTv.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null)
+            mAddLabelContainer.background = ContextCompat.getDrawable(this, R.drawable.bg_editor_insert_add_label)
+        } else {
+            val selectedLabel = getSelectedLabel()
+            if (selectedLabel == 0) {
+                mAddLabelTv.text = "添加标签"
+                mLabelNumTv.visibility = View.GONE
+                mAddLabelTv.setTextColor(ContextCompat.getColor(this, R.color.text_666666))
+                mAddLabelTv.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(this, R.drawable.ic_add_label), null, null, null)
+            } else {
+                mAddLabelTv.text = "标签"
+                mLabelNumTv.visibility = View.VISIBLE
+                mLabelNumTv.text = selectedLabel.toString()
+                mAddLabelTv.setTextColor(ContextCompat.getColor(this, R.color.theme_font))
+                mAddLabelTv.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null)
+            }
+            mLabelArrowIv.visibility = View.GONE
+            mAddLabelContainer.background = ContextCompat.getDrawable(this, R.drawable.border_round_stroke_eee_999)
+        }
+    }
+
+    open fun getSelectedLabel(): Int = 0
+
+
+    @OnClick(R.id.editor_image, R.id.editor_font, R.id.editor_link, R.id.add_label_container, R.id.editor_font_underline,
             R.id.editor_font_bold, R.id.editor_font_italic, R.id.editor_font_strikethrough,
             R.id.editor_paragraph_h1, R.id.editor_paragraph_h2, R.id.editor_paragraph_h3,
             R.id.editor_paragraph_h4, R.id.editor_font_container, R.id.editor_paragraph_container,
@@ -107,31 +182,13 @@ abstract class BaseRichEditorActivity : ToolBarActivity() {
     fun onRichClick(view: View) {
         when (view.id) {
             R.id.editor_font -> {
-                mEditorFont.isChecked = !mEditorFont.isChecked
-                mEditorParagraph.isChecked = false
-                mEditorLink.isChecked = false
-                mEditorFontContainer.visibility = if (mEditorFont.isChecked) View.VISIBLE else View.GONE
-                mEditorParagraphContainer.visibility = if (!mEditorFont.isChecked) View.VISIBLE else View.GONE
-                mEditorLinkContainer.visibility = if (!mEditorFont.isChecked) View.VISIBLE else View.GONE
-                mEditorInsertDetail.visibility = mEditorFontContainer.visibility
-            }
-            R.id.editor_paragraph -> {
-                mEditorParagraph.isChecked = !mEditorParagraph.isChecked
-                mEditorFont.isChecked = false
-                mEditorLink.isChecked = false
-                mEditorParagraphContainer.visibility = if (mEditorParagraph.isChecked) View.VISIBLE else View.GONE
-                mEditorFontContainer.visibility = if (!mEditorParagraph.isChecked) View.VISIBLE else View.GONE
-                mEditorLinkContainer.visibility = if (!mEditorParagraph.isChecked) View.VISIBLE else View.GONE
-                mEditorInsertDetail.visibility = mEditorParagraphContainer.visibility
+                controlEditorFontContainer()
             }
             R.id.editor_link -> {
-                mEditorLink.isChecked = !mEditorLink.isChecked
-                mEditorFont.isChecked = false
-                mEditorParagraph.isChecked = false
-                mEditorLinkContainer.visibility = if (mEditorLink.isChecked) View.VISIBLE else View.GONE
-                mEditorParagraphContainer.visibility = if (!mEditorLink.isChecked) View.VISIBLE else View.GONE
-                mEditorFontContainer.visibility = if (!mEditorLink.isChecked) View.VISIBLE else View.GONE
-                mEditorInsertDetail.visibility = mEditorLinkContainer.visibility
+                controlEditorLinkContainer()
+            }
+            R.id.add_label_container -> {
+                controlAddLabelContainer()
             }
             R.id.editor_font_bold -> {
                 mEditorFontBold.isChecked = !mEditorFontBold.isChecked
@@ -155,6 +212,14 @@ abstract class BaseRichEditorActivity : ToolBarActivity() {
                     MtaHelper.onEvent(mtaEventName(), "文字样式", "文字样式-删除线")
                 }
             }
+            R.id.editor_font_underline -> {
+                mEditorFontUnderline.isChecked = !mEditorFontUnderline.isChecked
+                mRichEditor.setUnderline()
+
+                if (mEditorFontUnderline.isChecked) {
+                    MtaHelper.onEvent(mtaEventName(), "文字样式", "文字样式-下滑线")
+                }
+            }
             R.id.editor_paragraph_h1 -> {
                 if (mEditorParagraphH1.isChecked) {
                     mRichEditor.formatBlock()
@@ -213,12 +278,93 @@ abstract class BaseRichEditorActivity : ToolBarActivity() {
                 startActivityForResult(GameActivity.getIntent(this, GameActivity.INSERT_GAME_TITLE), INSERT_GAME_CODE)
             }
             R.id.editor_link_video -> {
-                MtaHelper.onEvent(mtaEventName(), "插入链接", "插入链接-视频")
-                startActivityForResult(VideoActivity.getIntent(this), VideoActivity.INSERT_VIDEO_CODE)
+                PermissionHelper.checkStoragePermissionBeforeAction(this,
+                        object : EmptyCallback {
+                            override fun onCallback() {
+                                MtaHelper.onEvent(mtaEventName(), "插入链接", "插入链接-视频")
+                                startActivityForResult(VideoActivity.getIntent(this@BaseRichEditorActivity), VideoActivity.INSERT_VIDEO_CODE)
+                            }
+                        })
             }
         }
     }
 
+    private fun controlEditorFontContainer() {
+        mEditorFont.isChecked = !mEditorFont.isChecked
+        mEditorLink.isChecked = false
+        mAddLabelContainer.isSelected = false
+        val isShouldDelay = if (mEditorFont.isChecked) {
+            Util_System_Keyboard.hideSoftKeyboard(this)
+            true
+        } else {
+            Util_System_Keyboard.showSoftKeyboard(this)
+            false
+        }
+        mEditorInsertDetailContainer.postDelayed({
+            mEditorInsertDetailContainer.visibility = if (mEditorFont.isChecked) View.VISIBLE else View.GONE
+            mEditorFontContainer.visibility = if (mEditorFont.isChecked) View.VISIBLE else View.GONE
+            mEditorParagraphContainer.visibility = if (mEditorFont.isChecked) View.VISIBLE else View.GONE
+            mEditorLinkContainer.visibility = View.GONE
+            mTagsContainer.visibility = View.GONE
+            mIsExtendedKeyboardShow = mEditorFont.isChecked
+            changeAddLabel(false)
+        }, if (isShouldDelay) 200 else 0L)
+    }
+
+    private fun controlEditorLinkContainer() {
+        mEditorLink.isChecked = !mEditorLink.isChecked
+        mEditorFont.isChecked = false
+        mAddLabelContainer.isSelected = false
+        val isShouldDelay = if (mEditorLink.isChecked) {
+            Util_System_Keyboard.hideSoftKeyboard(this)
+            true
+        } else {
+            Util_System_Keyboard.showSoftKeyboard(this)
+            false
+        }
+        mEditorInsertDetailContainer.postDelayed({
+            mEditorInsertDetailContainer.visibility = if (mEditorLink.isChecked) View.VISIBLE else View.GONE
+            mEditorLinkContainer.visibility = if (mEditorLink.isChecked) View.VISIBLE else View.GONE
+            mEditorFontContainer.visibility = View.GONE
+            mEditorParagraphContainer.visibility = View.GONE
+            mTagsContainer.visibility = View.GONE
+            mIsExtendedKeyboardShow = mEditorLink.isChecked
+            changeAddLabel(false)
+        }, if (isShouldDelay) 200 else 0L)
+    }
+
+    fun controlAddLabelContainer() {
+        mEditorLink.isChecked = false
+        mEditorFont.isChecked = false
+        mAddLabelContainer.isSelected = !mAddLabelContainer.isSelected
+        val isShouldDelay = if (mAddLabelContainer.isSelected) {
+            Util_System_Keyboard.hideSoftKeyboard(this)
+            changeAddLabel(true)
+            true
+        } else {
+            Util_System_Keyboard.showSoftKeyboard(this)
+            changeAddLabel(false)
+            false
+        }
+        mEditorInsertDetailContainer.postDelayed({
+            mEditorInsertDetailContainer.visibility = if (mAddLabelContainer.isSelected) View.VISIBLE else View.GONE
+            mTagsContainer.visibility = if (mAddLabelContainer.isSelected) View.VISIBLE else View.GONE
+            mEditorLinkContainer.visibility = View.GONE
+            mEditorFontContainer.visibility = View.GONE
+            mEditorParagraphContainer.visibility = View.GONE
+            mIsExtendedKeyboardShow = mAddLabelContainer.isSelected
+        }, if (isShouldDelay) 200 else 0L)
+    }
+
+    override fun handleBackPressed(): Boolean {
+        if (mIsExtendedKeyboardShow) {
+            closeExtendedKeyboard()
+            return true
+        }
+        return super.handleBackPressed()
+    }
+
+
     private inner class OnCursorChangeListener {
         @JavascriptInterface
         fun onElements(elements: String) {
@@ -237,6 +383,7 @@ abstract class BaseRichEditorActivity : ToolBarActivity() {
                 mEditorFontBold.isChecked = elements.contains(ELEMENT_NAME_BOLD)
                 mEditorFontItalic.isChecked = elements.contains(ELEMENT_NAME_ITALIC)
                 mEditorFontStrikeThrough.isChecked = elements.contains(ELEMENT_NAME_STRIKE)
+                mEditorFontUnderline.isChecked = elements.contains(ELEMENT_NAME_UNDERLINE)
                 mEditorParagraphH1.isChecked = elements.contains(ELEMENT_PARAGRAPH_H1)
                 mEditorParagraphH2.isChecked = elements.contains(ELEMENT_PARAGRAPH_H2)
                 mEditorParagraphH3.isChecked = elements.contains(ELEMENT_PARAGRAPH_H3)
@@ -264,7 +411,9 @@ abstract class BaseRichEditorActivity : ToolBarActivity() {
         @JavascriptInterface
         fun onTextChange(count: Int) {
             val num = if (count > MAX_INPUT_TEXT_NUM) MAX_INPUT_TEXT_NUM - count else count
-            mEditorTextNumTv.text = num.toString()
+            mEditorTextNumTv.post {
+                mEditorTextNumTv.text = num.toString()
+            }
         }
     }
 
@@ -274,6 +423,7 @@ abstract class BaseRichEditorActivity : ToolBarActivity() {
         const val ELEMENT_NAME_BOLD = " b "
         const val ELEMENT_NAME_ITALIC = " i "
         const val ELEMENT_NAME_STRIKE = " strike "
+        const val ELEMENT_NAME_UNDERLINE = " u "
         const val ELEMENT_PARAGRAPH_H1 = " h1 "
         const val ELEMENT_PARAGRAPH_H2 = " h2 "
         const val ELEMENT_PARAGRAPH_H3 = " h3 "

app/src/main/java/com/gh/base/GHActivityLifecycleCallbacksImpl.java

@@ -7,6 +7,7 @@ import android.os.Bundle;
 import com.gh.common.notifier.Notifier;
 import com.gh.common.util.DataUtils;
 import com.gh.download.DownloadManager;
+import com.gh.gamecenter.SplashScreenActivity;
 import com.halo.assistant.HaloApp;
 import com.lightgame.utils.AppManager;
 
@@ -41,7 +42,9 @@ public class GHActivityLifecycleCallbacksImpl implements ActivityLifecycleCallba
             //FIXME 这里应该只是部分Activity需要
             try {
                 // 初始化gameMap
-                DownloadManager.getInstance(activity).initGameMap();
+                if (!(activity instanceof SplashScreenActivity)) {
+                    DownloadManager.getInstance(activity).initGameMap();
+                }
             } catch (Exception e) {
                 e.printStackTrace();
             }

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

@@ -0,0 +1,17 @@
+package com.gh.base
+
+import java.util.concurrent.ThreadFactory
+import java.util.concurrent.atomic.AtomicInteger
+
+class GHThreadFactory(threadNamePrefix: String) : ThreadFactory {
+
+    private val THREAD_NAME_STEM = "${threadNamePrefix}_%d"
+    private val mThreadId = AtomicInteger(0)
+
+    override fun newThread(r: Runnable?): Thread {
+        val t = Thread(r)
+        t.name = String.format(THREAD_NAME_STEM, mThreadId.getAndIncrement())
+        return t
+    }
+
+}

app/src/main/java/com/gh/base/fragment/BaseDialogFragment.java

@@ -9,6 +9,8 @@ import com.gh.gamecenter.R;
 import com.lightgame.utils.RuntimeUtils;
 import com.lightgame.utils.Utils;
 
+import java.lang.reflect.Field;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
@@ -29,7 +31,7 @@ public class BaseDialogFragment extends DialogFragment {
     @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final Dialog dialog = new Dialog(getActivity(), R.style.DialogWindowTransparent);
+        final Dialog dialog = new Dialog(getActivity(), getThemeRes());
         dialog.setCanceledOnTouchOutside(false);
         dialog.setOnKeyListener((dialog1, keyCode, event) -> {
             if (keyCode == KeyEvent.KEYCODE_BACK && !ClickUtils.isFastDoubleClick()) {
@@ -41,6 +43,10 @@ public class BaseDialogFragment extends DialogFragment {
         return dialog;
     }
 
+    public int getThemeRes() {
+        return R.style.DialogWindowTransparent;
+    }
+
     public void toast(@StringRes int res) {
         if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
             toast(getString(res));
@@ -71,7 +77,22 @@ public class BaseDialogFragment extends DialogFragment {
             transaction.show(fragment);
             transaction.commit();
         } else {
-            super.show(manager, tag);
+            try {
+                Class<?> clazz = DialogFragment.class;
+                Field dismissed = clazz.getDeclaredField("mDismissed");
+                dismissed.setAccessible(true);
+                dismissed.set(this, false);
+
+                Field shownByMe = clazz.getDeclaredField("mShownByMe");
+                shownByMe.setAccessible(true);
+                shownByMe.set(this, true);
+                FragmentTransaction transaction = manager.beginTransaction();
+                transaction.add(this, tag);
+                transaction.commitAllowingStateLoss();
+            } catch (Exception e) {
+                super.show(manager, tag);
+                e.printStackTrace();
+            }
         }
     }
 }

app/src/main/java/com/gh/base/fragment/BaseFragment.java

@@ -140,9 +140,8 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
         EventBus.getDefault().register(this);
 
         // For data binding.
-        if (getInflatedLayout() != null) {
-            mCachedView = getInflatedLayout();
-        } else {
+        mCachedView = getInflatedLayout();
+        if (mCachedView == null) {
             mCachedView = View.inflate(getContext(), getLayoutId(), null);
         }
 
@@ -207,6 +206,10 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         if (container != null) {
             container.removeView(mCachedView);
+            // TODO 页面重建 (framgent 的重新获取) 有大问题，这里只是修修补补
+            if (mCachedView != null && mCachedView.getParent() instanceof ViewGroup) {
+                ((ViewGroup) mCachedView.getParent()).removeView(mCachedView);
+            }
         }
         return mCachedView;
     }

app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager.java

@@ -11,12 +11,14 @@ package com.gh.base.fragment;
 
 import android.content.Intent;
 import android.os.Bundle;
+
 import androidx.annotation.IdRes;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
+
 import android.view.View;
 
 import com.gh.gamecenter.normal.NormalFragment;
@@ -53,19 +55,21 @@ public abstract class BaseFragment_ViewPager extends NormalFragment implements D
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mFragmentsList = new ArrayList<>();
-        initFragmentList(mFragmentsList);
-        mAdapter = BaseFragmentPagerAdapter.newInstance(getChildFragmentManager(), mFragmentsList);
-        final Bundle args = getArguments();
-        if (args != null) {
-            mCheckedIndex = args.getInt(ARGS_INDEX);
-        }
     }
 
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        mViewPager = (ViewPager) view.findViewById(getViewPagerId());
+        mViewPager = view.findViewById(getViewPagerId());
+        mFragmentsList = restoreFragments();
+        if (mFragmentsList.size() == 0) {
+            initFragmentList(mFragmentsList);
+        }
+        mAdapter = BaseFragmentPagerAdapter.newInstance(getChildFragmentManager(), mFragmentsList);
+        final Bundle args = getArguments();
+        if (args != null) {
+            mCheckedIndex = args.getInt(ARGS_INDEX);
+        }
         mViewPager.setOffscreenPageLimit(mFragmentsList.size());
         mViewPager.setAdapter(mAdapter);
         if (mCheckedIndex < mFragmentsList.size()) {
@@ -116,9 +120,24 @@ public abstract class BaseFragment_ViewPager extends NormalFragment implements D
                 fragment.onActivityResult(requestCode, resultCode, data);
             }
         }
-
     }
 
+    public ArrayList<Fragment> restoreFragments() {
+        String tag = "android:switcher:" + mViewPager.getId() + ":";
+        ArrayList<Fragment> fragments = new ArrayList<>();
+        int childCount = getChildCount();
+        for (int index = 0; index < childCount; index++) {
+            Fragment fragment = getChildFragmentManager().findFragmentByTag(tag + index);
+            if (fragment != null) {
+                fragments.add(fragment);
+            }
+        }
+
+        return fragments;
+    }
+
+    public abstract int getChildCount();
+
     public int getCurrentItem() {
         return mViewPager != null ? mViewPager.getCurrentItem() : 0;
     }

app/src/main/java/com/gh/base/fragment/BaseLazyFragment.kt

@@ -2,7 +2,6 @@ package com.gh.base.fragment
 
 import android.os.Bundle
 import com.gh.gamecenter.normal.NormalFragment
-import com.lightgame.utils.Utils
 
 /**
  * 懒加载（支持多层嵌套）
@@ -105,15 +104,25 @@ abstract class BaseLazyFragment : NormalFragment() {
         isSupportVisible = visible
 
         if (visible) {
-            if (mIsFirstVisible && view != null) {
+
+            // TODO 当 fragment 重建时这里的被调用很奇怪，onActivityCreated 回调触发，但此时的 view 是空的，原因是 createView 还没被调用
+            // TODO 这样就造成了 onFragmentResume 里可能用到 view 的地方出现空指针异常，所以这里遇到 view 为空的时候 return 等下一次被调用才进去
+            if (view == null) {
+                return
+            }
+
+            if (mIsFirstVisible) {
                 mIsFirstVisible = false
                 onFragmentFirstVisible()
             }
             onFragmentResume()
             dispatchChildVisibleState(true)
         } else {
-            dispatchChildVisibleState(false)
-            onFragmentPause()
+            // 当 fragment 重建时，这个代码块可能在第一次 view 为空的 visible 后调用导致在 onFragmentPause 里可能用到 view 的地方出现空指针异常
+            if (!mIsFirstVisible) {
+                dispatchChildVisibleState(false)
+                onFragmentPause()
+            }
         }
     }
 

app/src/main/java/com/gh/base/fragment/LazyFragment.kt

@@ -0,0 +1,68 @@
+package com.gh.base.fragment
+
+import android.view.View
+import android.view.ViewStub
+import com.gh.gamecenter.R
+
+/**
+ * 这是在 BaseLazyFragment 之上添加了一些通用功能的抽象类
+ *
+ * 怎么将一个已有的 fragment 转化为懒加载 (延迟渲染) 的 fragment 呢？
+ * (继承 ListFragment 的类请改为继承 LazyListFragment)
+ *
+ * 0. 删掉旧的 getInflatedLayout() 的代码，现在由 getLayoutId() 提供 Stub 布局 （默认为 R.layout.fragment_stub，若重写请注意提供 id 为 stub 的 ViewStub）
+ * 1. 重写 getRealLayoutId()，提供实际要延迟渲染的 layout Id
+ * 1. 将原有在 onCreate() 的代码移动到 onFragmentFirstVisible()
+ * 2. 将原有在 onViewCreated() 的代码移动到 initRealView()
+ * （注意，initRealView() 在 onFragmentFirstVisible() 中被调用，如果要初始化 viewModel 等非 UI 对象请在 super.onFragmentVisible() 调用）
+ * 3. 如需使用 ViewBinding ，在 onRealLayoutInflated() 的回调中初始化 ViewBinding 即可
+ * 4. onResume() 的代码移动到 onFragmentResume()，onPause() 的代码移动到 onFragmentPause()
+ * 5. Done!
+ */
+abstract class LazyFragment : BaseLazyFragment() {
+
+    // ViewStub + ViewBinding 有莫名的 bug，语法上没问题，但编译时通不过。
+    private var mViewStub: ViewStub? = null
+
+    override fun getLayoutId() = R.layout.fragment_stub
+
+    override fun useButterKnife() = false
+
+    override fun initView(view: View?) {
+        super.initView(view)
+        mViewStub = mCachedView.findViewById(R.id.stub)
+    }
+
+    override fun onFragmentFirstVisible() {
+        super.onFragmentFirstVisible()
+        inflateRealView()
+        initRealView()
+    }
+
+    /**
+     * 真正 inflate View 的地方
+     */
+    protected open fun inflateRealView() {
+        mViewStub?.layoutResource = getRealLayoutId()
+        mViewStub?.setOnInflateListener { _, inflatedView -> onRealLayoutInflated(inflatedView) }
+        mCachedView = mViewStub?.inflate()
+    }
+
+    /**
+     * 请在这个方法之后获取初始化后的各种 view
+     *
+     * 替换旧 fragment 实现时，等同于 onViewCreated
+     */
+    protected open fun initRealView() {}
+
+    /**
+     * 提供要 stub inflate 的 layout
+     */
+    protected abstract fun getRealLayoutId(): Int
+
+    /**
+     * 真实 layout inflate 完成的回调，可用于 viewBinding
+     */
+    protected open fun onRealLayoutInflated(inflatedView: View) {}
+
+}

app/src/main/java/com/gh/base/fragment/WaitingDialogFragment.java

@@ -10,6 +10,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentManager;
 
+import com.gh.common.util.ExtensionsKt;
 import com.gh.gamecenter.R;
 
 /**
@@ -87,7 +88,11 @@ public class WaitingDialogFragment extends BaseDialogFragment {
     @Override
     public void dismissAllowingStateLoss() {
         mBackListener = null;
-        super.dismissAllowingStateLoss();
+        try {
+            super.dismissAllowingStateLoss();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     public static class WaitingDialogData {

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

@@ -2,12 +2,13 @@ package com.gh.common
 
 import android.os.Handler
 import android.os.Looper
+import com.gh.base.GHThreadFactory
 import com.gh.common.AppExecutor.ioExecutor
 import com.gh.common.AppExecutor.lightWeightIoExecutor
+import com.gh.common.AppExecutor.logExecutor
 import com.gh.common.AppExecutor.uiExecutor
 import io.reactivex.schedulers.Schedulers
-import java.util.concurrent.Executor
-import java.util.concurrent.Executors
+import java.util.concurrent.*
 
 /**
  * APP 线程池管理类
@@ -15,16 +16,32 @@ import java.util.concurrent.Executors
  * [ioExecutor] 是一个最大线程数固定的线程池，较为繁重的 IO 任务可以交给它
  * [uiExecutor] 是主线程的包裹，需要切换至主线程执行可以用它
  * [lightWeightIoExecutor] 是一个单线程的线程池，轻量级且需要保证同一线程的 IO 任务可以交给它
- *
+ * [logExecutor] 只为上传 log 而使用的线程池
  */
 object AppExecutor {
 
+    private val mCoreSize = Runtime.getRuntime().availableProcessors()
+    private val mMinimumPoolSize = 16.coerceAtLeast(mCoreSize * 4)
+    private val mMaximumPoolSize = 64.coerceAtLeast(mCoreSize * 16)
+
+    // TODO 因为 LinkedBlockingQueue 过大导致 MaximumPoolSize 的值几乎无效，下版本改造 [PackageRepository] 启动请求一堆游戏摘要信息的接口？
+
     @JvmStatic
     val uiExecutor by lazy { MainThreadExecutor() }
+
     @JvmStatic
-    val lightWeightIoExecutor by lazy { Executors.newSingleThreadExecutor() }
+    val lightWeightIoExecutor by lazy { Executors.newSingleThreadExecutor(GHThreadFactory("GH_LIGHT_WEIGHT_IO_THREAD")) }
+
     @JvmStatic
-    val ioExecutor = Executors.newCachedThreadPool() // 用 by lazy 可能影响初始化速度
+    val logExecutor by lazy { Executors.newSingleThreadExecutor(GHThreadFactory("GH_LOG_THREAD")) }
+
+    @JvmStatic
+    val ioExecutor = ThreadPoolExecutor(
+            mMinimumPoolSize,
+            mMaximumPoolSize,
+            20L, TimeUnit.SECONDS,
+            LinkedBlockingQueue<Runnable>(1000),
+            GHThreadFactory("GH_IO_THREAD"))
 
     val cachedScheduler by lazy { Schedulers.from(ioExecutor) }
 

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

@@ -8,16 +8,22 @@ import androidx.annotation.Keep
 import androidx.appcompat.app.AppCompatActivity
 import com.gh.base.CurrentActivityHolder
 import com.gh.common.constant.Constants
+import com.gh.common.loghub.LoghubUtils
+import com.gh.common.tracker.Tracker
 import com.gh.common.util.*
 import com.gh.common.view.dsbridge.CompletionHandler
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.ImageViewerActivity
 import com.gh.gamecenter.LoginActivity
 import com.gh.gamecenter.WebActivity
+import com.gh.gamecenter.energy.EnergyCenterActivity
+import com.gh.gamecenter.energy.EnergyHouseActivity
 import com.gh.gamecenter.entity.Badge
 import com.gh.gamecenter.entity.MtaEvent
 import com.gh.gamecenter.entity.NotificationUgc
+import com.gh.gamecenter.help.QaFeedbackDialogFragment
 import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.personalhome.border.AvatarBorderActivity
 import com.gh.gamecenter.retrofit.BiResponse
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.security.BindPhoneActivity
@@ -64,8 +70,12 @@ class DefaultJsApi(var context: Context) {
 
     @JavascriptInterface
     fun login(msg: Any) {
-        val intent = LoginActivity.getIntent(context, "浏览器")
-        context.startActivity(intent)
+        if (SPUtils.getBoolean(Constants.SP_HAS_GET_PHONE_INFO) || NetworkUtils.isOpenMobileData(context)) {
+            QuickLoginHelper.startLogin(context, "浏览器")
+        } else {
+            val intent = LoginActivity.getIntent(context, "浏览器")
+            context.startActivity(intent)
+        }
     }
 
     @JavascriptInterface
@@ -115,6 +125,7 @@ class DefaultJsApi(var context: Context) {
                             .observeOn(AndroidSchedulers.mainThread())
                             .subscribe(object : BiResponse<ResponseBody>() {
                                 override fun onSuccess(data: ResponseBody) {
+                                    EnergyTaskHelper.postEnergyTask("bind_wechat")
                                     handler.complete(true)
                                 }
 
@@ -198,6 +209,7 @@ class DefaultJsApi(var context: Context) {
     @JavascriptInterface
     fun updateRegulationTestStatus(msg: Any) {
         if (msg.toString().toLowerCase(Locale.getDefault()) == "pass") {
+            EnergyTaskHelper.postEnergyTask("finish_etiquette_exam")
             SPUtils.setString(Constants.SP_REGULATION_TEST_PASS_STATUS, "pass")
         }
     }
@@ -215,7 +227,7 @@ class DefaultJsApi(var context: Context) {
 
     @JavascriptInterface
     fun showIncompatibleVersionDialog(msg: Any) {
-        DialogUtils.showLowVersionDialog(context)
+        DialogHelper.showUpgradeDialog(context)
     }
 
     @JavascriptInterface
@@ -228,6 +240,20 @@ class DefaultJsApi(var context: Context) {
         MessageShareUtils.getInstance(context).shareFromWeb(context, imageShareEvent.type)
     }
 
+    @JavascriptInterface
+    fun inviteFriends(event: Any) {
+        val inviteEvent = event.toString().toObject() ?: InviteFriendsEvent()
+        val context = CurrentActivityHolder.getCurrentActivity()
+        if ("poster" == inviteEvent.type) {
+            Base64ImageHolder.image = inviteEvent.poster.run {
+                if (this.startsWith("data:image/png;base64")) this.split(",")[1] else this
+            }
+            MessageShareUtils.getInstance(context).shareInviteFriends(context, inviteEvent.way)
+        } else {
+            ShareUtils.getInstance(context).shareInviteFriends(context, inviteEvent.url, inviteEvent.way)
+        }
+    }
+
     @JavascriptInterface
     fun bindPhone(msg: Any) {
         val intent = BindPhoneActivity.getNormalIntent(context, false)
@@ -257,10 +283,77 @@ class DefaultJsApi(var context: Context) {
         runOnUiThread { DirectUtils.directToWebView(context, url.toString(), "内部网页") }
     }
 
+    @JavascriptInterface
+    fun postWearBadgeTask(msg: Any) {
+        EnergyTaskHelper.postEnergyTask("wear_badge")
+    }
+
+    @JavascriptInterface
+    fun startEnergyCenter(msg: Any) {
+        context.startActivity(EnergyCenterActivity.getIntent(context))
+    }
+
+    @JavascriptInterface
+    fun startEnergyHouse(msg: Any) {
+        context.startActivity(EnergyHouseActivity.getIntent(context))
+    }
+
+    @JavascriptInterface
+    fun showQaFeedbackDialog(msg: Any) {
+        QaFeedbackDialogFragment.show(context as AppCompatActivity, msg.toString())
+    }
+
+    @JavascriptInterface
+    fun getMetaObject(msg: Any): String {
+        return LogUtils.getMetaObject().toString()
+    }
+
+    @JavascriptInterface
+    fun getLaunchId(msg: Any): String {
+        return Tracker.launchId
+    }
+
+    @JavascriptInterface
+    fun getSessionId(msg: Any): String {
+        return Tracker.sessionId
+    }
+
+    @JavascriptInterface
+    fun postLogEvent(event: Any) {
+        val logEvent = event.toString().toObject() ?: LogEvent()
+        debugOnly {
+            Utils.log("LogUtils->${logEvent.jsonString}")
+        }
+        LoghubUtils.log(logEvent.jsonString, logEvent.logStore, false)
+    }
+
+    @JavascriptInterface
+    fun startAvatarBorderPage(msg: Any) {
+        context.startActivity(AvatarBorderActivity.getIntent(context, msg.toString()))
+    }
+
+    @JavascriptInterface
+    fun isNetworkConnected(): Boolean {
+        return NetworkUtils.isNetworkConnected(context)
+    }
+
+    @JavascriptInterface
+    fun isWifiConnected(): Boolean {
+        return NetworkUtils.isWifiConnected(context)
+    }
+
     @Keep
     internal data class ImageEvent(var imageList: ArrayList<String> = arrayListOf(), var position: Int = 0)
 
     @Keep
     internal data class ImageShareEvent(var image: String = "", var type: String = "")
 
+    @Keep
+    internal data class InviteFriendsEvent(var type: String = "",
+                                           var way: String = "",
+                                           var url: String = "",
+                                           var poster: String = "")
+
+    @Keep
+    internal data class LogEvent(var jsonString: String = "", var logStore: String = "")
 }

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

@@ -287,6 +287,7 @@ object DefaultUrlHandler {
                     val platformName = PlatformUtils.getInstance(context).getPlatformName(platform)
                     val gameId = uri.getQueryParameter(EntranceUtils.KEY_GAMEID)
                     val packageMd5 = uri.getQueryParameter(EntranceUtils.KEY_PACKAGE_MD5)
+                    val isQaFeedback = uri.getQueryParameter(EntranceUtils.KEY_IS_QA_FEEDBACK) == "true"
                     val content = if (TextUtils.isEmpty(gameId) || TextUtils.isEmpty(packageMd5)) String.format("%s-%s-V%s，",
                             uri.getQueryParameter(EntranceUtils.KEY_GAME_NAME),
                             if (TextUtils.isEmpty(platformName)) platform else platformName,
@@ -299,7 +300,7 @@ object DefaultUrlHandler {
                     if (!TextUtils.isEmpty(qaId)) {
                         directToQa(context, qaTitle, qaId)
                     } else {
-                        directToFeedback(context, content, EntranceUtils.ENTRANCE_BROWSER)
+                        directToFeedback(context, content, null, isQaFeedback, EntranceUtils.ENTRANCE_BROWSER)
                     }
                 }
 
@@ -307,7 +308,7 @@ object DefaultUrlHandler {
                     val position = uri.getQueryParameter("position") ?: ""
                     DirectUtils.directToHelpAndFeedback(context, position.toInt())
                 }
-                else -> DialogUtils.showLowVersionDialog(context)
+                else -> DialogHelper.showUpgradeDialog(context)
             }
             return true
         } else if ("zhiqu" == uri.scheme) {
@@ -344,6 +345,11 @@ object DefaultUrlHandler {
             return true
         }
 
+        // 处理内部页面逻辑
+        if (transformNormalScheme(context, url, entrance)) {
+            return true
+        }
+
         if ("http" != uri.scheme && "https" != uri.scheme) return true
         return false
     }
@@ -360,7 +366,8 @@ object DefaultUrlHandler {
             uri.path?.apply {
                 when {
                     contains("game") -> {
-                        val gameId = uri.getQueryParameter("gameId") ?: ""
+                        val gameId = uri.getQueryParameter("gameId") ?: uri.pathSegments.last()
+                        ?: ""
                         DirectUtils.directToGameDetail(context, gameId, entrance, autoDownload = false, traceEvent = null)
                     }
                     contains("question") -> {
@@ -372,11 +379,12 @@ object DefaultUrlHandler {
                             DirectUtils.directToAnswerDetail(context, answerId, entrance, "")
                         }
                     }
-                    contains("communities") && contains("article") -> {
+                    ((contains("bbs")) && contains("article") ||
+                            (contains("communities")) && contains("article")) -> {
                         var communityId = ""
                         var type = ""
                         var typeId = ""
-                        val split = replace("/communities", "").replace(".html", "").split("/".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+                        val split = replace("/communities", "").replace("/bbs", "").replace(".html", "").split("/".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
                         for (text in split) {
                             if (TextUtils.isEmpty(communityId)) {
                                 communityId = text
@@ -390,7 +398,7 @@ object DefaultUrlHandler {
                                 typeId = text
                             }
                         }
-                        if ("articles" == type) {
+                        if ("articles" == type || "article" == type) {
                             DirectUtils.directToCommunityArticle(
                                     context, typeId, communityId,
                                     entrance, "文章链接")
@@ -398,7 +406,11 @@ object DefaultUrlHandler {
                     }
                     contains("article") -> {
                         val articleId = split("/")[2].replace(".html", "")
-                        DirectUtils.directToArticle(context, articleId, entrance)
+                        if (entrance == "隐私政策") {
+                            DirectUtils.directToArticle(context, articleId, true, entrance)
+                        } else {
+                            DirectUtils.directToArticle(context, articleId, entrance)
+                        }
                     }
                     contains("columns") -> {
                         val columnsId = split("/")[3]

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

@@ -11,6 +11,7 @@ import com.gh.gamecenter.entity.TimeEntity
 import com.gh.gamecenter.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
+import io.reactivex.schedulers.Schedulers
 import kotlin.concurrent.fixedRateTimer
 
 object FixedRateJobHelper {
@@ -35,7 +36,7 @@ object FixedRateJobHelper {
                 // 时间校对，10分钟一次
                 if ((mExecuteCount * CHECKER_PERIOD) % TIME_PERIOD == 0L) {
                     RetrofitManager.getInstance(HaloApp.getInstance().application).api.time
-                            .subscribeOn(AppExecutor.cachedScheduler)
+                            .subscribeOn(Schedulers.io())
                             .subscribe(object : Response<TimeEntity>() {
                                 override fun onResponse(response: TimeEntity?) {
                                     val serverTime = response?.time

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

@@ -5,6 +5,7 @@ import android.app.Application
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
+import com.gh.base.GHThreadFactory
 import com.halo.assistant.HaloApp
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
@@ -29,31 +30,31 @@ class TimeElapsedHelper(val fragment: Fragment?, val activity: Activity?) {
 
     init {
         activity?.application?.registerActivityLifecycleCallbacks(object : Application.ActivityLifecycleCallbacks {
-            override fun onActivityStarted(a: Activity?) {
+            override fun onActivityStarted(a: Activity) {
             }
 
-            override fun onActivitySaveInstanceState(a: Activity?, outState: Bundle?) {
+            override fun onActivitySaveInstanceState(a: Activity, outState: Bundle) {
             }
 
-            override fun onActivityStopped(a: Activity?) {
+            override fun onActivityStopped(a: Activity) {
             }
 
-            override fun onActivityCreated(a: Activity?, savedInstanceState: Bundle?) {
+            override fun onActivityCreated(a: Activity, savedInstanceState: Bundle?) {
             }
 
-            override fun onActivityPaused(a: Activity?) {
+            override fun onActivityPaused(a: Activity) {
                 if (activity == a) {
                     pauseCounting()
                 }
             }
 
-            override fun onActivityResumed(a: Activity?) {
+            override fun onActivityResumed(a: Activity) {
                 if (activity == a) {
                     resumeCounting()
                 }
             }
 
-            override fun onActivityDestroyed(a: Activity?) {
+            override fun onActivityDestroyed(a: Activity) {
                 if (activity == a) {
                     HaloApp.getInstance().application.unregisterActivityLifecycleCallbacks(this)
                 }
@@ -114,7 +115,7 @@ class TimeElapsedHelper(val fragment: Fragment?, val activity: Activity?) {
 }
 
 object TimeElapsedThreadHolder {
-    val threadService: ExecutorService by lazy { Executors.newSingleThreadExecutor() }
+    val threadService: ExecutorService by lazy { Executors.newSingleThreadExecutor(GHThreadFactory("TIME_ELAPSED_THREAD")) }
 }
 
 interface TimeoutCallback {

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

@@ -2,6 +2,7 @@ package com.gh.common.constant;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
 
@@ -11,9 +12,11 @@ import com.gh.common.util.PackageUtils;
 import com.gh.common.util.SPUtils;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.SuggestionActivity;
+import com.gh.gamecenter.entity.NewSettingsEntity;
 import com.gh.gamecenter.entity.NewsEntity;
 import com.gh.gamecenter.entity.SettingsEntity;
 import com.gh.gamecenter.eventbus.EBReuse;
+import com.gh.gamecenter.retrofit.BiResponse;
 import com.gh.gamecenter.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.halo.assistant.HaloApp;
@@ -52,15 +55,18 @@ public class Config {
     public static final String TTAD_APPID = BuildConfig.TTAD_APPID;
     public static final String DOUYIN_CLIENTKEY = BuildConfig.DOUYIN_CLIENTKEY;
     public static final String DOUYIN_CLIENTSECRET = BuildConfig.DOUYIN_CLIENTSECRET;
+    public static final String QUICK_LOGIN_APPID = BuildConfig.QUICK_LOGIN_APPID;
+    public static final String QUICK_LOGIN_APPKEY = BuildConfig.QUICK_LOGIN_APPKEY;
     // http://www.ghzs666.com/article/${articleId}.html
     public static final String URL_ARTICLE = "http://www.ghzs666.com/article/"; // ghzs/ghzs666 统一
     public static final String PATCHES = "patches";
 
-    public static final String DEFAULT_CHANNEL = "GH_TEST";
+    public static final String DEFAULT_CHANNEL = "GH_TEST2";
 
     private static String SETTINGS_KEY = "settingsKey";
 
     private static SettingsEntity mSettingsEntity;
+    private static NewSettingsEntity mNewSettingsEntity;
 
     public static final String FIX_DOWNLOAD_KEY = "isFixDownload";
     public static final String FIX_PLUGIN_KEY = "isFixPlugin";
@@ -203,6 +209,21 @@ public class Config {
         return mSettingsEntity;
     }
 
+    @Nullable
+    public static NewSettingsEntity getNewSettingsEntity() {
+        if (mNewSettingsEntity == null) {
+            try {
+                String json = SPUtils.getString(Constants.SP_NEW_SETTINGS);
+                if (!TextUtils.isEmpty(json)) {
+                    mNewSettingsEntity = GsonUtils.fromJson(json, NewSettingsEntity.class);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return mNewSettingsEntity;
+    }
+
     private static boolean isExistDownloadFilter() {
         if (getSettings() == null || getSettings().getDownload() == null || getSettings().getDownload().size() == 0) {
             return false;
@@ -278,5 +299,17 @@ public class Config {
                         EventBus.getDefault().post(new EBReuse("Refresh"));
                     }
                 });
+
+        RetrofitManager.getInstance(HaloApp.getInstance().getApplication())
+                .getApi().getNewSettings(Build.MANUFACTURER, Build.MODEL, channel)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new BiResponse<NewSettingsEntity>() {
+                    @Override
+                    public void onSuccess(NewSettingsEntity data) {
+                        mNewSettingsEntity = data;
+                        SPUtils.setString(Constants.SP_NEW_SETTINGS, GsonUtils.toJson(data));
+                    }
+                });
     }
 }

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

@@ -27,12 +27,16 @@ public class Constants {
 
     public static final String GAME_DETAIL_COME_IN = "game_detail_come_in"; // 从游戏详情进入
 
+    public static final String SPLASH_AD = "splash_ad"; // 启动广告
+
     public static final String XPOSED_INSTALLER_PACKAGE_NAME = "de.robv.android.xposed.installer";
 
     public static final String EB_QUIT_LOGIN = "quit_login";
 
-    // 用于避免历史下载掺和到普通下载状态的 ID 修饰符
-    public static final String GAME_ID_DIVIDER = ":";
+    public static final String EB_SHOW_AD = "show_ad";
+
+    public static final String EB_GAME_DETAIL = "eb_game_detail";
+
     // 用于避免历史下载影响到部分依赖名字作为数据更新条件的修饰符
     public static final String GAME_NAME_DECORATOR = " ";
 
@@ -49,10 +53,19 @@ public class Constants {
     public static final String RAW_GAME_ICON = "raw_game_icon";
     public static final String GAME_ICON_SUBSCRIPT = "game_icon_subscript";
 
+    public static final String IS_PLATFORM_RECOMMEND = "isPlatformRecommend";
+
+    // 下载 id，一般来说跟下载文件名一样
+    public static final String DOWNLOAD_ID = "download_id";
+
+    public static final String GHZS_GAME_ID = "5ae4462c2924bc7936438d07";
+
     public static final String EXTRA_DOWNLOAD_TYPE = "extra_download_type";
     public static final String SILENT_UPDATE = "静默更新";
     public static final String SIMULATOR_DOWNLOAD = "下载模拟器";
     public static final String SIMULATOR_GAME = "simulator_game";
+    public static final String SIMULATOR = "simulator";
+    public static final String GAME_NAME = "game_name";
     public static final String SIMULATOR_DOWNLOAD_START_TIME = "simulator_download_start_time";
     public static final String LAST_GHZS_UPDATE_FILE_SIZE = "last_ghzs_update_file_size";
 
@@ -62,6 +75,8 @@ public class Constants {
     public static final String SP_IMEI = "imei";
     public static final String SP_ANDROID_ID = "android_id";
 
+    public static final String LAST_INSTALL_GAME = "last_install_game";
+
     //引导设置 “通知管理” 引导弹窗
     public static final String SP_SHOWED_NOTIFICATION_LOGIN = "show_notification_login_hint";
     public static final String SP_SHOWED_NOTIFICATION_QUESTION = "show_notification_question_hint";
@@ -106,8 +121,6 @@ public class Constants {
     public static final String SP_FILTER_TAGS = "filter_tags";
     //实名认证弹窗分类数据
     public static final String SP_AUTH_DIALOG = "auth_dialog";
-    //顶部视频进度保存，重启恢复
-    public static final String SP_TOP_VIDEO_SCHEDULE = "top_video_schedule";
     //我的光环小红点提示
     public static final String SP_GH_RED_POINT_REMIND = "gh_red_point_remind";
     //论坛首页引导
@@ -131,10 +144,55 @@ public class Constants {
     public static final String SP_BRAND_NEW_USER = "brand_new_user";
     //包名检测是否点击不再提示
     public static final String SP_PACKAGE_CHECK = "package_check";
+    //游戏详情预约引导提示
+    public static final String SP_GAME_DETAIL_RESERVE_GUIDE = "game_detail_reserve_guide";
 
     public static final String SP_XAPK_UNZIP_ACTIVITY = "xapk_unzip_activity";
     public static final String SP_XAPK_URL = "xapk_url";
 
+    //游戏详情推荐弹窗
+    public static final String SP_RECOMMEND_POPUP = "recommend_popup";
+
+
+    // 使用浏览器安装开关
+    public static final String SP_USE_BROWSER_TO_INSTALL = "use_browser_to_install";
+    // 游戏详情页底部使用浏览器安装提示
+    public static final String SP_SHOULD_SHOW_GAMEDETAIL_USE_BROWSER_TO_INSTALL_HINT = "should_show_gamedetail_use_browser_to_install_hint";
+    // 第一次普通安装推荐使用浏览器安装提示
+    public static final String SP_SHOULD_SHOW_USE_BROWSER_TO_INSTALL_HINT = "should_show_use_browser_to_install_hint";
+
+    //模拟器管理引导
+    public static final String SP_SIMULATOR_GUIDE = "simulator_guide";
+    //模拟器游戏引导
+    public static final String SP_SIMULATOR_GAME_GUIDE = "simulator_game_guide";
+
+
+    //首页视频播放进度
+    public static final String SP_HOME_VIDEO_PLAY_RECORD = "home_video_play_record";
+
+    // 用户是否曾经永久拒绝过存储权限
+    public static final String SP_USER_HAS_PERMANENTLY_DENIED_STORAGE_PERMISSION = "user_has_permanently_denied_storage_permission";
+
+    // 是否已经填写邀请码
+    public static final String SP_HAS_COMPLETE_INVITE_CODE = "has_complete_invite_code";
+
+    // 补充配置项
+    public static final String SP_NEW_SETTINGS = "new_settings";
+
+    // 头像挂件ID
+    public static final String SP_CHOOSE_AVATAR_ID = "choose_avatar_id";
+
+    // 是否显示返回任务悬浮图标
+    public static final String SP_SHOW_TASK_FLOAT = "show_task_float";
+    // 悬浮图标Y值
+    public static final String SP_TASK_FLOAT_LAST_Y = "task_float_last_y";
+
+    // 是否第一次进入新分类2.0
+    public static final String SP_FIRST_ENTER_CATEGORY_V2 = "first_enter_category_v2";
+
+    // 是否成功取过号
+    public static final String SP_HAS_GET_PHONE_INFO = "has_get_phone_info";
+
     //手机号码匹配规则
     public static final String REGEX_MOBILE = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$";
     public static final String REGEX_ACCOUNT = "^[a-zA-Z_]\\w{5,17}$";
@@ -169,13 +227,76 @@ public class Constants {
     //版规声明
     public static final String FORUM_REGULATIONS_NEWS_ID = "5f4db9cc34d44d01b92fd670";
 
+    // 权限使用场景地址
+    public static final String PERMISSION_SCENARIO_ADDRESS = "https://resource.ghzs.com/page/permissions/android.html";
+
     //帮助内容详情
     public static final String HELP_ADDRESS_DEV = "https://static-web.ghzs.com/ghzs_help_dev/help.html?content=";
     public static final String HELP_ADDRESS = "https://static-web.ghzs.com/ghzs_help/help.html?content=";
 
     // 注销页面
-    public static final String LOGOUT_ADDRESS_DEV = "https://static-web.ghzs.com/ghzs_help_dev/help.html?content=5f6b1f02786564003944a693";
-    public static final String LOGOUT_ADDRESS = "https://static-web.ghzs.com/ghzs_help/help.html?content=5f534111b1f72909fc225672";
+    public static final String LOGOUT_ADDRESS_DEV = "https://static-web.ghzs.com/ghzs_help_dev/help.html?content=5f6b1f02786564003944a693&from=ghzs";
+    public static final String LOGOUT_ADDRESS = "https://static-web.ghzs.com/ghzs_help/help.html?content=5f534111b1f72909fc225672&from=ghzs";
+
+    // 商品详情
+    public static final String COMMODITY_DETAIL_ADDRESS_DEV = "https://static-web.ghzs.com/shop-dev/index.html#/product?from=ghzs";
+    public static final String COMMODITY_DETAIL_ADDRESS = "https://static-web.ghzs.com/shop/index.html#/product?from=ghzs";
+
+    // 光能记录
+    public static final String ENERGY_RECORD_ADDRESS_DEV = "https://static-web.ghzs.com/shop-dev/index.html#/record?from=ghzs";
+    public static final String ENERGY_RECORD_ADDRESS = "https://static-web.ghzs.com/shop/index.html#/record?from=ghzs";
+
+    // 订单中心
+    public static final String ORDER_CENTER_ADDRESS_DEV = "https://static-web.ghzs.com/shop-dev/index.html#/orders?from=ghzs";
+    public static final String ORDER_CENTER_ADDRESS = "https://static-web.ghzs.com/shop/index.html#/orders?from=ghzs";
+
+    // 订单详情
+    public static final String ORDER_DETAIL_ADDRESS_DEV = "https://static-web.ghzs.com/shop-dev/index.html#/order-detail?from=ghzs";
+    public static final String ORDER_DETAIL_ADDRESS = "https://static-web.ghzs.com/shop/index.html#/order-detail?from=ghzs";
+
+    // 邀请好友
+    public static final String INVITE_FRIENDS_ADDRESS_DEV = "https://static-web.ghzs.com/ghzs_activity_dev/inviteFriends.html#/invite";
+    public static final String INVITE_FRIENDS_ADDRESS = "https://static-web.ghzs.com/ghzs_activity_prod/inviteFriends.html#/invite";
+
+    // 等级页面
+    public static final String LEVEL_ADDRESS_DEV = "https://static-web.ghzs.com/ghzs-userhome-dev/index.html#/level";
+    public static final String LEVEL_ADDRESS = "https://static-web.ghzs.com/ghzs-userhome/index.html#/level";
+
+    // 兑换规则
+    public static final String EXCHANGE_RULE_ADDRESS_DEV = "https://static-web.ghzs.com/shop-dev/index.html#/exchange-rule?from=ghzs";
+    public static final String EXCHANGE_RULE_ADDRESS = "https://static-web.ghzs.com/shop/index.html#/exchange-rule?from=ghzs";
+
+    // 光能规则
+    public static final String ENERGY_RULE_ADDRESS_DEV = "https://static-web.ghzs.com/shop-dev/index.html#/energy-rule?from=ghzs";
+    public static final String ENERGY_RULE_ADDRESS = "https://static-web.ghzs.com/shop/index.html#/energy-rule?from=ghzs";
+
+    // 兑换商品
+    public static final String EXCHANGE_COMMODITY_ADDRESS_DEV = "https://static-web.ghzs.com/shop-dev/index.html#/exchange-log?from=ghzs";
+    public static final String EXCHANGE_COMMODITY_ADDRESS = "https://static-web.ghzs.com/shop/index.html#/exchange-log?from=ghzs";
+
+    // 抽奖乐园
+    public static final String LOTTERY_PARADISE_ADDRESS_DEV = "https://static-web.ghzs.com/shop-dev/index.html#/lottery-list?from=ghzs";
+    public static final String LOTTERY_PARADISE_ADDRESS = "https://static-web.ghzs.com/shop/index.html#/lottery-list?from=ghzs";
+
+    // 我的奖品
+    public static final String MY_PRIZE_ADDRESS_DEV = "https://static-web.ghzs.com/shop-dev/index.html#/mywin?from=ghzs";
+    public static final String MY_PRIZE_ADDRESS = "https://static-web.ghzs.com/shop/index.html#/mywin?from=ghzs";
+
+    // 中奖订单详情
+    public static final String WIN_ORDER_DETAIL_ADDRESS_DEV = "https://static-web.ghzs.com/shop-dev/index.html#/win-order-detail?from=ghzs";
+    public static final String WIN_ORDER_DETAIL_ADDRESS = "https://static-web.ghzs.com/shop/index.html#/win-order-detail?from=ghzs";
+
+    // 地址信息
+    public static final String ADDRESS_INFO_ADDRESS_DEV = "https://static-web.ghzs.com/shop-dev/index.html#/address-list?from=ghzs";
+    public static final String ADDRESS_INFO_ADDRESS = "https://static-web.ghzs.com/shop/index.html#/address-list?from=ghzs";
+
+    // 领奖信息
+    public static final String PRIZE_INFO_ADDRESS_DEV = "https://static-web.ghzs.com/shop-dev/index.html#/user-info?from=ghzs";
+    public static final String PRIZE_INFO_ADDRESS = "https://static-web.ghzs.com/shop/index.html#/user-info?from=ghzs";
+
+    // 提现信息
+    public static final String WITHDRAW_INFO_ADDRESS_DEV = "https://static-web.ghzs.com/shop-dev/index.html#/cash?from=ghzs";
+    public static final String WITHDRAW_INFO_ADDRESS = "https://static-web.ghzs.com/shop/index.html#/cash?from=ghzs";
 
     //最少需要多少数据才能上传
     public static final int DATA_AMOUNT = 20;

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

@@ -46,12 +46,14 @@ import com.gh.common.util.NumberUtils;
 import com.gh.common.util.PackageInstaller;
 import com.gh.common.util.PackageUtils;
 import com.gh.common.util.PlatformUtils;
+import com.gh.common.util.RealNameHelper;
 import com.gh.common.util.ReservationHelper;
 import com.gh.common.view.DownloadProgressBar;
 import com.gh.common.view.DrawableView;
 import com.gh.common.view.GameIconView;
 import com.gh.download.DownloadManager;
 import com.gh.download.dialog.DownloadDialog;
+import com.gh.download.server.BrowserInstallHelper;
 import com.gh.gamecenter.DownloadManagerActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.WebActivity;
@@ -66,6 +68,7 @@ import com.gh.gamecenter.entity.ServerCalendarEntity;
 import com.gh.gamecenter.entity.TagStyleEntity;
 import com.gh.gamecenter.entity.TestEntity;
 import com.gh.gamecenter.eventbus.EBReuse;
+import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment;
 import com.gh.gamecenter.manager.PackagesManager;
 import com.gh.gamecenter.qa.entity.CommunityVideoEntity;
 import com.lightgame.download.DownloadEntity;
@@ -456,27 +459,37 @@ public class BindingAdapters {
                                 return;
                             }
                         }
-                        PackageCheckDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity.getPackageDialog(), () -> {
-                            DownloadDialogHelper.findAvailableDialogAndShow(v.getContext(), gameEntity, apk, () -> {
-                                CertificationDialog.showCertificationDialog(v.getContext(), gameEntity, () -> {
-                                    DialogUtils.showVersionNumberDialog(v.getContext(), gameEntity, () -> {
-                                        DialogUtils.showOverseaDownloadDialog(v.getContext(), gameEntity, () -> {
-                                            DialogUtils.checkDownload(v.getContext(), apk.getSize(),
-                                                    isSubscribe -> download(progressBar, gameEntity, traceEvent, isSubscribe, entrance, location));
+                        RealNameHelper.checkIfAuth(v.getContext(), gameEntity, () -> {
+                            GamePermissionDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity, gameEntity.getInfo(), () -> {
+                                BrowserInstallHelper.showBrowserInstallHintDialog(v.getContext(), () -> {
+                                    PackageCheckDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity, () -> {
+                                        DownloadDialogHelper.findAvailableDialogAndShow(v.getContext(), gameEntity, apk, () -> {
+                                            CertificationDialog.showCertificationDialog(v.getContext(), gameEntity, () -> {
+                                                DialogUtils.showVersionNumberDialog(v.getContext(), gameEntity, () -> {
+                                                    DialogUtils.showOverseaDownloadDialog(v.getContext(), gameEntity, () -> {
+                                                        DialogUtils.checkDownload(v.getContext(), apk.getSize(),
+                                                                isSubscribe -> download(progressBar, gameEntity, traceEvent, isSubscribe, entrance, location));
+                                                    });
+                                                });
+                                            });
                                         });
                                     });
                                 });
                             });
                         });
                     } else {
-                        CertificationDialog.showCertificationDialog(v.getContext(), gameEntity, () -> {
-                            DialogUtils.showVersionNumberDialog(v.getContext(), gameEntity, () -> {
-                                DownloadDialog.showDownloadDialog(
-                                        v.getContext(),
-                                        gameEntity,
-                                        traceEvent,
-                                        entrance,
-                                        location + ":" + gameEntity.getName());
+                        RealNameHelper.checkIfAuth(v.getContext(), gameEntity, () -> {
+                            GamePermissionDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity, gameEntity.getInfo(), () -> {
+                                CertificationDialog.showCertificationDialog(v.getContext(), gameEntity, () -> {
+                                    DialogUtils.showVersionNumberDialog(v.getContext(), gameEntity, () -> {
+                                        DownloadDialog.showDownloadDialog(
+                                                v.getContext(),
+                                                gameEntity,
+                                                traceEvent,
+                                                entrance,
+                                                location + ":" + gameEntity.getName());
+                                    });
+                                });
                             });
                         });
                     }
@@ -518,12 +531,16 @@ public class BindingAdapters {
                     }
                     break;
                 case RESERVABLE:
-                    CheckLoginUtils.checkLogin(progressBar.getContext(), "", () -> {
-                        ReserveDialogFragment dialogFragment = ReserveDialogFragment.getInstance(gameEntity, () -> {
-                            LogUtils.logReservation(gameEntity, traceEvent);
-                            updateReservation(progressBar, gameEntity);
+                    RealNameHelper.checkIfAuth(v.getContext(), gameEntity, () -> {
+                        GamePermissionDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity, gameEntity.getInfo(), () -> {
+                            CheckLoginUtils.checkLogin(progressBar.getContext(), "", () -> {
+                                ReserveDialogFragment dialogFragment = ReserveDialogFragment.getInstance(gameEntity, () -> {
+                                    LogUtils.logReservation(gameEntity, traceEvent);
+                                    updateReservation(progressBar, gameEntity);
+                                });
+                                dialogFragment.show(((AppCompatActivity) progressBar.getContext()).getSupportFragmentManager(), "reserve");
+                            });
                         });
-                        dialogFragment.show(((AppCompatActivity) progressBar.getContext()).getSupportFragmentManager(), "reserve");
                     });
                     break;
                 case RESERVED:
@@ -550,8 +567,10 @@ public class BindingAdapters {
                         HistoryHelper.insertGameEntity(gameEntity);
                     }
 
-                    Intent i = new Intent(WebActivity.getIntentForWebGame(progressBar.getContext(), linkEntity.getLink(), gameEntity.getName(), isPlay, linkEntity.getCloseButton()));
-                    progressBar.getContext().startActivity(i);
+                    GamePermissionDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity, gameEntity.getInfo(), () -> {
+                        Intent i = new Intent(WebActivity.getIntentForWebGame(progressBar.getContext(), linkEntity.getLink(), gameEntity.getName(), isPlay, linkEntity.getCloseButton()));
+                        progressBar.getContext().startActivity(i);
+                    });
                     break;
                 case UPDATING:
                     Utils.toast(progressBar.getContext(), "正在加急更新版本，敬请后续留意");
@@ -731,7 +750,9 @@ public class BindingAdapters {
         try {
             ArrayList<TagStyleEntity> tagStyle = new ArrayList<>();
             TestEntity test = gameEntity.getTest();
-            if (test != null) {
+            if (test != null
+                    // 这个判断用于开测表列表
+                    && !"type_tag".equals(test.getGameTag())) {
                 TagStyleEntity typeTag = new TagStyleEntity();
                 typeTag.setName(test.getType() != null ? test.getType() : "");
                 typeTag.setBackground("FFF3E0");

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

@@ -0,0 +1,95 @@
+package com.gh.common.dialog
+
+import android.annotation.SuppressLint
+import android.app.Dialog
+import android.os.Bundle
+import android.view.*
+import com.gh.base.fragment.BaseDialogFragment
+import com.gh.gamecenter.R
+import com.halo.assistant.HaloApp
+
+abstract class BaseDraggableDialogFragment : BaseDialogFragment(), View.OnTouchListener {
+    private var mInitPositionY = 0f
+    private lateinit var mGestureDetector: GestureDetector
+    private lateinit var mRootView: View
+    private lateinit var mDragCloseView: View
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        mRootView = getRootView()
+        mDragCloseView = getDragCloseView()
+        mDragCloseView.setOnTouchListener(this)
+        mGestureDetector = GestureDetector(requireContext(), SingleTapConfirm())
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val createDialog = super.onCreateDialog(savedInstanceState)
+        createDialog.setCanceledOnTouchOutside(true)
+
+        val window = createDialog.window
+        window?.setGravity(Gravity.BOTTOM)
+        window?.setWindowAnimations(R.style.community_publication_animation)
+        return createDialog
+    }
+
+    // dialog drag animation
+    @SuppressLint("ClickableViewAccessibility")
+    override fun onTouch(v: View, event: MotionEvent): Boolean {
+        if (mGestureDetector.onTouchEvent(event) && mRootView.y == 0F) {
+            v.performClick()
+            return true
+        }
+        when (event.action) {
+            MotionEvent.ACTION_DOWN -> {
+                mInitPositionY = mRootView.y - event.rawY
+            }
+            MotionEvent.ACTION_MOVE -> {
+                val offsetY = event.rawY + mInitPositionY
+                val dialogY = mRootView.y
+                if (dialogY + offsetY > 0) {
+                    mRootView.animate()
+                            .y(offsetY)
+                            .setDuration(0)
+                            .start()
+                } else {
+                    resetDialogPosition()
+                }
+            }
+            MotionEvent.ACTION_CANCEL,
+            MotionEvent.ACTION_UP,
+            MotionEvent.ACTION_OUTSIDE -> {
+                if (mRootView.y >= mRootView.height / 2) {
+                    dismissAllowingStateLoss()
+                } else {
+                    resetDialogPosition(300)
+                }
+            }
+            else -> return false
+        }
+        return true
+    }
+
+    private fun resetDialogPosition(duration: Long = 0) {
+        mRootView.animate()
+                .y(0F)
+                .setDuration(duration)
+                .start()
+    }
+
+    private class SingleTapConfirm : GestureDetector.SimpleOnGestureListener() {
+        override fun onSingleTapUp(event: MotionEvent): Boolean {
+            return true
+        }
+    }
+
+    override fun onStart() {
+        super.onStart()
+        val width = HaloApp.getInstance().application.resources.displayMetrics.widthPixels
+        val height = dialog?.window?.attributes?.height ?: ViewGroup.LayoutParams.WRAP_CONTENT
+        dialog?.window?.setLayout(width, height)
+    }
+
+    abstract fun getRootView(): View
+    abstract fun getDragCloseView(): View
+    override fun getThemeRes(): Int = R.style.DialogFragmentDimAmount
+}

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

@@ -4,6 +4,8 @@ import android.content.DialogInterface
 import android.os.Bundle
 import android.view.KeyEvent
 import android.view.View
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.FragmentManager
 import com.gh.common.util.MtaHelper
 import com.lightgame.dialog.BaseDialogFragment
 import java.util.concurrent.atomic.AtomicBoolean
@@ -63,4 +65,29 @@ abstract class BaseTrackableDialogFragment : BaseDialogFragment() {
 
     open fun trackWithBasicDeviceInfo() = false
 
+
+    override fun show(manager: FragmentManager, tag: String?) {
+        val fragment = manager.findFragmentByTag(tag)
+        if (fragment != null) {
+            val transaction = manager.beginTransaction()
+            transaction.show(fragment)
+            transaction.commit()
+        } else {
+            try {
+                val clazz: Class<*> = DialogFragment::class.java
+                val dismissed = clazz.getDeclaredField("mDismissed")
+                dismissed.isAccessible = true
+                dismissed[this] = false
+                val shownByMe = clazz.getDeclaredField("mShownByMe")
+                shownByMe.isAccessible = true
+                shownByMe[this] = true
+                val transaction = manager.beginTransaction()
+                transaction.add(this, tag)
+                transaction.commitAllowingStateLoss()
+            } catch (e: Exception) {
+                super.show(manager, tag)
+                e.printStackTrace()
+            }
+        }
+    }
 }

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

@@ -60,26 +60,36 @@ class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val g
 
     companion object {
         fun showDeviceRemindDialog(context: Context, gameEntity: GameEntity) {
+            val datas = SPUtils.getString(Constants.SP_DEVICE_REMIND)
+            if (datas.isNotEmpty()) {
+                val pair = shouldShowDeviceRemindDialog(gameEntity)
+                if (pair.first) {
+                    val dialog = DeviceRemindDialog(context, pair.second!!, gameEntity)
+                    dialog.show()
+                }
+            }
+        }
+
+        fun shouldShowDeviceRemindDialog(gameEntity: GameEntity): Pair<Boolean, DeviceDialogEntity?> {
             val datas = SPUtils.getString(Constants.SP_DEVICE_REMIND)
             if (datas.isNotEmpty()) {
                 val type = object : TypeToken<List<DeviceDialogEntity>>() {}.type
-                val entitys = GsonUtils.gson.fromJson<List<DeviceDialogEntity>>(datas, type)
+                val entities = GsonUtils.gson.fromJson<List<DeviceDialogEntity>>(datas, type)
                 //1.判断设备是否匹配
-                val entity = entitys.find { it.manufacturer.toLowerCase().startsWith(Build.MANUFACTURER.toLowerCase()) }
-                        ?: return
+                val entity = entities.find { it.manufacturer.toLowerCase().startsWith(Build.MANUFACTURER.toLowerCase()) }
+                        ?: return Pair(false, null)
                 //2.判断游戏不含剔除标签
                 gameEntity.tagStyle.forEach {
                     if (entity.excludeTags.contains(it.name)) {
-                        return
+                        return Pair(false, null)
                     }
                 }
                 //3.不再弹出提示判断
                 val isNoRemindAgain = SPUtils.getBoolean(Constants.SP_NO_REMIND_AGAIN, false)
-                if (isNoRemindAgain) return
-
-                val dialog = DeviceRemindDialog(context, entity, gameEntity)
-                dialog.show()
+                if (isNoRemindAgain) return Pair(false, null)
+                return Pair(true, entity)
             }
+            return Pair(false, null)
         }
     }
 
@@ -215,7 +225,7 @@ class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val g
 
     class LooperHandle(val mAdapter: BannerAdapter) : Handler() {
         private val mWeakReference: WeakReference<BannerAdapter> = WeakReference(mAdapter)
-        override fun handleMessage(msg: Message?) {
+        override fun handleMessage(msg: Message) {
             val adapter = mWeakReference.get()
             adapter?.scrollToNextPage()
             adapter?.startScroll()

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

@@ -1,5 +1,6 @@
 package com.gh.common.dialog
 
+import android.app.Dialog
 import android.graphics.Paint
 import android.os.Bundle
 import android.util.TypedValue
@@ -8,54 +9,70 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
-import androidx.core.content.ContextCompat
 import androidx.core.text.HtmlCompat
 import com.gh.base.fragment.BaseDialogFragment
 import com.gh.common.util.DirectUtils
-import com.gh.common.util.DisplayUtils
-import com.gh.common.util.MtaHelper
+import com.gh.common.util.dip2px
+import com.gh.common.util.toColor
 import com.gh.gamecenter.R
+import com.gh.gamecenter.databinding.DialogGameOffServiceBinding
 import com.gh.gamecenter.entity.GameEntity
-import kotlinx.android.synthetic.main.dialog_game_off_service.*
 
 // 游戏关闭下载弹窗
 class GameOffServiceDialogFragment
 //    : BaseTrackableDialogFragment()
-    :BaseDialogFragment() {
+    : BaseDialogFragment() {
 
     private var mDialog: GameEntity.Dialog? = null
+    private var mBinding: DialogGameOffServiceBinding? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.dialog_game_off_service, null)
+        return DialogGameOffServiceBinding
+                .inflate(inflater)
+                .apply { mBinding = this }
+                .root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        mDialog?.run {
-            titleTv.text = title
-            contentTv.text = HtmlCompat.fromHtml(content, HtmlCompat.FROM_HTML_MODE_LEGACY)
-
-            for (site in sites) {
-                val siteTv = TextView(context)
-                siteTv.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply {
-                    topMargin = DisplayUtils.dip2px(12f)
-                }
-                siteTv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14f)
-                siteTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.theme_font))
-                siteTv.text = site.text
-                siteTv.paintFlags = siteTv.paintFlags or Paint.UNDERLINE_TEXT_FLAG
-                siteTv.setOnClickListener {
-//                    MtaHelper.onEvent("游戏下载状态按钮", getKey(), site.text)
-                    DirectUtils.directToWebView(requireContext(), site.url, "(关闭下载弹窗)")
+        mBinding?.run {
+            mDialog?.run {
+                titleTv.text = title
+                contentTv.text = HtmlCompat.fromHtml(content, HtmlCompat.FROM_HTML_MODE_LEGACY)
+                okTv.setOnClickListener {
                     dismissAllowingStateLoss()
                 }
 
-                container.addView(siteTv)
+                // 过滤内容为空的元素
+                val notEmptySite = sites.filter { it.text.isNotBlank() }
+
+                notEmptySite.forEachIndexed { index, site ->
+                    val siteTv = TextView(context)
+                    siteTv.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply {
+                        topMargin = 24F.dip2px()
+                        if (index == notEmptySite.size - 1) bottomMargin = 8F.dip2px()
+                    }
+                    siteTv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14F)
+                    siteTv.setTextColor(R.color.theme_font.toColor())
+                    siteTv.text = site.text
+                    siteTv.paintFlags = siteTv.paintFlags or Paint.UNDERLINE_TEXT_FLAG
+                    siteTv.setOnClickListener {
+    //                    MtaHelper.onEvent("游戏下载状态按钮", getKey(), site.text)
+                        DirectUtils.directToWebView(requireContext(), site.url, "(关闭下载弹窗)")
+                        dismissAllowingStateLoss()
+                    }
+
+                    container.addView(siteTv)
+                }
             }
         }
     }
 
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return super.onCreateDialog(savedInstanceState).apply { setCanceledOnTouchOutside(true) }
+    }
+
 //    override fun getEvent(): String {
 //        return "游戏下载状态按钮"
 //    }

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

@@ -67,7 +67,7 @@ class NotificationHintDialogFragment : BaseTrackableDialogFragment() {
         activateTv.setOnClickListener {
             MtaHelper.onEventWithBasicDeviceInfo(getEvent(), getKey(), "点击立即开启")
             MtaHelper.onEventWithBasicDeviceInfo(getEvent(), getKey(), "${styleEntity.scenes}_${styleEntity.styleNo}_点击立即开启")
-            dismiss()
+            dismissAllowingStateLoss()
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 //这种方案适用于 API 26, 即8.0（含8.0）以上可以用
                 val intent = Intent()
@@ -80,7 +80,7 @@ class NotificationHintDialogFragment : BaseTrackableDialogFragment() {
         }
 
         closeIv.setOnClickListener {
-            dismiss()
+            dismissAllowingStateLoss()
             MtaHelper.onEventWithBasicDeviceInfo(getEvent(), getKey(), "点击关闭")
             MtaHelper.onEventWithBasicDeviceInfo(getEvent(), getKey(), "${styleEntity.scenes}_${styleEntity.styleNo}_点击关闭")
         }

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

@@ -1,30 +1,39 @@
 package com.gh.common.dialog
 
+import android.animation.ValueAnimator
 import android.content.Context
+import android.content.pm.PackageInfo
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.animation.LinearInterpolator
 import android.widget.LinearLayout
-import android.widget.RelativeLayout
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentTransaction
+import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.gh.base.BaseRecyclerViewHolder
 import com.gh.common.constant.Constants
 import com.gh.common.util.*
 import com.gh.common.view.CustomLinkMovementMethod
+import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
 import com.gh.gamecenter.databinding.FragmentPackageCheckBinding
 import com.gh.gamecenter.databinding.PackageCheckItemBinding
 import com.gh.gamecenter.entity.DetectionObjectEntity
+import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.entity.LinkEntity
 import com.gh.gamecenter.entity.PackageDialogEntity
 import com.gh.gamecenter.eventbus.EBPackage
 import com.halo.assistant.HaloApp
 import com.lightgame.adapter.BaseRecyclerAdapter
 import com.lightgame.dialog.BaseDialogFragment
+import com.lightgame.download.DataWatcher
+import com.lightgame.download.DownloadEntity
+import com.lightgame.download.DownloadStatus
 import io.reactivex.disposables.Disposable
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
@@ -33,6 +42,7 @@ import org.greenrobot.eventbus.ThreadMode
 /**
  * 包名检测弹窗
  */
+// TODO 将 gameEntity 放到 argument 里再取出，避免重建时为空
 class PackageCheckDialogFragment : BaseDialogFragment() {
 
     private lateinit var binding: FragmentPackageCheckBinding
@@ -40,12 +50,33 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
     private val mDuration = 3000
     private var mDisposable: Disposable? = null
     private var mAdapter: PackageCheckAdapter? = null
-    var packageDialogEntity: PackageDialogEntity? = null
+    private var mAllInstalledPackages = PackageUtils.getInstalledPackages(HaloApp.getInstance().application, 0)
+    var gameEntity: GameEntity? = null
     var callBack: DialogUtils.ConfirmListener? = null
 
+    private val dataWatcher = object : DataWatcher() {
+        override fun onDataChanged(downloadEntity: DownloadEntity) {
+            val packageName = downloadEntity.packageName
+            val detectionObjects = gameEntity?.packageDialog?.detectionObjects
+            if (DownloadStatus.add == downloadEntity.status || DownloadStatus.done == downloadEntity.status) {
+                detectionObjects?.forEach { detectionObject ->
+                    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))
+                    }
+                }
+            }
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         EventBus.getDefault().register(this)
+        gameEntity?.let {
+            LogUtils.uploadPackageCheck("pkg_check_pop_click", "出现弹窗", it, "", "", "", "")
+        }
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -55,7 +86,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        packageDialogEntity?.let {
+        gameEntity?.packageDialog?.let {
             changeParams(it.detectionObjects.size)
 
             binding.packageRv.layoutManager = LinearLayoutManager(requireContext())
@@ -69,6 +100,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
             it.links.forEachIndexed { index, link ->
                 val linkSpan = SpanBuilder(link.title ?: "").click(0, (link.title
                         ?: "").length, R.color.theme_font, true) {
+                    LogUtils.uploadPackageCheck("pkg_check_pop_click", "点击链接", gameEntity, link.text, link.title, "", "")
                     DirectUtils.directToLinkPage(requireContext(), link, "包名检测弹窗", "")
                 }.build()
                 spanBuilder.append(linkSpan)
@@ -88,6 +120,10 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                     binding.cancelTv.text = "我知道了"
                     binding.noRemindAgainCb.visibility = View.GONE
                 }
+                "OPTIONAL_CURRENT_HINT" -> {
+                    binding.cancelTv.text = "我知道了"
+                    binding.noRemindAgainCb.visibility = View.VISIBLE
+                }
                 else -> {
                     binding.cancelTv.text = "我知道了"
                     binding.noRemindAgainCb.visibility = View.VISIBLE
@@ -95,7 +131,9 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
             }
             initListener(it)
         }
-        checkPackage()
+        binding.root.post {
+            checkPackage()
+        }
     }
 
     private fun changeParams(size: Int) {
@@ -107,15 +145,19 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
     private fun initListener(entity: PackageDialogEntity) {
         binding.downloadBtn.setOnClickListener {
             if (binding.noRemindAgainCb.isChecked) {
-                SPUtils.setBoolean(Constants.SP_PACKAGE_CHECK, true)
+                saveRecord(entity)
             }
-            val isAllPackageInstalled = isAllPackageInstalled(entity)
+            val isAllPackageInstalled = isAllPackageInstalled(mAllInstalledPackages, entity)
             if (isAllPackageInstalled) {
                 callBack?.onConfirm()
                 dismissAllowingStateLoss()
             } else {
-                val packageLink = entity.links.find { it.buttonLink }
+                var packageLink = getNotInstalledLink(entity)
+                if (packageLink == null) {
+                    packageLink = entity.links.find { it.buttonLink }
+                }
                 if (packageLink != null) {
+                    LogUtils.uploadPackageCheck("pkg_check_pop_click", "点击前往下载", gameEntity, packageLink.text, packageLink.title, "", "")
                     DirectUtils.directToLinkPage(requireContext(), packageLink, "包名检测弹窗", "")
                 }
             }
@@ -126,22 +168,26 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                 callBack?.onConfirm()
             }
             if (binding.noRemindAgainCb.isChecked) {
-                SPUtils.setBoolean(Constants.SP_PACKAGE_CHECK, true)
+                saveRecord(entity)
+                LogUtils.uploadPackageCheck("pkg_check_pop_click", "不再提示", gameEntity, "", "", "", "")
             }
             dismissAllowingStateLoss()
         }
     }
 
+    private fun saveRecord(entity: PackageDialogEntity) {
+        if (entity.level == "OPTIONAL_CURRENT_HINT") {
+            SPUtils.setBoolean("${Constants.SP_PACKAGE_CHECK}:${gameEntity?.id}", true)
+        } else {
+            SPUtils.setBoolean("${Constants.SP_PACKAGE_CHECK}:${gameEntity?.packageDialog?.id}", true)
+        }
+    }
+
     private fun checkPackage() {
         var index = 0
         mTotalWidth = (DisplayUtils.getScreenWidth() - 108f.dip2px()).toFloat()
         mDisposable = rxTimer(1) {
-            val width = (mTotalWidth / mDuration) * it
-            val params = binding.progressView.layoutParams as RelativeLayout.LayoutParams
-            params.width = width.toInt()
-            binding.progressView.layoutParams = params
-
-            packageDialogEntity?.detectionObjects?.let { objects ->
+            gameEntity?.packageDialog?.detectionObjects?.let { objects ->
                 if (objects.isNotEmpty()) {
                     val averageTime = if (objects.size == 1) {
                         mDuration
@@ -159,24 +205,49 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
             if (it >= mDuration) {
                 mDisposable?.dispose()
                 binding.downloadBtn.isEnabled = true
-                binding.progressText.text = "检测完成"
-                binding.progressView.background = ContextCompat.getDrawable(requireContext(), R.drawable.package_check_complete_bg)
             }
         }
+        val animator = ValueAnimator.ofInt(0, 100)
+        animator.duration = mDuration.toLong()
+        animator.interpolator = LinearInterpolator()
+        animator.addUpdateListener {
+            binding.progressBar.progress = it.animatedValue as Int
+        }
+        animator.start()
+    }
+
+    private fun getNotInstalledLink(packageDialogEntity: PackageDialogEntity): LinkEntity? {
+        val links = LinkedHashSet<LinkEntity>()
+        packageDialogEntity.detectionObjects.forEach { obj ->
+            if (!checkDetectionsInstalled(mAllInstalledPackages, obj.packages)) {
+                obj.assignDownload.forEach {
+                    links.add(packageDialogEntity.links[it])
+                }
+            }
+        }
+        var link: LinkEntity? = null
+        if (links.size > 1) {
+            link = links.find { it.buttonLink } ?: links.toList()[0]
+        } else if (links.size == 1) {
+            link = links.toList()[0]
+        }
+        return link
     }
 
     override fun onStart() {
         super.onStart()
         val width = requireContext().resources.displayMetrics.widthPixels - 60F.dip2px()
         val height = ViewGroup.LayoutParams.WRAP_CONTENT
-        dialog?.window?.setLayout(width, height)
-        dialog?.setCanceledOnTouchOutside(true)
+        requireDialog().window?.setLayout(width, height)
+        requireDialog().setCanceledOnTouchOutside(true)
+        DownloadManager.getInstance(context).addObserver(dataWatcher)
     }
 
     override fun onResume() {
         super.onResume()
-        packageDialogEntity?.let {
-            if (isAllPackageInstalled(it)) {
+        mAllInstalledPackages = PackageUtils.getInstalledPackages(HaloApp.getInstance().application, 0)
+        gameEntity?.packageDialog?.let {
+            if (isAllPackageInstalled(mAllInstalledPackages, it)) {
                 callBack?.onConfirm()
                 dismissAllowingStateLoss()
             }
@@ -189,22 +260,25 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
         if (mDisposable?.isDisposed == false) {
             mDisposable?.dispose()
         }
+        LogUtils.uploadPackageCheck("pkg_check_pop_click", "关闭弹窗", gameEntity, "", "", "", "")
+        DownloadManager.getInstance(context).removeObserver(dataWatcher)
     }
 
     //安装、卸载事件
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onEventMainThread(busFour: EBPackage) {
         if ("安装" == busFour.type || "卸载" == busFour.type) {
+            mAllInstalledPackages = PackageUtils.getInstalledPackages(HaloApp.getInstance().application, 0)
             mAdapter?.notifyDataSetChanged()
         }
     }
 
-    class PackageCheckAdapter(val context: Context, val entities: ArrayList<DetectionObjectEntity>) : BaseRecyclerAdapter<RecyclerView.ViewHolder>(context) {
+    inner class PackageCheckAdapter(val context: Context, val entities: ArrayList<DetectionObjectEntity>) : BaseRecyclerAdapter<RecyclerView.ViewHolder>(context) {
         private var index = -1
 
         fun notifyPackages() {
             index++
-            notifyDataSetChanged()
+            notifyItemChanged(index)
         }
 
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
@@ -218,14 +292,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
                 val entity = entities[position]
                 holder.binding.entity = entity
                 if (position <= index) {
-                    var isAllInstalled = false
-                    entity.packages.forEach { packageName ->
-                        val isInstalled = PackageUtils.getInstalledPackages(context, 0).find { it.packageName == packageName } != null
-                        if (isInstalled) {
-                            isAllInstalled = true
-                            return@forEach
-                        }
-                    }
+                    val isAllInstalled = checkDetectionsInstalled(mAllInstalledPackages, entity.packages)
                     if (isAllInstalled) {
                         holder.binding.statusTv.text = "已安装"
                         holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font))
@@ -245,56 +312,65 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
 
     companion object {
         @JvmStatic
-        fun show(activity: AppCompatActivity, packageDialogEntity: PackageDialogEntity?, callBack: DialogUtils.ConfirmListener) {
+        fun show(activity: AppCompatActivity, gameEntity: GameEntity, callBack: DialogUtils.ConfirmListener) {
+            val packageDialogEntity = gameEntity.packageDialog
             if (packageDialogEntity == null) {
                 callBack.onConfirm()
                 return
             }
-            if (isAllPackageInstalled(packageDialogEntity)) {
+
+            val allInstalledPackages = PackageUtils.getInstalledPackages(HaloApp.getInstance().application, 0)
+            if (isAllPackageInstalled(allInstalledPackages, packageDialogEntity)) {
                 callBack.onConfirm()
                 return
             }
-            val isChoose = SPUtils.getBoolean(Constants.SP_PACKAGE_CHECK, false)
+
+            val isChoose = SPUtils.getBoolean("${Constants.SP_PACKAGE_CHECK}:${packageDialogEntity.id}", false)
             if (packageDialogEntity.level == "OPTIONAL_HINT" && isChoose) {
                 callBack.onConfirm()
                 return
             }
 
+            val isCurrentGameChoose = SPUtils.getBoolean("${Constants.SP_PACKAGE_CHECK}:${gameEntity.id}", false)
+            if (packageDialogEntity.level == "OPTIONAL_CURRENT_HINT" && isCurrentGameChoose) {
+                callBack.onConfirm()
+                return
+            }
+
+            if (!activity.lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) return
+
             var dialogFragment = activity.supportFragmentManager.findFragmentByTag(PackageCheckDialogFragment::class.java.simpleName) as? PackageCheckDialogFragment
             if (dialogFragment == null) {
                 dialogFragment = PackageCheckDialogFragment()
-                dialogFragment.packageDialogEntity = packageDialogEntity
+                dialogFragment.gameEntity = gameEntity
                 dialogFragment.callBack = callBack
-
                 dialogFragment.show(activity.supportFragmentManager, PackageCheckDialogFragment::class.java.simpleName)
             } else {
-                dialogFragment.packageDialogEntity = packageDialogEntity
+                dialogFragment.gameEntity = gameEntity
                 dialogFragment.callBack = callBack
-
                 val transaction: FragmentTransaction = activity.supportFragmentManager.beginTransaction()
                 transaction.show(dialogFragment)
                 transaction.commit()
             }
-
         }
 
-        fun isAllPackageInstalled(packageDialogEntity: PackageDialogEntity): Boolean {
-            var isAllInstalled = true
-
-            val isPackagesInstall: (ArrayList<String>) -> Boolean = { packages ->
-                var isPackagesInstalled = false
-                packages.forEach {packageName->
-                    val isInstalled = PackageUtils.getInstalledPackages(HaloApp.getInstance().application, 0).find { it.packageName == packageName } != null
-                    if (isInstalled) {
-                        isPackagesInstalled = true
-                        return@forEach
-                    }
+        private fun checkDetectionsInstalled(allInstalledPackages: List<PackageInfo>, packages: ArrayList<String>): Boolean {
+            var isPackagesInstalled = false
+            packages.forEach { packageName ->
+                val isInstalled = allInstalledPackages.find { it.packageName == packageName } != null
+                if (isInstalled) {
+                    isPackagesInstalled = true
+                    return@forEach
                 }
-                isPackagesInstalled
             }
+            return isPackagesInstalled
+        }
 
+
+        fun isAllPackageInstalled(allInstalledPackages: List<PackageInfo>, packageDialogEntity: PackageDialogEntity): Boolean {
+            var isAllInstalled = true
             packageDialogEntity.detectionObjects.forEach loop@{ obj ->
-                if (!isPackagesInstall(obj.packages)) {
+                if (!checkDetectionsInstalled(allInstalledPackages, obj.packages)) {
                     isAllInstalled = false
                     return isAllInstalled
                 }

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

@@ -14,10 +14,10 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentTransaction
 import com.gh.base.fragment.BaseDialogFragment
-import com.gh.common.util.DirectUtils.directToExternalBrowser
 import com.gh.common.util.dip2px
 import com.gh.common.view.CustomLinkMovementMethod
 import com.gh.gamecenter.R
+import com.gh.gamecenter.WebActivity
 
 class PrivacyDialogFragment : BaseDialogFragment() {
 
@@ -53,7 +53,8 @@ class PrivacyDialogFragment : BaseDialogFragment() {
             }
 
             override fun onClick(widget: View) {
-                directToExternalBrowser(context!!, context!!.getString(R.string.privacy_policy_url))
+                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)
 
@@ -65,7 +66,8 @@ class PrivacyDialogFragment : BaseDialogFragment() {
             }
 
             override fun onClick(widget: View) {
-                directToExternalBrowser(requireContext(), requireContext().getString(R.string.disclaimer_url))
+                val intent = WebActivity.getIntent(requireContext(), context!!.getString(R.string.disclaimer_url), true)
+                context?.startActivity(intent)
             }
         }, skipText.length - 4, skipText.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
         descTv?.movementMethod = CustomLinkMovementMethod()

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

@@ -13,9 +13,17 @@ data class ExposureEntity(
         val gameName: String? = "",
         val gameVersion: String? = "",
         val sequence: Int? = 0,
+        val outerSequence: Int? = 0,
         val platform: String? = "",
+        var isMirrorData: Boolean = false,
+        @SerializedName("is_web_download")
+        var isWebDownload: Boolean = false,
         val downloadType: String? = "",
         val downloadCompleteType: String? = "",
+        @SerializedName("display_type")
+        val displayType: String? = "",
+        @SerializedName("is_platform_recommend")
+        val isPlatformRecommend: Boolean? = false,
 
         // 下载地址的 host 和 path
         var host: String? = "",

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

@@ -9,9 +9,12 @@ import com.gh.common.exposure.meta.Meta
 import com.gh.common.exposure.meta.MetaUtil
 import com.gh.common.exposure.time.TimeUtil
 import com.gh.common.util.getFirstElementDividedByDivider
+import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.entity.GameEntity
+import com.lightgame.download.DownloadEntity
 import kotlinx.android.parcel.Parcelize
 import java.util.*
+import kotlin.collections.ArrayList
 
 @Keep
 @Parcelize
@@ -29,19 +32,27 @@ data class ExposureEvent(
 
         // TODO 建一个 exposureEvent 池规避反复生成对象
         @JvmStatic
-        fun createEvent(gameEntity: GameEntity?, source: List<ExposureSource>, eTrace: List<ExposureEvent>? = null, event: ExposureType = ExposureType.EXPOSURE): ExposureEvent {
+        fun createEvent(gameEntity: GameEntity?,
+                        source: List<ExposureSource>,
+                        eTrace: List<ExposureEvent>? = null,
+                        event: ExposureType = ExposureType.EXPOSURE): ExposureEvent {
             if (gameEntity?.getApk()?.size == 1) {
                 gameEntity.gameVersion = gameEntity.getApk().elementAtOrNull(0)?.version ?: ""
             }
             return ExposureEvent(
                     payload = ExposureEntity(
-                            gameId = gameEntity?.id?.getFirstElementDividedByDivider(Constants.GAME_ID_DIVIDER),
-                            gameName = gameEntity?.name?.removeSuffix(Constants.GAME_NAME_DECORATOR),
-                            gameVersion = gameEntity?.gameVersion,
-                            sequence = gameEntity?.sequence,
-                            platform = gameEntity?.platform,
+                            gameId = gameEntity?.id?.getFirstElementDividedByDivider(DownloadEntity.GAME_ID_DIVIDER),
+                            gameName = eTrace?.firstOrNull()?.payload?.gameName ?: gameEntity?.name?.removeSuffix(Constants.GAME_NAME_DECORATOR),
+                            gameVersion = eTrace?.firstOrNull()?.payload?.gameVersion ?:gameEntity?.gameVersion,
+                            isMirrorData = eTrace?.firstOrNull()?.payload?.isMirrorData ?: gameEntity?.shouldUseMirrorInfo() ?: false,
+                            isWebDownload = BrowserInstallHelper.isUseBrowserToInstallEnabled() && BrowserInstallHelper.shouldUseBrowserToInstall(), // 实时的值，不用从 eTrace 里取
+                            sequence = eTrace?.firstOrNull()?.payload?.sequence ?: gameEntity?.sequence,
+                            outerSequence = eTrace?.firstOrNull()?.payload?.outerSequence ?: gameEntity?.outerSequence,
+                            platform = eTrace?.firstOrNull()?.payload?.platform ?:gameEntity?.platform,
                             downloadType = gameEntity?.downloadType,
                             downloadCompleteType = gameEntity?.downloadCompleteType,
+                            displayType = eTrace?.firstOrNull()?.payload?.displayType ?:gameEntity?.displayContent,
+                            isPlatformRecommend = gameEntity?.isPlatformRecommend ?: false,
                             // ugly
                             welcomeDialogId = gameEntity?.welcomeDialogId ?: eTrace?.firstOrNull()?.payload?.welcomeDialogId,
                             welcomeDialogLinkTitle = gameEntity?.welcomeDialogTitle ?: eTrace?.firstOrNull()?.payload?.welcomeDialogLinkTitle),
@@ -49,5 +60,19 @@ data class ExposureEvent(
                     eTrace = eTrace,
                     event = event).apply { gameEntity?.exposureEvent = this }
         }
+
+        @JvmStatic
+        fun createEventWithSourceConcat(gameEntity: GameEntity?,
+                                        basicSource: List<ExposureSource>,
+                                        source: List<ExposureSource>,
+                                        eTrace: List<ExposureEvent>? = null,
+                                        event: ExposureType = ExposureType.EXPOSURE): ExposureEvent {
+            val concatSourceList = ArrayList<ExposureSource>().apply {
+                addAll(basicSource)
+                addAll(source)
+            }
+            return createEvent(gameEntity, concatSourceList, eTrace, event)
+        }
+
     }
 }

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

@@ -11,20 +11,16 @@ import io.reactivex.functions.Consumer
  */
 class ExposureListener(var fragment: Fragment, var exposable: IExposable) : RecyclerView.OnScrollListener() {
 
-    var throttleBus: ExposureThrottleBus? = null
+    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 onFragmentResumed(fm: FragmentManager, f: Fragment) {
-                        throttleBus = ExposureThrottleBus(Consumer { commitExposure(it) }, Consumer(Throwable::printStackTrace))
-                    }
-
                     override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
                         visibleState?.let { commitExposure(it) }
-                        throttleBus?.clear()
+                        throttleBus.clear()
                     }
 
                     override fun onFragmentViewDestroyed(fm: FragmentManager, f: Fragment) {
@@ -44,7 +40,7 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
 
         layoutManager?.run {
             visibleState = ExposureThrottleBus.VisibleState(findFirstVisibleItemPosition(), findLastVisibleItemPosition())
-            throttleBus?.postVisibleState(visibleState!!)
+            throttleBus.postVisibleState(visibleState!!)
         }
     }
 

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

@@ -1,15 +1,13 @@
 package com.gh.common.exposure
 
-import com.aliyun.sls.android.sdk.model.LogGroup
-import com.gh.common.exposure.time.TimeUtil
+import com.aliyun.sls.android.producer.Log
+import com.gh.common.loghub.LoghubHelper
 import com.gh.common.util.toJson
 import com.gh.common.util.tryWithDefaultCatch
 import com.gh.gamecenter.BuildConfig
-import com.gh.loghub.LgLOG
-import com.gh.loghub.LoghubHelper
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
-import java.util.concurrent.Executors
+import java.util.concurrent.ExecutorService
 
 /**
  * A handful tool for committing logs to aliyun loghub.
@@ -22,26 +20,23 @@ import java.util.concurrent.Executors
  */
 object ExposureManager {
 
-    private const val ENDPOINT = "cn-qingdao.log.aliyuncs.com"
-    private const val PROJECT = "ghzs"
     private const val STORE_SIZE = 100
     private const val LOG_STORE = BuildConfig.EXPOSURE_REPO
 
-    private val loghubHelper = LoghubHelper.getInstance()
-
     // exposureCache 用来过滤掉具有相同 id 的曝光事件，避免重复发送事件
     private val exposureSet by lazy { hashSetOf<ExposureEvent>() }
-    private val exposureExecutor by lazy { Executors.newSingleThreadExecutor() }
+    private var exposureExecutor: ExecutorService? = null
     private val exposureCache by lazy { FixedSizeLinkedHashSet<String>(300) }
     private val exposureDao by lazy { ExposureDatabase.buildDatabase(HaloApp.getInstance().application).logHubEventDao() }
 
     @JvmStatic
-    fun init() {
-        loghubHelper.init(HaloApp.getInstance().application, ENDPOINT, PROJECT, LOG_STORE) { TimeUtil.currentTimeMillis() }
-
-        exposureExecutor.execute {
-            val eventList = exposureDao.getAll()
-            exposureSet.addAll(eventList)
+    fun init(excutor: ExecutorService) {
+        exposureExecutor = excutor
+        exposureExecutor?.execute {
+            tryWithDefaultCatch {
+                val eventList = exposureDao.getAll()
+                exposureSet.addAll(eventList)
+            }
         }
     }
 
@@ -49,7 +44,7 @@ object ExposureManager {
      * Log a single exposure event.
      */
     fun log(event: ExposureEvent) {
-        exposureExecutor.execute {
+        exposureExecutor?.execute {
             try {
                 if (!exposureCache.contains(event.id)) {
                     // Catch `android.database.sqlite.SQLiteFullException: database or disk is full` exception.
@@ -71,7 +66,7 @@ object ExposureManager {
      * Log a collection of exposure event.
      */
     fun log(eventList: List<ExposureEvent>) {
-        exposureExecutor.execute {
+        exposureExecutor?.execute {
             for (event in eventList) {
                 try {
                     if (!exposureCache.contains(event.id)) {
@@ -94,14 +89,13 @@ object ExposureManager {
      * @param forced Ignore all restrictions.
      */
     fun commitSavedExposureEvents(forced: Boolean = false) {
-        exposureExecutor.execute {
+        exposureExecutor?.execute {
             tryWithDefaultCatch {
                 // TODO 初始化 loghubHelper 去掉这个 tryCatch 块
                 if (exposureSet.size < STORE_SIZE && !forced || exposureSet.size == 0) return@execute
 
                 val exposureList = exposureSet.toList()
-                // uploadLogGroup 是一个异步方法，LoghubHelper 里面实现了重传功能，所以这里交给它就好了
-                loghubHelper.uploadLogGroup(buildLogGroup(exposureList))
+                uploadExposures(exposureList)
 
                 Utils.log("Exposure", "提交了${exposureList.size}条曝光记录")
                 exposureSet.removeAll(exposureList)
@@ -114,31 +108,25 @@ object ExposureManager {
         return jsonWithMultipleBracket.replace("[[", "[").replace("]]", "]")
     }
 
-    private fun buildLogGroup(eventList: List<ExposureEvent>): LogGroup {
-        val logGroup = LogGroup("sls android", "no ip")
-
-        eventList.forEach { logGroup.PutLog(buildLog(it)) }
-
-        return logGroup
+    private fun uploadExposures(eventList: List<ExposureEvent>) {
+        eventList.forEach {
+            LoghubHelper.uploadLog(buildLog(it), LOG_STORE)
+        }
     }
 
-    private fun buildLog(event: ExposureEvent): LgLOG {
-        val log = LgLOG(TimeUtil.currentTime())
-
-        log.PutContent("id", event.id)
-        log.PutContent("payload", event.payload.toJson())
-        log.PutContent("event", event.event.toString())
-        log.PutContent("source", eliminateMultipleBrackets(event.source.toJson()))
-        log.PutContent("meta", event.meta.toJson())
-        log.PutContent("e-traces", if (event.eTrace != null) {
+    private fun buildLog(event: ExposureEvent) = Log().apply {
+        putContent("id", event.id)
+        putContent("payload", event.payload.toJson())
+        putContent("event", event.event.toString())
+        putContent("source", eliminateMultipleBrackets(event.source.toJson()))
+        putContent("meta", event.meta.toJson())
+        putContent("e-traces", if (event.eTrace != null) {
             eliminateMultipleBrackets(event.eTrace?.toJson() ?: "")
         } else "")
-        log.PutTime(event.time)
-
-        return log
+        logTime = event.time.toLong()
     }
 
-    internal class FixedSizeLinkedHashSet<T>(var maxSize: Int) : LinkedHashSet<T>() {
+    class FixedSizeLinkedHashSet<T>(var maxSize: Int) : LinkedHashSet<T>() {
         override fun add(element: T): Boolean {
             if (size == maxSize) {
                 pop()

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

@@ -2,35 +2,39 @@ package com.gh.common.exposure
 
 import android.text.TextUtils
 import com.g00fy2.versioncompare.Version
-import com.gh.common.constant.Constants
 import com.gh.common.util.PackageUtils
 import com.gh.common.util.toObject
 import com.gh.gamecenter.entity.ApkEntity
 import com.gh.gamecenter.entity.GameEntity
 import com.halo.assistant.HaloApp
-import java.util.*
+import com.lightgame.download.DownloadEntity
 
 object ExposureUtils {
 
+    private val mDownloadCompleteTraceEventIdSet = ExposureManager.FixedSizeLinkedHashSet<String>(3)
+
     @JvmStatic
     fun logADownloadExposureEvent(entity: GameEntity,
                                   platform: String?,
                                   traceEvent: ExposureEvent?,
                                   downloadType: DownloadType): ExposureEvent {
         val gameEntity = entity.clone()
-        gameEntity.id = if (entity.id.contains(Constants.GAME_ID_DIVIDER)) {
-            entity.id.split(Constants.GAME_ID_DIVIDER).toTypedArray()[0]
+        gameEntity.id = if (entity.id.contains(DownloadEntity.GAME_ID_DIVIDER)) {
+            entity.id.split(DownloadEntity.GAME_ID_DIVIDER).toTypedArray()[0]
         } else {
             entity.id
         }
-        gameEntity.gameVersion = entity.getApk().elementAtOrNull(0)?.version ?: gameEntity.gameVersion
+        gameEntity.gameVersion = entity.getApk().elementAtOrNull(0)?.version
+                ?: gameEntity.gameVersion
         gameEntity.platform = platform
         gameEntity.downloadType = downloadType.toString()
         val exposureEvent = ExposureEvent.createEvent(gameEntity = gameEntity,
                 source = traceEvent?.source ?: ArrayList(),
                 eTrace = ExposureTraceUtils.appendTrace(traceEvent),
                 event = ExposureType.DOWNLOAD)
-        ExposureManager.log(exposureEvent)
+        if (!TextUtils.isEmpty(entity.id)) {
+            ExposureManager.log(exposureEvent)
+        }
         return exposureEvent
     }
 
@@ -45,6 +49,16 @@ object ExposureUtils {
         gameEntity.platform = platform
         gameEntity.downloadCompleteType = downloadType.toString()
         val traceEvent = trace?.toObject<ExposureEvent>()
+
+        if (TextUtils.isEmpty(entity.id)) return
+
+        // 避免生成 trace 相同的下载完成事件，根据日志看下载完成的同一秒有可能生成两条
+        if (mDownloadCompleteTraceEventIdSet.contains(traceEvent?.id)) {
+            return
+        }
+
+        traceEvent?.payload?.gameId?.let { mDownloadCompleteTraceEventIdSet.add(it) }
+
         val exposureEvent = ExposureEvent.createEvent(gameEntity = gameEntity,
                 source = traceEvent?.source ?: ArrayList(),
                 eTrace = ExposureTraceUtils.appendTrace(traceEvent),
@@ -80,6 +94,15 @@ object ExposureUtils {
         }
     }
 
+    @JvmStatic
+    fun updateExposureSequence(gameList: List<GameEntity>?) {
+        gameList?.let {
+            for ((index, game) in it.withIndex()) {
+                game.sequence = index
+            }
+        }
+    }
+
     enum class DownloadType {
         DOWNLOAD,
 

app/src/main/java/com/gh/common/exposure/meta/Meta.kt

@@ -8,10 +8,10 @@ import kotlinx.android.parcel.Parcelize
 @Parcelize
 data class Meta(
         val mac: String? = "",
-        val imei: String? = "",
+        val jnfj: String? = "",
         val model: String? = "",
         val manufacturer: String? = "",
-        val android_id: String? = "",
+        val dia: String? = "",
         val android_sdk: Int? = -1,
         val android_version: String? = "",
         val network: String? = "",

app/src/main/java/com/gh/common/exposure/meta/MetaUtil.kt

@@ -11,6 +11,7 @@ import android.telephony.TelephonyManager
 import android.text.TextUtils
 import com.gh.common.constant.Constants
 import com.gh.common.util.SPUtils
+import com.gh.common.util.tryWithDefaultCatch
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.manager.UserManager
 import com.halo.assistant.HaloApp
@@ -26,13 +27,25 @@ object MetaUtil {
     private var imei: String? = null
     private var base64EncodedImei: String? = null
     private var androidId: String? = null
+    private var base64EncodedAndroidId: String? = null
+
+    private var romName: String? = null
+    private var romVersion: String? = null
 
     fun refreshMeta() {
+
+        if (romName == null) {
+            tryWithDefaultCatch {
+                romName = RomIdentifier.getRom().name
+                romVersion = RomIdentifier.getRom().versionName
+            }
+        }
+
         m = Meta(mac = "",
-                imei = getIMEI(),
+                jnfj = getBase64EncodedIMEI(),
                 model = getModel(),
                 manufacturer = getManufacturer(),
-                android_id = getAndroidId(),
+                dia = getBase64EncodedAndroidId(),
                 android_sdk = getAndroidSDK(),
                 android_version = getAndroidVersion(),
                 network = getNetwork(),
@@ -43,7 +56,7 @@ object MetaUtil {
                 appVersion = BuildConfig.VERSION_NAME,
                 userId = UserManager.getInstance().userId,
                 exposureVersion = BuildConfig.EXPOSURE_VERSION,
-                rom = RomIdentifier.getRom().name + "" + RomIdentifier.getRom().versionName)
+                rom = romName + "" + romVersion)
     }
 
     fun getMeta(): Meta {
@@ -107,6 +120,10 @@ object MetaUtil {
 
     @JvmStatic
     fun getBase64EncodedIMEI(): String {
+        if (imei == null) {
+            getIMEI()
+        }
+
         if (TextUtils.isEmpty(base64EncodedImei) && imei != null) {
             try {
                 base64EncodedImei = android.util.Base64.encodeToString(getIMEI().trim().toByteArray(), android.util.Base64.NO_WRAP)
@@ -119,6 +136,24 @@ object MetaUtil {
         return base64EncodedImei ?: ""
     }
 
+    @JvmStatic
+    fun getBase64EncodedAndroidId(): String {
+        if (androidId == null) {
+            getAndroidId()
+        }
+
+        if (TextUtils.isEmpty(base64EncodedAndroidId) && androidId != null) {
+            try {
+                base64EncodedAndroidId = android.util.Base64.encodeToString(getAndroidId().trim().toByteArray(), android.util.Base64.NO_WRAP)
+            } catch (e: java.lang.Exception) {
+                e.printStackTrace()
+                return ""
+            }
+        }
+
+        return base64EncodedAndroidId ?: ""
+    }
+
     fun getModel(): String? {
         return Build.MODEL
     }

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

@@ -1,7 +1,6 @@
 package com.gh.common.filter
 
 import android.annotation.SuppressLint
-import com.gh.common.AppExecutor
 import com.gh.common.constant.Constants
 import com.gh.common.util.SPUtils
 import com.gh.common.util.debounceActionWithInterval
@@ -14,6 +13,7 @@ import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.functions.Function
+import io.reactivex.schedulers.Schedulers
 
 object RegionSettingHelper {
 
@@ -67,7 +67,7 @@ object RegionSettingHelper {
             RetrofitManager.getInstance(HaloApp.getInstance().application)
                     .sensitiveApi
                     .getRegionSetting(HaloApp.getInstance().channel)
-                    .subscribeOn(AppExecutor.cachedScheduler)
+                    .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(object : BiResponse<RegionSetting>() {
                         override fun onSuccess(data: RegionSetting) {
@@ -76,7 +76,7 @@ object RegionSettingHelper {
                         }
 
                         override fun onFailure(exception: Exception) {
-                            SPUtils.getString(SP_SETTING).toObject<RegionSetting>()?.let {
+                            SPUtils.getString(SP_SETTING)?.toObject<RegionSetting>()?.let {
                                 updateSettingsInMemory(it)
                             }
                         }

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

@@ -15,7 +15,7 @@ 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], version = 7, exportSchema = false)
+@Database(entities = [AnswerEntity::class, ArticleEntity::class, NewsEntity::class, HistoryGameEntity::class, MyVideoEntity::class], version = 8, exportSchema = false)
 @TypeConverters(CountConverter::class,
         CommunityConverter::class,
         TimeConverter::class,
@@ -23,8 +23,10 @@ import com.halo.assistant.HaloApp
         ThumbnailConverter::class,
         TagStyleListConverter::class,
         StringArrayListConverter::class,
+        ListStringConverter::class,
         CommunityVideoConverter::class,
-        UserConverter::class)
+        UserConverter::class,
+        ImageInfoConverter::class)
 
 abstract class HistoryDatabase : RoomDatabase() {
 
@@ -69,6 +71,14 @@ abstract class HistoryDatabase : RoomDatabase() {
             }
         }
 
+        val MIGRATION_7_8: Migration = object : Migration(7, 8) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("Alter TABLE ArticleEntity add images TEXT NOT NULL DEFAULT ''")
+                database.execSQL("Alter TABLE ArticleEntity add imagesInfo TEXT NOT NULL DEFAULT ''")
+                database.execSQL("Alter TABLE AnswerEntity add imagesInfo TEXT NOT NULL DEFAULT ''")
+            }
+        }
+
         val instance by lazy {
             Room.databaseBuilder(HaloApp.getInstance().application, HistoryDatabase::class.java, "USER_TRACK_HISTORY_DATABASE")
                     .addMigrations(MIGRATION_2_3)
@@ -76,6 +86,7 @@ abstract class HistoryDatabase : RoomDatabase() {
                     .addMigrations(MIGRATION_4_5)
                     .addMigrations(MIGRATION_5_6)
                     .addMigrations(MIGRATION_6_7)
+                    .addMigrations(MIGRATION_7_8)
                     .build()
         }
     }

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

@@ -69,48 +69,49 @@ object HistoryHelper {
     @JvmStatic
     fun insertNewsEntity(newsEntity: NewsEntity) {
         newsEntity.orderTag = System.currentTimeMillis()
-        runOnIoThread { HistoryDatabase.instance.newsDao().addNews(newsEntity) }
+        runOnIoThread { tryCatchInRelease { HistoryDatabase.instance.newsDao().addNews(newsEntity) } }
     }
 
     @JvmStatic
     fun deleteNewsEntity(newsId: String) {
-        runOnIoThread { HistoryDatabase.instance.newsDao().deleteNews(NewsEntity().apply { id = newsId }) }
+        runOnIoThread { tryCatchInRelease { HistoryDatabase.instance.newsDao().deleteNews(NewsEntity().apply { id = newsId }) } }
     }
 
     @JvmStatic
     fun deleteGameEntity(gameId: String) {
-        runOnIoThread { HistoryDatabase.instance.gameDao().deleteGame(HistoryGameEntity(id = gameId)) }
+        runOnIoThread { tryCatchInRelease { HistoryDatabase.instance.gameDao().deleteGame(HistoryGameEntity(id = gameId)) } }
     }
 
     @JvmStatic
     fun deleteArticleEntity(articleId: String) {
-        runOnIoThread { HistoryDatabase.instance.articleDao().deleteArticle(ArticleEntity(id = articleId)) }
+        runOnIoThread { tryCatchInRelease { HistoryDatabase.instance.articleDao().deleteArticle(ArticleEntity(id = articleId)) } }
     }
 
     @JvmStatic
     fun deleteAnswerEntity(answerId: String) {
-        runOnIoThread { HistoryDatabase.instance.answerDao().deleteAnswer(AnswerEntity().apply { primaryKey = answerId }) }
+        runOnIoThread { tryCatchInRelease { HistoryDatabase.instance.answerDao().deleteAnswer(AnswerEntity().apply { primaryKey = answerId }) } }
     }
 
     @JvmStatic
     fun deleteVideoEntity(videoId: String) {
-        runOnIoThread { HistoryDatabase.instance.videoHistoryDao().deleteVideo(MyVideoEntity().apply { id = videoId }) }
+        runOnIoThread { tryCatchInRelease { HistoryDatabase.instance.videoHistoryDao().deleteVideo(MyVideoEntity().apply { id = videoId }) } }
+    }
+
+    @JvmStatic
+    fun deleteAttentionVideoRecord() {
+        runOnIoThread { tryCatchInRelease { HistoryDatabase.instance.videoHistoryDao().deleteAttentionVideoRecord() } }
     }
 
     @JvmStatic
     fun emptyDatabase() {
-        runOnIoThread { HistoryDatabase.instance.clearAllTables() }
+        runOnIoThread { tryCatchInRelease { HistoryDatabase.instance.clearAllTables() } }
     }
 
     private fun convertArticleDetailToArticle(articleDetailEntity: ArticleDetailEntity): ArticleEntity {
         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
@@ -118,6 +119,9 @@ object HistoryHelper {
         articleEntity.title = articleDetailEntity.title
         articleEntity.user = articleDetailEntity.user
         articleEntity.orderTag = System.currentTimeMillis()
+        articleEntity.images = articleDetailEntity.images
+        articleEntity.imagesInfo = articleDetailEntity.imagesInfo
+        articleEntity.videos = articleDetailEntity.videos
 
         return articleEntity
     }
@@ -132,12 +136,11 @@ 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
+        answerEntity.videos = answerDetailEntity.videos
 
         return answerEntity
     }

app/src/main/java/com/gh/common/loghub/LoghubHelper.kt

@@ -0,0 +1,90 @@
+package com.gh.common.loghub
+
+import com.aliyun.sls.android.producer.*
+import com.gh.common.util.isPublishEnv
+import com.halo.assistant.HaloApp
+import com.lightgame.utils.Utils
+
+/**
+ *  上传阿里云日志辅助类
+ */
+object LoghubHelper {
+
+    private const val ACCESS_KEY_ID = "LTAIV3i0sNc4TPK1"
+    private const val ACCESS_KEY_SECRET = "8dKtTPeE5WYA6ZCeuIBcIVp7eB0ir4"
+    private const val ENDPOINT = "cn-qingdao.log.aliyuncs.com"
+    private const val PROJECT = "ghzs"
+
+    private val mClientMaps by lazy { hashMapOf<String, LogProducerClient>() }
+
+    fun uploadLog(log: Log, logStore: String) {
+        getClient(logStore)?.addLog(log)
+    }
+
+    fun uploadLogs(logs: List<Log>, logStore: String) {
+        logs.forEach {
+            uploadLog(it, logStore)
+        }
+    }
+
+
+    private fun getClient(logStore: String): LogProducerClient? {
+        if (!mClientMaps.containsKey(logStore)) {
+            mClientMaps[logStore] = createClient(logStore)
+        }
+        return mClientMaps[logStore]
+    }
+
+    private fun createClient(logStore: String): LogProducerClient {
+        val config = LogProducerConfig(ENDPOINT, PROJECT, logStore, ACCESS_KEY_ID, ACCESS_KEY_SECRET).apply {
+            // 1 开启断点续传功能， 0 关闭
+            // 每次发送前会把日志保存到本地的binlog文件，只有发送成功才会删除，保证日志上传At Least Once
+            setPersistent(1)
+            // 持久化的文件名，需要保证文件所在的文件夹已创建。配置多个客户端时，不应设置相同文件
+            setPersistentFilePath(HaloApp.getInstance().application.filesDir.absolutePath + "/log.dat")
+            // 是否每次AddLog强制刷新，高可靠性场景建议打开
+            setPersistentForceFlush(1)
+            // 持久化文件滚动个数，建议设置成10。
+            setPersistentMaxFileCount(10)
+            // 每个持久化文件的大小，建议设置成1-10M
+            setPersistentMaxFileSize(1024 * 1024)
+            // 本地最多缓存的日志数，不建议超过1M，通常设置为65536即可
+            setPersistentMaxLogCount(65536)
+
+            //网络连接超时时间，整数，单位秒，默认为10
+            setConnectTimeoutSec(15)
+            //日志发送超时时间，整数，单位秒，默认为15
+            setSendTimeoutSec(15)
+            //flusher线程销毁最大等待时间，整数，单位秒，默认为1
+            setDestroyFlusherWaitSec(2)
+            //sender线程池销毁最大等待时间，整数，单位秒，默认为1
+            setDestroySenderWaitSec(2)
+            //日志时间与本机时间之差，超过该大小后会根据 `drop_delay_log` 选项进行处理。
+            //一般此种情况只会在设置persistent的情况下出现，即设备下线后，超过几天/数月启动，发送退出前未发出的日志
+            //整数，单位秒，默认为7*24*3600，即7天
+            setMaxLogDelayTime(7 * 24 * 3600)
+            //对于超过 `max_log_delay_time` 日志的处理策略
+            //0 不丢弃，把日志时间修改为当前时间; 1 丢弃，默认为 1 （丢弃）
+            setDropDelayLog(0)
+            //是否丢弃鉴权失败的日志，0 不丢弃，1丢弃
+            //默认为 0，即不丢弃
+            setDropUnauthorizedLog(0)
+        }
+
+        return if (isPublishEnv()) {
+            LogProducerClient(config)
+        } else {
+            return LogProducerClient(config,
+                    LogProducerCallback { resultCode, reqId, errorMessage, logBytes, compressedBytes ->
+
+                        // resultCode       返回结果代码
+                        // reqId            请求id
+                        // errorMessage     错误信息，没有为null
+                        // logBytes         日志大小
+                        // compressedBytes  压缩后日志大小
+                        Utils.log("LoghubHelper -> ${String.format("%s %s %s %s %s",
+                                LogProducerResult.fromInt(resultCode), reqId, errorMessage, logBytes, compressedBytes)}")
+                    })
+        }
+    }
+}

app/src/main/java/com/gh/common/loghub/LoghubUtils.kt

@@ -2,14 +2,12 @@ package com.gh.common.loghub
 
 import android.app.Application
 import androidx.annotation.Keep
-import com.aliyun.sls.android.sdk.model.Log
-import com.aliyun.sls.android.sdk.model.LogGroup
+import com.aliyun.sls.android.producer.Log
 import com.gh.common.exposure.ExposureEntity
 import com.gh.common.exposure.meta.Meta
 import com.gh.common.util.tryWithDefaultCatch
-import com.gh.loghub.LoghubHelper
 import org.json.JSONObject
-import java.util.concurrent.Executors
+import java.util.concurrent.ExecutorService
 
 object LoghubUtils {
 
@@ -17,22 +15,25 @@ object LoghubUtils {
     private lateinit var mApplication: Application
 
     private val loghubEventSet by lazy { hashSetOf<LoghubEvent>() }
-    private val loghubEventExecutor by lazy { Executors.newSingleThreadExecutor() }
+    private var loghubEventExecutor: ExecutorService? = null
     private val loghubEventDao by lazy { LoghubDatabase.buildDatabase(mApplication).logHubEventDao() }
 
     @JvmStatic
-    fun init(application: Application) {
+    fun init(application: Application, executor: ExecutorService) {
         mApplication = application
 
-        loghubEventExecutor.execute {
-            val eventList = loghubEventDao.getAll()
-            loghubEventSet.addAll(eventList)
+        loghubEventExecutor = executor
+        loghubEventExecutor?.execute {
+            tryWithDefaultCatch {
+                val eventList = loghubEventDao.getAll()
+                loghubEventSet.addAll(eventList)
+            }
         }
     }
 
     @JvmStatic
     fun log(logJson: JSONObject, logStore: String, forcedUpload: Boolean) {
-        loghubEventExecutor.execute {
+        loghubEventExecutor?.execute {
             try {
                 val event = LoghubEvent(time = (System.currentTimeMillis() / 1000L).toString(), content = logJson.toString(), logStore = logStore)
                 loghubEventSet.add(event)
@@ -49,7 +50,7 @@ object LoghubUtils {
 
     @JvmStatic
     fun log(jsonString: String, logStore: String, forcedUpload: Boolean) {
-        loghubEventExecutor.execute {
+        loghubEventExecutor?.execute {
             try {
                 val event = LoghubEvent(time = (System.currentTimeMillis() / 1000L).toString(), content = jsonString, logStore = logStore)
                 loghubEventSet.add(event)
@@ -64,49 +65,37 @@ object LoghubUtils {
         }
     }
 
-    private fun uploadLogGroup(logGroup: LogGroup, logStore: String) {
-        LoghubHelper.getInstance().uploadLogGroup(logGroup, logStore)
-    }
-
     fun commitSavedLoghubEvents() {
-        loghubEventExecutor.execute {
+        loghubEventExecutor?.execute {
             // TODO 初始化 loghubHelper 去掉这个 tryCatch 块
             tryWithDefaultCatch {
                 if (loghubEventSet.isEmpty()) return@execute
 
                 val exposureList = loghubEventSet.toList()
 
-                createLogGroupAndUpload()
+                uploadEvents()
                 loghubEventSet.removeAll(exposureList)
                 loghubEventDao.deleteMany(exposureList)
             }
         }
     }
 
-    private fun createLogGroupAndUpload() {
-        val logGroupHashMap = hashMapOf<String, LogGroup>()
-
+    private fun uploadEvents() {
         for (event in loghubEventSet) {
-            if (!logGroupHashMap.containsKey(event.logStore)) {
-                logGroupHashMap[event.logStore] = LogGroup("sls android", "no ip")
-            }
 
             val log = Log()
             // 特殊处理，以下logStore不需要用content包裹数据
             if (event.logStore == "collection" || event.logStore == "common" || event.logStore == "halo-api-device-installed") {
                 val contentJson = JSONObject(event.content)
                 for (key in contentJson.keys()) {
-                    log.PutContent(key, contentJson.get(key).toString())
+                    log.putContent(key, contentJson.get(key).toString())
                 }
             } else {
-                log.PutContent("current time ", event.time)
-                log.PutContent("content", event.content)
+                log.putContent("current time ", event.time)
+                log.putContent("content", event.content)
             }
-            logGroupHashMap[event.logStore]?.PutLog(log)
-        }
 
-        for ((logStore, logGroup) in logGroupHashMap) {
-            uploadLogGroup(logGroup, logStore)
+            LoghubHelper.uploadLog(log, event.logStore)
         }
     }
 

app/src/main/java/com/gh/common/observer/VolumeObserver.kt

@@ -20,7 +20,12 @@ class VolumeObserver(var context: Context, handler: Handler, var callback: MuteC
         super.onChange(selfChange)
 
         val audio = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-        val currentVolume = audio.getStreamVolume(AudioManager.STREAM_MUSIC)
+        var currentVolume = 0
+
+        tryCatchInRelease {
+            // 部分设备(Meizu 7.1.2 M6 Note)的 audioManager getStreamVolume 内部会触发空指针 :(
+            currentVolume = audio.getStreamVolume(AudioManager.STREAM_MUSIC)
+        }
 
         val delta = previousVolume - currentVolume
 

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

@@ -7,6 +7,7 @@ import android.view.View
 import android.view.Window
 import android.widget.ProgressBar
 import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
 import com.g00fy2.versioncompare.Version
@@ -14,7 +15,6 @@ import com.gh.common.AppExecutor.uiExecutor
 import com.gh.common.constant.Constants
 import com.gh.common.dialog.TrackableDialog
 import com.gh.common.util.*
-import com.gh.common.util.PackageInstaller.getDownloadPath
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
 import com.gh.gamecenter.entity.ApkEntity
@@ -23,6 +23,7 @@ import com.gh.gamecenter.entity.TrackableEntity
 import com.halo.assistant.HaloApp
 import com.lightgame.download.*
 import com.lightgame.utils.Utils
+import java.lang.ref.WeakReference
 import java.text.DecimalFormat
 
 class SimulatorDownloadManager private constructor() {
@@ -34,6 +35,7 @@ class SimulatorDownloadManager private constructor() {
     private var appProgressFilling: View? = null
     private var appProgressAnchor: View? = null
     private var downloadDialog: Dialog? = null
+    private var mContextRef: WeakReference<Context>? = null
 
     private var simulatorLocation: SimulatorLocation? = null
     private var simulator: SimulatorEntity? = null
@@ -71,7 +73,10 @@ class SimulatorDownloadManager private constructor() {
                         val startTime = downloadEntity.getMetaExtra(Constants.SIMULATOR_DOWNLOAD_START_TIME)
                         LogUtils.uploadSimulatorDownload("simulator_download_complete", fileName, simulator?.id, downloadEntity.name, gameId, locationStr, downloadType, startTime)
                         DownloadManager.getInstance(HaloApp.getInstance().application).cancel(downloadEntity.url, false, true)
-                        downloadDialog?.dismiss()
+                        val activity = mContextRef?.get() as? AppCompatActivity
+                        if (activity?.isFinishing == false) {
+                            downloadDialog?.dismiss()
+                        }
                     }
                     DownloadStatus.neterror == downloadEntity.status -> {
                         ToastUtils.showToast("网络不稳定，下载任务已暂停")
@@ -94,7 +99,9 @@ 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
@@ -117,7 +124,7 @@ class SimulatorDownloadManager private constructor() {
                 key = if (shouldShowUpdate && isInstalled) "更新弹窗" else "下载弹窗",
                 logShowEvent = true
         )
-        DialogUtils.showNewAlertDialog(context, title, message, negativeText, positiveText, trackableEntity, Gravity.LEFT, {
+        DialogUtils.showNewAlertDialog(context, title, message, negativeText, positiveText, trackableEntity, Gravity.LEFT, false, {
             if (shouldShowUpdate && isInstalled) {
                 cancelCallback?.invoke()
                 MtaHelper.onEvent(trackableEntity.event, trackableEntity.key, "点击下次再说")
@@ -153,7 +160,10 @@ class SimulatorDownloadManager private constructor() {
         view.findViewById<View>(R.id.app_tv_cancel).setOnClickListener {
             DownloadManager.getInstance(context).pause(simulator?.apk?.url)
             MtaHelper.onEvent("模拟器下载", "下载中弹窗", "点击关闭")
-            downloadDialog?.dismiss()
+            val activity = mContextRef?.get() as? AppCompatActivity
+            if (activity?.isFinishing == false) {
+                downloadDialog?.dismiss()
+            }
         }
 
         downloadDialog?.setOnDismissListener {
@@ -184,6 +194,7 @@ class SimulatorDownloadManager private constructor() {
         DownloadManager.getInstance(context).pauseAll()
 
         val entity = DownloadManager.getInstance(context).getDownloadEntityByUrl(apkEntity.url)
+        HaloApp.put(simulator.name, simulator)
         if (entity != null) {
             when (entity.status) {
                 DownloadStatus.pause, DownloadStatus.subscribe,
@@ -203,16 +214,18 @@ class SimulatorDownloadManager private constructor() {
 
     private fun createDownload(context: Context, apkEntity: ApkEntity, simulator: SimulatorEntity) {
         DownloadManager.getInstance(context).addObserver(dataWatcher)
+        val downloadId = PackageInstaller.createDownloadId(simulator.name)
         val downloadEntity = DownloadEntity()
         downloadEntity.url = apkEntity.url
         downloadEntity.name = simulator.name
-        downloadEntity.path = getDownloadPath(simulator.name, apkEntity.format)
+        downloadEntity.path = PackageInstaller.getDownloadPathWithId(downloadId, apkEntity.format)
         downloadEntity.platform = apkEntity.getPlatform()
         downloadEntity.packageName = apkEntity.packageName
         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.DOWNLOAD_ID, downloadId)
         uiExecutor.executeWithDelay(Runnable { DownloadManager.getInstance(context).add(downloadEntity) }, 200)
 
         val locationStr = if (simulatorLocation == SimulatorLocation.LAUNCH) "${simulatorLocation?.value}《${gameName}》" else simulatorLocation?.value

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

@@ -3,24 +3,29 @@ package com.gh.common.simulator
 import android.annotation.SuppressLint
 import android.content.ActivityNotFoundException
 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.util.*
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.entity.SimulatorGameRecordEntity
 import com.gh.gamecenter.manager.UserManager
 import com.gh.gamecenter.retrofit.BiResponse
 import com.gh.gamecenter.retrofit.EmptyResponse
 import com.gh.gamecenter.retrofit.RetrofitManager
+import com.gh.gamecenter.room.AppDatabase
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DownloadDao
 import com.lightgame.download.DownloadEntity
 import com.lightgame.download.FileUtils
 import com.lightgame.utils.AppManager
+import io.reactivex.Single
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import okhttp3.ResponseBody
+import java.io.ByteArrayOutputStream
 import java.io.File
 
 
@@ -33,7 +38,7 @@ object SimulatorGameManager {
 
     @JvmStatic
     fun deleteLocalGames(names: List<String>) {
-        val downloadEntityList = DownloadDao.getInstance(HaloApp.getInstance().application).all
+        val downloadEntityList = DownloadManager.getInstance(HaloApp.getInstance().application).allDownloadEntity
         names.forEach { name ->
             val downloadEntity = downloadEntityList.find { it.name == name }
             if (downloadEntity != null) {
@@ -48,7 +53,7 @@ object SimulatorGameManager {
 
     @JvmStatic
     fun deleteLocalGame(name: String) {
-        val downloadEntityList = DownloadDao.getInstance(HaloApp.getInstance().application).all
+        val downloadEntityList = DownloadManager.getInstance(HaloApp.getInstance().application).allDownloadEntity
         val downloadEntity = downloadEntityList.find { it.name == name }
         if (downloadEntity != null) {
             val file = File(downloadEntity.path)
@@ -90,31 +95,62 @@ object SimulatorGameManager {
         }
     }
 
+    @SuppressLint("CheckResult")
     private fun jumpToSimulator(downloadEntity: DownloadEntity, gameEntity: GameEntity) {
-        val intent = Intent()
-        intent.data = Uri.fromFile(File(downloadEntity.path))
-        if (gameEntity.simulatorType == "FBA") {
-            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", gameEntity.icon ?: "")
-        intent.putExtra("meta", LogUtils.getMetaObject().toString())
-        intent.putExtra("simulatorId", gameEntity.simulator?.id)
-        intent.putExtra("simulatorName", gameEntity.simulator?.name)
-        intent.putExtra("gameId", gameEntity.id)
+        Single.just(gameEntity.icon ?: "")
+                .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)
+                    }
+                    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", gameEntity.icon ?: "")
+                    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)
+                    recordPlaySimulatorGames(gameEntity.id)
+                }, {
+                    ToastUtils.showToast("跳转失败")
+                })
+    }
+
+    private fun getBitmapFormCache(url: String): Single<Bitmap> {
+        return Single.create {
+            ImageUtils.getBitmap(url, object : BiCallback<Bitmap, Boolean> {
+                override fun onFirst(first: Bitmap) {
+                    it.onSuccess(first)
+                }
+
+                override fun onSecond(second: Boolean) {
+                    it.onError(Throwable("获取bitmap失败"))
+                }
+            })
+        }
     }
 
 
@@ -123,16 +159,42 @@ object SimulatorGameManager {
      */
     @SuppressLint("CheckResult")
     @JvmStatic
-    fun recordDownloadSimulatorGames(gameId: String) {
+    fun recordDownloadSimulatorGames(gameId: String, type: String) {
         val requestMap = hashMapOf<String, Any>()
         requestMap["game_id"] = gameId
         requestMap["package"] = "-"
         val body = requestMap.createRequestBodyAny()
         RetrofitManager.getInstance(HaloApp.getInstance().application).api
                 .downloadSimulatorGames(HaloApp.getInstance().gid, body)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(EmptyResponse())
+                .compose(singleToMain())
+                .subscribe(object : BiResponse<ResponseBody>() {
+                    override fun onSuccess(data: ResponseBody) {
+                        refreshSimulatorGame(gameId, type)
+                    }
+                })
+    }
+
+    @SuppressLint("CheckResult")
+    private fun refreshSimulatorGame(gameId: String, type: String) {
+        val simulatorGameDao = AppDatabase.getInstance(HaloApp.getInstance()).simulatorGameDao()
+        RetrofitManager.getInstance(HaloApp.getInstance().application).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)
+                    }
+                })
+    }
+
+    private fun getFilter(type: String): String {
+        return UrlFilterUtils.getFilterQuery("type", type)
     }
 
     /**
@@ -147,8 +209,7 @@ object SimulatorGameManager {
             val body = requestMap.toRequestBody()
             RetrofitManager.getInstance(HaloApp.getInstance().application).api
                     .postPlayedGame(UserManager.getInstance().userId, body)
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
+                    .compose(singleToMain())
                     .subscribe(EmptyResponse())
         }
     }
@@ -189,6 +250,7 @@ object SimulatorGameManager {
     /**
      * 批量删除设备下载模拟器游戏的记录
      */
+    @JvmStatic
     @SuppressLint("CheckResult")
     fun deleteSimulatorGames(gameIds: List<String>, callback: () -> Unit) {
         val requestMap = hashMapOf<String, Any>()

app/src/main/java/com/gh/common/syncpage/example/ExampleAdapter.kt

@@ -80,7 +80,7 @@ class ExampleAdapter(context: Context) : ListAdapter<AnswerEntity>(context), ISy
             ItemViewType.ITEM_FOOTER -> {
                 val footerViewHolder = holder as FooterViewHolder
                 footerViewHolder.initItemPadding()
-                footerViewHolder.initFooterViewHolder(mIsLoading, mIsNetworkError, mIsOver, R.string.ask_loadover_hint)
+                footerViewHolder.initFooterViewHolder(mIsLoading, mIsNetworkError, mIsOver)
             }
         }
     }

app/src/main/java/com/gh/common/tracker/ActivityLifecycleWatcher.kt

@@ -0,0 +1,24 @@
+package com.gh.common.tracker
+
+import android.app.Activity
+import android.app.Application
+import android.os.Bundle
+
+// TODO SplashActivity 没有回调 onStart 和 onStop
+class ActivityLifecycleWatcher(private val mTrack: ITrack) : Application.ActivityLifecycleCallbacks {
+
+    override fun onActivityStarted(activity: Activity) {
+        mTrack.onActivityStarted(activity)
+    }
+
+    override fun onActivityStopped(activity: Activity) {
+        mTrack.onActivityStopped(activity)
+    }
+
+    override fun onActivityDestroyed(activity: Activity) {}
+    override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
+    override fun onActivityPaused(activity: Activity) {}
+    override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {}
+    override fun onActivityResumed(activity: Activity) {}
+
+}

app/src/main/java/com/gh/common/tracker/AppLifecycleWatcher.kt

@@ -0,0 +1,72 @@
+package com.gh.common.tracker
+
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import java.util.*
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.atomic.AtomicLong
+import kotlin.concurrent.fixedRateTimer
+
+/**
+ * 应用声明周期观察者
+ */
+class AppLifecycleWatcher(private val mTrack: ITrack) : DefaultLifecycleObserver {
+
+    private var mWatchVisibleCount = 0 // 检查是否满足上传可见的次数
+
+    private val mLastVisibleTime by lazy { AtomicLong(0L) } // 最后可见时间
+    private val mIsVisible by lazy { AtomicBoolean(false) } // 当前是否可见
+    private val mWatchInterval by lazy { AtomicLong(MIN_WATCH_VISIBLE_INTERVAL) } // 与上次上报可见的间隔时间
+
+    init {
+        fixedRateTimer(FIXED_RATE_TIMER_NAME, initialDelay = MIN_WATCH_VISIBLE_INTERVAL, period = MIN_WATCH_VISIBLE_INTERVAL) {
+            if (mIsVisible.get()) {
+                // 单位间隔发送
+                val meetLogVisibleInterval = (mWatchVisibleCount++) * MIN_WATCH_VISIBLE_INTERVAL == mWatchInterval.get()
+
+                val equalToMinVisibleInterval = mWatchInterval.get() == MIN_WATCH_VISIBLE_INTERVAL
+                val equalToMaxVisibleInterval = mWatchInterval.get() == MAX_WATCH_VISIBLE_INTERVAL
+
+                if (meetLogVisibleInterval || equalToMinVisibleInterval) {
+                    // 上报完重置计数
+                    mWatchVisibleCount = 0
+                    mTrack.onAppVisible(mWatchInterval.get() / 1000)
+                    if (!equalToMaxVisibleInterval) {
+                        mWatchInterval.set(mWatchInterval.get() * 2) // 间隔递增两倍
+                    }
+                }
+            }
+        }
+    }
+
+    override fun onStart(owner: LifecycleOwner) {
+        super.onStart(owner)
+
+        if (mLastVisibleTime.get() == 0L
+                || (mLastVisibleTime.get() + SESSION_ALIVE_INTERVAL) < System.currentTimeMillis() / 1000) {
+            mTrack.onSessionChanged(UUID.randomUUID().toString())
+        }
+        mIsVisible.set(true)
+
+        mTrack.onAppStarted()
+    }
+
+    override fun onStop(owner: LifecycleOwner) {
+        super.onStop(owner)
+
+        mIsVisible.set(false)
+        mLastVisibleTime.set(System.currentTimeMillis() / 1000)
+        mWatchInterval.set(MIN_WATCH_VISIBLE_INTERVAL)
+
+        mTrack.onAppStopped()
+    }
+
+    companion object {
+        private const val FIXED_RATE_TIMER_NAME = "APP_TRACKER_TIMER"
+
+        private const val SESSION_ALIVE_INTERVAL = 30L // 30s
+        private const val MIN_WATCH_VISIBLE_INTERVAL = 5000L // 5s
+        private const val MAX_WATCH_VISIBLE_INTERVAL = 320000L // 320s
+    }
+
+}

app/src/main/java/com/gh/common/tracker/IBusiness.kt

@@ -0,0 +1,8 @@
+package com.gh.common.tracker
+
+import androidx.annotation.Nullable
+
+interface IBusiness {
+    @Nullable
+    fun getBusinessId(): Pair<String, String>
+}

app/src/main/java/com/gh/common/tracker/ITrack.kt

@@ -0,0 +1,14 @@
+package com.gh.common.tracker
+
+import android.app.Activity
+
+interface ITrack {
+    fun onActivityStarted(activity: Activity)
+    fun onActivityStopped(activity: Activity)
+
+    fun onAppStarted()
+    fun onAppVisible(interval: Long)
+    fun onAppStopped()
+
+    fun onSessionChanged(sessionId: String)
+}

app/src/main/java/com/gh/common/tracker/Tracker.kt

@@ -0,0 +1,70 @@
+package com.gh.common.tracker
+
+import android.app.Activity
+import android.app.Application
+import androidx.lifecycle.ProcessLifecycleOwner
+import java.util.*
+
+object Tracker : ITrack {
+
+    private var mSessionId: String = ""
+    private val mLaunchId by lazy { UUID.randomUUID().toString() }
+
+    val sessionId: String
+        get() = mSessionId
+
+    val launchId: String
+        get() = mLaunchId
+
+    private var mIsInitialized = false
+
+    @JvmStatic
+    fun init(application: Application) {
+        if (mIsInitialized) {
+            return
+        }
+
+        ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifecycleWatcher(this))
+        application.registerActivityLifecycleCallbacks(ActivityLifecycleWatcher(this))
+        mIsInitialized = true
+    }
+
+    override fun onActivityStarted(activity: Activity) {
+        val businessId = if (activity is IBusiness) activity.getBusinessId() else null
+
+        TrackerLogger.logActivityStart(
+                mLaunchId,
+                mSessionId,
+                System.identityHashCode(activity).toString(),
+                activity::class.java.simpleName,
+                businessId)
+    }
+
+    override fun onActivityStopped(activity: Activity) {
+        val businessId = if (activity is IBusiness) activity.getBusinessId() else null
+
+        TrackerLogger.logActivityStop(
+                mLaunchId,
+                mSessionId,
+                System.identityHashCode(activity).toString(),
+                activity::class.java.simpleName,
+                businessId)
+    }
+
+    override fun onAppStarted() {
+        TrackerLogger.logAppStart(mLaunchId, mSessionId)
+    }
+
+    override fun onAppVisible(interval: Long) {
+        TrackerLogger.logAppVisible(mLaunchId, mSessionId, interval)
+    }
+
+    override fun onAppStopped() {
+        TrackerLogger.logAppStop(mLaunchId, mSessionId)
+    }
+
+    override fun onSessionChanged(sessionId: String) {
+        mSessionId = sessionId
+    }
+
+}

app/src/main/java/com/gh/common/tracker/TrackerLogger.kt

@@ -0,0 +1,178 @@
+package com.gh.common.tracker
+
+import com.gh.common.exposure.meta.MetaUtil
+import com.gh.common.exposure.meta.MetaUtil.getBase64EncodedAndroidId
+import com.gh.common.exposure.meta.MetaUtil.getBase64EncodedIMEI
+import com.gh.common.loghub.LoghubUtils
+import com.gh.common.util.tryCatchInRelease
+import com.lightgame.utils.Utils
+import org.json.JSONException
+import org.json.JSONObject
+
+object TrackerLogger {
+
+    private const val LOG_STORE = "launch_activity"
+
+    fun logAppStart(launchId: String, sessionId: String) {
+        logAppVisible(launchId, sessionId, 0)
+    }
+
+    fun logAppVisible(launchId: String, sessionId: String, interval: Long) {
+        val jsonObject = JSONObject()
+        val payloadObject = JSONObject()
+        tryCatchInRelease {
+            payloadObject.put("launch_id", launchId)
+            payloadObject.put("session_id", sessionId)
+            payloadObject.put("interval", interval)
+
+            jsonObject.put("event", "app_visible")
+            jsonObject.put("payload", payloadObject)
+            jsonObject.put("meta", getMeta())
+        }
+        uploadToLoghub(jsonObject, true)
+    }
+
+    fun logAppStop(launchId: String, sessionId: String) {
+        val jsonObject = JSONObject()
+        val payloadObject = JSONObject()
+        tryCatchInRelease {
+            payloadObject.put("launch_id", launchId)
+            payloadObject.put("session_id", sessionId)
+
+            jsonObject.put("event", "app_invisible")
+            jsonObject.put("payload", payloadObject)
+            jsonObject.put("meta", getMeta())
+        }
+        uploadToLoghub(jsonObject, true)
+    }
+
+    fun logActivityStart(launchId: String,
+                         sessionId: String,
+                         activityId: String,
+                         activityName: String,
+                         activityBusinessId: Pair<String, String>? = null) {
+        val jsonObject = JSONObject()
+        val payloadObject = JSONObject()
+        tryCatchInRelease {
+            payloadObject.put("launch_id", launchId)
+            payloadObject.put("session_id", sessionId)
+            payloadObject.put("activity_id", activityId)
+            payloadObject.put("activity_name", activityName)
+            if (activityBusinessId != null) {
+                payloadObject.put("activity_primary_business_id", activityBusinessId.first)
+                if (activityBusinessId.second.isNotEmpty()) {
+                    payloadObject.put("activity_secondary_business_id", activityBusinessId.second)
+                }
+            }
+
+            jsonObject.put("event", "activity_visible")
+            jsonObject.put("payload", payloadObject)
+            jsonObject.put("meta", getMeta())
+        }
+        uploadToLoghub(jsonObject, false)
+    }
+
+    fun logActivityStop(launchId: String,
+                        sessionId: String,
+                        activityId: String,
+                        activityName: String,
+                        activityBusinessId: Pair<String, String>? = null) {
+        val jsonObject = JSONObject()
+        val payloadObject = JSONObject()
+        tryCatchInRelease {
+            payloadObject.put("launch_id", launchId)
+            payloadObject.put("session_id", sessionId)
+            payloadObject.put("activity_id", activityId)
+            payloadObject.put("activity_name", activityName)
+            if (activityBusinessId != null) {
+                payloadObject.put("activity_primary_business_id", activityBusinessId.first)
+                if (activityBusinessId.second.isNotEmpty()) {
+                    payloadObject.put("activity_secondary_business_id", activityBusinessId.second)
+                }
+            }
+
+            jsonObject.put("event", "activity_invisible")
+            jsonObject.put("payload", payloadObject)
+            jsonObject.put("meta", getMeta())
+        }
+        uploadToLoghub(jsonObject, false)
+    }
+
+    @JvmStatic
+    fun logHomeTabSelected(launchId: String,
+                           sessionId: String,
+                           tabPosition: Int,
+                           tabContent: String) {
+        val jsonObject = JSONObject()
+        val payloadObject = JSONObject()
+        tryCatchInRelease {
+            payloadObject.put("launch_id", launchId)
+            payloadObject.put("session_id", sessionId)
+            payloadObject.put("tab_position", tabPosition)
+            payloadObject.put("tab_content", tabContent)
+
+            jsonObject.put("event", "home_tab_select")
+            jsonObject.put("payload", payloadObject)
+            jsonObject.put("meta", getMeta())
+        }
+        uploadToLoghub(jsonObject, false)
+    }
+
+    @JvmStatic
+    fun logAppLaunch(launchId: String, sessionId: String) {
+        val jsonObject = JSONObject()
+        val payloadObject = JSONObject()
+        tryCatchInRelease {
+            payloadObject.put("launch_id", launchId)
+            payloadObject.put("session_id", sessionId)
+
+            jsonObject.put("event", "app_launch")
+            jsonObject.put("payload", payloadObject)
+            jsonObject.put("meta", getMeta())
+        }
+        uploadToLoghub(jsonObject, true)
+    }
+
+    @JvmStatic
+    fun logAppLaunchSuccessful(launchId: String, sessionId: String) {
+        val jsonObject = JSONObject()
+        val payloadObject = JSONObject()
+        tryCatchInRelease {
+            payloadObject.put("launch_id", launchId)
+            payloadObject.put("session_id", sessionId)
+
+            jsonObject.put("event", "app_launch_successful")
+            jsonObject.put("payload", payloadObject)
+            jsonObject.put("meta", getMeta())
+        }
+        uploadToLoghub(jsonObject, true)
+    }
+
+    private fun uploadToLoghub(jsonObject: JSONObject, uploadImmediately: Boolean) {
+        jsonObject.put("timestamp", System.currentTimeMillis() / 1000)
+
+        Utils.log("Tracker -> $jsonObject")
+        LoghubUtils.log(jsonObject, LOG_STORE, uploadImmediately)
+    }
+
+    private fun getMeta(): JSONObject {
+        val (_, _, model, manufacturer, _, _, android_version, network, _, gid, _, channel, appVersion, userId) = MetaUtil.getMeta()
+        val metaObject = JSONObject()
+        try {
+            metaObject.put("dia", getBase64EncodedAndroidId())
+            metaObject.put("android_version", android_version)
+            metaObject.put("app_version", appVersion)
+            metaObject.put("channel", channel)
+            metaObject.put("gid", gid)
+            metaObject.put("jnfj", getBase64EncodedIMEI())
+            metaObject.put("manufacturer", manufacturer)
+            metaObject.put("model", model)
+            metaObject.put("network", network)
+            metaObject.put("user_id", userId)
+        } catch (e: JSONException) {
+            e.printStackTrace()
+        }
+        return metaObject
+    }
+
+}

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

@@ -1,7 +1,14 @@
 package com.gh.common.util
 
+import android.annotation.SuppressLint
+import androidx.lifecycle.MutableLiveData
 import com.gh.common.constant.Config
 import com.gh.gamecenter.entity.SettingsEntity
+import com.gh.gamecenter.entity.StartupAdEntity
+import com.gh.gamecenter.retrofit.BiResponse
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.halo.assistant.HaloApp
+import io.reactivex.schedulers.Schedulers
 
 object AdHelper {
 
@@ -12,6 +19,28 @@ object AdHelper {
     const val LOCATION_DISCOVER = "discover"
     const val LOCATION_SIMULATOR_GAME = "simulator_game"
 
+    @JvmField
+    var startupAd = MutableLiveData<StartupAdEntity>()
+
+    @JvmStatic
+    @SuppressLint("CheckResult")
+    fun getStartUpAd() {
+        if (!NetworkUtils.isNetworkConnected(HaloApp.getInstance())) {
+            startupAd.postValue(null)
+            return
+        }
+
+        RetrofitManager.getInstance(HaloApp.getInstance())
+                .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? {
         val adList = Config.getSettings()?.adList ?: return null
 

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

@@ -333,14 +333,19 @@ public class BitmapUtils {
     }
 
 
-    public static Bitmap compressBitmap(Bitmap bitmap) {
+    /**
+     * 压缩图片
+     *
+     * @param bitmap
+     * @param compressSize 压缩大小(单位k)
+     */
+    public static Bitmap compressBitmap(Bitmap bitmap, int compressSize) {
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         Matrix matrix = new Matrix();
         Bitmap result = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
         result.compress(Bitmap.CompressFormat.WEBP, 100, bos);
 
-        while (bos.toByteArray().length > 400 * 1024) {
-            System.out.println(bos.toByteArray().length);
+        while (bos.toByteArray().length > compressSize * 1024) {
             matrix.setScale(0.9f, 0.9f);
             result = Bitmap.createBitmap(result, 0, 0, result.getWidth(), result.getHeight(), matrix, true);
             bos.reset();

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

@@ -1,16 +1,14 @@
 package com.gh.common.util;
 
 import android.content.Context;
-import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
 
-import com.gh.common.avoidcallback.Callback;
+import com.gh.common.constant.Constants;
 import com.gh.gamecenter.LoginActivity;
 import com.gh.gamecenter.manager.UserManager;
 import com.lightgame.utils.Utils;
 
-import org.jetbrains.annotations.Nullable;
 
 /**
  * Created by khy on 28/06/17.
@@ -24,11 +22,15 @@ public class CheckLoginUtils {
             LogUtils.login("dialog", null, entrance);
             LogUtils.login("activity", null, entrance);
 
-            // 有可能App未启动
-            Bundle bundle = new Bundle();
-            bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance);
-            bundle.putString(EntranceUtils.KEY_TO, LoginActivity.class.getName());
-            EntranceUtils.jumpActivity(context, bundle);
+            if (SPUtils.getBoolean(Constants.SP_HAS_GET_PHONE_INFO) || NetworkUtils.isOpenMobileData(context)) {
+                QuickLoginHelper.startLogin(context, entrance);
+            } else {
+                // 有可能App未启动
+                Bundle bundle = new Bundle();
+                bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance);
+                bundle.putString(EntranceUtils.KEY_TO, LoginActivity.class.getName());
+                EntranceUtils.jumpActivity(context, bundle);
+            }
         } else {
             if (listener != null) {
                 listener.onLogin();

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

@@ -118,13 +118,13 @@ object CommentHelper {
         }
 
         val inflater = LayoutInflater.from(context)
-        val layout = inflater.inflate(R.layout.comment_more_option, null)
+        val layout = inflater.inflate(R.layout.layout_popup_container, null)
         val popupWindow = BugFixedPopupWindow(layout,
                 LinearLayout.LayoutParams.WRAP_CONTENT,
                 LinearLayout.LayoutParams.WRAP_CONTENT)
         val container = layout.findViewById<LinearLayout>(R.id.container)
         for (text in dialogOptions) {
-            val item = inflater.inflate(R.layout.comment_more_option_item, container, false)
+            val item = inflater.inflate(R.layout.layout_popup_option_item, container, false)
             container.addView(item)
 
             val hitText = item.findViewById<TextView>(R.id.hint_text)

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

@@ -334,15 +334,16 @@ public class CommentUtils {
                     });
         });
     }
+
     public static void voteVideoComment(final Context context,
-                                   String answerId,
-                                   String articleId,
-                                   String articleCommunityId,
-                                   String videoId,
-                                   final CommentEntity commentEntity,
-                                   final TextView commentLikeCountTv,
-                                   final ImageView commentLikeIv,
-                                   final OnVoteListener listener) {
+                                        String answerId,
+                                        String articleId,
+                                        String articleCommunityId,
+                                        String videoId,
+                                        final CommentEntity commentEntity,
+                                        final TextView commentLikeCountTv,
+                                        final ImageView commentLikeIv,
+                                        final OnVoteListener listener) {
 
         String entrance = "视频流-评论-点赞";
         CheckLoginUtils.checkLogin(context, entrance, () -> {
@@ -389,10 +390,10 @@ public class CommentUtils {
     }
 
     public static void unVoteVideoComment(final Context context,
-                                     String videoId,
-                                     final CommentEntity commentEntity,
-                                     final TextView commentLikeCountTv,
-                                     final ImageView commentLikeIv) {
+                                          String videoId,
+                                          final CommentEntity commentEntity,
+                                          final TextView commentLikeCountTv,
+                                          final ImageView commentLikeIv) {
         String entrance = "视频流-评论-取消点赞";
         CheckLoginUtils.checkLogin(context, entrance, () -> {
             RetrofitManager.getInstance(context).getApi()
@@ -434,10 +435,10 @@ public class CommentUtils {
         holder.commentLikeIv.setImageResource(R.drawable.comment_vote_unselect);
 
         if (userDataEntity == null || !userDataEntity.isCommentOwner()) {
-            holder.replyLine.setVisibility(View.VISIBLE);
+            if (holder.replyLine != null) holder.replyLine.setVisibility(View.VISIBLE);
             holder.commentReply.setVisibility(View.VISIBLE);
         } else {
-            holder.replyLine.setVisibility(View.GONE);
+            if (holder.replyLine != null) holder.replyLine.setVisibility(View.GONE);
             holder.commentReply.setVisibility(View.GONE);
         }
 

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

@@ -35,7 +35,7 @@ public class DataCollectionUtils {
     public static void uploadDownload(Context context, DownloadEntity downloadEntity, String status) {
         Map<String, Object> map = new HashMap<>();
         map.put("game", StringsKt.removeSuffix(downloadEntity.getName(), Constants.GAME_NAME_DECORATOR));
-        map.put("game_id", downloadEntity.getRealGameId(Constants.GAME_ID_DIVIDER));
+        map.put("game_id", downloadEntity.getGameId());
         if (downloadEntity.isPluggable()) {
             map.put("method", "插件化");
             map.put("btn_status", "插件化");

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

@@ -52,8 +52,8 @@ public class DataLogUtils {
         String user = Installation.getUUID(context);
         String channel = HaloApp.getInstance().getChannel();
         map.put("version", version);
-        map.put("user", user);
-        map.put("device_id", MetaUtil.getIMEI());
+        map.put("resu", user);
+        map.put("jnfj", MetaUtil.getBase64EncodedIMEI());
         map.put("channel", channel);
 
         Map<String, String> params = new HashMap<>();

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

@@ -7,6 +7,7 @@ import android.os.Build;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
 
+import com.gh.common.AppExecutor;
 import com.gh.common.constant.Constants;
 import com.gh.common.exposure.meta.MetaUtil;
 import com.gh.gamecenter.BuildConfig;
@@ -19,9 +20,8 @@ import com.lightgame.utils.Utils;
 import java.util.HashMap;
 import java.util.Map;
 
+import io.sentry.Sentry;
 import io.sentry.android.core.SentryAndroid;
-import io.sentry.core.Sentry;
-import io.sentry.core.protocol.User;
 
 /**
  * Created by LGT on 2016/6/15.
@@ -40,34 +40,9 @@ public class DataUtils {
         if (CommonDebug.IS_DEBUG) {
             return;
         }
-
-        SentryAndroid.init(context, options -> {
-            options.setDebug(BuildConfig.DEBUG);
-            options.setEnableSessionTracking(true);
-            options.setEnvironment(BuildConfig.FLAVOR);
-            options.setDsn("https://6b1caf0d17c1408e8680f3f73ff80bd0@sentry.ghzs.com/22");
-
-            options.setBeforeSend((event, hint) -> {
-                if (BuildConfig.DEBUG) {
-                    return null;
-                } else {
-                    return event;
-                }
-            });
-        });
-
-        Sentry.configureScope(scope -> {
-            User user = new User();
-            user.setId(HaloApp.getInstance().getGid());
-            scope.setUser(user);
-
-            if (BuildConfig.BUILD_TIME != 0L) {
-                scope.setTag("alias", "内测版" + BuildConfig.VERSION_NAME + "_" + BuildConfig.BUILD_TIME);
-            } else {
-                scope.setTag("alias", "正式版" + BuildConfig.VERSION_NAME);
-                scope.setTag("channel", channel);
-            }
-        });
+    
+        // 初始化 Sentry 约占用 90ms，这里切换到子线程初始化
+        AppExecutor.getIoExecutor().execute(() -> initSentry(context, channel));
 
         //TalkingData
 //        try {
@@ -137,6 +112,41 @@ public class DataUtils {
 //        }
 
     }
+    
+    private static void initSentry(Context context, String channel) {
+        SentryAndroid.init(context, options -> {
+            // Sentry 疯狂报 ANR (很大一部分还是莫名奇妙的 ANR)严重影响到其它闪退日志的收集
+            // 这里将它局限到只有官网渠道的包才统计 ANR
+            if ("GH_206".equals(channel)) {
+                options.setAnrEnabled(true);
+                options.setAnrTimeoutIntervalMillis(6000);
+            } else {
+                options.setAnrEnabled(false);
+            }
+        
+            options.setDebug(BuildConfig.DEBUG);
+            options.setEnableSessionTracking(true);
+            options.setEnvironment(BuildConfig.FLAVOR);
+            options.setDsn("https://6b1caf0d17c1408e8680f3f73ff80bd0@sentry.ghzs.com/22");
+        
+            options.setBeforeSend((event, hint) -> {
+                if (BuildConfig.DEBUG) {
+                    return null;
+                } else {
+                    return event;
+                }
+            });
+        });
+    
+        Sentry.configureScope(scope -> {
+            if (BuildConfig.BUILD_TIME != 0L) {
+                scope.setTag("alias", "内测版" + BuildConfig.VERSION_NAME);
+            } else {
+                scope.setTag("alias", "正式版" + BuildConfig.VERSION_NAME);
+                scope.setTag("channel", channel);
+            }
+        });
+    }
 
     // MTA ->【次数统计】Key-Value参数的事件
     public static void onMtaEvent(Context context, String eventId, String... kv) {
@@ -229,7 +239,7 @@ public class DataUtils {
 
         kv.put("版本", platform);
         kv.put("用户机型", Build.MODEL);
-        kv.put("设备IMEI", MetaUtil.getIMEI());
+        kv.put("设备JNFJ", MetaUtil.getBase64EncodedIMEI());
         kv.put("网络状态", DeviceUtils.getNetwork(HaloApp.getInstance().getApplication()));
         kv.put("光环助手版本", BuildConfig.VERSION_NAME);
         kv.put("位置", entrance);

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

@@ -41,11 +41,11 @@ public class DeviceUtils {
         context = context.getApplicationContext();
         JSONObject object = new JSONObject();
         object.put("os", "Android");
-        object.put("imei", MetaUtil.getIMEI());
+        object.put("jnfj", MetaUtil.getBase64EncodedIMEI());
         object.put("mac", getMac(context));
         object.put("model", MODEL);
         object.put("manufacturer", MANUFACTURER);
-        object.put("android_id", MetaUtil.getAndroidId());
+        object.put("dia", MetaUtil.getBase64EncodedAndroidId());
         object.put("android_sdk", Build.VERSION.SDK_INT);
         object.put("android_version", android.os.Build.VERSION.RELEASE);
         object.put("ip", "");
@@ -57,8 +57,8 @@ public class DeviceUtils {
     public static JSONObject getUserDevice(Context context) { // 判断新老用户device数据
         JSONObject object = new JSONObject();
         try {
-            object.put("IMEI", MetaUtil.getIMEI());
-            object.put("ANDROID_ID", MetaUtil.getAndroidId());
+            object.put("JNFJ", MetaUtil.getBase64EncodedIMEI());
+            object.put("DIA", MetaUtil.getBase64EncodedAndroidId());
             object.put("MAC", getMac(context));
 //            object.put("MTA_ID", StatConfig.getMid(context));
             object.put("MANUFACTURER", MANUFACTURER);
@@ -258,7 +258,7 @@ public class DeviceUtils {
         }
     }
 
-    public static long getTotalRamSizeOfDevice(Context context) {
+    public static long  getTotalRamSizeOfDevice(Context context) {
         ActivityManager actManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
         ActivityManager.MemoryInfo memInfo = new ActivityManager.MemoryInfo();
         if (actManager != null) {

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

@@ -2,39 +2,40 @@ package com.gh.common.util
 
 import android.app.Dialog
 import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.view.Gravity
 import android.view.LayoutInflater
+import android.view.View
 import android.view.Window
-import android.widget.TextView
 import com.gh.common.dialog.TrackableDialog
 import com.gh.common.util.DialogUtils.checkDialogContext
+import com.gh.gamecenter.AboutActivity
 import com.gh.gamecenter.R
+import com.gh.gamecenter.databinding.DialogAlertDefaultBinding
 
 object DialogHelper {
 
     /**
-     * Material Design 风格弹窗
+     * 光环常规弹窗
      *
-     * @param context
-     * @param title      标题
-     * @param content    内容
-     * @param positiveText   确认按钮文本
-     * @param negativeText   取消按钮文本
-     * @param positiveClickCallback 确认按钮监听
-     * @param negativeClickCallback 取消按钮监听
-     * @param trackMtaEvent 是否记录出现、关闭弹窗MTA事件
-     * @param mtaEvent MTA 的事件名
-     * @param mtaKey MTA 的事件 Key
+     * extraConfig，可选标题居中、内容居中、是否显示关闭按钮以及是否显示正文辅助文本等
+     *
+     * uiModificationCallback，可用来手动微调样式的回调，可使用 binding 来修改颜色、文字大小等
      */
-    fun showDialog(context: Context,
-                   title: String,
-                   content: CharSequence,
-                   positiveText: String,
-                   negativeText: String,
-                   positiveClickCallback: (() -> Unit)? = null,
-                   negativeClickCallback: (() -> Unit)? = null,
-                   trackMtaEvent: Boolean = false,
-                   mtaEvent: String = "",
-                   mtaKey: String = ""): Dialog {
+    fun showDialog(
+            context: Context,
+            title: String,
+            content: CharSequence,
+            confirmText: String,
+            cancelText: String,
+            confirmClickCallback: (() -> Unit)? = null,
+            cancelClickCallback: (() -> Unit)? = null,
+            extraConfig: Config? = null,
+            uiModificationCallback: ((binding: DialogAlertDefaultBinding) -> Unit)? = null,
+            trackMtaEvent: Boolean = false,
+            mtaEvent: String = "",
+            mtaKey: String = ""): Dialog {
         val solidContext = checkDialogContext(context)
 
         val dialog = if (trackMtaEvent) {
@@ -43,32 +44,58 @@ object DialogHelper {
             Dialog(solidContext, R.style.GhAlertDialog)
         }
 
-        val contentView = LayoutInflater.from(solidContext).inflate(R.layout.dialog_alert, null)
-        val contentTv = contentView.findViewById<TextView>(R.id.dialog_content)
-        val titleTv = contentView.findViewById<TextView>(R.id.dialog_title)
-        val negativeTv = contentView.findViewById<TextView>(R.id.dialog_negative)
-        val positiveTv = contentView.findViewById<TextView>(R.id.dialog_positive)
-        contentTv.text = content
-        titleTv.text = title
-        negativeTv.text = negativeText
-        positiveTv.text = positiveText
+        val binding = DialogAlertDefaultBinding.inflate(LayoutInflater.from(solidContext))
+        val contentView = binding.root
+        binding.contentTv.text = content
+        binding.titleTv.text = title
 
-        negativeTv.setOnClickListener {
-            if (trackMtaEvent) MtaHelper.onEvent(mtaEvent, mtaKey, "点击" + negativeText)
+        extraConfig?.let {
+            if (it.hint.isNotEmpty()) {
+                binding.hintTv.visibility = View.VISIBLE
+                binding.hintTv.text = it.hint
+            }
 
-            negativeClickCallback?.invoke()
+            if (it.centerTitle) {
+                binding.titleTv.gravity = Gravity.CENTER
+            }
+
+            if (it.centerContent) {
+                binding.contentTv.gravity = Gravity.CENTER
+            }
+
+            if (it.showCloseIcon) {
+                binding.closeContainer.visibility = View.VISIBLE
+                binding.closeContainer.setOnClickListener { dialog.dismiss() }
+            }
+        }
+
+        if (cancelText.isEmpty()) {
+            binding.cancelTv.visibility = View.GONE
+            binding.centerDivider.visibility = View.GONE
+        }
+
+        binding.cancelTv.text = cancelText
+        binding.confirmTv.text = confirmText
+
+        binding.cancelTv.setOnClickListener {
+            if (trackMtaEvent) MtaHelper.onEvent(mtaEvent, mtaKey, "点击$cancelText")
+
+            cancelClickCallback?.invoke()
             dialog.dismiss()
         }
 
-        positiveTv.setOnClickListener {
-            if (trackMtaEvent) MtaHelper.onEvent(mtaEvent, mtaKey, "点击$positiveText")
+        binding.confirmTv.setOnClickListener {
+            if (trackMtaEvent) MtaHelper.onEvent(mtaEvent, mtaKey, "点击$confirmText")
 
-            positiveClickCallback?.invoke()
+            confirmClickCallback?.invoke()
             dialog.dismiss()
         }
 
+        uiModificationCallback?.invoke(binding)
+
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
         dialog.setContentView(contentView)
+        dialog.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
         dialog.show()
         return dialog
     }
@@ -77,6 +104,7 @@ object DialogHelper {
      * For legacy java invocation
      */
     @JvmStatic
+    @Deprecated("Kotlin 中请使用其它方法调用")
     fun showDialog(context: Context,
                    title: String,
                    content: CharSequence,
@@ -87,7 +115,87 @@ object DialogHelper {
                    trackMtaEvent: Boolean = false,
                    mtaEvent: String = "",
                    mtaKey: String = ""): Dialog {
-        return showDialog(context, title, content, positiveText, negativeText, { positiveClickCallback.onCallback() }, { negativeClickCallback.onCallback() }, trackMtaEvent, mtaEvent, mtaKey)
+        return showDialog(
+                context = context,
+                title = title,
+                content = content,
+                confirmText = positiveText,
+                cancelText = negativeText,
+                confirmClickCallback = { positiveClickCallback.onCallback() },
+                cancelClickCallback = { negativeClickCallback.onCallback() },
+                trackMtaEvent = trackMtaEvent,
+                mtaEvent = mtaEvent,
+                mtaKey = mtaKey)
     }
 
+    @JvmStatic
+    fun showSignatureConflictDialog(context: Context,
+                                    confirmClickCallback: (() -> Unit)? = null) {
+        showDialog(
+                context,
+                "温馨提示",
+                "检测到安装包与已安装应用的签名不一致，需要卸载后才能安装，是否立即卸载",
+                "卸载",
+                "取消",
+                { confirmClickCallback?.invoke() },
+                null,
+                Config(hint = "注意：卸载会让游戏数据丢失，请提前做好备份"),
+                { binding -> binding.hintTv.setTextColor(R.color.theme_font.toColor()) }
+        )
+    }
+
+    @JvmStatic
+    fun showPluginDialog(context: Context,
+                         confirmClickCallback: (() -> Unit)? = null) {
+        MtaHelper.onEvent("插件化", "插件化安装弹窗", "出现弹窗提示")
+        showDialog(
+                context,
+                "插件化安装",
+                "您将进行插件化安装以实现插件功能，此过程将卸载当前使用的版本并安装插件版本",
+                "确认，开始插件化",
+                "取消",
+                {
+                    confirmClickCallback?.invoke()
+                    MtaHelper.onEvent("插件化", "插件化安装弹窗", "确认并开始")
+                },
+                { MtaHelper.onEvent("插件化", "插件化安装弹窗", "取消") },
+                Config(hint = "注意：卸载前请妥善保存游戏账号与密码"),
+                { binding -> binding.hintTv.setTextColor(R.color.text_FF0000.toColor()) }
+        )
+    }
+
+    @JvmStatic
+    fun showUpgradeDialog(context: Context) {
+        showDialog(
+                context,
+                "提示",
+                "当前版本暂不支持该功能，\n建议您升级到最新版本体验哦",
+                "检查升级",
+                "取消",
+                confirmClickCallback = { context.startActivity(AboutActivity.getIntent(context, true)); },
+                uiModificationCallback = {
+                    it.titleTv.gravity = Gravity.CENTER
+                    it.contentTv.gravity = Gravity.CENTER
+                }
+        )
+    }
+
+
+    @JvmStatic
+    fun showDowngradeHintDialog(context: Context,
+                                confirmClickCallback: (() -> Unit)? = null) {
+        showDialog(
+                context,
+                "温馨提示",
+                "您已安装较高版本，若要安装历史版本需先卸载再安装\n",
+                "我知道了",
+                "",
+                { confirmClickCallback?.invoke() })
+    }
+
+    data class Config(val hint: String = "",
+                      val showCloseIcon: Boolean = false,
+                      val centerTitle: Boolean = false,
+                      val centerContent: Boolean = false)
+
 }

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

@@ -1,5 +1,6 @@
 package com.gh.common.util;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
@@ -14,12 +15,15 @@ import android.os.CountDownTimer;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
 import android.text.Html;
+import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextPaint;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
+import android.text.style.URLSpan;
+import android.text.style.UnderlineSpan;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -33,6 +37,7 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -42,11 +47,15 @@ import androidx.core.content.ContextCompat;
 import androidx.databinding.DataBindingUtil;
 import androidx.recyclerview.widget.RecyclerView;
 
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+
 import com.facebook.drawee.generic.GenericDraweeHierarchy;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.gh.common.AppExecutor;
 import com.gh.common.constant.Config;
 import com.gh.common.dialog.TrackableDialog;
+import com.gh.common.view.CustomLinkMovementMethod;
 import com.gh.common.view.DrawableView;
 import com.gh.common.view.FixLinearLayoutManager;
 import com.gh.common.view.LimitHeightLinearLayout;
@@ -55,7 +64,12 @@ import com.gh.gamecenter.AboutActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.SuggestionActivity;
 import com.gh.gamecenter.adapter.viewholder.PrivacyPolicyItemViewHolder;
+import com.gh.gamecenter.databinding.DialogBindPhoneBinding;
 import com.gh.gamecenter.databinding.DialogOverseaConfirmationBinding;
+import com.gh.gamecenter.databinding.DialogPackageParseErrorBinding;
+import com.gh.gamecenter.databinding.DialogQuickLoginPermissionBinding;
+import com.gh.gamecenter.databinding.DialogReceiveLibaoSuccessBinding;
+import com.gh.gamecenter.databinding.DialogReportReasonBinding;
 import com.gh.gamecenter.databinding.ImprintContentItemBinding;
 import com.gh.gamecenter.databinding.PrivacyItemBinding;
 import com.gh.gamecenter.entity.ApkEntity;
@@ -64,6 +78,7 @@ import com.gh.gamecenter.entity.BadgeEntity;
 import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.entity.PrivacyPolicyEntity;
 import com.gh.gamecenter.entity.SettingsEntity;
+import com.gh.gamecenter.entity.SimpleGameEntity;
 import com.gh.gamecenter.entity.TrackableEntity;
 import com.gh.gamecenter.suggest.SuggestType;
 import com.halo.assistant.HaloApp;
@@ -311,33 +326,6 @@ public class DialogUtils {
         showCancelListenerDialog(context, "取消关注", content, "确定取消", "暂不取消", listener, cancelListener);
     }
 
-    public static void showPluginDialog(Context context, final ConfirmListener listener) {
-        context = checkDialogContext(context);
-
-        MtaHelper.onEvent("插件化", "插件化安装弹窗", "出现弹窗提示");
-
-        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
-
-        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_plugin, null);
-        TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
-        TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
-        negativeTv.setOnClickListener(v -> {
-            dialog.dismiss();
-            MtaHelper.onEvent("插件化", "插件化安装弹窗", "取消");
-        });
-        positiveTv.setOnClickListener(view -> {
-            if (listener != null) {
-                listener.onConfirm();
-            }
-            dialog.dismiss();
-            MtaHelper.onEvent("插件化", "插件化安装弹窗", "确认并开始");
-        });
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(contentView);
-        dialog.show();
-    }
-
     /**
      * ios 风格弹窗
      *
@@ -350,7 +338,7 @@ public class DialogUtils {
      * @param cmListener 确认按钮监听
      */
     public static Dialog showNewAlertDialog(Context context, String title, CharSequence message
-            , String negative, String positive, TrackableEntity trackableEntity, int gravity, final CancelListener clListener, final ConfirmListener cmListener) {
+            , String negative, String positive, TrackableEntity trackableEntity, int gravity, boolean shouldShowCloseBtn, final CancelListener clListener, final ConfirmListener cmListener) {
         context = checkDialogContext(context);
         final Dialog dialog;
         if (trackableEntity != null) {
@@ -373,6 +361,7 @@ public class DialogUtils {
         TextView cancelBtn = contentView.findViewById(R.id.cancel);
         TextView confirmBtn = contentView.findViewById(R.id.confirm);
         View middleLine = contentView.findViewById(R.id.middle_line);
+        View closeIv = contentView.findViewById(R.id.closeIv);
         titleTv.setGravity(gravity);
         contentTv.setGravity(gravity);
 
@@ -389,6 +378,8 @@ public class DialogUtils {
             confirmBtn.setVisibility(View.GONE);
             middleLine.setVisibility(View.GONE);
         }
+        closeIv.setVisibility(shouldShowCloseBtn ? View.VISIBLE : View.GONE);
+        closeIv.setOnClickListener(v -> dialog.dismiss());
 
         cancelBtn.setOnClickListener(v -> {
             if (clListener != null) clListener.onCancel();
@@ -413,7 +404,12 @@ public class DialogUtils {
 
     public static Dialog showNewAlertDialog(Context context, String title, CharSequence message
             , String negative, String positive, final CancelListener clListener, final ConfirmListener cmListener) {
-        return showNewAlertDialog(context, title, message, negative, positive, null, Gravity.LEFT, clListener, cmListener);
+        return showNewAlertDialog(context, title, message, negative, positive, null, Gravity.LEFT, false, clListener, cmListener);
+    }
+
+    public static Dialog showNewAlertDialog(Context context, String title, CharSequence message
+            , String negative, String positive, int gravity, boolean shouldShowCloseBtn, final CancelListener clListener, final ConfirmListener cmListener) {
+        return showNewAlertDialog(context, title, message, negative, positive, null, gravity, shouldShowCloseBtn, clListener, cmListener);
     }
 
     /**
@@ -790,33 +786,6 @@ public class DialogUtils {
         dialog.show();
     }
 
-    public static void showLowVersionDialog(Context context) {
-        final Context activityContext = checkDialogContext(context);
-
-        final Dialog dialog = new Dialog(activityContext, R.style.GhAlertDialog);
-
-        View contentView = LayoutInflater.from(activityContext).inflate(R.layout.dialog_alert, null);
-        TextView contentTv = contentView.findViewById(R.id.dialog_content);
-        TextView titleTv = contentView.findViewById(R.id.dialog_title);
-        TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
-        TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
-
-        contentTv.setText("链接超出范围，请检查升级至最新版本的光环助手");
-        titleTv.setText("提示");
-        negativeTv.setText("关闭");
-        positiveTv.setText("检查升级");
-
-        negativeTv.setOnClickListener(view -> dialog.dismiss());
-
-        positiveTv.setOnClickListener(view -> {
-            activityContext.startActivity(AboutActivity.getIntent(activityContext, true));
-            dialog.dismiss();
-        });
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(contentView);
-        dialog.show();
-    }
 
     public static void showLowSystemVersionDialog(Context context) {
         final Context activityContext = checkDialogContext(context);
@@ -970,7 +939,7 @@ public class DialogUtils {
 
     public static void showPrivacyPolicyDialog(Context context,
                                                @NonNull PrivacyPolicyEntity entity,
-                                               EmptyCallback callback) {
+                                               SimpleCallback<Boolean> callback) {
 
         final Context activityContext = checkDialogContext(context);
 
@@ -1086,19 +1055,31 @@ public class DialogUtils {
 
         title.setText(entity.getTitle());
         linkContent.setText(skipText);
-        linkContent.setMovementMethod(new LinkMovementMethod());
+        linkContent.setMovementMethod(LinkMovementMethod.getInstance());
         topContent.setText(entity.getTopContent());
-        bottomContent.setText(entity.getBottomContent());
+        bottomContent.setText(ExtensionsKt.fromHtml(entity.getBottomContent()));
+        bottomContent.setMovementMethod(CustomLinkMovementMethod.getInstance());
+
+        // Remove underline
+        Spannable sa = (Spannable) bottomContent.getText();
+        for (URLSpan u : sa.getSpans(0, sa.length(), URLSpan.class)) {
+            sa.setSpan(new UnderlineSpan() {
+                public void updateDrawState(TextPaint tp) {
+                    tp.setUnderlineText(false);
+                }
+            }, sa.getSpanStart(u), sa.getSpanEnd(u), 0);
+        }
 
         allowButton.setOnClickListener(view -> {
             dialog.dismiss();
-            callback.onCallback();
+            callback.onCallback(true);
 //            MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击同意");
         });
 
         disallowButton.setOnClickListener(v -> {
             dialog.dismiss();
-            showPrivacyPolicyDisallowDialog(activityContext, entity, callback);
+            callback.onCallback(false);
+//            showPrivacyPolicyDisallowDialog(activityContext, entity, callback);
 //            MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "不同意并退出App");
         });
 
@@ -1902,6 +1883,305 @@ public class DialogUtils {
         dialog.show();
     }
 
+    public static Dialog showCancelOrDeleteReservationDialog(Context context, String title, String message
+            , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) {
+        context = checkDialogContext(context);
+
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
+
+        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_cancel_reservation, null);
+        TextView contentTv = contentView.findViewById(R.id.dialog_content);
+        TextView titleTv = contentView.findViewById(R.id.dialog_title);
+        TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
+        TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
+        contentTv.setText(message);
+        titleTv.setText(title);
+        negativeTv.setText(negative);
+        positiveTv.setText(positive);
+
+        negativeTv.setOnClickListener(view -> {
+            if (clListener != null) {
+                clListener.onCancel();
+            }
+            dialog.dismiss();
+        });
+
+        positiveTv.setOnClickListener(view -> {
+            if (cmListener != null) {
+                cmListener.onConfirm();
+            }
+            dialog.dismiss();
+        });
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(contentView);
+        dialog.show();
+        Window window = dialog.getWindow();
+        if (window != null) {
+            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+            WindowManager.LayoutParams params = window.getAttributes();
+            params.width = context.getResources().getDisplayMetrics().widthPixels - DisplayUtils.dip2px(60f);
+            window.setAttributes(params);
+        }
+        return dialog;
+    }
+
+    public static void showEnergyDialog(Context context, String userName, int 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 showEnergyTaskNoticeDialog(Context context, String title, String content) {
+        context = checkDialogContext(context);
+
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
+
+        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_notice, null);
+        TextView titleTv = contentView.findViewById(R.id.dialog_title);
+        TextView contentTv = contentView.findViewById(R.id.dialog_content);
+        TextView okTv = contentView.findViewById(R.id.dialog_ok);
+
+        if (title == null) {
+            titleTv.setVisibility(View.GONE);
+        } else {
+            titleTv.setVisibility(View.VISIBLE);
+            titleTv.setText(title);
+        }
+        contentTv.setText(content);
+
+        okTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font));
+        okTv.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);
+
+        DialogPackageParseErrorBinding binding = DialogPackageParseErrorBinding.inflate(LayoutInflater.from(context), null, false);
+        Context finalContext = context;
+        SpannableStringBuilder builder = new SpanBuilder("您也可以点击提交反馈跟我们联系").click(6, 10, R.color.theme_font, true, new Function0<Unit>() {
+            @Override
+            public Unit invoke() {
+                SimpleGameEntity entity = new SimpleGameEntity(gameId, gameName, "");
+                SuggestionActivity.startSuggestionActivity(finalContext, SuggestType.gameQuestion, "notfound", "模拟器安装包解析错误", entity, "-");
+                dialog.dismiss();
+                return null;
+            }
+        }).build();
+        binding.feedbackTv.setText(builder);
+        binding.feedbackTv.setMovementMethod(new LinkMovementMethod());
+
+        binding.cancel.setOnClickListener(v -> {
+            dialog.dismiss();
+        });
+        binding.confirm.setOnClickListener(v -> {
+            confirmListener.onConfirm();
+            dialog.dismiss();
+        });
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(binding.getRoot());
+        dialog.show();
+        Window window = dialog.getWindow();
+        if (window != null) {
+            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+            WindowManager.LayoutParams params = window.getAttributes();
+            params.width = context.getResources().getDisplayMetrics().widthPixels - DisplayUtils.dip2px(60f);
+            window.setAttributes(params);
+        }
+    }
+
+    @SuppressLint("SetTextI18n")
+    public static void showReportReasonDialog(Context context, ReportReasonCallBack callBack) {
+        context = checkDialogContext(context);
+
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
+        DialogReportReasonBinding binding = DialogReportReasonBinding.inflate(LayoutInflater.from(context));
+
+        binding.reasonOne.setOnClickListener(v -> {
+            dialog.dismiss();
+            callBack.onResponse(binding.reasonOne.getText().toString(), "");
+        });
+
+        binding.reasonTwo.setOnClickListener(v -> {
+            dialog.dismiss();
+            callBack.onResponse(binding.reasonTwo.getText().toString(), "");
+        });
+
+        binding.reasonThree.setOnClickListener(v -> {
+            dialog.dismiss();
+            callBack.onResponse(binding.reasonThree.getText().toString(), "");
+        });
+
+        binding.reasonFour.setOnClickListener(v -> {
+            dialog.dismiss();
+            callBack.onResponse(binding.reasonFour.getText().toString(), "");
+        });
+
+        binding.reasonOther.setOnClickListener(v -> {
+            binding.reasonTitle.setText(R.string.report_reason_other_title);
+            binding.normalReasonContainer.setVisibility(View.GONE);
+            binding.otherReasonContainer.setVisibility(View.VISIBLE);
+        });
+
+        binding.negativeBtn.setOnClickListener(v -> {
+            binding.reasonTitle.setText(R.string.report_reason_title);
+            binding.normalReasonContainer.setVisibility(View.VISIBLE);
+            binding.otherReasonContainer.setVisibility(View.GONE);
+        });
+
+        binding.positiveBtn.setOnClickListener(v -> {
+            if (TextUtils.isEmpty(binding.otherReasonEt.getText().toString().trim())) {
+                ToastUtils.INSTANCE.showToast("请填写举报原因");
+            } else {
+                dialog.dismiss();
+                callBack.onResponse("其它", binding.otherReasonEt.getText().toString());
+            }
+        });
+
+        Context finalContext = context;
+        ExtensionsKt.setTextChangedListener(binding.otherReasonEt, (s, start, before, count) -> {
+            int tvCount = s.length();
+            if (tvCount >= 500) {
+                binding.tvCount.setTextColor(ContextCompat.getColor(finalContext, R.color.text_FF4147));
+            }
+            binding.tvCount.setText(tvCount + "/500");
+            return null;
+        });
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(binding.getRoot());
+        dialog.show();
+    }
+
+    public static void showSignSuccessDialog(Context context, ConfirmListener listener) {
+        context = checkDialogContext(context);
+
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
+
+        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_sign_success, null);
+
+        ImageView signBg = contentView.findViewById(R.id.signBg);
+        RelativeLayout signContainer = contentView.findViewById(R.id.signContainer);
+
+        Animation animation1 = AnimationUtils.loadAnimation(context, R.anim.anim_badge_light_bg);
+        signBg.startAnimation(animation1);
+
+        Animation animation2 = AnimationUtils.loadAnimation(context, R.anim.anim_sign_dialog_dismiss);
+        signContainer.postDelayed(() -> signContainer.startAnimation(animation2), 2000);
+
+        signContainer.postDelayed(dialog::dismiss, 3000);
+
+        dialog.setOnDismissListener(dialogInterface -> listener.onConfirm());
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(contentView);
+        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 void showBindPhoneDialog(Context context, ConfirmListener listener) {
+        context = checkDialogContext(context);
+
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
+        DialogBindPhoneBinding binding = DialogBindPhoneBinding.inflate(LayoutInflater.from(context));
+
+        binding.positiveTv.setOnClickListener(v -> {
+            dialog.dismiss();
+            listener.onConfirm();
+        });
+
+        binding.closeIv.setOnClickListener(v -> {
+            dialog.dismiss();
+        });
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(binding.getRoot());
+        dialog.show();
+    }
+
+    public static void showReceiveLibaoSuccessDialog(Context context, String title, String des, String libaoCode, ConfirmListener listener) {
+        context = checkDialogContext(context);
+
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
+        DialogReceiveLibaoSuccessBinding binding = DialogReceiveLibaoSuccessBinding.inflate(LayoutInflater.from(context));
+        binding.title.setText(title);
+        binding.libaoCodeTv.setText(libaoCode);
+        binding.desTv.setText(des);
+
+        binding.confirm.setOnClickListener(v -> {
+            dialog.dismiss();
+            listener.onConfirm();
+        });
+
+        binding.cancel.setOnClickListener(v -> {
+            dialog.dismiss();
+        });
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(binding.getRoot());
+        dialog.show();
+        Window window = dialog.getWindow();
+        if (window != null) {
+            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+            WindowManager.LayoutParams params = window.getAttributes();
+            params.width = context.getResources().getDisplayMetrics().widthPixels - DisplayUtils.dip2px(60f);
+            window.setAttributes(params);
+        }
+    }
+
+    public static void showQuickLoginPermissionDialog(Context context, ConfirmListener confirmListener, CancelListener cancelListener) {
+        context = checkDialogContext(context);
+
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
+        DialogQuickLoginPermissionBinding binding = DialogQuickLoginPermissionBinding.inflate(LayoutInflater.from(context));
+
+        binding.confirmBtn.setOnClickListener(v -> {
+            dialog.dismiss();
+            confirmListener.onConfirm();
+        });
+
+        binding.cancelBtn.setOnClickListener(v -> {
+            dialog.dismiss();
+            cancelListener.onCancel();
+        });
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(binding.getRoot());
+        dialog.show();
+    }
+
     /**
      * @param context may be is application context
      * @return activity context
@@ -1935,4 +2215,7 @@ public class DialogUtils {
         void onResponse(boolean isSubscribe);
     }
 
+    public interface ReportReasonCallBack {
+        void onResponse(String reason, String desc);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.gh.common.util
 
+import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -24,6 +25,7 @@ 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.download.DownloadFragment.Companion.INDEX_UPDATE
 import com.gh.gamecenter.entity.*
 import com.gh.gamecenter.eventbus.EBReuse
@@ -39,6 +41,8 @@ import com.gh.gamecenter.gamedetail.rating.RatingReplyActivity
 import com.gh.gamecenter.manager.UserManager
 import com.gh.gamecenter.mygame.PlayedGameActivity
 import com.gh.gamecenter.personalhome.UserHomeActivity
+import com.gh.gamecenter.personalhome.background.PersonalityBackgroundActivity
+import com.gh.gamecenter.personalhome.border.AvatarBorderActivity
 import com.gh.gamecenter.qa.CommunityFragment
 import com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity
 import com.gh.gamecenter.qa.article.SimpleArticleListActivity
@@ -48,10 +52,13 @@ import com.gh.gamecenter.qa.questions.detail.QuestionsDetailActivity
 import com.gh.gamecenter.qa.subject.CommunitySubjectActivity
 import com.gh.gamecenter.retrofit.Response
 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.subject.SubjectActivity
 import com.gh.gamecenter.suggest.SuggestType
 import com.gh.gamecenter.tag.TagsActivity
+import com.gh.gamecenter.user.UserViewModel
 import com.gh.gamecenter.video.data.VideoDataActivity
 import com.gh.gamecenter.video.detail.VideoDetailActivity
 import com.gh.gamecenter.video.detail.VideoDetailContainerViewModel
@@ -204,6 +211,8 @@ object DirectUtils {
 
             "catalog" -> directCatalog(context, linkEntity.link!!, linkEntity.text!!, entrance, path)
 
+            "category_v2" -> directCategoryV2(context, linkEntity.link!!, linkEntity.text!!, entrance, path)
+
             "block", "版块" -> {
                 if (linkEntity.link.isNullOrEmpty()) return
                 directToBlock(context,
@@ -233,7 +242,7 @@ object DirectUtils {
 
             "libao", "礼包" -> directToGiftDetail(context, linkEntity.link ?: "", entrance)
 
-            "feedback" -> directToFeedback(context, linkEntity.name, linkEntity.text, entrance)
+            "feedback" -> directToFeedback(context, linkEntity.name, linkEntity.text, false, entrance)
 
             "qa", "Q&A" -> directToQa(context, linkEntity.text ?: "", linkEntity.link ?: "")
 
@@ -249,6 +258,71 @@ object DirectUtils {
 
             "bbs_detail" -> directForumDetail(context, linkEntity.link ?: "", entrance)
 
+            "mobile_bind" -> {
+                CheckLoginUtils.checkLogin(context, entrance) {
+                    context.startActivity(BindPhoneActivity.getNormalIntent(context, false))
+                }
+            }
+
+            "authentication" -> {
+                CheckLoginUtils.checkLogin(context, entrance) {
+                    context.startActivity(UserInfoEditActivity.getIntent(context, UserViewModel.TYPE_ID_CARD))
+                }
+            }
+
+            "user_background" -> {
+                CheckLoginUtils.checkLogin(context, entrance) {
+                    context.startActivity(PersonalityBackgroundActivity.getIntent(context))
+                }
+            }
+
+            "avatar_frame" -> {
+                CheckLoginUtils.checkLogin(context, entrance) {
+                    context.startActivity(AvatarBorderActivity.getIntent(context))
+                }
+            }
+
+            "badge" -> {
+                CheckLoginUtils.checkLogin(context, entrance) {
+                    UserManager.getInstance().userInfoEntity?.run {
+                        directToBadgeWall(context, userId, name, icon)
+                    }
+                }
+            }
+
+            "etiquette_exam" -> directToRegulationTestPage(context)
+
+            "setting" -> context.startActivity(SettingActivity.getIntent(context, false, entrance))
+
+            "index_page" -> directToHomeTab(context)
+
+            "video_upload" -> context.startActivity(VideoManagerActivity.getIntent(context, "", entrance))
+
+            "bbs" -> directToForum(context)
+
+            "user_page" -> directToHomeActivity(context, UserManager.getInstance().userId, "", entrance)
+
+            "video_tab" -> directToVideoTab(context)
+
+            "toolkit" -> context.startActivity(ToolBoxActivity.getIntent(context, entrance))
+
+            "column_test" -> context.startActivity(GameServerTestActivity.getIntent(context, linkEntity.link
+                    ?: "", linkEntity.text ?: "", entrance))
+
+            "toolkit_detail" -> {
+                linkEntity.toolkit?.run {
+                    if (url != null && url!!.contains(Config.URL_ARTICLE)) {
+                        val newsId = url!!.substring(url!!.lastIndexOf("/") + 1, url!!.length - 5) // 5: ".html"
+                        val intent = NewsDetailActivity.getIntentById(context, newsId, entrance)
+                        context.startActivity(intent)
+                    } else {
+                        context.startActivity(WebActivity.getWebByCollectionTools(context, this, false))
+                    }
+                } ?: ""
+            }
+
+            "halo_tab" -> directToPersonalTab(context)
+
             //"h5_game_center" -> directLetoGameCenter(context)
 
             "" -> {
@@ -258,7 +332,7 @@ object DirectUtils {
                 if (unknownCallback != null) {
                     unknownCallback.invoke()
                 } else {
-                    DialogUtils.showLowVersionDialog(context)
+                    DialogHelper.showUpgradeDialog(context)
                 }
             }
         }
@@ -357,6 +431,20 @@ object DirectUtils {
         jumpActivity(context, bundle)
     }
 
+    /**
+     * 跳转到新闻详情
+     */
+    @JvmStatic
+    fun directToArticle(context: Context, id: String, hideUselessInfo: Boolean, entrance: String? = null) {
+        if (id.isEmpty()) return
+        val bundle = Bundle()
+        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+        bundle.putString(KEY_TO, NewsDetailActivity::class.java.simpleName)
+        bundle.putString(KEY_NEWSID, id)
+        bundle.putBoolean(KEY_HIDE_USELESS_INFO, hideUselessInfo)
+        jumpActivity(context, bundle)
+    }
+
     /**
      * 跳转至个人主页
      */
@@ -371,6 +459,7 @@ object DirectUtils {
      */
     @JvmStatic
     fun directToHomeActivity(context: Context, userId: String?, position: Int, entrance: String? = null, path: String? = null) {
+        IntegralLogHelper.log("view_homepage", "个人主页")
         val bundle = Bundle()
         bundle.putString(KEY_USER_ID, userId)
         bundle.putString(KEY_TO, UserHomeActivity::class.java.name)
@@ -472,21 +561,27 @@ object DirectUtils {
     // 反馈
     @JvmStatic
     fun directToFeedback(context: Context, content: String? = null, entrance: String? = null) {
-        directToFeedback(context, content, null, entrance)
+        directToFeedback(context, content, null, false, entrance)
     }
 
     @JvmStatic
-    fun directToFeedback(context: Context, content: String? = null, hintType: String? = null, entrance: String? = null) {
+    fun directToFeedback(context: Context, content: String? = null, hintType: String? = null, isQaFeedback: Boolean = false, entrance: String? = null) {
         val bundle = Bundle()
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_TO, SuggestionActivity::class.java.simpleName)
-        bundle.putString(KEY_CONTENT, content)
-        if (TextUtils.isEmpty(hintType)) {
-            bundle.putString(KEY_SUGGEST_HINT_TYPE, KEY_PLUGIN)
+        if (isQaFeedback) {
+            bundle.putBoolean(KEY_IS_QA_FEEDBACK, true)
+            bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.normal)
         } else {
-            bundle.putString(KEY_SUGGEST_HINT_TYPE, hintType)
+            bundle.putString(KEY_CONTENT, content)
+            bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.gameQuestion)
+            if (TextUtils.isEmpty(hintType)) {
+                bundle.putString(KEY_SUGGEST_HINT_TYPE, KEY_PLUGIN)
+            } else {
+                bundle.putString(KEY_SUGGEST_HINT_TYPE, hintType)
+            }
         }
-        bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.gameQuestion)
+
         jumpActivity(context, bundle)
     }
 
@@ -578,12 +673,17 @@ object DirectUtils {
 
     @JvmStatic
     fun directToExternalBrowser(context: Context, url: String) {
-        if (url.isEmpty()) return
-        val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(Uri.decode(url)))
-        if (context !is AppCompatActivity) {
-            browserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        try {
+            if (url.isEmpty()) return
+            val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(Uri.decode(url)))
+            if (context !is AppCompatActivity) {
+                browserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            }
+            context.startActivity(browserIntent)
+        } catch (e: ActivityNotFoundException) {
+            e.printStackTrace()
+            Utils.toast(context, "跳转地址无效")
         }
-        context.startActivity(browserIntent)
     }
 
     // 跳转 QQ，qqNumber 为空选择默认客服 QQ
@@ -906,6 +1006,20 @@ object DirectUtils {
         jumpActivity(context, bundle)
     }
 
+    /**
+     * 跳转新分类2.0
+     */
+    @JvmStatic
+    fun directCategoryV2(context: Context, categoryId: String, categoryTitle: String, entrance: String? = null, path: String? = "") {
+        if (categoryId.isEmpty()) return
+        val bundle = Bundle()
+        bundle.putString(KEY_TO, CategoryV2Activity::class.java.name)
+        bundle.putString(KEY_CATEGORY_ID, categoryId)
+        bundle.putString(KEY_CATEGORY_TITLE, categoryTitle)
+        bundle.putString(KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path))
+        jumpActivity(context, bundle)
+    }
+
     /**
      * 跳转到问题标签详情
      */
@@ -1030,7 +1144,28 @@ object DirectUtils {
     }
 
     /**
-     * 到首页论坛 tab
+     * 到首页-首页 tab
+     */
+    @JvmStatic
+    fun directToHomeTab(context: Context) {
+        if (RunningUtils.isRunning(context)
+                && MainActivity::class.java.name == RunningUtils.getBaseActivity(context)) {
+            val intent = Intent(context, MainActivity::class.java)
+            intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+            context.startActivity(intent)
+
+            // 这里换个线程操作是为了做一点延时
+            AppExecutor.ioExecutor.execute {
+                EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_HOME))
+            }
+        } else {
+            jumpActivity(context, Bundle().apply { putInt(KEY_POSITION, MainWrapperFragment.INDEX_HOME) })
+        }
+    }
+
+
+    /**
+     * 到首页-论坛 tab
      */
     @JvmStatic
     fun directToForum(context: Context) {
@@ -1049,6 +1184,46 @@ object DirectUtils {
         }
     }
 
+    /**
+     * 到首页-视频 tab
+     */
+    @JvmStatic
+    fun directToVideoTab(context: Context) {
+        if (RunningUtils.isRunning(context)
+                && MainActivity::class.java.name == RunningUtils.getBaseActivity(context)) {
+            val intent = Intent(context, MainActivity::class.java)
+            intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+            context.startActivity(intent)
+
+            // 这里换个线程操作是为了做一点延时
+            AppExecutor.ioExecutor.execute {
+                EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_VIDEO))
+            }
+        } else {
+            jumpActivity(context, Bundle().apply { putInt(KEY_POSITION, MainWrapperFragment.INDEX_VIDEO) })
+        }
+    }
+
+    /**
+     * 到首页-我的光环 tab
+     */
+    @JvmStatic
+    fun directToPersonalTab(context: Context) {
+        if (RunningUtils.isRunning(context)
+                && MainActivity::class.java.name == RunningUtils.getBaseActivity(context)) {
+            val intent = Intent(context, MainActivity::class.java)
+            intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+            context.startActivity(intent)
+
+            // 这里换个线程操作是为了做一点延时
+            AppExecutor.ioExecutor.execute {
+                EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_PERSONAL))
+            }
+        } else {
+            jumpActivity(context, Bundle().apply { putInt(KEY_POSITION, MainWrapperFragment.INDEX_PERSONAL) })
+        }
+    }
+
     /**
      * 跳转至使用帮助与反馈
      * @param position 使用帮助：[HelpAndFeedbackActivity.HELP_ITEM],意见反馈：[HelpAndFeedbackActivity.SUGGESTION_ITEM]
@@ -1060,4 +1235,230 @@ object DirectUtils {
         bundle.putInt(BaseActivity_TabLayout.PAGE_INDEX, position)
         jumpActivity(context, bundle)
     }
+
+    /**
+     * 跳转至商品详情
+     */
+    @JvmStatic
+    fun directToCommodityDetail(context: Context, commodityId: String) {
+        var url: String = if ("internal" == BuildConfig.FLAVOR) {
+            Constants.COMMODITY_DETAIL_ADDRESS_DEV
+        } else {
+            Constants.COMMODITY_DETAIL_ADDRESS
+        }
+
+        url = String.format(Locale.CHINA, "%s&shopid=%s&timestamp=%d", url, commodityId, (Date().time / 1000 / 1000.toFloat()).roundToInt())
+        directToFullScreenWebPage(context, url, true)
+    }
+
+    /**
+     * 跳转至光能记录（默认跳到光能记录第一个Tab）
+     */
+    @JvmStatic
+    fun directToEnergyRecord(context: Context) {
+        directToEnergyRecord(context, 0)
+    }
+
+    @JvmStatic
+    fun directToEnergyRecord(context: Context, position: Int) {
+        var url: String = if ("internal" == BuildConfig.FLAVOR) {
+            Constants.ENERGY_RECORD_ADDRESS_DEV
+        } else {
+            Constants.ENERGY_RECORD_ADDRESS
+        }
+
+        url = String.format(Locale.CHINA, "%s&position=%s&timestamp=%d", url, position, (Date().time / 1000 / 1000.toFloat()).roundToInt())
+        directToFullScreenWebPage(context, url, true)
+    }
+
+    /**
+     * 跳转至订单中心
+     */
+    @JvmStatic
+    fun directToOrderCenter(context: Context) {
+        var url: String = if ("internal" == BuildConfig.FLAVOR) {
+            Constants.ORDER_CENTER_ADDRESS_DEV
+        } else {
+            Constants.ORDER_CENTER_ADDRESS
+        }
+        directToFullScreenWebPage(context, url, true)
+    }
+
+    /**
+     * 跳转至订单详情
+     */
+    @JvmStatic
+    fun directToOrderDetail(context: Context, orderId: String) {
+        var url: String = if ("internal" == BuildConfig.FLAVOR) {
+            Constants.ORDER_DETAIL_ADDRESS_DEV
+        } else {
+            Constants.ORDER_DETAIL_ADDRESS
+        }
+
+        url = String.format(Locale.CHINA, "%s&order_id=%s&timestamp=%d", url, orderId, (Date().time / 1000 / 1000.toFloat()).roundToInt())
+        directToFullScreenWebPage(context, url, true)
+    }
+
+    /**
+     * 跳转至邀请好友
+     */
+    @JvmStatic
+    fun directToInviteFriends(context: Context) {
+        var url: String = if ("internal" == BuildConfig.FLAVOR) {
+            Constants.INVITE_FRIENDS_ADDRESS_DEV
+        } else {
+            Constants.INVITE_FRIENDS_ADDRESS
+        }
+        directToFullScreenWebPage(context, url, true)
+    }
+
+    /**
+     * 跳转至等级页面
+     */
+    @JvmStatic
+    fun directToLevelPage(context: Context) {
+        var url: String = if (isPublishEnv()) {
+            Constants.LEVEL_ADDRESS
+        } else {
+            Constants.LEVEL_ADDRESS_DEV
+        }
+
+        url = String.format(Locale.CHINA, "%s?timestamp=%d", url, (Date().time / 1000 / 1000.toFloat()).roundToInt())
+        directToFullScreenWebPage(context, url, true)
+    }
+
+    /**
+     * 跳转至兑换规则
+     */
+    @JvmStatic
+    fun directToExchangeRulePage(context: Context) {
+        var url: String = if (isPublishEnv()) {
+            Constants.EXCHANGE_RULE_ADDRESS
+        } else {
+            Constants.EXCHANGE_RULE_ADDRESS_DEV
+        }
+
+        url = String.format(Locale.CHINA, "%s&timestamp=%d", url, (Date().time / 1000 / 1000.toFloat()).roundToInt())
+        directToFullScreenWebPage(context, url, true)
+    }
+
+    /**
+     * 跳转至光能规则
+     */
+    @JvmStatic
+    fun directToEnergyRulePage(context: Context) {
+        var url: String = if (isPublishEnv()) {
+            Constants.ENERGY_RULE_ADDRESS
+        } else {
+            Constants.ENERGY_RULE_ADDRESS_DEV
+        }
+
+        url = String.format(Locale.CHINA, "%s&timestamp=%d", url, (Date().time / 1000 / 1000.toFloat()).roundToInt())
+        directToFullScreenWebPage(context, url, true)
+    }
+
+    /**
+     * 跳转至兑换商品
+     */
+    @JvmStatic
+    fun directToExchangeCommodityPage(context: Context) {
+        var url: String = if (isPublishEnv()) {
+            Constants.EXCHANGE_COMMODITY_ADDRESS
+        } else {
+            Constants.EXCHANGE_COMMODITY_ADDRESS_DEV
+        }
+
+        url = String.format(Locale.CHINA, "%s&timestamp=%d", url, (Date().time / 1000 / 1000.toFloat()).roundToInt())
+        directToFullScreenWebPage(context, url, true)
+    }
+
+    /**
+     * 跳转至抽奖乐园
+     */
+    @JvmStatic
+    fun directToLotteryParadisePage(context: Context) {
+        var url: String = if (isPublishEnv()) {
+            Constants.LOTTERY_PARADISE_ADDRESS
+        } else {
+            Constants.LOTTERY_PARADISE_ADDRESS_DEV
+        }
+
+        url = String.format(Locale.CHINA, "%s&timestamp=%d", url, (Date().time / 1000 / 1000.toFloat()).roundToInt())
+        directToFullScreenWebPage(context, url, true)
+    }
+
+    /**
+     * 跳转至我的奖品
+     */
+    @JvmStatic
+    fun directToMyPrizePage(context: Context) {
+        var url: String = if (isPublishEnv()) {
+            Constants.MY_PRIZE_ADDRESS
+        } else {
+            Constants.MY_PRIZE_ADDRESS_DEV
+        }
+
+        url = String.format(Locale.CHINA, "%s&timestamp=%d", url, (Date().time / 1000 / 1000.toFloat()).roundToInt())
+        directToFullScreenWebPage(context, url, true)
+    }
+
+    /**
+     * 跳转至中奖订单详情
+     */
+    @JvmStatic
+    fun directToWinOrderDetail(context: Context, orderId: String, activityId: String) {
+        var url: String = if (isPublishEnv()) {
+            Constants.WIN_ORDER_DETAIL_ADDRESS
+        } else {
+            Constants.WIN_ORDER_DETAIL_ADDRESS_DEV
+        }
+
+        url = String.format(Locale.CHINA, "%s&order_id=%s&activity_id=%s&timestamp=%d", url, orderId, activityId, (Date().time / 1000 / 1000.toFloat()).roundToInt())
+        directToFullScreenWebPage(context, url, true)
+    }
+
+    /**
+     * 跳转至地址信息
+     */
+    @JvmStatic
+    fun directToAddressInfo(context: Context) {
+        var url: String = if (isPublishEnv()) {
+            Constants.ADDRESS_INFO_ADDRESS
+        } else {
+            Constants.ADDRESS_INFO_ADDRESS_DEV
+        }
+
+        url = String.format(Locale.CHINA, "%s&timestamp=%d", url, (Date().time / 1000 / 1000.toFloat()).roundToInt())
+        directToFullScreenWebPage(context, url, true)
+    }
+
+    /**
+     * 跳转至领奖信息
+     */
+    @JvmStatic
+    fun directToPrizeInfo(context: Context) {
+        var url: String = if (isPublishEnv()) {
+            Constants.PRIZE_INFO_ADDRESS
+        } else {
+            Constants.PRIZE_INFO_ADDRESS_DEV
+        }
+
+        url = String.format(Locale.CHINA, "%s&timestamp=%d", url, (Date().time / 1000 / 1000.toFloat()).roundToInt())
+        directToFullScreenWebPage(context, url, true)
+    }
+
+    /**
+     * 跳转至提现信息
+     */
+    @JvmStatic
+    fun directToWithdrawInfo(context: Context) {
+        var url: String = if (isPublishEnv()) {
+            Constants.WITHDRAW_INFO_ADDRESS
+        } else {
+            Constants.WITHDRAW_INFO_ADDRESS_DEV
+        }
+
+        url = String.format(Locale.CHINA, "%s&timestamp=%d", url, (Date().time / 1000 / 1000.toFloat()).roundToInt())
+        directToFullScreenWebPage(context, url, true)
+    }
 }

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

@@ -21,67 +21,74 @@ object DownloadDialogHelper {
     }
 
     private fun retrieveAvailableDialog(gameEntity: GameEntity, apkEntity: ApkEntity): GameEntity.Dialog? {
-        if (gameEntity.downloadDialog.isNullOrEmpty()) return null
+        val downloadDialog = if (gameEntity.shouldUseMirrorInfo()) {
+            gameEntity.mirrorData?.downloadDialog
+        } else {
+            gameEntity.downloadDialog
+        }
 
-        for (dialog in gameEntity.downloadDialog!!) {
+        if (downloadDialog.isNullOrEmpty()) return null
+        for (dialog in downloadDialog) {
+            val versionName = PackageUtils.getVersionName()
+            val noticeVersions = dialog.rule.noticeVersions
+            if (noticeVersions.isEmpty() || noticeVersions.contains(versionName)) {
+                // 共有 8 种可能
+                // 1. 不指定包名、机型和系统版本
+                if (dialog.rule.packageName.isEmpty()
+                        && dialog.rule.models.isEmpty()
+                        && dialog.rule.systemVersions.isEmpty()) {
+                    return dialog
+                }
 
-            // 共有 8 种可能
-            // 1. 不指定包名、机型和系统版本
-            if (dialog.rule.packageName.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()) {
+                    return dialog
+                }
 
-            // 2. 指定包名不管机型和系统
-            if (dialog.rule.packageName == apkEntity.packageName
-                    && 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()) {
+                    return dialog
+                }
 
-            // 3. 指定机型不管包名和系统
-            if (dialog.rule.models.contains(Build.MODEL)
-                    && 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()) {
+                    return dialog
+                }
 
-            // 4. 指定系统不管包名和机型
-            if (dialog.rule.systemVersions.contains(Build.VERSION.RELEASE)
-                    && 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()) {
+                    return dialog
+                }
 
-            // 5. 指定包名和机型不管系统
-            if (dialog.rule.packageName == apkEntity.packageName
-                    && 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()) {
+                    return dialog
+                }
 
-            // 6. 指定包名和系统不管机型
-            if (dialog.rule.packageName == apkEntity.packageName
-                    && 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()) {
-                return dialog
-            }
-
-            // 8.指定包名、机型和系统版本
-            if (dialog.rule.packageName == apkEntity.packageName
-                    && dialog.rule.models.contains(Build.MODEL)
-                    && dialog.rule.systemVersions.contains(Build.VERSION.RELEASE)) {
-                return dialog
-            }
+                // 7. 指定机型和系统不管包名
+                if (dialog.rule.systemVersions.contains(Build.VERSION.RELEASE)
+                        && 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)) {
+                    return dialog
+                }
+            } else return null
         }
 
         return null

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

@@ -28,6 +28,7 @@ import com.gh.common.xapk.XapkInstaller;
 import com.gh.common.xapk.XapkUnzipStatus;
 import com.gh.download.DownloadManager;
 import com.gh.download.dialog.DownloadDialog;
+import com.gh.download.server.BrowserInstallHelper;
 import com.gh.gamecenter.DownloadManagerActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.WebActivity;
@@ -36,6 +37,7 @@ import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.entity.LinkEntity;
 import com.gh.gamecenter.entity.PluginLocation;
+import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment;
 import com.gh.gamecenter.manager.PackagesManager;
 import com.lightgame.download.DownloadConfig;
 import com.lightgame.download.DownloadEntity;
@@ -125,16 +127,18 @@ public class DownloadItemUtils {
     public static void updateItemWithReserveStatus(GameViewHolder holder, GameEntity gameEntity) {
         if ("download".equals(gameEntity.getReserveStatus())) {
             // 已上线
-            holder.gameDownloadBtn.setVisibility(View.VISIBLE);
-            holder.gameDownloadBtn.setText("已上线");
-            holder.gameDownloadBtn.setTextColor(Color.WHITE);
-            holder.gameDownloadBtn.setBackground(ContextCompat.getDrawable(holder.gameDes.getContext(), R.drawable.game_item_btn_pause_dn));
+//            holder.gameDownloadBtn.setVisibility(View.VISIBLE);
+//            holder.gameDownloadBtn.setText("已上线");
+//            holder.gameDownloadBtn.setTextColor(Color.WHITE);
+//            holder.gameDownloadBtn.setBackground(ContextCompat.getDrawable(holder.gameDes.getContext(), R.drawable.game_item_btn_pause_dn));
+            updateItem(holder.gameDes.getContext(), gameEntity, holder, false);
         } else if ("appointment".equals(gameEntity.getReserveStatus())) {
             // 已预约
             holder.gameDownloadBtn.setVisibility(View.VISIBLE);
             holder.gameDownloadBtn.setText("已预约");
-            holder.gameDownloadBtn.setTextColor(Color.WHITE);
-            holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_pause_dn);
+            holder.gameDownloadBtn.setTextColor(ContextCompat.getColor(holder.gameDes.getContext(), R.color.aaaaaa));
+            holder.gameDownloadBtn.setBackgroundResource(R.drawable.button_round_f5f5f5);
+            updateItemViewStatus(holder, false, null);
         }
     }
 
@@ -544,15 +548,19 @@ public class DownloadItemUtils {
                 if (clickCallback != null) {
                     clickCallback.onCallback();
                 }
-                PermissionHelper.checkStoragePermissionBeforeAction(context, () -> {
-                    CertificationDialog.showCertificationDialog(context, gameEntity, () -> {
-                        DialogUtils.showVersionNumberDialog(context, gameEntity, () -> {
-                            DownloadDialog.showDownloadDialog(
-                                    v.getContext(),
-                                    gameEntity,
-                                    traceEvent,
-                                    entrance,
-                                    location);
+                RealNameHelper.checkIfAuth(v.getContext(), gameEntity, () -> {
+                    GamePermissionDialogFragment.show((AppCompatActivity) context, gameEntity, gameEntity.getInfo(), () -> {
+                        PermissionHelper.checkStoragePermissionBeforeAction(context, () -> {
+                            CertificationDialog.showCertificationDialog(context, gameEntity, () -> {
+                                DialogUtils.showVersionNumberDialog(context, gameEntity, () -> {
+                                    DownloadDialog.showDownloadDialog(
+                                            v.getContext(),
+                                            gameEntity,
+                                            traceEvent,
+                                            entrance,
+                                            location);
+                                });
+                            });
                         });
                     });
                 });
@@ -579,16 +587,24 @@ public class DownloadItemUtils {
                                      final String location,
                                      @Nullable final ExposureEvent traceEvent) {
         String str = downloadBtn.getText().toString();
-        ApkEntity apk = gameEntity.getApk().get(0);
+        if (gameEntity.getApk().isEmpty()) return;
+        ApkEntity apk = ExtensionsKt.safelyGetInRelease(gameEntity.getApk(), 0);
+        if (apk == null) return;
 
         if (str.equals(context.getString(R.string.download))) {
             // 先弹下载弹窗(如果需要的话)
-            PackageCheckDialogFragment.show((AppCompatActivity) context, gameEntity.getPackageDialog(), () -> {
-                DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, () -> {
-                    CertificationDialog.showCertificationDialog(context, gameEntity, () -> {
-                        DialogUtils.showOverseaDownloadDialog(context, gameEntity, () -> {
-                            DialogUtils.checkDownload(context, apk.getSize(),
-                                    isSubscribe -> download(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent));
+            RealNameHelper.checkIfAuth(context, gameEntity, () -> {
+                GamePermissionDialogFragment.show((AppCompatActivity) context, gameEntity, gameEntity.getInfo(), () -> {
+                    BrowserInstallHelper.showBrowserInstallHintDialog(context, () -> {
+                        PackageCheckDialogFragment.show((AppCompatActivity) context, gameEntity, () -> {
+                            DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, () -> {
+                                CertificationDialog.showCertificationDialog(context, gameEntity, () -> {
+                                    DialogUtils.showOverseaDownloadDialog(context, gameEntity, () -> {
+                                        DialogUtils.checkDownload(context, apk.getSize(),
+                                                isSubscribe -> download(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent));
+                                    });
+                                });
+                            });
                         });
                     });
                 });
@@ -596,13 +612,19 @@ public class DownloadItemUtils {
 
             DataLogUtils.uploadGameLog(context, gameEntity.getId(), gameEntity.getName(), entrance);
         } else if (str.equals(context.getString(R.string.attempt))) {
-            PackageCheckDialogFragment.show((AppCompatActivity) context, gameEntity.getPackageDialog(), () -> {
-                DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, () -> {
-                    CertificationDialog.showCertificationDialog(context, gameEntity, () -> {
-                        DialogUtils.showVersionNumberDialog(context, gameEntity, () -> {
-                            DialogUtils.showOverseaDownloadDialog(context, gameEntity, () -> {
-                                DialogUtils.checkDownload(context, apk.getSize(),
-                                        isSubscribe -> download(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent));
+            RealNameHelper.checkIfAuth(context, gameEntity, () -> {
+                GamePermissionDialogFragment.show((AppCompatActivity) context, gameEntity, gameEntity.getInfo(), () -> {
+                    BrowserInstallHelper.showBrowserInstallHintDialog(context, () -> {
+                        PackageCheckDialogFragment.show((AppCompatActivity) context, gameEntity, () -> {
+                            DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, () -> {
+                                CertificationDialog.showCertificationDialog(context, gameEntity, () -> {
+                                    DialogUtils.showVersionNumberDialog(context, gameEntity, () -> {
+                                        DialogUtils.showOverseaDownloadDialog(context, gameEntity, () -> {
+                                            DialogUtils.checkDownload(context, apk.getSize(),
+                                                    isSubscribe -> download(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent));
+                                        });
+                                    });
+                                });
                             });
                         });
                     });
@@ -654,6 +676,8 @@ public class DownloadItemUtils {
             }
             DataUtils.onGameLaunchEvent(context, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), location);
             PackageUtils.launchApplicationByPackageName(context, gameEntity.getApk().get(0).getPackageName());
+
+            EnergyTaskHelper.postEnergyTask("play_game", gameEntity.getId(), gameEntity.getApk().get(0).getPackageName());
         } else if (str.equals(context.getString(R.string.update))) {
             if (entrance.contains("我的游戏")) {
                 MtaHelper.onEvent("我的游戏_启动", "更新", gameEntity.getName());
@@ -666,6 +690,7 @@ public class DownloadItemUtils {
             context.startActivity(DownloadManagerActivity.getDownloadMangerIntent(context,
                     apk.getUrl(), entrance + "+(" + location.split(":")[0] + ")"));
         }
+
     }
 
     //下载
@@ -725,7 +750,10 @@ public class DownloadItemUtils {
                 }
                 adapter.notifyItemChanged(position);
             } else if (PackageUtils.isCanPluggable(apkEntity)) {
-                DialogUtils.showPluginDialog(context, () -> PackageInstaller.uninstall(context, path));
+                DialogHelper.showPluginDialog(context, () -> {
+                    PackageInstaller.uninstall(context, path);
+                    return null;
+                });
             } else {
                 PackageInstaller.install(context, downloadEntity);
             }

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

@@ -8,6 +8,7 @@ import com.gh.common.exposure.ExposureUtils
 import com.gh.common.exposure.meta.MetaUtil
 import com.gh.common.simulator.SimulatorDownloadManager
 import com.gh.common.simulator.SimulatorGameManager
+import com.gh.common.util.EnergyTaskHelper.postEnergyTask
 import com.gh.common.xapk.XapkInstaller
 import com.gh.download.DownloadDataHelper
 import com.gh.download.DownloadManager
@@ -16,6 +17,7 @@ import com.gh.gamecenter.R
 import com.gh.gamecenter.SuggestionActivity
 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.eventbus.EBShowDialog
 import com.gh.gamecenter.retrofit.Response
@@ -50,7 +52,7 @@ object DownloadObserver {
                 val xapkStatus = downloadEntity.meta[XapkInstaller.XAPK_UNZIP_STATUS]
                 if (!xapkStatus.isNullOrEmpty()) return
 
-                val gameId = downloadEntity.getRealGameId(Constants.GAME_ID_DIVIDER)
+                val gameId = downloadEntity.gameId
                 val downloadManager = DownloadManager.getInstance(HaloApp.getInstance().application)
 
                 tryCatchInRelease {
@@ -111,6 +113,7 @@ object DownloadObserver {
                 }
                 if (DownloadStatus.done == downloadEntity.status) {
                     if (downloadEntity.name.contains(mApplication.getString(R.string.app_name))) {
+                        statDoneEvent(downloadEntity)
                         MtaHelper.onEvent("软件更新", "下载完成")
                         // 会有 ActivityNotFoundException 异常，catch 掉不管了
                         tryWithDefaultCatch {
@@ -124,10 +127,12 @@ object DownloadObserver {
                     } else {
                         statDoneEvent(downloadEntity)
 
+                        postEnergyTask("download_game", downloadEntity.gameId, downloadEntity.packageName)
                         val platform = PlatformUtils.getInstance(mApplication)
                                 .getPlatformName(downloadEntity.platform)
                         if (platform != null) {
                             when {
+                                // TODO 插件化传 path 从 apk 中获取 packageName 的形式有可能出现拿不到 packageName 的情况
                                 downloadEntity.isPluggable -> // 弹出插件化提示框
                                     EventBus.getDefault().post(EBShowDialog(BaseActivity.PLUGGABLE, downloadEntity.path))
                                 downloadEntity.isPlugin -> Utils.toast(mApplication, downloadEntity.name + " - " + platform + " - 下载完成")
@@ -138,19 +143,20 @@ object DownloadObserver {
                         }
                         if (!downloadEntity.isPluggable) {
                             if (downloadEntity.isSimulatorGame()) {
-                                val gameEntity = HaloApp.get(GameEntity::class.java.simpleName, true) as? GameEntity
-                                if (gameEntity?.simulator != null) {
-                                    val isInstalled = PackageUtils.isInstalledFromAllPackage(HaloApp.getInstance().application, gameEntity.simulator!!.apk!!.packageName)
-                                    if (!isInstalled) {
-                                        val currentActivity = AppManager.getInstance().currentActivity() ?: return
+                                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)
+                                val isInstalled = PackageUtils.isInstalledFromAllPackage(HaloApp.getInstance().application, simulator.apk?.packageName)
+                                if (!isInstalled) {
+                                    val currentActivity = AppManager.getInstance().currentActivity()
+                                            ?: return
 
-                                        SimulatorDownloadManager.getInstance().showDownloadDialog(currentActivity, gameEntity.simulator,
-                                                SimulatorDownloadManager.SimulatorLocation.LAUNCH, gameEntity.id, gameEntity.name
-                                                ?: "", null)
-                                    }
-                                    SimulatorGameManager.recordDownloadSimulatorGames(gameEntity.id)
-                                    SimulatorGameManager.postPlayedGame(gameEntity.id, downloadEntity.packageName)
+                                    SimulatorDownloadManager.getInstance().showDownloadDialog(currentActivity, simulator,
+                                            SimulatorDownloadManager.SimulatorLocation.LAUNCH, downloadEntity.gameId, gameName, null)
                                 }
+                                SimulatorGameManager.recordDownloadSimulatorGames(downloadEntity.gameId, simulator.type)
+                                SimulatorGameManager.postPlayedGame(downloadEntity.gameId, downloadEntity.packageName)
                             } else {
                                 val downloadType = downloadEntity.getMetaExtra(Constants.EXTRA_DOWNLOAD_TYPE)
                                 // 是否是自动安装
@@ -167,7 +173,11 @@ object DownloadObserver {
                                             }
                                         } else {
                                             // 弹出卸载提示框
-                                            EventBus.getDefault().post(EBShowDialog(BaseActivity.PLUGGABLE, downloadEntity.path))
+                                            if (downloadEntity.isPlugin) {
+                                                EventBus.getDefault().post(EBShowDialog(BaseActivity.PLUGGABLE, downloadEntity.path))
+                                            } else {
+                                                EventBus.getDefault().post(EBShowDialog(BaseActivity.SIGNATURE_CONFLICT, downloadEntity.path))
+                                            }
                                         }
                                     }
                                 }
@@ -179,15 +189,33 @@ object DownloadObserver {
                     }
 
                     // 下载过程分析统计
-//                    val pm = mApplication.packageManager
-//                    val packageInfo = pm.getPackageArchiveInfo(downloadEntity.path, 0)
-//                    if (packageInfo == null) {
+
+                    // 部分设备 (已知 vivo 5.1.1) 在调用 packageManager.getPackageArchiveInfo 获取比较大的 APK 文件时会出现 ANR
+                    // 这里为了让它能用就不判断是否解析包错误了
+                    if (PackageUtils.isDeviceUnableToHandleBigApkFile(downloadEntity.path)) {
+                        return
+                    }
+
+                    val pm = mApplication.packageManager
+                    val packageInfo = pm.getPackageArchiveInfo(downloadEntity.path, 0)
+                    if (packageInfo == null) {
 //                        MtaHelper.onEventWithBasicDeviceInfo("解析包错误分析",
 //                                "游戏名字", downloadEntity.name + ":" + PlatformUtils.getInstance(mApplication).getPlatformName(downloadEntity.platform))
 //
 //                        MtaHelper.onEventWithBasicDeviceInfo("解析包错误_新",
 //                                "游戏", downloadEntity.name + ":" + PlatformUtils.getInstance(mApplication).getPlatformName(downloadEntity.platform))
-//                    }
+                        val downloadType = downloadEntity.getMetaExtra(Constants.EXTRA_DOWNLOAD_TYPE)
+                        if (downloadType == Constants.SIMULATOR_DOWNLOAD) {
+                            val currentActivity = AppManager.getInstance().currentActivity()
+                                    ?: return
+                            DialogUtils.showSimulatorParseErrorDialog(currentActivity, downloadEntity.gameId, downloadEntity.name) {
+                                val simulator = HaloApp.get(downloadEntity.name, true) as? SimulatorEntity
+                                        ?: return@showSimulatorParseErrorDialog
+                                DownloadManager.getInstance(currentActivity).cancel(downloadEntity.url, true, true)
+                                SimulatorDownloadManager.getInstance().showDownloadDialog(currentActivity, simulator, SimulatorDownloadManager.SimulatorLocation.SIMULATOR_GAME)
+                            }
+                        }
+                    }
                 }
 
                 if (downloadEntity.status == DownloadStatus.done) {
@@ -219,7 +247,7 @@ object DownloadObserver {
         kv1["版本"] = platform
         kv1["状态"] = "下载完成"
         kv1["用户机型"] = Build.MODEL
-        kv1["设备IMEI"] = MetaUtil.getIMEI()
+        kv1["设备JNFJ"] = MetaUtil.getBase64EncodedIMEI()
         kv1["网络状态"] = DeviceUtils.getNetwork(HaloApp.getInstance().application)
         kv1["光环助手版本"] = BuildConfig.VERSION_NAME
         if (downloadEntity.isUpdate) {
@@ -255,11 +283,12 @@ object DownloadObserver {
 //                    "操作", "下载完成",
 //                    "网络状态", DeviceUtils.getNetwork(HaloApp.getInstance().application))
         }
-
+        val isPlatformRecommend = java.lang.Boolean.parseBoolean(downloadEntity.getMetaExtra(Constants.IS_PLATFORM_RECOMMEND))
         ExposureUtils.logADownloadCompleteExposureEvent(
-                GameEntity(id = downloadEntity.getRealGameId(Constants.GAME_ID_DIVIDER),
+                GameEntity(id = downloadEntity.gameId,
                         mName = downloadEntity.name.removeSuffix(Constants.GAME_NAME_DECORATOR),
-                        gameVersion = downloadEntity.versionName ?: ""),
+                        gameVersion = downloadEntity.versionName ?: "",
+                        isPlatformRecommend = isPlatformRecommend),
                 downloadEntity.platform,
                 downloadEntity.exposureTrace,
                 downloadEntity.meta[DownloadEntity.DOWNLOAD_HOST_KEY] ?: "unknown",
@@ -287,7 +316,7 @@ object DownloadObserver {
         params["game"] = id
         params["platform"] = platform ?: ""
         val body = RequestBody.create(MediaType.parse("application/json"),
-                JSONObject(params).toString())
+                JSONObject(params as Map<*, *>).toString())
         RetrofitManager.getInstance(mApplication).api.postDownload(body)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())

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

@@ -0,0 +1,157 @@
+package com.gh.common.util
+
+import android.annotation.SuppressLint
+import android.view.Gravity
+import android.view.View
+import android.widget.LinearLayout
+import android.widget.PopupWindow
+import android.widget.TextView
+import com.gh.common.constant.Constants
+import com.gh.gamecenter.BuildConfig
+import com.gh.gamecenter.R
+import com.gh.gamecenter.energy.EnergyCenterActivity
+import com.gh.gamecenter.entity.EnergyTaskCompleteEntity
+import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.retrofit.BiResponse
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.halo.assistant.HaloApp
+import com.lightgame.utils.AppManager
+import com.lightgame.utils.Utils
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import okhttp3.MediaType
+import okhttp3.RequestBody
+import org.json.JSONObject
+
+/**
+ * 上报光能任务辅助类
+ */
+object EnergyTaskHelper {
+
+    @JvmStatic
+    fun postEnergyTask(action: String) {
+        postEnergyTask(action, null, null, null)
+    }
+
+    @JvmStatic
+    fun postEnergyTask(action: String, id: String) {
+        postEnergyTask(action, id, null, null)
+    }
+
+    @JvmStatic
+    fun postEnergyTask(action: String, id: String, packageName: String) {
+        postEnergyTask(action, id, packageName, null)
+    }
+
+    @JvmStatic
+    fun postEnergyTaskForWeb(action: String, url: String) {
+        postEnergyTask(action, null, null, url)
+    }
+
+    @JvmStatic
+    fun postEnergyTaskForShare(type: String, id: String, url: String) {
+        when (type) {
+            "游戏详情" -> postEnergyTask("share_game_detail", id)
+
+            "视频" -> postEnergyTask("share_video", id)
+
+            "资讯文章" -> postEnergyTask("share_article", id)
+
+            "问题详情" -> postEnergyTask("share_question", id)
+
+            "回答详情" -> postEnergyTask("share_answer", id)
+
+            "文章详情" -> postEnergyTask("share_community_article", id)
+
+            "工具箱" -> postEnergyTask("share_toolkit", id)
+
+            "web链接" -> postEnergyTaskForWeb("share_web", url)
+        }
+    }
+
+    @SuppressLint("CheckResult")
+    @JvmStatic
+    fun postEnergyTask(action: String, id: String? = null, packageName: String? = null, url: String? = null) {
+        if (BuildConfig.DEBUG || BuildConfig.BUILD_TIME != 0L) {
+            val taskParams = JSONObject()
+            taskParams.put("action", action)
+
+            val actionParams = JSONObject()
+            if (id != null) actionParams.put("_id", id)
+            if (packageName != null) actionParams.put("package", packageName)
+            if (url != null) actionParams.put("url", url)
+            taskParams.put("action_param", actionParams)
+
+            debugOnly { Utils.log("EnergyTaskHelper -> $taskParams") }
+
+            val body = RequestBody.create(MediaType.parse("application/json"), taskParams.toString())
+            RetrofitManager.getInstance(HaloApp.getInstance().application)
+                    .api.postEnergyTask(UserManager.getInstance().userId, body)
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(object : BiResponse<List<EnergyTaskCompleteEntity>>() {
+                        override fun onSuccess(data: List<EnergyTaskCompleteEntity>) {
+                            data.forEach { showCompletePopup(it) }
+                        }
+                    })
+        }
+    }
+
+    @SuppressLint("CheckResult")
+    @JvmStatic
+    fun postInviteCodeTask(code: String, from: String, callback: (() -> Unit)?) {
+        if (BuildConfig.DEBUG || BuildConfig.BUILD_TIME != 0L) {
+            val taskParams = JSONObject()
+            taskParams.put("action", "enter_invite_code")
+
+            val actionParams = JSONObject()
+            actionParams.put("code", code)
+            actionParams.put("type", "new")
+            actionParams.put("from", from)
+            taskParams.put("action_param", actionParams)
+
+            debugOnly { Utils.log("EnergyTaskHelper -> $taskParams") }
+
+            val body = RequestBody.create(MediaType.parse("application/json"), taskParams.toString())
+            RetrofitManager.getInstance(HaloApp.getInstance().application)
+                    .api.postEnergyTask(UserManager.getInstance().userId, body)
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(object : BiResponse<List<EnergyTaskCompleteEntity>>() {
+                        override fun onSuccess(data: List<EnergyTaskCompleteEntity>) {
+                            SPUtils.setBoolean(Constants.SP_HAS_COMPLETE_INVITE_CODE, true)
+                            callback?.invoke()
+                            data.forEach { showCompletePopup(it) }
+                        }
+                    })
+        }
+    }
+
+    // 完成弹窗
+    @JvmStatic
+    fun showCompletePopup(entity: EnergyTaskCompleteEntity) {
+        val currentActivity = AppManager.getInstance().recentActiveActivity
+        currentActivity?.run {
+            val contentView = View.inflate(this, R.layout.popup_energy_task, null)
+            contentView.run {
+                findViewById<TextView>(R.id.taskDesc).text = "恭喜你！完成任务：${entity.name}"
+                findViewById<TextView>(R.id.taskEnergy).text = "+${entity.energy}光能"
+                isFocusable = true
+                isFocusableInTouchMode = true
+                setOnClickListener {
+                    if (currentActivity::class.java.simpleName != EnergyCenterActivity::class.java.simpleName) {
+                        currentActivity.startActivity(EnergyCenterActivity.getIntent(currentActivity))
+                    }
+                }
+            }
+            val popWindow = PopupWindow(contentView, LinearLayout.LayoutParams.MATCH_PARENT, 88F.dip2px())
+            popWindow.showAtLocation(currentActivity.window.decorView, Gravity.TOP, 0, 0)
+
+            countDownTimer(3) { finish, _ ->
+                if (finish && popWindow != null && popWindow.isShowing) {
+                    popWindow.dismiss()
+                }
+            }
+        }
+    }
+}

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

@@ -148,8 +148,10 @@ public class EntranceUtils {
     public static final String KEY_RECOMMENDS_CONTENTS = "isRecommendsContents";
     public static final String KEY_VERSION_UPDATE = "versionUpdate";
     public static final String KEY_CHECK_QUESTION_CONCERN = "check_question_concern";
+    public static final String KEY_IS_COLUMN_COLLECTION = "is_column_collection";//是专题合集
     public static final String KEY_DRAFT_ID = "draft_id";
     public static final String KEY_KAIFU_LIST = "kaifuList";
+    public static final String KEY_CATEGORY = "category";
     public static final String KEY_CATEGORY_ID = "category_id";
     public static final String KEY_CATEGORY_TITLE = "category_title";
     public static final String KEY_CATEGORY_INIT_TITLE = "category_init_title";
@@ -167,6 +169,7 @@ public class EntranceUtils {
     public static final String KEY_COLUMN_ID = "column_id";
     public static final String KEY_AUTO_DOWNLOAD = "auto_download";
     public static final String KEY_HIDE_SUGGEST_HINT = "hide_suggest_hint";
+    public static final String KEY_HIDE_USELESS_INFO = "hide_useless_info";
     public static final String KEY_COMMUNITY_ARTICLE_ID = "communityArticleId";
     public static final String KEY_ARTICLE_COMMENT_ID = "articleCommentId";
     public static final String KEY_SHOW_ARTICLE_COMMENT = "showArticleComment";
@@ -190,6 +193,7 @@ public class EntranceUtils {
     public static final String KEY_UUID = "uuid";
     public static final String KEY_IS_HOME_VIDEO = "isHomeVideo";
     public static final String KEY_IS_HOME = "isHome";
+    public static final String KEY_TAB_COUNT = "tab_count";
     public static final String KEY_WEB_SHARE = "webShare";
     public static final String KEY_ACTIVITY_NAME = "activityName";//活动名称
     public static final String KEY_PAGINATION_TYPE = "paginationType";//活动分页方式
@@ -212,6 +216,7 @@ public class EntranceUtils {
     public static final String KEY_CHANGE_PHONE = "changePhone";
     public static final String KEY_CONFLICT_PHONE = "conflictPhone";
     public static final String KEY_CONFLICT_USER = "conflictUser";
+    public static final String KEY_EXPOSURE_SOURCE = "exposure_source";
     public static final String KEY_BBS_ID = "bbs_id";
     public static final String KEY_DIAGNOSIS = "diagnosis";
     public static final String KEY_SIMULATOR = "simulator";
@@ -221,6 +226,16 @@ public class EntranceUtils {
     public static final String KEY_PRIMARY_CATALOG_NAME = "primaryCatalogName";
     public static final String KEY_CATALOG_TITLE = "catalog_title";
     public static final String KEY_CATALOG_INIT_TITLE = "catalog_init_title";
+    public static final String KEY_CATEGORY_LIST = "categoty_list";
+    public static final String KEY_IS_FREE = "is_free";
+    public static final String KEY_IS_SIGN = "is_sign";
+    public static final String KEY_IS_CHOOSE_APK = "is_choose_apk";
+    public static final String KEY_TAB_INDEX = "tab_index";
+    public static final String KEY_IS_CATEGORY_V2 = "is_category_v2";
+    public static final String KEY_SUB_CATEGORY_ID = "sub_category_id";
+    public static final String KEY_IS_QA_FEEDBACK = "is_qa_feedback";
+    public static final String KEY_IS_CLICK_RECEIVE_BTN = "is_click_receive_btn";
+    public static final String KEY_SHOW_QUICK_LOGIN = "show_quick_login";
 
     public static void jumpActivity(Context context, Bundle bundle) {
         bundle.putBoolean(KEY_REQUIRE_REDIRECT, true);

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

@@ -6,6 +6,7 @@ import com.gh.gamecenter.R
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.entity.ErrorEntity
 import com.lightgame.utils.Utils
+import retrofit2.HttpException
 
 /**
  * 这个类用来管理一些错误，像弹窗、TOAST 什么的
@@ -17,6 +18,7 @@ object ErrorHelper {
      * [showHighPriorityHint] 用来标识有同样错误码可以触发两种处理时，为 true 时选择重要的
      * [customizedHandler] 返回 true 为已处理该错误码，false 则交由 [handleError] 处理
      */
+    @JvmStatic
     fun handleErrorWithCustomizedHandler(context: Context,
                                          errorString: String?,
                                          showHighPriorityHint: Boolean = false,
@@ -169,4 +171,23 @@ object ErrorHelper {
         }, null)
     }
 
+    @JvmStatic
+    fun handleLoginError(context: Context, httpException: HttpException?) {
+        try {
+            val errorEntity: ErrorEntity? = httpException?.response()?.errorBody()?.string()?.toObject()
+            when {
+                errorEntity?.code == 403099 -> {
+                    Utils.toast(context, "当前账号正在注销，禁止登录")
+                }
+                errorEntity?.toast?.isNotEmpty() == true -> {
+                    Utils.toast(context, errorEntity.toast)
+                }
+                else -> Utils.toast(context, R.string.login_failure)
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            Utils.toast(context, R.string.login_failure)
+        }
+    }
+
 }

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

@@ -4,6 +4,9 @@ import android.animation.Animator
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
 import android.os.Build
 import android.text.*
@@ -67,11 +70,16 @@ inline fun <reified VM : ViewModel> FragmentActivity.viewModelProvider(
 
 /**
  * 创建以 activity 为观察者上下文的 viewModel
+ * 额外的 key: 用于区分单 activity 多 viewModel 的情况 (如首页tab)
  */
 inline fun <reified VM : ViewModel> Fragment.viewModelProviderFromParent(
-        provider: ViewModelProvider.Factory? = null
-) =
-        ViewModelProviders.of(requireActivity(), provider).get(VM::class.java)
+        provider: ViewModelProvider.Factory? = null,
+        key: String = ""
+) = if (key.isEmpty()) {
+    ViewModelProviders.of(requireActivity(), provider).get(VM::class.java)
+} else {
+    ViewModelProviders.of(requireActivity(), provider).get(key, VM::class.java)
+}
 
 /**
  * 创建以 activity 为观察者上下文的 viewModel
@@ -113,12 +121,16 @@ fun ViewPager.addOnPageChangeListener(onSelected: ((position: Int) -> Unit)? = n
     addOnPageChangeListener(listener)
 }
 
-fun ViewPager.addOnScrollStateChanged(onStateChanged: ((state: Int) -> Unit)? = null) {
+fun ViewPager.doOnScroll(onStateChanged: ((state: Int) -> Unit)? = null,
+                         onPageScrolled: ((position: Int, positionOffset: Float, positionOffsetPixels: Int) -> Unit)? = null,
+                         onPageSelected: ((position: Int) -> Unit)? = null) {
     val listener = object : ViewPager.OnPageChangeListener {
         override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
+            onPageScrolled?.invoke(position, positionOffset, positionOffsetPixels)
         }
 
         override fun onPageSelected(position: Int) {
+            onPageSelected?.invoke(position)
         }
 
         override fun onPageScrollStateChanged(state: Int) {
@@ -424,7 +436,7 @@ fun String.copyTextAndToast(toastText: String = "复制成功") {
         val application = HaloApp.getInstance().application
         val cmb = application.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
         val clip = ClipData.newPlainText(null, this)
-        cmb.primaryClip = clip
+        cmb.setPrimaryClip(clip)
 
         if (!TextUtils.isEmpty(toastText)) {
             ToastUtils.showToast(toastText)
@@ -477,6 +489,9 @@ fun Float.sp2px(): Int {
     return (this * scale + 0.5f).toInt()
 }
 
+fun Float.roundTo(n: Int): Float {
+    return "%.${n}f".format(Locale.CHINA, this).toFloat()
+}
 
 /**
  * PopupWindow 自动适配方向
@@ -602,15 +617,20 @@ fun TextView.setTextChangedListener(action: (s: CharSequence, start: Int, before
 }
 
 /**
- * ArrayList related
+ * List related
  */
-fun <T> ArrayList<T>.safelyGetInRelease(index: Int): T? {
+fun <T> List<T>.safelyGetInRelease(index: Int): T? {
     return if (index >= size) {
-        throwExceptionInDebug("这里触发了数组越界，请检查")
+        throwExceptionInDebug("这里触发了数组越界，请检查 (index $index >= size $size)")
         toastInInternalRelease("这个操作可能触发闪退，请确定复现方式并联系开发处理")
         null
     } else {
-        this[index]
+        try {
+            this[index]
+        } catch (e: IndexOutOfBoundsException) {
+            e.printStackTrace()
+            null
+        }
     }
 }
 
@@ -687,6 +707,10 @@ fun Int.toColor(): Int {
     return ContextCompat.getColor(HaloApp.getInstance().application, this)
 }
 
+fun Int.toDrawable(): Drawable? {
+    return ContextCompat.getDrawable(HaloApp.getInstance().application, this)
+}
+
 fun Int.toResString(): String {
     return HaloApp.getInstance().application.resources.getString(this)
 }
@@ -706,11 +730,16 @@ fun SimpleDraweeView.display(url: String) {
  * DownloadEntity extension
  */
 fun DownloadEntity.addMetaExtra(key: String, value: String?) {
-    value?.let { meta[key] = value }
+    value?.let {
+        if (meta == null) {
+            meta = hashMapOf()
+        }
+        meta[key] = value
+    }
 }
 
 fun DownloadEntity.getMetaExtra(key: String): String {
-    return meta[key] ?: ""
+    return meta?.get(key) ?: ""
 }
 
 fun DownloadEntity.isSilentUpdate(): Boolean {
@@ -732,6 +761,9 @@ fun Context.doOnMainProcessOnly(callback: EmptyCallback) {
     doOnMainProcessOnly { callback.onCallback() }
 }
 
+/**
+ * 虽然现在我们没有了友盟以后只是单进程APP，但在 debug 模式下还有 whatTheStack 这个进程如果不限定主进程会出现奇奇怪怪的问题 (BroadcastReceiver相关)
+ */
 inline fun Context.doOnMainProcessOnly(f: () -> Unit) {
     val processName = PackageUtils.obtainProcessName(this)
     if (processName == null || BuildConfig.APPLICATION_ID == processName) {
@@ -918,4 +950,11 @@ fun <T> singleToMain(): SingleTransformer<T, T> {
         upstream.subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
     }
+}
+
+fun View.getBitmapFromView(): Bitmap? {
+    val bitmap = Bitmap.createBitmap(this.width, this.height, Bitmap.Config.ARGB_8888)
+    val canvas = Canvas(bitmap)
+    this.draw(canvas)
+    return bitmap
 }

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

@@ -78,6 +78,9 @@ public class GameUtils {
         int pluginCount = 0;    // 可插件化数量
         int updateCount = 0;    // 可更新数量
         int installCount = 0;   // 已安装数量
+
+        boolean isRelatedEmulatorInstalled = false; // 若该游戏是模拟器游戏时其对应的模拟器是否已经安装
+
         DownloadEntity downloadEntity;
         Object gh_id;
         apkFor:
@@ -113,7 +116,10 @@ public class GameUtils {
                         && !PackageUtils.isSignedByGh(context, apkEntity.getPackageName())
                         && apkEntity.isShowPlugin(pluginLocation)) {
                     pluginCount++;
-                } else if (gh_id == null || gh_id.equals(gameEntity.getId())) {
+                } else if (gh_id == null
+                        || gh_id.equals(gameEntity.getId())
+                        // 当使用镜像时，可能会存在镜像 gh_id 与当前游戏 id 不一样的情况，这时也让它通过，避免装完还是显示`下载`
+                        || gameEntity.shouldUseMirrorInfo()) {
                     installCount++;
                 }
             }
@@ -123,20 +129,26 @@ public class GameUtils {
                     boolean isInstalled = PackageUtils.isInstalledFromAllPackage(context, gameEntity.getSimulator().getApk().getPackageName());
                     if (isInstalled) {
                         installCount++;
+                        isRelatedEmulatorInstalled = true;
                     } else {
                         doneCount++;
                     }
                 }
             }
         }
-        if (installCount != 0) {
+
+        if (isRelatedEmulatorInstalled && doneCount != 0) {
             return context.getString(R.string.launch);
+        }
+
+        if (doneCount != 0) {
+            return context.getString(R.string.install);
         } else if (pluginCount != 0 && !SimulatorGameManager.isSimulatorGame(gameEntity)) {
             return context.getString(R.string.pluggable);
         } else if (updateCount != 0 && !SimulatorGameManager.isSimulatorGame(gameEntity)) {
             return context.getString(R.string.update);
-        } else if (doneCount != 0) {
-            return context.getString(R.string.install);
+        } else if (installCount != 0) {
+            return context.getString(R.string.launch);
         } else if (gameEntity.getVersionNumber().contains("无版号") && Config.isGameDomeSwitchOpen() && !SimulatorGameManager.isSimulatorGame(gameEntity)) {
             return context.getString(R.string.attempt);
         } else {

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

@@ -24,27 +24,39 @@ object HomePluggableHelper {
         val apkList = gameEntity.getApk()
         if (apkList.isNotEmpty()) {
             val apk = apkList.first()
-            val filterData = mHomePluggableFilterDao.getDataByPkgName(apk.packageName)
-            if (filterData?.active == true) {
-                val filterTag = filterData.tag
-                return filterTag != "never" && apk.version != filterTag
+            tryCatchInRelease {
+                val filterData = mHomePluggableFilterDao.getDataByPkgName(apk.packageName)
+                if (filterData?.active == true) {
+                    val filterTag = filterData.tag
+                    return filterTag != "never" && apk.version != filterTag
+                }
             }
         }
         return true
     }
 
     @JvmStatic
-    fun getPermanentInactivePluggablePackage() = mHomePluggableFilterDao.getDataByTag("never")
+    fun getPermanentInactivePluggablePackage(): List<HomePluggableFilterEntity>? {
+        tryCatchInRelease {
+            return mHomePluggableFilterDao.getDataByTag("never")
+        }
+        return emptyList()
+    }
 
     @JvmStatic
     fun activationFilterData() {
-        val filterList = mHomePluggableFilterDao.getDataByActive(false)
+        try {
+            val filterList = mHomePluggableFilterDao.getDataByActive(false)
 
-        if (filterList != null) {
-            for (entity in filterList) {
-                entity.active = true
+            if (filterList != null) {
+                for (entity in filterList) {
+                    entity.active = true
+                }
+                mHomePluggableFilterDao.addData(filterList)
             }
-            tryCatchInRelease { mHomePluggableFilterDao.addData(filterList) }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            toastInInternalRelease("数据库/磁盘已满，插件筛选失败")
         }
     }
 }

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

@@ -24,6 +24,7 @@ import com.facebook.imagepipeline.image.CloseableImage
 import com.facebook.imagepipeline.image.ImageInfo
 import com.facebook.imagepipeline.request.ImageRequest
 import com.facebook.imagepipeline.request.ImageRequestBuilder
+import com.facebook.imagepipeline.request.Postprocessor
 import com.gh.common.constant.Config
 import com.gh.common.structure.FixedSizeLinkedHashSet
 import com.gh.gamecenter.R
@@ -42,6 +43,8 @@ object ImageUtils {
     private val LARGE_GIF_SIZE = 80F.dip2px()
     private val STANDARD_GIF_SIZE = 60F.dip2px()
 
+    const val TARGET_WIDTH = R.dimen.width_placeholder
+
     private val mImageUrlCacheSet by lazy { FixedSizeLinkedHashSet<String>(maxSize = 200) }
 
     @JvmStatic
@@ -85,8 +88,14 @@ object ImageUtils {
     @JvmStatic
     fun addLimitWidth(imageUrl: String?, width: Int?): String? {
         val jpegConfig = Config.getSettings()?.image?.oss?.jpeg
+        val webpConfig = Config.getSettings()?.image?.oss?.webp
+                ?: Config.getSettings()?.image?.oss?.gif
         if (jpegConfig != null) {
-            return "$imageUrl$jpegConfig,w_$width"
+            return if (width == 0 || width == null) {
+                "$imageUrl$webpConfig"
+            } else {
+                "$imageUrl$jpegConfig,w_$width"
+            }
         }
         return imageUrl
     }
@@ -286,15 +295,20 @@ object ImageUtils {
 
     /**
      *  规则 width>0 Wifi/4G:x2 traffic:x1
+     *  统一加载 webp 忽略掉第二种方案
      *  第一种方案:通过LayoutParams获取 可以快速(无延迟)获取宽高,但是无法获取wrap_content和match_parent的View
-     *  第二种方案(备用方案):有延迟,View的宽高需要在Measure过程后才能确定,能够在这里获取到正确的宽高
+     *  ~~第二种方案(备用方案):有延迟,View的宽高需要在Measure过程后才能确定,能够在这里获取到正确的宽高~~
      *  @param isAutoPlayGif 是否禁止播放动图
      */
     @JvmStatic
-    fun display(view: SimpleDraweeView?, url: String?, isAutoPlayGif: Boolean = true) {
+    fun display(view: SimpleDraweeView?,
+                url: String?,
+                isAutoPlayGif: Boolean = true,
+                processor: Postprocessor? = null) {
         if (url == null) return
 
-        val width = view?.layoutParams?.width
+        // 部分自适应宽高图片需要一个 TARGET_WIDTH 来避免加载过小图片
+        val width = (view?.getTag(TARGET_WIDTH) as? Int) ?: view?.layoutParams?.width
         val height = view?.layoutParams?.height
 
         var lowResUrl = ""
@@ -310,40 +324,47 @@ object ImageUtils {
         }
 
         val loadImageClosure: (autoPlay: Boolean, highResUrl: String, lowResUrl: String) -> Unit = { autoPlay, hUrl, lUrl ->
-            view?.controller = Fresco.newDraweeControllerBuilder()
-                    .setImageRequest(ImageRequest.fromUri(hUrl))
+            val imageRequest = ImageRequestBuilder.newBuilderWithSource(Uri.parse(hUrl))
+                    .setPostprocessor(processor)
+                    .build()
+            val controller = Fresco.newDraweeControllerBuilder()
+                    .setImageRequest(imageRequest)
                     .apply {
                         if (lUrl.isNotEmpty()
                                 && lUrl != hUrl
                                 && hUrl != view?.getTag(R.string.highResImageTag)) {
-                            lowResImageRequest = ImageRequest.fromUri(lUrl)
+                            lowResImageRequest = ImageRequestBuilder.newBuilderWithSource(Uri.parse(lUrl))
+                                    .setPostprocessor(processor)
+                                    .build()
                         }
                         autoPlayAnimations = autoPlay
                     }
                     .build()
+            view?.controller = controller
 
             view?.setTag(R.string.highResImageTag, highResUrl)
         }
 
-        val shouldLoadAsGif = url.endsWith(".gif") && isAutoPlayGif && view?.getTag(R.id.tag_show_gif) != false
+        // 低于 2G 运行内存的不加载 gif
+        val shouldLoadAsGif = url.endsWith(".gif")
+                && isAutoPlayGif
+                && (HaloApp.getInstance().deviceRamSize == 0L || HaloApp.getInstance().deviceRamSize > 2500)
+                && view?.getTag(R.id.tag_show_gif) != false
 
         if (shouldLoadAsGif && view?.tag == url) return
 
-        if (width != null && width > 0) {
-            highResUrl = if (shouldLoadAsGif) {
-                resizeGif(url, width, height ?: 0)
-            } else {
-                getTransformLimitUrl(url, width, view.context) ?: ""
-            }
+        if (!shouldLoadAsGif) {
+            highResUrl = getTransformLimitUrl(url, width ?: 0, view?.context) ?: ""
             loadImageClosure(shouldLoadAsGif, highResUrl, lowResUrl)
         } else {
-            view?.post {
-                highResUrl = if (shouldLoadAsGif) {
-                    resizeGif(url, view.width, height ?: 0)
-                } else {
-                    getTransformLimitUrl(url, view.width, view.context) ?: ""
-                }
+            if (width != null && width > 0) {
+                highResUrl = resizeGif(url, view!!.width, height ?: 0)
                 loadImageClosure(shouldLoadAsGif, highResUrl, lowResUrl)
+            } else {
+                view?.post {
+                    highResUrl = resizeGif(url, view.width, height ?: 0)
+                    loadImageClosure(shouldLoadAsGif, highResUrl, lowResUrl)
+                }
             }
         }
         view?.tag = url
@@ -352,25 +373,27 @@ object ImageUtils {
     // Wifi/4G:x2 traffic:x1
     @JvmStatic
     fun getTransformLimitUrl(url: String?, width: Int?, context: Context?): String? {
-        var transformUrl: String? = url
+        val transformUrl: String?
         if (width != null && width > 0) {
             // 加载大小是实际 ImageView 大小两倍的图片真的有意义吗？
             val transformUrlX2 = addLimitWidth(url, width * 2)
             val transformUrlX1 = addLimitWidth(url, width)
-            // 当网络为 WIFI 或 4G， 且系统版本大于 5.0 && 手机内存大于 1G 才用高清图片
-            if (NetworkUtils.isWifiOr4GConnected(context)
+            // 当网络为 WIFI 或 4G， 且系统版本大于 5.0 && 手机内存大于 4G 才用超高清图片 (x2)
+            transformUrl = if (NetworkUtils.isWifiOr4GConnected(context)
                     && Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP
-                    && HaloApp.getInstance().deviceRamSize > 1024) {
-                transformUrl = transformUrlX2
+                    && HaloApp.getInstance().deviceRamSize > 4500) {
+                transformUrlX2
             } else {
                 // 检查X2大图是否被缓存
                 if (Fresco.getImagePipeline().isInBitmapMemoryCache(Uri.parse(transformUrlX2)) ||
                         Fresco.getImagePipeline().isInDiskCacheSync(Uri.parse(transformUrlX2))) {
-                    transformUrl = transformUrlX2
+                    transformUrlX2
                 } else {
-                    transformUrl = transformUrlX1
+                    transformUrlX1
                 }
             }
+        } else {
+            transformUrl = addLimitWidth(url, null)
         }
         addCachedUrl(transformUrl ?: "")
         return transformUrl
@@ -383,9 +406,7 @@ object ImageUtils {
         if (width != null && width > 0) {
             view.setImageURI(addLimitWidth(url, width * 2))
         } else {
-            view?.post {
-                view.setImageURI(addLimitWidth(url, view.width * 2))
-            }
+            view?.setImageURI(addLimitWidth(url, view.width * 2))
         }
     }
 
@@ -395,6 +416,18 @@ object ImageUtils {
         }
     }
 
+    /**
+     * 获取已缓存的图片地址，不区分质量，暂时只供查看大图页面使用
+     */
+    fun getCachedUrl(url: String): String {
+        for (decoratedUrl in mImageUrlCacheSet) {
+            if (decoratedUrl.contains(url)) {
+                return decoratedUrl
+            }
+        }
+        return url
+    }
+
     @JvmStatic
     fun bmpToByteArray(bmp: Bitmap, needRecycle: Boolean): ByteArray {
         val output = ByteArrayOutputStream()
@@ -444,11 +477,29 @@ object ImageUtils {
         }
     }
 
-    public interface OnImageloadListener {
+    interface OnImageloadListener {
         fun onLoadFinal(imageInfo: ImageInfo?)
     }
 
     fun getVideoSnapshot(videoUrl: String, progress: Long): String {
         return "$videoUrl?x-oss-process=video/snapshot,t_$progress,f_jpg,w_0,h_0"
     }
+
+    /**
+     * 虽然在 Application 里有使用子线程初始化但有可能出现初始化超时(卡住？)的情况，
+     * 这里反射获取 sDraweecontrollerbuildersupplier 根据是否有值确定是否被初始化了
+     */
+    @JvmStatic
+    fun isFrescoInitialized(): Boolean {
+        val clazz = SimpleDraweeView::class.java
+        return try {
+            val field =
+                clazz.getDeclaredField("sDraweecontrollerbuildersupplier")
+            field.isAccessible = true
+            val obj = field[SimpleDraweeView::class.java]
+            obj != null
+        } catch (ignore: java.lang.Exception) {
+            false
+        }
+    }
 }

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

@@ -18,11 +18,11 @@ public class Installation {
     private static String sID = null;
 
     public synchronized static String getUUID(Context context) {
-        String imei = MetaUtil.getIMEI();
+        String imei = MetaUtil.getBase64EncodedIMEI();
         if (!TextUtils.isEmpty(imei)) {
             return imei;
         }
-        String android_id = MetaUtil.getAndroidId();
+        String android_id = MetaUtil.getBase64EncodedAndroidId();
         if (!TextUtils.isEmpty(android_id)) {
             return android_id;
         }

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

@@ -0,0 +1,157 @@
+package com.gh.common.util
+
+import com.gh.common.loghub.LoghubUtils.log
+import com.gh.common.tracker.Tracker.launchId
+import com.gh.common.tracker.Tracker.sessionId
+import com.lightgame.utils.Utils
+import org.json.JSONObject
+
+object IntegralLogHelper {
+
+    fun log(event: String, location: String) = log(event, location, null)
+
+    fun log(event: String, location: String, entrance: String? = null) {
+        val json = JSONObject().apply {
+            tryWithDefaultCatch {
+                put("meta", LogUtils.getMetaObject())
+                put("event", event)
+                put("location", location)
+                put("timestamp", System.currentTimeMillis() / 1000)
+                put("launch_id", launchId)
+                put("session_id", sessionId)
+                entrance?.let {
+                    put("entrance", it)
+                }
+            }
+        }
+
+        debugOnly {
+            Utils.log("LogUtils->$json")
+        }
+        log(json, "score", false)
+    }
+
+    fun logTask(event: String, location: String, jobId: String, jobName: String, jobType: String) {
+        val json = JSONObject().apply {
+            tryWithDefaultCatch {
+                put("meta", LogUtils.getMetaObject())
+                put("event", event)
+                put("location", location)
+                put("timestamp", System.currentTimeMillis() / 1000)
+                put("launch_id", launchId)
+                put("session_id", sessionId)
+                put("job_id", jobId)
+                put("job_name", jobName)
+                put("job_type", jobType)
+            }
+        }
+
+        debugOnly {
+            Utils.log("LogUtils->$json")
+        }
+        log(json, "score", false)
+    }
+
+    fun logCommodityCategory(event: String, location: String, entrance: String, categoryId: String, categoryName: String) {
+        val json = JSONObject().apply {
+            tryWithDefaultCatch {
+                put("meta", LogUtils.getMetaObject())
+                put("event", event)
+                put("location", location)
+                put("timestamp", System.currentTimeMillis() / 1000)
+                put("launch_id", launchId)
+                put("session_id", sessionId)
+                put("entrance", entrance)
+                put("goods_species_id", categoryId)
+                put("goods_species_name", categoryName)
+            }
+        }
+
+        debugOnly {
+            Utils.log("LogUtils->$json")
+        }
+        log(json, "score", false)
+    }
+
+    fun logCommodity(event: String, location: String, commodityId: String, categoryId: String, categoryName: String) {
+        val json = JSONObject().apply {
+            tryWithDefaultCatch {
+                put("meta", LogUtils.getMetaObject())
+                put("event", event)
+                put("location", location)
+                put("timestamp", System.currentTimeMillis() / 1000)
+                put("launch_id", launchId)
+                put("session_id", sessionId)
+                put("goods_id", commodityId)
+                put("goods_species_id", categoryId)
+                put("goods_species_name", categoryName)
+            }
+        }
+
+        debugOnly {
+            Utils.log("LogUtils->$json")
+        }
+        log(json, "score", false)
+    }
+
+    fun logEnergyRange(event: String, location: String, range: String) {
+        val json = JSONObject().apply {
+            tryWithDefaultCatch {
+                put("meta", LogUtils.getMetaObject())
+                put("event", event)
+                put("location", location)
+                put("timestamp", System.currentTimeMillis() / 1000)
+                put("launch_id", launchId)
+                put("session_id", sessionId)
+                put("energy_range", range)
+            }
+        }
+
+        debugOnly {
+            Utils.log("LogUtils->$json")
+        }
+        log(json, "score", false)
+    }
+
+    fun logPendent(event: String, location: String, pendentId: String, pendentType: String? = null) {
+        val json = JSONObject().apply {
+            tryWithDefaultCatch {
+                put("meta", LogUtils.getMetaObject())
+                put("event", event)
+                put("location", location)
+                put("timestamp", System.currentTimeMillis() / 1000)
+                put("launch_id", launchId)
+                put("session_id", sessionId)
+                put("pendant_id", pendentId)
+                pendentType?.run {
+                    put("pendant_type", this)
+                }
+            }
+        }
+
+        debugOnly {
+            Utils.log("LogUtils->$json")
+        }
+        log(json, "score", false)
+    }
+
+    fun logInviteResult(result: String, type: String? = null) {
+        val json = JSONObject().apply {
+            tryWithDefaultCatch {
+                put("meta", LogUtils.getMetaObject())
+                put("event", "invite_result")
+                put("location", "邀请途径面板")
+                put("timestamp", System.currentTimeMillis() / 1000)
+                put("launch_id", launchId)
+                put("session_id", sessionId)
+                put("invitation_result", result)
+                put("invitation_type", type)
+            }
+        }
+
+        debugOnly {
+            Utils.log("LogUtils->$json")
+        }
+        log(json, "score", false)
+    }
+}

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

@@ -28,14 +28,17 @@ import com.gh.gamecenter.manager.UserManager;
 import com.gh.gamecenter.retrofit.JSONObjectResponse;
 import com.gh.gamecenter.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
+import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -151,9 +154,10 @@ public class LibaoUtils {
                 });
     }
 
-    public static void setLiBaoBtnStatusRound(final TextView libaoBtn, String status, Context context) {
+    public static void setLiBaoBtnStatusRound(final TextView libaoBtn, LibaoEntity libaoEntity, boolean shouldUpdateStatus, Context context) {
+        String status = shouldUpdateStatus ? updateStatus(libaoEntity) : libaoEntity.getStatus();
         libaoBtn.setTextColor(Color.WHITE);
-        if (TextUtils.isEmpty(status)) return;
+        if (status == null || TextUtils.isEmpty(status)) return;
         switch (status) {
             case "ling":
                 libaoBtn.setText(R.string.libao_ling);
@@ -180,8 +184,8 @@ public class LibaoUtils {
                 break;
             case "linged":
                 libaoBtn.setText(R.string.libao_linged);
-                libaoBtn.setBackgroundResource(R.drawable.button_normal_round_border);
-                libaoBtn.setTextColor(context.getResources().getColor(R.color.theme_font));
+                libaoBtn.setBackgroundResource(R.drawable.button_border_round_gray);
+                libaoBtn.setTextColor(context.getResources().getColor(R.color.button_gray));
                 break;
             case "taoed":
                 libaoBtn.setText(R.string.libao_taoed);
@@ -193,22 +197,16 @@ public class LibaoUtils {
                 libaoBtn.setBackgroundResource(R.drawable.button_normal_round_style);
                 break;
             case "repeatLing":
-                libaoBtn.setText(R.string.libao_repeat_ling);
-                libaoBtn.setBackgroundResource(R.drawable.button_normal_round_border);
-                libaoBtn.setTextColor(context.getResources().getColor(R.color.theme_font));
-                break;
             case "repeatLinged":
                 libaoBtn.setText(R.string.libao_repeat_ling);
-                libaoBtn.setBackgroundResource(R.drawable.button_normal_round_style);
-                break;
-            case "repeatTao":
-                libaoBtn.setText(R.string.libao_repeat_tao);
                 libaoBtn.setBackgroundResource(R.drawable.button_normal_round_border);
                 libaoBtn.setTextColor(context.getResources().getColor(R.color.theme_font));
                 break;
+            case "repeatTao":
             case "repeatTaoed":
                 libaoBtn.setText(R.string.libao_repeat_tao);
-                libaoBtn.setBackgroundResource(R.drawable.button_normal_round_style);
+                libaoBtn.setBackgroundResource(R.drawable.button_normal_round_border);
+                libaoBtn.setTextColor(context.getResources().getColor(R.color.theme_font));
                 break;
             case "unshelve":
                 libaoBtn.setBackgroundResource(R.drawable.button_border_round_gray);
@@ -227,14 +225,85 @@ public class LibaoUtils {
         }
     }
 
-    public static void initLibaoBtn(final Context context, final TextView libaoBtn, final LibaoEntity libaoEntity,
-                                    final boolean isInstallRequired, final LibaoDetailAdapter adapter, final String entrance) {
+    public static String updateStatus(LibaoEntity libaoEntity) {
         String status = libaoEntity.getStatus();
-        setLiBaoBtnStatusRound(libaoBtn, status, context);
+        String beforeStatus = libaoEntity.getBeforeStatus();
+        if (libaoEntity.getRepeat() > 0 && libaoEntity.getMe() != null
+                && libaoEntity.getMe().getUserDataLibaoList() != null) {
+
+            MeEntity userData = libaoEntity.getMe();
+            List<UserDataLibaoEntity> userDataLibaoList = userData.getUserDataLibaoList();
+
+            int repeat = libaoEntity.getRepeat();
+            int curStatusCount = 0; // 当前状态的领取/淘号数量
+
+            for (UserDataLibaoEntity userDataLibaoEntity : userDataLibaoList) {
+                if (beforeStatus != null && beforeStatus.equals(userDataLibaoEntity.getType())) {
+                    curStatusCount++;
+                }
+            }
+
+            // 由领取到淘号的状态转换
+            if (repeat <= curStatusCount || curStatusCount == 0) { // 当前领取/淘号总数是否超过总重复领取次数 / 当前状态的礼包没有领取/淘号过
+                if (curStatusCount == 0 && ("ling".equals(beforeStatus) || "tao".equals(beforeStatus))) {
+                    if (isCanLing(libaoEntity)) { // 恢复原始状态
+                        return beforeStatus;
+                    }
+                }
+                return status;
+            }
+
+            if ((("linged").equals(status) || ("taoed").equals(status)) &&
+                    ("ling".equals(beforeStatus) || "tao".equals(beforeStatus))) { //检查是否到了重复领取时间
+                if (isCanLing(libaoEntity)) {
+                    if ("ling".equals(beforeStatus)) {
+                        return "repeatLinged"; // 可以重复领取
+                    } else {
+                        return "repeatTaoed"; // 可以重复领取
+                    }
+                } else {
+                    if ("ling".equals(beforeStatus)) {
+                        return "repeatLing"; // 预备重复领取
+                    } else {
+                        return "repeatTao"; // 预备重复领取
+                    }
+                }
+            }
+        }
+        return status;
+    }
+
+    public static boolean isCanLing(LibaoEntity libaoEntity) {
+        List<UserDataLibaoEntity> userDataLibaoList = libaoEntity.getMe().getUserDataLibaoList();
+        UserDataLibaoEntity userDataLibaoEntity = userDataLibaoList.get(userDataLibaoList.size() - 1);
+        SimpleDateFormat formatDay = new SimpleDateFormat("dd", Locale.CHINA);
+        long lingTime = userDataLibaoEntity.getTime() * 1000;
+        long curTime = Utils.getTime(HaloApp.getInstance()) * 1000;
+        int lingDay = Integer.parseInt(formatDay.format(lingTime));
+        int curDay = Integer.parseInt(formatDay.format(curTime));
+        if (curDay != lingDay || curTime - lingTime > 24 * 60 * 60 * 1000) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public static void initLibaoBtn(final Context context, final TextView libaoBtn, final LibaoEntity libaoEntity,
+                                    final boolean isInstallRequired, final LibaoDetailAdapter adapter, boolean shouldUpdateStatus, final String entrance) {
+        String status = libaoEntity.getStatus();
+        setLiBaoBtnStatusRound(libaoBtn, libaoEntity, shouldUpdateStatus, context);
+
+        if (adapter != null) {
+            if (libaoBtn.getText().toString().equals("再领")) {
+                libaoBtn.setText("再领一个");
+            }
+            if (libaoBtn.getText().toString().equals("再淘")) {
+                libaoBtn.setText("再淘一个");
+            }
+        }
 
         libaoBtn.setOnClickListener(v -> {
             String btnStatus = libaoBtn.getText().toString();
-
             // 领取限制
             CheckLoginUtils.checkLogin(context, "礼包详情-[" + btnStatus + "]", () -> {
                 if ("领取".equals(btnStatus) || "淘号".equals(btnStatus)) {
@@ -280,6 +349,7 @@ public class LibaoUtils {
                                     Html.fromHtml(libaoEntity.getDes()), "关闭", null, null, null);
                         }
                         break;
+                    case "再领":
                     case "再领一个":
                     case "领取":
                         if ("repeatLing".equals(status)) {
@@ -290,136 +360,140 @@ public class LibaoUtils {
                             libaoLing(context, libaoBtn, libaoEntity, adapter, isInstallRequired, null, entrance);
                         }
                         break;
+                    case "再淘":
                     case "再淘一个":
                     case "淘号":
-                        if ("repeatTao".equals(status)) {
-                            Utils.toast(context, "没到重复淘号时间, 礼包每天0点刷新");
-                            return;
-                        }
-                        final Dialog loadingDialog = DialogUtils.showWaitDialog(context, "淘号中...");
-                        postLibaoTao(context, libaoEntity.getId(), new PostLibaoListener() {
-                            @Override
-                            public void postSucceed(Object response) {
-
-                                if (loadingDialog != null) loadingDialog.dismiss();
-
-                                JSONObject responseBody = (JSONObject) response;
-                                String libaoCode = null;
-                                try {
-                                    libaoCode = responseBody.getString("code");
-                                } catch (JSONException e) {
-                                    e.printStackTrace();
-                                }
-
-                                if (TextUtils.isEmpty(libaoCode)) {
-                                    try {
-                                        String detail = responseBody.getString("detail");
-                                        switch (detail) {
-                                            case "maintaining":
-                                                Utils.toast(context, "网络状态异常，请稍后再试");
-                                                break;
-                                            case "fail to compete":
-                                                Utils.toast(context, "淘号失败，稍后重试");
-                                                break;
-                                            default:
-                                                Utils.toast(context, "淘号异常");
-                                                break;
-                                        }
-                                    } catch (JSONException e) {
-                                        e.printStackTrace();
-                                    }
-                                    return;
-                                }
-
-                                Utils.toast(context, "淘号成功");
-
-                                libaoEntity.setStatus("taoed");
-
-                                EventBus.getDefault().post(new EBReuse("libaoChanged"));
-
-                                adapter.initLibaoCode(new UserDataLibaoEntity(libaoCode, "tao", Utils.getTime(context)));
-
-                                final String finalLibaoCode = libaoCode;
-
-                                DialogUtils.showWarningDialog(context, "淘号成功"
-                                        , Html.fromHtml(context.getString(R.string.taoed_dialog, libaoCode))
-                                        , "关闭", " 复制礼包码"
-                                        , () -> {
-                                            copyLink(finalLibaoCode, context);
-                                            if (isInstallRequired) {
-                                                libaoBtn.postDelayed(() -> {
-                                                    Spanned msg = Html.fromHtml(
-                                                            context.getString(R.string.taoed_copy_dialog
-                                                                    , finalLibaoCode));
-                                                    lunningAppDialog(context
-                                                            , msg, libaoEntity);
-                                                }, 300);
-                                            }
-                                        }, null);
-                            }
-
-                            @Override
-                            public void postFailed(Throwable error) {
-                                Utils.log("---" + error.toString());
-
-                                if (loadingDialog != null) loadingDialog.dismiss();
-
-                                if (error instanceof HttpException) {
-                                    HttpException exception = (HttpException) error;
-                                    if (exception.code() == 403) {
-                                        try {
-                                            JSONObject errorJson = new JSONObject(exception.response().errorBody().string());
-                                            String detail = errorJson.getString("detail");
-//                                                    Utils.toast(context, "返回::" + detail);
-                                            switch (detail) {
-                                                case "coming":
-                                                    Utils.toast(context, "礼包领取时间未开始");
-                                                    break;
-                                                case "finish":
-                                                    Utils.toast(context, "礼包领取时间已结束");
-                                                    break;
-                                                case "fetched":
-                                                    Utils.toast(context, "你今天已领过这个礼包了, 不能再淘号");
-
-                                                    libaoBtn.setText("已淘号");
-                                                    libaoBtn.setBackgroundResource(R.drawable.libao_taoed_style);
-                                                    libaoBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.libao_taoed_selector));
-                                                    libaoEntity.setStatus("taoed");
-                                                    break;
-                                                case "try tao":
-                                                case "used up":
-                                                    DialogUtils.showHintDialog(context, "礼包已领光"
-                                                            , "手速不够快，礼包已经被抢光了，十分抱歉", "知道了");
-                                                    break;
-                                                case "maintaining":
-                                                    Utils.toast(context, "网络状态异常，请稍后再试");
-                                                    break;
-                                                case "fail to compete":
-                                                    Utils.toast(context, "淘号失败，稍后重试");
-                                                    break;
-                                                default:
-                                                    Utils.toast(context, "操作失败");
-                                                    break;
-
-                                            }
-                                        } catch (Exception ex) {
-                                            ex.printStackTrace();
-                                            Utils.toast(context, "礼包处理异常" + ex.toString());
-                                        }
-                                        return;
-                                    } else if (exception.code() == 401) {
-                                        return;
-                                    }
-                                }
-                                Utils.toast(context, "发生异常");
-                            }
-                        });
+                        libaoTao(context, libaoBtn, libaoEntity, isInstallRequired, adapter, status, entrance);
                         break;
                 }
             });
         });
     }
 
+    private static void libaoTao(Context context, TextView libaoBtn, LibaoEntity libaoEntity, boolean isInstallRequired, LibaoDetailAdapter adapter, String status, String entrance) {
+        if ("repeatTao".equals(status)) {
+            Utils.toast(context, "没到重复淘号时间, 礼包每天0点刷新");
+            return;
+        }
+        final Dialog loadingDialog = DialogUtils.showWaitDialog(context, "淘号中...");
+        postLibaoTao(context, libaoEntity.getId(), new PostLibaoListener() {
+            @Override
+            public void postSucceed(Object response) {
+
+                if (loadingDialog != null) loadingDialog.dismiss();
+
+                JSONObject responseBody = (JSONObject) response;
+                String libaoCode = null;
+                boolean hasSame = false;
+                try {
+                    hasSame = responseBody.getBoolean("has_same");
+                    libaoCode = responseBody.getString("code");
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+
+                if (TextUtils.isEmpty(libaoCode)) {
+                    try {
+                        String detail = responseBody.getString("detail").toLowerCase();
+                        switch (detail) {
+                            case "maintaining":
+                                Utils.toast(context, "网络状态异常，请稍后再试");
+                                break;
+                            case "fail to compete":
+                                Utils.toast(context, "淘号失败，稍后重试");
+                                break;
+                            default:
+                                Utils.toast(context, "淘号异常");
+                                break;
+                        }
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
+                    return;
+                }
+                Utils.toast(context, "淘号成功");
+                libaoEntity.setStatus("taoed");
+                EventBus.getDefault().post(new EBReuse("libaoChanged"));
+                adapter.initLibaoCode(new UserDataLibaoEntity(libaoCode, "tao", Utils.getTime(context)));
+                uploadEvent(libaoEntity, true, entrance);
+                final String finalLibaoCode = libaoCode;
+                String des;
+                if (!hasSame) {
+                    des = "淘到的礼包码不保证可以兑换，请尽快前往游戏兑换";
+                } else {
+                    des = "您已领取过相同的礼包，可能无法成功兑换，请自行尝试";
+                }
+                DialogUtils.showReceiveLibaoSuccessDialog(context, "淘号成功", des, finalLibaoCode, () -> {
+                    copyLink(finalLibaoCode, context);
+                    if (isInstallRequired) {
+                        libaoBtn.postDelayed(() -> {
+                            Spanned msg = Html.fromHtml(
+                                    context.getString(R.string.taoed_copy_dialog
+                                            , finalLibaoCode));
+                            lunningAppDialog(context
+                                    , msg, libaoEntity);
+                        }, 300);
+                    }
+                });
+            }
+
+            @Override
+            public void postFailed(Throwable error) {
+                Utils.log("---" + error.toString());
+
+                if (loadingDialog != null) loadingDialog.dismiss();
+
+                if (error instanceof HttpException) {
+                    HttpException exception = (HttpException) error;
+                    if (exception.code() == 403) {
+                        try {
+                            JSONObject errorJson = new JSONObject(exception.response().errorBody().string());
+                            String detail = errorJson.getString("detail").toLowerCase();
+                            switch (detail) {
+                                case "coming":
+                                    Utils.toast(context, "礼包领取时间未开始");
+                                    break;
+                                case "finish":
+                                    Utils.toast(context, "礼包领取时间已结束");
+                                    break;
+                                case "fetched":
+                                    Utils.toast(context, "你今天已领过这个礼包了, 不能再淘号");
+
+                                    libaoBtn.setText("已淘号");
+                                    libaoBtn.setBackgroundResource(R.drawable.libao_taoed_style);
+                                    libaoBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.libao_taoed_selector));
+                                    libaoEntity.setStatus("taoed");
+                                    break;
+                                case "try tao":
+                                case "used up":
+                                    DialogUtils.showHintDialog(context, "礼包已领光"
+                                            , "手速不够快，礼包已经被抢光了，十分抱歉", "知道了");
+                                    break;
+                                case "maintaining":
+                                    Utils.toast(context, "网络状态异常，请稍后再试");
+                                    break;
+                                case "fail to compete":
+                                    Utils.toast(context, "淘号失败，稍后重试");
+                                    break;
+                                default:
+                                    Utils.toast(context, "操作失败");
+                                    break;
+
+                            }
+                        } catch (Exception ex) {
+                            ex.printStackTrace();
+                            Utils.toast(context, "礼包处理异常" + ex.toString());
+                        }
+                        return;
+                    } else if (exception.code() == 401) {
+                        return;
+                    }
+                }
+                Utils.toast(context, "发生异常");
+            }
+        });
+    }
+
     private static void libaoLing(final Context context, final TextView libaoBtn, final LibaoEntity libaoEntity, final LibaoDetailAdapter adapter,
                                   final boolean isInstallRequired, String captchaCode, final String entrance) {
 
@@ -435,45 +509,56 @@ public class LibaoUtils {
                 if (loadingDialog != null) loadingDialog.dismiss();
 
                 JSONObject responseBody = (JSONObject) response;
+                boolean hasSame = false; //是否领取过相同的礼包
                 String libaoCode = null;
+                int gameApkSize = 1;//游戏apk的size，大于1为“多版本插件游戏”，否则为“非插件游戏/单版本插件游戏”
                 try {
+                    hasSame = responseBody.getBoolean("has_same");
                     libaoCode = responseBody.getString("code");
+                    gameApkSize = responseBody.getInt("game_apk_size");
                 } catch (JSONException e) {
                     e.printStackTrace();
                 }
-
                 if (TextUtils.isEmpty(libaoCode)) {
                     Utils.toast(context, "领取异常");
                     return;
                 }
                 libaoEntity.setAvailable(libaoEntity.getAvailable() - 1);
-
                 libaoEntity.setStatus("linged");
-
                 EventBus.getDefault().post(new EBReuse("libaoChanged"));
 
+                uploadEvent(libaoEntity, false, entrance);
+
                 adapter.initLibaoCode(new UserDataLibaoEntity(libaoCode, "ling", Utils.getTime(context)));
                 adapter.notifyDataSetChanged();
                 final String finalLibaoCode = libaoCode;
+                boolean finalHasSame = hasSame;
+                int finalGameApkSize = gameApkSize;
                 NotificationHelper.showNotificationHintDialog(NotificationUgc.GIFT, isShow -> {
                     if (!isShow) {
-                        DialogUtils.showWarningDialog(context, "领取成功", Html.fromHtml(context.getString(R.string.linged_dialog, finalLibaoCode))
-                                , "关闭", " 复制礼包码"
-                                , () -> {
-                                    copyLink(finalLibaoCode, context);
-                                    if (isInstallRequired) {
-                                        libaoBtn.postDelayed(() -> {
-                                            Spanned msg = Html.fromHtml(context.getString(R.string.linged_copy_dialog, finalLibaoCode));
-                                            lunningAppDialog(context
-                                                    , msg, libaoEntity);
-                                        }, 300);
-                                    }
-                                }, null);
+                        String des;
+                        if (!finalHasSame) {
+                            if (finalGameApkSize > 1) {
+                                des = "礼包码将于60分钟后进入淘号池，部分礼包兑换有平台限制，请根据使用说明兑换";
+                            } else {
+                                des = "礼包码将于60分钟后进入淘号池,请尽快前往游戏兑换";
+                            }
+                        } else {
+                            des = "您已领取过相同的礼包，可能无法成功兑换，请自行尝试";
+                        }
+                        DialogUtils.showReceiveLibaoSuccessDialog(context, "领取成功", des, finalLibaoCode, () -> {
+                            copyLink(finalLibaoCode, context);
+                            if (isInstallRequired) {
+                                libaoBtn.postDelayed(() -> {
+                                    Spanned msg = Html.fromHtml(context.getString(R.string.linged_copy_dialog, finalLibaoCode));
+                                    lunningAppDialog(context
+                                            , msg, libaoEntity);
+                                }, 300);
+                            }
+                        });
                     }
                     return null;
                 });
-
-
             }
 
             @Override
@@ -486,7 +571,7 @@ public class LibaoUtils {
                         try {
                             String string = exception.response().errorBody().string();
                             JSONObject errorJson = new JSONObject(string);
-                            String detail = errorJson.getString("detail");
+                            String detail = errorJson.getString("detail").toLowerCase();
                             switch (detail) {
                                 case "coming":
                                     Utils.toast(context, "礼包领取时间未开始");
@@ -516,7 +601,7 @@ public class LibaoUtils {
                                     DialogUtils.showHintDialog(context, "礼包已领光"
                                             , "手速不够快，礼包已经被抢光了，十分抱歉", "知道了");
                                     libaoEntity.setStatus("used_up");
-                                    initLibaoBtn(context, libaoBtn, libaoEntity, isInstallRequired, adapter, entrance);
+                                    initLibaoBtn(context, libaoBtn, libaoEntity, isInstallRequired, adapter, false, entrance);
                                     break;
                                 case "maintaining":
                                     Utils.toast(context, "网络状态异常，请稍后再试");
@@ -544,6 +629,24 @@ public class LibaoUtils {
         }, captchaCode);
     }
 
+    private static void uploadEvent(LibaoEntity libaoEntity, boolean isTao, String entrance) {
+        String location = "";
+        if (!libaoEntity.getClickReceiveBtnIn()) {
+            location = "礼包详情";
+        } else {
+            if (entrance.contains("游戏详情")) {
+                location = "游戏详情";
+            } else if (entrance.contains("礼包中心:最新")) {
+                location = "礼包中心-最新";
+            } else if (entrance.contains("礼包中心:关注")) {
+                location = "礼包中心-关注";
+            }
+        }
+        String event = isTao ? "game_gift_dig_successful" : "game_gift_get_successful";
+        LogUtils.uploadReceiveGift(event, libaoEntity.getId(), libaoEntity.getName(), location,
+                libaoEntity.getGame() == null ? "" : libaoEntity.getGame().getId(), libaoEntity.getGame() == null ? "" : libaoEntity.getGame().getName());
+    }
+
     public static boolean isAppInstalled(Context context, String packageName) {
         List<PackageInfo> pinfo = PackageUtils.getInstalledPackages(context, 0);
         if (pinfo != null) {

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

@@ -16,9 +16,12 @@ import com.gh.common.loghub.LoghubUtils;
 import com.gh.common.loghub.SimpleLogContainerEntity;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.entity.CommunityEntity;
+import com.gh.gamecenter.entity.DetectionObjectEntity;
 import com.gh.gamecenter.entity.GameEntity;
+import com.gh.gamecenter.entity.PackageDialogEntity;
 import com.gh.gamecenter.entity.ShareResultEntity;
 import com.gh.gamecenter.entity.SpecialColumn;
+import com.gh.gamecenter.entity.StartupAdEntity;
 import com.gh.gamecenter.manager.UserManager;
 import com.gh.gamecenter.qa.entity.Questions;
 import com.gh.gamecenter.retrofit.EmptyResponse;
@@ -26,6 +29,7 @@ import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
 
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -235,6 +239,11 @@ public class LogUtils {
             object.put("game_name", gameEntity.getName());
             object.put("game_id", gameEntity.getId());
             object.put("game_platform", gameEntity.getPlatform());
+            if (event != null) {
+                object.put("sequence", event.getPayload().getSequence());
+                object.put("outer_sequence", event.getPayload().getOuterSequence());
+            }
+            object.put("download_open", gameEntity.getDownloadOffStatus() == null ? "true" : "false");
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -255,14 +264,15 @@ public class LogUtils {
         try {
             object.put("version", PackageUtils.getVersionName());
             object.put("channel", HaloApp.getInstance().getChannel());
-            object.put("android_id", MetaUtil.getAndroidId());
+            object.put("dia", MetaUtil.getBase64EncodedAndroidId());
             object.put("time", Utils.getTime(context));
             object.put("network", DeviceUtils.getNetwork(context));
             object.put("user_id", UserManager.getInstance().getUserId());
             object.put("device_system", android.os.Build.VERSION.RELEASE);
             object.put("device_model", android.os.Build.MODEL);
-            object.put("imei", MetaUtil.getIMEI());
+            object.put("jnfj", MetaUtil.getBase64EncodedIMEI());
             object.put("G_ID", UserManager.getInstance().getDeviceId());
+            object.put("oaid", HaloApp.getInstance().getOAID());
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -279,13 +289,13 @@ public class LogUtils {
         try {
             object.put("version", PackageUtils.getVersionName());
             object.put("channel", HaloApp.getInstance().getChannel());
-            object.put("android_id", MetaUtil.getAndroidId());
+            object.put("dia", MetaUtil.getBase64EncodedAndroidId());
             object.put("time", Utils.getTime(context));
             object.put("network", DeviceUtils.getNetwork(context));
             object.put("user_id", UserManager.getInstance().getUserId());
             object.put("device_system", android.os.Build.VERSION.RELEASE);
             object.put("device_model", android.os.Build.MODEL);
-            object.put("imei", MetaUtil.getIMEI());
+            object.put("jnfj", MetaUtil.getBase64EncodedIMEI());
             object.put("G_ID", UserManager.getInstance().getDeviceId());
         } catch (JSONException e) {
             e.printStackTrace();
@@ -298,13 +308,13 @@ public class LogUtils {
         Meta meta = MetaUtil.INSTANCE.getMeta();
         JSONObject metaObject = new JSONObject();
         try {
-            metaObject.put("android_id", meta.getAndroid_id());
+            metaObject.put("dia", MetaUtil.getBase64EncodedAndroidId());
             metaObject.put("android_sdk", meta.getAndroid_sdk());
             metaObject.put("android_version", meta.getAndroid_version());
             metaObject.put("appVersion", meta.getAppVersion());
             metaObject.put("channel", meta.getChannel());
             metaObject.put("gid", meta.getGid());
-            metaObject.put("imei", meta.getImei());
+            metaObject.put("jnfj", MetaUtil.getBase64EncodedIMEI());
             metaObject.put("mac", meta.getMac());
             metaObject.put("manufacturer", meta.getManufacturer());
             metaObject.put("model", meta.getModel());
@@ -376,6 +386,63 @@ public class LogUtils {
         uploadVideoStreaming(object);
     }
 
+    public static void uploadTopVideoStreamingPlaying(String action, String videoId, String videoTitle, String gameId, String gameName, String videoModel, String videoPlayStatus, double videoSize, int videoTotalTime, int videoPlayTs, int progress) {
+        JSONObject object = new JSONObject();
+        JSONObject payloadObject = new JSONObject();
+        try {
+            object.put("event", "TOP_VIDEO_PLAYING");
+            object.put("action", action);
+
+            payloadObject.put("video_mode", videoModel);//视频播放方式 ["自动播放"/"点击播放"/"全屏播放"]
+            payloadObject.put("video_id", videoId);
+            payloadObject.put("video_title", videoTitle);
+            payloadObject.put("game_id", gameId);
+            payloadObject.put("game_name", gameName);
+            payloadObject.put("video_size", videoSize);
+            payloadObject.put("video_total_time", videoTotalTime);
+            payloadObject.put("progress", progress);
+            payloadObject.put("video_play_ts", videoPlayTs);
+            payloadObject.put("video_play_status", videoPlayStatus);
+
+            object.put("payload", payloadObject);
+            object.put("meta", getMetaObject());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        if (BuildConfig.DEBUG) {
+            Utils.log("LogUtils->" + object.toString());
+        }
+        LoghubUtils.log(object, "video_streaming", false);
+    }
+
+    public static void uploadHomeVideoStreamingPlaying(String action, boolean videoShade, String videoId, String videoTitle, String gameId, String gameName, double videoSize, int videoTotalTime, int videoPlayTs, int progress) {
+        JSONObject object = new JSONObject();
+        JSONObject payloadObject = new JSONObject();
+        try {
+            object.put("event", "HOME_VIDEO_PLAYING");
+            object.put("action", action);
+
+            payloadObject.put("video_id", videoId);
+            payloadObject.put("video_title", videoTitle);
+            payloadObject.put("game_id", gameId);
+            payloadObject.put("game_name", gameName);
+            payloadObject.put("video_size", videoSize);
+            payloadObject.put("video_total_time", videoTotalTime);
+            payloadObject.put("progress", progress);
+            payloadObject.put("video_play_ts", videoPlayTs);
+            payloadObject.put("video_shade", String.valueOf(videoShade));//["true"/"false"]是否存在引导遮罩
+
+            object.put("payload", payloadObject);
+            object.put("meta", getMetaObject());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        if (BuildConfig.DEBUG) {
+            Utils.log("LogUtils->" + object.toString());
+        }
+        LoghubUtils.log(object, "video_streaming", false);
+    }
+
     public static void uploadWelcomeDialog(String action, String dialogId, String linkTitle) {
         ExposureEntity payload = new ExposureEntity();
         payload.setWelcomeDialogId(dialogId);
@@ -429,13 +496,13 @@ public class LogUtils {
         Meta meta = MetaUtil.INSTANCE.getMeta();
         JSONObject metaObject = new JSONObject();
         try {
-            metaObject.put("android_id", meta.getAndroid_id());
+            metaObject.put("dia", MetaUtil.getBase64EncodedAndroidId());
             metaObject.put("android_sdk", meta.getAndroid_sdk());
             metaObject.put("android_version", meta.getAndroid_version());
             metaObject.put("appVersion", meta.getAppVersion());
             metaObject.put("channel", meta.getChannel());
             metaObject.put("gid", meta.getGid());
-            metaObject.put("imei", meta.getImei());
+            metaObject.put("jnfj", MetaUtil.getBase64EncodedIMEI());
             metaObject.put("mac", meta.getMac());
             metaObject.put("manufacturer", meta.getManufacturer());
             metaObject.put("model", meta.getModel());
@@ -523,19 +590,20 @@ public class LogUtils {
         Meta meta = MetaUtil.INSTANCE.getMeta();
         JSONObject metaObject = new JSONObject();
         try {
-            metaObject.put("android_id", meta.getAndroid_id());
+            metaObject.put("dia", MetaUtil.getBase64EncodedAndroidId());
             metaObject.put("android_sdk", meta.getAndroid_sdk());
             metaObject.put("android_version", meta.getAndroid_version());
             metaObject.put("appVersion", meta.getAppVersion());
             metaObject.put("channel", meta.getChannel());
             metaObject.put("gid", meta.getGid());
-            metaObject.put("imei", meta.getImei());
+            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("userId", meta.getUserId());
+            metaObject.put("oaid", HaloApp.getInstance().getOAID());
 
         } catch (JSONException e) {
             e.printStackTrace();
@@ -612,10 +680,16 @@ public class LogUtils {
     }
 
     public static void uploadSearchGame(String event, String location, String key, String searchType) {
-        uploadSearchClick(event, location, key, searchType, "", "");
+        uploadSearchClick(event, location, key, searchType, "", "", false);
     }
 
-    public static void uploadSearchClick(String event, String location, String key, String searchType, String gameId, String gameName) {
+    public static void uploadSearchClick(String event,
+                                         String location,
+                                         String key,
+                                         String searchType,
+                                         String gameId,
+                                         String gameName,
+                                         Boolean isMirrorData) {
         JSONObject object = new JSONObject();
         JSONObject payload = new JSONObject();
         try {
@@ -628,6 +702,121 @@ public class LogUtils {
             payload.put("search_type", searchType); //搜索类型, 有四种取值 默认搜索/历史搜索/自动搜索/主动搜索
             payload.put("game_id", gameId); //event为search_click才取值
             payload.put("game_name", gameName); //event为search_click才取值
+            payload.put("is_mirror_data", isMirrorData);
+            object.put("payload", payload);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        if (BuildConfig.DEBUG) {
+            Utils.log("LogUtils->" + object.toString());
+        }
+        LoghubUtils.log(object, "event", false);
+    }
+
+    public static void logGameDetailStrategyButtonEvent(String gameId,
+                                                        String gameName,
+                                                        String text) {
+        JSONObject object = new JSONObject();
+        try {
+            object.put("event", "game_detail_click_strategy_button");
+            object.put("timestamp", System.currentTimeMillis() / 1000);
+            object.put("meta", getMetaObject());
+            object.put("game_id", gameId);
+            object.put("game_name", gameName);
+            object.put("text", text);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        if (BuildConfig.DEBUG) {
+            Utils.log("LogUtils->" + object.toString());
+        }
+        LoghubUtils.log(object, "event", false);
+    }
+
+    public static void logServerTestAccessEvent(String entrance,
+                                                String entranceDetail,
+                                                String serverTestName,
+                                                String serverTestNote) {
+        JSONObject payload = new JSONObject();
+        try {
+            payload.put("server_test_name", serverTestName);
+            payload.put("server_test_note", serverTestNote);
+            payload.put("entrance", entrance);
+            payload.put("entrance_detail", entranceDetail);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        logServerTestEvent("access_to_server_test", payload);
+    }
+
+    public static void logServerTestSelectTypeEvent(String buttonText,
+                                                    String serverTestName,
+                                                    String serverTestNote) {
+        JSONObject payload = new JSONObject();
+        try {
+            payload.put("server_test_name", serverTestName);
+            payload.put("server_test_note", serverTestNote);
+            payload.put("button_text", buttonText);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        logServerTestEvent("server_test_select_type", payload);
+    }
+
+    public static void logServerTestSelectTimeEvent(String buttonText,
+                                                    String serverTestName,
+                                                    String serverTestNote) {
+        JSONObject payload = new JSONObject();
+        try {
+            payload.put("server_test_name", serverTestName);
+            payload.put("server_test_note", serverTestNote);
+            payload.put("button_text", buttonText);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        logServerTestEvent("server_test_select_time", payload);
+    }
+
+    public static void logServerTestClickAllEvent(String serverTestName,
+                                                  String serverTestNote) {
+        JSONObject payload = new JSONObject();
+        try {
+            payload.put("server_test_name", serverTestName);
+            payload.put("server_test_note", serverTestNote);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        logServerTestEvent("server_test_click_all", payload);
+    }
+
+    public static void logServerTestClickMoreEvent(String serverTestName,
+                                                   String serverTestNote,
+                                                   String redirectType,
+                                                   String redirectLink) {
+        JSONObject payload = new JSONObject();
+        try {
+            payload.put("server_test_name", serverTestName);
+            payload.put("server_test_note", serverTestNote);
+            payload.put("redirect_type", redirectType);
+            payload.put("redirect_link", redirectLink);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        logServerTestEvent("server_test_click_more", payload);
+    }
+
+    private static void logServerTestEvent(String event, JSONObject payload) {
+        JSONObject object = new JSONObject();
+        try {
+            object.put("event", event);
+            object.put("meta", getMetaObject());
+            object.put("timestamp", System.currentTimeMillis() / 1000);
             object.put("payload", payload);
         } catch (JSONException e) {
             e.printStackTrace();
@@ -659,6 +848,25 @@ public class LogUtils {
         logCatalogEvent("click_content_list", entrance, key, seq1, -1, seqContent, seqContentList);
     }
 
+    public static void logSpecialCatalogBannerClickEvent(String key, int seq) {
+        JSONObject object = new JSONObject();
+        try {
+            object.put("event", "category_lunbo_click");
+            object.put("meta", getMetaObject());
+            object.put("timestamp", System.currentTimeMillis() / 1000);
+
+            object.put("key", key);
+            object.put("sequence", seq);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        if (BuildConfig.DEBUG) {
+            Utils.log("LogUtils->" + object.toString());
+        }
+        LoghubUtils.log(object, "event", false);
+    }
+
     private static void logCatalogEvent(String event, String entrance, String key, int seq1, int seq2, int seqContent, int seqContentList) {
         JSONObject object = new JSONObject();
         JSONObject payload = new JSONObject();
@@ -683,4 +891,270 @@ public class LogUtils {
         }
         LoghubUtils.log(object, "event", false);
     }
+
+    public static void uploadPackageSkip(String event, String action, String gameId, String gameName) {
+        JSONObject object = new JSONObject();
+        try {
+            object.put("event", event);//external_jump/external_show
+            object.put("action", action);
+            if (!TextUtils.isEmpty(gameId) && !TextUtils.isEmpty(gameName)) {
+                object.put("game_id", gameId);
+                object.put("game_name", gameName);
+            }
+            object.put("meta", getMetaObject());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        if (BuildConfig.DEBUG) {
+            Utils.log("LogUtils->" + object.toString());
+        }
+        LoghubUtils.log(object, "event", false);
+    }
+
+    public static void logStartAd(String event, StartupAdEntity adEntity) {
+        JSONObject object = new JSONObject();
+        try {
+            object.put("event", event);
+            object.put("timestamp", System.currentTimeMillis() / 1000);
+            object.put("meta", getMetaObject());
+            if (adEntity != null) {
+                object.put("abs_id", adEntity.getId());
+                object.put("abs_text", adEntity.getDesc());
+                if (adEntity.getButton()) {
+                    object.put("abs_type", adEntity.getJump().getType());
+                    object.put("abs_link", adEntity.getJump().getLink());
+                    object.put("abs_link_title", adEntity.getJump().getText());
+                }
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        if (BuildConfig.DEBUG) {
+            Utils.log("LogUtils->" + object.toString());
+        }
+        LoghubUtils.log(object, "event", false);
+    }
+
+    public static void logRecommendClick(String entrance, String recommendName, String linkType, String linkTitle, int sequence) {
+        JSONObject object = new JSONObject();
+        try {
+            object.put("event", "recommend_click");
+            object.put("timestamp", System.currentTimeMillis() / 1000);
+            object.put("meta", getMetaObject());
+            object.put("entrance", entrance);
+            object.put("recommend_name", recommendName);
+            object.put("link_type", linkType);
+            object.put("link_title", linkTitle);
+            object.put("sequence", sequence);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        if (BuildConfig.DEBUG) {
+            Utils.log("LogUtils->" + object.toString());
+        }
+        LoghubUtils.log(object, "event", false);
+    }
+
+    public static void uploadPackageCheck(String event, String action, GameEntity gameEntity, String linkTitle, String linkDesc, String downloadGameId, String downloadGameName) {
+        PackageDialogEntity packageDialog = gameEntity.getPackageDialog();
+        if (packageDialog == null) return;
+        JSONObject object = new JSONObject();
+        JSONObject payloadObject = new JSONObject();
+        try {
+            object.put("event", event);
+            object.put("action", action);
+
+            payloadObject.put("game_id", gameEntity.getId());
+            payloadObject.put("game_name", gameEntity.getName());
+            payloadObject.put("link_title", linkTitle);
+            payloadObject.put("link_desc", linkDesc);
+            payloadObject.put("download_game_id", downloadGameId);
+            payloadObject.put("download_game_name", downloadGameName);
+            JSONArray detectionArray = new JSONArray();
+            for (DetectionObjectEntity entity : packageDialog.getDetectionObjects()) {
+                JSONObject detectionObject = new JSONObject();
+                detectionObject.put("text", entity.getText());
+                detectionObject.put("packages", new JSONArray(GsonUtils.toJson(entity.getPackages())));
+                detectionArray.put(detectionObject);
+            }
+            payloadObject.put("detection_objects", detectionArray);
+
+            object.put("meta", getMetaObject());
+            object.put("payload", payloadObject);
+            object.put("timestamp", System.currentTimeMillis() / 1000);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        if (BuildConfig.DEBUG) {
+            Utils.log("LogUtils->" + object.toString());
+        }
+        LoghubUtils.log(object, "event", false);
+    }
+
+    public static void logCategoryV2AppearanceEvent(String entrance, String classification) {
+        logCategoryV2Event("access_to_classification_v2", entrance, classification, "", "", "", "", "", -1, -1, -1, -1);
+    }
+
+    public static void logCategoryV2ClickSideEvent(String entrance, String classification, String sideClassification, int seq) {
+        logCategoryV2Event("click_side", entrance, classification, sideClassification, "", "", "", "", seq, -1, -1, -1);
+    }
+
+    public static void logCategoryV2ClickClassificationEvent(String entrance, String classification, String sideClassification, String classification1, String classification2, int seq1, int seq2) {
+        logCategoryV2Event("click_classification", entrance, classification, sideClassification, classification1, classification2, "", "", -1, -1, seq1, seq2);
+    }
+
+    public static void logCategoryV2ClickClassificationDeleteEvent(String entrance, String classification, String classification1, String classification2, String location) {
+        logCategoryV2Event("click_classification_delete", entrance, classification, "", classification1, classification2, "", location, -1, -1, -1, -1);
+    }
+
+    public static void logCategoryV2ClickDetermineEvent(String entrance, String classification, String classification2) {
+        logCategoryV2Event("click_determine", entrance, classification, "", "", classification2, "", "", -1, -1, -1, -1);
+    }
+
+    public static void logCategoryV2ClickResetEvent(String entrance, String classification, String classification2, String location) {
+        logCategoryV2Event("click_reset", entrance, classification, "", "", classification2, "", location, -1, -1, -1, -1);
+    }
+
+    public static void logSpecialCategoryV2BannerClickEvent(String entrance, String classification, String detail, int seq) {
+        logCategoryV2Event("category_lunbo_click_v2", entrance, classification, "", "", "", detail, "", seq, -1, -1, -1);
+    }
+
+    public static void logSpecialCategoryV2ContentClickEvent(String entrance, String classification, String detail, int seq) {
+        logCategoryV2Event("click_content_v2", entrance, classification, "", "", "", detail, "", seq, -1, -1, -1);
+    }
+
+    public static void logSpecialCategoryV2SpecificContentClickEvent(String entrance, String classification, String detail, int seq, int outSeq) {
+        logCategoryV2Event("click_content_list_v2", entrance, classification, "", "", "", detail, "", seq, outSeq, -1, -1);
+    }
+
+    public static void logCategoryV2Event(String event,
+                                          String entrance,
+                                          String classification,
+                                          String sideClassification,
+                                          String classification1,
+                                          String classification2,
+                                          String detail,
+                                          String location,
+                                          int seq,
+                                          int outSeq,
+                                          int seq1,
+                                          int seq2) {
+        JSONObject object = new JSONObject();
+        try {
+            object.put("event", event);
+            object.put("meta", getMetaObject());
+            object.put("timestamp", System.currentTimeMillis() / 1000);
+
+            object.put("entrance", entrance);
+            object.put("classification", classification);
+            object.put("side_classification", sideClassification);
+            object.put("classification_1st", classification1);
+            object.put("classification_2nd", classification2);
+            object.put("detail", detail);
+            object.put("location", location);
+            object.put("sequence", seq);
+            object.put("outer_sequence", outSeq);
+            object.put("seq_1st", seq1);
+            object.put("seq_2nd", seq2);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        if (BuildConfig.DEBUG) {
+            Utils.log("LogUtils->" + object.toString());
+        }
+        LoghubUtils.log(object, "event", false);
+    }
+
+    public static void logGameDetailFixedTopArticleClick(String gameId, String gameName, String url) {
+        JSONObject object = new JSONObject();
+        try {
+            object.put("event", "game_detail_click_top_strategy");
+            object.put("game_id", gameId);
+            object.put("game_name", gameName);
+            object.put("top_strategy_url", url);
+            object.put("meta", getMetaObject());
+            object.put("timestamp", System.currentTimeMillis() / 1000);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        if (BuildConfig.DEBUG) {
+            Utils.log("LogUtils->" + object.toString());
+        }
+        LoghubUtils.log(object, "event", false);
+    }
+
+    public static void logHomeTopTabClick(String tabName, String linkType, String linkTitle, int sequence) {
+        JSONObject object = new JSONObject();
+        try {
+            object.put("event", "top_tab_click");
+            object.put("tab_name", tabName);
+            object.put("link_type", linkType);
+            object.put("link_title", linkTitle);
+            object.put("sequence", sequence);
+            object.put("meta", getMetaObject());
+            object.put("timestamp", System.currentTimeMillis() / 1000);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        if (BuildConfig.DEBUG) {
+            Utils.log("LogUtils->" + object.toString());
+        }
+        LoghubUtils.log(object, "event", false);
+    }
+
+    public static void uploadRecommendPopup(String event, String popupId, String gameId, String gameName,
+                                            String linkType, String linkTitle, String downloadGameId, String downloadGameName) {
+        JSONObject object = new JSONObject();
+        JSONObject payloadObject = new JSONObject();
+        try {
+            object.put("event", event);//recommend_pop_show推荐弹窗出现、recommend_pop_close推荐弹窗手动关闭、recommend_pop_link_click点击推荐弹窗链接、recommend_pop_download推荐弹窗下载开始、recommend_pop_download_complete推荐弹窗下载完成
+            payloadObject.put("recommend_pop_id", popupId);
+            payloadObject.put("game_id", gameId);
+            payloadObject.put("game_name", gameName);
+            if (!TextUtils.isEmpty(linkType)) {
+                payloadObject.put("link_type", linkType);
+            }
+            if (!TextUtils.isEmpty(linkTitle)) {
+                payloadObject.put("link_title", linkTitle);
+            }
+            if (!TextUtils.isEmpty(downloadGameId)) {
+                payloadObject.put("download_game_id", downloadGameId);
+            }
+            if (!TextUtils.isEmpty(downloadGameName)) {
+                payloadObject.put("download_game_name", downloadGameName);
+            }
+            object.put("payload", payloadObject);
+            object.put("meta", getMetaObject());
+            object.put("timestamp", System.currentTimeMillis() / 1000);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        if (BuildConfig.DEBUG) {
+            Utils.log("LogUtils->" + object.toString());
+        }
+        LoghubUtils.log(object, "event", false);
+    }
+
+    public static void uploadReceiveGift(String event, String giftId, String giftName, String location, String gameId, String gameName) {
+        JSONObject object = new JSONObject();
+        JSONObject payloadObject = new JSONObject();
+        try {
+            object.put("event", event);//game_gift_get_successful领取礼包、game_gift_dig_successful淘号
+            payloadObject.put("gift_id", giftId);
+            payloadObject.put("gift_name", giftName);
+            payloadObject.put("location", location);
+            payloadObject.put("game_id", gameId);
+            payloadObject.put("game_name", gameName);
+            object.put("payload", payloadObject);
+            object.put("meta", getMetaObject());
+            object.put("timestamp", System.currentTimeMillis() / 1000);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        if (BuildConfig.DEBUG) {
+            Utils.log("LogUtils->" + object.toString());
+        }
+        LoghubUtils.log(object, "event", false);
+    }
 }

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

@@ -8,6 +8,7 @@ import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.Matrix;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 
@@ -29,7 +30,10 @@ import android.widget.TextView;
 import com.gh.common.Base64ImageHolder;
 import com.gh.common.constant.Config;
 import com.gh.gamecenter.R;
+import com.gh.gamecenter.WeiBoShareActivity;
 import com.lightgame.utils.Utils;
+import com.sina.weibo.sdk.WbSdk;
+import com.sina.weibo.sdk.auth.AuthInfo;
 import com.tencent.connect.auth.QQToken;
 import com.tencent.connect.share.QQShare;
 import com.tencent.mm.opensdk.modelmsg.SendMessageToWX;
@@ -48,7 +52,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.util.Date;
-import java.util.List;
+
+import static com.gh.common.util.LoginHelper.WEIBO_SCOPE;
 
 /**
  * Created by khy on 2016/11/8.
@@ -65,6 +70,9 @@ public class MessageShareUtils {
     private PopupWindow mPopupWindow;
     private Bitmap shareBm; //分享截图
     private String picName;
+    private ShareWay shareWay;
+    private boolean isFromInviteFriends = false;
+    private String mWriteBitmapPath;
 
 
     private String[] mArrLabel = {"微信好友", "朋友圈", "QQ好友", "QQ空间", "保存"};
@@ -76,23 +84,51 @@ public class MessageShareUtils {
             R.drawable.share_save
     };
 
+    public enum ShareWay {
+        qq("qq"),
+        qqZone("qq空间"),
+        weibo("微博"),
+        wechat("微信"),
+        wechatMoments("朋友圈");
+
+        private String name;
+
+        ShareWay(String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+    }
+
     //QQ或者QQ空间分享回调处理
     public IUiListener QqShareListener = new IUiListener() {
         @Override
         public void onComplete(Object o) {
             Utils.toast(mContext, "分享成功");
+            if (isFromInviteFriends) {
+                IntegralLogHelper.INSTANCE.logInviteResult("成功", shareWay.getName());
+            }
         }
 
         @Override
         public void onError(UiError uiError) {
+            if (isFromInviteFriends) {
+                IntegralLogHelper.INSTANCE.logInviteResult("失败", shareWay.getName());
+            }
             // 单分享图片不支持显示未安装弹窗,手动调出
-            Activity activity = mActivity.get();
-            if (activity != null && !ShareUtils.isQQClientAvailable(activity.getApplication())) {
-                new TDialog(activity,
-                        "",
-                        "http://openmobile.qq.com/oauth2.0/m_jump_by_version",
-                        null,
-                        new QQToken("")).show();
+            if (mActivity != null) {
+                Activity activity = mActivity.get();
+                if (activity != null && !ShareUtils.isQQClientAvailable(activity.getApplication())) {
+                    new TDialog(activity,
+                            "",
+                            "http://openmobile.qq.com/oauth2.0/m_jump_by_version",
+                            null,
+                            new QQToken("")).show();
+                } else {
+                    Utils.toast(mContext, "分享失败");
+                }
             } else {
                 Utils.toast(mContext, "分享失败");
             }
@@ -101,6 +137,9 @@ public class MessageShareUtils {
         @Override
         public void onCancel() {
             Utils.toast(mContext, R.string.share_cancel_hint);
+            if (isFromInviteFriends) {
+                IntegralLogHelper.INSTANCE.logInviteResult("取消", shareWay.getName());
+            }
         }
     };
 
@@ -117,6 +156,12 @@ public class MessageShareUtils {
         mTencent = Tencent.createInstance(Config.TENCENT_APPID, context); //初始化QQ分享
         mIWXAPI = WXAPIFactory.createWXAPI(context, Config.WECHAT_APPID); //初始化微信分享
         mContext = context.getApplicationContext();
+        // 安卓11无法访问Android/data目录
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            mWriteBitmapPath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/ShareImg/";
+        } else {
+            mWriteBitmapPath = context.getExternalCacheDir().getPath() + "/ShareImg/";
+        }
     }
 
     public static MessageShareUtils getInstance(Context context) {
@@ -206,55 +251,70 @@ public class MessageShareUtils {
         });
     }
 
+    public void shareInviteFriends(Activity activity, String type) {
+        isFromInviteFriends = true;
+        shareFromWeb(activity, type);
+    }
+
     public void shareFromWeb(Activity activity, String type) {
-        // base64转bitmap
-        byte[] decode = Base64.decode(Base64ImageHolder.INSTANCE.getImage(), Base64.DEFAULT);
-        Bitmap bitmap = BitmapFactory.decodeByteArray(decode, 0, decode.length);
-        // 转完后重新置位
-        Base64ImageHolder.INSTANCE.setImage("");
-
-        this.picName = "shareImgPic.jpg";
         this.mActivity = new WeakReference<>(activity);
-        this.shareBm = bitmap;
 
-        // 保存图片
-        File file = new File(activity.getExternalCacheDir().getPath() + "/ShareImg");
-        if (!file.isDirectory()) {
-            file.delete();
-            file.mkdirs();
-        }
-        if (!file.exists()) {
-            file.mkdirs();
-        }
-        writeBitmap(file.getPath(), picName, bitmap, false);
+        if ("weibo".equals(type)) {
+            shareWay = ShareWay.weibo;
+            weiboShare();
+        } else {
+            // base64转bitmap
+            byte[] decode = Base64.decode(Base64ImageHolder.INSTANCE.getImage(), Base64.DEFAULT);
+            Bitmap bitmap = BitmapFactory.decodeByteArray(decode, 0, decode.length);
+            // 转完后重新置位
+            Base64ImageHolder.INSTANCE.setImage("");
+            this.picName = "shareImgPic.jpg";
+            this.shareBm = bitmap;
 
-        // 分享
-        switch (type) {
-            case "qq" :
-                qqSahre();
-                break;
-            case "qq_zone" :
-                qZoneSahre();
-                break;
-            case "wechat" :
-                wechatSahre();
-                break;
-            case "wechat_moments" :
-                wechatMomentsSahre();
-            case "save" :
-                String savePath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/ghzhushou/";
-                writeBitmap(savePath, "gh-" + new Date().getTime() + ".jpg", shareBm, true);
-                break;
+            // 保存图片
+            File file = new File(mWriteBitmapPath);
+            if (!file.isDirectory()) {
+                file.delete();
+                file.mkdirs();
+            }
+            if (!file.exists()) {
+                file.mkdirs();
+            }
+            writeBitmap(file.getPath(), picName, bitmap, false);
+
+            // 分享
+            switch (type) {
+                case "qq" :
+                    shareWay = ShareWay.qq;
+                    qqShare();
+                    break;
+                case "qq_zone" :
+                    shareWay = ShareWay.qqZone;
+                    qZoneShare();
+                    break;
+                case "wechat" :
+                    shareWay = ShareWay.wechat;
+                    wechatShare();
+                    break;
+                case "wechat_moments" :
+                    shareWay = ShareWay.wechatMoments;
+                    wechatMomentsShare();
+                    break;
+                case "save" :
+                    String savePath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/ghzhushou/";
+                    writeBitmap(savePath, "gh-" + new Date().getTime() + ".jpg", shareBm, true);
+                    break;
+            }
         }
     }
 
     //QQ分享
-    private void qqSahre() {
+    private void qqShare() {
         Utils.toast(mContext, "分享跳转中...");
         Bundle params = new Bundle();
         params.putInt(QQShare.SHARE_TO_QQ_KEY_TYPE,
                 QQShare.SHARE_TO_QQ_TYPE_IMAGE);
-        params.putString(QQShare.SHARE_TO_QQ_IMAGE_LOCAL_URL, mContext.getExternalCacheDir().getPath() + "/ShareImg/" + picName);
+        params.putString(QQShare.SHARE_TO_QQ_IMAGE_LOCAL_URL, mWriteBitmapPath + picName);
         params.putString(QQShare.SHARE_TO_QQ_APP_NAME, mContext.getString(R.string.app_name));
         params.putInt(QQShare.SHARE_TO_QQ_EXT_INT,
                 QQShare.SHARE_TO_QQ_FLAG_QZONE_ITEM_HIDE);
@@ -269,12 +329,12 @@ public class MessageShareUtils {
     }
 
     //QQ空间分享
-    private void qZoneSahre() {
+    private void qZoneShare() {
         Utils.toast(mContext, "分享跳转中...");
         Bundle params = new Bundle();
         params.putInt(QQShare.SHARE_TO_QQ_KEY_TYPE,
                 QQShare.SHARE_TO_QQ_TYPE_IMAGE);
-        params.putString(QQShare.SHARE_TO_QQ_IMAGE_LOCAL_URL, mContext.getExternalCacheDir().getPath() + "/ShareImg/" + picName);
+        params.putString(QQShare.SHARE_TO_QQ_IMAGE_LOCAL_URL, mWriteBitmapPath + picName);
         params.putString(QQShare.SHARE_TO_QQ_APP_NAME, mContext.getString(R.string.app_name));
         params.putInt(QQShare.SHARE_TO_QQ_EXT_INT,
                 QQShare.SHARE_TO_QQ_FLAG_QZONE_AUTO_OPEN);
@@ -289,7 +349,7 @@ public class MessageShareUtils {
     }
 
     //微信好友分享
-    private void wechatSahre() {
+    private void wechatShare() {
         Utils.toast(mContext, "分享跳转中...");
 
         if (!PackageHelper.INSTANCE.getLocalPackageNameSet().contains("com.tencent.mm")) {
@@ -299,7 +359,7 @@ public class MessageShareUtils {
 
         //官方分享
         WXImageObject imgObj = new WXImageObject();
-        imgObj.setImagePath(mContext.getExternalCacheDir().getPath() + "/ShareImg/" + picName);
+        imgObj.setImagePath(mWriteBitmapPath + picName);
         WXMediaMessage msg = new WXMediaMessage();
         msg.mediaObject = imgObj;
 
@@ -325,7 +385,7 @@ public class MessageShareUtils {
     }
 
     //微信朋友圈分享
-    private void wechatMomentsSahre() {
+    private void wechatMomentsShare() {
         Utils.toast(mContext, "分享跳转中...");
 
         if (!PackageHelper.INSTANCE.getLocalPackageNameSet().contains("com.tencent.mm")) {
@@ -334,7 +394,7 @@ public class MessageShareUtils {
         }
 
         WXImageObject imgObj = new WXImageObject();
-        imgObj.setImagePath(mContext.getExternalCacheDir().getPath() + "/ShareImg/" + picName);
+        imgObj.setImagePath(mWriteBitmapPath + picName);
         WXMediaMessage msg = new WXMediaMessage();
         msg.mediaObject = imgObj;
 
@@ -352,6 +412,20 @@ public class MessageShareUtils {
         mPopupWindow.dismiss();
     }
 
+    //新浪微博分享
+    public void weiboShare() {
+        WbSdk.install(mContext, new AuthInfo(mContext, Config.WEIBO_APPKEY, "http://www.sina.com", WEIBO_SCOPE));
+
+        Activity activity = mActivity.get();
+        if (activity != null) {
+            Intent intent = WeiBoShareActivity.getWeiboImageShareIntent(activity);
+            activity.startActivity(intent);
+        }
+
+        if (mPopupWindow == null) return;
+        mPopupWindow.dismiss();
+    }
+
     private String buildTransaction(final String type) {
         return (type == null) ? String.valueOf(System.currentTimeMillis()) : type + System.currentTimeMillis();
     }
@@ -474,22 +548,22 @@ public class MessageShareUtils {
             holder.itemView.setOnClickListener(v -> {
                 switch (holder.getPosition()) {
                     case 0:
-                        wechatSahre();
+                        wechatShare();
                         if (shareType != 2) {
 //                                activity.finish();
                         }
                         break;
                     case 1:
-                        wechatMomentsSahre();
+                        wechatMomentsShare();
                         if (shareType != 2) {
 //                                activity.finish();
                         }
                         break;
                     case 2:
-                        qqSahre();
+                        qqShare();
                         break;
                     case 3:
-                        qZoneSahre();
+                        qZoneShare();
                         break;
                     case 4:
                         String savePath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pictures/ghzhushou/";

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

@@ -5,6 +5,11 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.telephony.TelephonyManager;
 
+import com.cmic.sso.sdk.auth.AuthnHelper;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
 public class NetworkUtils {
 
     /**
@@ -75,6 +80,26 @@ public class NetworkUtils {
         return false;
     }
 
+    /**
+     * 判断是否打开数据流量(一键登录必须要打开流量才能获取到手机号码)
+     *
+     * AuthnHelper的getNetworkType方法用于获取用户当前的网络环境和运营商，返回的是JSONObject，其中
+     * operatorType字段获取网络运营商: 0.未知 1.移动流量 2.联通流量 3.电信流量，
+     * networkType字段获取网络状态：0.未知；1.流量 2.wifi；3.数据流量+wifi
+     */
+    public static boolean isOpenMobileData(Context context){
+        AuthnHelper helper = AuthnHelper.getInstance(context);
+        JSONObject jsonObject = helper.getNetworkType(context);
+        int net;
+        try {
+            net = Integer.parseInt(jsonObject.getString("networkType"));
+            if (net == 1 || net == 3) return true;
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
     /**
      * 获取当前网络连接的类型信息
      *

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

@@ -58,7 +58,7 @@ object NotificationHelper {
         when (ugc) {
             NotificationUgc.LOGIN -> {
                 if (!isShowedLogin) {
-                    show(AppManager.getInstance().recentActiveActivity as AppCompatActivity, ugc, callBack)
+                    show(AppManager.getInstance().recentActiveActivity as? AppCompatActivity, ugc, callBack)
                     SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_LOGIN, true)
                     // 设置今天的时间，表示今天已经触发过了
                     SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday())
@@ -68,7 +68,7 @@ object NotificationHelper {
             }
             NotificationUgc.QUESTION -> {
                 if (!isShowedQuestion) {
-                    show(AppManager.getInstance().recentActiveActivity as AppCompatActivity, ugc, callBack)
+                    show(AppManager.getInstance().recentActiveActivity as? AppCompatActivity, ugc, callBack)
                     SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_QUESTION, true)
                     SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday())
                 } else {
@@ -77,7 +77,7 @@ object NotificationHelper {
             }
             NotificationUgc.ANSWER -> {
                 if (!isShowedAnswer) {
-                    show(AppManager.getInstance().recentActiveActivity as AppCompatActivity, ugc, callBack)
+                    show(AppManager.getInstance().recentActiveActivity as? AppCompatActivity, ugc, callBack)
                     SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_ANSWER, true)
                     SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday())
                 } else {
@@ -86,7 +86,7 @@ object NotificationHelper {
             }
             NotificationUgc.ARTICLE -> {
                 if (!isShowedArticle) {
-                    show(AppManager.getInstance().recentActiveActivity as AppCompatActivity, ugc, callBack)
+                    show(AppManager.getInstance().recentActiveActivity as? AppCompatActivity, ugc, callBack)
                     SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_ARTICLE, true)
                     SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday())
                 } else {
@@ -95,7 +95,7 @@ object NotificationHelper {
             }
             NotificationUgc.VIDEO -> {
                 if (!isShowedVideo) {
-                    show(AppManager.getInstance().recentActiveActivity as AppCompatActivity, ugc, callBack)
+                    show(AppManager.getInstance().recentActiveActivity as? AppCompatActivity, ugc, callBack)
                     SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_VIDEO, true)
                     SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday())
                 } else {
@@ -104,7 +104,7 @@ object NotificationHelper {
             }
             NotificationUgc.RATING -> {
                 if (!isShowedRating) {
-                    show(AppManager.getInstance().recentActiveActivity as AppCompatActivity, ugc, callBack)
+                    show(AppManager.getInstance().recentActiveActivity as? AppCompatActivity, ugc, callBack)
                     SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_RATING, true)
                     SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday())
                 } else {
@@ -113,7 +113,7 @@ object NotificationHelper {
             }
             NotificationUgc.GIFT -> {
                 if (!isShowedGift) {
-                    show(AppManager.getInstance().recentActiveActivity as AppCompatActivity, ugc, callBack)
+                    show(AppManager.getInstance().recentActiveActivity as? AppCompatActivity, ugc, callBack)
                     SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_GIFT, true)
                     SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday())
                 } else {
@@ -122,7 +122,7 @@ object NotificationHelper {
             }
             NotificationUgc.RESERVE_GAME -> {
                 if (!isShowedReserveGame) {
-                    show(AppManager.getInstance().recentActiveActivity as AppCompatActivity, ugc, callBack)
+                    show(AppManager.getInstance().recentActiveActivity as? AppCompatActivity, ugc, callBack)
                     SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_RESERVE_GAME, true)
                     SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday())
                 } else {
@@ -131,7 +131,7 @@ object NotificationHelper {
             }
             NotificationUgc.FEEDBACK -> {
                 if (!isShowedFeedback) {
-                    show(AppManager.getInstance().recentActiveActivity as AppCompatActivity, ugc, callBack)
+                    show(AppManager.getInstance().recentActiveActivity as? AppCompatActivity, ugc, callBack)
                     SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_FEEDBACK, true)
                     SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday())
                 } else {

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

@@ -37,4 +37,15 @@ object NumberUtils {
         val minute = Math.round((totalMinute - hour * 60).toFloat())
         return hour.toString() + "小时" + if (minute == 0) "" else minute.toString() + "分钟"
     }
+
+    @JvmStatic
+    fun findMax(lastPositions: IntArray): Int {
+        var max = lastPositions[0]
+        for (value in lastPositions) {
+            if (value > max) {
+                max = value
+            }
+        }
+        return max
+    }
 }

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

@@ -11,6 +11,7 @@ import androidx.core.content.FileProvider
 import com.gh.common.constant.Constants
 import com.gh.common.dialog.InstallPermissionDialogFragment
 import com.gh.common.xapk.XapkInstaller
+import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.BuildConfig
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DownloadEntity
@@ -21,13 +22,12 @@ import java.io.File
 
 object PackageInstaller {
 
-
     /**
      * 为了兼容java代码
      */
     @JvmStatic
-    fun install(context: Context, downloadEntity: DownloadEntity) {
-        install(context, downloadEntity, true)
+    fun install(context: Context, downloadEntity: DownloadEntity?) {
+        downloadEntity?.let { install(context, downloadEntity, true) }
     }
 
     /**
@@ -44,15 +44,19 @@ object PackageInstaller {
 
         val currentActivity = AppManager.getInstance().currentActivity() ?: return
 
-        InstallPermissionDialogFragment.show(currentActivity as AppCompatActivity, downloadEntity) {
-            // 取消状态栏下载完成的通知，若存在
-            downloadEntity.meta[Constants.MARK_ALREADY_TRIGGERED_INSTALLATION] = "YES"
-            DownloadNotificationHelper.addOrUpdateDownloadNotification(downloadEntity)
+        // TODO 此处可能遇到 activity 是 WXEntryActivity
+        // TODO 当 activity 全部出栈，但是应用还在下载游戏，下载完会唤不起安装!
+        if (currentActivity is AppCompatActivity) {
+            InstallPermissionDialogFragment.show(currentActivity, downloadEntity) {
+                // 取消状态栏下载完成的通知，若存在
+                downloadEntity.meta[Constants.MARK_ALREADY_TRIGGERED_INSTALLATION] = "YES"
+                DownloadNotificationHelper.addOrUpdateDownloadNotification(downloadEntity)
 
-            if (isXapk) {
-                XapkInstaller.install(context, downloadEntity, showUnzipToast)
-            } else {
-                install(context, downloadEntity.path)
+                if (isXapk) {
+                    XapkInstaller.install(context, downloadEntity, showUnzipToast)
+                } else {
+                    install(context, downloadEntity.isPlugin, downloadEntity.path)
+                }
             }
         }
     }
@@ -64,14 +68,30 @@ object PackageInstaller {
      * 除非你已经确定该文件一定是Apk
      */
     @JvmStatic
-    fun install(context: Context, pkgPath: String) {
+    fun install(context: Context, isPluggin: Boolean = false, pkgPath: String) {
         try {
+            // 判断是否需要使用浏览器来进行安装
+            if (BrowserInstallHelper.isUseBrowserToInstallEnabled()
+                    && BrowserInstallHelper.shouldUseBrowserToInstall()) {
+                BrowserInstallHelper.downloadFile(pkgPath)
+                return
+            }
+
             if (PackageUtils.isCanLaunchSetup(context, pkgPath)) {
+                HaloApp.put(Constants.LAST_INSTALL_GAME, pkgPath)
+
                 val installIntent = getInstallIntent(context, pkgPath)
                 context.startActivity(installIntent)
             } else {
-                DialogUtils.showPluginDialog(context) {
-                    uninstall(context, pkgPath)
+                if (isPluggin) {
+                    DialogHelper.showPluginDialog(context) {
+                        uninstall(context, pkgPath)
+                    }
+                } else {
+                    // 非插件化的同包名不同签名冲突
+                    DialogHelper.showSignatureConflictDialog(context) {
+                        uninstall(context, pkgPath)
+                    }
                 }
             }
         } catch (e: Exception) {
@@ -115,28 +135,44 @@ object PackageInstaller {
      */
     @JvmStatic
     fun uninstall(context: Context, path: String) {
+        // TODO 根据 path 获取包名可能出现获取不到的情况，看能不能改成直接用包名！
+        val packageName = PackageUtils.getPackageNameByPath(context, path)
+        uninstallForPackageName(context, packageName)
+    }
+
+    /**
+     * 根据包名卸载应用
+     */
+    @JvmStatic
+    fun uninstallForPackageName(context: Context, pkn: String?) {
+        if (pkn.isNullOrEmpty()) return
+
         val uninstallIntent = Intent()
         uninstallIntent.action = Intent.ACTION_DELETE
         uninstallIntent.addCategory(Intent.CATEGORY_DEFAULT)
         if (context !is Activity) {
             uninstallIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
         }
-        val packageName = PackageUtils.getPackageNameByPath(context, path)
-        uninstallIntent.data = Uri.parse("package:$packageName")
-        InstallUtils.getInstance(context).addUninstall(packageName)
+        uninstallIntent.data = Uri.parse("package:$pkn")
+        InstallUtils.getInstance(context).addUninstall(pkn)
         context.startActivity(uninstallIntent)
     }
 
     @JvmStatic
-    fun getDownloadPath(gameName: String?, format: String?): String {
-        return FileUtils.getDownloadPath(HaloApp.getInstance().application, getDownloadFileName(gameName, format))
+    fun getDownloadPathWithId(id: String, format: String?): String {
+        return FileUtils.getDownloadPath(HaloApp.getInstance().application, id + "." + getFileSuffixByFormat(format))
     }
 
-    private fun getDownloadFileName(gameName: String?, format: String?): String {
-        var fileExtension = "apk"
-        if (format == XapkInstaller.XAPK_EXTENSION_NAME) {
-            fileExtension = XapkInstaller.XAPK_EXTENSION_NAME
+    private fun getFileSuffixByFormat(format: String?): String {
+        return if (format == XapkInstaller.XAPK_EXTENSION_NAME) {
+            XapkInstaller.XAPK_EXTENSION_NAME
+        } else {
+            "apk"
         }
-        return MD5Utils.getContentMD5(gameName + "_" + System.currentTimeMillis()) + "." + fileExtension
+    }
+
+    @JvmStatic
+    fun createDownloadId(gameName: String?): String {
+        return MD5Utils.getContentMD5(gameName + "_" + System.currentTimeMillis())
     }
 }

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

@@ -18,6 +18,7 @@ import android.text.TextUtils;
 import androidx.annotation.Nullable;
 
 import com.g00fy2.versioncompare.Version;
+import com.gh.common.xapk.XapkInstaller;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
@@ -26,12 +27,16 @@ import com.gh.gamecenter.manager.PackagesManager;
 import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
 
+import net.dongliu.apk.parser.ApkFile;
+import net.dongliu.apk.parser.bean.ApkMeta;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -183,16 +188,13 @@ public class PackageUtils {
         return null;
     }
 
+    // TODO 找一个更好的办法来比较签名并且不触发 ANR
     public static boolean compareSignatureBetweenInstalledAppWithApk(Context context, String packageName, String apkFilePath) {
         try {
-            // 统计签名比较使用的频率 (大文件会触发 ANR)
-            SentryHelper.INSTANCE.onEvent(
-                    "SIGNATURE_COMPARE",
-                    "packageName", packageName);
-
+            // 据 Sentry 统计，刚上架一个周末的包里对这个方法有 700+ 次调用，然后其中一部分会造成 ANR
             Signature sig = context.getPackageManager().getPackageInfo(packageName, PackageManager.GET_SIGNATURES).signatures[0];
 
-            // Fuck HUAWEI, 华为系统调用 getPackageArchiveInfo 获取魔羯 apk 的签名时会耗时超过5秒造成 ANR，没有找到解决方法
+            // 调用 getPackageArchiveInfo 获取较大的 apk 的签名时会耗时超过5秒造成 ANR，没有找到解决方法
             // 如果可以的话尽量避免调用 getPackageArchiveInfo 方法
             Signature releaseSig = context.getPackageManager().getPackageArchiveInfo(apkFilePath, PackageManager.GET_SIGNATURES).signatures[0];
             return sig.hashCode() == releaseSig.hashCode();
@@ -293,15 +295,69 @@ public class PackageUtils {
      * 根据路径，获取apk的包名
      */
     public static String getPackageNameByPath(Context context, String path) {
+
+        // 部分设备 (已知 vivo 5.1.1) 在调用 packageManager.getPackageArchiveInfo 获取比较大的 APK 文件时会出现 ANR
+        // 大于 1G 的 APK 就走另类方法
+        if (isDeviceUnableToHandleBigApkFile(path)) {
+            // XAPK 不存在 AndroidManifest
+            if (path.contains(XapkInstaller.XAPK_EXTENSION_NAME)) {
+                return null;
+            }
+            return getPackageNameByPathAlternative(path);
+        }
+
         PackageManager packageManager = context.getApplicationContext().getPackageManager();
         PackageInfo info = packageManager.getPackageArchiveInfo(path, 0);
         if (info != null) {
             ApplicationInfo appInfo = info.applicationInfo;
             return appInfo.packageName;
         }
+
         return null;
     }
 
+    /**
+     * 此设备是否不能调用 packageManager.getPackageArchiveInfo 来获取 APK 信息
+     * <p>
+     * 部分设备 (已知 vivo 5.1.1 及 5.0.1 的设备) 在调用 packageManager.getPackageArchiveInfo 获取比较大的 APK 文件时会出现 ANR
+     */
+    public static boolean isDeviceUnableToHandleBigApkFile(String path) {
+        if ("vivo".equals(Build.MANUFACTURER)
+                && Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1) {
+            File file = new File(path);
+
+            if (file != null && file.length() > 1024 * 1024 * 1024) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * 从 APK 文件里读包名的另类方法
+     * 部分设备 (已知 vivo 5.1.1) 在调用 packageManager.getPackageArchiveInfo 获取比较大的 APK 文件时会出现 ANR
+     * <p>
+     * 令人迷惑的点：
+     * 1. 同样的代码，同样的 APK 在 demo 包里调用 packageManager.getPackageArchiveInfo 并不会 ANR
+     * 2. 把 packageManager.getPackageArchiveInfo 放在子线程调用一样会出现 ANR
+     * 3. demo 里 manifest 中 application 配置和 targetSdk 也改成与光环一样也不会出现 ANR
+     * <p>
+     * 大概是光环的某个配置触发了系统的 bug ?
+     */
+    private static String getPackageNameByPathAlternative(String path) {
+        ApkFile apkParser = null;
+        try {
+            apkParser = new ApkFile(new File(path));
+            ApkMeta apkMeta = apkParser.getApkMeta();
+            apkParser.close();
+            return apkMeta.getPackageName();
+        } catch (Throwable e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
     /*
      * 根据包名，判断是否已安装该游戏
      *
@@ -389,6 +445,31 @@ public class PackageUtils {
         return list;
     }
 
+    public static ArrayList<String> getAllPackageNameIncludeGh(Context context) {
+        ArrayList<String> list = new ArrayList<>();
+        List<PackageInfo> packageInfos = getInstalledPackages(context, 0);
+        for (PackageInfo packageInfo : packageInfos) {
+            if ((packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
+                list.add(packageInfo.packageName);
+            }
+        }
+        return list;
+    }
+
+    /*
+     * 获取所有已安装的软件的包名（包括系统应用）
+     */
+    public static ArrayList<String> getAllPackageNameIncludeSystemApps(Context context) {
+        ArrayList<String> list = new ArrayList<>();
+        List<PackageInfo> packageInfos = getInstalledPackages(context, 0);
+        for (PackageInfo packageInfo : packageInfos) {
+            if (!context.getPackageName().equals(packageInfo.packageName)) {
+                list.add(packageInfo.packageName);
+            }
+        }
+        return list;
+    }
+
     public static JSONArray getAppList(Context context) {
         JSONArray jsonArray = new JSONArray();
         try {
@@ -485,9 +566,53 @@ public class PackageUtils {
 
         if (gh_version != null && apkEntity.getGhVersion() != null && gh_id != null) {
             gh_version = gh_version.substring(2);
-            return Long.parseLong(gh_version) < Long.parseLong(apkEntity.getGhVersion())
-                    && apkEntity.getForce()
-                    && gh_id.equals(gameId);
+            try {
+                return Long.parseLong(gh_version) < Long.parseLong(apkEntity.getGhVersion()) && apkEntity
+                        .getForce() && gh_id.equals(gameId);
+            } catch (NumberFormatException exception) {
+                // gh_id 可能出錯
+                exception.printStackTrace();
+                return false;
+            }
+        }
+        return false;
+    }
+
+    public static boolean isNonPluginUpdatable(ApkEntity apkEntity, GameEntity gameEntity) {
+        // 非插件游戏更新
+        // ghVersion 不存在即是非插件游戏
+        if (TextUtils.isEmpty(apkEntity.getGhVersion())) {
+            String versionFromRequest = apkEntity.getVersion();
+            String versionFromInstalledApp = getVersionByPackage(apkEntity.getPackageName());
+
+            // 是否需要显示更新
+            boolean shouldShowUpdate = apkEntity.getForce();
+
+            if (shouldShowUpdate && !TextUtils.isEmpty(versionFromRequest) && !TextUtils.isEmpty(versionFromInstalledApp)) {
+                // 根据版本判断是否需要更新
+                shouldShowUpdate = new Version(versionFromRequest).isHigherThan(versionFromInstalledApp);
+
+                if (shouldShowUpdate) {
+                    GameUpdateEntity updateEntity = new GameUpdateEntity();
+                    updateEntity.setId(gameEntity.getId());
+                    updateEntity.setName(gameEntity.getName());
+                    updateEntity.setIcon(gameEntity.getIcon());
+                    updateEntity.setPackageName(apkEntity.getPackageName());
+                    updateEntity.setSize(apkEntity.getSize());
+                    updateEntity.setVersion(apkEntity.getVersion());
+                    updateEntity.setGhVersion(apkEntity.getGhVersion());
+                    updateEntity.setUrl(apkEntity.getUrl());
+                    updateEntity.setPlatform(apkEntity.getPlatform());
+                    updateEntity.setEtag(apkEntity.getEtag());
+                    updateEntity.setBrief(gameEntity.getBrief());
+                    updateEntity.setTag(gameEntity.getTag());
+                    updateEntity.setTagStyle(gameEntity.getTagStyle());
+                    updateEntity.setIndexPlugin(gameEntity.getIndexPlugin());
+                    updateEntity.setPluginDesc(gameEntity.getPluginDesc());
+                    updateEntity.setFormat(apkEntity.getFormat());
+                    return true;
+                }
+            }
         }
         return false;
     }
@@ -519,15 +644,21 @@ public class PackageUtils {
      * @return 进程名
      */
     public static String obtainProcessName(Context context) {
-        final int pid = android.os.Process.myPid();
-        ActivityManager am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-        List<ActivityManager.RunningAppProcessInfo> listTaskInfo = am.getRunningAppProcesses();
-        if (listTaskInfo != null && !listTaskInfo.isEmpty()) {
-            for (ActivityManager.RunningAppProcessInfo info : listTaskInfo) {
-                if (info != null && info.pid == pid) {
-                    return info.processName;
+        try {
+            final int pid = android.os.Process.myPid();
+            ActivityManager am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+            List<ActivityManager.RunningAppProcessInfo> listTaskInfo = am.getRunningAppProcesses();
+            if (listTaskInfo != null && !listTaskInfo.isEmpty()) {
+                for (ActivityManager.RunningAppProcessInfo info : listTaskInfo) {
+                    if (info != null && info.pid == pid) {
+                        return info.processName;
+                    }
                 }
             }
+        } catch (Exception e) {
+            // 遇到异常了让这次调用正常执行
+            e.printStackTrace();
+            return BuildConfig.APPLICATION_ID;
         }
         return null;
     }

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

@@ -0,0 +1,35 @@
+package com.gh.common.util
+
+import com.lightgame.utils.AppManager
+
+/**
+ * 用来简单获取上一个跳转页面的跳转信息的辅助类
+ * 简单解藕，不想层层传递数据可以把简单数据放这里面
+ * 暂只支持单页面(上一 activity)记录，不支持连续跨页
+ */
+object PageSwitchDataHelper {
+
+    const val PAGE_BUSINESS_NAME = "page_business_name"
+    const val PAGE_BUSINESS_TYPE = "page_business_type"
+    const val PAGE_GAME_DETAIL_RECOMMEND = "page_game_detail_recommend"
+
+    private var mDataFromTheLastPage: Pair<String, HashMap<String, String>>? = null
+
+    @JvmStatic
+    fun popLastPageData(): HashMap<String, String>? {
+        AppManager.getInstance().previousActivity()?.let {
+            if (System.identityHashCode(it).toString() == mDataFromTheLastPage?.first
+                    && mDataFromTheLastPage?.second != null) {
+                return mDataFromTheLastPage!!.second.also { mDataFromTheLastPage = null }
+            }
+        }
+        return null
+    }
+
+    fun pushCurrentPageData(data: HashMap<String, String>) {
+        AppManager.getInstance().currentActivity()?.let {
+            mDataFromTheLastPage = Pair(System.identityHashCode(it).toString(), data)
+        }
+    }
+
+}

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

@@ -5,10 +5,14 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.provider.Settings
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
+import com.gh.common.constant.Constants
+import com.gh.gamecenter.R
 import com.tbruyelle.rxpermissions2.RxPermissions
 
 object PermissionHelper {
@@ -59,41 +63,41 @@ object PermissionHelper {
     @JvmStatic
     fun checkStoragePermissionBeforeAction(context: Context, emptyCallback: EmptyCallback) {
         if (context is FragmentActivity) {
-            val rxPermission = RxPermissions(context)
+            if (context.checkCallingOrSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED
+                    && context.checkCallingOrSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
+                emptyCallback.onCallback()
+                SPUtils.setBoolean(Constants.SP_USER_HAS_PERMANENTLY_DENIED_STORAGE_PERMISSION, false)
+            } else {
+                showDialogBeforeRequestingStorageDialog(context, emptyCallback)
+            }
+        }
+    }
 
-            tryWithDefaultCatch {
-                rxPermission
-                        .requestEachCombined(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE)
-                        .subscribe { permission ->
-                            when {
-                                permission.granted -> {
-                                    emptyCallback.onCallback()
-                                }
-                                permission.shouldShowRequestPermissionRationale -> {
-                                    DialogUtils.showPermissionDialog(context,
-                                            "权限申请",
-                                            "光环助手需要存储权限，以保证能正常使用相关功能",
-                                            "重试",
-                                            "放弃",
-                                            { checkStoragePermissionBeforeAction(context, emptyCallback) },
-                                            null)
-                                }
-                                else -> {
-                                    DialogUtils.showPermissionDialog(context,
-                                            "权限申请",
-                                            "在设置-应用-光环助手-权限中开启存储权限，以保证能正常使用相关功能",
-                                            "去设置",
-                                            "放弃",
-                                            {
-                                                val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-                                                intent.data = Uri.parse("package:" + context.getPackageName())
-                                                context.startActivity(intent)
-                                            },
-                                            null)
+    private fun checkStoragePermissionBeforeAction(context: FragmentActivity, emptyCallback: EmptyCallback) {
+        tryWithDefaultCatch {
+            val rxPermission = RxPermissions(context)
+            rxPermission
+                    .requestEachCombined(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE)
+                    .subscribe { permission ->
+                        when {
+                            permission.granted -> {
+                                emptyCallback.onCallback()
+                                SPUtils.setBoolean(Constants.SP_USER_HAS_PERMANENTLY_DENIED_STORAGE_PERMISSION, false)
+                            }
+                            permission.shouldShowRequestPermissionRationale -> {
+                                // do nothing
+                            }
+                            else -> {
+                                if (SPUtils.getBoolean(Constants.SP_USER_HAS_PERMANENTLY_DENIED_STORAGE_PERMISSION)) {
+                                    val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+                                    intent.data = Uri.parse("package:" + context.packageName)
+                                    context.startActivity(intent)
+                                } else {
+                                    SPUtils.setBoolean(Constants.SP_USER_HAS_PERMANENTLY_DENIED_STORAGE_PERMISSION, true)
                                 }
                             }
                         }
-            }
+                    }
         }
     }
 
@@ -101,39 +105,37 @@ object PermissionHelper {
     @JvmStatic
     fun checkReadPhoneStateAndStoragePermissionBeforeAction(context: Context, emptyCallback: EmptyCallback) {
         if (context is FragmentActivity) {
-            val rxPermission = RxPermissions(context)
+            if (context.checkCallingOrSelfPermission(Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED
+                    && context.checkCallingOrSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED
+                    && context.checkCallingOrSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
+                emptyCallback.onCallback()
+            } else {
+                val rxPermission = RxPermissions(context)
 
-            tryWithDefaultCatch {
-                rxPermission
-                        .requestEachCombined(
-                                Manifest.permission.READ_PHONE_STATE,
-                                Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                                Manifest.permission.READ_EXTERNAL_STORAGE)
-                        .subscribe { permission ->
-                            when {
-                                permission.granted -> {
-                                    emptyCallback.onCallback()
+                tryWithDefaultCatch {
+                    rxPermission
+                            .requestEachCombined(
+                                    Manifest.permission.READ_PHONE_STATE,
+                                    Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                                    Manifest.permission.READ_EXTERNAL_STORAGE)
+                            .subscribe { permission ->
+                                when {
+                                    permission.granted -> {
+                                        emptyCallback.onCallback()
 
-                                    ActivationHelper.sendActivationInfo()
-                                }
-                                permission.shouldShowRequestPermissionRationale -> {
-                                    DialogUtils.showPermissionDialog(context, "权限申请",
-                                            "光环助手需要获取存储权限和手机信息权限，以保证能正常使用相关功能", "重试", "放弃",
-                                            { checkStoragePermissionBeforeAction(context, emptyCallback) }, null)
-                                }
-                                else -> {
-                                    DialogUtils.showPermissionDialog(context, "权限申请",
-                                            "在设置-应用-光环助手-权限中开启获取存储权限和手机信息，以保证能正常使用相关功能",
-                                            "去设置",
-                                            "放弃",
-                                            {
-                                                val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-                                                intent.data = Uri.parse("package:" + context.getPackageName())
-                                                context.startActivity(intent)
-                                            }, null)
+                                        ActivationHelper.sendActivationInfo()
+                                    }
+                                    permission.shouldShowRequestPermissionRationale -> {
+                                        // do nothing
+                                    }
+                                    else -> {
+                                        val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+                                        intent.data = Uri.parse("package:" + context.getPackageName())
+                                        context.startActivity(intent)
+                                    }
                                 }
                             }
-                        }
+                }
             }
         }
     }
@@ -142,36 +144,33 @@ object PermissionHelper {
     @JvmStatic
     fun checkReadPhoneStatePermissionBeforeAction(context: Context, emptyCallback: EmptyCallback) {
         if (context is FragmentActivity) {
-            val rxPermission = RxPermissions(context)
 
-            tryWithDefaultCatch {
-                rxPermission
-                        .requestEachCombined(Manifest.permission.READ_PHONE_STATE)
-                        .subscribe { permission ->
-                            when {
-                                permission.granted -> {
-                                    emptyCallback.onCallback()
+            if (context.checkCallingOrSelfPermission(Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) {
+                emptyCallback.onCallback()
+            } else {
+                val rxPermission = RxPermissions(context)
 
-                                    ActivationHelper.sendActivationInfo()
-                                }
-                                permission.shouldShowRequestPermissionRationale -> {
-                                    DialogUtils.showPermissionDialog(context, "权限申请",
-                                            "光环助手需要获取手机信息权限，以保证能正常使用相关功能", "重试", "放弃",
-                                            { checkStoragePermissionBeforeAction(context, emptyCallback) }, null)
-                                }
-                                else -> {
-                                    DialogUtils.showPermissionDialog(context, "权限申请",
-                                            "在设置-应用-光环助手-权限中开启获取手机信息，以保证能正常使用相关功能",
-                                            "去设置",
-                                            "放弃",
-                                            {
-                                                val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-                                                intent.data = Uri.parse("package:" + context.getPackageName())
-                                                context.startActivity(intent)
-                                            }, null)
+                tryWithDefaultCatch {
+                    rxPermission
+                            .requestEachCombined(Manifest.permission.READ_PHONE_STATE)
+                            .subscribe { permission ->
+                                when {
+                                    permission.granted -> {
+                                        emptyCallback.onCallback()
+
+                                        ActivationHelper.sendActivationInfo()
+                                    }
+                                    permission.shouldShowRequestPermissionRationale -> {
+                                        // do nothing
+                                    }
+                                    else -> {
+                                        val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+                                        intent.data = Uri.parse("package:" + context.getPackageName())
+                                        context.startActivity(intent)
+                                    }
                                 }
                             }
-                        }
+                }
             }
         }
     }
@@ -220,7 +219,26 @@ object PermissionHelper {
         } catch (e: Exception) {
             e.printStackTrace()
         }
+    }
 
+    private fun showDialogBeforeRequestingStorageDialog(context: FragmentActivity, emptyCallback: EmptyCallback) {
+        DialogHelper.showDialog(
+                context,
+                title = "权限申请",
+                content = "光环助手将向您申请开启设备的存储权限，以保证能正常使用相关功能。拒绝授权将无法正常使用部分功能。",
+                cancelText = "放弃",
+                confirmText = "去授权",
+                cancelClickCallback = null,
+                confirmClickCallback = { checkStoragePermissionBeforeAction(context, emptyCallback) },
+                extraConfig = DialogHelper.Config(hint = "查看权限应用场景"),
+                uiModificationCallback = {
+                    it.hintTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font))
+                    it.hintTv.setOnClickListener {
+                        DirectUtils.directToWebView(context, Constants.PERMISSION_SCENARIO_ADDRESS, "(权限弹窗)")
+                    }
+                    it.contentTv.setTextColor(ContextCompat.getColor(context, R.color.text_333333))
+                }
+        )
     }
 
     /**
@@ -236,5 +254,4 @@ object PermissionHelper {
         }
     }
 
-
 }

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

@@ -0,0 +1,318 @@
+package com.gh.common.util
+
+import android.Manifest
+import android.annotation.SuppressLint
+import android.app.Dialog
+import android.content.Context
+import android.content.pm.PackageManager
+import android.graphics.Color
+import android.view.LayoutInflater
+import android.view.View
+import android.view.Window
+import android.view.WindowManager
+import com.cmic.sso.sdk.AuthThemeConfig
+import com.cmic.sso.sdk.auth.AuthnHelper
+import com.cmic.sso.sdk.auth.LoginClickListener
+import com.cmic.sso.sdk.auth.TokenListener
+import com.gh.common.constant.Config
+import com.gh.common.constant.Constants
+import com.gh.common.util.PermissionHelper.checkReadPhoneStatePermissionBeforeAction
+import com.gh.common.util.ToastUtils.toast
+import com.gh.gamecenter.LoginActivity
+import com.gh.gamecenter.R
+import com.gh.gamecenter.databinding.DialogQuickLoginBinding
+import com.gh.gamecenter.databinding.SetWaitDialogBinding
+import com.gh.gamecenter.entity.LoginTokenEntity
+import com.gh.gamecenter.user.ApiResponse
+import com.gh.gamecenter.user.LoginTag
+import com.gh.gamecenter.user.UserRepository
+import com.lightgame.utils.AppManager
+import com.lightgame.utils.Utils
+import org.json.JSONObject
+import java.util.*
+
+/**
+ * 一键登录辅助类
+ * 1.取号请求
+ * 2.授权请求
+ * 3.获取token
+ * 4.请求登录接口
+ */
+object QuickLoginHelper {
+
+    private var mAuthnHelper: AuthnHelper? = null
+    private var mTokenListener: TokenListener? = null
+    private var mPreDialog: Dialog? = null
+    private var mDialog: Dialog? = null
+    private var mToken: String = ""
+    private var mOpenAuthPageSuccess = false
+    private const val REQUEST_GET_PHONE_INFO_CODE = 100
+    private const val REQUEST_LOGIN_AUTH_CODE = 101
+    private const val ENTRANCE_DEFAULT = "一键登录"
+    private const val ENTRANCE_PERMISSION_DIALOG = "一键登录权限弹窗"
+    private const val AUTH_ACTIVITY_NAME = "com.cmic.sso.sdk.activity.LoginAuthActivity"
+
+    @JvmStatic
+    fun startLogin(context: Context, entrance: String) {
+        // 防止短时间多次调用
+        if (ClickUtils.isFastDoubleClick(991)) return
+
+        mOpenAuthPageSuccess = false
+
+        if (isPublishEnv()) {
+            AuthnHelper.setDebugMode(false)
+        } else {
+            AuthnHelper.setDebugMode(true)
+        }
+        mAuthnHelper = AuthnHelper.getInstance(context.applicationContext)
+        mAuthnHelper?.run {
+            authThemeConfig = getConfig(context, entrance)
+            // 授权页面的回调方法
+            setPageInListener { code, _ ->
+                // 返回码200087代表授权页成功拉起
+                if (code == "200087") {
+                    if (mPreDialog != null && mPreDialog!!.isShowing) {
+                        mPreDialog?.dismiss()
+                    }
+                    mOpenAuthPageSuccess = true
+                } else { // 不成功就调起验证码登录页
+                    toastCode(code)
+                    startCodeLoginPage(context, true)
+                }
+            }
+
+            // token回调
+            mTokenListener = TokenListener { requestCode: Int, jsonObject: JSONObject ->
+                val code = jsonObject.optString("resultCode")
+                // “103000”为成功
+                if (code == "103000") {
+                    when (requestCode) {
+                        REQUEST_GET_PHONE_INFO_CODE -> {
+                            SPUtils.setBoolean(Constants.SP_HAS_GET_PHONE_INFO, true)
+                            // 2.授权请求
+                            mAuthnHelper!!.loginAuth(Config.QUICK_LOGIN_APPID, Config.QUICK_LOGIN_APPKEY, mTokenListener, REQUEST_LOGIN_AUTH_CODE)
+                        }
+
+                        REQUEST_LOGIN_AUTH_CODE -> {
+                            // 3.获取token
+                            mToken = jsonObject.optString("token")
+                        }
+                    }
+                } else if (code != "200020") { // 不成功就调起验证码登录页(200020代表授权页关闭)
+                    toastCode(code)
+                    startCodeLoginPage(context, true)
+                }
+            }
+
+            if (context.checkCallingOrSelfPermission(Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) {
+                getPhoneInfo(context)
+            } else {
+                DialogUtils.showQuickLoginPermissionDialog(
+                        context,
+                        {
+                            checkReadPhoneStatePermissionBeforeAction(context,  object : EmptyCallback {
+                                override fun onCallback() {
+                                    getPhoneInfo(context)
+                                }
+                            })
+                        },
+                        {
+                            startCodeLoginPage(
+                                context,
+                                entrance = ENTRANCE_PERMISSION_DIALOG,
+                                isFinishAuth = false,
+                                isFromPermission = true
+                            )
+                        }
+                )
+            }
+        }
+    }
+
+    private fun getPhoneInfo(context: Context) {
+        mPreDialog = Dialog(context, R.style.DialogWindowTransparent).apply {
+            val binding = SetWaitDialogBinding.inflate(LayoutInflater.from(context)).apply {
+                setWaitMessage.text = "请求登录中"
+            }
+            requestWindowFeature(Window.FEATURE_NO_TITLE)
+            setContentView(binding.root)
+            setCanceledOnTouchOutside(false)
+            show()
+        }
+        // 1.取号请求
+        mAuthnHelper!!.getPhoneInfo(Config.QUICK_LOGIN_APPID, Config.QUICK_LOGIN_APPKEY, mTokenListener, REQUEST_GET_PHONE_INFO_CODE)
+    }
+
+    private fun getConfig(context: Context, entrance: String):  AuthThemeConfig{
+        return AuthThemeConfig.Builder()
+                .setStatusBar(Color.WHITE, true) //状态栏颜色、是否高亮
+                .setAuthContentView(getCustomView(context)) //自定义布局
+                // 服务条款标题栏
+                .setClauseLayoutResID(R.layout.layout_quick_login_navigation, "backIv") //服务条款标题栏
+                .setNavTextColor(Color.BLACK) //服务条款标题颜色
+                .setNavTextSize(18) //服务条款标题字体大小
+                // 手机号码
+                .setNumberSize(20, true) //手机号码字体大小
+                .setNumberColor(R.color.text_333333.toColor()) //手机号码字体颜色
+                .setNumFieldOffsetY(95) //号码栏Y偏移量
+                // 登录按钮
+                .setLogBtnImgPath("login_btn_bg") //登录按钮背景
+                .setLogBtnText("本机号码一键登录", Color.WHITE, 16, false) //登录按钮相关
+                .setLogBtnOffsetY(170) //登录按钮Y偏移量
+                .setLogBtn(1000, 44) //登录按钮相关宽高
+                .setLogBtnMargin(20, 20) //登录按钮相对于屏幕左右边缘边距
+                // 回调
+                .setBackPressedListener {} //返回键回调
+                .setLogBtnClickListener(object : LoginClickListener {
+                    override fun onLoginClickStart(context: Context, jsonObj: JSONObject?) {
+                        LogUtils.login("logging", "一键登录", entrance)
+                        mDialog = Dialog(context, R.style.DialogWindowTransparent).apply {
+                            val binding = SetWaitDialogBinding.inflate(LayoutInflater.from(context)).apply {
+                                setWaitMessage.text = R.string.logging.toResString()
+                            }
+                            requestWindowFeature(Window.FEATURE_NO_TITLE)
+                            setContentView(binding.root)
+                            setCanceledOnTouchOutside(false)
+                            show()
+                        }
+                    }
+
+                    override fun onLoginClickComplete(context: Context, jsonObj: JSONObject?) {
+                        if (mToken.isNotBlank()) {
+                            val params = HashMap<String, String>()
+                            params["token"] = mToken
+
+                            // 4.请求登录接口
+                            UserRepository.getInstance(context).login(
+                                    JSONObject(params as Map<*, *>),
+                                    LoginTag.oauth,
+                                    object : BiCallback<LoginTokenEntity, ApiResponse<LoginTokenEntity>> {
+                                        override fun onFirst(first: LoginTokenEntity) {
+                                            if (mDialog != null && mDialog!!.isShowing) {
+                                                mDialog?.dismiss()
+                                            }
+
+                                            SPUtils.setBoolean(Constants.SP_HAS_GET_PHONE_INFO, false)
+
+                                            LogUtils.login("success", "一键登录", entrance)
+                                            finishAuthActivity()
+                                        }
+
+                                        override fun onSecond(second: ApiResponse<LoginTokenEntity>) {
+                                            if (mDialog != null && mDialog!!.isShowing) {
+                                                mDialog?.dismiss()
+                                            }
+                                        }
+                                    }
+                            )
+                        } else {
+                            if (mDialog != null && mDialog!!.isShowing) {
+                                mDialog?.dismiss()
+                            }
+                        }
+                    }
+                }) //登录按钮回调
+                .setCheckBoxListener { _: Context?, _: JSONObject? ->
+                    toast("请先勾选同意《${getOperatorType(context)}认证服务协议》《用户协议》《隐私政策》")
+                }  //勾选回调
+                // 勾选框
+                .setCheckTipText("") //设置未勾选时弹出提示
+                .setCheckBoxImgPath("ic_quick_login_check", "ic_quick_login_uncheck", 12, 12) //勾选图片
+                // 服务条款、用户协议、隐私政策
+                .setPrivacyState(false) //默认不勾选
+                .setPrivacyAlignment("阅读并同意 " + AuthThemeConfig.PLACEHOLDER + " 用户协议 隐私政策",
+                        "用户协议", R.string.disclaimer_url.toResString(),
+                        "隐私政策", R.string.privacy_policy_url.toResString(),
+                        "", "", "", "") //隐私条款的协议文本，自定义条款，自定义条款链接(支持四份条款)
+                .setPrivacyText(11, R.color.text_999999.toColor(), R.color.theme_font.toColor(), true, false) //条款文本设置
+                .setPrivacyMargin(30, 32) //隐私条款距离手机左右边缘的边距
+                .setPrivacyOffsetY(280) //隐私条款Y偏移量
+                // 语言
+                .setAppLanguageType(0) //0.中文简体1.中文繁体2.英文
+                // 转场动画
+                .setAuthPageActIn("anim_auth_in","anim_auth_out")
+//                .setAuthPageActOut("anim_auth_in","anim_auth_out")
+                // 整体布局
+                .setAuthPageWindowMode(WindowManager.LayoutParams.MATCH_PARENT, 360) //授权页窗口宽高比例
+                .setWindowBottom(1) //授权页是否居于底部，0=居中;1=底部，设置为1Y轴的偏移 失效
+                .setFitsSystemWindows(false)
+                .setThemeId(R.style.quickLoginDialog) //授权页弹窗主题
+                .build()
+    }
+
+    // 获取自定义布局View
+    @SuppressLint("SetTextI18n")
+    private fun getCustomView(context: Context): View {
+        return DialogQuickLoginBinding.inflate(LayoutInflater.from(context)).apply {
+            closeIv.setOnClickListener {
+                finishAuthActivity()
+            }
+            changeLoginBtn.setOnClickListener {
+                startCodeLoginPage(context, false)
+            }
+            descTv.text = "${getOperatorType(context)}提供认证服务"
+        }.root
+    }
+
+    // 获取运营商名称
+    private fun getOperatorType(context: Context): String {
+        mAuthnHelper?.run {
+            val jsonObject = getNetworkType(context)
+            tryWithDefaultCatch {
+                val net = jsonObject.optString("operatorType").toInt()
+                if (net == 1) return "中国移动"
+                if (net == 2) return "中国联通"
+                if (net == 3) return "中国电信"
+            }
+        }
+        return ""
+    }
+
+    private fun startCodeLoginPage(context: Context, isFinishAuth: Boolean) {
+        startCodeLoginPage(context, ENTRANCE_DEFAULT, isFinishAuth, false)
+    }
+
+    private fun startCodeLoginPage(context: Context, entrance: String, isFinishAuth: Boolean, isFromPermission: Boolean) {
+        if (mPreDialog != null && mPreDialog!!.isShowing) {
+            mPreDialog?.dismiss()
+        }
+
+        if (isFinishAuth) {
+            finishAuthActivity()
+        }
+
+        val status = when {
+            isFromPermission -> LoginActivity.STATUS_FROM_QUICK_LOGIN_PERMISSION
+
+            mOpenAuthPageSuccess -> LoginActivity.STATUS_FROM_QUICK_LOGIN_PAGE
+
+
+            else -> LoginActivity.STATUS_DEFAULT
+        }
+
+        context.startActivity(LoginActivity.getIntent(context, entrance, status))
+    }
+
+    @JvmStatic
+    fun finishAuthActivity() {
+        mAuthnHelper?.quitAuthActivity()
+        // 调用quitAuthActivity()方法有概率会关不掉授权页，所以使用在调用quitAuthActivity()方法后，判断当前Activity是否还是AuthActivity，如果是则finish
+        AppManager.getInstance().recentActiveActivity?.run {
+            if (localClassName == AUTH_ACTIVITY_NAME) {
+                finish()
+            }
+        }
+    }
+
+    private fun toastCode(code: String) {
+        debugOnly {
+            Utils.log("QuickLoginHelper -> code = $code")
+        }
+
+//        if (code == "200023" || code == "200028") {
+//            toast("验证码登录")
+//        } else {
+//            toast(code)
+//        }
+    }
+}

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

@@ -0,0 +1,50 @@
+package com.gh.common.util
+
+import android.content.Context
+import com.gh.gamecenter.UserInfoEditActivity
+import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.user.UserViewModel
+import java.util.*
+
+object RealNameHelper {
+
+    @JvmStatic
+    fun checkIfAuth(context: Context, gameEntity: GameEntity, callback: EmptyCallback) {
+        if (gameEntity.auth?.switch == "on") {
+            if ((gameEntity.auth?.timeStart == "00:00" && gameEntity.auth?.timeEnd == "00:00")
+                    || withinTimeRange(gameEntity.auth?.timeStart, gameEntity.auth?.timeEnd)) {
+                context.ifLogin("") {
+                    if (!UserManager.getInstance().isAuth) {
+                        context.startActivity(UserInfoEditActivity.getIntent(context, UserViewModel.TYPE_ID_CARD))
+                    } else {
+                        callback.onCallback()
+                    }
+                }
+            } else {
+                callback.onCallback()
+            }
+        } else {
+            callback.onCallback()
+        }
+    }
+
+    private fun withinTimeRange(timeStart: String?, timeEnd: String?): Boolean {
+        val realTimeEnd = if (timeEnd == "00:00") "23:59" else timeEnd
+
+        val startHourAndMinuteArray = timeStart?.split(":")
+        val endHourAndMinuteArray = realTimeEnd?.split(":")
+
+        val calStart = Calendar.getInstance().apply {
+            set(Calendar.HOUR_OF_DAY, startHourAndMinuteArray?.first()!!.toInt())
+            set(Calendar.MINUTE, startHourAndMinuteArray.secondOrNull()!!.toInt())
+        }
+        val calEnd = Calendar.getInstance().apply {
+            set(Calendar.HOUR_OF_DAY, endHourAndMinuteArray?.first()!!.toInt())
+            set(Calendar.MINUTE, endHourAndMinuteArray.secondOrNull()!!.toInt())
+        }
+
+        return (Calendar.getInstance().after(calStart) && Calendar.getInstance().before(calEnd))
+    }
+
+}

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

@@ -0,0 +1,144 @@
+package com.gh.common.util
+
+import com.gh.common.constant.Constants
+import com.gh.common.dialog.DeviceRemindDialog
+import com.gh.gamecenter.entity.*
+import com.google.gson.reflect.TypeToken
+import com.halo.assistant.HaloApp
+
+object RecommendPopupHelper {
+
+    fun getRecommendPopup(gameEntity: GameEntity?, popups: ArrayList<RecommendPopupEntity>?): RecommendPopupEntity? {
+        if (gameEntity == null || popups.isNullOrEmpty()) return null
+
+        //判断是否触发设备弹窗
+        val pair = DeviceRemindDialog.shouldShowDeviceRemindDialog(gameEntity)
+        if (pair.first) return null
+
+        //判断是否为多版本游戏
+        if (gameEntity.getApk().isEmpty() || gameEntity.getApk().size > 1) return null
+
+        val downloadBtnText = GameUtils.getDownloadBtnText(HaloApp.getInstance(), gameEntity, PluginLocation.only_game)
+        val filterEntities = arrayListOf<RecommendPopupEntity>()
+
+        loop@ for (entity in popups) {
+            //判断是否符合下载类型
+            val downloadType = entity.recommendPackage.getDownloadType()
+            if (!downloadType.contains(downloadBtnText)) continue
+
+            //判断是否符合安装包大小限制
+            val minSize = entity.recommendPackage.minSize
+            val sizeStr = gameEntity.getApk()[0].size ?: continue
+            val size = sizeStr.substring(0, sizeStr.length - 2).toFloat()
+            if (size < minSize) continue
+
+            //判断是否符合包名限制
+            val nameRule = entity.recommendPackage.nameRule
+            val packages = entity.recommendPackage.details
+            val installedPackages = PackageUtils.getAllPackageNameIncludeGh(HaloApp.getInstance())
+            var isMatchSuccess = true
+            val checkInstalled: (splitPackages: List<String>) -> Boolean = {
+                var isInstalled = false
+                it.forEach { packageName ->
+                    if (installedPackages.contains(packageName)) {
+                        isInstalled = true
+                        return@forEach
+                    }
+                }
+                isInstalled
+            }
+            when (nameRule) {
+                "installed" -> {
+                    //设备上安装了指定的包名才生效(需全部满足)
+                    packages.forEach {
+                        val splitPackages = it.split("、")
+                        val isInstalled = checkInstalled(splitPackages)
+                        if (!isInstalled) {
+                            isMatchSuccess = false
+                            return@forEach
+                        }
+                    }
+                }
+                "uninstalled" -> {
+                    //设备上未安装指定的包名才生效(需全部满足)
+                    packages.forEach {
+                        val splitPackages = it.split("、")
+                        val isInstalled = checkInstalled(splitPackages)
+                        if (isInstalled) {
+                            isMatchSuccess = false
+                            return@forEach
+                        }
+                    }
+                }
+                else -> {
+                    isMatchSuccess = true
+                }
+            }
+            if (!isMatchSuccess) continue
+
+            filterEntities.add(entity)
+        }
+
+        return if (filterEntities.isEmpty()) {
+            null
+        } else {
+            val recommendPopupEntity = filterEntities[0]
+            if (checkFrequencyIsMatch(recommendPopupEntity)) {
+                recommendPopupEntity
+            } else {
+                null
+            }
+        }
+    }
+
+     fun checkFrequencyIsMatch(entity: RecommendPopupEntity): Boolean {
+        //判断是否符合通知频率 一次once, 累计次数count, 每周一次weekly, 每天一次daily, 每次always
+        val plan = entity.notice.plan
+        val times = entity.notice.times
+        //[{"popupId":"6074ff265b58135844aec523","showTime":1618391319457,"count":1}]
+        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()
+        val recommendRecord = records.find { it.popupId == entity.id }
+        val showTime = recommendRecord?.showTime ?: 0L
+        val count = recommendRecord?.count ?: 0
+        when (plan) {
+            "once" -> {
+                if (recommendRecord != null) return false
+            }
+            "count" -> {
+                if (count >= times) return false
+            }
+            "weekly" -> {
+                if (TimeUtils.isThisWeek(showTime)) return false
+            }
+            "daily" -> {
+                if (TimeUtils.isToday(showTime)) return false
+            }
+            "always" -> {
+                //do nothing
+            }
+        }
+        return true
+    }
+
+    fun saveRecord(popup: RecommendPopupEntity) {
+        val plan = popup.notice.plan
+        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()
+        val recommendRecord = records.find { it.popupId == popup.id }
+        if (recommendRecord == null) {
+            records.add(RecommendRecord(popup.id, System.currentTimeMillis(), 1))
+        } else {
+            if (plan == "count") {
+                recommendRecord.count = recommendRecord.count + 1
+            }
+            recommendRecord.showTime = System.currentTimeMillis()
+
+        }
+        SPUtils.setString(Constants.SP_RECOMMEND_POPUP, GsonUtils.toJson(records))
+    }
+}

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

@@ -64,34 +64,24 @@ object ReservationHelper {
 
     @JvmStatic
     fun showDeleteReservationDialog(context: Context, emptyCallback: EmptyCallback) {
-        DialogHelper.showDialog(
-                context,
+        DialogUtils.showCancelOrDeleteReservationDialog(context,
                 "删除预约",
                 "游戏已上线，你可以删除此预约记录，确定删除吗？",
                 "确定删除",
-                "暂不删除",
-                { emptyCallback.onCallback() },
-                null,
-                trackMtaEvent = true
-//                , mtaEvent = "预约游戏",
-//                mtaKey = "删除预约弹窗"
-        )
+                "暂不删除", {
+            emptyCallback.onCallback()
+        }, null)
     }
 
     @JvmStatic
     fun showCancelReservationDialog(context: Context, emptyCallback: EmptyCallback) {
-        DialogHelper.showDialog(
-                context,
+        DialogUtils.showCancelOrDeleteReservationDialog(context,
                 "取消预约",
                 "取消之后你将无法收到游戏上线的通知，确定取消预约吗？",
                 "确定取消",
-                "暂不取消",
-                { emptyCallback.onCallback() },
-                null,
-                trackMtaEvent = true
-//                , mtaEvent = "预约游戏",
-//                mtaKey = "取消预约弹窗"
-        )
+                "暂不取消", {
+            emptyCallback.onCallback()
+        }, null)
     }
 
 

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

@@ -2,10 +2,10 @@ package com.gh.common.util
 
 import android.text.TextUtils
 import com.lightgame.utils.Utils
-import io.sentry.core.Sentry
-import io.sentry.core.SentryEvent
-import io.sentry.core.SentryLevel
-import io.sentry.core.protocol.Message
+import io.sentry.Sentry
+import io.sentry.SentryEvent
+import io.sentry.SentryLevel
+import io.sentry.protocol.Message
 
 object SentryHelper {
 
@@ -17,7 +17,7 @@ object SentryHelper {
         val message = Message()
         message.message = eventId
         sentryEvent.message = message
-        sentryEvent.level = SentryLevel.LOG
+        sentryEvent.level = SentryLevel.INFO
 
         for (i in kv.indices) {
             if (i % 2 != 0) {

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

@@ -90,7 +90,8 @@ public class ShareUtils {
         video("视频"),
         web("web链接"),
         userHome("个人主页"),
-        qaDetail("QA内容详情");
+        qaDetail("QA内容详情"),
+        inviteFriends("邀请好友");
 
         private String name;
 
@@ -103,6 +104,24 @@ public class ShareUtils {
         }
     }
 
+    public enum ShareType {
+        qq("qq"),
+        qqZone("qq空间"),
+        weibo("微博"),
+        wechat("微信"),
+        wechatMoments("朋友圈");
+
+        private String name;
+
+        ShareType(String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+    }
+
     private String[] arrLabel = {"微信好友", "朋友圈", "QQ好友", "QQ空间", "新浪微博", "短信", "复制链接", "取消"};
 
     private WeakReference<PopupWindow> popupWindow;
@@ -112,6 +131,7 @@ public class ShareUtils {
     public static ShareEntrance shareEntrance;//分享入口(事件上报和视频分享统计用)
     public static String resourceId = "";//分享内容的id(事件上报用)
     public static ShareEntity shareEntity;//分享信息(事件上报用)
+    private static ShareType mShareType;//分享类型(事件上报用)
 
     private WeakReference<Activity> mActivity;
 
@@ -124,6 +144,10 @@ public class ShareUtils {
             EventBus.getDefault().post(new EBShare(ShareUtils.shareEntrance));
             LogUtils.uploadShareResult(shareType, ShareUtils.shareEntrance.getName(), "success",
                     ShareUtils.shareEntity.getShareUrl(), ShareUtils.shareEntity.getShareTitle(), ShareUtils.shareEntity.getSummary(), ShareUtils.resourceId);
+            EnergyTaskHelper.postEnergyTaskForShare(ShareUtils.shareEntrance.getName(), ShareUtils.resourceId, ShareUtils.shareEntity.getShareUrl());
+            if (ShareUtils.shareEntrance == ShareEntrance.inviteFriends) {
+                IntegralLogHelper.INSTANCE.logInviteResult("成功", mShareType.getName());
+            }
         }
 
         @Override
@@ -131,6 +155,9 @@ public class ShareUtils {
             Utils.toast(mContext, R.string.share_fail_hint);
             LogUtils.uploadShareResult(shareType, ShareUtils.shareEntrance.getName(), "fail",
                     ShareUtils.shareEntity.getShareUrl(), ShareUtils.shareEntity.getShareTitle(), ShareUtils.shareEntity.getSummary(), ShareUtils.resourceId);
+            if (ShareUtils.shareEntrance == ShareEntrance.inviteFriends) {
+                IntegralLogHelper.INSTANCE.logInviteResult("失败", mShareType.getName());
+            }
         }
 
         @Override
@@ -138,6 +165,9 @@ public class ShareUtils {
             Utils.toast(mContext, R.string.share_cancel_hint);
             LogUtils.uploadShareResult(shareType, ShareUtils.shareEntrance.getName(), "cancel",
                     ShareUtils.shareEntity.getShareUrl(), ShareUtils.shareEntity.getShareTitle(), ShareUtils.shareEntity.getSummary(), ShareUtils.resourceId);
+            if (ShareUtils.shareEntrance == ShareEntrance.inviteFriends) {
+                IntegralLogHelper.INSTANCE.logInviteResult("取消", mShareType.getName());
+            }
         }
     };
 
@@ -169,6 +199,45 @@ public class ShareUtils {
         return false;
     }
 
+    // 邀请好友（专属链接）
+    public void shareInviteFriends(Activity activity, String url, String way) {
+        if (activity.isFinishing()) return;
+        this.mActivity = new WeakReference<>(activity);
+        this.shareIcon = activity.getString(R.string.gh_icon_url);
+        this.shareUrl = url;
+        this.mSummary = "卡牌神器，海量游戏下载，积分大礼，等你尝鲜";
+        this.mTitle = "推荐一款好玩的游戏下载APP【光环助手】";
+        this.mShareEntrance = ShareEntrance.inviteFriends;
+        ShareUtils.shareEntrance = mShareEntrance;
+        ShareUtils.resourceId = "";
+        ShareUtils.shareEntity = new ShareEntity(shareUrl, mTitle, mSummary);
+        LogUtils.uploadShareEnter(mShareEntrance.getName(), shareUrl, mTitle, mSummary, "");
+
+        // 分享
+        switch (way) {
+            case "qq" :
+                mShareType = ShareType.qq;
+                qqShare();
+                break;
+            case "qq_zone" :
+                mShareType = ShareType.qqZone;
+                qZoneShare();
+                break;
+            case "wechat" :
+                mShareType = ShareType.wechat;
+                wechatShare();
+                break;
+            case "wechat_moments" :
+                mShareType = ShareType.wechatMoments;
+                wechatMomentsShare();
+                break;
+            case "weibo" :
+                mShareType = ShareType.weibo;
+                sinaWeiboShare();
+                break;
+        }
+    }
+
     public void showShareUserHomeWindows(Activity activity, View view, String url, String icon, String shareTitle, String shareSummary, ShareEntrance shareEntrance, String id, ShareCallBack callBack) {
         if (activity.isFinishing()) return;
         this.mActivity = new WeakReference<>(activity);
@@ -318,13 +387,27 @@ public class ShareUtils {
         });
     }
 
+    public void shareParamsDetail(Activity activity, String url, String icon, String shareTitle, String shareSummary, ShareEntrance shareEntrance, String id, ShareCallBack callBack) {
+        if (activity.isFinishing()) return;
+        this.mActivity = new WeakReference<>(activity);
+        this.shareIcon = icon;
+        this.shareUrl = url;
+        this.mSummary = shareSummary;
+        this.mTitle = shareTitle;
+        this.mShareEntrance = shareEntrance;
+        ShareUtils.shareEntrance = mShareEntrance;
+        ShareUtils.resourceId = id;
+        ShareUtils.shareEntity = new ShareEntity(shareUrl, mTitle, mSummary);
+        LogUtils.uploadShareEnter(mShareEntrance.getName(), shareUrl, mTitle, mSummary, id);
+    }
+
 
     public void showShareWindows(Activity activity, View view, String url, String icon, String shareTitle, String shareSummary, ShareEntrance shareEntrance, String id) {
         showShareWindowsCallback(activity, view, url, icon, shareTitle, shareSummary, shareEntrance, id, null);
     }
 
     //QQ分享
-    private void qqShare() {
+    public void qqShare() {
         Utils.toast(mContext, R.string.share_skip);
         Bundle params = new Bundle();
 
@@ -359,7 +442,7 @@ public class ShareUtils {
     }
 
     //微信好友分享
-    private void wechatShare() {
+    public void wechatShare() {
         Utils.toast(mContext, R.string.share_skip);
 
         if (!PackageHelper.INSTANCE.getLocalPackageNameSet().contains("com.tencent.mm")) {
@@ -476,7 +559,7 @@ public class ShareUtils {
     }
 
     //QQ空间分享
-    private void qZoneShare() {
+    public void qZoneShare() {
         Utils.toast(mContext, R.string.share_skip);
         Bundle params = new Bundle();
 
@@ -515,7 +598,7 @@ public class ShareUtils {
     }
 
     //微信朋友圈分享
-    private void wechatMomentsShare() {
+    public void wechatMomentsShare() {
         Utils.toast(mContext, R.string.share_skip);
 
         if (!PackageHelper.INSTANCE.getLocalPackageNameSet().contains("com.tencent.mm")) {
@@ -558,7 +641,7 @@ public class ShareUtils {
     }
 
     //新浪微博分享
-    private void sinaWeiboShare() {
+    public void sinaWeiboShare() {
         WbSdk.install(mContext, new AuthInfo(mContext, Config.WEIBO_APPKEY, "http://www.sina.com", WEIBO_SCOPE));
 
         if (mShareEntrance == ShareEntrance.qaDetail) {
@@ -567,7 +650,7 @@ public class ShareUtils {
         }
         Activity activity = mActivity.get();
         if (activity != null) {
-            Intent intent = WeiBoShareActivity.getWeiboshareIntent(
+            Intent intent = WeiBoShareActivity.getWeiboShareIntent(
                     activity,
                     shareUrl,
                     shareIcon,
@@ -584,7 +667,7 @@ public class ShareUtils {
     }
 
     //短信分享
-    private void shortMessageShare() {
+    public void shortMessageShare() {
         String smsBody;
         switch (mShareEntrance) {
             case news:
@@ -628,7 +711,7 @@ public class ShareUtils {
     }
 
     //复制文字链接
-    private void copyLink(String copyContent) {
+    public void copyLink(String copyContent) {
         shareType = "copy_link";
         LogUtils.uploadShareType(shareType, shareEntrance.getName(), shareUrl, mTitle, mSummary, resourceId);
         if (mShareEntrance != ShareEntrance.shareGh) {
@@ -639,6 +722,14 @@ public class ShareUtils {
         }
     }
 
+    public String getTitle() {
+        return mTitle;
+    }
+
+    public String getShareUrl() {
+        return shareUrl;
+    }
+
     private class ShareRecyclerViewAdapter extends RecyclerView.Adapter<ShareRecyclerViewAdapter.ViewHolder> {
 
         private OnItemClickListener listener;
@@ -664,6 +755,7 @@ public class ShareUtils {
                 if (listener != null) {
                     listener.onItemClick(holder.getAdapterPosition());
                 }
+
                 switch (holder.getPosition()) {
                     case 0:
                         shareType = "wechat_friend";
@@ -749,7 +841,7 @@ public class ShareUtils {
     }
 
     private void safelyDismiss() {
-        if (popupWindow.get() != null) {
+        if (popupWindow != null && popupWindow.get() != null) {
             popupWindow.get().dismiss();
         }
     }

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

@@ -23,7 +23,7 @@ object SPUtils {
 
     @JvmStatic
     fun getString(key: String): String {
-        return sp.getString(key, "")
+        return sp.getString(key, "")?:""
     }
 
     @JvmStatic

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

@@ -71,7 +71,7 @@ object SyncDataBetweenPageHelper {
         val fields = syncData::class.java.declaredFields
         var isNeedNotify = false
         for (field in fields) {
-            if (field.getAnnotation(Synchronize::class.java) != null) {
+            if (field.getAnnotation(Synchronize::class.java) != null && resultData != null) {
                 // 同步数据
                 val resultField = resultData::class.java.getDeclaredField(field.name)
                 resultField.isAccessible = true

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

@@ -48,6 +48,12 @@ object TimeUtils {
         return testDate
     }
 
+    //获取当前的小时（24小时制）
+    fun getCurrentHour(): Int {
+        val calendar = Calendar.getInstance()
+        return calendar.get(Calendar.HOUR_OF_DAY)
+    }
+
     //判断是不是今天
     fun isToday(timestamp: Long): Boolean {
         val format = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA)
@@ -60,6 +66,15 @@ object TimeUtils {
         return false
     }
 
+    //判断是不是本周
+    fun isThisWeek(timestamp: Long): Boolean {
+        val calendar = Calendar.getInstance()
+        val currentWeek = calendar[Calendar.WEEK_OF_YEAR]
+        calendar.time = Date(timestamp)
+        val paramWeek = calendar[Calendar.WEEK_OF_YEAR]
+        return paramWeek == currentWeek
+    }
+
     /**
      * 判断时间戳是多少天前
      */
@@ -77,6 +92,23 @@ object TimeUtils {
         return days.toInt()
     }
 
+    /**
+     * 判断传入时间戳与当前日期的差值，返回单位为天
+     */
+    fun getDaysOffset(timestamp: Long): Int {
+        var days: Long = 0
+        val format = SimpleDateFormat("yyyyMMdd", Locale.getDefault())
+        try {
+            val today = format.parse(format.format(Date())).time
+            val day = timestamp * 1000
+            days = (day - today) / 86400000
+        } catch (e: ParseException) {
+            e.printStackTrace()
+        }
+
+        return days.toInt()
+    }
+
 
     /**
      * 格式化视频时长
@@ -88,6 +120,17 @@ object TimeUtils {
         return String.format(Locale.CHINA, "%02d:%02d", minute, second)
     }
 
+    /**
+     * 格式化时长（将秒数转化为HH:mm:ss格式）
+     */
+    @JvmStatic
+    fun formatDuration(seconds: Long): String {
+        val hour = seconds / 3600
+        val minute = seconds % 3600 / 60
+        val second = seconds % 60
+        return String.format(Locale.CHINA, "%02d:%02d:%02d", hour, minute, second)
+    }
+
     @JvmStatic
     fun getDayString(date: Long): String {
         val offSet = Calendar.getInstance().timeZone.rawOffset
@@ -117,6 +160,20 @@ object TimeUtils {
         return calendar.timeInMillis
     }
 
+    @JvmStatic
+    fun getTimeOfToday(hour: Int) = getTimeOfToday(hour, 0)
+
+    @JvmStatic
+    fun getTimeOfToday(hour: Int, minute: Int): Long {
+        val calendar = Calendar.getInstance(TimeZone.getTimeZone("GMT+8"))
+        calendar.timeInMillis = getJavaTimestamp(System.currentTimeMillis())
+        calendar.set(Calendar.HOUR_OF_DAY, hour)
+        calendar.set(Calendar.MINUTE, minute)
+        calendar.set(Calendar.SECOND, 0)
+        calendar.set(Calendar.MILLISECOND, 0)
+        return calendar.timeInMillis
+    }
+
     @JvmStatic
     fun getJavaTimestamp(timestamp: Long): Long {
         return if ((log10(timestamp.toDouble()) + 1).toInt() == 10) {