tinker_base 4.0.2-182

集成反爬虫SDK

See merge request halo/assistant-android!18

.gitmodules

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

CHANGELOG.md

@@ -64,3 +64,26 @@
   - 低版本兼容方案: 插入的样式默认隐藏,只有在3.6.4及以上才会显示
 * 游戏详情评分模块增加`小编评论`区域以及样式修改
 * 游戏评分增加回复功能
+
+### var 3.6.5
+* 以补丁方式向外推出，并没有增加需求，只是单纯的修BUG
+
+### var 3.6.6
+* 游戏详情:
+  - 支持修改评分
+  - 评分列表增加排序/过滤功能
+  - 增加弹出系统
+* 社区相关:
+  - 选择社区页面重做
+  - 首页社区推荐增加推荐入口
+  - 首页社区问题模块改版,名称改为全部,去除问题分类(统一为问题列表),增加社区文章列表
+* 游戏搜索默认页面改版
+* 权限系统更改,不授权也可以进去App,申请权限细分到功能(用到某个功能时才需要强制授予权限)
+* 增加隐私系统
+* 增加游戏预约功能
+* 增加标签详情模块
+* 进入今日头条广告SDK
+* 图片上传压缩机制优化
+  - 支持从后台修改上传配置(本该在早些版本实现,由于代码问题无法引用后台配置)
+  - 对压缩失败是进行catch(由于后台对宽高配置放宽,很容易发生OOM),失败后直接上传原图(这步可能会出现问题)
+* 游戏相关UI修改

app/build.gradle

@@ -1,7 +1,6 @@
 apply plugin: 'com.android.application'
-
-apply plugin: 'org.jetbrains.kotlin.android.extensions'
 apply plugin: 'kotlin-android' // kotlin
+apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 // apkChannelPackage
@@ -24,6 +23,10 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
     dexOptions {
 //        jumboMode = true
         javaMaxHeapSize "4g"
@@ -38,14 +41,8 @@ android {
             }
         }
 
-        /**
-         * 只支持两种架构，减少apk大小，有疑问请参考：
-         * https://developer.android.com/ndk/guides/abis.html
-         * http://allenfeng.com/2016/11/06/what-you-should-know-about-android-abi-and-so/
-         * （为了性能考虑，armeabi可以考虑替换成armeabi-v7a[需要先收集用户设备情况]）
-         */
         ndk {
-            abiFilters "armeabi", "x86"
+            abiFilters "armeabi-v7a"
         }
 
         // 由于app只针对中文用户，所以仅保留zh资源，其他删掉
@@ -68,6 +65,15 @@ android {
         buildConfigField "String", "WEIBO_APPKEY", "\"${WEIBO_APPKEY}\""
         buildConfigField "String", "MTA_APPKEY", "\"${MTA_APPKEY}\""
         buildConfigField "String", "TD_APPID", "\"${TD_APPID}\""
+        buildConfigField "String", "LETO_APPID", "\"${LETO_APPID}\""
+        buildConfigField "String", "TTAD_APPID", "\"${TTAD_APPID}\""
+
+        buildConfigField "String", "MIPUSH_APPID", "\"${MIPUSH_APPID}\""
+        buildConfigField "String", "MIPUSH_APPKEY", "\"${MIPUSH_APPKEY}\""
+        buildConfigField "String", "MEIZUPUSH_APPID", "\"${MEIZUPUSH_APPID}\""
+        buildConfigField "String", "MEIZUPUSH_APPKEY", "\"${MEIZUPUSH_APPKEY}\""
+
+        resValue "string", "huawei_push_appid", "appid=${HUAWEI_PUSH_APPID}"
 
         /**
          * Build Time 供区分 jenkins 打包时间用
@@ -96,7 +102,9 @@ android {
             signingConfig signingConfigs.debug
 
             buildConfigField "String", "EXPOSURE_REPO", "\"test\""
-            buildConfigField "String", "EXPOSURE_VERSION", "\"E3\""
+            buildConfigField "String", "EXPOSURE_VERSION", "\"E4\""
+
+            multiDexKeepProguard file("tinker_multidexkeep.pro")
         }
         release {
             debuggable false
@@ -106,7 +114,9 @@ android {
             signingConfig signingConfigs.release
 
             buildConfigField "String", "EXPOSURE_REPO", "\"exposure\""
-            buildConfigField "String", "EXPOSURE_VERSION", "\"E3\""
+            buildConfigField "String", "EXPOSURE_VERSION", "\"E4\""
+
+            multiDexKeepProguard file("tinker_multidexkeep.pro")
         }
     }
 
@@ -120,21 +130,12 @@ android {
         publish {
             dimension "nonsense"
             buildConfigField "String", "API_HOST", "\"${API_HOST}\""
-            buildConfigField "String", "USER_HOST", "\"${USER_HOST}\""
-            buildConfigField "String", "COMMENT_HOST", "\"${COMMENT_HOST}\""
-            buildConfigField "String", "LIBAO_HOST", "\"${LIBAO_HOST}\""
-            buildConfigField "String", "MESSAGE_HOST", "\"${MESSAGE_HOST}\""
-            buildConfigField "String", "DATA_HOST", "\"${DATA_HOST}\""
+
+            buildConfigField "String", "SENSITIVE_API_HOST", "\"${SENSITIVE_API_HOST}\""
 
             buildConfigField "String", "UMENG_APPKEY", "\"${UMENG_APPKEY}\""
             buildConfigField "String", "UMENG_MESSAGE_SECRET", "\"${UMENG_MESSAGE_SECRET}\""
-            buildConfigField "String", "MIPUSH_APPID", "\"${MIPUSH_APPID}\""
-            buildConfigField "String", "MIPUSH_APPKEY", "\"${MIPUSH_APPKEY}\""
-            buildConfigField "String", "MEIZUPUSH_APPID", "\"${MEIZUPUSH_APPID}\""
-            buildConfigField "String", "MEIZUPUSH_APPKEY", "\"${MEIZUPUSH_APPKEY}\""
-
             buildConfigField "String", "BUGLY_APPID", "\"${BUGLY_APPID}\""
-
         }
         // internal test dev host
         internal {
@@ -142,27 +143,14 @@ android {
             versionNameSuffix "-debug"
 
             buildConfigField "String", "API_HOST", "\"${DEV_API_HOST}\""
-            buildConfigField "String", "USER_HOST", "\"${DEV_USER_HOST}\""
-            buildConfigField "String", "COMMENT_HOST", "\"${DEV_COMMENT_HOST}\""
-            buildConfigField "String", "LIBAO_HOST", "\"${DEV_LIBAO_HOST}\""
-            buildConfigField "String", "MESSAGE_HOST", "\"${DEV_MESSAGE_HOST}\""
-            buildConfigField "String", "DATA_HOST", "\"${DEV_DATA_HOST}\""
 
-            buildConfigField "String", "UMENG_APPKEY", "\"${DEBUG_UMENG_APPKEY}\""
-            buildConfigField "String", "UMENG_MESSAGE_SECRET", "\"${DEBUG_UMENG_MESSAGE_SECRET}\""
-            buildConfigField "String", "MIPUSH_APPID", "\"${DEBUG_MIPUSH_APPID}\""
-            buildConfigField "String", "MIPUSH_APPKEY", "\"${DEBUG_MIPUSH_APPKEY}\""
-            buildConfigField "String", "MEIZUPUSH_APPID", "\"${DEBUG_MEIZUPUSH_APPID}\""
-            buildConfigField "String", "MEIZUPUSH_APPKEY", "\"${DEBUG_MEIZUPUSH_APPKEY}\""
+            buildConfigField "String", "SENSITIVE_API_HOST", "\"${DEV_API_HOST}\""
 
-            buildConfigField "String", "BUGLY_APPID", "\"${DEBUG_BUGLY_APPID}\""
+            buildConfigField "String", "UMENG_APPKEY", "\"${DEV_UMENG_APPKEY}\""
+            buildConfigField "String", "UMENG_MESSAGE_SECRET", "\"${DEV_UMENG_MESSAGE_SECRET}\""
+            buildConfigField "String", "BUGLY_APPID", "\"${DEV_BUGLY_APPID}\""
         }
     }
-
-//    productFlavors.all { flavor ->
-//        flavor.manifestPlaceholders = [CHANNEL_VALUE: name]//命令 gradlew assembleRelease
-//    }
-
 }
 
 // apkChannelPackage
@@ -184,7 +172,7 @@ rebuildChannel {
 
 repositories {
     flatDir {
-        dirs 'libs/aars'
+        dirs 'libs', 'libs/aars'
     }
 }
 
@@ -198,19 +186,32 @@ dependencies {
     debugImplementation "com.facebook.stetho:stetho:${stetho}"
     debugImplementation "com.facebook.stetho:stetho-okhttp3:${stetho}"
     debugImplementation "com.squareup.okhttp3:logging-interceptor:${okHttp}"
+    debugImplementation "com.gu.android:toolargetool:${toolargetool}"
+
+    implementation "androidx.core:core:${core}"
+    implementation "androidx.fragment:fragment:${fragment}"
+    implementation "androidx.multidex:multidex:${multiDex}"
+    implementation "androidx.appcompat:appcompat:${appCompat}"
+    implementation "androidx.cardview:cardview:${cardView}"
+    implementation "androidx.annotation:annotation:${annotation}"
+    implementation "androidx.constraintlayout:constraintlayout:${constraintLayout}"
+    implementation "androidx.recyclerview:recyclerview:${recyclerView}"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifeCycle"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifeCycle"
+    implementation "androidx.lifecycle:lifecycle-common-java8:$lifeCycle"
+    implementation "androidx.room:room-runtime:${room}"
+    implementation "androidx.room:room-rxjava2:${room}"
+    implementation "androidx.core:core-ktx:${ktx}"
+    implementation "androidx.viewpager2:viewpager2:${viewpager2}"
+    kapt "androidx.room:room-compiler:${room}"
+
+    implementation "com.google.android.material:material:${material}"
 
-    implementation "com.android.support:multidex:${multidex}"
-    implementation "com.android.support:design:${androidSupport}"
-    implementation "com.android.support:support-v4:${androidSupport}"
-    implementation "com.android.support:appcompat-v7:${androidSupport}"
-    implementation "com.android.support:cardview-v7:${androidSupport}"
-    implementation "com.android.support:support-annotations:${androidSupport}"
-    implementation "com.android.support:percent:${androidSupport}"
-    implementation "com.android.support.constraint:constraint-layout:${constraintLayout}"
     implementation "com.kyleduo.switchbutton:library:${switchButton}"
 
     implementation "com.facebook.fresco:fresco:${fresco}"
     implementation "com.facebook.fresco:animated-gif:${fresco}"
+    implementation "com.facebook.fresco:animated-drawable:${fresco}"
 
     implementation "com.squareup.okhttp3:okhttp:${okHttp}"
 
@@ -238,30 +239,19 @@ dependencies {
     implementation "com.google.zxing:android-core:${zxing}"
 
     implementation "com.daimajia.swipelayout:library:${swipeLayout}"
-    implementation("cn.trinea.android.view.autoscrollviewpager:android-auto-scroll-view-pager:${autoScrollViewPager}") {
-        exclude module: 'support-v4'
-    }
 
     implementation "com.sina.weibo.sdk:core:${weiboSDK}"
 
     // bugly with tinker support
     implementation "com.tencent.bugly:crashreport_upgrade:${buglyTinkerSupport}"
 
-    implementation "pub.devrel:easypermissions:${easypermissions}"
-    // mvvm
-    implementation "android.arch.lifecycle:runtime:${archLifecycleVersion}"
-    kapt "android.arch.lifecycle:compiler:${archLifecycleVersion}"
-    implementation "android.arch.lifecycle:extensions:${archLifecycleVersion}"
-    implementation "android.arch.persistence.room:runtime:${archRoomVersion}"
-    kapt "android.arch.persistence.room:compiler:${archRoomVersion}"
-    implementation "android.arch.persistence.room:rxjava2:${archRoomVersion}"
+    implementation "com.google.android:flexbox:${flexbox}"
 
-    implementation 'com.google.android:flexbox:0.2.2'
+    implementation "pub.devrel:easypermissions:${easypermissions}"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    kapt 'com.android.databinding:compiler:3.1.3'
 
-    implementation 'com.contrarywind:Android-PickerView:4.1.3'
+    implementation "com.contrarywind:Android-PickerView:${pickerView}"
 
     implementation "com.scwang.smartrefresh:SmartRefreshLayout:${smartRefreshLayout}"
     implementation "net.cachapa.expandablelayout:expandablelayout:${expandableLayout}"
@@ -271,27 +261,46 @@ dependencies {
 
     implementation "top.zibin:Luban:${luban}"
 
+    implementation "com.squareup.picasso:picasso:${picasso}"
+
     // for video streaming
-    implementation "cn.jzvd:jiaozivideoplayer:${jiaoziVideoView}"
-    implementation "com.danikula:videocache:${videoCache}"
+    implementation("com.shuyu:gsyVideoPlayer-java:$gsyVideo", {
+        exclude module: "gsyvideoplayer-androidvideocache"
+    })
+    implementation "com.shuyu:GSYVideoPlayer-exo2:$gsyVideo"
 
-    implementation "com.llew.huawei:verifier:1.0.6"
+    implementation "android.arch.work:work-runtime:${workManager}"
 
-    implementation 'com.ethanhua:skeleton:1.1.1'
-    implementation 'io.supercharge:shimmerlayout:2.1.0'
-    implementation "com.tencent.mm.opensdk:wechat-sdk-android-without-mta:5.3.1"
-    implementation 'com.walkud.rom.checker:RomChecker:1.0.0'
+    implementation "com.llew.huawei:verifier:${verifier}"
+
+    implementation "com.github.tbruyelle:rxpermissions:${rxPermissions}"
+
+    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}"
+
+    debugImplementation "com.github.nichbar.chucker:library:$chucker"
+    releaseImplementation "com.github.nichbar.chucker:library-no-op:$chucker"
+    implementation "com.bytedance.applog:RangersAppLog-Lite-cn:$bytedanceApplog"
+
+    implementation "com.aliyun.dpa:oss-android-sdk:${oss}"
+
+    implementation "com.airbnb.android:lottie:$lottie"
+
+    implementation("com.github.piasy:BigImageViewer:$bigImageViewer", {
+        exclude group: 'com.squareup.okhttp3'
+    })
 
-    implementation project(':libraries:gid')
     implementation project(':libraries:LGLibrary')
     implementation project(':libraries:MTA')
     implementation project(':libraries:QQShare')
     implementation project(':libraries:TalkingData')
     implementation project(':libraries:UmengPush')
 //    implementation project(':libraries:WechatShare')
-    implementation project(':libraries:LogHub')
     implementation project(':libraries:im')
     implementation project(':libraries:Matisse')
+    implementation project(path: ':libraries:gsyVideoPlayer-proxy_cache')
 }
 File propFile = file('sign.properties')
 if (propFile.exists()) {

app/proguard-rules.txt

@@ -194,9 +194,9 @@
 
 -ignorewarnings
 
--keep @android.support.annotation.Keep class *
+-keep @androidx.annotation.Keep class *
 -keepclassmembers class ** {
-  @android.support.annotation.Keep *;
+    @androidx.annotation.Keep *;
 }
 
 -keep class com.gh.loghub.** { *; }
@@ -222,4 +222,36 @@
 
 ### 广点通
 -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.** { *; }
+-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 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.**{*;}

app/src/debug/java/com/gh/gamecenter/Injection.java

@@ -4,7 +4,6 @@ import android.app.Application;
 
 import com.facebook.stetho.Stetho;
 import com.facebook.stetho.okhttp3.StethoInterceptor;
-import com.squareup.leakcanary.LeakCanary;
 
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;
@@ -18,18 +17,11 @@ import okhttp3.logging.HttpLoggingInterceptor;
 public class Injection {
 
     public static boolean appInit(Application application) {
-
-        // init leakcanary
-        if (LeakCanary.isInAnalyzerProcess(application)) {
-            // This process is dedicated to LeakCanary for heap analysis.
-            // You should not init your app in this process.
-            return false;
-        }
-        LeakCanary.install(application);
-
         // init stetho
         Stetho.initializeWithDefaults(application);
 
+        // 监控Bundle大小,预防溢出(需要调试的时候再开启吧!)
+//        TooLargeTool.startLogging(application);
         return true;
     }
 

app/src/main/AndroidManifest.xml

@@ -1,495 +1,653 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android = "http://schemas.android.com/apk/res/android"
-    xmlns:tools = "http://schemas.android.com/tools"
-    package = "com.gh.gamecenter" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.gh.gamecenter">
 
     <!-- 允许应用程序访问网络连接 -->
-    <uses-permission android:name = "android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.INTERNET" />
     <!-- 允许应用程序写入外部存储，如SD卡上写文件 -->
-    <uses-permission android:name = "android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <!-- 允许应用程序读取扩展存储器 -->
-    <uses-permission android:name = "android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <!-- 允许挂载和反挂载文件系统可移动存储 -->
-    <uses-permission android:name = "android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
+    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
     <!-- 允许应用程序访问Wi-Fi网络状态信息 -->
-    <uses-permission android:name = "android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <!-- 允许应用程序获取网络信息状态 -->
-    <uses-permission android:name = "android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <!-- 允许应用程序读取电话状态 -->
-    <uses-permission android:name = "android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <!-- 允许应用程序获取当前或最近运行的应用 -->
-    <uses-permission android:name = "android.permission.GET_TASKS" />
+    <uses-permission android:name="android.permission.GET_TASKS" />
     <!-- 允许访问振动设备 -->
-    <uses-permission android:name = "android.permission.VIBRATE" />
-    <!-- 允许应用程序通过WiFi或移动基站获取粗略的位置信息 -->
-    <uses-permission android:name = "android.permission.ACCESS_COARSE_LOCATION" />
-    <!-- 允许应用程序通过GPS获取精确的位置信息 -->
-    <uses-permission android:name = "android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.VIBRATE" />
     <!-- 允许应用程序改变Wi-Fi连接状态 -->
-    <uses-permission android:name = "android.permission.CHANGE_WIFI_STATE" />
-    <!-- 允许应用程序管理AccountManager中的账户列表 -->
-    <uses-permission android:name = "android.permission.MANAGE_ACCOUNTS" />
-    <!-- 允许应用程序访问GMail账户列表 -->
-    <uses-permission android:name = "android.permission.GET_ACCOUNTS" />
-    <!-- 允许应用程序连接配对过的蓝牙设备 -->
-    <uses-permission android:name = "android.permission.BLUETOOTH" />
-    <!-- 允许应用程序管理蓝牙,搜索和配对新的蓝牙设备 -->
-    <uses-permission android:name = "android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <!-- 允许应用程序打开系统窗口，显示其他应用程序 -->
-    <uses-permission android:name = "android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <!-- 修改系统设置的权限 -->
-    <uses-permission android:name = "android.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+
+    <uses-permission
+        android:name="android.permission.PACKAGE_USAGE_STATS"
+        tools:ignore="ProtectedPermissions" />
 
     <!-- bugly with tinker -->
-    <uses-permission android:name = "android.permission.READ_LOGS" />
-    <uses-permission android:name = "android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.READ_LOGS" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+
+
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <!--可选，穿山甲提供“获取地理位置权限”和“不给予地理位置权限，开发者传入地理位置参数”两种方式上报用户位置，两种方式均可不选，添加位置权限或参数将帮助投放定位广告-->
+    <!--请注意：无论通过何种方式提供给穿山甲用户地理位置，均需向用户声明地理位置权限将应用于穿山甲广告投放，穿山甲不强制获取地理位置信息-->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
+    <!-- 如果有视频相关的广告且使用textureView播放，请务必添加，否则黑屏 -->
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <uses-sdk tools:overrideLibrary="com.shuyu.gsyvideoplayer,
+        com.shuyu.gsyvideoplayer.lib,
+        com.shuyu.gsyvideoplayer.armv7a,
+        com.shuyu.gsyvideoplayer.x86,
+        com.shuyu.gsy.base,
+        com.google.android.exoplayer2,
+        tv.danmaku.ijk.media.exo2,
+        shuyu.com.androidvideocache,
+        pl.droidsonroids.gif,
+        com.ledong.lib.minigame,
+        com.ledong.lib.leto,
+        com.leto.game.base.glide4,
+        com.leto.game.ad.gdt,
+        com.leto.game.fcm,
+        com.leto.game.ad.toutiao" />
+
+    <!-- 去掉 SDK 一些流氓权限 -->
+    <uses-permission
+        android:name="android.permission.READ_CONTACTS"
+        tools:node="remove" />
 
     <supports-screens
-        android:anyDensity = "true"
-        android:largeScreens = "true"
-        android:normalScreens = "true"
-        android:resizeable = "true"
-        android:smallScreens = "true" />
+        android:anyDensity="true"
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:resizeable="true"
+        android:smallScreens="true" />
 
     <!--android:largeHeap = "true"-->
     <application
-        android:name = "com.halo.assistant.TinkerApp"
-        android:allowBackup = "true"
-        android:icon = "@mipmap/logo"
-        android:label = "@string/app_name"
-        android:resizeableActivity = "true"
-        android:theme = "@style/AppCompatTheme.APP"
-        tools:targetApi = "n" >
+        android:name="com.halo.assistant.TinkerApp"
+        android:allowBackup="true"
+        android:icon="@mipmap/logo"
+        android:label="@string/app_name"
+        android:largeHeap="true"
+        android:resizeableActivity="true"
+        android:theme="@style/AppCompatTheme.APP"
+        tools:replace="android:allowBackup"
+        tools:targetApi="n">
 
         <!--android:launchMode = "singleTask"-->
         <activity
-            android:name = "com.gh.gamecenter.SplashScreenActivity"
-            android:configChanges = "keyboardHidden|orientation|screenSize"
-            android:screenOrientation = "portrait"
-            android:theme = "@style/AppGuideTheme" >
-            <intent-filter >
-                <action android:name = "android.intent.action.MAIN" />
+            android:name="com.gh.gamecenter.SplashScreenActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.Launcher">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name = "android.intent.category.LAUNCHER" />
-            </intent-filter >
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
 
-        </activity >
+        </activity>
 
         <activity
-            android:name = "com.gh.gamecenter.MainActivity"
-            android:launchMode = "singleTask"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateAlwaysHidden|adjustResize" />
+            android:name="com.gh.gamecenter.MainActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppCompatTheme.APP"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
 
         <activity
-            android:name = "com.gh.gamecenter.DownloadManagerActivity"
-            android:launchMode = "singleTask"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.DownloadManagerActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
 
         <!--android:theme = "@android:style/Theme.Black.NoTitleBar.Fullscreen"  退出时屏幕抖动 -->
-        <activity android:name = "com.gh.gamecenter.ViewImageActivity" />
-        <activity
-            android:name = "com.gh.gamecenter.SearchActivity"
-            android:configChanges = "keyboardHidden"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.NewsDetailActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.SettingActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.ConcernActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.subject.SubjectActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.NewsSearchActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateHidden" />
-        <activity
-            android:name = "com.gh.gamecenter.GameNewsActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.CropImageActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.WebActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.ShareCardPicActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.ShareCardActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.MessageDetailActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.LibaoActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateHidden" />
-        <activity
-            android:name = "com.gh.gamecenter.LibaoDetailActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.ShareGhWfifActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.ShareGhActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.CleanApkActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.KcSelectGameActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.ChooseReceiverActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.ReceiverWaitingActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.FileSenderActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.FileReceiverActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.SelectUserIconActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.AboutActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.CommentDetailActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.GameDetailActivity"
-            android:configChanges = "orientation|screenSize|keyboardHidden"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.SuggestSelectActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.SuggestionActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.VoteActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateAlwaysHidden|adjustResize" />
-        <activity
-            android:name = "com.gh.gamecenter.ToolBoxActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateHidden" />
+        <activity android:name="com.gh.gamecenter.ViewImageActivity" />
 
         <activity
-            android:name = "com.gh.gamecenter.WeiBoShareActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateHidden" />
+            android:name="com.gh.gamecenter.SearchActivity"
+            android:configChanges="keyboardHidden"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppCompatTheme.APP" />
 
         <activity
-            android:name = "com.gh.gamecenter.InstallActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.amway.search.AmwaySearchActivity"
+            android:configChanges="keyboardHidden"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppCompatTheme.APP" />
 
         <activity
-            android:name = ".category.CategoryDirectoryActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.ShellActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = ".category.CategoryListActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.gamedetail.history.HistoryApkListActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.LoginActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateHidden" />
+            android:name="com.gh.gamecenter.NewsDetailActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.UserInfoActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.SettingActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.UserRegionActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.ConcernActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.CollectionActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.subject.SubjectActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.MessageActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.NewsSearchActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name = "com.gh.gamecenter.UserInfoEditActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateHidden" />
-        <activity
-            android:name = "com.gh.gamecenter.KaiFuActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.GameNewsActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.search.AskSearchActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.CropImageActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.WebActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.questions.detail.QuestionsDetailActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.ShareCardPicActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = ".qa.answer.fold.AnswerFoldActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.ShareCardActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.answer.edit.AnswerEditActivity"
-            android:screenOrientation = "portrait" />
+            android:theme="@style/TransparentStatusBarAndNavigationBar"
+            android:name="com.gh.gamecenter.MessageDetailActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.ConcernInfoActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.LibaoActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name = "com.gh.gamecenter.InfoActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.LibaoDetailActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.MessageKeFuActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.ShareGhActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.select.CommunitiesSelectActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.CleanApkActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.subject.CommunitySubjectActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.SelectUserIconActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.MessageInviteActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.AboutActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.MessageVoteActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.CommentDetailActivity"
+            android:theme="@style/TransparentStatusBarAndNavigationBar"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = ".qa.questions.invite.QuestionsInviteActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.mygame.MyGameActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.myqa.MyAskActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.GameDetailActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.column.order.AskTabOrderActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.SuggestionActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="com.gh.gamecenter.VoteActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.questions.edit.QuestionEditActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.ToolBoxActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name = "com.gh.gamecenter.kaifu.add.AddKaiFuActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateHidden" />
+            android:name="com.gh.gamecenter.WeiBoShareActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name = "com.gh.gamecenter.kaifu.patch.PatchKaifuActivity"
-            android:screenOrientation = "portrait" />
+            android:name=".category.CategoryDirectoryActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.BlockActivity"
-            android:screenOrientation = "portrait" />
+            android:name=".category.CategoryListActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.column.detail.AskColumnDetailActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.LoginActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name = "com.gh.gamecenter.NetworkDiagnosisActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.UserInfoActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.personalhome.fans.FansActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.UserRegionActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.personalhome.followers.FollowersActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.CollectionActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.PersonalHomeActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.MessageActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.personalhome.answer.PersonalAnswerActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.UserInfoEditActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name = "com.gh.gamecenter.personalhome.question.PersonalQuestionActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.qa.search.AskSearchActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.article.edit.ArticleEditActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.article.MyArticleActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.qa.questions.detail.QuestionsDetailActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.article.draft.ArticleDraftActivity"
-            android:screenOrientation = "portrait" />
+            android:name=".qa.answer.fold.AnswerFoldActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.article.detail.ArticleDetailActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.qa.answer.edit.AnswerEditActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.draft.CommunityDraftWrapperActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.ConcernInfoActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.gamedetail.rating.edit.RatingEditActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateVisible" />
+            android:name="com.gh.gamecenter.InfoActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.questions.edit.manager.HistoryDetailActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.MessageKeFuActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.questions.edit.manager.HistoryActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.qa.select.CommunitiesSelectActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.editor.InsertAnswerWrapperActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.qa.subject.CommunitySubjectActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.editor.GameActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.MessageInviteActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.editor.InsertArticleWrapperActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.MessageVoteActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.gamedetail.rating.RatingReplyActivity"
-            android:screenOrientation = "portrait" />
+            android:name=".qa.questions.invite.QuestionsInviteActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = ".history.HistoryActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.qa.myqa.MyAskActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.comment.CommentActivity"
-            android:screenOrientation = "portrait"
-            android:theme = "@style/Theme.Transparent"
-            android:windowSoftInputMode = "adjustNothing" />
+            android:name="com.gh.gamecenter.qa.column.order.AskTabOrderActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.questions.edit.QuestionEditActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.servers.add.AddKaiFuActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
+
+        <activity
+            android:name="com.gh.gamecenter.servers.patch.PatchKaifuActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.BlockActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.amway.AmwayActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.column.detail.AskColumnDetailActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.NetworkDiagnosisActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.personalhome.fans.FansActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.personalhome.followers.FollowersActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.personalhome.UserHomeActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.article.edit.ArticleEditActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.article.MyArticleActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.article.draft.ArticleDraftActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.article.detail.ArticleDetailActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.draft.CommunityDraftWrapperActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.gamedetail.rating.edit.RatingEditActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateVisible" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.questions.edit.manager.HistoryDetailActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.questions.edit.manager.HistoryActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.editor.InsertAnswerWrapperActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.editor.GameActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.editor.InsertArticleWrapperActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:theme="@style/TransparentStatusBarAndNavigationBar"
+            android:name="com.gh.gamecenter.gamedetail.rating.RatingReplyActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.history.HistoryActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.personalhome.rating.RatingActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.gamedetail.rating.logs.CommentLogsActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.tag.TagsActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.article.SimpleArticleListActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.video.videomanager.VideoManagerActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.video.upload.view.UploadVideoActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.video.game.GameVideoActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.editor.VideoActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.mygame.PlayedGameActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.servers.GameServersActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.game.columncollection.detail.ColumnCollectionDetailActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.game.upload.GameSubmissionActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.halo.assistant.fragment.user.UserPortraitCropImageActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.HelpAndFeedbackActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
+
+        <activity
+            android:name="com.gh.gamecenter.help.HelpDetailActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.comment.CommentActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.Transparent"
+            android:windowSoftInputMode="adjustNothing" />
+
+        <activity
+            android:name="com.gh.gamecenter.video.detail.VideoDetailActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:screenOrientation="portrait"
+            android:theme="@style/TransparentStatusBarAndNavigationBar" />
+        <activity
+            android:name=".gamedetail.myrating.MyRatingActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.gamedetail.fuli.kaifu.ServersCalendarActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.QaActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".qa.answer.draft.AnswerDraftActivity"
+            android:screenOrientation="portrait" />
 
         <!-- 使用小米/华为推送弹窗功能提高推送成功率-->
         <activity
-            android:name = "com.gh.gamecenter.PushProxyActivity"
-            android:exported = "true"
-            android:theme = "@android:style/Theme.Translucent" />
+            android:name="com.gh.gamecenter.PushProxyActivity"
+            android:exported="true"
+            android:launchMode="singleTask"
+            android:theme="@android:style/Theme.Translucent" />
 
         <activity
-            android:name = "com.gh.gamecenter.SkipActivity"
-            android:theme = "@style/Theme.AppCompat.Light.Fullscreen.Transparent" >
-            <intent-filter >
-                <data android:scheme = "ghzhushou" />
+            android:name="com.gh.gamecenter.SkipActivity"
+            android:theme="@style/Theme.AppCompat.Light.Fullscreen.Transparent">
+            <intent-filter>
+                <data android:scheme="ghzhushou" />
 
-                <category android:name = "android.intent.category.DEFAULT" />
-                <action android:name = "android.intent.action.VIEW" />
-                <category android:name = "android.intent.category.BROWSABLE" />
-            </intent-filter >
-        </activity >
+                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>
+        </activity>
 
         <activity
-            android:name = "${applicationId}.wxapi.WXEntryActivity"
-            android:exported = "true"
-            android:label = "@string/app_name"
-            android:launchMode = "singleTop"
-            android:screenOrientation = "portrait"
-            android:theme = "@android:style/Theme.Translucent.NoTitleBar" ></activity >
+            android:name="${applicationId}.wxapi.WXEntryActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"></activity>
 
         <provider
-            android:name = "android.support.v4.content.FileProvider"
-            android:authorities = "${applicationId}"
-            android:exported = "false"
-            android:grantUriPermissions = "true" >
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}"
+            android:exported="false"
+            android:grantUriPermissions="true">
             <meta-data
-                android:name = "android.support.FILE_PROVIDER_PATHS"
-                android:resource = "@xml/provider_paths" />
-        </provider >
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths" />
+        </provider>
 
         <receiver
-            android:name = "com.gh.gamecenter.receiver.DownloadReceiver"
-            android:exported = "false" >
-            <intent-filter >
-                <action android:name = "com.gh.gamecenter.DOWNLOAD" />
-            </intent-filter >
-        </receiver >
+            android:name="com.gh.gamecenter.receiver.DownloadReceiver"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.gh.gamecenter.DOWNLOAD" />
+            </intent-filter>
+        </receiver>
         <receiver
-            android:name = "com.gh.gamecenter.receiver.InstallReceiver"
-            android:exported = "false" >
-            <intent-filter >
-                <action android:name = "com.gh.gamecenter.INSTALL" />
-            </intent-filter >
-        </receiver >
+            android:name="com.gh.gamecenter.receiver.InstallReceiver"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.gh.gamecenter.INSTALL" />
+            </intent-filter>
+        </receiver>
 
         <receiver
-            android:name = "com.gh.gamecenter.receiver.ActivitySkipReceiver"
-            android:exported = "true" >
-            <intent-filter >
-                <action android:name = "com.gh.gamecenter.ACTIVITYSKIP" />
-            </intent-filter >
-        </receiver >
+            android:name="com.gh.gamecenter.receiver.ActivitySkipReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.gh.gamecenter.ACTIVITYSKIP" />
+            </intent-filter>
+        </receiver>
 
-        <receiver android:name = "com.gh.gamecenter.receiver.UmengMessageReceiver" >
-            <intent-filter >
-                <action android:name = "com.gh.gamecenter.UMENG" />
-            </intent-filter >
-        </receiver >
+        <receiver android:name="com.gh.gamecenter.receiver.UmengMessageReceiver">
+            <intent-filter>
+                <action android:name="com.gh.gamecenter.UMENG" />
+            </intent-filter>
+        </receiver>
 
         <!--魅族push应用定义消息receiver声明 -->
-        <receiver android:name = "com.gh.gamecenter.receiver.MeizuPushReceiver" >
-            <intent-filter >
+        <receiver android:name="com.gh.gamecenter.receiver.UmengMeizuPushReceiver">
+            <intent-filter>
                 <!-- 接收push消息 -->
-                <action android:name = "com.meizu.flyme.push.intent.MESSAGE" />
+                <action android:name="com.meizu.flyme.push.intent.MESSAGE" />
                 <!-- 接收register消息 -->
-                <action android:name = "com.meizu.flyme.push.intent.REGISTER.FEEDBACK" />
+                <action android:name="com.meizu.flyme.push.intent.REGISTER.FEEDBACK" />
                 <!-- 接收unregister消息-->
-                <action android:name = "com.meizu.flyme.push.intent.UNREGISTER.FEEDBACK" />
+                <action android:name="com.meizu.flyme.push.intent.UNREGISTER.FEEDBACK" />
                 <!-- 兼容低版本Flyme3推送服务配置 -->
-                <action android:name = "com.meizu.c2dm.intent.REGISTRATION" />
-                <action android:name = "com.meizu.c2dm.intent.RECEIVE" />
+                <action android:name="com.meizu.c2dm.intent.REGISTRATION" />
+                <action android:name="com.meizu.c2dm.intent.RECEIVE" />
 
-                <category android:name = "${applicationId}" />
-            </intent-filter >
-        </receiver >
+                <category android:name="${applicationId}" />
+            </intent-filter>
+        </receiver>
 
         <receiver
-            android:name = "com.gh.common.im.ImReceiver"
-            android:enabled = "true" >
-            <intent-filter android:priority = "2147483647" >
-                <action android:name = "com.gh.im" />
-                <action android:name = "action_finish" />
-            </intent-filter >
-        </receiver >
+            android:name="com.gh.common.im.ImReceiver"
+            android:enabled="true">
+            <intent-filter android:priority="2147483647">
+                <action android:name="com.gh.im" />
+                <action android:name="action_finish" />
+            </intent-filter>
+        </receiver>
 
-        <service android:name = "com.gh.base.GHUmengNotificationService" />
+        <meta-data android:name="com.huawei.hms.client.appid" android:value="@string/huawei_push_appid"/>
+
+        <service
+            android:name="com.gh.base.GHUmengNotificationService"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
 
         <!--<service android:name = "com.gh.gamecenter.statistics.AppStaticService" />-->
 
-    </application >
+        <!-- 梦工厂配置 开始 -->
+        <!--<meta-data
+            android:name="MGC_APPID"
+            android:value="1001276" />
 
-</manifest >
+        <provider
+            android:name="com.leto.game.base.provider.LetoFileProvider"
+            android:authorities="${applicationId}.leto.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/leto_file_path"
+                tools:replace="android:resource" />
+        </provider>-->
+        <!-- 梦工厂配置 结束 -->
+
+        <!-- 穿山甲配置 开始 -->
+        <!--<provider
+            android:name="com.bytedance.sdk.openadsdk.TTFileProvider"
+            android:authorities="${applicationId}.TTFileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+
+        <provider
+            android:name="com.bytedance.sdk.openadsdk.multipro.TTMultiProvider"
+            android:authorities="${applicationId}.TTMultiProvider"
+            android:exported="false" />-->
+        <!-- 穿山甲配置 结束 -->
+    </application>
+
+</manifest>

app/src/main/assets/Home.html

@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/html">
-<head>
-    <meta charset="utf-8">
-    <title>光环助手</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <style>
-body {
-	font: 100%/1.0 'Microsoft YaHei','Helvetica Neue',Helvetica,Arial,sans-serif;
-	background-color: #fff;
-	margin: 0;
-	padding: 0;
-}
-
-header {
-}
-
-article {
-	width:100%;
-	max-width:720px;
-	clear: both;
-	margin: 0 auto;
-	margin-top: 20%;
-	text-align: center;
-	margin-bottom:20%;
-}
-.title{margin-top: 4%;font-size:1.7em;color:#191919;text-align:center;}
-.info{margin-top: 18%;font-size:1.0em;color:#191919;line-height:1.3em;}
-.download {text-align: center;}
-.download a{font-size:1.8em;padding:0.2em; text-align:center;color:#ffffff;margin: 0 auto;width:56%;background-color:#2999f9;border-radius:8px; text-decoration:none;display:block;line-height:1.8em;}
-
-@media only screen and (min-width: 1080px) {
-article {
-	width:100%;
-	max-width:720px;
-	clear: both;
-	margin: 0 auto;
-	margin-top: 5%;
-	text-align: center;
-	margin-bottom:20%;
-}
-}
-
-
-    </style>
-
-</head>
-
-<body>
-<header>
-</header>
-
-<article>
-    <img src="http://192.168.43.1:3100/image/gh_icon.png" width="28%">
-    <p class="title">光环助手</p>
-    <br class="info">乐于分享的人是最帅的^_^ </p>
-    <div class="download">
-        <a href="http://192.168.43.1:3100/download/ghzs.apk">免流量下载</a>
-    </div>
-    <p class="title"><font color="#9A9A9A" size="3em">仅限安卓系统 </font></p>
-</article>
-</body>
-</html>

app/src/main/assets/content.js

@@ -29,7 +29,7 @@ function getStyle(dom, name) {
 
 function customLinkgo(self) {
   var datas = self.dataset.datas;
-   console.log(datas)
+  console.log(datas)
   window.OnLinkClickListener.onClick(datas);
 }
 

app/src/main/assets/editor.html

@@ -2,14 +2,20 @@
 <html>
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     <link rel="stylesheet" type="text/css" href="normalize.css">
     <link rel="stylesheet" type="text/css" href="style.css">
+    <link rel="stylesheet" type="text/css" href="video-js.min.css">
+<!--    <link rel="stylesheet" href="https://static-web.ghzs.com/website-static/lib/video-js.min.css">--> <!--在web页面播放视频-->
     <!--<link rel="stylesheet" type="text/css" href="https://resource.ghzs.com/css/halo_app.css">-->
 </head>
-<body>
-<div id="editor" contenteditable="true"></div>
+
+<body style="overflow-x: hidden; word-break: break-all;">
+<div id="editor" contenteditable="false"></div>
 <script type="text/javascript" src="zepto.min.js"></script>
 <script type="text/javascript" src="rich_editor.js"></script>
+<script type="text/javascript" src="video.min.js"></script>
+<!--<script src="https://static-web.ghzs.com/website-static/lib/video.min.js"></script>--> <!--在web页面播放视频-->
 <!--<script type="text/javascript" src="content.js"></script>-->
 <!--<script type="text/javascript" src="https://resource.ghzs.com/js/halo_app.js"></script>-->
 </body>

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

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

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

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

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

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

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

@@ -0,0 +1 @@
+{"v":"5.5.9","fr":30,"ip":0,"op":20,"w":66,"h":66,"nm":"tab_index","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"椭圆形备份","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.596],"y":[0]},"t":0,"s":[0]},{"t":6,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,40.493,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.54,0.54,0.333],"y":[0,0,0]},"t":4,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.555,0.555,0.333],"y":[0,0,0]},"t":9,"s":[110,110,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.552,0.552,0.333],"y":[0,0,0]},"t":13,"s":[90,90,100]},{"t":16,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[5,5],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.635],"y":[0]},"t":0,"s":[0]},{"t":8,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.5,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形备份","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-0.5,"op":59.5,"st":-0.5,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"路径备份","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,32.993,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.508,0.508,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.488,0.488,0.333],"y":[0,0,0]},"t":4,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.502,0.502,0.333],"y":[0,0,0]},"t":9,"s":[110,110,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.534,0.534,0.333],"y":[0,0,0]},"t":13,"s":[95,95,100]},{"t":16,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.24,-1.21],[-1.93,-1.89],[-0.24,-0.57],[0,-0.06],[0,-2.63],[1.76,0],[0,0],[0,1.72],[0,2.63],[-0.24,0.61],[-0.03,0.02],[-1.93,1.89]],"o":[[1.92,1.89],[0.02,0.02],[0.24,0.57],[0,2.63],[0,1.72],[0,0],[-1.76,0],[0,-2.62],[0,-0.07],[0.25,-0.61],[1.92,-1.89],[1.24,-1.21]],"v":[[2.26,-9.09],[8.03,-3.42],[8.76,-2.38],[9,-1.02],[9,6.88],[5.82,10],[-5.82,10],[-9,6.88],[-9,-0.99],[-8.71,-2.38],[-8.01,-3.43],[-2.23,-9.09]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.266,0.638,1,0.5,0.242,0.595,1,1,0.217,0.552,1],"ix":9}},"s":{"a":0,"k":[-4.902,-4.663],"ix":5},"e":{"a":0,"k":[8.159,8.646],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"路径备份","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"bm":0}],"markers":[]}

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

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

app/src/main/assets/rich_editor.js

@@ -24,15 +24,30 @@ RE.currentSelection = {
     "endContainer": 0,
     "endOffset": 0};
 
+var isDebug = false;
+try {
+    isDebug = window.NativeCallBack.isNativeBuildDebug()
+} catch(error) {
+}
+
 // 引用远端的JS 和 CSS
 var script = document.createElement("script")
-script.src = "https://resource.ghzs.com/js/halo.js" + "?timestamp=" + Math.round(new Date().getTime() / 1000 / 1000)
 document.body.appendChild(script)
+if (isDebug) {
+    script.src = "https://resource.ghzs.com/js/halo_app_test.js" + "?timestamp=" + Math.round(new Date().getTime() / 1000)
+} else {
+    script.src = "https://resource.ghzs.com/js/halo.js" + "?timestamp=" + Math.round(new Date().getTime() / 1000 / 1000)
+}
 
 var style = document.createElement("link")
 style.rel = "stylesheet"
 style.type = "text/css"
-style.href = "https://resource.ghzs.com/css/halo.css" + "?timestamp=" + Math.round(new Date().getTime() / 1000 / 1000)
+if (isDebug) {
+    style.href = "https://resource.ghzs.com/css/halo_app_test.css" + "?timestamp=" + Math.round(new Date().getTime() / 1000)
+} else {
+    style.href = "https://resource.ghzs.com/css/halo.css" + "?timestamp=" + Math.round(new Date().getTime() / 1000 / 1000)
+}
+
 document.head.appendChild(style)
 
 RE.editor = document.getElementById('editor');
@@ -48,6 +63,12 @@ RE.setHtml = function(contents) {
     RE.editor.innerHTML = decodeURIComponent(contents.replace(/\+/g, '%20'));
 }
 
+// 后续初始化html代码,都用该方法
+RE.setHtmlByVideoStatus = function(contents) {
+    RE.editor.innerHTML = decodeURIComponent(contents.replace(/\+/g, '%20'));
+}
+
+// Deprecated
 RE.getHtml = function() {
     return RE.editor.innerHTML;
 }
@@ -214,7 +235,7 @@ RE.replaceTbImage = function(imgRuleFlag, gifRuleFlag) {
          var img = imgs[i];
          var imageClassName = img.className;
 //         console.log(imageClassName)
-         if (imageClassName == "image-link") continue;
+         if (imageClassName == "image-link" || img.className == "poster") continue;
          if(img.src.indexOf("?") > 0) continue;
 //         console.log(i)
          var tbImg
@@ -253,7 +274,7 @@ RE.replaceAllDfImage = function(imgRuleFlag, gifRuleFlag) {
     for (var i = 0; i < imgs.length; i++) {
          var img = imgs[i];
          var imageClassName = img.className;
-         if (imageClassName == "image-link") continue;
+         if (imageClassName == "image-link" || img.className == "poster") continue;
          if(img.src.indexOf("web_load_dfimg_icon") > 0) {
             img.parentNode.removeChild(img.parentNode.childNodes[0]);
             i--;
@@ -279,7 +300,7 @@ RE.hideShowBigPic = function() {
     for (var i = 0; i < imgs.length; i++) {
          var img = imgs[i];
          var imageClassName = img.className;
-         if (imageClassName == "image-link") continue;
+         if (imageClassName == "image-link" || img.className == "poster") continue;
          if(img.src.indexOf(",thumbnail") > 0 && img.src.indexOf(".gif") == -1) {
             j++;
          }
@@ -290,7 +311,7 @@ RE.hideShowBigPic = function() {
        for (var i = 0; i < imgs.length; i++) {
            var img = imgs[i];
            var imageClassName = img.className;
-           if (imageClassName == "image-link") continue;
+           if (imageClassName == "image-link" || img.className == "poster") continue;
            if(img.src.indexOf("web_load_dfimg_icon") > 0) {
              img.parentNode.removeChild(img.parentNode.childNodes[0]);
              break;
@@ -304,7 +325,7 @@ RE.replaceDfImageByUrl = function(imgUrl, imgRuleFlag, gifRuleFlag) {
     for (var i = 0; i < imgs.length; i++) {
          var img = imgs[i];
          var imageClassName = img.className;
-         if (imageClassName == "image-link") continue;
+         if (imageClassName == "image-link" || img.className == "poster") continue;
          if (img.src.indexOf(imgUrl) != -1) {
              img.style.cssText = "max-width: 100%; display:block; margin:8px auto; height: auto;"
              if(img.src.indexOf(".gif") > 0) {
@@ -322,7 +343,7 @@ RE.ImageClickListener = function() {
     for (var i = 0; i < imgs.length; i++) {
          var img = imgs[i];
          var imageClassName = img.className;
-         if (imageClassName == "image-link") continue;
+         if (imageClassName == "image-link"|| img.className == "poster") continue;
          window.imagelistener.imageArr(img.src);
          img.onclick = function() {
              window.imagelistener.imageClick(this.src);
@@ -596,3 +617,25 @@ RE.sendElementNameToNative = function() {
         }
     }
 }
+
+// android function to open link
+function customLinkgo(self) {
+  var datas = self.dataset.datas
+  // console.log(datas)
+  window.OnLinkClickListener.onClick(datas)
+}
+
+// 在web页面播放视频
+//RE.initArticleVideo = function(){
+//    initArticleVideo()
+//}
+
+function showNativeDialog(title, message, positive, negative, callback) {
+    var jsCallbackCode = "(" + function (v) {
+        window.onNativeDialogCallback(v);
+        delete window.onNativeDialogCallback;
+    }.toString() + ")";
+
+    window.onNativeDialogCallback = callback;
+    window.NativeCallBack.showDialog(title, message, positive, negative, jsCallbackCode);
+}

app/src/main/java/com/gc/materialdesign/views/CustomView.java

@@ -1,53 +0,0 @@
-package com.gc.materialdesign.views;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.util.AttributeSet;
-import android.widget.RelativeLayout;
-
-public class CustomView extends RelativeLayout {
-
-
-    final static String MATERIALDESIGNXML = "http://schemas.android.com/apk/res-auto";
-    final static String ANDROIDXML = "http://schemas.android.com/apk/res/android";
-
-    final int disabledBackgroundColor = Color.parseColor("#E2E2E2");
-    // Indicate if user touched this view the last time
-    public boolean isLastTouch = false;
-    int beforeBackground;
-    boolean animation = false;
-
-    public CustomView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    public void setEnabled(boolean enabled) {
-        super.setEnabled(enabled);
-        if (enabled)
-            setBackgroundColor(beforeBackground);
-        else
-            setBackgroundColor(disabledBackgroundColor);
-        invalidate();
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-        if (animation)
-            invalidate();
-    }
-
-    @Override
-    protected void onAnimationStart() {
-        super.onAnimationStart();
-        animation = true;
-    }
-
-    @Override
-    protected void onAnimationEnd() {
-        super.onAnimationEnd();
-        animation = false;
-    }
-}

app/src/main/java/com/gc/materialdesign/views/ProgressBarCircularIndeterminate.java

@@ -1,174 +0,0 @@
-package com.gc.materialdesign.views;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.RectF;
-import android.support.v4.content.ContextCompat;
-import android.util.AttributeSet;
-
-public class ProgressBarCircularIndeterminate extends CustomView {
-
-    final static String ANDROIDXML = "http://schemas.android.com/apk/res/android";
-
-    int backgroundColor = Color.parseColor("#1E88E5");
-    float radius1 = 0;
-    float radius2 = 0;
-    int cont = 0;
-    boolean firstAnimationOver = false;
-    int arcD = 1;
-    int arcO = 0;
-    float rotateAngle = 0;
-    int limite = 0;
-
-    public ProgressBarCircularIndeterminate(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        setAttributes(attrs);
-    }
-
-    // Set atributtes of XML to View
-    protected void setAttributes(AttributeSet attrs) {
-
-        setMinimumHeight(Utils.dpToPx(32, getResources()));
-        setMinimumWidth(Utils.dpToPx(32, getResources()));
-
-        // Set background Color
-        // Color by resource
-        int bacgroundColor = attrs.getAttributeResourceValue(ANDROIDXML, "background", -1);
-        if (bacgroundColor != -1) {
-            setBackgroundColor(ContextCompat.getColor(getContext(), bacgroundColor));
-        } else {
-            // Color by hexadecimal
-            int background = attrs.getAttributeIntValue(ANDROIDXML, "background", -1);
-            if (background != -1) {
-                setBackgroundColor(background);
-            } else {
-                setBackgroundColor(Color.parseColor("#1E88E5"));
-            }
-        }
-
-        setMinimumHeight(Utils.dpToPx(3, getResources()));
-
-    }
-
-    // Set color of background
-    public void setBackgroundColor(int color) {
-        super.setBackgroundColor(ContextCompat.getColor(getContext(), android.R.color.transparent));
-        if (isEnabled()) {
-            beforeBackground = backgroundColor;
-        }
-        this.backgroundColor = color;
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-        if (!firstAnimationOver) {
-            drawFirstAnimation(canvas);
-        }
-        if (cont > 0) {
-            drawSecondAnimation(canvas);
-        }
-        invalidate();
-
-    }
-
-    /**
-     * Draw first animation of view
-     *
-     * @param canvas
-     */
-    private void drawFirstAnimation(Canvas canvas) {
-        if (radius1 < getWidth() / 2) {
-            Paint paint = new Paint();
-            paint.setAntiAlias(true);
-            paint.setColor(makePressColor());
-            radius1 = (radius1 >= getWidth() / 2) ? (float) getWidth() / 2 : radius1 + 1;
-            canvas.drawCircle(getWidth() / 2, getHeight() / 2, radius1, paint);
-        } else {
-            Bitmap bitmap = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888);
-            Canvas temp = new Canvas(bitmap);
-            Paint paint = new Paint();
-            paint.setAntiAlias(true);
-            paint.setColor(makePressColor());
-            temp.drawCircle(getWidth() / 2, getHeight() / 2, getHeight() / 2, paint);
-            Paint transparentPaint = new Paint();
-            transparentPaint.setAntiAlias(true);
-            transparentPaint.setColor(ContextCompat.getColor(getContext(), android.R.color.transparent));
-            transparentPaint.setXfermode(new PorterDuffXfermode(
-                    PorterDuff.Mode.CLEAR));
-            if (cont >= 50) {
-                radius2 = (radius2 >= getWidth() / 2) ? (float) getWidth() / 2 : radius2 + 1;
-            } else {
-                radius2 = (radius2 >= getWidth() / 2 - Utils.dpToPx(4, getResources())) ?
-                        (float) getWidth() / 2 - Utils.dpToPx(4, getResources()) : radius2 + 1;
-            }
-            temp.drawCircle(getWidth() / 2, getHeight() / 2, radius2, transparentPaint);
-            canvas.drawBitmap(bitmap, 0, 0, new Paint());
-            if (radius2 >= getWidth() / 2 - Utils.dpToPx(4, getResources())) {
-                cont++;
-            }
-            if (radius2 >= getWidth() / 2) {
-                firstAnimationOver = true;
-            }
-        }
-    }
-
-    /**
-     * Draw second animation of view
-     *
-     * @param canvas
-     */
-    private void drawSecondAnimation(Canvas canvas) {
-        if (arcO == limite) {
-            arcD += 6;
-        }
-        if (arcD >= 290 || arcO > limite) {
-            arcO += 6;
-            arcD -= 6;
-        }
-        if (arcO > limite + 290) {
-            limite = arcO;
-            arcO = limite;
-            arcD = 1;
-        }
-        rotateAngle += 4;
-        canvas.rotate(rotateAngle, getWidth() / 2, getHeight() / 2);
-
-        Bitmap bitmap = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888);
-        Canvas temp = new Canvas(bitmap);
-        Paint paint = new Paint();
-        paint.setAntiAlias(true);
-        paint.setColor(backgroundColor);
-        // temp.drawARGB(0, 0, 0, 255);
-        temp.drawArc(new RectF(0, 0, getWidth(), getHeight()), arcO, arcD, true, paint);
-        Paint transparentPaint = new Paint();
-        transparentPaint.setAntiAlias(true);
-        transparentPaint.setColor(ContextCompat.getColor(getContext(), android.R.color.transparent));
-        transparentPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
-        temp.drawCircle(getWidth() / 2, getHeight() / 2, (getWidth() / 2)
-                - Utils.dpToPx(4, getResources()), transparentPaint);
-
-        canvas.drawBitmap(bitmap, 0, 0, new Paint());
-    }
-
-    /**
-     * Make a dark color to ripple effect
-     *
-     * @return
-     */
-    protected int makePressColor() {
-        int r = (this.backgroundColor >> 16) & 0xFF;
-        int g = (this.backgroundColor >> 8) & 0xFF;
-        int b = (this.backgroundColor >> 0) & 0xFF;
-        // r = (r+90 > 245) ? 245 : r+90;
-        // g = (g+90 > 245) ? 245 : g+90;
-        // b = (b+90 > 245) ? 245 : b+90;
-        return Color.argb(128, r, g, b);
-    }
-
-}

app/src/main/java/com/gc/materialdesign/views/Utils.java

@@ -1,34 +0,0 @@
-package com.gc.materialdesign.views;
-
-import android.content.res.Resources;
-import android.util.TypedValue;
-import android.view.View;
-
-public class Utils {
-
-
-    /**
-     * Convert Dp to Pixel
-     */
-    public static int dpToPx(float dp, Resources resources) {
-        float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, resources.getDisplayMetrics());
-        return (int) px;
-    }
-
-    public static int getRelativeTop(View myView) {
-//	    if (myView.getParent() == myView.getRootView())
-        if (myView.getId() == android.R.id.content)
-            return myView.getTop();
-        else
-            return myView.getTop() + getRelativeTop((View) myView.getParent());
-    }
-
-    public static int getRelativeLeft(View myView) {
-//	    if (myView.getParent() == myView.getRootView())
-        if (myView.getId() == android.R.id.content)
-            return myView.getLeft();
-        else
-            return myView.getLeft() + getRelativeLeft((View) myView.getParent());
-    }
-
-}

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

@@ -1,26 +1,37 @@
 package com.gh.base;
 
-import android.app.Activity;
-import android.arch.lifecycle.Lifecycle;
 import android.content.Intent;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.graphics.Color;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.NonNull;
 import android.text.TextUtils;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.View;
 import android.view.Window;
+import android.view.WindowManager;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
 
-import com.gh.common.util.DataUtils;
+import com.gh.base.fragment.BaseFragment;
+import com.gh.common.constant.Constants;
 import com.gh.common.util.DialogUtils;
+import com.gh.common.util.DisplayUtils;
+import com.gh.common.util.MtaHelper;
 import com.gh.common.util.PackageUtils;
 import com.gh.common.util.RunningUtils;
 import com.gh.common.util.ShareUtils;
 import com.gh.common.util.StringUtils;
+import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.LoginActivity;
 import com.gh.gamecenter.R;
-import com.gh.gamecenter.SuggestionActivity;
 import com.gh.gamecenter.eventbus.EBShowDialog;
-import com.gh.gamecenter.suggest.SuggestType;
+import com.lightgame.BaseAppCompatActivity;
 import com.lightgame.download.FileUtils;
 import com.lightgame.utils.Utils;
 import com.tencent.tauth.Tencent;
@@ -28,29 +39,42 @@ import com.tencent.tauth.Tencent;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.lang.ref.WeakReference;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.Lifecycle;
 import butterknife.ButterKnife;
 import pub.devrel.easypermissions.EasyPermissions;
 
 import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE;
 
-public abstract class BaseActivity extends BaseToolBarActivity implements EasyPermissions.PermissionCallbacks {
+/**
+ * 只提供基础的服务(EventBus/ButterKnife/Share/GlobalDialog/Permissions)
+ * <p>
+ * 需要工具栏的页面请继承{@link ToolBarActivity}
+ */
 
+public abstract class BaseActivity extends BaseAppCompatActivity implements EasyPermissions.PermissionCallbacks {
+
+    // global dialog key
+    public final static String DOWNLOAD_HIJACK = "hijack";
+    public final static String LOGIN_EXCEPTION = "loginException";
+    public final static String PLUGGABLE = "plugin";
+
+    @NonNull
     protected String mEntrance;
 
-    private boolean mIsPause;
     private boolean mIsExistLogoutDialog;
 
     protected final Handler mBaseHandler = new BaseHandler(this);
 
     protected static class BaseHandler extends Handler {
+
         private final WeakReference<BaseActivity> mActivityWeakReference;
 
         BaseHandler(BaseActivity activity) {
@@ -79,106 +103,130 @@ public abstract class BaseActivity extends BaseToolBarActivity implements EasyPe
         }
     }
 
-    // 小米沉浸式黑色字体
-    public void setStatusBarDarkMode(boolean darkmode, Activity activity) {
-        Class<? extends Window> clazz = activity.getWindow().getClass();
-        try {
-            int darkModeFlag = 0;
-            Class<?> layoutParams = Class.forName("android.view.MiuiWindowManager$LayoutParams");
-            Field field = layoutParams.getField("EXTRA_FLAG_STATUS_BAR_DARK_MODE");
-            darkModeFlag = field.getInt(layoutParams);
-            Method extraFlagField = clazz.getMethod("setExtraFlags", int.class, int.class);
-            extraFlagField.invoke(activity.getWindow(), darkmode ? darkModeFlag : 0, darkModeFlag);
-        } catch (Exception ignore) {
-
-        }
-    }
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setStatusBarDarkMode(true, this);
-        EventBus.getDefault().register(this);
-        ButterKnife.bind(this);
+        if (useEventBus()) EventBus.getDefault().register(this);
+        if (useButterKnife()) ButterKnife.bind(this);
         mEntrance = getIntent().getStringExtra(KEY_ENTRANCE);
+        if (TextUtils.isEmpty(mEntrance)) {
+            mEntrance = Constants.ENTRANCE_UNKNOWN;
+        }
+
+        if (BuildConfig.DEBUG) {
+            Utils.log("ACTIVITY_ENTRANCE -> " + mEntrance);
+        }
+    }
+
+    @SuppressWarnings("ConstantConditions")
+    @Override
+    public void setContentView(View view) {
+        if (BuildConfig.DEBUG || BuildConfig.BUILD_TIME != 0) {
+            view = getRootViewWithEnvIndicator(view);
+        }
+        super.setContentView(view);
     }
 
     @Override
     protected void onDestroy() {
-        EventBus.getDefault().unregister(this);
+        if (useEventBus()) EventBus.getDefault().unregister(this);
         mBaseHandler.removeCallbacksAndMessages(null);
         super.onDestroy();
     }
 
-    @Override
-    protected boolean onNavigationIconClicked() {
-        onBackPressed();
-        return true;
-    }
-
     public void toast(String msg) {
-        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-            Utils.toast(this, msg);
+        Utils.toast(this, msg);
     }
 
     public void toast(int msg) {
-        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-            toast(getString(msg));
+        toast(getString(msg));
     }
 
-    public void showShare(String url, String icon, String shareTitle, String shareSummary, ShareUtils.ShareType shareType) {
-
-        ShareUtils.getInstance(this).showShareWindows(this, getWindow().getDecorView(), url, icon, shareTitle, shareSummary, shareType);
-
-        if (shareType == ShareUtils.ShareType.game || shareType == ShareUtils.ShareType.plugin) {
-            DataUtils.onEvent(this, "内容分享", shareTitle + shareSummary);
+    public void showShare(String url,
+                          String icon,
+                          String shareTitle,
+                          String shareSummary,
+                          ShareUtils.ShareEntrance shareEntrance, String id) {
+        ShareUtils.getInstance(this).showShareWindows(this,
+                getWindow().getDecorView(),
+                url,
+                icon,
+                shareTitle,
+                shareSummary,
+                shareEntrance, id);
+        if (shareEntrance == ShareUtils.ShareEntrance.game || shareEntrance == ShareUtils.ShareEntrance.plugin) {
+            MtaHelper.onEvent("内容分享", "内容分享", shareTitle + shareSummary);
         } else {
-            DataUtils.onEvent(this, "内容分享", shareTitle);
+            MtaHelper.onEvent("内容分享", "内容分享", shareTitle);
         }
     }
 
+    private View getRootViewWithEnvIndicator(View view) {
+        RelativeLayout screenRootView = new RelativeLayout(this);
+        screenRootView.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT));
+
+        LinearLayout ll = new LinearLayout(this);
+        TextView tv = new TextView(this);
+        String envText = "正式环境";
+        if (BuildConfig.FLAVOR.equals("internal")) {
+            envText = "测试环境";
+        }
+        tv.setText(envText);
+        tv.setGravity(Gravity.CENTER);
+        tv.setTextColor(Color.WHITE);
+        tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 13);
+        tv.setBackground(ContextCompat.getDrawable(this, R.color.red));
+        tv.measure(0, 0);
+        tv.setAlpha(0.15F);
+        int height = tv.getMeasuredHeight();
+        int width = tv.getMeasuredWidth();
+        tv.setPadding(DisplayUtils.dip2px(20), 0, DisplayUtils.dip2px(20), 0);
+        ll.setTranslationX(DisplayUtils.dip2px(20));
+        ll.setRotation(45);
+        ll.addView(tv);
+        ll.setPadding(0, (width - height) / 2, 0, (width - height) / 2);
+
+        screenRootView.addView(view);
+        screenRootView.addView(ll);
+
+        RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) ll.getLayoutParams();
+        lp.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+        view.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT));
+        return screenRootView;
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(final EBShowDialog showDialog) {
-        if (!mIsPause && this.getClass().getName().equals(RunningUtils.getTopActivity(this))) {
-            if ("hijack".equals(showDialog.getType())) {
-                DialogUtils.showQqSessionDialog(this, "2586716223");// 建议用户联系客服
-            } else if ("plugin".equals(showDialog.getType())) {
-                DialogUtils.showPluginDialog(this, new DialogUtils.ConfirmListener() {
-                    @Override
-                    public void onConfirm() {
-                        if (FileUtils.isEmptyFile(showDialog.getPath())) {
-                            toast(R.string.install_failure_hint);
-                        } else {
-                            startActivity(PackageUtils.getUninstallIntent(BaseActivity.this, showDialog.getPath()));
-                        }
+        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)
+                && this.getClass().getName().equals(RunningUtils.getTopActivity(this))) {
+            if (DOWNLOAD_HIJACK.equals(showDialog.getType())) {
+                DialogUtils.showQqSessionDialog(this);// 建议用户联系客服
+            } else if (PLUGGABLE.equals(showDialog.getType())) {
+                DialogUtils.showPluginDialog(this, () -> {
+                    if (FileUtils.isEmptyFile(showDialog.getPath())) {
+                        toast(R.string.install_failure_hint);
+                    } else {
+                        startActivity(PackageUtils.getUninstallIntent(BaseActivity.this, showDialog.getPath()));
                     }
                 });
-            } else if ("loginException".equals(showDialog.getType())) {
+            } else if (LOGIN_EXCEPTION.equals(showDialog.getType())) {
                 if (mIsExistLogoutDialog) return;
                 mIsExistLogoutDialog = true;
                 try {
                     JSONObject object = new JSONObject(showDialog.getPath());
                     JSONObject device = object.getJSONObject("device");
-                    String manufacturer = device.getString("manufacturer");
                     String model = device.getString("model");
                     DialogUtils.showAlertDialog(this, "你的账号已在另外一台设备登录"
-                            , StringUtils.buildString("（", manufacturer, " - ", model, "）")
+                            , StringUtils.buildString("（", model, "）")
                             , "知道了", "重新登录"
                             , null
                             , () -> startActivity(LoginActivity.getIntent(BaseActivity.this,
                                     "你的账号已在另外一台设备登录多设备-重新登录"))
                     );
                     mBaseHandler.postDelayed(() -> mIsExistLogoutDialog = false, 5000);
-                } catch (JSONException e) {
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
-            } else if ("notfound".equals(showDialog.getType())) {
-                DialogUtils.showAlertDialog(this, "下载失败", "下载链接已失效，建议提交反馈"
-                        , "立即反馈", "取消"
-                        , () -> {
-                            SuggestionActivity.startSuggestionActivity(this, SuggestType.gameQuestion,
-                                    null, showDialog.getPath() + "，问题反馈：下载链接失效");
-                        }, null);
             }
         }
     }
@@ -186,17 +234,32 @@ public abstract class BaseActivity extends BaseToolBarActivity implements EasyPe
     @Override
     protected void onPause() {
         super.onPause();
-        mIsPause = true;
+        if (isFinishing()) {
+            onFinish();
+            for (Fragment fragment : getSupportFragmentManager().getFragments()) {
+                if (fragment.isAdded() && fragment instanceof BaseFragment) {
+                    ((BaseFragment) fragment).onParentActivityFinish();
+                }
+            }
+        }
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        mIsPause = false;
+    }
+
+    /**
+     * 此回调可用于确认当前 activity 已经执行了 finish() 方法并处于 isFinishing 状态
+     */
+    protected void onFinish() {
+
     }
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+    public void onRequestPermissionsResult(int requestCode,
+                                           @NonNull String[] permissions,
+                                           @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
     }
@@ -211,7 +274,27 @@ public abstract class BaseActivity extends BaseToolBarActivity implements EasyPe
 
     }
 
+    protected void setStatusBarColor(int color) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window window = getWindow();
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+            window.setStatusBarColor(color);
+        }
+    }
 
+    /**
+     * 提供当前 activity 的中文名 (不重载的话为类名)
+     */
+    public String getActivityNameInChinese() {
+        return getClass().getSimpleName();
+    }
+
+    /**
+     * @param entrance 上一个页面的链式入口名称
+     * @param path     当前页面名称
+     * @return 完整的链式入口名称
+     */
     public static String mergeEntranceAndPath(String entrance, String path) {
         if (TextUtils.isEmpty(entrance) && TextUtils.isEmpty(path)) return "";
         if (TextUtils.isEmpty(entrance) && !TextUtils.isEmpty(path)) {
@@ -222,4 +305,23 @@ public abstract class BaseActivity extends BaseToolBarActivity implements EasyPe
         }
         return StringUtils.buildString(entrance, "+(", path, ")");
     }
+
+    protected boolean useEventBus() {
+        return true;
+    }
+
+    protected boolean useButterKnife() {
+        return true;
+    }
+
+    @Override
+    public Resources getResources() {
+        Resources resources = super.getResources();
+        if (resources.getConfiguration().fontScale != 1.0f) {
+            Configuration configuration = resources.getConfiguration();
+            configuration.fontScale = 1.0f;
+            resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+        }
+        return resources;
+    }
 }

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

@@ -2,15 +2,17 @@ package com.gh.base;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+
 import com.gh.base.adapter.FragmentAdapter;
+import com.gh.base.fragment.BaseFragment_TabLayout;
 import com.gh.common.view.TabIndicatorView;
 import com.gh.gamecenter.R;
+import com.google.android.material.tabs.TabLayout;
 import com.lightgame.view.NoScrollableViewPager;
 
 import java.util.ArrayList;
@@ -22,7 +24,7 @@ import butterknife.BindView;
  * Created by khy on 15/03/18.
  */
 
-public abstract class BaseActivity_TabLayout extends BaseActivity implements ViewPager.OnPageChangeListener {
+public abstract class BaseActivity_TabLayout extends ToolBarActivity implements ViewPager.OnPageChangeListener {
 
     public static final String PAGE_INDEX = "PAGE_INDEX";
 
@@ -44,7 +46,7 @@ public abstract class BaseActivity_TabLayout extends BaseActivity implements Vie
     protected abstract void initTabTitleList(List<String> tabTitleList);
 
     protected int provideIndicatorWidth() {
-        return 65;
+        return 20;
     }
 
     protected View provideTabView(int position, String tabTitle) {
@@ -88,11 +90,14 @@ public abstract class BaseActivity_TabLayout extends BaseActivity implements Vie
         for (int i = 0; i < mTabLayout.getTabCount(); i++) {
             TabLayout.Tab tab = mTabLayout.getTabAt(i);
             if (tab == null) continue;
-            View tabView = provideTabView(i, tab.getText() != null ? tab.getText().toString() : "");
-            if (tabView == null) continue;
+            String tabTitle = tab.getText() != null ? tab.getText().toString() : "";
+            View tabView = provideTabView(i, tabTitle);
+            if (tabView == null)
+                tabView = BaseFragment_TabLayout.createDefaultTabCustomView(tabTitle);
             tab.setCustomView(tabView);
         }
 
+        BaseFragment_TabLayout.initTabStyle(mTabLayout, mCheckedIndex);
     }
 
     @Override

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

@@ -1,6 +1,6 @@
 package com.gh.base;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 import butterknife.ButterKnife;

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

@@ -9,13 +9,19 @@ import android.os.Bundle
 import android.text.TextUtils
 import android.view.View
 import android.webkit.JavascriptInterface
+import android.widget.TextView
 import butterknife.OnClick
+import com.gh.common.util.DialogUtils
+import com.gh.common.util.MtaHelper
 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.editor.GameActivity
 import com.gh.gamecenter.qa.editor.InsertAnswerWrapperActivity
 import com.gh.gamecenter.qa.editor.InsertArticleWrapperActivity
+import com.gh.gamecenter.qa.editor.VideoActivity
 import com.gh.gamecenter.qa.entity.AnswerEntity
 import com.gh.gamecenter.qa.entity.ArticleEntity
 import com.gh.gamecenter.qa.entity.EditorInsertEntity
@@ -24,10 +30,12 @@ import com.lightgame.utils.Utils
 import com.lightgame.view.CheckableImageView
 import kotterknife.bindView
 
-abstract class BaseRichEditorActivity : BaseActivity() {
+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)
@@ -49,6 +57,7 @@ abstract class BaseRichEditorActivity : BaseActivity() {
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
+        DialogUtils.fixWebViewKeyboardNotWorking(this)
         if (resultCode != Activity.RESULT_OK) return
         var insertData: EditorInsertEntity? = null
         when (requestCode) {
@@ -64,10 +73,11 @@ abstract class BaseRichEditorActivity : BaseActivity() {
                 val game = data?.getParcelableExtra<GameEntity>(GameEntity::class.java.simpleName)
                 if (game != null) insertData = EditorInsertEntity.transform(game)
             }
-        }
-        if (mCurrentParagraphStyle == ELEMENT_PARAGRAPH_QUOTE || mCurrentParagraphStyle == ELEMENT_PARAGRAPH_P) {
-            mRichEditor.insertHtml("&nbsp")
-            if (mCurrentParagraphStyle == ELEMENT_PARAGRAPH_QUOTE) mRichEditor.formatBlock()
+            VideoActivity.INSERT_VIDEO_CODE -> {
+                val video = data?.getParcelableExtra<MyVideoEntity>(MyVideoEntity::class.java.simpleName)
+                if (video != null) mRichEditor.insertCustomVideo(video)
+                return
+            }
         }
 
         mRichEditor.insertCustomStyleLink(insertData)
@@ -80,6 +90,12 @@ abstract class BaseRichEditorActivity : BaseActivity() {
         // 防止个别手机在Js里无法获取粘贴内容
         mRichEditor.addJavascriptInterface(OnPasteListener(), "onPasteListener")
         mRichEditor.addJavascriptInterface(OnCursorChangeListener(), "OnCursorChangeListener")
+        mRichEditor.addJavascriptInterface(OnEditorTextChangeListener(), "OnEditorTextChangeListener")
+        mRichEditor.setInputEnabled(true)
+
+        mDraftBtn.text = if (this is AnswerEditActivity) {
+            "回答草稿"
+        } else "文章草稿"
     }
 
     @OnClick(R.id.editor_image, R.id.editor_font, R.id.editor_link, R.id.editor_paragraph,
@@ -87,7 +103,7 @@ abstract class BaseRichEditorActivity : BaseActivity() {
             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,
             R.id.editor_paragraph_quote, R.id.editor_link_answer, R.id.editor_link_article,
-            R.id.editor_link_game)
+            R.id.editor_link_game, R.id.editor_link_video)
     fun onRichClick(view: View) {
         when (view.id) {
             R.id.editor_font -> {
@@ -120,19 +136,30 @@ abstract class BaseRichEditorActivity : BaseActivity() {
             R.id.editor_font_bold -> {
                 mEditorFontBold.isChecked = !mEditorFontBold.isChecked
                 mRichEditor.setBold()
+                if (mEditorFontBold.isChecked) {
+                    MtaHelper.onEvent(mtaEventName(), "文字样式", "文字样式-加粗")
+                }
             }
             R.id.editor_font_italic -> {
                 mEditorFontItalic.isChecked = !mEditorFontItalic.isChecked
                 mRichEditor.setItalic()
+                if (mEditorFontItalic.isChecked) {
+                    MtaHelper.onEvent(mtaEventName(), "文字样式", "文字样式-斜体")
+                }
             }
             R.id.editor_font_strikethrough -> {
                 mEditorFontStrikeThrough.isChecked = !mEditorFontStrikeThrough.isChecked
                 mRichEditor.setStrikeThrough()
+
+                if (mEditorFontStrikeThrough.isChecked) {
+                    MtaHelper.onEvent(mtaEventName(), "文字样式", "文字样式-删除线")
+                }
             }
             R.id.editor_paragraph_h1 -> {
                 if (mEditorParagraphH1.isChecked) {
                     mRichEditor.formatBlock()
                 } else {
+                    MtaHelper.onEvent(mtaEventName(), "段落样式", "段落样式-1级标题")
                     mRichEditor.setHeading(1)
                 }
                 mEditorParagraphH1.isChecked = !mEditorParagraphH1.isChecked
@@ -141,6 +168,7 @@ abstract class BaseRichEditorActivity : BaseActivity() {
                 if (mEditorParagraphH2.isChecked) {
                     mRichEditor.formatBlock()
                 } else {
+                    MtaHelper.onEvent(mtaEventName(), "段落样式", "段落样式-2级标题")
                     mRichEditor.setHeading(2)
                 }
                 mEditorParagraphH2.isChecked = !mEditorParagraphH2.isChecked
@@ -149,6 +177,7 @@ abstract class BaseRichEditorActivity : BaseActivity() {
                 if (mEditorParagraphH3.isChecked) {
                     mRichEditor.formatBlock()
                 } else {
+                    MtaHelper.onEvent(mtaEventName(), "段落样式", "段落样式-3级标题")
                     mRichEditor.setHeading(3)
                 }
                 mEditorParagraphH3.isChecked = !mEditorParagraphH3.isChecked
@@ -157,6 +186,7 @@ abstract class BaseRichEditorActivity : BaseActivity() {
                 if (mEditorParagraphH4.isChecked) {
                     mRichEditor.formatBlock()
                 } else {
+                    MtaHelper.onEvent(mtaEventName(), "段落样式", "段落样式-4级标题")
                     mRichEditor.setHeading(4)
                 }
                 mEditorParagraphH4.isChecked = !mEditorParagraphH4.isChecked
@@ -165,18 +195,26 @@ abstract class BaseRichEditorActivity : BaseActivity() {
                 if (mEditorParagraphQuote.isChecked) {
                     mRichEditor.formatBlock()
                 } else {
+                    MtaHelper.onEvent(mtaEventName(), "段落样式", "段落样式-引用")
                     mRichEditor.setBlockquote()
                 }
                 mEditorParagraphQuote.isChecked = !mEditorParagraphQuote.isChecked
             }
             R.id.editor_link_answer -> {
+                MtaHelper.onEvent(mtaEventName(), "插入链接", "插入链接-回答")
                 startActivityForResult(InsertAnswerWrapperActivity.getIntent(this), INSERT_ANSWER_CODE)
             }
             R.id.editor_link_article -> {
+                MtaHelper.onEvent(mtaEventName(), "插入链接", "插入链接-文章")
                 startActivityForResult(InsertArticleWrapperActivity.getIntent(this), INSERT_ARTICLE_CODE)
             }
             R.id.editor_link_game -> {
-                startActivityForResult(GameActivity.getIntent(this), INSERT_GAME_CODE)
+                MtaHelper.onEvent(mtaEventName(), "插入链接", "插入链接-游戏")
+                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)
             }
         }
     }
@@ -222,6 +260,16 @@ abstract class BaseRichEditorActivity : BaseActivity() {
         }
     }
 
+    private inner class OnEditorTextChangeListener {
+        @JavascriptInterface
+        fun onTextChange(count: Int) {
+            val num = if (count > MAX_INPUT_TEXT_NUM) MAX_INPUT_TEXT_NUM - count else count
+            mEditorTextNumTv.text = num.toString()
+        }
+    }
+
+    abstract fun mtaEventName(): String
+
     companion object {
         const val ELEMENT_NAME_BOLD = " b "
         const val ELEMENT_NAME_ITALIC = " i "
@@ -235,5 +283,6 @@ abstract class BaseRichEditorActivity : BaseActivity() {
         const val INSERT_ANSWER_CODE = 411
         const val INSERT_ARTICLE_CODE = 412
         const val INSERT_GAME_CODE = 413
+        const val MAX_INPUT_TEXT_NUM = 10000
     }
 }

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

@@ -1,130 +0,0 @@
-package com.gh.base;
-
-import android.os.Bundle;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.StringRes;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.Toolbar;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.ViewGroup;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.gh.common.util.DisplayUtils;
-import com.gh.gamecenter.R;
-import com.gh.gamecenter.normal.ToolbarController;
-import com.lightgame.BaseAppCompatActivity;
-import com.lightgame.OnTitleClickListener;
-
-import java.util.List;
-
-/**
- * Created by csheng on 15-10-12.
- */
-
-public abstract class BaseToolBarActivity extends BaseAppCompatActivity implements ToolbarController, Toolbar.OnMenuItemClickListener {
-
-    private Toolbar mToolbar;
-    private TextView mTitleTv;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        initToolbar();
-    }
-
-    private void initToolbar() {
-        mToolbar = findViewById(R.id.normal_toolbar);
-        mTitleTv = findViewById(R.id.normal_title);
-        if (mToolbar != null) {
-//            setSupportActionBar(mToolbar); // 替换actionBar后 toolBar无法控制
-            mToolbar.setNavigationIcon(provideNavigationIcon());
-            mToolbar.setNavigationOnClickListener(view -> onBackPressed());
-            mTitleTv.setOnClickListener(view -> {
-                final List<Fragment> fragmentList = getSupportFragmentManager().getFragments();
-                for (Fragment fragment : fragmentList) {
-                    if (fragment instanceof OnTitleClickListener) {
-                        ((OnTitleClickListener) fragment).onTitleClick();
-                    }
-                }
-            });
-        }
-    }
-
-    @DrawableRes
-    public int provideNavigationIcon() {
-        return R.drawable.ic_bar_back; // default navigation icon
-    }
-
-    @Override
-    public void setNavigationTitle(String title) {
-        if (mTitleTv != null) mTitleTv.setText(title);
-    }
-
-    @Override
-    public void setNavigationTitle(@StringRes int res) {
-        setNavigationTitle(getString(res));
-    }
-
-    @Override
-    public void setToolbarMenu(int res) {
-        if (mToolbar == null) return;
-        mToolbar.inflateMenu(res);
-        mToolbar.setOnMenuItemClickListener(this);
-
-        Menu menu = mToolbar.getMenu();
-        for (int i = 0; i < menu.size(); i++) {
-            MenuItem menuItem = menu.getItem(i);
-            // menu设置actionLayout后，无法捕捉点击事件，以icon为tag，如果icon is null 手动设置menuItem点击事件
-            if (menuItem != null && menuItem.getIcon() == null) {
-                if (menuItem.getActionView() != null) {
-                    menuItem.getActionView().setOnClickListener((v) -> this.onMenuItemClick(menuItem));
-                }
-            }
-        }
-
-        // 限制标题实际宽度 防止标题挡住toolbar menu按钮
-        if (menu.size() > 2 && mTitleTv != null) {
-            ViewGroup.LayoutParams layoutParams = mTitleTv.getLayoutParams();
-            if (layoutParams instanceof RelativeLayout.LayoutParams) {
-                RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) layoutParams;
-                params.setMargins(DisplayUtils.dip2px(90), 0, DisplayUtils.dip2px(90), 0);
-                mTitleTv.setLayoutParams(params);
-            }
-        }
-    }
-
-    @Override
-    public MenuItem getMenuItem(int res) {
-        if (mToolbar == null) return null; //后续页面做好判断
-        return mToolbar.getMenu().findItem(res);
-    }
-
-    public void clearMenu() {
-        if (mToolbar != null) {
-            mToolbar.getMenu().clear();
-        }
-    }
-
-    public Menu getMenu() {
-        return mToolbar.getMenu();
-    }
-
-    @Override
-    public boolean onMenuItemClick(MenuItem item) {
-        return false;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                return onNavigationIconClicked();
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    protected abstract boolean onNavigationIconClicked();
-
-}

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

@@ -65,7 +65,9 @@ public class GHActivityLifecycleCallbacksImpl implements ActivityLifecycleCallba
 
     @Override
     public void onActivityDestroyed(Activity activity) {
-        AppManager.getInstance().finishActivity(activity);
+        if (activity.isFinishing()) {
+            AppManager.getInstance().finishActivity(activity);
+        }
     }
 
 }

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

@@ -1,55 +0,0 @@
-package com.gh.base;
-
-import android.content.Context;
-import android.os.Bundle;
-
-import com.gh.common.util.EntranceUtils;
-import com.gh.gamecenter.GameDetailActivity;
-import com.gh.gamecenter.NewsDetailActivity;
-import com.gh.gamecenter.WebActivity;
-import com.gh.gamecenter.subject.SubjectActivity;
-import com.umeng.message.UmengNotificationClickHandler;
-import com.umeng.message.entity.UMessage;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-
-public class GHUmengNotificationClickHandler extends UmengNotificationClickHandler {
-
-    @Override
-    public void launchApp(Context context, UMessage uMessage) {
-//		super.launchApp(context, uMessage);
-
-        try {
-            String content = uMessage.extra.get(EntranceUtils.KEY_DATA);
-            JSONObject response = new JSONObject(content);
-            Bundle bundle = new Bundle();
-            bundle.putString(EntranceUtils.KEY_ENTRANCE, EntranceUtils.ENTRANCE_UMENG);
-            String type = response.getString(EntranceUtils.KEY_TYPE);
-            String target = response.getString(EntranceUtils.KEY_TARGET);
-            switch (type) {
-                case EntranceUtils.HOST_ARTICLE:
-                    bundle.putString(EntranceUtils.KEY_TO, NewsDetailActivity.class.getSimpleName());
-                    bundle.putString(EntranceUtils.KEY_NEWSID, target);
-                    break;
-                case EntranceUtils.HOST_GAME:
-                    bundle.putString(EntranceUtils.KEY_TO, GameDetailActivity.class.getSimpleName());
-                    bundle.putString(EntranceUtils.KEY_GAMEID, target);
-                    break;
-                case EntranceUtils.HOST_COLUMN:
-                    bundle.putString(EntranceUtils.KEY_TO, SubjectActivity.class.getName());
-                    bundle.putString(EntranceUtils.KEY_ID, target);
-                    break;
-                case EntranceUtils.HOST_WEB:
-                    bundle.putString(EntranceUtils.KEY_TO, WebActivity.class.getSimpleName());
-                    bundle.putString(EntranceUtils.KEY_URL, target);
-                    break;
-            }
-            EntranceUtils.jumpActivity(context, bundle);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-    }
-
-}

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

@@ -9,14 +9,12 @@ import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.preference.PreferenceManager
-import android.support.v4.app.NotificationCompat
 import android.text.TextUtils
 import android.view.View
+import androidx.core.app.NotificationCompat
+import androidx.core.text.htmlEncode
 import com.gh.common.notifier.Notifier
-import com.gh.common.util.DataUtils
-import com.gh.common.util.EntranceUtils
-import com.gh.common.util.StringUtils
-import com.gh.common.util.toObject
+import com.gh.common.util.*
 import com.gh.gamecenter.R
 import com.gh.gamecenter.entity.PushEntity
 import com.gh.gamecenter.entity.PushMessageEntity
@@ -55,6 +53,7 @@ class GHUmengNotificationService : UmengMessageService() {
         const val DISPLAY_TYPE_NOTIFICATION = "notification"
         const val DISPLAY_TYPE_CUSTOM = "custom"
         const val MESSAGE_ID = "message_id"
+        const val NOTIFICATION_MESSAGE_ID = "notification_message_id" // 通知中心消息 ID
         const val PUSH_ID = "push_id"
     }
 
@@ -89,13 +88,14 @@ class GHUmengNotificationService : UmengMessageService() {
                 intent.putExtra(EntranceUtils.KEY_DATA, data?.link)
                 intent.putExtra(EntranceUtils.KEY_TYPE, UmengMessageReceiver.DIRECT_ONLY)
                 intent.putExtra(EntranceUtils.KEY_MESSAGE, message)
+                intent.putExtra(NOTIFICATION_MESSAGE_ID, data?.messageId)
                 context.sendBroadcast(intent)
                 return
             }
 
             // 用户未登录的情况下不生成消息中心通知，避免用户掉登录了还收到跳转至消息中心的通知
             if (data != null
-                    && data.link?.target == "system"
+                    && data.link?.link == "system"
                     && !UserManager.getInstance().isLoggedIn) {
                 return
             }
@@ -108,6 +108,7 @@ class GHUmengNotificationService : UmengMessageService() {
             clickIntent.putExtra(EntranceUtils.KEY_MESSAGE, message)
             clickIntent.putExtra(MESSAGE_ID, msg?.msgId)
             clickIntent.putExtra(PUSH_ID, data?.pushId)
+            clickIntent.putExtra(NOTIFICATION_MESSAGE_ID, data?.messageId)
             clickIntent.putExtra(EntranceUtils.KEY_TYPE, TYPE_CLICK)
 
             removeIntent.setClass(context, UmengMessageReceiver::class.java)
@@ -129,7 +130,7 @@ class GHUmengNotificationService : UmengMessageService() {
                     .setSmallIcon(R.drawable.ic_notification)
                     .setTicker(pushData.body?.ticker)
                     .setContentTitle(pushData.body?.title)
-                    .setContentText(pushData.body?.text)
+                    .setContentText(pushData.body?.text?.fromHtml())
                     .setContentIntent(clickPendingIntent)
                     .setDeleteIntent(deletePendingIntent)
                     .build()
@@ -137,8 +138,9 @@ class GHUmengNotificationService : UmengMessageService() {
 
             notificationManager.notify(getNotificationTag(context), NOTIFICATION_ID, notification)
         } else {
-            if (UserManager.getInstance().isLoggedIn
-                    && HALO_MESSAGE_DIALOG == pushData.body?.custom) {
+            if (UserManager.getInstance().isLoggedIn &&
+                    HALO_MESSAGE_DIALOG == pushData.body?.custom &&
+                    MessageUnreadRepository.unreadLiveData.value != null) {
                 // 回答了问题或者关注了问题的消息
                 val msg = gson.fromJson(message, PushMessageEntity::class.java)
                 val data = msg?.extra?.data
@@ -158,19 +160,20 @@ class GHUmengNotificationService : UmengMessageService() {
                             .setText(displayText)
                             .setDuration(5000)
                             .setIcon(data?.userEntity?.icon)
-                            .setOnClickListener(View.OnClickListener { _ ->
+                            .setOnClickListener(View.OnClickListener {
                                 val bundle = Bundle()
                                 bundle.putString(EntranceUtils.KEY_ANSWER_ID, data?.answer?.id)
                                 bundle.putString(EntranceUtils.KEY_ENTRANCE, EntranceUtils.ENTRANCE_UMENG)
                                 bundle.putString(EntranceUtils.KEY_TO, AnswerDetailActivity::class.java.name)
                                 EntranceUtils.jumpActivity(context, bundle)
 
-                                DataUtils.onMtaEvent(context, "消息弹窗", type, "Does not contains any parameter.")
+                                MtaHelper.onEvent("消息弹窗", type, "Does not contains any parameter.")
 
                                 // 标记已读
                                 val jsonObject = JSONObject()
                                 jsonObject.put("type", type)
                                 val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString())
+
                                 RetrofitManager.getInstance(application).api.postMessageRead(UserManager.getInstance().userId, data?.id, body)
                                         .subscribeOn(Schedulers.io())
                                         .observeOn(AndroidSchedulers.mainThread())
@@ -184,7 +187,6 @@ class GHUmengNotificationService : UmengMessageService() {
                                                 e?.printStackTrace()
                                             }
                                         })
-
                                 Notifier.hide()
                             })
                             .show(false)

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

@@ -9,15 +9,14 @@ import android.view.View;
  * Created by khy on 25/04/18.
  */
 
-public abstract class onDoubleTapListener implements View.OnTouchListener {
+public abstract class OnDoubleTapListener implements View.OnTouchListener {
     private GestureDetector mGestureDetector;
 
-    public onDoubleTapListener(Context context) {
+    protected OnDoubleTapListener(Context context) {
         mGestureDetector = new GestureDetector(context, new GestureDetector.SimpleOnGestureListener() {
-
             @Override
             public boolean onDoubleTap(MotionEvent e) {
-                onDoubleTapListener.this.onDoubleTap();
+                OnDoubleTapListener.this.onDoubleTap();
                 return true;
             }
         });
@@ -26,7 +25,7 @@ public abstract class onDoubleTapListener implements View.OnTouchListener {
     @Override
     public boolean onTouch(View v, MotionEvent event) {
         mGestureDetector.onTouchEvent(event);
-        return true;
+        return false;
     }
 
     public abstract void onDoubleTap();

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

@@ -2,7 +2,11 @@ package com.gh.base;
 
 /**
  * Created by Administrator on 2016/9/8.
+ *
+ * 逐步移除
  */
+
+@Deprecated
 public interface OnRequestCallBackListener<T> {
 
     void loadDone();

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

@@ -2,6 +2,6 @@ package com.gh.base;
 
 import android.view.View;
 
-public interface OnViewClickListener {
-    void onClick(View v, Object data);
+public interface OnViewClickListener<T> {
+    void onClick(View v, T data);
 }

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

@@ -0,0 +1,262 @@
+package com.gh.base;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.gh.common.util.DisplayUtils;
+import com.gh.download.DownloadManager;
+import com.gh.gamecenter.DownloadManagerActivity;
+import com.gh.gamecenter.R;
+import com.gh.gamecenter.entity.GameUpdateEntity;
+import com.gh.gamecenter.eventbus.EBDownloadStatus;
+import com.gh.gamecenter.normal.ToolbarController;
+import com.gh.gamecenter.packagehelper.PackageViewModel;
+import com.lightgame.OnTitleClickListener;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.List;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProviders;
+
+/**
+ * 需要用到工具栏的页面使用
+ * <p>
+ * 特殊页面请参考{@link BaseActivity}
+ */
+
+public abstract class ToolBarActivity extends BaseActivity implements ToolbarController, Toolbar.OnMenuItemClickListener {
+
+    @Nullable
+    private PackageViewModel mPackageViewModel;
+
+    protected RelativeLayout mToolbarContainer;
+
+    protected Toolbar mToolbar;
+
+    protected TextView mTitleTv;
+
+    @Nullable
+    private TextView mDownloadCountHint;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setStatusBarDarkMode(true, this);
+        initToolbar();
+
+        if (showDownloadMenu()) {
+            mPackageViewModel = ViewModelProviders.of(this, new PackageViewModel.Factory()).get(PackageViewModel.class);
+            mPackageViewModel.getFilterSameUpdateLiveData().observe(this, this::updateDownloadCountHint);
+        }
+    }
+
+    // 小米沉浸式黑色字体
+    @SuppressLint("PrivateApi")
+    public void setStatusBarDarkMode(boolean darkmode, Activity activity) {
+        Class<? extends Window> clazz = activity.getWindow().getClass();
+        try {
+            Class<?> layoutParams = Class.forName("android.view.MiuiWindowManager$LayoutParams");
+            Field field = layoutParams.getField("EXTRA_FLAG_STATUS_BAR_DARK_MODE");
+            int darkModeFlag = field.getInt(layoutParams);
+            Method extraFlagField = clazz.getMethod("setExtraFlags", int.class, int.class);
+            extraFlagField.invoke(activity.getWindow(), darkmode ? darkModeFlag : 0, darkModeFlag);
+        } catch (Exception ignore) {
+
+        }
+    }
+
+    private void initToolbar() {
+        mToolbarContainer = findViewById(R.id.normal_toolbar_container);
+        mToolbar = findViewById(R.id.normal_toolbar);
+        mTitleTv = findViewById(R.id.normal_title);
+        if (mToolbar != null) {
+//            setSupportActionBar(mToolbar); // 替换actionBar后 toolBar无法控制
+            mToolbar.setNavigationIcon(provideNavigationIcon());
+            mToolbar.setNavigationOnClickListener(provideNavigationItemClickListener());
+            if (mTitleTv != null) {
+                mTitleTv.setOnClickListener(view -> {
+                    final List<Fragment> fragmentList = getSupportFragmentManager().getFragments();
+                    for (Fragment fragment : fragmentList) {
+                        if (fragment instanceof OnTitleClickListener) {
+                            ((OnTitleClickListener) fragment).onTitleClick();
+                        }
+                    }
+                });
+            }
+        }
+    }
+
+    @DrawableRes
+    public int provideNavigationIcon() {
+        return R.drawable.ic_bar_back; // default navigation icon
+    }
+
+    @Override
+    public void setNavigationTitle(String title) {
+        if (mTitleTv != null) mTitleTv.setText(title);
+    }
+
+    @Override
+    public void setNavigationTitle(@StringRes int res) {
+        setNavigationTitle(getString(res));
+    }
+
+    /**
+     * 重写此方法以将标题靠左显示
+     */
+    public boolean showToolbarAtLeft() {
+        return false;
+    }
+
+    @Override
+    public void setToolbarMenu(int res) {
+        if (mToolbar == null) return;
+        mToolbar.inflateMenu(res);
+        mToolbar.setOnMenuItemClickListener(this);
+
+        if (showDownloadMenu()) {
+            createDownloadMenu(res);
+        }
+
+        Menu menu = mToolbar.getMenu();
+        for (int i = 0; i < menu.size(); i++) {
+            MenuItem menuItem = menu.getItem(i);
+            // menu设置actionLayout后，无法捕捉点击事件，以icon为tag，如果icon is null 手动设置menuItem点击事件
+            if (menuItem != null && menuItem.getIcon() == null) {
+                if (menuItem.getActionView() != null) {
+                    menuItem.getActionView().setOnClickListener((v) -> this.onMenuItemClick(menuItem));
+                }
+            }
+        }
+
+        // 限制标题实际宽度 防止标题挡住toolbar menu按钮
+        if (menu.size() > 2 && mTitleTv != null) {
+            ViewGroup.LayoutParams layoutParams = mTitleTv.getLayoutParams();
+            if (layoutParams instanceof RelativeLayout.LayoutParams) {
+                RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) layoutParams;
+                if (showToolbarAtLeft()) {
+                    params.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+                    params.addRule(RelativeLayout.CENTER_VERTICAL);
+                    params.setMargins(DisplayUtils.dip2px(55), 0, DisplayUtils.dip2px(48 * menu.size()), 0);
+                } else {
+                    params.setMargins(DisplayUtils.dip2px(90), 0, DisplayUtils.dip2px(90), 0);
+                }
+                mTitleTv.setLayoutParams(params);
+            }
+        } else {
+            if (showToolbarAtLeft()) {
+                ViewGroup.LayoutParams layoutParams = mTitleTv.getLayoutParams();
+                if (layoutParams instanceof RelativeLayout.LayoutParams) {
+                    RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) layoutParams;
+                    params.addRule(RelativeLayout.CENTER_VERTICAL);
+                    params.setMargins(DisplayUtils.dip2px(55), 0, DisplayUtils.dip2px(48 * menu.size()), 0);
+                    mTitleTv.setLayoutParams(params);
+                }
+            }
+        }
+    }
+
+    private void createDownloadMenu(int res) {
+        if (res != R.menu.menu_download) {
+            MenuInflater inflater = getMenuInflater();
+            inflater.inflate(R.menu.menu_download, mToolbar.getMenu());
+        }
+
+        if (mPackageViewModel != null) {
+            updateDownloadCountHint(mPackageViewModel.getFilterSameUpdateLiveData().getValue());
+        }
+
+        View downloadMenuView = mToolbar.getMenu().findItem(R.id.menu_download).getActionView();
+        mDownloadCountHint = downloadMenuView.findViewById(R.id.menu_download_count_hint);
+    }
+
+    private void updateDownloadCountHint(List<GameUpdateEntity> updateList) {
+        if (mDownloadCountHint == null) return;
+
+        String count = DownloadManager.getInstance(getApplicationContext()).getDownloadOrUpdateCount(updateList);
+        if (count != null) {
+            mDownloadCountHint.setVisibility(View.VISIBLE);
+            mDownloadCountHint.setText(count);
+
+            ViewGroup.LayoutParams params = mDownloadCountHint.getLayoutParams();
+            if (TextUtils.isEmpty(count)) {
+                params.width = DisplayUtils.dip2px(6);
+                params.height = DisplayUtils.dip2px(6);
+            } else {
+                params.width = DisplayUtils.dip2px(12);
+                params.height = DisplayUtils.dip2px(12);
+            }
+            mDownloadCountHint.setLayoutParams(params);
+        } else {
+            mDownloadCountHint.setVisibility(View.GONE);
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEventMainThread(EBDownloadStatus status) {
+        if (showDownloadMenu() && mPackageViewModel != null) {
+            updateDownloadCountHint(mPackageViewModel.getFilterSameUpdateLiveData().getValue());
+        }
+    }
+
+    @Override
+    public MenuItem getMenuItem(int res) {
+        if (mToolbar == null) return null; //后续页面做好判断
+        return mToolbar.getMenu().findItem(res);
+    }
+
+    public void clearMenu() {
+        if (mToolbar != null) {
+            mToolbar.getMenu().clear();
+        }
+    }
+
+    public Menu getMenu() {
+        return mToolbar.getMenu();
+    }
+
+    @Override
+    public boolean onMenuItemClick(MenuItem item) {
+        if (item.getItemId() == R.id.menu_download) {
+//            MtaHelper.onEvent("下载管理", "下载管理入口", getActivityNameInChinese());
+            Intent intent = DownloadManagerActivity.getDownloadMangerIntent(this, mEntrance);
+            startActivity(intent);
+        }
+        return false;
+    }
+
+    protected View.OnClickListener provideNavigationItemClickListener() {
+        return view -> onBackPressed();
+    }
+
+    protected boolean showDownloadMenu() {
+        return false;
+    }
+
+    @Override
+    public void hideToolbar(boolean isHide) {
+        if (mToolbarContainer != null) {
+            mToolbarContainer.setVisibility(isHide ? View.GONE : View.VISIBLE);
+        }
+    }
+}

app/src/main/java/com/gh/base/adapter/FragmentAdapter.java

@@ -1,9 +1,9 @@
 package com.gh.base.adapter;
 
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
 
 import java.util.List;
 

app/src/main/java/com/gh/base/adapter/FragmentStateAdapter.java

@@ -1,8 +1,8 @@
 package com.gh.base.adapter;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
 
 import java.util.List;
 

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

@@ -1,13 +1,14 @@
 package com.gh.base.fragment;
 
 import android.app.Dialog;
-import android.arch.lifecycle.Lifecycle;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
-import android.support.v4.app.DialogFragment;
 import android.view.KeyEvent;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.fragment.app.DialogFragment;
+import androidx.lifecycle.Lifecycle;
+
 import com.gh.common.util.ClickUtils;
 import com.gh.gamecenter.R;
 import com.lightgame.utils.RuntimeUtils;
@@ -27,7 +28,7 @@ public class BaseDialogFragment extends DialogFragment {
         final Dialog dialog = new Dialog(getActivity(), R.style.DialogWindowTransparent);
         dialog.setCanceledOnTouchOutside(false);
         dialog.setOnKeyListener((dialog1, keyCode, event) -> {
-            if (keyCode == KeyEvent.KEYCODE_BACK && ClickUtils.isFastDoubleClick()) { //会多次响应??
+            if (keyCode == KeyEvent.KEYCODE_BACK && !ClickUtils.isFastDoubleClick()) {
                 return onBack();
             }
             return false;

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

@@ -2,9 +2,9 @@ package com.gh.base.fragment;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;

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

@@ -1,22 +1,29 @@
 package com.gh.base.fragment;
 
-import android.arch.lifecycle.Lifecycle;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.gh.base.OnListClickListener;
 import com.gh.base.OnRequestCallBackListener;
+import com.gh.common.constant.Constants;
+import com.gh.common.syncpage.ISyncAdapterHandler;
+import com.gh.common.syncpage.SyncDataEntity;
+import com.gh.common.syncpage.SyncPageRepository;
+import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.eventbus.EBMiPush;
 import com.lightgame.OnTitleClickListener;
 import com.lightgame.utils.RuntimeUtils;
@@ -27,12 +34,14 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
 import java.lang.ref.WeakReference;
+import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.ButterKnife;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
+import kotlin.Pair;
 
 import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE;
 
@@ -49,7 +58,8 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
 
     protected boolean isEverPause;
 
-    protected String mEntrance;
+    @NonNull
+    protected String mEntrance = "";
 
     protected final Handler mBaseHandler = new BaseFragment.BaseHandler(this);
 
@@ -118,6 +128,14 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
             mEntrance = getArguments().getString(KEY_ENTRANCE);
         }
 
+        if (TextUtils.isEmpty(mEntrance)) {
+            mEntrance = Constants.ENTRANCE_UNKNOWN;
+        }
+
+        if (BuildConfig.DEBUG) {
+            Utils.log("FRAGMENT_ENTRANCE -> " + mEntrance);
+        }
+
         isEverPause = false;
         EventBus.getDefault().register(this);
 
@@ -127,9 +145,55 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
         } else {
             mCachedView = View.inflate(getContext(), getLayoutId(), null);
         }
-        ButterKnife.bind(this, mCachedView);
+
+        if (useButterKnife()) {
+            ButterKnife.bind(this, mCachedView);
+        }
 
         initView(mCachedView);
+
+        if (addSyncPageObserver()) {
+            initSyncPageObserver();
+        }
+    }
+
+    private void initSyncPageObserver() {
+        SyncPageRepository.INSTANCE.getSyncPageLiveData().observe(this, syncDataEntities -> {
+            try {
+                Utils.log("SyncPageRepository initSyncPageObserver->" + syncDataEntities);
+                List<SyncDataEntity> readyRemoveList = new ArrayList<>();
+                if (syncDataEntities == null || syncDataEntities.isEmpty()) return;
+                RecyclerView.Adapter adapter = provideSyncAdapter();
+                if (!(adapter instanceof ISyncAdapterHandler)) return;
+                for (int i = 0; i < adapter.getItemCount(); i++) {
+                    Pair<String, Object> syncKey = ((ISyncAdapterHandler) adapter).getSyncData(i);
+                    if (syncKey == null) continue;
+                    for (SyncDataEntity syncDataEntity : syncDataEntities) {
+                        if (syncDataEntity.getSyncId().equals(syncKey.getFirst())) {
+                            boolean isSuccess = SyncPageRepository.INSTANCE.handleSyncData(syncKey.getSecond(), syncDataEntity);
+                            if (isSuccess) {
+                                if (BuildConfig.DEBUG) {
+                                    Utils.log("SyncPageRepository notify position->" + i);
+                                }
+                                adapter.notifyItemChanged(i);
+
+                                if (syncDataEntity.getRemove()) {
+                                    readyRemoveList.add(syncDataEntity);
+                                }
+                            }
+                        }
+                    }
+                }
+
+                mBaseHandler.postDelayed(() -> SyncPageRepository.removeSyncData(readyRemoveList), 2000);
+            } catch (Exception e) {
+                if (BuildConfig.DEBUG) {
+                    throw e;
+                } else {
+                    e.printStackTrace();
+                }
+            }
+        });
     }
 
     // 必须的有subscribe才能register
@@ -147,6 +211,13 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
         return mCachedView;
     }
 
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+
+        mCachedView = null;
+    }
+
     @Override
     public void onResume() {
         super.onResume();
@@ -168,13 +239,11 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
     }
 
     public void toast(@StringRes int res) {
-        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-            toast(getString(res));
+        toast(getString(res));
     }
 
     public void toast(String msg) {
-        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-            Utils.toast(getContext(), msg);
+        Utils.toast(getContext(), msg);
     }
 
     public void toastLong(@StringRes int msg) {
@@ -236,4 +305,26 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
         }
     }
 
+    // 为 fragment 附加 bundle (setArgument())
+    public BaseFragment with(Bundle bundle) {
+        this.setArguments(bundle);
+        return this;
+    }
+
+    public void onParentActivityFinish() {
+
+    }
+
+    @Nullable
+    protected RecyclerView.Adapter provideSyncAdapter() {
+        return null;
+    }
+
+    protected boolean addSyncPageObserver() {
+        return false;
+    }
+
+    protected boolean useButterKnife() {
+        return true;
+    }
 }

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

@@ -1,18 +1,28 @@
 package com.gh.base.fragment;
 
 import android.content.Intent;
+import android.graphics.Typeface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.android.material.tabs.TabLayout;
+
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+
+import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.CheckedTextView;
+import android.widget.TextView;
 
 import com.gh.base.adapter.FragmentAdapter;
 import com.gh.common.view.TabIndicatorView;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.normal.NormalFragment;
+import com.halo.assistant.HaloApp;
+import com.lightgame.utils.Utils;
 import com.lightgame.view.NoScrollableViewPager;
 
 import java.util.ArrayList;
@@ -46,7 +56,7 @@ public abstract class BaseFragment_TabLayout extends NormalFragment implements V
     protected abstract void initTabTitleList(List<String> tabTitleList);
 
     protected int provideIndicatorWidth() {
-        return 65;
+        return 20;
     }
 
     protected View provideTabView(int position, String tabTitle) {
@@ -94,11 +104,71 @@ public abstract class BaseFragment_TabLayout extends NormalFragment implements V
         for (int i = 0; i < mTabLayout.getTabCount(); i++) {
             TabLayout.Tab tab = mTabLayout.getTabAt(i);
             if (tab == null) continue;
-            View tabView = provideTabView(i, tab.getText() != null ? tab.getText().toString() : "");
-            if (tabView == null) continue;
+            String tabTitle = tab.getText() != null ? tab.getText().toString() : "";
+            View tabView = provideTabView(i, tabTitle);
+            if (tabView == null) tabView = createDefaultTabCustomView(tabTitle);
             tab.setCustomView(tabView);
         }
 
+        initTabStyle(mTabLayout, mCheckedIndex);
+    }
+
+    public static void initTabStyle(TabLayout tabLayout, int currentItem) {
+        // 默认选择addOnTabSelectedListener不会回调
+        int tabCount = tabLayout.getTabCount();
+        if (tabCount > 0) {
+            TabLayout.Tab tab = tabLayout.getTabAt(currentItem);
+            if (tab != null) updateTabStyle(tab, true);
+        }
+
+        tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                updateTabStyle(tab, true);
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+                updateTabStyle(tab, false);
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+                updateTabStyle(tab, true);
+            }
+        });
+    }
+
+    private static void updateTabStyle(TabLayout.Tab tab, boolean isChecked) {
+        View tabView = tab.getCustomView();
+        if (tabView == null) {
+            Utils.log("TabLayout->Tab样式不是通用样式,请检查");
+            return;
+        }
+
+        TextView tabTitle;
+        if (tabView instanceof TextView) {
+            tabTitle = (TextView) tabView;
+        } else {
+            tabTitle = tabView.findViewById(R.id.tab_title);
+        }
+
+        if (tabTitle == null) {
+            Utils.log("TabLayout->Tab样式不是通用样式,请检查");
+            return;
+        }
+        tabTitle.setTypeface(isChecked ? Typeface.DEFAULT_BOLD : Typeface.DEFAULT);
+    }
+
+    // 如果不设置View的话，无法动态设置字体样式
+    @NonNull
+    public static View createDefaultTabCustomView(String title) {
+        View view = LayoutInflater.from(HaloApp.getInstance().getApplication().getBaseContext()).inflate(R.layout.tab_item, null);
+        View tabTitle = view.findViewById(R.id.tab_title);
+        if (tabTitle instanceof CheckedTextView) {
+            ((CheckedTextView) tabTitle).setText(title);
+        }
+        return view;
     }
 
     @Override

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

@@ -11,12 +11,12 @@ package com.gh.base.fragment;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.IdRes;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
+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;

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

@@ -10,13 +10,20 @@
 package com.gh.base.fragment;
 
 import android.os.Bundle;
-import android.support.annotation.IdRes;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewPager;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Checkable;
 
+import com.gh.gamecenter.fragment.MainWrapperFragment;
+
+import java.util.List;
+
+import androidx.annotation.IdRes;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.viewpager.widget.ViewPager;
+
 
 /**
  * ViewPager 配合ViewGroup Checkable实现双切换<br/>
@@ -31,6 +38,8 @@ public abstract class BaseFragment_ViewPager_Checkable extends BaseFragment_View
 
     protected ViewGroup mCheckableGroup;
 
+    private int mLastPosition = MainWrapperFragment.INDEX_HOME;
+
     @IdRes
     protected abstract int getCheckableGroupId();
 
@@ -68,6 +77,33 @@ public abstract class BaseFragment_ViewPager_Checkable extends BaseFragment_View
     @Override
     public void onPageSelected(int index) {
         onPageChanged(index);
+        try {
+            // 补充Viewpager Fragment的生命周期， 先调用旧选中 fragment 的 onPause 再当前的 onResume
+            if (mFragmentsList.size() > mLastPosition) {
+                Fragment fragment = mFragmentsList.get(mLastPosition);
+                fragment.onPause();
+        
+                FragmentManager childFragmentManager = fragment.getChildFragmentManager();
+                List<Fragment> fragments = childFragmentManager.getFragments();
+                for (Fragment childFragment : fragments) {
+                    childFragment.onPause();
+                }
+            }
+            
+            if (mFragmentsList.size() > index) {
+                Fragment fragment = mFragmentsList.get(index);
+                fragment.onResume();
+
+                FragmentManager childFragmentManager = fragment.getChildFragmentManager();
+                List<Fragment> fragments = childFragmentManager.getFragments();
+                for (Fragment childFragment : fragments) {
+                    childFragment.onResume();
+                }
+            }
+            mLastPosition = index;
+        } catch (Exception ignore) {
+
+        }
     }
 
     @Override

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

@@ -0,0 +1,164 @@
+package com.gh.base.fragment
+
+import android.os.Bundle
+import com.gh.gamecenter.normal.NormalFragment
+import com.lightgame.utils.Utils
+
+/**
+ * 懒加载（支持多层嵌套）
+ */
+abstract class BaseLazyFragment : NormalFragment() {
+
+    private var mIsFirstVisible = true
+
+    private var isViewCreated = false
+
+    protected var isSupportVisible = false
+
+    /**
+     * 用于分发可见时间的时候获取 父fragment 是否隐藏
+     *
+     * @return true fragment 不可见， false 父 fragment 可见
+     */
+    private val isParentInvisible: Boolean
+        get() {
+            val parentFragment = parentFragment
+            return if (parentFragment is BaseLazyFragment) {
+                val fragment = parentFragment as BaseLazyFragment?
+                !fragment!!.isSupportVisible
+            } else {
+                false
+            }
+        }
+
+    override fun setUserVisibleHint(isVisibleToUser: Boolean) {
+        super.setUserVisibleHint(isVisibleToUser)
+        // 对于默认 tab 和 间隔 checked tab 需要等到 isViewCreated = true 后才可以通过此通知用户可见
+        // 这种情况下第一次可见不是在这里通知 因为 isViewCreated = false 成立,等从别的界面回到这里后会使用 onFragmentResume 通知可见
+        // 对于非默认 tab mIsFirstVisible = true 会一直保持到选择则这个 tab 的时候，因为在 onActivityCreated 会返回 false
+        if (isViewCreated) {
+            if (isVisibleToUser && !isSupportVisible) {
+                dispatchUserVisibleHint(true)
+            } else if (!isVisibleToUser && isSupportVisible) {
+                dispatchUserVisibleHint(false)
+            }
+        }
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+
+        isViewCreated = true
+        // !isHidden() 默认为 true  在调用 hide show 的时候可以使用
+        if (!isHidden && userVisibleHint) {
+            dispatchUserVisibleHint(true)
+        }
+
+    }
+
+    override fun onHiddenChanged(hidden: Boolean) {
+        super.onHiddenChanged(hidden)
+
+        if (hidden) {
+            dispatchUserVisibleHint(false)
+        } else {
+            dispatchUserVisibleHint(true)
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (!mIsFirstVisible) {
+            if (!isHidden && !isSupportVisible && userVisibleHint) {
+                dispatchUserVisibleHint(true)
+            }
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+        // 当前 Fragment 包含子 Fragment 的时候 dispatchUserVisibleHint 内部本身就会通知子 Fragment 不可见
+        // 子 fragment 走到这里的时候自身又会调用一遍 ？
+        if (isSupportVisible && userVisibleHint) {
+            dispatchUserVisibleHint(false)
+        }
+    }
+
+
+    /**
+     * 统一处理 显示隐藏
+     *
+     * @param visible
+     */
+    private fun dispatchUserVisibleHint(visible: Boolean) {
+        //当前 Fragment 是 child 时候 作为缓存 Fragment 的子 fragment getUserVisibleHint = true
+        //但当父 fragment 不可见所以 currentVisibleState = false 直接 return 掉
+        // 这里限制则可以限制多层嵌套的时候子 Fragment 的分发
+        if (visible && isParentInvisible) return
+
+        //此处是对子 Fragment 不可见的限制，因为 子 Fragment 先于父 Fragment回调本方法 currentVisibleState 置位 false
+        // 当父 dispatchChildVisibleState 的时候第二次回调本方法 visible = false 所以此处 visible 将直接返回
+        if (isSupportVisible == visible) {
+            return
+        }
+
+        isSupportVisible = visible
+
+        if (visible) {
+            if (mIsFirstVisible && view != null) {
+                mIsFirstVisible = false
+                onFragmentFirstVisible()
+            }
+            onFragmentResume()
+            dispatchChildVisibleState(true)
+        } else {
+            dispatchChildVisibleState(false)
+            onFragmentPause()
+        }
+    }
+
+    /**
+     * 当前 Fragment 是 child 时候 作为缓存 Fragment 的子 fragment 的唯一或者嵌套 VP 的第一 fragment 时 getUserVisibleHint = true
+     * 但是由于父 Fragment 还未进入可见状态所以自身也是不可见的， 这个方法可以存在是因为庆幸的是 父 fragment 的生命周期回调总是先于子 Fragment
+     * 所以在父 fragment 设置完成当前不可见状态后，需要通知子 Fragment 我不可见，你也不可见，
+     *
+     *
+     * 因为 dispatchUserVisibleHint 中判断了 isParentInvisible 所以当 子 fragment 走到了 onActivityCreated 的时候直接 return 掉了
+     *
+     *
+     * 当真正的外部 Fragment 可见的时候，走 setVisibleHint (VP 中)或者 onActivityCreated (hide show) 的时候
+     * 从对应的生命周期入口调用 dispatchChildVisibleState 通知子 Fragment 可见状态
+     *
+     * @param visible
+     */
+    private fun dispatchChildVisibleState(visible: Boolean) {
+        val childFragmentManager = childFragmentManager
+        val fragments = childFragmentManager.fragments
+        if (!fragments.isEmpty()) {
+            for (child in fragments) {
+                if (child is BaseLazyFragment && !child.isHidden() && child.getUserVisibleHint()) {
+                    child.dispatchUserVisibleHint(visible)
+                }
+            }
+        }
+    }
+
+    open fun onFragmentFirstVisible() {
+        //ULog.e("对用户第一次可见")
+    }
+
+    open fun onFragmentResume() {
+        //ULog.e("对用户可见")
+    }
+
+    open fun onFragmentPause() {
+        //ULog.e("对用户不可见")
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        isViewCreated = false
+        mIsFirstVisible = true
+    }
+
+}

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

@@ -0,0 +1,107 @@
+package com.gh.base.fragment
+
+import android.content.Intent
+import android.graphics.Typeface
+import android.os.Bundle
+import android.view.View
+import android.widget.TextView
+import androidx.fragment.app.Fragment
+import androidx.viewpager.widget.PagerAdapter
+import androidx.viewpager.widget.ViewPager
+import butterknife.BindView
+import com.gh.base.adapter.FragmentAdapter
+import com.gh.common.view.TabIndicatorView
+import com.gh.gamecenter.R
+import com.google.android.material.tabs.TabLayout
+import com.google.android.material.tabs.TabLayout.OnTabSelectedListener
+import com.lightgame.utils.Utils
+import com.lightgame.view.NoScrollableViewPager
+
+abstract class BaseLazyTabFragment : BaseLazyFragment(), ViewPager.OnPageChangeListener {
+
+    @BindView(R.id.fragment_tab_layout)
+    lateinit var mTabLayout: TabLayout
+
+    @BindView(R.id.fragment_view_pager)
+    lateinit var mViewPager: NoScrollableViewPager
+
+    @BindView(R.id.fragment_tab_indicator)
+    lateinit var mTabIndicatorView: TabIndicatorView
+
+    var mFragmentsList: MutableList<Fragment> = arrayListOf()
+
+    var mTabTitleList: MutableList<String> = arrayListOf()
+
+    var mCheckedIndex = 0
+
+    abstract fun initFragmentList(fragments: MutableList<Fragment>)
+
+    abstract fun initTabTitleList(tabTitleList: MutableList<String>)
+
+    protected open fun provideIndicatorWidth(): Int {
+        return 20
+    }
+
+    protected open fun provideTabView(position: Int, tabTitle: String?): View? {
+        return null
+    }
+
+    override fun getLayoutId(): Int {
+        return R.layout.fragment_tablayout_viewpager
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        val fragments = childFragmentManager.fragments
+        if (fragments != null) {
+            for (fragment in fragments) {
+                fragment.onActivityResult(requestCode, resultCode, data)
+            }
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        if (arguments != null) mCheckedIndex = requireArguments().getInt(PAGE_INDEX, 0)
+    }
+
+    open fun providePagerAdapter(): PagerAdapter? {
+        return null
+    }
+
+    override fun onFragmentFirstVisible() {
+        super.onFragmentFirstVisible()
+
+        initFragmentList(mFragmentsList)
+        initTabTitleList(mTabTitleList)
+
+        mViewPager.offscreenPageLimit = mFragmentsList.size
+        mViewPager.addOnPageChangeListener(this)
+        mViewPager.adapter = providePagerAdapter()
+                ?: FragmentAdapter(childFragmentManager, mFragmentsList, mTabTitleList)
+        mViewPager.currentItem = mCheckedIndex
+        mTabLayout.setupWithViewPager(mViewPager)
+        mTabIndicatorView.setupWithTabLayout(mTabLayout)
+        mTabIndicatorView.setupWithViewPager(mViewPager)
+        mTabIndicatorView.setIndicatorWidth(provideIndicatorWidth())
+        for (i in 0 until mTabLayout.tabCount) {
+            val tab = mTabLayout.getTabAt(i) ?: continue
+            val tabTitle = if (tab.text != null) tab.text.toString() else ""
+            var tabView = provideTabView(i, tabTitle)
+            if (tabView == null) tabView = BaseFragment_TabLayout.createDefaultTabCustomView(tabTitle)
+            tab.customView = tabView
+        }
+        BaseFragment_TabLayout.initTabStyle(mTabLayout, mCheckedIndex)
+    }
+
+    override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
+
+    override fun onPageSelected(position: Int) {}
+
+    override fun onPageScrollStateChanged(state: Int) {}
+
+    companion object {
+        const val PAGE_INDEX = "PAGE_INDEX"
+    }
+}

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

@@ -1,13 +1,15 @@
 package com.gh.base.fragment;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentManager;
+
 import com.gh.gamecenter.R;
 
 /**
@@ -43,9 +45,9 @@ public class WaitingDialogFragment extends BaseDialogFragment {
 
     @Nullable
     @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         final View view = inflater.inflate(R.layout.set_wait_dialog, null);
-        message = (TextView) view.findViewById(R.id.set_wait_message);
+        message = view.findViewById(R.id.set_wait_message);
         message.setText(getArguments().getString(KEY_MSG));
         return view;
     }
@@ -77,6 +79,12 @@ public class WaitingDialogFragment extends BaseDialogFragment {
         return super.onBack();
     }
 
+    @Override
+    public void dismiss() {
+        mBackListener = null;
+        super.dismiss();
+    }
+
     public static class WaitingDialogData {
         private String msg;
 

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

@@ -2,14 +2,28 @@ package com.gh.common
 
 import android.os.Handler
 import android.os.Looper
+import com.gh.common.AppExecutor.ioExecutor
+import com.gh.common.AppExecutor.lightWeightIoExecutor
+import com.gh.common.AppExecutor.uiExecutor
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors
 
+/**
+ * APP 线程池管理类
+ *
+ * [ioExecutor] 是一个最大线程数固定的线程池，较为繁重的 IO 任务可以交给它
+ * [uiExecutor] 是主线程的包裹，需要切换至主线程执行可以用它
+ * [lightWeightIoExecutor] 是一个单线程的线程池，轻量级且需要保证同一线程的 IO 任务可以交给它
+ *
+ */
 object AppExecutor {
+
     @JvmStatic
-    var ioExecutor = Executors.newSingleThreadExecutor()
+    val uiExecutor by lazy { MainThreadExecutor() }
     @JvmStatic
-    var uiExecutor = MainThreadExecutor()
+    val lightWeightIoExecutor by lazy { Executors.newSingleThreadExecutor() }
+    @JvmStatic
+    val ioExecutor = Executors.newCachedThreadPool() // 用 by lazy 可能影响初始化速度
 
     class MainThreadExecutor : Executor {
         private val mainThreadHandler = Handler(Looper.getMainLooper())
@@ -24,8 +38,12 @@ object AppExecutor {
     }
 }
 
-fun runOnIoThread(f: () -> Unit) {
-    AppExecutor.ioExecutor.execute(f)
+fun runOnIoThread(isLightWeightTask: Boolean = false, f: () -> Unit) {
+    if (isLightWeightTask) {
+        AppExecutor.lightWeightIoExecutor.execute(f)
+    } else {
+        AppExecutor.ioExecutor.execute(f)
+    }
 }
 
 fun runOnUiThread(f: () -> Unit) {

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

@@ -0,0 +1,5 @@
+package com.gh.common
+
+object Base64ImageHolder {
+    var image: String = ""
+}

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

@@ -0,0 +1,171 @@
+package com.gh.common
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.webkit.JavascriptInterface
+import androidx.annotation.Keep
+import com.gh.base.CurrentActivityHolder
+import com.gh.common.util.*
+import com.gh.common.view.dsbridge.CompletionHandler
+import com.gh.gamecenter.BuildConfig
+import com.gh.gamecenter.LoginActivity
+import com.gh.gamecenter.ViewImageActivity
+import com.gh.gamecenter.entity.Badge
+import com.gh.gamecenter.entity.MtaEvent
+import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.retrofit.BiResponse
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.gh.gamecenter.room.AppDatabase
+import com.gh.gamecenter.user.LoginTag
+import com.halo.assistant.HaloApp
+import com.lightgame.utils.Utils
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import okhttp3.ResponseBody
+import org.json.JSONObject
+import retrofit2.HttpException
+
+class DefaultJsApi(var context: Context) {
+
+    @JavascriptInterface
+    fun isGhzs(msg: Any): String {
+        return "true"
+    }
+
+    @JavascriptInterface
+    fun toast(msg: Any) {
+        Utils.toast(HaloApp.getInstance().application, msg.toString())
+    }
+
+    @JavascriptInterface
+    fun logMtaEvent(event: Any) {
+        val mtaEvent = event.toString().toObject() ?: MtaEvent()
+
+        MtaHelper.onEvent(mtaEvent.name, mtaEvent.key, mtaEvent.value)
+    }
+
+    @JavascriptInterface
+    fun getUserInfo(msg: Any): String {
+        return UserManager.getInstance().userInfoEntity.toJson()
+    }
+
+    @JavascriptInterface
+    fun getUserToken(msg: Any): String {
+        return if (UserManager.getInstance().isLoggedIn) UserManager.getInstance().loginTokenEntity.accessToken.value else ""
+    }
+
+    @JavascriptInterface
+    fun login(msg: Any) {
+        val intent = LoginActivity.getIntent(context, "浏览器")
+        context.startActivity(intent)
+    }
+
+    @JavascriptInterface
+    fun refreshUserInfoBadge(msg: Any) {
+        val userInfoEntity = UserManager.getInstance().userInfoEntity
+        if (msg.toString().isNotEmpty()) {
+            val badge = msg.toString().toObject() ?: Badge()
+            userInfoEntity.badge = badge
+        } else {
+            userInfoEntity.badge = null
+        }
+        UserManager.getInstance().userInfoEntity = userInfoEntity
+        AppDatabase.getInstance(context).userInfoDao().updateUserInfo(userInfoEntity)
+    }
+
+    @JavascriptInterface
+    fun getChannel(msg: Any): String {
+        return HaloApp.getInstance().channel
+    }
+
+    @JavascriptInterface
+    fun getAppVersion(msg: Any): String {
+        return BuildConfig.VERSION_NAME
+    }
+
+    @JavascriptInterface
+    fun bindWechat(msg: Any, handler: CompletionHandler<Any>) {
+        context.ifLogin("浏览器") {
+            LoginHelper.loginWithWechat(object : LoginHelper.LoginCallback {
+                @SuppressLint("CheckResult")
+                override fun onLoginSuccess(loginType: LoginTag, jsonContent: JSONObject) {
+
+                    val wechatLoginInfoMap = hashMapOf<String, String>()
+                    wechatLoginInfoMap["openid"] = jsonContent.getString("openid")
+                    wechatLoginInfoMap["unionid"] = jsonContent.getString("unionid")
+                    wechatLoginInfoMap["access_token"] = jsonContent.getString("access_token")
+                    wechatLoginInfoMap["refresh_token"] = jsonContent.getString("refresh_token")
+
+                    RetrofitManager.getInstance(HaloApp.getInstance().application)
+                            .api
+                            .postBindWechat(wechatLoginInfoMap.createRequestBody())
+                            .subscribeOn(Schedulers.io())
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe(object : BiResponse<ResponseBody>() {
+                                override fun onSuccess(data: ResponseBody) {
+                                    handler.complete(true)
+                                }
+
+                                override fun onFailure(exception: Exception) {
+                                    handler.complete(false)
+                                    if (exception is HttpException) {
+                                        ErrorHelper.handleError(HaloApp.getInstance().application, exception.response().errorBody()?.string())
+                                    }
+                                }
+                            })
+                }
+
+                override fun onLoginFailure(loginType: LoginTag, error: String) {
+                    handler.complete(false)
+                }
+            })
+        }
+    }
+
+    @JavascriptInterface
+    fun copyText(msg: Any) {
+        msg.toString().copyTextAndToast()
+    }
+
+    @JavascriptInterface
+    fun startApp(msg: Any) {
+        val packageName = msg.toString()
+        PackageUtils.launchApplicationByPackageName(HaloApp.getInstance().application, packageName)
+    }
+
+    @JavascriptInterface
+    fun openImage(event: Any) {
+        val imageEvent = event.toString().toObject() ?: ImageEvent()
+
+        val context = CurrentActivityHolder.getCurrentActivity()
+
+        context?.startActivity(ViewImageActivity.getViewImageIntent(context, imageEvent.imageList, imageEvent.position, "浏览器"))
+    }
+
+    @JavascriptInterface
+    fun isInstalled(event: Any): String {
+        val localInstalledPackageList = PackageUtils.getAllPackageName(HaloApp.getInstance().application)
+        val packageNameList: ArrayList<String> = event.toString().toObject() ?: ArrayList()
+
+        for (packageName in packageNameList) {
+            if (!localInstalledPackageList.contains(packageName)) {
+                return "false"
+            }
+        }
+
+        return "true"
+    }
+
+    @JavascriptInterface
+    fun openBase64Image(event: Any) {
+        val context = CurrentActivityHolder.getCurrentActivity()
+
+        Base64ImageHolder.image = event.toString()
+
+        context?.startActivity(ViewImageActivity.getBase64ViewImageIntent(context, true))
+    }
+
+    @Keep
+    internal data class ImageEvent(var imageList: ArrayList<String> = arrayListOf(), var position: Int = 0)
+
+}

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

@@ -0,0 +1,229 @@
+package com.gh.common
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.text.TextUtils
+import com.gh.common.util.CheckLoginUtils
+import com.gh.common.util.DialogUtils
+import com.gh.common.util.DirectUtils
+import com.gh.common.util.DirectUtils.directToGameDetailVideoStreaming
+import com.gh.common.util.DirectUtils.directToGameVideo
+import com.gh.common.util.DirectUtils.directToVideoDetail
+import com.gh.common.util.EntranceUtils
+import com.gh.gamecenter.*
+import com.gh.gamecenter.entity.CommunityEntity
+import com.gh.gamecenter.entity.SimpleGameEntity
+import com.gh.gamecenter.entity.SubjectRecommendEntity
+import com.gh.gamecenter.entity.VideoLinkEntity
+import com.gh.gamecenter.subject.SubjectActivity
+import com.gh.gamecenter.video.detail.VideoDetailContainerViewModel
+import com.lightgame.utils.Utils
+
+object DefaultUrlHandler {
+
+    @JvmStatic
+    fun interceptUrl(context: Context, url: String, entrance: String): Boolean {
+        val uri = Uri.parse(url)
+        if ("ghzhushou" == uri.scheme) {
+            Utils.log("url = $url")
+            Utils.log("url = " + uri.scheme!!)
+            val host = uri.host
+            val path = uri.path
+            var id = ""
+            if (!TextUtils.isEmpty(path)) {
+                id = path!!.substring(1)
+            }
+            val intent: Intent
+            when (host) {
+                "article" -> context.startActivity(NewsDetailActivity.getIntentById(context, id, entrance))
+
+                "game" -> GameDetailActivity.startGameDetailActivity(context, id, "libao" == uri.getQueryParameter("to"), entrance)
+
+                "column" -> SubjectActivity.startSubjectActivity(context, id, uri.getQueryParameter("name"), false, entrance)
+
+                "libao" -> context.startActivity(LibaoDetailActivity.getIntentById(context, id, entrance))
+
+                "qq" -> try {
+                    DirectUtils.directToQqConversation(context, id)
+                } catch (e: Throwable) {
+                    Utils.toast(context, "请检查是否已经安装手机QQ")
+                    e.printStackTrace()
+                }
+
+                "qqqun" -> {
+                    val key = uri.getQueryParameter("key")
+                    if (!DirectUtils.directToQqGroup(context, key)) {
+                        Utils.toast(context, "请检查是否已经安装手机QQ")
+                    }
+                }
+
+                "inurl" -> {
+                    intent = Intent(context, WebActivity::class.java)
+                    intent.putExtra(EntranceUtils.KEY_URL, uri.getQueryParameter("url"))
+                    context.startActivity(intent)
+                }
+
+                "outurl" -> {
+                    intent = Intent()
+                    intent.action = Intent.ACTION_VIEW
+                    intent.data = Uri.parse(uri.getQueryParameter("url"))
+                    try {
+                        context.startActivity(intent)
+                    } catch (e: Exception) {
+                        Utils.toast(context, "请检查是否已经安装手机浏览器")
+                        e.printStackTrace()
+                    }
+
+                }
+                "question" -> DirectUtils.directToQuestionDetail(context, id, entrance, "文章链接")
+
+                "community" -> {
+                    val community = CommunityEntity()
+                    community.id = id
+                    community.name = uri.getQueryParameter("name") ?: ""
+                    DirectUtils.directToCommunity(context, community)
+                }
+
+                "community_column" -> {
+                    val community = CommunityEntity()
+                    community.id = uri.getQueryParameter("community_id") ?: ""
+                    community.name = uri.getQueryParameter("community_name") ?: ""
+                    val columnId = uri.getQueryParameter("column_id") ?: ""
+                    DirectUtils.directToCommunityColumn(context, community, columnId, entrance, "文章链接")
+                }
+
+                "answer" -> DirectUtils.directToAnswerDetail(context, id, entrance, "文章链接")
+
+                "communities" -> {
+                    // ghzhushou://communities/5a32405b2397ab000f688de3/articles/5c99d262c140b321564f04e3
+                    var communityId = ""
+                    var type = ""
+                    var typeId = ""
+                    val split = id.split("/".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+                    for (text in split) {
+                        if (TextUtils.isEmpty(communityId)) {
+                            communityId = text
+                            continue
+                        }
+                        if (TextUtils.isEmpty(type)) {
+                            type = text
+                            continue
+                        }
+                        if (TextUtils.isEmpty(typeId)) {
+                            typeId = text
+                        }
+                    }
+                    if ("articles" == type) {
+                        DirectUtils.directToCommunityArticle(
+                                context, typeId, communityId,
+                                entrance, "文章链接")
+                    }
+                }
+                EntranceUtils.HOST_UPLOAD_VIDEO -> {
+                    val titleParameter = uri.getQueryParameter("title")
+                    val title = if (titleParameter.isNullOrEmpty()) "" else "#$titleParameter#"
+                    val categoryId = uri.getQueryParameter("category_id") ?: ""
+                    val link = uri.getQueryParameter("link") ?: ""
+                    val linkEntity = VideoLinkEntity(title, categoryId, link)
+                    val gameId = uri.getQueryParameter("gameId") ?: ""
+                    val gameName = uri.getQueryParameter("gameName") ?: ""
+                    val simpleGameEntity = SimpleGameEntity(gameId, gameName)
+                    CheckLoginUtils.checkLogin(context, null, true, EntranceUtils.ENTRANCE_BROWSER) {
+                        DirectUtils.directToVideoManager(context, linkEntity, simpleGameEntity, EntranceUtils.ENTRANCE_BROWSER, "")
+                    }
+                }
+                EntranceUtils.HOST_USERHOME -> {
+                    val position = uri.getQueryParameter("position")
+                    DirectUtils.directToHomeActivity(context, id, if (position.isNullOrEmpty()) -1 else position.toInt(), entrance, "")
+                }
+                EntranceUtils.HOST_VIDEO_MORE -> {
+                    val referer = uri.getQueryParameter("referer") ?: ""
+                    val type = uri.getQueryParameter("type") ?: ""
+                    val act = uri.getQueryParameter("act") ?: ""
+                    val loaction = if (TextUtils.isEmpty(act)) id else VideoDetailContainerViewModel.Location.VIDEO_ACTIVITY.value
+                    directToVideoDetail(context, id, loaction, false, "", entrance, "", referer, type, act)
+                }
+                EntranceUtils.HOST_VIDEO_SINGLE -> {
+                    val referer = uri.getQueryParameter("referer") ?: ""
+                    directToVideoDetail(context, id, VideoDetailContainerViewModel.Location.SINGLE_VIDEO.value,
+                            false, "", entrance, "", if (TextUtils.isEmpty(referer)) "" else referer)
+                }
+                EntranceUtils.HOST_VIDEO_STREAMING_HOME -> {
+                    intent = Intent(context, MainActivity::class.java)
+                    intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+                    intent.putExtra(MainActivity.SWITCH_TO_VIDEO, true)
+                    context.startActivity(intent)
+                }
+                EntranceUtils.HOST_VIDEO_STREAMING_DESC -> {
+                    directToGameDetailVideoStreaming(context, id, entrance)
+                }
+                EntranceUtils.HOST_VIDEO_COLLECTION -> {
+                    directToGameVideo(context, id, entrance, "")
+                }
+
+                EntranceUtils.HOST_CATEGORY -> {
+                    val title = uri.getQueryParameter("title")
+                    DirectUtils.directCategoryDirectory(context, id, title ?: "", entrance, "")
+                }
+                EntranceUtils.HOST_COLUMN_COLLECTION -> {
+                    val name = uri.getQueryParameter("name")
+                    DirectUtils.directToColumnCollection(context, id, -1, entrance, name ?: "")
+                }
+                EntranceUtils.HOST_COLUMN -> {
+                    DirectUtils.directToSubject(context, id, uri.getQueryParameter(EntranceUtils.KEY_NAME), entrance)
+                }
+                EntranceUtils.HOST_COMMUNITY_QUESTION_LABEL_DETAIL -> {
+                    val community = CommunityEntity()
+                    community.id = uri.getQueryParameter("community_id") ?: ""
+                    community.name = uri.getQueryParameter("community_name") ?: ""
+                    val tag = uri.getQueryParameter("tag") ?: ""
+                    DirectUtils.directAskColumnLabelDetail(context, tag, community, entrance, "")
+                }
+                EntranceUtils.HOST_COMMUNITY_COLUMN_DETAIL -> {
+                    val community = CommunityEntity()
+                    community.id = uri.getQueryParameter("community_id") ?: ""
+                    community.name = uri.getQueryParameter("community_name") ?: ""
+                    val columnId = uri.getQueryParameter("column_id") ?: ""
+                    DirectUtils.directAskColumnDetail(context, columnId, community, entrance, "")
+                }
+
+                EntranceUtils.HOST_BLOCK -> {
+                    val name = uri.getQueryParameter("name")
+                            ?: ""
+                    val entity = SubjectRecommendEntity(link = id, name = name, text = name)
+                    DirectUtils.directToBlock(context, entity)
+                }
+
+                EntranceUtils.HOST_SERVER_BLOCK -> {
+                    DirectUtils.directToGameServers(context, entrance = entrance, path = "")
+                }
+
+                EntranceUtils.HOST_AMWAY_BLOCK -> {
+                    DirectUtils.directToAmway(context, entrance = entrance, path = "")
+                }
+
+                EntranceUtils.HOST_HELP -> {
+                    val name = uri.getQueryParameter("name")
+                            ?: ""
+                    DirectUtils.directToQa(context, name, id)
+                }
+
+                EntranceUtils.HOST_HELP_COLLECTION -> {
+                    val name = uri.getQueryParameter("name")
+                            ?: ""
+                    DirectUtils.directToQaCollection(context, name, id)
+                }
+
+                EntranceUtils.HOST_GAME_UPLOAD -> {
+                    DirectUtils.directGameUpload(context, entrance = entrance, path = "")
+                }
+
+                else -> DialogUtils.showLowVersionDialog(context)
+            }
+            return true
+        }
+        if ("http" != uri.scheme && "https" != uri.scheme) return true
+        return false
+    }
+}

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

@@ -0,0 +1,68 @@
+package com.gh.common
+
+import com.gh.common.exposure.ExposureManager
+import com.gh.common.filter.RegionSettingHelper
+import com.gh.common.loghub.LoghubUtils
+import com.gh.common.util.doOnMainProcessOnly
+import com.gh.common.videolog.VideoRecordUtils
+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 {
+    private const val CHECKER_PERIOD: Long = 60 * 1000L
+    private const val TIME_PERIOD: Long = 600 * 1000L
+    private const val LOGHUB_PERIOD: Long = 120 * 1000L
+    private const val EXPOSURE_PERIOD: Long = 300 * 1000L
+    private const val REGION_SETTING_PERIOD: Long = 300 * 1000L
+    private const val VIDEO_RECORD_PERIOD: Long = 60 * 1000L
+
+    private var mExecuteCount: Int = 0
+
+    var timeDeltaBetweenServerAndClient: Long = 0
+
+    @JvmStatic
+    fun begin() {
+        doOnMainProcessOnly {
+            fixedRateTimer("Global-Fixed-Rate-Timer", initialDelay = 100, period = CHECKER_PERIOD) {
+                // 时间校对，10分钟一次
+                if ((mExecuteCount * CHECKER_PERIOD) % TIME_PERIOD == 0L) {
+                    RetrofitManager.getInstance(HaloApp.getInstance().application).api.time
+                            .subscribeOn(Schedulers.io())
+                            .subscribe(object : Response<TimeEntity>() {
+                                override fun onResponse(response: TimeEntity?) {
+                                    val serverTime = response?.time
+                                    serverTime?.let { timeDeltaBetweenServerAndClient = it * 1000 - System.currentTimeMillis() }
+                                }
+                            })
+                }
+
+                // 提交曝光数据
+                if ((mExecuteCount * CHECKER_PERIOD) % EXPOSURE_PERIOD == 0L) {
+                    ExposureManager.commitSavedExposureEvents(true)
+                }
+
+                // 提交普通 loghub 数据
+                if ((mExecuteCount * CHECKER_PERIOD) % LOGHUB_PERIOD == 0L) {
+                    LoghubUtils.commitSavedLoghubEvents()
+                }
+
+                // 更新游戏屏蔽信息
+                if ((mExecuteCount * CHECKER_PERIOD) % REGION_SETTING_PERIOD == 0L) {
+                    RegionSettingHelper.getRegionSetting()
+                }
+
+                // 提交视频浏览记录数据
+                if ((mExecuteCount * CHECKER_PERIOD) % VIDEO_RECORD_PERIOD == 0L) {
+                    VideoRecordUtils.commitVideoRecord()
+                }
+
+//              ExposureUtils.logADownloadCompleteExposureEvent(GameEntity(id = mExecuteCount.toString(), name = "测试曝光上传"), platform = "", trace = null, downloadType = ExposureUtils.DownloadType.DOWNLOAD)
+                mExecuteCount++
+            }
+        }
+    }
+}

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

@@ -8,6 +8,7 @@ import com.gh.common.exposure.meta.MetaUtil
 import com.gh.common.util.edit
 import com.gh.common.util.toJson
 import com.gh.common.util.toObject
+import com.gh.common.util.tryWithDefaultCatch
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.entity.AliasEntity
 import com.gh.gamecenter.retrofit.RetrofitManager
@@ -27,44 +28,41 @@ import org.json.JSONObject
 object PushManager {
 
     var deviceToken: String? = ""
-    var previousAlias: AliasEntity? = null
-    var application = HaloApp.getInstance().application
+
+    private var mPreviousAlias: AliasEntity? = null
+    private var mApplication = HaloApp.getInstance().application
 
     const val SP_PUSH_ALIAS = "push_alias"
 
     @JvmStatic
     fun init(channel: String) {
-        //初始化友盟推送
-        UMConfigure.init(application,
-                Config.UMENG_APPKEY, channel,
-                UMConfigure.DEVICE_TYPE_PHONE,
-                Config.UMENG_MESSAGE_SECRET)
+        tryWithDefaultCatch {
+            //初始化友盟推送
+            UMConfigure.init(mApplication, Config.UMENG_APPKEY, channel, UMConfigure.DEVICE_TYPE_PHONE, Config.UMENG_MESSAGE_SECRET)
 
-        // 注册小米、华为和魅族通道
-        MiPushRegistar.register(application, Config.MIPUSH_APPID, Config.MIPUSH_APPKEY)
-        HuaWeiRegister.register(application)
-        MeizuRegister.register(application, BuildConfig.MEIZUPUSH_APPID, BuildConfig.MEIZUPUSH_APPKEY)
+            val pushAgent = PushAgent.getInstance(mApplication)
 
-        //友盟推送
-        val pushAgent = PushAgent.getInstance(application)
-        pushAgent.onAppStart() // 开启App统计
+            runOnIoThread { registerDevice() }
 
-        //注册推送服务，每次调用register方法都会回调该接口
-        registerDevice()
+            // 注册小米、华为和魅族通道
+            MiPushRegistar.register(mApplication, Config.MIPUSH_APPID, Config.MIPUSH_APPKEY)
+            HuaWeiRegister.register(mApplication)
+            MeizuRegister.register(mApplication, BuildConfig.MEIZUPUSH_APPID, BuildConfig.MEIZUPUSH_APPKEY)
 
-        val aliasInSp = PreferenceManager.getDefaultSharedPreferences(application).getString(SP_PUSH_ALIAS, "")
-        previousAlias = aliasInSp.toObject()
+            val aliasInSp = PreferenceManager.getDefaultSharedPreferences(mApplication).getString(SP_PUSH_ALIAS, "")
+            mPreviousAlias = aliasInSp?.toObject()
 
-        if (previousAlias == null) {
-            getAndSetAlias()
+            if (mPreviousAlias == null) {
+                getAndSetAlias()
+            }
+
+            // 完全自定义处理（透传）
+            pushAgent.setPushIntentServiceClass(GHUmengNotificationService::class.java)
         }
-
-        // 完全自定义处理（透传）
-        pushAgent.setPushIntentServiceClass(GHUmengNotificationService::class.java)
     }
 
     private fun registerDevice() {
-        PushAgent.getInstance(application).register(object : IUmengRegisterCallback {
+        PushAgent.getInstance(mApplication).register(object : IUmengRegisterCallback {
             override fun onSuccess(dToken: String) {
                 //注册成功会返回device token
                 deviceToken = dToken
@@ -100,7 +98,7 @@ object PushManager {
 
         val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString())
 
-        RetrofitManager.getInstance(application).api.getAlias(body)
+        RetrofitManager.getInstance(mApplication).api.getAlias(body)
                 .subscribeOn(Schedulers.io())
                 .subscribe(
                         { setAlias(it) },
@@ -110,11 +108,11 @@ object PushManager {
 
     @JvmStatic
     fun setAlias(alias: AliasEntity) {
-        val pushAgent = PushAgent.getInstance(application)
+        val pushAgent = PushAgent.getInstance(mApplication)
 
-        previousAlias = alias
-        PreferenceManager.getDefaultSharedPreferences(application).edit {
-            putString(SP_PUSH_ALIAS, previousAlias?.toJson())
+        mPreviousAlias = alias
+        PreferenceManager.getDefaultSharedPreferences(mApplication).edit {
+            putString(SP_PUSH_ALIAS, mPreviousAlias?.toJson())
         }
 
         pushAgent.setAlias(alias.alias, alias.aliasType) { b, s ->
@@ -124,16 +122,16 @@ object PushManager {
 
     @JvmStatic
     fun deleteAlias() {
-        val pushAgent = PushAgent.getInstance(application)
+        val pushAgent = PushAgent.getInstance(mApplication)
 
-        previousAlias?.let {
+        mPreviousAlias?.let {
             pushAgent.deleteAlias(it.alias, it.aliasType) { b, s ->
                 Utils.log("删除别名 $b + $s")
             }
         }
-        PreferenceManager.getDefaultSharedPreferences(application).edit {
+        PreferenceManager.getDefaultSharedPreferences(mApplication).edit {
             putString(SP_PUSH_ALIAS, "")
         }
-        previousAlias = null
+        mPreviousAlias = null
     }
 }

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

@@ -3,13 +3,14 @@ package com.gh.common
 import android.app.Activity
 import android.app.Application
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
 import com.halo.assistant.HaloApp
+import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 
 /**
- * 统计用户在当前 Fragment 的停留时间，在 onViewDestroy 或 onDestroy 里获取 elapsedTime 即可，单位为秒
+ * 统计用户在当前 Fragment/Activity 的停留时间，在 onViewDestroy 或 onDestroy 里获取 elapsedTime 即可，单位为秒
  */
 class TimeElapsedHelper(val fragment: Fragment?, val activity: Activity?) {
 
@@ -61,19 +62,19 @@ class TimeElapsedHelper(val fragment: Fragment?, val activity: Activity?) {
 
         fragment?.fragmentManager?.registerFragmentLifecycleCallbacks(
                 object : FragmentManager.FragmentLifecycleCallbacks() {
-                    override fun onFragmentResumed(fm: FragmentManager?, f: Fragment?) {
+                    override fun onFragmentResumed(fm: FragmentManager, f: Fragment) {
                         if (f === fragment) {
                             resumeCounting()
                         }
                     }
 
-                    override fun onFragmentPaused(fm: FragmentManager?, f: Fragment?) {
+                    override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
                         if (f === fragment) {
                             pauseCounting()
                         }
                     }
 
-                    override fun onFragmentViewDestroyed(fm: FragmentManager?, f: Fragment?) {
+                    override fun onFragmentViewDestroyed(fm: FragmentManager, f: Fragment) {
                         if (f === fragment) {
                             fragment.fragmentManager?.unregisterFragmentLifecycleCallbacks(this)
                         }
@@ -113,7 +114,7 @@ class TimeElapsedHelper(val fragment: Fragment?, val activity: Activity?) {
 }
 
 object TimeElapsedThreadHolder {
-    val threadService = Executors.newSingleThreadExecutor()
+    val threadService: ExecutorService by lazy { Executors.newSingleThreadExecutor() }
 }
 
 interface TimeoutCallback {

app/src/main/java/com/gh/common/annotation/SyncIgnore.java

@@ -0,0 +1,16 @@
+package com.gh.common.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 标记那些不需要检查的同步字段
+ *
+ * 同步字段冲突时使用
+ */
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface SyncIgnore {
+}

app/src/main/java/com/gh/common/annotation/SyncPage.java

@@ -0,0 +1,12 @@
+package com.gh.common.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface SyncPage {
+    String[] syncNames();
+}

app/src/main/java/com/gh/common/annotation/Synchronize.java

@@ -0,0 +1,11 @@
+package com.gh.common.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Synchronize {
+}

app/src/main/java/com/gh/common/avoidcallback/ActivityResultInfo.java

@@ -0,0 +1,31 @@
+package com.gh.common.avoidcallback;
+
+import android.content.Intent;
+
+public class ActivityResultInfo {
+    private int resultCode;
+    private Intent data;
+
+    public ActivityResultInfo(int resultCode, Intent data) {
+        this.resultCode = resultCode;
+        this.data = data;
+    }
+
+
+    public int getResultCode() {
+        return resultCode;
+    }
+
+    public void setResultCode(int resultCode) {
+        this.resultCode = resultCode;
+    }
+
+    public Intent getData() {
+
+        return data;
+    }
+
+    public void setData(Intent data) {
+        this.data = data;
+    }
+}

app/src/main/java/com/gh/common/avoidcallback/AvoidOnResultFragment.kt

@@ -0,0 +1,48 @@
+package com.gh.common.avoidcallback
+
+import android.content.Intent
+import android.os.Bundle
+import android.util.SparseArray
+import androidx.fragment.app.Fragment
+import io.reactivex.Observable
+import io.reactivex.subjects.PublishSubject
+
+class AvoidOnResultFragment : Fragment() {
+    private val mSubjects = SparseArray<PublishSubject<ActivityResultInfo>>()
+    private val mCallbacks = SparseArray<Callback>()
+
+    private var requestCode = 1000
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        retainInstance = true
+    }
+
+    fun startForResult(intent: Intent): Observable<ActivityResultInfo> {
+        val subject = PublishSubject.create<ActivityResultInfo>()
+        return subject.doOnSubscribe {
+            mSubjects.put(requestCode, subject)
+            startActivityForResult(intent, requestCode)
+            requestCode++
+        }
+    }
+
+    fun startForResult(intent: Intent, callback: Callback) {
+        mCallbacks.put(requestCode, callback)
+        startActivityForResult(intent, requestCode)
+        requestCode++
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        val subject = mSubjects.get(requestCode)
+        if (subject != null) {
+            subject.onNext(ActivityResultInfo(resultCode, data))
+            subject.onComplete()
+        }
+        mSubjects.remove(requestCode)
+        val callback = mCallbacks.get(requestCode)
+        callback?.onActivityResult(resultCode, data)
+        mCallbacks.remove(requestCode)
+    }
+}

app/src/main/java/com/gh/common/avoidcallback/AvoidOnResultManager.kt

@@ -0,0 +1,64 @@
+package com.gh.common.avoidcallback
+
+import android.content.Intent
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import io.reactivex.Observable
+
+
+class AvoidOnResultManager {
+    val TAG = "AvoidOnResultManager"
+    private var mAvoidOnResultFragment: AvoidOnResultFragment
+
+    private constructor(activity: AppCompatActivity) {
+        mAvoidOnResultFragment = getAvoidOnResultFragment(activity)
+    }
+
+    private constructor(fragment: Fragment) : this(fragment.activity as AppCompatActivity)
+
+    companion object {
+        fun getInstance(activity: AppCompatActivity): AvoidOnResultManager {
+            return AvoidOnResultManager(activity)
+        }
+
+        fun getInstance(fragment: Fragment): AvoidOnResultManager {
+            return AvoidOnResultManager(fragment)
+        }
+    }
+
+    private fun getAvoidOnResultFragment(activity: AppCompatActivity): AvoidOnResultFragment {
+        var avoidOnResultFragment = findAvoidOnResultFragment(activity)
+        if (avoidOnResultFragment == null) {
+            avoidOnResultFragment = AvoidOnResultFragment()
+            val fragmentManager = activity.supportFragmentManager
+            fragmentManager
+                    .beginTransaction()
+                    .add(avoidOnResultFragment, TAG)
+                    .commitAllowingStateLoss()
+            fragmentManager.executePendingTransactions()
+        }
+        return avoidOnResultFragment
+    }
+
+    private fun findAvoidOnResultFragment(activity: AppCompatActivity): AvoidOnResultFragment? {
+        return activity.supportFragmentManager.findFragmentByTag(TAG) as? AvoidOnResultFragment
+    }
+
+    fun startForResult(intent: Intent, callback: Callback) {
+        mAvoidOnResultFragment.startForResult(intent, callback)
+    }
+
+    fun startForResult(clazz: Class<*>, callback: Callback) {
+        val intent = Intent(mAvoidOnResultFragment.activity, clazz)
+        mAvoidOnResultFragment.startForResult(intent, callback)
+    }
+
+    fun startForResult(intent: Intent): Observable<ActivityResultInfo> {
+        return mAvoidOnResultFragment.startForResult(intent)
+    }
+
+    fun startForResult(clazz: Class<*>): Observable<ActivityResultInfo> {
+        val intent = Intent(mAvoidOnResultFragment.activity, clazz)
+        return mAvoidOnResultFragment.startForResult(intent)
+    }
+}

app/src/main/java/com/gh/common/avoidcallback/Callback.kt

@@ -0,0 +1,7 @@
+package com.gh.common.avoidcallback
+
+import android.content.Intent
+
+interface Callback {
+    fun onActivityResult(resultCode: Int, data: Intent?)
+}

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

@@ -3,34 +3,39 @@ package com.gh.common.constant;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
+import androidx.annotation.Nullable;
+
 import com.gh.common.util.GsonUtils;
 import com.gh.common.util.PackageHelper;
+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.NewsEntity;
 import com.gh.gamecenter.entity.SettingsEntity;
+import com.gh.gamecenter.eventbus.EBReuse;
+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 java.util.List;
 
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+
 public class Config {
 
     public static final String API_HOST = BuildConfig.API_HOST;
-    public static final String USER_HOST = BuildConfig.USER_HOST;
-    public static final String COMMENT_HOST = BuildConfig.COMMENT_HOST;
-    public static final String DATA_HOST = BuildConfig.DATA_HOST;
-    public static final String LIBAO_HOST = BuildConfig.LIBAO_HOST;
-    public static final String MESSAGE_HOST = BuildConfig.MESSAGE_HOST;
+    public static final String SENSITIVE_API_HOST = BuildConfig.SENSITIVE_API_HOST;
 
     /**
      * 需要配置的请使用{@link PreferenceManager#getDefaultSharedPreferences(Context)}
      */
-//    @Deprecated
-//    public static final String PREFERENCE = "ghzhushou";
 
     // Third-Party confs
     public static final String WECHAT_APPID = BuildConfig.WECHAT_APPID;
@@ -44,10 +49,14 @@ public class Config {
     public static final String UMENG_APPKEY = BuildConfig.UMENG_APPKEY;
     public static final String UMENG_MESSAGE_SECRET = BuildConfig.UMENG_MESSAGE_SECRET;
     public static final String BUGLY_APPID = BuildConfig.BUGLY_APPID;
+    public static final String LETO_APPID = BuildConfig.LETO_APPID;
+    public static final String TTAD_APPID = BuildConfig.TTAD_APPID;
     // 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";
+
     private static String SETTINGS_KEY = "settingsKey";
 
     private static SettingsEntity mSettingsEntity;
@@ -57,6 +66,7 @@ public class Config {
     public static final String FIX_ARTICLE_KEY = "isFixArticle";
     public static final String FIX_COMMUNITY_KEY = "isFixCommunity";
 
+    public static final int VIDEO_PAGE_SIZE = 21; // 视频列表大多都是一行3个
 
     public static boolean isShow() {
         if (getPreferences().getBoolean(FIX_DOWNLOAD_KEY, false)) return true;
@@ -170,6 +180,9 @@ public class Config {
         getPreferences().edit().putString(SETTINGS_KEY, GsonUtils.toJson(settingsEntity)).apply();
         mSettingsEntity = settingsEntity;
 
+        // 更新 FIX_ARTICLE_KEY 状态
+        mSettingsEntity.showArticleEntrance();
+
         // 加载完设置后刷新下
         PackageHelper.initList();
     }
@@ -223,6 +236,10 @@ public class Config {
         return false;
     }
 
+    public static boolean isGameDomeSwitchOpen() {
+        return getSettings() != null && getSettings().getGameDomeSwitch().equals("on");
+    }
+
     public static void fixHideFunction() {
         SharedPreferences preferences = PreferenceManager.
                 getDefaultSharedPreferences(HaloApp.getInstance().getApplication());
@@ -233,4 +250,29 @@ public class Config {
         editor.putBoolean(Config.FIX_PLUGIN_KEY, true);
         editor.apply();
     }
+
+    public static void getGhzsSettings() {
+        String channel = HaloApp.getInstance().getChannel();
+        RetrofitManager.getInstance(HaloApp.getInstance().getApplication())
+                .getSensitiveApi().getSettings(PackageUtils.getVersionName(), channel)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Response<SettingsEntity>() {
+                    @Override
+                    public void onResponse(SettingsEntity response) {
+                        Config.setSettings(response);
+
+                        // 意见反馈
+                        SharedPreferences.Editor edit = getPreferences().edit();
+                        edit.putString(SuggestionActivity.SUGGESTION_HINT_TYPE,
+                                GsonUtils.toJson(response.getSuggestion()));
+                        edit.apply();
+
+                        if (!getPreferences().getBoolean(Config.FIX_DOWNLOAD_KEY, false) && Config.isShow()) {
+                            getPreferences().edit().putBoolean(Config.FIX_DOWNLOAD_KEY, true).apply();
+                        }
+                        EventBus.getDefault().post(new EBReuse("Refresh"));
+                    }
+                });
+    }
 }

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

@@ -1,5 +1,7 @@
 package com.gh.common.constant;
 
+import com.gh.common.util.PackageUtils;
+
 public class Constants {
 
     public static final int SEND_NEWS_FEEDBACK = 0x126;
@@ -17,11 +19,78 @@ public class Constants {
 
     public static final String DEVICE_KEY = "deviceKey";
 
+    public static final String HAS_REQUESTED_NOTIFICATION_PERMISSIONS = "has_requested_notification_permissions";
+
+    public static final String SHOULD_SHOW_VIDEO_MOBILE_WARNING = "should_show_video_mobile_warning";
+
+    public static final String GAME_DETAIL_COME_IN = "game_detail_come_in"; // 从游戏详情进入
+
     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 GAME_NAME_DECORATOR = " ";
+    
+    // 游戏详情进入时的自定义栏目标签是否已经默认展开过一次的标记
+    public static final String SP_HAS_EXPANDED_GAME_DETAIL_TAGS = "has_expanded_game_detail_tags";
+    // 游戏详情进入时的自定义栏目标签是否已经显示过一次展开更多的浮窗提示
+    public static final String SP_HAS_SHOWN_EXPANDED_GAME_DETAIL_TAGS_HINT = "has_shown_expanded_game_detail_tags_hint";
+
     // 最近显示的弹窗信息
     public static final String SP_LAST_OPENING_ID = "last_opening_dialog_id";
     public static final String SP_LAST_OPENING_TIME = "last_opening_dialog_time";
+    
+    // 新用户首次启动光环的时间
+    public static final String SP_INITIAL_USAGE_TIME = "initial_usage_time";
+
+    //引导设置 “通知管理” 引导弹窗
+    public static final String SP_SHOWED_NOTIFICATION_LOGIN = "show_notification_login_hint";
+    public static final String SP_SHOWED_NOTIFICATION_QUESTION = "show_notification_question_hint";
+    public static final String SP_SHOWED_NOTIFICATION_ANSWER = "show_notification_answer_hint";
+    public static final String SP_SHOWED_NOTIFICATION_ARTICLE = "show_notification_article_hint";
+    public static final String SP_SHOWED_NOTIFICATION_VIDEO = "show_notification_video_hint";
+    public static final String SP_SHOWED_NOTIFICATION_RATING = "show_notification_rating_hint";
+    // 新版本 也要触发一次“通知管理” 引导弹窗
+    public static final String SP_SHOWED_NOTIFICATION_NEW_VERSION = "show_notification_new_version";
+    // 今天是否已经触发了 “通知管理” 引导弹窗
+    public static final String SP_IS_SHOWED_NOTIFICATION_TODAY = "show_is_notification_today";
+    // v4.0.0已废弃,标记安装的游戏为已玩过弹窗，最多取消2次 (https://gitlab.ghzs.com/pm/halo-app-issues/issues/722 调整为版本相关) (不是常量了也放这里好像有点奇怪)
+    public static final String SP_MARK_INSTALLED_GAME = "mark_installed_game" + PackageUtils.getVersionName();
+    // 标记安装的游戏为已玩过弹窗（个人主页最多弹一次）
+    public static final String SP_MARK_INSTALLED_GAME_USER_HOME = "mark_installed_game_user_home" + PackageUtils.getVersionName();
+    // 标记安装的游戏为已玩过弹窗（我的游戏最多弹一次）
+    public static final String SP_MARK_INSTALLED_GAME_MY_GAME = "mark_installed_game_my_game" + PackageUtils.getVersionName();
+    //视频详情滑动引导
+    public static final String SP_SHOW_SLIDE_GUIDE = "show_slide_guide";
+    //视频详情点击引导
+    public static final String SP_SHOW_CLICK_GUIDE = "show_click_guide";
+    //视频详情双击点赞引导
+    public static final String SP_SHOW_DOUBLE_CLICK_GUIDE = "show_double_click_guide";
+    //顶部视频声音状态,重启恢复
+    public static final String SP_TOP_VIDEO_VOICE = "top_video_voice";
+    //我的光环提醒设置已读
+    public static final String SP_ADDONS_FUNCS_HAVE_READ = "addons_funcs_have_read";
+    //视频非wifi提醒只提醒一次，重启恢复
+    public static final String SP_NON_WIFI_TIPS = "non_wifi_tips";
+    //首页视频最新tab提示
+    public static final String SP_HOME_NEW_VIDEO_TIPS = "home_new_video";
+    //游戏设备弹窗提示
+    public static final String SP_DEVICE_REMIND = "device_remind";
+    //是否是第一次弹出游戏设备弹窗提示
+    public static final String SP_FIRST_DEVICE_REMIND = "first_device_remind";
+    //游戏设备弹窗不再提示
+    public static final String SP_NO_REMIND_AGAIN = "no_remind_again";
+    //游戏详情过滤标签数据
+    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";
 
     //手机号码匹配规则
     public static final String REGEX_MOBILE = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$";
@@ -31,6 +100,14 @@ public class Constants {
     //输入规则
     public static final String INPUT_RULE = "0123456789abcdefghijklnmopqrstuvwxyzABCDEFGHIJKLNMOPQRSTUVWXYZ_";
 
+    // 微信绑定地址地址
+    public static final String WECHAT_BIND_ADDRESS_DEV = "https://resource.ghzs.com/page/wechat_dev/index.html#/";
+    public static final String WECHAT_BIND_ADDRESS = "https://resource.ghzs.com/page/wechat_pro/index.html#/";
+
+    // 徽章
+    public static final String BADGE_ADDRESS_DEV = "http://resource.ghzs.com/page/badge_dev/index.html#/";
+    public static final String BADGE_ADDRESS = "http://resource.ghzs.com/page/badge_pro/index.html#/";
+
     //最少需要多少数据才能上传
     public static final int DATA_AMOUNT = 20;
 
@@ -46,6 +123,20 @@ public class Constants {
     public static final int SEARCH_CD = 5 * 60 * 1000;
     //评论 cd间隔
     public static final int COMMENT_CD = 60 * 1000;
+    //我的光环功能分组 cd间隔
+    public static final int ADDONS_CD = 10 * 60 * 1000;
+    //已收录包名更新 cd间隔
+    public static final int PACKAGES_CD = 60 * 1000;
 
     public static final String[] REPORT_LIST = new String[]{"垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息", "违法有害信息", "其它"};
+
+    public static final String ENTRANCE_UNKNOWN = "(unknown)";
+
+    public static final String DEFAULT_TEXT_WRAPPER = "###";
+
+    // 触发了安装事件的标记
+    public static final String MARK_ALREADY_TRIGGERED_INSTALLATION = "triggered_installation";
+
+    // 标记下载重试标记(值为任务已下载大小,为空表示需要重试)
+    public static final String MARK_RETRY_DOWNLOAD = "retry_download";
 }

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

@@ -9,6 +9,7 @@ public class ItemViewType {
     public static final int GAME_SLIDE = 1;     // 滚动图布局
     public static final int GAME_NORMAL = 2;    // 正常游戏布局
     public static final int GAME_SUBJECT = 19;
+    public static final int GAME_SUBJECT_SLIDE = 26;
     public static final int GAME_TEST = 3;      // 测试游戏布局
     public static final int GAME_IMAGE = 4;     // 游戏大图布局
     public static final int NEWS_HEADER = 5;    // 新闻头部布局
@@ -27,6 +28,10 @@ public class ItemViewType {
     public static final int ASK_REFRESH = 19;     // 问答精选 刷新
     public static final int ITEM_EMPTY = 20;
     public static final int ASK_CONCERN = 21;     // 问答精选 关注
+    public static final int RATING_ITEM = 22;     // 问答精选 关注
+    public static final int IMAGE_SLIDE_ITEM = 23;
+    public static final int VERTICAL_SLIDE_ITEM = 24;
+    public static final int COLUMN_COLLECTION = 25;
 
     /**
      * 普通列表

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

@@ -1,10 +1,12 @@
 package com.gh.common.databind;
 
 import android.content.Intent;
-import android.databinding.BindingAdapter;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.widget.SwipeRefreshLayout;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -12,36 +14,56 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import androidx.databinding.BindingAdapter;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.gh.base.OnViewClickListener;
 import com.gh.common.constant.Config;
+import com.gh.common.dialog.CertificationDialog;
+import com.gh.common.dialog.ReserveDialogFragment;
 import com.gh.common.exposure.ExposureEvent;
-import com.gh.common.exposure.ExposureUtils;
+import com.gh.common.history.HistoryHelper;
+import com.gh.common.repository.ReservationRepository;
+import com.gh.common.util.CheckLoginUtils;
 import com.gh.common.util.DataUtils;
 import com.gh.common.util.DialogUtils;
 import com.gh.common.util.DisplayUtils;
+import com.gh.common.util.DownloadDialogHelper;
 import com.gh.common.util.GameUtils;
 import com.gh.common.util.GameViewUtils;
 import com.gh.common.util.ImageUtils;
+import com.gh.common.util.LogUtils;
+import com.gh.common.util.MtaHelper;
 import com.gh.common.util.NewsUtils;
 import com.gh.common.util.NumberUtils;
 import com.gh.common.util.PackageUtils;
+import com.gh.common.util.PermissionHelper;
 import com.gh.common.util.PlatformUtils;
-import com.gh.common.util.StringUtils;
-import com.gh.common.view.DownloadDialog;
+import com.gh.common.util.ReservationHelper;
 import com.gh.common.view.DownloadProgressBar;
+import com.gh.common.view.DrawableView;
 import com.gh.download.DownloadManager;
+import com.gh.download.dialog.DownloadDialog;
 import com.gh.gamecenter.DownloadManagerActivity;
 import com.gh.gamecenter.R;
+import com.gh.gamecenter.WebActivity;
 import com.gh.gamecenter.baselist.LoadStatus;
 import com.gh.gamecenter.databinding.KaifuAddItemBinding;
 import com.gh.gamecenter.databinding.KaifuDetailItemRowBinding;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
-import com.gh.gamecenter.entity.KaiFuCalendarEntity;
+import com.gh.gamecenter.entity.LinkEntity;
 import com.gh.gamecenter.entity.PluginLocation;
+import com.gh.gamecenter.entity.ServerCalendarEntity;
+import com.gh.gamecenter.entity.TagStyleEntity;
+import com.gh.gamecenter.entity.TestEntity;
 import com.gh.gamecenter.eventbus.EBReuse;
 import com.gh.gamecenter.manager.PackagesManager;
+import com.gh.gamecenter.qa.entity.CommunityVideoEntity;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.FileUtils;
 import com.lightgame.utils.Utils;
@@ -49,6 +71,7 @@ import com.lightgame.utils.Utils;
 import org.greenrobot.eventbus.EventBus;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
@@ -73,8 +96,28 @@ public class BindingAdapters {
         view.setTextSize(number);
     }
 
+    @BindingAdapter("setTypeface")
+    public static void setTypeface(TextView view, String type) {
+        if (type == null) return;
+
+        switch (type) {
+            case "bold":
+                view.setTypeface(null, Typeface.BOLD);
+                break;
+            case "italic":
+                view.setTypeface(null, Typeface.ITALIC);
+                break;
+            case "bold_italic":
+                view.setTypeface(null, Typeface.BOLD_ITALIC);
+                break;
+            default:
+                view.setTypeface(null, Typeface.NORMAL);
+                break;
+        }
+    }
+
     @BindingAdapter({"addDetailKaiFuView", "addDetailKaiFuViewListener", "isReadyPatch"})
-    public static void addDetailKaiFuView(LinearLayout view, List<KaiFuCalendarEntity> list
+    public static void addDetailKaiFuView(LinearLayout view, List<ServerCalendarEntity> list
             , OnViewClickListener listener, Boolean isReadyPatch) {
         if (list == null) return;
         view.removeAllViews();
@@ -86,7 +129,7 @@ public class BindingAdapters {
             if (i == 0) {
                 binding.setIsTitle(true);
             } else {
-                KaiFuCalendarEntity serverEntity = list.get(i - 1);
+                ServerCalendarEntity serverEntity = list.get(i - 1);
                 binding.setEntity(serverEntity);
                 binding.getRoot().setOnClickListener(v -> {
                     listener.onClick(v, isReadyPatch != null && isReadyPatch ? serverEntity : null);
@@ -115,7 +158,7 @@ public class BindingAdapters {
     }
 
     @BindingAdapter({"addKaiFuView", "clickListener"})
-    public static void addKaiFuView(LinearLayout view, List<KaiFuCalendarEntity> list, OnViewClickListener listener) {
+    public static void addKaiFuView(LinearLayout view, List<ServerCalendarEntity> list, OnViewClickListener listener) {
         if (list == null) return;
         view.removeAllViews();
         view.addView(LayoutInflater.from(view.getContext()).inflate(R.layout.kaifu_add_item_title, null));
@@ -179,6 +222,17 @@ public class BindingAdapters {
         }
     }
 
+    @BindingAdapter("textColorFromString")
+    public static void textColorFromString(TextView tv, String hexString) {
+        if (TextUtils.isEmpty(hexString)) return;
+
+        try {
+            tv.setTextColor(Color.parseColor(hexString));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     @BindingAdapter("visibleGone")
     public static void showHide(View view, Boolean show) {
         if (show != null && show) {
@@ -188,6 +242,40 @@ public class BindingAdapters {
         }
     }
 
+    @BindingAdapter("goneIf")
+    public static void goneIf(View view, Boolean gone) {
+        if (gone != null && gone) {
+            view.setVisibility(View.GONE);
+        } else {
+            view.setVisibility(View.VISIBLE);
+        }
+    }
+
+    /**
+     * lazy 的 paddingTop
+     */
+    @BindingAdapter("lazyPaddingTop")
+    public static void lazyPaddingTop(View view, int paddingTopInDp) {
+        view.setPadding(view.getPaddingLeft(), DisplayUtils.dip2px(paddingTopInDp), view.getPaddingRight(), view.getPaddingBottom());
+    }
+
+    /**
+     * lazy 的 paddingBottom
+     */
+    @BindingAdapter("lazyPaddingBottom")
+    public static void lazyPaddingBottom(View view, int paddingBottomInDp) {
+        view.setPadding(view.getPaddingLeft(), view.getPaddingTop(), view.getPaddingRight(), DisplayUtils.dip2px(paddingBottomInDp));
+    }
+
+    @BindingAdapter("visibleInvisible")
+    public static void visibleInvisible(View view, Boolean show) {
+        if (show != null && show) {
+            view.setVisibility(View.VISIBLE);
+        } else {
+            view.setVisibility(View.INVISIBLE);
+        }
+    }
+
     @BindingAdapter("messageUnread")
     public static void setMessageUnread(TextView view, int unreadCount) {
         if (unreadCount < 100) {
@@ -303,8 +391,15 @@ public class BindingAdapters {
         }
     }
 
-    @BindingAdapter({"downloadButton", "traceEvent"})
-    public static void setDownloadButton(DownloadProgressBar progressBar, GameEntity gameEntity, ExposureEvent traceEvent) {
+    // 大图下的进度条
+    @BindingAdapter({"downloadButton", "traceEvent", "clickCallBack", "entrance", "location"})
+    public static void setDownloadButton(DownloadProgressBar progressBar,
+                                         GameEntity gameEntity,
+                                         ExposureEvent traceEvent,
+                                         @Nullable View.OnClickListener clickCallBack,
+                                         @Nullable String entrance,
+                                         @Nullable String location) {
+
         // 判断是否显示按钮
         if (gameEntity != null
                 && Config.isShowDownload(gameEntity.getId())
@@ -315,10 +410,140 @@ public class BindingAdapters {
             return;
         }
 
+        // 点击事件
+        progressBar.setOnClickListener(v -> {
+            if (clickCallBack != null) clickCallBack.onClick(v);
+            switch (progressBar.getDownloadType()) {
+                case DOWNLOADING_PLUGIN:
+                case DOWNLOADING_NORMAL:
+                    Intent intent = DownloadManagerActivity.getDownloadMangerIntent(v.getContext(),
+                            gameEntity.getApk().get(0).getUrl(), entrance);
+                    v.getContext().startActivity(intent);
+                    break;
+                case NONE:
+                    Utils.toast(v.getContext(), "该游戏已关闭下载");
+                    break;
+                case NORMAL:
+                case PLUGIN:
+                    if (gameEntity.getApk().size() == 1) {
+                        ApkEntity apk = gameEntity.getApk().get(0);
+                        DownloadDialogHelper.findAvailableDialogAndShow(v.getContext(), gameEntity, apk,
+                                () -> {
+                                    CertificationDialog.showCertificationDialog(v.getContext(), gameEntity, () -> {
+                                        DialogUtils.showVersionNumberDialog(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());
+                            });
+                        });
+                    }
+                    break;
+                case LAUNCH_OR_OPEN:
+                    if (gameEntity.getApk().size() == 1) {
+                        DataUtils.onGameLaunchEvent(v.getContext(), gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), location);
+                        PackageUtils.launchApplicationByPackageName(v.getContext(), gameEntity.getApk().get(0).getPackageName());
+                    } else {
+                        DownloadDialog.showDownloadDialog(
+                                v.getContext(),
+                                gameEntity,
+                                traceEvent,
+                                entrance,
+                                location + ":" + gameEntity.getName());
+                    }
+                    break;
+                case INSTALL_PLUGIN:
+                case INSTALL_NORMAL:
+                    if (gameEntity.getApk().size() == 1) {
+                        DownloadEntity downloadEntity = DownloadManager.getInstance(progressBar.getContext()).getDownloadEntityByUrl(gameEntity.getApk().get(0).getUrl());
+                        if (downloadEntity != null) {
+                            PackageUtils.launchSetup(v.getContext(), downloadEntity);
+                        }
+                    }
+                    break;
+                case RESERVABLE:
+                    CheckLoginUtils.checkLogin(progressBar.getContext(), "", () -> {
+                        PermissionHelper.checkReadPhoneStatePermissionBeforeAction(progressBar.getContext(), () -> {
+                            ReserveDialogFragment dialogFragment = ReserveDialogFragment.getInstance(gameEntity, () -> {
+                                LogUtils.logReservation(gameEntity, traceEvent);
+                                updateReservation(progressBar, gameEntity);
+                            });
+                            dialogFragment.show(((AppCompatActivity) progressBar.getContext()).getSupportFragmentManager(), "reserve");
+                        });
+                    });
+                    break;
+                case RESERVED:
+                    if ("download".equals(gameEntity.getReserveStatus())) {
+                        ReservationHelper.showDeleteReservationDialog(progressBar.getContext(), () -> {
+                            ReservationHelper.deleteReservation(gameEntity, () -> {
+                                updateReservation(progressBar, gameEntity);
+                            });
+                        });
+                    } else {
+                        ReservationHelper.showCancelReservationDialog(progressBar.getContext(), () -> {
+                            ReservationHelper.cancelReservation(gameEntity, () -> {
+                                updateReservation(progressBar, gameEntity);
+                            });
+                        });
+                    }
+                    break;
+                case H5_GAME:
+                    LinkEntity linkEntity = gameEntity.getH5Link();
+                    boolean isPlay = "play".equals(linkEntity.getType()); // 是否为开始玩
+                    MtaHelper.onEvent("H5页面", "入口", "列表页_" + gameEntity.getName());
+
+                    if (isPlay) {
+                        HistoryHelper.insertGameEntity(gameEntity);
+                    }
+
+                    Intent i = new Intent(WebActivity.getIntentForWebGame(progressBar.getContext(), linkEntity.getLink(), gameEntity.getName(), isPlay));
+                    progressBar.getContext().startActivity(i);
+                    break;
+            }
+        });
+
+        // 显示预约
+        if (gameEntity.isReservable()) {
+            if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.getId())) {
+                progressBar.setText("预约");
+                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVABLE);
+            } else {
+                progressBar.setText("已预约");
+                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVED);
+            }
+            return;
+        }
+
         // 显示下载按钮状态
-        if (gameEntity.getApk().isEmpty()) {
-            progressBar.setText("暂无下载");
-            progressBar.setDownloadType(DownloadProgressBar.DownloadType.NONE);
+        if (gameEntity.getApk().isEmpty() || gameEntity.getDownloadOffStatus() != null) {
+            LinkEntity h5LinkEntity = gameEntity.getH5Link();
+            String offStatus = gameEntity.getDownloadOffStatus();
+            if (h5LinkEntity != null) {
+                if ("play".equals(h5LinkEntity.getType())) {
+                    progressBar.setText("开始玩");
+                } else {
+                    progressBar.setText("查看");
+                }
+                progressBar.setDownloadType(DownloadProgressBar.DownloadType.H5_GAME);
+            } else {
+                if (offStatus != null && "dialog".equals(offStatus)) {
+                    progressBar.setText("查看");
+                } else {
+                    progressBar.setText("暂无");
+                }
+                progressBar.setDownloadType(DownloadProgressBar.DownloadType.NONE);
+            }
+
         } else {
             String status = GameUtils.getDownloadBtnText(progressBar.getContext(), gameEntity, PluginLocation.only_game);
             switch (status) {
@@ -372,54 +597,47 @@ public class BindingAdapters {
                 }
             }
         }
-
-        // 点击事件
-        progressBar.setOnClickListener(v -> {
-            switch (progressBar.getDownloadType()) {
-                case DOWNLOADING_PLUGIN:
-                case DOWNLOADING_NORMAL:
-                    Intent intent = DownloadManagerActivity.getDownloadMangerIntent(v.getContext(),
-                            gameEntity.getApk().get(0).getUrl(), "(我的光环:我的游戏)");
-                    v.getContext().startActivity(intent);
-                    break;
-                case NONE:
-                    Utils.toast(v.getContext(), "该游戏已关闭下载");
-                    break;
-                case NORMAL:
-                case PLUGIN:
-                    if (gameEntity.getApk().size() == 1) {
-                        DialogUtils.checkDownload(v.getContext(), gameEntity.getApk().get(0).getSize(),
-                                isSubscribe -> download(progressBar, gameEntity, traceEvent, isSubscribe));
-                    } else {
-                        DownloadDialog.getInstance(v.getContext()).showPopupWindow(v, gameEntity,
-                                "(我的光环:我的游戏)", "我的光环-我的游戏:" + gameEntity.getName(), traceEvent);
-                    }
-                    break;
-                case LAUNCH_OR_OPEN:
-                    if (gameEntity.getApk().size() == 1) {
-                        DataUtils.onGameLaunchEvent(v.getContext(), gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), "我的光环-我的游戏");
-                        PackageUtils.launchApplicationByPackageName(v.getContext(), gameEntity.getApk().get(0).getPackageName());
-                    } else {
-                        DownloadDialog.getInstance(v.getContext()).showPopupWindow(v, gameEntity,
-                                "(我的光环:我的游戏)", "我的光环-我的游戏:" + gameEntity.getName(), traceEvent);
-                    }
-                    break;
-                case INSTALL_PLUGIN:
-                case INSTALL_NORMAL:
-                    if (gameEntity.getApk().size() == 1) {
-                        DownloadEntity downloadEntity = DownloadManager.getInstance(progressBar.getContext()).getDownloadEntityByUrl(gameEntity.getApk().get(0).getUrl());
-                        if (downloadEntity != null) {
-                            PackageUtils.launchSetup(v.getContext(), downloadEntity.getPath());
-                        }
-                    }
-                    break;
-            }
-        });
     }
 
+    /*private static void download(DownloadProgressBar progressBar, GameEntity gameEntity, ExposureEvent traceEvent, @Nullable String entrance, @Nullable String location, View v) {
+        if (gameEntity.getApk().size() == 1) {
+            ApkEntity apk = gameEntity.getApk().get(0);
+            DownloadDialogHelper.findAvailableDialogAndShow(
+                    v.getContext(),
+                    gameEntity,
+                    apk,
+                    () -> {
+                        DialogUtils.checkDownload(v.getContext(), apk.getSize(),
+                                isSubscribe -> download(progressBar, gameEntity, traceEvent, isSubscribe, entrance, location));
+                    });
+        } else {
+            DownloadDialog.getInstance(v.getContext()).showPopupWindow(v, gameEntity,
+                    entrance, location + gameEntity.getName(), traceEvent);
+        }
+    }*/
+
+
+    private static void updateReservation(DownloadProgressBar progressBar, GameEntity gameEntity) {
+        // 显示预约
+        if (gameEntity.isReservable()) {
+            if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.getId())) {
+                progressBar.setText("预约");
+                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVABLE);
+            } else {
+                progressBar.setText("已预约");
+                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVED);
+            }
+        }
+    }
+
+
     // 开始下载
-    private static void download(DownloadProgressBar progressBar, GameEntity
-            gameEntity, ExposureEvent traceEvent, boolean isSubscribe) {
+    private static void download(DownloadProgressBar progressBar,
+                                 GameEntity gameEntity,
+                                 ExposureEvent traceEvent,
+                                 boolean isSubscribe,
+                                 String entrance,
+                                 String location) {
         String str = progressBar.getText();
         String method;
         if (str.contains("更新")) {
@@ -432,17 +650,16 @@ public class BindingAdapters {
         ApkEntity apkEntity = gameEntity.getApk().get(0);
         String msg = FileUtils.isCanDownload(progressBar.getContext(), apkEntity.getSize());
         if (TextUtils.isEmpty(msg)) {
-            DataUtils.onGameDownloadEvent(progressBar.getContext(), gameEntity.getName(), apkEntity.getPlatform(), "(我的光环:我的游戏)", "下载开始", method);
-
-            ExposureEvent downloadExposureEvent = ExposureUtils.logADownloadExposureEvent(gameEntity, apkEntity.getPlatform(), traceEvent, ExposureUtils.DownloadType.DOWNLOAD);
+            DataUtils.onGameDownloadEvent(progressBar.getContext(), gameEntity.getName(), apkEntity.getPlatform(), entrance, "下载开始", method);
 
             DownloadManager.createDownload(progressBar.getContext(),
                     apkEntity,
                     gameEntity,
                     method,
-                    StringUtils.buildString("(我的光环:我的游戏)"), "我的光环-我的游戏:" + gameEntity.getName(),
+                    entrance,
+                    location + gameEntity.getName(),
                     isSubscribe,
-                    downloadExposureEvent);
+                    traceEvent);
 
             progressBar.setProgress(0);
             progressBar.setDownloadType("插件化".equals(method) ?
@@ -452,47 +669,110 @@ public class BindingAdapters {
         }
     }
 
-    @BindingAdapter({"gameLabelList", "subjectTag"})
-    public static void setGameLabelList(LinearLayout layout, GameEntity gameEntity, String subjectTag) {
-        if (gameEntity == null) return;
-        if (gameEntity.getTest() != null) {
-            layout.removeAllViews();
-            View testView = LayoutInflater.from(layout.getContext()).inflate(R.layout.game_test_label, null);
-            TextView testType = testView.findViewById(R.id.test_type);
-            TextView testTime = testView.findViewById(R.id.test_time);
-            testType.setText(gameEntity.getTest().getType());
-            testType.setBackgroundColor(ContextCompat.getColor(layout.getContext(), R.color.tag_yellow));
+    @BindingAdapter("gameLabelList")
+    public static void setGameLabelList(LinearLayout layout, List<TagStyleEntity> tagStyle) {
+        GameViewUtils.setLabelList(layout.getContext(), layout, tagStyle);
+    }
 
-            if (gameEntity.getTest().getStart() == 0) {
-                testTime.setVisibility(View.GONE);
+    // 包含测试开服标签
+    @BindingAdapter("setGameTags")
+    public static void setGameTags(LinearLayout layout, GameEntity gameEntity) {
+        try {
+            ArrayList<TagStyleEntity> tagStyle = new ArrayList<>();
+            TestEntity test = gameEntity.getTest();
+            if (test != null) {
+                TagStyleEntity typeTag = new TagStyleEntity();
+                typeTag.setName(test.getType() != null ? test.getType() : "");
+                typeTag.setBackground("FFF3E0");
+                typeTag.setColor("FA8500");
+                tagStyle.add(typeTag);
+
+                TagStyleEntity timeTag = new TagStyleEntity();
+                timeTag.setName(GameViewUtils.getGameTestDate(test.getStart()));
+                timeTag.setBackground("E0FFF9");
+                timeTag.setColor("00A887");
+                tagStyle.add(timeTag);
             } else {
-                testTime.setText(GameViewUtils.getGameTestDate(gameEntity.getTest().getStart()));
+                tagStyle = gameEntity.getTagStyle();
             }
-            layout.addView(testView);
-        } else {
-            GameViewUtils.setLabelList(layout.getContext(), layout, gameEntity.getTag(), subjectTag, gameEntity.getTagStyle());
+            GameViewUtils.setLabelList(layout.getContext(), layout, tagStyle);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-
     }
 
     @BindingAdapter("isRefreshing")
     public static void isRefreshing(SwipeRefreshLayout layout, LoadStatus status) {
-        if (status == LoadStatus.INIT_LOADING) {
-            layout.setRefreshing(true);
-        } else {
+        if (status != LoadStatus.INIT_LOADING && status != LoadStatus.LIST_LOADING) {
             layout.setRefreshing(false);
         }
     }
 
-    @BindingAdapter({"setGameName", "isShowPlatform"})
-    public static void setGameName(TextView view, GameEntity game, boolean isShowPlatform) {
+    @BindingAdapter({"setGameName", "isShowPlatform", "isShowSuffix"})
+    public static void setGameName(TextView view, GameEntity game, boolean isShowPlatform, @Nullable Boolean isShowSuffix) {
+        if (isShowSuffix == null) isShowSuffix = true; // 默认显示
         if (isShowPlatform && game.getApk().size() > 0) {
-            view.setText(String.format("%s - %s", game.getName(),
+            view.setText(String.format("%s - %s", !isShowSuffix ? game.getNameWithoutSuffix() : game.getName(),
                     PlatformUtils.getInstance(view.getContext()).getPlatformName(
                             game.getApk().get(0).getPlatform())));
         } else {
-            view.setText(game.getName());
+            view.setText(!isShowSuffix ? game.getNameWithoutSuffix() : game.getName());
         }
 
     }
+
+    @BindingAdapter({"setCommunityImage", "setCommunityVideoImage"})
+    public static void setCommunityImage(SimpleDraweeView imageView, List<String> images, List<CommunityVideoEntity> videos) {
+        if (videos.size() > 0) {
+            CommunityVideoEntity videoEntity = videos.get(0);
+            ImageUtils.display(imageView, videoEntity.getPoster());
+            imageView.setVisibility(View.VISIBLE);
+        } else if (images.size() > 0) {
+            imageView.setVisibility(View.VISIBLE);
+            ImageUtils.display(imageView, images.get(0));
+        } else {
+            imageView.setVisibility(View.GONE);
+        }
+    }
+
+    @BindingAdapter({"setCommunityVideoDuration"})
+    public static void setCommunityVideoDuration(TextView mVideoDuration, List<CommunityVideoEntity> videos) {
+        if (videos != null && videos.size() > 0) {
+            CommunityVideoEntity videoEntity = videos.get(0);
+            mVideoDuration.setBackground(DrawableView.getOvalDrawable(R.color.black_alpha_80, 999F));
+            mVideoDuration.setText(videoEntity.getDuration());
+            mVideoDuration.setVisibility(View.VISIBLE);
+        } else {
+            mVideoDuration.setVisibility(View.GONE);
+        }
+    }
+
+    @BindingAdapter({"setGameTags", "setMaxGameTags"})
+    public static void setGameTags(TextView view, List<TagStyleEntity> tags, int maxTags) {
+        if (tags == null) {
+            view.setText("");
+            return;
+        }
+
+        int showCount = tags.size() > maxTags ? maxTags : tags.size(); // 最多显示3个
+
+        StringBuilder content = new StringBuilder();
+        for (int i = 0; i < showCount; i++) {
+            TagStyleEntity tag = tags.get(i);
+            content.append(tag.getName());
+            if (i != showCount - 1) content.append("/");
+        }
+
+        Spannable span = new SpannableString(content);
+        int index = 0;
+        for (int i = 0; i < showCount; i++) {
+            TagStyleEntity tag = tags.get(i);
+            int start = index;
+            int end = start + tag.getName().length() + ((i != showCount - 1) ? 1 : 0);
+            index = end;
+            span.setSpan(new ForegroundColorSpan(Color.parseColor("#" + tag.getColor())),
+                    start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+        view.setText(span);
+    }
 }

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

@@ -0,0 +1,66 @@
+package com.gh.common.dialog
+
+import android.content.DialogInterface
+import android.os.Bundle
+import android.view.KeyEvent
+import android.view.View
+import com.gh.common.util.MtaHelper
+import com.lightgame.dialog.BaseDialogFragment
+import java.util.concurrent.atomic.AtomicBoolean
+
+/**
+ * 对 dialog 操作进行 MTA 事件记录的 dialog fragment
+ */
+abstract class BaseTrackableDialogFragment : BaseDialogFragment() {
+
+    abstract fun getEvent(): String
+    abstract fun getKey(): String
+    open fun getValue(): String = ""
+
+    // 区分此 dialog 是点击 dialog 外部取消的还是点击返回取消的
+    private val mIsCanceledByClickOutsideOfDialog = AtomicBoolean(true)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        if (getEvent().isEmpty()) {
+            throw IllegalStateException("需要提供非空的 Event 来供 MTA 进行事件记录")
+        }
+
+        if (getKey().isEmpty()) {
+            throw IllegalStateException("需要提供非空的 Key 来供 MTA 进行事件记录")
+        }
+
+        onEvent("出现弹窗")
+
+        dialog?.setCanceledOnTouchOutside(true)
+        dialog?.setOnKeyListener { _, keyCode, event ->
+            if (keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_UP) {
+                mIsCanceledByClickOutsideOfDialog.set(false)
+                onEvent("点击返回")
+            }
+            false
+        }
+    }
+
+    fun onEvent(value: String) {
+        if (trackWithBasicDeviceInfo()) {
+            MtaHelper.onEventWithBasicDeviceInfo(getEvent(), getKey(), value)
+        } else {
+            MtaHelper.onEvent(getEvent(), getKey(), value)
+            if (getValue().isNotEmpty()) {
+                MtaHelper.onEvent(getEvent(), value, getValue())
+            }
+        }
+    }
+
+    override fun onCancel(dialog: DialogInterface) {
+        super.onCancel(dialog)
+        if (mIsCanceledByClickOutsideOfDialog.get()) {
+            onEvent("点击空白")
+        }
+    }
+
+    open fun trackWithBasicDeviceInfo() = false
+
+}

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

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

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

@@ -0,0 +1,233 @@
+package com.gh.common.dialog
+
+import android.app.Dialog
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Build
+import android.os.Bundle
+import android.os.Handler
+import android.os.Message
+import android.preference.PreferenceManager
+import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.LinearLayout
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
+import androidx.viewpager2.widget.ViewPager2
+import com.facebook.drawee.view.SimpleDraweeView
+import com.gh.common.constant.Constants
+import com.gh.common.util.*
+import com.gh.download.DownloadManager
+import com.gh.gamecenter.R
+import com.gh.gamecenter.entity.DeviceDialogEntity
+import com.gh.gamecenter.entity.GameEntity
+import com.google.gson.reflect.TypeToken
+import com.halo.assistant.fragment.SettingsFragment.AUTO_INSTALL_SP_KEY
+import com.lightgame.download.DataWatcher
+import com.lightgame.download.DownloadEntity
+import com.lightgame.download.DownloadStatus
+import io.reactivex.disposables.Disposable
+import kotlinx.android.synthetic.main.dialog_device_remind.view.*
+import java.lang.ref.WeakReference
+
+/**
+ * 设备提醒弹窗
+ */
+class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val gameEntity: GameEntity) : Dialog(context, R.style.GhAlertDialog) {
+    private lateinit var view: View
+    private var currentPage = 0
+    private var mSlideLooperInterval = 3000L
+    private lateinit var mLooperHandle: LooperHandle
+    private lateinit var mAdapter: BannerAdapter
+    private var mDatas: ArrayList<String> = ArrayList()
+    private val mSlideLooperKey = 100
+    private var disposable: Disposable? = null
+    private val dataWatcher = object : DataWatcher() {
+        override fun onDataChanged(downloadEntity: DownloadEntity) {
+            if (downloadEntity.status == DownloadStatus.done && downloadEntity.name == gameEntity.name) {
+                val sp = PreferenceManager.getDefaultSharedPreferences(getContext())
+                val autoInstall = sp.getBoolean(AUTO_INSTALL_SP_KEY, true)
+                if (autoInstall) {
+                    dismiss()
+                }
+            }
+        }
+    }
+
+    companion object {
+        fun showDeviceRemindDialog(context: Context, gameEntity: GameEntity) {
+            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)
+                //1.判断设备是否匹配
+                val entity = entitys.find { it.manufacturer.toLowerCase().startsWith(Build.MANUFACTURER.toLowerCase()) }
+                        ?: return
+                //2.判断游戏不含剔除标签
+                gameEntity.tagStyle.forEach {
+                    if (entity.excludeTags.contains(it.name)) {
+                        return
+                    }
+                }
+                //3.不再弹出提示判断
+                val isNoRemindAgain = SPUtils.getBoolean(Constants.SP_NO_REMIND_AGAIN, false)
+                if (isNoRemindAgain) return
+
+                val dialog = DeviceRemindDialog(context, entity, gameEntity)
+                dialog.show()
+            }
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+        view = LayoutInflater.from(context).inflate(R.layout.dialog_device_remind, null)
+        setContentView(view)
+        mDatas.addAll(entity.gallery)
+        view.titleTv.text = entity.title
+        view.contentTv.text = entity.content
+
+        view.bannerView.apply {
+            orientation = ViewPager2.ORIENTATION_HORIZONTAL
+            mAdapter = BannerAdapter()
+            val recyclerView = getChildAt(0) as RecyclerView
+            recyclerView.overScrollMode = RecyclerView.OVER_SCROLL_NEVER
+            registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+                override fun onPageSelected(position: Int) {
+                    super.onPageSelected(position)
+                    currentPage = position
+                    slideIndicator(currentPage % mDatas.size)
+                }
+            })
+            recyclerView.addOnItemTouchListener(object : RecyclerView.SimpleOnItemTouchListener() {
+                override fun onInterceptTouchEvent(rv: RecyclerView, e: MotionEvent): Boolean {
+                    val isStop = e.action == MotionEvent.ACTION_DOWN || e.action == MotionEvent.ACTION_MOVE
+                    if (isStop) mAdapter.stopScroll() else mAdapter.startScroll()
+                    return false
+                }
+            })
+            adapter = mAdapter
+            mLooperHandle = LooperHandle(mAdapter)
+            currentPage = (adapter as BannerAdapter).getActualFirstPositionInCenter()
+            setCurrentItem(currentPage, false)
+            if (mDatas.size > 1) {
+                addIndicator()
+                slideIndicator(currentPage % mDatas.size)
+                autoPlay()
+            }
+        }
+        val isFirst = SPUtils.getBoolean(Constants.SP_FIRST_DEVICE_REMIND, false)
+        if (!isFirst) {
+            view.cancelTv.isEnabled = false
+            view.cancelTv.background = ContextCompat.getDrawable(context, R.drawable.button_round_f5f5f5)
+            disposable = countDownTimer(3) { finish, time ->
+                if (finish) {
+                    view.cancelTv.isEnabled = true
+                    view.cancelTv.background = ContextCompat.getDrawable(context, R.drawable.button_blue_oval)
+                    view.cancelTv.text = "我知道了"
+                    view.cancelTv.setTextColor(ContextCompat.getColor(context, R.color.white))
+                } else {
+                    view.cancelTv.text = "我知道了(${time}S)"
+                }
+            }
+
+            SPUtils.setBoolean(Constants.SP_FIRST_DEVICE_REMIND, true)
+        } else {
+            view.noRemindAgainCb.visibility = View.VISIBLE
+            view.cancelTv.text = "我知道了"
+            view.cancelTv.isEnabled = true
+            view.cancelTv.setTextColor(ContextCompat.getColor(context, R.color.white))
+            view.cancelTv.background = ContextCompat.getDrawable(context, R.drawable.button_blue_oval)
+        }
+        view.cancelTv.setOnClickListener {
+            SPUtils.setBoolean(Constants.SP_NO_REMIND_AGAIN, view.noRemindAgainCb.isChecked)
+            dismiss()
+        }
+        DownloadManager.getInstance(context).addObserver(dataWatcher)
+    }
+
+    private fun addIndicator() {
+        view.indicatorLl.removeAllViews()
+        mDatas.forEach { _ ->
+            val indicatorView = ImageView(context).apply {
+                setImageResource(R.drawable.selector_device_remind_indicator)
+                val params = LinearLayout.LayoutParams(DisplayUtils.dip2px(8F), LinearLayout.LayoutParams.WRAP_CONTENT)
+                params.leftMargin = DisplayUtils.dip2px(1F)
+                params.rightMargin = DisplayUtils.dip2px(1F)
+                layoutParams = params
+            }
+            view.indicatorLl.addView(indicatorView)
+        }
+    }
+
+    private fun slideIndicator(position: Int) {
+        for (i in 0 until view.indicatorLl.childCount) {
+            val childAt = view.indicatorLl.getChildAt(i)
+            childAt.isSelected = i == position
+        }
+    }
+
+    private fun autoPlay() {
+        mAdapter.startScroll()
+    }
+
+    inner class BannerAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+            return object : RecyclerView.ViewHolder(LayoutInflater.from(context).inflate(R.layout.item_device_remind_banner, parent, false)) {}
+        }
+
+        override fun getItemCount(): Int = if (mDatas.size == 1) mDatas.size else Int.MAX_VALUE
+
+        override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+            val data = mDatas[position % mDatas.size]
+            val view = holder.itemView as SimpleDraweeView
+            ImageUtils.display(view, data)
+        }
+
+        fun getActualFirstPositionInCenter(): Int {
+            if (mDatas.size == 1) return 0
+            var index = itemCount / 2
+            if (index % mDatas.size != 0) {
+                index -= (index % mDatas.size)
+            }
+            return index
+        }
+
+        fun scrollToNextPage() {
+            currentPage++
+            view.bannerView.setCurrentItem(currentPage, true)
+        }
+
+        fun startScroll() {
+            mLooperHandle.removeMessages(mSlideLooperKey)
+            mLooperHandle.sendEmptyMessageDelayed(mSlideLooperKey, mSlideLooperInterval)
+        }
+
+        fun stopScroll() {
+            mLooperHandle.removeMessages(mSlideLooperKey)
+        }
+    }
+
+    class LooperHandle(val mAdapter: BannerAdapter) : Handler() {
+        private val mWeakReference: WeakReference<BannerAdapter> = WeakReference(mAdapter)
+        override fun handleMessage(msg: Message?) {
+            val adapter = mWeakReference.get()
+            adapter?.scrollToNextPage()
+            adapter?.startScroll()
+        }
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        if (disposable != null && !disposable!!.isDisposed) {
+            disposable!!.dispose()
+            disposable = null
+        }
+        DownloadManager.getInstance(context).removeObserver(dataWatcher)
+    }
+}

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

@@ -0,0 +1,74 @@
+package com.gh.common.dialog
+
+import android.graphics.Paint
+import android.os.Bundle
+import android.util.TypedValue
+import android.view.LayoutInflater
+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.gamecenter.R
+import com.gh.gamecenter.entity.GameEntity
+import kotlinx.android.synthetic.main.dialog_game_off_service.*
+
+// 游戏关闭下载弹窗
+class GameOffServiceDialogFragment
+//    : BaseTrackableDialogFragment()
+    :BaseDialogFragment() {
+
+    private var mDialog: GameEntity.Dialog? = null
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.dialog_game_off_service, null)
+    }
+
+    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, "(关闭下载弹窗)")
+                    dismiss()
+                }
+
+                container.addView(siteTv)
+            }
+        }
+    }
+
+//    override fun getEvent(): String {
+//        return "游戏下载状态按钮"
+//    }
+//
+//    override fun getKey(): String {
+//        return "查看详情弹窗"
+//    }
+
+    companion object {
+        @JvmStatic
+        fun getInstance(dialog: GameEntity.Dialog) = GameOffServiceDialogFragment().apply {
+            mDialog = dialog
+        }
+    }
+
+}

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

@@ -0,0 +1,90 @@
+package com.gh.common.dialog
+
+import android.annotation.SuppressLint
+import android.content.Intent
+import android.graphics.Color
+import android.os.Build
+import android.os.Bundle
+import android.provider.Settings
+import android.util.TypedValue
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.TextView
+import com.gh.common.util.DisplayUtils
+import com.gh.common.util.MtaHelper
+import com.gh.common.util.PermissionHelper
+import com.gh.gamecenter.BuildConfig
+import com.gh.gamecenter.R
+import com.gh.gamecenter.entity.NotificationHint
+import kotlinx.android.synthetic.main.dialog_notification_hint.*
+
+// 通知权限弹窗
+class NotificationHintDialogFragment : BaseTrackableDialogFragment() {
+
+    private var mNotificationHint: NotificationHint? = null
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.dialog_notification_hint, null)
+    }
+
+    @Suppress("DEPRECATION")
+    @SuppressLint("SetTextI18n")
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        titleTv.text = mNotificationHint?.title
+
+        contentContainer.removeAllViews()
+        for (item in mNotificationHint?.content ?: arrayListOf()) {
+            val tv = TextView(context)
+
+            tv.layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply {
+                topMargin = if (contentContainer.childCount == 0) 0 else DisplayUtils.dip2px(12f)
+            }
+            tv.text = item
+            tv.setTextColor(Color.parseColor("#1383EB"))
+            tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14f)
+            contentContainer.addView(tv)
+        }
+
+        activateTv.setOnClickListener {
+            MtaHelper.onEventWithBasicDeviceInfo(getEvent(), getKey(), "点击立即开启")
+            dismiss()
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                //这种方案适用于 API 26, 即8.0（含8.0）以上可以用
+                val intent = Intent()
+                intent.action = Settings.ACTION_APP_NOTIFICATION_SETTINGS
+                intent.putExtra(Settings.EXTRA_APP_PACKAGE, BuildConfig.APPLICATION_ID)
+                startActivity(intent)
+            } else {
+                PermissionHelper.toPermissionSetting(requireActivity())
+            }
+        }
+
+        laterTv.setOnClickListener {
+            dismiss()
+            MtaHelper.onEventWithBasicDeviceInfo(getEvent(), getKey(), "点击以后再说")
+        }
+
+        dialog?.setCanceledOnTouchOutside(true)
+    }
+
+    override fun getEvent(): String {
+        return "推送引导弹窗"
+    }
+
+    override fun getKey(): String {
+        return "引导弹窗"
+    }
+
+    override fun trackWithBasicDeviceInfo() = true
+
+    companion object {
+        @JvmStatic
+        fun getInstance(hint: NotificationHint) = NotificationHintDialogFragment().apply {
+            mNotificationHint = hint
+        }
+    }
+}

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

@@ -0,0 +1,205 @@
+package com.gh.common.dialog
+
+import android.annotation.SuppressLint
+import android.app.Application
+import android.os.Bundle
+import android.text.Html
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.EditText
+import android.widget.TextView
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.MutableLiveData
+import butterknife.BindView
+import butterknife.ButterKnife
+import butterknife.OnClick
+import com.gh.base.fragment.BaseDialogFragment
+import com.gh.common.constant.Config
+import com.gh.common.history.HistoryHelper
+import com.gh.common.repository.ReservationRepository
+import com.gh.common.util.*
+import com.gh.gamecenter.R
+import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.retrofit.BiResponse
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.lightgame.utils.Utils
+import io.reactivex.schedulers.Schedulers
+import okhttp3.ResponseBody
+import org.json.JSONObject
+
+// 预约弹窗
+class ReserveDialogFragment
+    : BaseDialogFragment() {
+//    : BaseTrackableDialogFragment() {
+
+    @BindView(R.id.reserve_hint_tv)
+    lateinit var reserveHintTv: TextView
+    @BindView(R.id.reserve_content_tv)
+    lateinit var reserveContentTv: TextView
+    @BindView(R.id.reserve_completed_content_tv)
+    lateinit var reserveCompletedContentTv: TextView
+    @BindView(R.id.mobile_et)
+    lateinit var mobileEt: EditText
+    @BindView(R.id.reserve_container)
+    lateinit var reserveContainer: View
+    @BindView(R.id.reserve_completed_container)
+    lateinit var reserveCompletedContainer: View
+    @BindView(R.id.customizable_btn)
+    lateinit var customizableBtn: TextView
+
+    private lateinit var mViewModel: ReserveViewModel
+
+    private var mSuccessCallback: SuccessCallback? = null
+
+    private var mGame: GameEntity? = null
+    private var mGameId: String = ""
+    private var mGameName: String = ""
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        mViewModel = viewModelProvider()
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.dialog_reserve_game, null)
+    }
+
+//    override fun getEvent(): String {
+//        return "预约游戏"
+//    }
+//
+//    override fun getKey(): String {
+//        return "预约功能操作"
+//    }
+
+    @Suppress("DEPRECATION")
+    @SuppressLint("SetTextI18n")
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        ButterKnife.bind(this, view)
+
+        val reserveContent = "游戏上线，您将<font color='#ff4147'>免费</font>收到短信提醒"
+
+        reserveContentTv.text = Html.fromHtml(reserveContent)
+        mobileEt.setText(UserManager.getInstance().userInfoEntity.mobile)
+        mobileEt.setSelection(mobileEt.text.length)
+
+        mViewModel.reservation.observeNonNull(this) {
+            if (it.success) {
+                showSuccessDialog(it.withMobile, it.boundWechat)
+                mSuccessCallback?.onSuccess()
+                HistoryHelper.insertGameEntity(mGame!!)
+            }
+        }
+        dialog?.setCanceledOnTouchOutside(true)
+    }
+
+    private fun showSuccessDialog(withMobile: Boolean, boundWechat: Boolean) {
+        reserveHintTv.text = "游戏预约成功"
+        reserveContainer.visibility = View.GONE
+        reserveCompletedContainer.visibility = View.VISIBLE
+
+        val reservation = Config.getSettings()?.appointment
+        val dialogConfig = if (withMobile) reservation?.withMobile else reservation?.withoutMobile
+
+        reserveCompletedContentTv.text = dialogConfig?.htmlContent?.fromHtml()
+        if (dialogConfig?.text.isNullOrEmpty()
+                || (dialogConfig?.type == "wechat_bind" && boundWechat)) {
+            customizableBtn.visibility = View.GONE
+        } else {
+            customizableBtn.text = dialogConfig?.text
+            customizableBtn.setOnClickListener {
+//                MtaHelper.onEvent("预约游戏", "预约功能操作", "点击跳转按钮")
+                DirectUtils.directToLinkPage(
+                        requireContext(),
+                        dialogConfig!!.toLinkEntity(),
+                        "(游戏预约)",
+                        "")
+                dismissAllowingStateLoss()
+            }
+        }
+    }
+
+    @OnClick(R.id.reserve_with_mobile_btn,
+            R.id.reserve_without_mobile_btn,
+            R.id.close_btn,
+            R.id.customizable_btn)
+    fun onClick(view: View) {
+        when (view.id) {
+            R.id.reserve_without_mobile_btn -> {
+//                MtaHelper.onEvent("预约游戏", "预约功能操作", "点击无手机号预约")
+                mViewModel.reserve(gameId = mGameId, gameName = mGameName)
+            }
+
+            R.id.reserve_with_mobile_btn -> {
+                val mobile = mobileEt.text.toString()
+                if (mobile.length < 11 || !mobile.startsWith("1")) {
+                    Utils.toast(context, "手机号格式错误，请检查并重新输入")
+                    return
+                }
+
+//                MtaHelper.onEvent("预约游戏", "预约功能操作", "点击立即预约")
+                mViewModel.reserve(gameId = mGameId, gameName = mGameName, mobile = mobile)
+            }
+
+            R.id.close_btn -> {
+//                MtaHelper.onEvent("预约游戏", "预约功能操作", "点击关闭")
+                dismissAllowingStateLoss()
+            }
+        }
+    }
+
+    companion object {
+        @JvmStatic
+        fun getInstance(gameEntity: GameEntity, successCallback: SuccessCallback) = ReserveDialogFragment().apply {
+            this.mGame = gameEntity
+            this.mGameId = gameEntity.id
+            this.mGameName = gameEntity.name ?: ""
+            this.mSuccessCallback = successCallback
+        }
+    }
+
+    interface SuccessCallback {
+        fun onSuccess()
+    }
+}
+
+class ReserveViewModel(application: Application) : AndroidViewModel(application) {
+    val reservation = MutableLiveData<Reservation>()
+
+    @SuppressLint("CheckResult")
+    fun reserve(gameId: String, gameName: String, mobile: String = "") {
+
+        val requestMap = hashMapOf<String, String>()
+        requestMap["game_id"] = gameId
+        if (mobile.isNotEmpty()) {
+            requestMap["mobile"] = mobile
+        }
+
+        RetrofitManager.getInstance(getApplication()).api
+                .createNewGameReservation(requestMap.createRequestBody())
+                .subscribeOn(Schedulers.io())
+                .subscribe(object : BiResponse<ResponseBody>() {
+                    override fun onSuccess(data: ResponseBody) {
+                        var boundWechat = false
+                        tryWithDefaultCatch {
+                            boundWechat = JSONObject(data.string() ?: "").getBoolean("wechat_bind")
+                        }
+
+                        reservation.postValue(Reservation(success = true, withMobile = mobile.isNotEmpty(), boundWechat = boundWechat))
+                        ReservationRepository.addReservationToMemoryAndRefresh(gameId)
+
+//                        MtaHelper.onEvent("预约游戏", "预约", gameName)
+                    }
+
+                    override fun onFailure(exception: Exception) {
+                        Utils.toast(getApplication(), exception.message)
+                    }
+                })
+    }
+
+    class Reservation(var success: Boolean = false, var withMobile: Boolean = false, var boundWechat: Boolean = false)
+}

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

@@ -0,0 +1,57 @@
+package com.gh.common.dialog
+
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import android.view.KeyEvent
+import com.gh.common.util.MtaHelper
+import java.util.concurrent.atomic.AtomicBoolean
+
+open class TrackableDialog(context: Context,
+                           themeResId: Int,
+                           private var mEvent: String,
+                           private var mKey: String,
+                           private var mValue: String? = null,
+                           private var mCancelValue: String? = null,
+                           private var mKeyBackValue: String? = null,
+                           private var mLogShowEvent: Boolean = true)
+    : Dialog(context, themeResId) {
+
+    // 区分此 dialog 是点击 dialog 外部取消的还是点击返回取消的
+    private val mIsCanceledByClickOutsideOfDialog = AtomicBoolean(true)
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setOnCancelListener {
+            if (mIsCanceledByClickOutsideOfDialog.get()) {
+                MtaHelper.onEvent(mEvent, mKey, mCancelValue ?: "点击空白")
+                if (!mValue.isNullOrEmpty()) {
+                    MtaHelper.onEvent(mEvent, "点击空白", mValue)
+                }
+            }
+        }
+
+        setOnKeyListener { _, keyCode, event ->
+            if (keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_UP) {
+                mIsCanceledByClickOutsideOfDialog.set(false)
+                MtaHelper.onEvent(mEvent, mKey, mKeyBackValue ?: "点击返回")
+                if (mValue != null) {
+                    MtaHelper.onEvent(mEvent, "点击返回", mValue)
+                }
+            }
+            false
+        }
+    }
+
+    override fun show() {
+        super.show()
+        if (mLogShowEvent) {
+            MtaHelper.onEvent(mEvent, mKey, "出现弹窗")
+            if (!mValue.isNullOrEmpty()) {
+                MtaHelper.onEvent(mEvent, "出现弹窗", mValue)
+            }
+        }
+    }
+
+}

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

@@ -1,6 +1,6 @@
 package com.gh.common.exposure
 
-import android.arch.persistence.room.TypeConverter
+import androidx.room.TypeConverter
 import com.gh.common.exposure.meta.Meta
 import com.gh.common.util.GsonUtils
 import java.util.*

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

@@ -1,9 +1,9 @@
 package com.gh.common.exposure
 
-import android.arch.persistence.room.Database
-import android.arch.persistence.room.Room
-import android.arch.persistence.room.RoomDatabase
-import android.arch.persistence.room.TypeConverters
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
 import android.content.Context
 
 @TypeConverters(ExposureConverters::class)

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

@@ -1,7 +1,7 @@
 package com.gh.common.exposure
 
 import android.os.Parcelable
-import android.support.annotation.Keep
+import androidx.annotation.Keep
 import com.google.gson.annotations.SerializedName
 import kotlinx.android.parcel.Parcelize
 
@@ -11,6 +11,7 @@ data class ExposureEntity(
         @SerializedName("game_id")
         val gameId: String? = "",
         val gameName: String? = "",
+        val gameVersion: String? = "",
         val sequence: Int? = 0,
         val platform: String? = "",
         val downloadType: String? = "",

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

@@ -1,12 +1,14 @@
 package com.gh.common.exposure
 
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
 import android.os.Parcelable
-import android.support.annotation.Keep
+import androidx.annotation.Keep
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.gh.common.constant.Constants
 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.gamecenter.entity.GameEntity
 import kotlinx.android.parcel.Parcelize
 import java.util.*
@@ -24,17 +26,23 @@ data class ExposureEvent(
         @PrimaryKey
         val id: String = UUID.randomUUID().toString()) : Parcelable {
     companion object {
-        fun createEvent(gameEntity: GameEntity?, source: List<ExposureSource>, eTrace: List<ExposureEvent>?, event: ExposureType): ExposureEvent {
+        @JvmStatic
+        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,
-                            gameName = gameEntity?.name,
+                    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,
                             downloadType = gameEntity?.downloadType,
                             downloadCompleteType = gameEntity?.downloadCompleteType),
                     source = source,
                     eTrace = eTrace,
-                    event = event)
+                    event = event).apply { gameEntity?.exposureEvent = this }
         }
     }
 }

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

@@ -1,6 +1,6 @@
 package com.gh.common.exposure
 
-import android.arch.persistence.room.*
+import androidx.room.*
 
 @Dao
 interface ExposureEventDao {

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

@@ -1,9 +1,9 @@
 package com.gh.common.exposure
 
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import io.reactivex.functions.Consumer
 
 /**
@@ -18,14 +18,18 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
     init {
         fragment.fragmentManager?.registerFragmentLifecycleCallbacks(
                 object : FragmentManager.FragmentLifecycleCallbacks() {
-                    override fun onFragmentResumed(fm: FragmentManager?, f: Fragment?) {
+                    override fun onFragmentResumed(fm: FragmentManager, f: Fragment) {
                         throttleBus = ExposureThrottleBus(Consumer { commitExposure(it) }, Consumer(Throwable::printStackTrace))
                     }
 
-                    override fun onFragmentPaused(fm: FragmentManager?, f: Fragment?) {
+                    override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
                         visibleState?.let { commitExposure(it) }
                         throttleBus?.clear()
                     }
+
+                    override fun onFragmentViewDestroyed(fm: FragmentManager, f: Fragment) {
+                        fragment.fragmentManager?.unregisterFragmentLifecycleCallbacks(this)
+                    }
                 }, false)
     }
 

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

@@ -9,7 +9,6 @@ import com.gh.loghub.LoghubHelper
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
 import java.util.concurrent.Executors
-import kotlin.concurrent.fixedRateTimer
 
 /**
  * A handful tool for committing logs to aliyun loghub.
@@ -17,7 +16,7 @@ import kotlin.concurrent.fixedRateTimer
  * 如何简单地统计列表中每个 item 的曝光事件？
  *
  * 1. Adapter 实现 IExposable 接口，在 BindView 阶段更新 ExposureEvent，ExposureEvent 供 getEventByPosition(pos) 方法获取用
- * 2. 构建一个 ExposureListener 并作为入参添加至 recyclerview 的 Scroll 回调中
+ * 2. 构建一个 ExposureListener 并作为入参添加至 recyclerview 的 onScroll 回调中
  * 3. 没了
  */
 object ExposureManager {
@@ -25,31 +24,24 @@ 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 STORE_FORCE_UPLOAD_PERIOD = 300 * 1000L
     private const val LOG_STORE = BuildConfig.EXPOSURE_REPO
 
     private val loghubHelper = LoghubHelper.getInstance()
 
     // exposureCache 用来过滤掉具有相同 id 的曝光事件，避免重复发送事件
-    private val exposureCache = FixedSizeLinkedHashSet<String>(100)
-    private val exposureSet = hashSetOf<ExposureEvent>()
+    private val exposureSet by lazy { hashSetOf<ExposureEvent>() }
+    private val exposureExecutor by lazy { Executors.newSingleThreadExecutor() }
+    private val exposureCache by lazy { FixedSizeLinkedHashSet<String>(300) }
     private val exposureDao by lazy { ExposureDatabase.buildDatabase(HaloApp.getInstance().application).logHubEventDao() }
-    private val exposureExecutor = Executors.newSingleThreadExecutor()
 
     @JvmStatic
     fun init() {
-        TimeUtil.init()
-
         loghubHelper.init(HaloApp.getInstance().application, ENDPOINT, PROJECT, LOG_STORE) { TimeUtil.currentTimeMillis() }
 
         exposureExecutor.execute {
             val eventList = exposureDao.getAll()
             exposureSet.addAll(eventList)
         }
-
-        fixedRateTimer(name = "ExposureManager-Store-Checker", initialDelay = 500, period = STORE_FORCE_UPLOAD_PERIOD) {
-            commitSavedExposureEvent(true)
-        }
     }
 
     /**
@@ -57,17 +49,19 @@ object ExposureManager {
      */
     fun log(event: ExposureEvent) {
         exposureExecutor.execute {
-            if (!exposureCache.contains(event.id)) {
-                // Catch `android.database.sqlite.SQLiteFullException: database or disk is full` exception.
-                try {
+            try {
+                if (!exposureCache.contains(event.id)) {
+                    // Catch `android.database.sqlite.SQLiteFullException: database or disk is full` exception.
+
                     exposureSet.add(event)
                     exposureDao.insert(event)
                     exposureCache.add(event.id)
-                } catch (e: Exception) {
-                    e.printStackTrace()
+
+                } else {
+                    Utils.log("Exposure", "遇到重复曝光事件，自动过滤 （${event.id} - ${event.payload.gameName}）")
                 }
-            } else {
-                Utils.log("Exposure", "遇到重复曝光事件，自动过滤 （${event.id} - ${event.payload.gameName}）")
+            } catch (e: Exception) {
+                e.printStackTrace()
             }
         }
     }
@@ -78,26 +72,29 @@ object ExposureManager {
     fun log(eventList: List<ExposureEvent>) {
         exposureExecutor.execute {
             for (event in eventList) {
-                if (!exposureCache.contains(event.id)) {
-                    // Catch `android.database.sqlite.SQLiteFullException: database or disk is full` exception.
-                    try {
+                try {
+                    if (!exposureCache.contains(event.id)) {
+                        // Catch `android.database.sqlite.SQLiteFullException: database or disk is full` exception.
                         exposureSet.add(event)
                         exposureDao.insert(event)
                         exposureCache.add(event.id)
-                    } catch (e: Exception) {
-                        e.printStackTrace()
+                    } else {
+                        Utils.log("Exposure", "遇到重复曝光事件，自动过滤 （${event.id} - ${event.payload.gameName}）")
                     }
-                } else {
-                    Utils.log("Exposure", "遇到重复曝光事件，自动过滤 （${event.id} - ${event.payload.gameName}）")
+                } catch (e: Exception) {
+                    e.printStackTrace()
                 }
             }
-            commitSavedExposureEvent()
+            commitSavedExposureEvents()
         }
     }
 
-    private fun commitSavedExposureEvent(force: Boolean = false) {
+    /**
+     * @param forced Ignore all restrictions.
+     */
+    fun commitSavedExposureEvents(forced: Boolean = false) {
         exposureExecutor.execute {
-            if (exposureSet.size < STORE_SIZE && !force || exposureSet.size == 0) return@execute
+            if (exposureSet.size < STORE_SIZE && !forced || exposureSet.size == 0) return@execute
 
             val exposureList = exposureSet.toList()
             // uploadLogGroup 是一个异步方法，LoghubHelper 里面实现了重传功能，所以这里交给它就好了

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

@@ -1,9 +1,9 @@
 package com.gh.common.exposure
 
 import android.os.Parcelable
-import android.support.annotation.Keep
+import androidx.annotation.Keep
 import kotlinx.android.parcel.Parcelize
 
 @Keep
 @Parcelize
-data class ExposureSource(var k: String, var v: String): Parcelable
+data class ExposureSource(var k: String, var v: String = ""): Parcelable

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

@@ -1,7 +1,13 @@
 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.*
 
 object ExposureUtils {
@@ -12,6 +18,12 @@ object ExposureUtils {
                                   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]
+        } else {
+            entity.id
+        }
+        gameEntity.gameVersion = entity.getApk().elementAtOrNull(0)?.version ?: gameEntity.gameVersion
         gameEntity.platform = platform
         gameEntity.downloadType = downloadType.toString()
         val exposureEvent = ExposureEvent.createEvent(gameEntity = gameEntity,
@@ -36,6 +48,32 @@ object ExposureUtils {
                 eTrace = ExposureTraceUtils.appendTrace(traceEvent),
                 event = ExposureType.DOWNLOAD_COMPLETE)
         ExposureManager.log(exposureEvent)
+        ExposureManager.commitSavedExposureEvents(forced = true)
+    }
+
+    @JvmStatic
+    fun getDownloadType(apkEntity: ApkEntity, gameId: String): DownloadType {
+        return if (PackageUtils.isInstalled(HaloApp.getInstance().application, apkEntity.packageName)) {
+            if (PackageUtils.isSignedByGh(HaloApp.getInstance().application, apkEntity.packageName)) {
+                if (PackageUtils.isCanUpdate(apkEntity, gameId)) {
+                    DownloadType.PLUGIN_UPDATE
+                } else {
+                    if (Version(apkEntity.version).isHigherThan(PackageUtils.getVersionByPackage(apkEntity.packageName))) {
+                        DownloadType.UPDATE
+                    } else {
+                        DownloadType.DOWNLOAD
+                    }
+                }
+            } else {
+                if (!TextUtils.isEmpty(apkEntity.ghVersion)) {
+                    DownloadType.PLUGIN_DOWNLOAD
+                } else {
+                    DownloadType.UPDATE
+                }
+            }
+        } else {
+            DownloadType.DOWNLOAD
+        }
     }
 
     enum class DownloadType {

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

@@ -1,7 +1,7 @@
 package com.gh.common.exposure.meta
 
 import android.os.Parcelable
-import android.support.annotation.Keep
+import androidx.annotation.Keep
 import kotlinx.android.parcel.Parcelize
 
 @Keep
@@ -17,6 +17,7 @@ data class Meta(
         val network: String? = "",
         val os: String? = "",
         val gid: String? = "",
+        val oaid: String? = "",
         val channel: String? = "",
         val appVersion: String? = "",
         val userId: String? = "",

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

@@ -35,6 +35,7 @@ object MetaUtil {
                 network = getNetwork(),
                 os = getOS(),
                 gid = HaloApp.getInstance().gid,
+                oaid = HaloApp.getInstance().oaid,
                 channel = getChannel(),
                 appVersion = BuildConfig.VERSION_NAME,
                 userId = UserManager.getInstance().userId,

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

@@ -1,30 +0,0 @@
-package com.gh.common.exposure.time
-
-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
-
-class Corrector {
-
-    companion object {
-        const val TIME_CORRECTOR_ADJUST_PERIOD: Long = 600000
-    }
-
-    var delta: Long = 0
-
-    init {
-        fixedRateTimer("TimeUtil-Corrector-Checker", initialDelay = 0, period = TIME_CORRECTOR_ADJUST_PERIOD) {
-            RetrofitManager.getInstance(HaloApp.getInstance().application).api.time
-                    .subscribeOn(Schedulers.io())
-                    .subscribe(object : Response<TimeEntity>() {
-                        override fun onResponse(response: TimeEntity?) {
-                            val serverTime = response?.time
-                            serverTime?.let { delta = it * 1000 - System.currentTimeMillis() }
-                        }
-                    })
-        }
-    }
-}

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

@@ -1,23 +1,15 @@
 package com.gh.common.exposure.time
 
+import com.gh.common.FixedRateJobHelper
+
 object TimeUtil {
 
-    private lateinit var corrector: Corrector
-
-    fun init() {
-        corrector = Corrector()
-    }
-
     fun currentTimeMillis(): Long {
-        return corrector.delta + System.currentTimeMillis()
+        return FixedRateJobHelper.timeDeltaBetweenServerAndClient + System.currentTimeMillis()
     }
 
     fun currentTime(): Int {
-        return if (::corrector.isInitialized) {
-            ((corrector.delta + System.currentTimeMillis()) / 1000).toInt()
-        } else {
-            (System.currentTimeMillis() / 1000).toInt()
-        }
+        return ((FixedRateJobHelper.timeDeltaBetweenServerAndClient + System.currentTimeMillis()) / 1000).toInt()
     }
 
 }

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

@@ -0,0 +1,21 @@
+package com.gh.common.filter
+
+import androidx.annotation.Keep
+import com.google.gson.annotations.SerializedName
+
+@Keep
+data class RegionSetting(
+        @SerializedName("game_mirror")
+        var mirrorGameIdSet: HashSet<String>,
+        @SerializedName("game_block")
+        var filterGameIdSet: HashSet<String>,
+        @SerializedName("channel_control")
+        var channelControl: ChannelControl) {
+
+    @Keep
+    data class ChannelControl(
+            @SerializedName("game_category")
+            var gameCategory: String,
+            @SerializedName("effect")
+            var effect: Boolean)
+}

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

@@ -0,0 +1,96 @@
+package com.gh.common.filter
+
+import android.annotation.SuppressLint
+import com.gh.common.constant.Constants
+import com.gh.common.util.SPUtils
+import com.gh.common.util.toJson
+import com.gh.common.util.toObject
+import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.retrofit.BiResponse
+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 {
+
+    private var mChannelControl: RegionSetting.ChannelControl? = null
+    private var mFilterGameIdSet: HashSet<String>? = hashSetOf()
+    private var mDisplayMirrorIfoGameIdSet: HashSet<String>? = hashSetOf()
+
+    private const val SP_SETTING = "region_setting"
+
+    fun shouldThisGameDisplayMirrorInfo(gameId: String): Boolean {
+        return mDisplayMirrorIfoGameIdSet?.contains(gameId) ?: false
+    }
+
+    @JvmStatic
+    fun shouldThisGameBeFiltered(gameId: String?): Boolean {
+        return mFilterGameIdSet?.contains(gameId) ?: false
+    }
+
+    @JvmStatic
+    fun filterGame(list: List<GameEntity>?): ArrayList<GameEntity> {
+        if (list == null) return arrayListOf()
+
+        if (mFilterGameIdSet?.isEmpty() == true) {
+            if (list is ArrayList) return list
+        }
+
+        val listCopy: ArrayList<GameEntity> = if (list is ArrayList) list else ArrayList(list)
+        listCopy.removeAll { mFilterGameIdSet?.contains(it.id) ?: false }
+        return listCopy
+    }
+
+    @JvmField
+    var filterGame = Function { list: List<GameEntity> ->
+        filterGame(list)
+        list
+    }
+
+    fun shouldGameOfThisCategoryUseMirrorInfo(category: String) : Boolean {
+        return if (mChannelControl == null || mChannelControl?.effect == false || !isUserUsedLessThan24Hours()) {
+            false
+        } else {
+            mChannelControl?.gameCategory == category
+        }
+    }
+
+    @SuppressLint("CheckResult")
+    @JvmStatic
+    fun getRegionSetting() {
+        RetrofitManager.getInstance(HaloApp.getInstance().application)
+                .sensitiveApi
+                .getRegionSetting(HaloApp.getInstance().channel)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(object : BiResponse<RegionSetting>() {
+                    override fun onSuccess(data: RegionSetting) {
+                        updateSettingsInMemory(data)
+                        SPUtils.setString(SP_SETTING, data.toJson())
+                    }
+
+                    override fun onFailure(exception: Exception) {
+                        SPUtils.getString(SP_SETTING).toObject<RegionSetting>()?.let {
+                            updateSettingsInMemory(it)
+                        }
+                    }
+                })
+    }
+
+    private fun updateSettingsInMemory(data: RegionSetting) {
+        mFilterGameIdSet = data.filterGameIdSet
+        mDisplayMirrorIfoGameIdSet = data.mirrorGameIdSet
+        mChannelControl = data.channelControl
+    }
+
+    /**
+     * 该用户是否是使用了不到 24 小时的新用户
+     */
+    private fun isUserUsedLessThan24Hours(): Boolean {
+        val initialUsageTime = SPUtils.getLong(Constants.SP_INITIAL_USAGE_TIME, 0)
+        return !(initialUsageTime == 0L || System.currentTimeMillis() - initialUsageTime > 86400000)
+    }
+
+}

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

@@ -1,29 +1,30 @@
 package com.gh.common.history
 
-import android.arch.persistence.room.Database
-import android.arch.persistence.room.Room
-import android.arch.persistence.room.RoomDatabase
-import android.arch.persistence.room.TypeConverters
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
 import com.gh.gamecenter.entity.HistoryGameEntity
+import com.gh.gamecenter.entity.MyVideoEntity
 import com.gh.gamecenter.entity.NewsEntity
 import com.gh.gamecenter.qa.entity.AnswerEntity
 import com.gh.gamecenter.qa.entity.ArticleEntity
 import com.gh.gamecenter.room.converter.*
-import com.gh.gamecenter.room.dao.AnswerHistoryDao
-import com.gh.gamecenter.room.dao.ArticleHistoryDao
-import com.gh.gamecenter.room.dao.GameDao
-import com.gh.gamecenter.room.dao.NewsHistoryDao
+import com.gh.gamecenter.room.dao.*
 import com.halo.assistant.HaloApp
 
-@Database(entities = [AnswerEntity::class, ArticleEntity::class, NewsEntity::class, HistoryGameEntity::class], version = 2, exportSchema = false)
-@TypeConverters(*[
-    CountConverter::class,
-    CommunityConverter::class,
-    TimeConverter::class,
-    AnswerUserConverter::class,
-    ThumbnailConverter::class,
-    TagStyleListConverter::class,
-    StringArrayListConverter::class])
+@Database(entities = [AnswerEntity::class, ArticleEntity::class, NewsEntity::class, HistoryGameEntity::class, MyVideoEntity::class], version = 6, exportSchema = false)
+@TypeConverters(CountConverter::class,
+        CommunityConverter::class,
+        TimeConverter::class,
+        AnswerUserConverter::class,
+        ThumbnailConverter::class,
+        TagStyleListConverter::class,
+        StringArrayListConverter::class,
+        CommunityVideoConverter::class,
+        UserConverter::class)
 
 abstract class HistoryDatabase : RoomDatabase() {
 
@@ -31,11 +32,43 @@ abstract class HistoryDatabase : RoomDatabase() {
     abstract fun articleDao(): ArticleHistoryDao
     abstract fun newsDao(): NewsHistoryDao
     abstract fun gameDao(): GameDao
+    abstract fun videoHistoryDao(): VideoHistoryDao
 
     companion object {
+
+        val MIGRATION_2_3: Migration = object : Migration(2, 3) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("Alter TABLE HistoryGameEntity add isLibaoExist INTEGER NOT NULL DEFAULT 0")
+            }
+        }
+
+        val MIGRATION_3_4: Migration = object : Migration(3, 4) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("Alter TABLE AnswerEntity add videos TEXT NOT NULL DEFAULT ''")
+                database.execSQL("Alter TABLE ArticleEntity add videos TEXT NOT NULL DEFAULT ''")
+            }
+        }
+
+        val MIGRATION_4_5: Migration = object : Migration(4, 5) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("CREATE TABLE MyVideoEntity(id TEXT NOT NULL PRIMARY KEY,poster TEXT NOT NULL DEFAULT '',url TEXT NOT NULL DEFAULT '',vote INTEGER NOT NULL DEFAULT 0,length INTEGER NOT NULL DEFAULT 0,time INTEGER NOT NULL DEFAULT 0,videoStreamRecord INTEGER NOT NULL DEFAULT 0,status TEXT NOT NULL DEFAULT '')")
+            }
+        }
+
+        val MIGRATION_5_6: Migration = object : Migration(5, 6) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("Alter TABLE MyVideoEntity add title TEXT NOT NULL DEFAULT ''")
+                database.execSQL("Alter TABLE MyVideoEntity add commentCount INTEGER NOT NULL DEFAULT 0")
+                database.execSQL("Alter TABLE MyVideoEntity add user TEXT NOT NULL DEFAULT ''")
+            }
+        }
+
         val instance by lazy {
             Room.databaseBuilder(HaloApp.getInstance().application, HistoryDatabase::class.java, "USER_TRACK_HISTORY_DATABASE")
-                    .fallbackToDestructiveMigration()
+                    .addMigrations(MIGRATION_2_3)
+                    .addMigrations(MIGRATION_3_4)
+                    .addMigrations(MIGRATION_4_5)
+                    .addMigrations(MIGRATION_5_6)
                     .build()
         }
     }

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

@@ -3,9 +3,8 @@ package com.gh.common.history
 import com.gh.common.runOnIoThread
 import com.gh.common.util.clearHtmlFormatCompletely
 import com.gh.common.util.removeInsertedContent
-import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.entity.HistoryGameEntity
-import com.gh.gamecenter.entity.NewsEntity
+import com.gh.common.util.removeVideoContent
+import com.gh.gamecenter.entity.*
 import com.gh.gamecenter.qa.entity.AnswerDetailEntity
 import com.gh.gamecenter.qa.entity.AnswerEntity
 import com.gh.gamecenter.qa.entity.ArticleDetailEntity
@@ -23,11 +22,32 @@ object HistoryHelper {
         runOnIoThread { HistoryDatabase.instance.articleDao().addArticle(articleEntity) }
     }
 
+    @JvmStatic
     fun insertGameEntity(gameEntity: GameEntity) {
         val historyGameEntity = convertGameEntityToHistoryGameEntity(gameEntity)
         runOnIoThread { HistoryDatabase.instance.gameDao().addGame(historyGameEntity) }
     }
 
+    @JvmStatic
+    fun insertGameEntity(updateEntity: GameUpdateEntity) {
+        val historyGameEntity = convertGameUpdateEntityToHistoryGameEntity(updateEntity)
+        runOnIoThread { HistoryDatabase.instance.gameDao().addGame(historyGameEntity) }
+    }
+
+    private fun convertGameUpdateEntityToHistoryGameEntity(updateEntity: GameUpdateEntity):  HistoryGameEntity{
+        val historyGame = HistoryGameEntity()
+
+        historyGame.orderTag = System.currentTimeMillis()
+        historyGame.id = updateEntity.id
+        historyGame.brief = updateEntity.brief
+        historyGame.des = ""
+        historyGame.icon = updateEntity.icon
+        historyGame.name = updateEntity.name
+        historyGame.tagStyle = updateEntity.tagStyle
+        historyGame.tag = updateEntity.tag
+        return historyGame
+    }
+
     private fun convertGameEntityToHistoryGameEntity(gameEntity: GameEntity): HistoryGameEntity {
         val historyGame = HistoryGameEntity()
 
@@ -39,6 +59,7 @@ object HistoryHelper {
         historyGame.name = gameEntity.name
         historyGame.tagStyle = gameEntity.tagStyle
         historyGame.tag = gameEntity.getTag()
+        historyGame.isLibaoExist = gameEntity.isLibaoExists
         return historyGame
     }
 
@@ -68,6 +89,11 @@ object HistoryHelper {
         runOnIoThread { HistoryDatabase.instance.answerDao().deleteAnswer(AnswerEntity().apply { primaryKey = answerId }) }
     }
 
+    @JvmStatic
+    fun deleteVideoEntity(videoId: String) {
+        runOnIoThread { HistoryDatabase.instance.videoHistoryDao().deleteVideo(MyVideoEntity().apply { id = videoId }) }
+    }
+
     @JvmStatic
     fun emptyDatabase() {
         runOnIoThread { HistoryDatabase.instance.clearAllTables() }
@@ -77,7 +103,11 @@ object HistoryHelper {
         val articleEntity = ArticleEntity()
 
         articleEntity.id = articleDetailEntity.id
-        articleEntity.brief = articleDetailEntity.content.removeInsertedContent().clearHtmlFormatCompletely().replace(" +".toRegex()," ")
+        articleEntity.brief = articleDetailEntity.content.
+                removeVideoContent().
+                removeInsertedContent().
+                clearHtmlFormatCompletely().
+                replace(" +".toRegex()," ")
         articleEntity.count = articleDetailEntity.count
         articleEntity.community = articleDetailEntity.community
         articleEntity.time = articleDetailEntity.time
@@ -98,7 +128,11 @@ object HistoryHelper {
         answerEntity.vote = answerDetailEntity.vote
         answerEntity.user = answerDetailEntity.user
         answerEntity.orderTag = System.currentTimeMillis()
-        answerEntity.brief = answerDetailEntity.content.removeInsertedContent().clearHtmlFormatCompletely().replace(" +".toRegex(), " ")
+        answerEntity.brief = answerDetailEntity.content.
+                removeVideoContent().
+                removeInsertedContent().
+                clearHtmlFormatCompletely().
+                replace(" +".toRegex(), " ")
         answerEntity.time = answerDetailEntity.time
 
         return answerEntity

app/src/main/java/com/gh/common/im/ImHintHelper.kt

@@ -1,7 +1,7 @@
 package com.gh.common.im
 
 import android.app.Activity
-import android.support.v4.view.ViewCompat
+import androidx.core.view.ViewCompat
 import android.view.View
 import android.view.ViewGroup
 

app/src/main/java/com/gh/common/im/ImHintView.kt

@@ -2,16 +2,12 @@ package com.gh.common.im
 
 import android.app.Activity
 import android.content.Context
-import android.os.Build
-import android.support.v4.view.ViewCompat
 import android.util.AttributeSet
-import android.util.DisplayMetrics
 import android.util.TypedValue
-import android.view.KeyCharacterMap
-import android.view.KeyEvent
 import android.view.View
-import android.view.ViewConfiguration
 import android.widget.RelativeLayout
+import androidx.core.view.ViewCompat
+import com.gh.common.util.DisplayUtils
 import com.gh.gamecenter.R
 import kotlinx.android.synthetic.main.view_im_hint.view.*
 
@@ -32,7 +28,7 @@ class ImHintView @JvmOverloads constructor(context: Context, attrs: AttributeSet
 
         val lp = ivContainer.layoutParams as RelativeLayout.LayoutParams
 
-        lp.setMargins(0, 0, dp2px(30f), dp2px(106f) + retrieveNavigationHeight())
+        lp.setMargins(0, 0, dp2px(30f), dp2px(106f) + DisplayUtils.retrieveNavigationHeight(context))
     }
 
     fun showDot(show: Boolean) {
@@ -46,39 +42,4 @@ class ImHintView @JvmOverloads constructor(context: Context, attrs: AttributeSet
     private fun dp2px(dp: Float): Int {
         return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, context.applicationContext.resources.displayMetrics).toInt()
     }
-
-    private fun hasSoftKeys(): Boolean {
-        if (context !is Activity) return false
-
-        val hasSoftwareKeys: Boolean
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            val d = (context as Activity).windowManager.defaultDisplay
-
-            val realDisplayMetrics = DisplayMetrics()
-            d.getRealMetrics(realDisplayMetrics)
-
-            val realHeight = realDisplayMetrics.heightPixels
-            val realWidth = realDisplayMetrics.widthPixels
-
-            val displayMetrics = DisplayMetrics()
-            d.getMetrics(displayMetrics)
-
-            val displayHeight = displayMetrics.heightPixels
-            val displayWidth = displayMetrics.widthPixels
-
-            hasSoftwareKeys = realWidth - displayWidth > 0 || realHeight - displayHeight > 0
-        } else {
-            val hasMenuKey = ViewConfiguration.get(context).hasPermanentMenuKey()
-            val hasBackKey = KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_BACK)
-            hasSoftwareKeys = !hasMenuKey && !hasBackKey
-        }
-        return hasSoftwareKeys
-    }
-
-    private fun retrieveNavigationHeight(): Int {
-        val resources = context.resources
-        val resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android")
-        return if (resourceId > 0 && hasSoftKeys()) resources.getDimensionPixelSize(resourceId) else 0
-    }
 }

app/src/main/java/com/gh/common/im/ImManager.kt

@@ -4,11 +4,13 @@ import android.app.Activity
 import android.app.NotificationManager
 import android.content.Context
 import com.gh.base.CurrentActivityHolder
+import com.gh.common.runOnIoThread
 import com.gh.common.util.SPUtils
+import com.gh.common.util.tryWithDefaultCatch
 import com.gh.gamecenter.BuildConfig
+import com.gh.gamecenter.HelpAndFeedbackActivity
 import com.gh.gamecenter.MainActivity
 import com.gh.gamecenter.MessageActivity
-import com.gh.gamecenter.SuggestSelectActivity
 import com.gh.gamecenter.manager.UserManager
 import com.halo.assistant.HaloApp
 import com.m7.imkfsdk.KfStartHelper
@@ -68,12 +70,12 @@ object ImManager {
     }
 
     @JvmStatic
-    fun startChatActivity(activity: Activity) {
+    fun startChatActivity(activity: Activity, inputContent: String? = "", requestCode: Int? = null) {
         if (!UserManager.getInstance().userId.isNullOrEmpty()) {
             try {
                 SPUtils.setBoolean(SP_FLOATING_WINDOW_DOT_KEY + UserManager.getInstance().userId, false)
                 shouldShowFloatingWindowDot = false
-                val chatHelper = KfStartHelper(activity, UserManager.getInstance().userInfoEntity.icon)
+                val chatHelper = KfStartHelper(activity, UserManager.getInstance().userInfoEntity.icon, inputContent, requestCode)
                 chatHelper.initSdkChat(
                         ImReceiver.UNIQUE_BROADCAST_ACTION,
                         IM_KEY,
@@ -127,12 +129,14 @@ object ImManager {
     @JvmStatic
     fun sendFeedbackMessage(message: String) {
         val fromToMessage = IMMessage.createTxtMessage(message)
-        HaloApp.getInstance().mainExecutor.execute {
-            IMChat.getInstance().sendMessage(fromToMessage, object : ChatListener {
-                override fun onProgress(p0: Int) {}
-                override fun onSuccess() {}
-                override fun onFailed() {}
-            })
+        runOnIoThread {
+            tryWithDefaultCatch {
+                IMChat.getInstance().sendMessage(fromToMessage, object : ChatListener {
+                    override fun onProgress(p0: Int) {}
+                    override fun onSuccess() {}
+                    override fun onFailed() {}
+                })
+            }
         }
     }
 
@@ -149,7 +153,7 @@ object ImManager {
     private fun isActivityValid(activity: Activity): Boolean {
         return when (activity) {
             is MainActivity -> true
-            is SuggestSelectActivity -> true
+            is HelpAndFeedbackActivity -> true
             is MessageActivity -> true
             else -> false
         }