tinker_base 3.7.4

修改社区问题的点击效果

.gitignore

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

.gitmodules

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

CHANGELOG.md

@@ -1,4 +1,10 @@
-### Ver 3.1
+# 版本升级备忘
+
+### Ver 2.5
+* 此处写本次更新所做的业务和代码修改
+
+### Ver 2.6
+* xx
 
 ### Ver 3.0
 * 升级账号系统(登录流程/用户信息相关/用户账号相关操作(评论,礼包...))
@@ -10,8 +16,74 @@
 * 游戏下载平台面板修改(加快弹出速度,不再读取本地平台图片)
 * 接入bugly(tinker)
 
-### Ver 2.6
-* xx
+### VER 3.1
+### VER 3.2
+### VER 3.3
+### VER 3.4
+### VER 3.5
 
-### Ver 2.5
-* 此处写本次更新所做的业务和代码修改
+### Ver 3.6
+* 首页游戏增加预览骨架,游戏ITEM样式微调和开服标签
+* 首页问答增加关注页面
+* 重构游戏更新管理(游戏更新/插件化/已安装的游戏),具体细节参考PackageRepository & PackageViewModel
+* 重构APP更新管理(已VersionVode为更新基准,小版本更新改为光环后台控制)
+  - 删除TINKER_VERISON_NAME
+  - tinker打包方式变更(以小版本作为Base包,防止与数据后台小版本更新发生冲突)
+* 社区增加版主功能(版主可以对存在的相关内容进行修改/隐藏操作,内容包括问题/回答/回答评论)
+* 社区互动引导优化(问答推荐增加`推荐关注`,回答详情增加一些交互动效)
+
+### Ver 3.6.1
+* 可以后台控制关闭资讯功能
+* 版块、分类、专题详情、游戏详情、礼包详情增加预览骨架
+* 下载按钮状态可以通过接口屏蔽相应的包
+
+### Ver 3.6.2
+* 资讯/问答入口和插件功能线上控制(不可逆)
+* 首页不显示已安装的游戏
+* 插件求版本功能增加内部跳转
+* 下载面板增加公告和版本说明功能
+* 接入腾讯`广点通`(广告)
+
+### ver 3.6.3
+* 社区搜索修改
+  - 增加 `文章/用户` 模块
+  - 增加 `搜索置顶` 功能
+* 回答详情/社区文章详情修改
+  - 支持文案样式(加粗/斜体/删除线)和段落样式(引用/标题)
+  - 支持关闭评论功能
+  - 回答详情新增上下切换回答
+* 社区编辑框(回答/文章)修改
+  - 支持批量插入图片(使用知乎Matisse实现)
+  - 新增插入特殊样式,文案样式(加粗/斜体/删除线)和段落样式(引用/标题)
+* 编辑框部分 JS/CSS 使用远程文件
+
+### ver 3.6.4
+* 增加浏览记录(回答/文章/资讯/游戏)
+* 回答/社区文章 增加反对功能
+* 社区编辑框增加插入文章/回答/游戏
+  - 低版本兼容方案: 插入的样式默认隐藏,只有在3.6.4及以上才会显示
+* 游戏详情评分模块增加`小编评论`区域以及样式修改
+* 游戏评分增加回复功能
+
+### var 3.6.5
+* 以补丁方式向外推出，并没有增加需求，只是单纯的修BUG
+
+### var 3.6.6
+* 游戏详情:
+  - 支持修改评分
+  - 评分列表增加排序/过滤功能
+  - 增加弹出系统
+* 社区相关:
+  - 选择社区页面重做
+  - 首页社区推荐增加推荐入口
+  - 首页社区问题模块改版,名称改为全部,去除问题分类(统一为问题列表),增加社区文章列表
+* 游戏搜索默认页面改版
+* 权限系统更改,不授权也可以进去App,申请权限细分到功能(用到某个功能时才需要强制授予权限)
+* 增加隐私系统
+* 增加游戏预约功能
+* 增加标签详情模块
+* 进入今日头条广告SDK
+* 图片上传压缩机制优化
+  - 支持从后台修改上传配置(本该在早些版本实现,由于代码问题无法引用后台配置)
+  - 对压缩失败是进行catch(由于后台对宽高配置放宽,很容易发生OOM),失败后直接上传原图(这步可能会出现问题)
+* 游戏相关UI修改

README.md

@@ -1,9 +1,5 @@
 # 光环助手Android客户端
 
-### sourcesets/debug/release
-
-* https://developer.android.com/studio/build/build-variants.html#sourcesets
-
 ### APK打包配置
 
 * 使用[ApkChannelPackage](https://github.com/ltlovezh/ApkChannelPackage)的方案
@@ -51,7 +47,7 @@
 * ~~Adapter ViewHolder的功能，部分重写到ViewHolder类本身~~
 
 * ~~activity 统一入口未完成(外部入口相关)，去除多余activity使用，统一toolbar~~
-* release / debug compile不同的类库，不需要再做什么开关
+* ~~release / debug compile不同的类库，不需要再做什么开关~~
 
 * ~~Toolbar分离，有图形按钮/没有图形按钮~~
 
@@ -59,12 +55,15 @@
 
 - 解决 Utils 工具类引发的内存泄漏问题
 - 把原有 EventBus 的消息 Type 统一到一个文件内
-- 明确 MVVM 中 Repository 及其衍生类的具体实现方式
 - 将实现细节从 View(Fragment、Activity) 剥离并以 MVVM 结构改造
-- 将 ListViewModel 所对应的 ListRepository 合并到 ListViewModel 中
+- ~~将 ListViewModel 所对应的 ListRepository 合并到 ListViewModel 中~~
 - 依照光环助手界面功能以大模块 - 小模块的方式去修改包结构，包内文件建议以包名摘要作为前缀
-- 使用 RxJava 的 Debounce 和 Map 操作优化搜索触发机制 参考资料:[1](https://proandroiddev.com/building-an-autocompleting-edittext-using-rxjava-f69c5c3f5a40),[2](https://medium.com/@kurtisnusbaum/rxandroid-basics-part-2-6e877af352)
+- ~~使用 RxJava 的 Debounce 和 Map 操作优化搜索触发机制 参考资料:[1](https://proandroiddev.com/building-an-autocompleting-edittext-using-rxjava-f69c5c3f5a40),[2](https://medium.com/@kurtisnusbaum/rxandroid-basics-part-2-6e877af352)~~
 
-- 把 ListViewModel 的数据结构类型转换方式换为抽象方法，让继承的类实现，避免出现无响应的问题
+- ~~把 ListViewModel 的数据结构类型转换方式换为抽象方法，让继承的类实现，避免出现无响应的问题~~
 
-- 上传图片改为用Retrofit上传
+- ~~rxjava2 如果接口返回为空 会发生异常:java.lang.NullPointerException: Null is not a valid element (答案编辑) 解决方法->com.gh.gamecenter.retrofit.Response~~
+- constraintLayout 1.1.2 导致布局出现异常(问题编辑标签选择弹窗)
+
+- 搞清楚 GameManager 的用途，看能不能去掉
+- 重构一下 MainActivity

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
@@ -25,7 +24,8 @@ android {
     }
 
     dexOptions {
-        jumboMode = true
+//        jumboMode = true
+        javaMaxHeapSize "4g"
     }
 
     defaultConfig {
@@ -37,14 +37,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", "x86"
         }
 
         // 由于app只针对中文用户，所以仅保留zh资源，其他删掉
@@ -67,7 +61,11 @@ android {
         buildConfigField "String", "WEIBO_APPKEY", "\"${WEIBO_APPKEY}\""
         buildConfigField "String", "MTA_APPKEY", "\"${MTA_APPKEY}\""
         buildConfigField "String", "TD_APPID", "\"${TD_APPID}\""
-        buildConfigField "String", "PATCH_VERSION_NAME", "\"${PATCH_VERSION_NAME}\""
+
+        /**
+         * Build Time 供区分 jenkins 打包时间用
+         */
+        buildConfigField "long", "BUILD_TIME", "0"
 
     }
 
@@ -88,13 +86,12 @@ android {
             debuggable true
             minifyEnabled false
             zipAlignEnabled false
-            versionNameSuffix "-debug"
             signingConfig signingConfigs.debug
 
-            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", "EXPOSURE_REPO", "\"test\""
+            buildConfigField "String", "EXPOSURE_VERSION", "\"E3\""
+
+            multiDexKeepProguard file("tinker_multidexkeep.pro")
         }
         release {
             debuggable false
@@ -103,10 +100,10 @@ android {
             shrinkResources true
             signingConfig signingConfigs.release
 
-            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", "EXPOSURE_REPO", "\"exposure\""
+            buildConfigField "String", "EXPOSURE_VERSION", "\"E3\""
+
+            multiDexKeepProguard file("tinker_multidexkeep.pro")
         }
     }
 
@@ -120,33 +117,37 @@ 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", "BUGLY_APPID", "\"${BUGLY_APPID}\""
+            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 {
             dimension "nonsense"
+            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", "BUGLY_APPID", "\"${DEBUG_BUGLY_APPID}\""
         }
     }
-
-//    productFlavors.all { flavor ->
-//        flavor.manifestPlaceholders = [CHANNEL_VALUE: name]//命令 gradlew assembleRelease
-//    }
-
 }
 
 // apkChannelPackage
@@ -166,28 +167,47 @@ rebuildChannel {
 //    releaseOutputDir = Release渠道包输出目录
 }
 
+repositories {
+    flatDir {
+        dirs 'libs/aars'
+    }
+}
+
 dependencies {
 
-    implementation fileTree(include: '*.jar', dir: 'libs')
+    implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
+
+    testImplementation 'junit:junit:4.12'
 
     debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakcanary}"
     debugImplementation "com.facebook.stetho:stetho:${stetho}"
     debugImplementation "com.facebook.stetho:stetho-okhttp3:${stetho}"
     debugImplementation "com.squareup.okhttp3:logging-interceptor:${okHttp}"
 
-    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 "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-runtime:${lifeCycle}"
+    implementation "androidx.lifecycle:lifecycle-extensions:${lifeCycle}"
+    kapt "androidx.lifecycle:lifecycle-compiler:${lifeCycle}"
+    implementation "androidx.room:room-runtime:${room}"
+    implementation "androidx.room:room-rxjava2:${room}"
+    implementation "androidx.core:core-ktx:${ktx}"
+    kapt "androidx.room:room-compiler:${room}"
+    kapt "androidx.databinding:databinding-compiler:${databinding}"
+
+    implementation "com.google.android.material:material:${material}"
+
     implementation "com.kyleduo.switchbutton:library:${switchButton}"
-    implementation "com.readystatesoftware.systembartint:systembartint:${systemBarTint}"
 
     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}"
 
@@ -195,69 +215,95 @@ dependencies {
 
     implementation "com.squareup.retrofit2:retrofit:${retrofit}"
     implementation "com.squareup.retrofit2:converter-gson:${retrofit}"   // include gson 2.7
-    implementation "com.squareup.retrofit2:adapter-rxjava:${retrofit}"
-//    implementation "com.google.code.gson:gson:${gson}"
+    implementation "com.squareup.retrofit2:adapter-rxjava2:${retrofit}"
 
     implementation "com.j256.ormlite:ormlite-android:${ormlite}"
     implementation "com.j256.ormlite:ormlite-core:${ormlite}"
 
     implementation "com.jakewharton:butterknife:${butterKnife}"
-    annotationProcessor "com.jakewharton:butterknife-compiler:${butterKnife}"
     kapt "com.jakewharton:butterknife-compiler:${butterKnife}"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
 
     implementation "org.greenrobot:eventbus:${eventbus}"
-    annotationProcessor "org.greenrobot:eventbus-annotation-processor:${eventbusApt}"
+    kapt "org.greenrobot:eventbus-annotation-processor:${eventbusApt}"
 
-    implementation "io.reactivex:rxjava:${rxJava}"
-    implementation "io.reactivex:rxandroid:${rxAndroid}"
-    implementation "com.jakewharton.rxbinding:rxbinding:${rxBinding}"
-
-    //TODO update to rx 2.x
-//    implementation "io.reactivex.rxjava2:rxjava:${rxJava2}"
-//    implementation "io.reactivex.rxjava2:rxandroid:${rxAndroid2}"
-//    implementation "com.jakewharton.rxbinding2:rxbinding:${rxBinding2}"
+    implementation "io.reactivex.rxjava2:rxjava:${rxJava2}"
+    implementation "io.reactivex.rxjava2:rxandroid:${rxAndroid2}"
+    implementation "com.jakewharton.rxbinding2:rxbinding:${rxBinding2}"
 
     implementation "com.google.zxing:core:${zxing}"
     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 'com.google.android:flexbox:1.1.0'
 
-    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.0.1'
 
-    implementation 'com.contrarywind:Android-PickerView:4.1.3'
+    implementation 'com.contrarywind:Android-PickerView:4.1.8'
 
     implementation "com.scwang.smartrefresh:SmartRefreshLayout:${smartRefreshLayout}"
     implementation "net.cachapa.expandablelayout:expandablelayout:${expandableLayout}"
 
+    // 用于比较 versionName 是大于小于或等于
+    implementation "com.g00fy2:versioncompare:${versioncompare}"
+
+    implementation "top.zibin:Luban:${luban}"
+
+    implementation "com.squareup.picasso:picasso:${picasso}"
+
+    // for video streaming
+    implementation ("com.shuyu:gsyVideoPlayer-java:$gsyVideo",{
+        exclude module: "gsyvideoplayer-androidvideocache"
+    })
+    implementation "com.shuyu:GSYVideoPlayer-exo2:$gsyVideo"
+//    implementation "com.shuyu:gsyVideoPlayer-armv7a:$gsyVideo"
+//    implementation "com.shuyu:gsyVideoPlayer-x86:$gsyVideo"
+
+    implementation "com.github.wendux:DSBridge-Android:$dsBridge"
+
+    implementation "android.arch.work:work-runtime:${workManager}"
+
+    implementation "com.llew.huawei:verifier:1.0.6"
+
+    implementation "com.github.tbruyelle:rxpermissions:${rxPermissions}"
+
+    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'
+
+    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:2.9.2'
+
+    implementation "com.airbnb.android:lottie:$lottie"
+
+    implementation("com.github.piasy:BigImageViewer:$bigImageViewer", {
+        exclude group: 'com.squareup.okhttp3'
+    })
+
+    debugImplementation "com.github.markzhai:blockcanary-android:$blockcanary"
+    releaseImplementation "com.github.markzhai:blockcanary-no-op:$blockcanary"
+
     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:iosched')
-    implementation project(':libraries:LogHub')
-
+//    implementation project(':libraries:WechatShare')
+    implementation project(':libraries:im')
+    implementation project(':libraries:Matisse')
+    implementation project(path: ':libraries:gsyVideoPlayer-proxy_cache')
 }
 File propFile = file('sign.properties')
 if (propFile.exists()) {
@@ -287,3 +333,31 @@ if (propFile.exists()) {
 } else {
     android.buildTypes.release.signingConfig = null
 }
+
+// 用于测试读取 META-INF 里的 JSON 的代码
+//task generateMetaJson {
+//    def resDir = new File(buildDir, 'generated/FILES_FOR_META_INF/')
+//    def destDir = new File(resDir, 'META-INF/')
+//    // Add resDir as a resource directory so that it is automatically included in the APK.
+//    android {
+//        sourceSets {
+//            main.resources {
+//                srcDir resDir
+//            }
+//        }
+//    }
+//
+//    doLast {
+//        if (!destDir.exists()) destDir.mkdirs()
+//        copy {
+//            into destDir
+//            from new File('generated/FILES_FOR_META_INF/META-INF/halo_skip.json')
+//        }
+//    }
+//}
+//// Specify when put_files_in_META_INF should run
+//project.afterEvaluate {
+//    tasks.findAll { task ->
+//        task.name.startsWith('merge') && task.name.endsWith('Resources')
+//    }.each { t -> t.dependsOn generateMetaJson }
+//}

app/proguard-rules.txt

@@ -194,7 +194,50 @@
 
 -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.** { *; }
+
+### greenDAO 3
+-keepclassmembers class * extends org.greenrobot.greendao.AbstractDao {
+    public static java.lang.String TABLENAME;
+}
+-keep class **$Properties
+-keep class org.greenrobot.greendao.** { *; }
+# If you do not use SQLCipher:
+-dontwarn org.greenrobot.greendao.database.**
+# If you do not use RxJava:
+-dontwarn rx.**
+-dontwarn org.greenrobot.greendao.rx.**
+-dontwarn org.greenrobot.greendao.**
+
+### fastJson
+-dontwarn com.alibaba.fastjson.**
+-keep class com.alibaba.fastjson.** { *; }
+-keepattributes Signature
+-keepattributes Annotation
+
+### 广点通
+-dontwarn com.qq.gdt.action.**
+-keep class com.qq.gdt.action.** {*;}
+
+### AndroidX
+-keep class androidx.core.app.CoreComponentFactory { *; }
+
+#阿里云上传
+-keep class com.alibaba.sdk.android.oss.** { *; }
+-dontwarn okio.**
+-dontwarn org.apache.commons.codec.binary.**
+
+#视频相关
+-keep class com.shuyu.gsyvideoplayer.video.** { *; }
+-dontwarn com.shuyu.gsyvideoplayer.video.**
+-keep class com.shuyu.gsyvideoplayer.video.base.** { *; }
+-dontwarn com.shuyu.gsyvideoplayer.video.base.**
+-keep class com.shuyu.gsyvideoplayer.utils.** { *; }
+-dontwarn com.shuyu.gsyvideoplayer.utils.**
+-keep class tv.danmaku.ijk.** { *; }
+-dontwarn tv.danmaku.ijk.**

app/src/main/AndroidManifest.xml

@@ -1,390 +1,580 @@
 <?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_PHONE_STATE" />
-    <uses-permission android:name = "android.permission.INTERNET" />
-    <uses-permission android:name = "android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name = "android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name = "android.permission.READ_LOGS" />
-    <uses-permission android:name = "android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_LOGS" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+
+    <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" />
+
+    <!-- 去掉 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 = "@drawable/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:targetApi="n">
 
         <!--android:launchMode = "singleTask"-->
         <activity
-            android:name = "com.gh.gamecenter.SplashScreenActivity"
-            android:configChanges = "keyboardHidden|orientation|screenSize"
-            android:noHistory = "true"
-            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.SubjectActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.PluginActivity"
-            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: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.NewsDetailActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.LoginActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateHidden" />
+            android:name="com.gh.gamecenter.SettingActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.UserInfoActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.ConcernActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.UserRegionActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.subject.SubjectActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.CollectionActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.NewsSearchActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name = "com.gh.gamecenter.MessageActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.GameNewsActivity"
+            android:screenOrientation="portrait" />
 
         <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.CropImageActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.search.AskSearchActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.WebActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.ShareCardPicActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.questions.detail.QuestionsDetailActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.ShareCardActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = ".qa.answer.fold.AnswerFoldActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.MessageDetailActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.answer.edit.AnswerEditActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.LibaoActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name = "com.gh.gamecenter.ConcernInfoActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.LibaoDetailActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.InfoActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.ShareGhActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.MessageKeFuActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.CleanApkActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.select.CommunitiesSelectActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.SelectUserIconActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.subject.CommunitySubjectActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.AboutActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.MessageInviteActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.CommentDetailActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.MessageVoteActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.mygame.MyGameActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = ".qa.questions.invite.QuestionsInviteActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.GameDetailActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.myqa.MyAskActivity"
-            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.column.order.AskTabOrderActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.ToolBoxActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.ask.QuestionEditActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.WeiBoShareActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name = "com.gh.gamecenter.kaifu.add.AddKaiFuActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateHidden"/>
+            android:name=".category.CategoryDirectoryActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.kaifu.patch.PatchKaifuActivity"
-            android:screenOrientation = "portrait" />
+            android:name=".category.CategoryListActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.BlockActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.LoginActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.column.detail.AskColumnDetailActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.UserInfoActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.NetworkDiagnosisActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.UserRegionActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.CollectionActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.MessageActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.UserInfoEditActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.search.AskSearchActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.questions.detail.QuestionsDetailActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".qa.answer.fold.AnswerFoldActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.answer.edit.AnswerEditActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.ConcernInfoActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.InfoActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.MessageKeFuActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.select.CommunitiesSelectActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.subject.CommunitySubjectActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.MessageInviteActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.MessageVoteActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".qa.questions.invite.QuestionsInviteActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.myqa.MyAskActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.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: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:windowSoftInputMode="stateHidden"
+            android:screenOrientation="portrait" />
+
+        <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.PushProxyActivity"
-            android:exported = "true"
-            android:theme = "@android:style/Theme.Translucent" />
+            android:name="com.gh.gamecenter.PushProxyActivity"
+            android:exported="true"
+            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 = ".CommonActivity"
-            android:screenOrientation = "portrait" />
+            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>
 
-        <receiver android:name = "com.gh.gamecenter.receiver.InstallAndUninstallReceiver" >
-            <intent-filter >
-                <action android:name = "android.intent.action.PACKAGE_ADDED" />
-                <action android:name = "android.intent.action.PACKAGE_REMOVED" />
-                <action android:name = "android.intent.action.PACKAGE_REPLACED" />
-
-                <data android:scheme = "package" />
-            </intent-filter >
-        </receiver >
+        <provider
+            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>
 
         <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 >
-        <receiver android:name = "com.gh.gamecenter.receiver.NetworkStateReceiver" >
-            <intent-filter >
-                <action android:name = "android.net.conn.CONNECTIVITY_CHANGE" />
-            </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>
+
+        <!--魅族push应用定义消息receiver声明 -->
+        <receiver android:name="com.gh.gamecenter.receiver.MeizuPushReceiver">
+            <intent-filter>
+                <!-- 接收push消息 -->
+                <action android:name="com.meizu.flyme.push.intent.MESSAGE" />
+                <!-- 接收register消息 -->
+                <action android:name="com.meizu.flyme.push.intent.REGISTER.FEEDBACK" />
+                <!-- 接收unregister消息-->
+                <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" />
+
+                <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>
+
+        <service android:name="com.gh.base.GHUmengNotificationService" />
 
         <!--<service android:name = "com.gh.gamecenter.statistics.AppStaticService" />-->
 
-    </application >
+    </application>
 
-</manifest >
+</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

@@ -1,24 +1,163 @@
 function requestContentFocus() {
-    $('#editor').focus();
+  $("#editor").focus();
 }
 
 function setupWhenContentEditable() {
-    var editor = $('#editor');
-    if (!editor[0].hasAttribute('contenteditable')) {
-        return;
+  var editor = $("#editor");
+  if (!editor[0].hasAttribute("contenteditable")) {
+    return;
+  }
+
+  // paste
+  editor.on("paste", function(e) {
+    e.preventDefault();
+    var text = (e.originalEvent || e).clipboardData.getData("text/plain");
+    text = text.replace(/\n/g, "<br>");
+    if ("" != text) {
+      document.execCommand("insertHTML", false, text);
+    } else {
+      window.onPasteListener.onPaste();
     }
+  });
 
-    // paste 回调只会获取粘贴之前的光标位置，需要自己手动加上粘贴文本的长度，并保证粘贴的是纯文本
-    editor.on('paste', function(e) {
-        e.preventDefault();
-        var text = (e.originalEvent || e).clipboardData.getData('text/plain');
-        text = text.replace(/\n/g, '<br>');
-        document.execCommand("insertHTML", false, text);
-    });
-
-    requestContentFocus();
+  requestContentFocus();
 }
 
-$(document).ready(function() {
-    setupWhenContentEditable();
+function getStyle(dom, name) {
+  return window.getComputedStyle(dom)[name];
+}
+
+function customLinkgo(self) {
+  var datas = self.dataset.datas;
+  console.log(datas)
+  window.OnLinkClickListener.onClick(datas);
+}
+
+var typeClassList = [
+  "community_article-container",
+  "answer-container",
+  "game-container"
+];
+
+function removeDomByParent(curDom) {
+  if (curDom.parentElement) {
+    curDom.parentElement.removeChild(curDom);
+  }
+}
+
+window.addEventListener("load", function() {
+  var EditorDom = document.querySelector("#editor");
+  setupWhenContentEditable();
+
+  document.addEventListener("keydown", function(e) {
+    var event = e || window.event;
+
+    if (event.keyCode === 8) {
+      var s = document.getSelection();
+      var r = s.getRangeAt(0);
+
+      if (r.startOffset === r.endOffset && r.endOffset === 0) {
+        var preDOM = s.focusNode.previousElementSibling;
+
+        if (
+          preDOM &&
+          preDOM instanceof Element &&
+          preDOM.nodeName === "IMG" &&
+          getStyle(preDOM, "display") === "block"
+        ) {
+          preDOM.parentElement.removeChild(preDOM);
+        }
+      }
+
+      var customDom = s.focusNode;
+      if (customDom) {
+        if (
+          r.startContainer.nodeName.toLowerCase() === "blockquote" &&
+          r.startOffset === 0
+        ) {
+          RE.formatBlock();
+          e.preventDefault();
+        } else if (
+          customDom.nodeName === "#text" &&
+          customDom.previousElementSibling &&
+          typeClassList.indexOf(customDom.previousElementSibling.className) >
+            -1 &&
+          r.startOffset === 1
+        ) {
+          var needDeleteDom = customDom.previousElementSibling;
+          needDeleteDom.insertAdjacentElement(
+            "afterend",
+            document.createElement("br")
+          );
+        } else if (
+          customDom instanceof Element &&
+          customDom.childNodes[s.focusOffset] &&
+          customDom.childNodes[s.focusOffset].previousElementSibling &&
+          typeClassList.indexOf(
+            customDom.childNodes[s.focusOffset].previousElementSibling.className
+          ) > -1
+        ) {
+          customDom =
+            customDom.childNodes[s.focusOffset].previousElementSibling;
+          customDom.parentElement.removeChild(customDom);
+        }
+      }
+    }
+  });
+
+  document.addEventListener("keyup", function(e) {
+    var event = e || window.event;
+    if (event.keyCode === 13) {
+      var s = document.getSelection();
+      var curDom = s.focusNode;
+      var preDom = curDom.previousElementSibling;
+
+      if (
+        curDom.nodeName.toLowerCase() === "blockquote" &&
+        preDom.nodeName.toLowerCase() === "blockquote"
+      ) {
+        if (
+          preDom.childNodes.length > 1 ||
+          (preDom.childNodes.length === 1 &&
+            preDom.childNodes[0].tagName !== "BR")
+        ) {
+          curDom.style.marginTop = 0;
+          preDom.style.marginBottom = 0;
+        } else if (
+          (curDom.childNodes.length === 0 ||
+            (curDom.childNodes.length === 1 &&
+              curDom.childNodes[0].tagName === "BR")) &&
+          (preDom.childNodes.length === 0 ||
+            (preDom.childNodes.length === 1 &&
+              preDom.childNodes[0].tagName === "BR"))
+        ) {
+
+          removeDomByParent(curDom);
+
+          var startQuoteDom = preDom.previousElementSibling;
+          startQuoteDom && startQuoteDom.nodeName.toLowerCase() === "blockquote"
+            ? (startQuoteDom.style.marginBottom = "10px")
+            : null;
+
+          var range = document.createRange();
+          range.selectNode(preDom);
+          s.removeAllRanges();
+          s.addRange(range);
+
+          RE.formatBlock();
+        }
+      }
+    }
+  });
+
+  document.addEventListener("selectionchange", function(e) {
+    var event = e || window.event;
+    var targetDom = event.target.activeElement;
+    if (targetDom.id === "editor" && targetDom.lastElementChild) {
+      if (typeClassList.indexOf(targetDom.lastElementChild.className) > -1) {
+        var brDom = document.createElement("br");
+        EditorDom.appendChild(brDom);
+      }
+    }
+  });
 });

app/src/main/assets/editor.html

@@ -1,15 +1,19 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta name="viewport" content="user-scalable=no">
     <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" type="text/css" href="https://resource.ghzs.com/css/halo_app.css">-->
 </head>
 <body>
-<div id="editor" contenteditable="true"></div>
+<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="content.js"></script>
+<script type="text/javascript" src="video.min.js"></script>
+<!--<script type="text/javascript" src="content.js"></script>-->
+<!--<script type="text/javascript" src="https://resource.ghzs.com/js/halo_app.js"></script>-->
 </body>
 </html>

app/src/main/assets/emojikf

@@ -0,0 +1,40 @@
+emoji_kf_1.png,:smile:
+emoji_kf_2.png,:smiley:
+emoji_kf_3.png,:laughing:
+emoji_kf_4.png,:blush:
+emoji_kf_5.png,:heart_eyes:
+emoji_kf_6.png,:smirk:
+emoji_kf_7.png,:flushed:
+emoji_kf_8.png,:kissing_heart:
+emoji_kf_9.png,:grin:
+emoji_kf_10.png,:wink:
+emoji_kf_11.png,:stuck_out_tongue_winking_eye:
+emoji_kf_12.png,:stuck_out_tongue_closed eyes:
+emoji_kf_13.png,:worried:
+emoji_kf_14.png,:sleeping:
+emoji_kf_15.png,:expressionless:
+emoji_kf_16.png,:sweat_smile:
+emoji_kf_17.png,:joy:
+emoji_kf_18.png,:cold_sweat:
+emoji_kf_19.png,:sob:
+emoji_kf_20.png,:angry:
+emoji_kf_21.png,:mask:
+emoji_kf_22.png,:scream:
+emoji_kf_23.png,:sunglasses:
+emoji_kf_24.png,:heart:
+emoji_kf_25.png,:broken_heart:
+emoji_kf_26.png,:star:
+emoji_kf_27.png,:anger:
+emoji_kf_28.png,:exclamation:
+emoji_kf_29.png,:question:
+emoji_kf_30.png,:zzz:
+emoji_kf_31.png,:thumbsup:
+emoji_kf_32.png,:thumbsdown:
+emoji_kf_33.png,:ok_hand:
+emoji_kf_34.png,:punch:
+emoji_kf_35.png,:yeah:
+emoji_kf_36.png,:clap:
+emoji_kf_37.png,:muscle:
+emoji_kf_38.png,:pray:
+emoji_kf_39.png,:skull:
+emoji_kf_40.png,:trollface:

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/microlog.properties

@@ -0,0 +1,5 @@
+# This is a simple Microlog configuration file
+microlog.level=DEBUG
+microlog.appender=LogCatAppender;FileAppender
+microlog.formatter=PatternFormatter
+microlog.formatter.PatternFormatter.pattern=%c [%P] %m %T

app/src/main/assets/rich_editor.js

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+// alert("")
+
 var RE = {};
 
 RE.currentSelection = {
@@ -22,19 +24,51 @@ RE.currentSelection = {
     "endContainer": 0,
     "endOffset": 0};
 
+var isDebug = false;
+try {
+    isDebug = window.NativeCallBack.isNativeBuildDebug()
+} catch(error) {
+}
+
+// 引用远端的JS 和 CSS
+var script = document.createElement("script")
+document.body.appendChild(script)
+if (isDebug) {
+    script.src = "https://resource.ghzs.com/js/halo_app_test.js" + "?timestamp=" + Math.round(new Date().getTime() / 1000)
+} 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"
+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');
 
 document.addEventListener("selectionchange", function() { RE.backuprange(); });
 
 // Initializations
 RE.callback = function() {
-    window.location.href = "re-callback://" + encodeURI(RE.getHtml());
+    window.location.href = "re-callback://" + encodeURIComponent(RE.getHtml());
 }
 
 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;
 }
@@ -94,16 +128,8 @@ RE.setInputEnabled = function(inputEnabled) {
     RE.editor.contentEditable = String(inputEnabled);
 }
 
-RE.setFocusByEnd = function() {
-//alert("111111")
-//    var txt =RE.editor.createTextRange();
-//    ("22222")
-//    txt.moveStart('character',-1);
-//    ("333333")
-//    txt.collapse(true);
-//    ("444444")
-//    txt.select();
-//    alert("ddddddd")
+RE.formatBlock = function() {
+    document.execCommand('formatBlock', false, 'p');
 }
 
 RE.undo = function() {
@@ -166,6 +192,7 @@ RE.setFontSize = function(fontSize){
 
 RE.setHeading = function(heading) {
     document.execCommand('formatBlock', false, '<h'+heading+'>');
+    RE.sendElementNameToNative()
 }
 
 RE.setIndent = function() {
@@ -190,76 +217,122 @@ RE.setJustifyRight = function() {
 
 RE.setBlockquote = function() {
     document.execCommand('formatBlock', false, '<blockquote>');
+//    var blockId = window.getSelection().focusNode.parentNode;
+//    $(blockId).addClass("haloBlock")
+    RE.sendElementNameToNative()
 }
 
 RE.insertImage = function(url) {
-    var html = "<div><img src =\"" + url + "\" style=\" max-width: 100%; display:block; margin:8px auto; height: auto;\"></div><br>"
+    var html = "<div><img src =\"" + url + "\" style=\" max-width: 100%; display:block; margin:15px auto; height: auto;\"></div><br>"
     RE.insertHTML(html);
 }
 
-RE.replaceTbImage = function() {
+// 替换成缩略图
+RE.replaceTbImage = function(imgRuleFlag, gifRuleFlag) {
     var imgs = document.getElementsByTagName("img");
+    var index = 0
     for (var i = 0; i < imgs.length; i++) {
          var img = imgs[i];
-         if(img.src.indexOf("/tb/") > 0) continue;
-         var imgArr = img.src.split("/");
-         var tbImg = ""
-         for (var j = 0; j < imgArr.length; j++) {
-             if (j == imgArr.length - 1) {
-                 tbImg += "tb/" + imgArr[j];
-             } else {
-                 tbImg += imgArr[j] + "/";
-             }
+         var imageClassName = img.className;
+//         console.log(imageClassName)
+         if (imageClassName == "image-link" || img.className == "poster") continue;
+         if(img.src.indexOf("?") > 0) continue;
+//         console.log(i)
+         var tbImg
+         if(img.src.indexOf(".gif") > 0) {
+           tbImg = img.src + gifRuleFlag
+         } else {
+           tbImg = img.src + imgRuleFlag
          }
-         img.style.cssText = "max-width: 30%; display:block; margin:8px auto; height: auto;"
+
+         img.style.cssText = "max-width: 60%; display:block; margin:15px auto; height: auto;"
          img.src = tbImg;
 
-         if (i == 0) {
+         if (index == 0) {
              var bigImg = document.createElement('img');
              bigImg.src = "file:///android_asset/web_load_dfimg_icon.png";
-             bigImg.style.cssText = "max-width: 20%; margin:8px 0 0 0; height: auto;"
+             bigImg.style.cssText = "max-width: 20%; margin:15px 0 0 0; height: auto;"
              img.parentNode.insertBefore(bigImg, img.parentNode.childNodes[0]);
              i++;
+
+             if(img.parentNode != null) {
+                 img.parentNode.style.cssText += "text-align: left;"
+             }
+
+             if(img.parentNode != null && img.parentNode.parentNode != null) {
+                 img.parentNode.parentNode.style.cssText += "text-align: left;"
+             }
+
          }
+         index ++;
     }
 }
 
-RE.replaceAllDfImage = function() {
+// 替换成默认图
+RE.replaceAllDfImage = function(imgRuleFlag, gifRuleFlag) {
     var imgs = document.getElementsByTagName("img");
     for (var i = 0; i < imgs.length; i++) {
          var img = imgs[i];
+         var imageClassName = img.className;
+         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--;
          } else {
-           img.style.cssText = "max-width: 100%; display:block; margin:8px auto; height: auto;"
-           img.src = img.src.replace("/tb/", "/");
+           if(img.src.indexOf(".gif") > 0) {
+              if(gifRuleFlag.indexOf(",default") > 0) {
+                 img.style.cssText = "max-width: 100%; display:block; margin:8px auto; height: auto;"
+                 img.src = img.src.split("?")[0] + gifRuleFlag
+              }
+           } else {
+             img.style.cssText = "max-width: 100%; display:block; margin:8px auto; height: auto;"
+             img.src = img.src.split("?")[0] + imgRuleFlag
+           }
          }
     }
 
 }
 
+// 去除显示大图
 RE.hideShowBigPic = function() {
     var imgs = document.getElementsByTagName("img");
     var j = 0;
     for (var i = 0; i < imgs.length; i++) {
          var img = imgs[i];
-         if(img.src.indexOf("/tb/") > 0) {
+         var imageClassName = img.className;
+         if (imageClassName == "image-link" || img.className == "poster") continue;
+         if(img.src.indexOf(",thumbnail") > 0 && img.src.indexOf(".gif") == -1) {
             j++;
          }
     }
+    // 去除显示大图
     if (j == 0) {
-        RE.replaceAllDfImage();
+       var imgs = document.getElementsByTagName("img");
+       for (var i = 0; i < imgs.length; i++) {
+           var img = imgs[i];
+           var imageClassName = img.className;
+           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;
+           }
+       }
     }
 }
 
-RE.replaceDfImageByUrl = function(imgUrl) {
+RE.replaceDfImageByUrl = function(imgUrl, imgRuleFlag, gifRuleFlag) {
     var imgs = document.getElementsByTagName("img");
     for (var i = 0; i < imgs.length; i++) {
          var img = imgs[i];
-         if (img.src == imgUrl) {
+         var imageClassName = img.className;
+         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;"
-             img.src = img.src.replace("/tb/", "/");
+             if(img.src.indexOf(".gif") > 0) {
+               img.src = img.src.split("?")[0] + gifRuleFlag
+             } else {
+               img.src = img.src.split("?")[0] + imgRuleFlag
+             }
          }
     }
     RE.hideShowBigPic();
@@ -269,6 +342,8 @@ RE.ImageClickListener = function() {
     var imgs = document.getElementsByTagName("img");
     for (var i = 0; i < imgs.length; i++) {
          var img = imgs[i];
+         var imageClassName = img.className;
+         if (imageClassName == "image-link"|| img.className == "poster") continue;
          window.imagelistener.imageArr(img.src);
          img.onclick = function() {
              window.imagelistener.imageClick(this.src);
@@ -321,12 +396,16 @@ RE.backuprange = function(){
 }
 
 RE.restorerange = function(){
-    var selection = window.getSelection();
-    selection.removeAllRanges();
-    var range = document.createRange();
-    range.setStart(RE.currentSelection.startContainer, RE.currentSelection.startOffset);
-    range.setEnd(RE.currentSelection.endContainer, RE.currentSelection.endOffset);
-    selection.addRange(range);
+    try {
+        var selection = window.getSelection();
+        selection.removeAllRanges();
+        var range = document.createRange();
+        range.setStart(RE.currentSelection.startContainer, RE.currentSelection.startOffset);
+        range.setEnd(RE.currentSelection.endContainer, RE.currentSelection.endOffset);
+        selection.addRange(range);
+    } catch(error) {
+
+    }
 }
 
 RE.enabledEditingItems = function(e) {
@@ -396,12 +475,152 @@ RE.removeFormat = function() {
     document.execCommand('removeFormat', false, null);
 }
 
+RE.insertCustomStyleLink = function(data) {
+  var entity = JSON.parse(data)
+  var html =  "<br/><div class='"+ entity.type +"-container'>\n" +
+              "     <a class='"+ entity.type +"' href=\"javascript:void(0);\" contenteditable=\"false\" onclick=\"customLinkgo(this)\" data-datas='"+ data +"'>\n" +
+              "        <div class='flex-container'>\n" +
+              "        <div class='gh-internal-content img-left'>\n" +
+              "            <img class = \"image-link\" src='"+ entity.icon +"' />\n" +
+              "        </div>\n" +
+              "        <div class='gh-internal-content content-right'>\n" +
+              "            <p class='content-title'>"+ entity.title +"</p>\n" +
+              "            <p class='contents'>"+ entity.brief +"</p>\n" +
+              "        </div>\n" +
+              "        </div>\n" +
+              "        </a>\n" +
+              "    </div><br/>"
+  var tags = "", gameHtml = ""
+  if (entity.tags != null) {
+    for (var i = 0; i < entity.tags.length; i++) {
+        tags += "<label>"+ entity.tags[i]+"</label>"
+    }
+
+    gameHtml = "<br/><div class='"+ entity.type +"-container'>\n" +
+               "        <a class='"+ entity.type +"' href=\"javascript:void(0);\" contenteditable=\"false\" onclick=\"customLinkgo(this)\" data-datas='"+ data +"'>\n" +
+               "        <div class='flex-container'>\n" +
+               "            <div class='gh-internal-content img-left'>\n" +
+               "                <img class='image-link' src='"+ entity.icon +"' />\n" +
+               "            </div>\n" +
+               "            <div class='gh-internal-content content-right'>\n" +
+               "                <p class='content-title'>"+ entity.title +"</p>\n" +
+               "                <p class='tags'>"+ tags +"</p>\n" +
+               "            </div>\n" +
+               "        </div>\n" +
+               "        </a></div><br/>"
+  }
+
+  switch(entity.type) {
+    case "answer":
+      document.execCommand("insertHTML",false, html);
+      break
+    case "community_article":
+      document.execCommand("insertHTML",false, html);
+      break
+    case "game":
+      document.execCommand("insertHTML",false, gameHtml);
+      break
+  }
+  RE.callback();
+}
+
+RE.showLinkStyle = function() {
+  var answerElement = document.getElementsByClassName("answer-container");
+  for (var i=0;i<answerElement.length;i+=1){
+    answerElement[i].style.display = 'inline';
+  }
+  var articleElement = document.getElementsByClassName("community_article-container");
+  for (var i=0;i<articleElement.length;i+=1){
+    articleElement[i].style.display = 'inline';
+  }
+  var gameElement = document.getElementsByClassName("game-container");
+  for (var i=0;i<gameElement.length;i+=1){
+    gameElement[i].style.display = 'inline';
+  }
+}
+
+RE.hideLinkStyle = function() {
+  var answerElement = document.getElementsByClassName("answer-container");
+  for (var i=0;i<answerElement.length;i+=1){
+    answerElement[i].style.display = 'none';
+  }
+  var articleElement = document.getElementsByClassName("community_article-container");
+  for (var i=0;i<articleElement.length;i+=1){
+    articleElement[i].style.display = 'none';
+  }
+  var gameElement = document.getElementsByClassName("game-container");
+  for (var i=0;i<gameElement.length;i+=1){
+    gameElement[i].style.display = 'none';
+  }
+}
+
 // Event Listeners
 RE.editor.addEventListener("input", RE.callback);
+
 RE.editor.addEventListener("keyup", function(e) {
     var KEY_LEFT = 37, KEY_RIGHT = 39;
     if (e.which == KEY_LEFT || e.which == KEY_RIGHT) {
         RE.enabledEditingItems(e);
     }
+    RE.sendElementNameToNative()
 });
-RE.editor.addEventListener("click", RE.enabledEditingItems);
+
+RE.editor.addEventListener("click", function(e) {
+    RE.enabledEditingItems
+    RE.sendElementNameToNative()
+    var s = document.getSelection()
+    var isNeedRemoveR = RE.recursion(e.target)
+    if (isNeedRemoveR && s.rangeCount) {
+       s.removeAllRanges()
+    }
+});
+
+document.addEventListener("selectionchange", function(e) {
+   RE.sendElementNameToNative()
+});
+
+RE.recursion = function(dom) {
+    var parenDom = dom.parentElement
+    if (parenDom && parenDom instanceof Element &&
+    typeClassList.indexOf(parenDom.className) > -1) {
+      return parenDom
+    } else if(parenDom && parenDom instanceof Element &&
+    typeClassList.indexOf(parenDom.className) === -1 && parenDom.nodeName !== 'BODY') {
+      return RE.recursion(parenDom)
+    } else {
+      return null
+    }
+}
+
+// 返回组件标签 多个标签以"空格"划分
+RE.sendElementNameToNative = function() {
+    if (window.getSelection) {
+        var selection = window.getSelection()
+        if (selection.rangeCount > 0) {
+            var range = selection.getRangeAt(0);
+            var container = range.startContainer;
+            var elements = " " + container.localName + " ";
+            var parentElement;
+            while(true) {
+                if(parentElement != null) {
+                    parentElement = parentElement.parentElement
+                } else {
+                    parentElement = container.parentElement
+                }
+                if (parentElement == null || parentElement.localName == null) {
+                    break;
+                }
+                elements = elements + " " + parentElement.localName + " "
+            }
+//            console.log(elements)
+            window.OnCursorChangeListener.onElements(elements);
+        }
+    }
+}
+
+// android function to open link
+function customLinkgo(self) {
+  var datas = self.dataset.datas
+  // console.log(datas)
+  window.OnLinkClickListener.onClick(datas)
+}

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/AppUncaughtHandler.java

@@ -75,7 +75,7 @@ public class AppUncaughtHandler implements UncaughtExceptionHandler {
     // 保存log到本地
     public static void saveLocalLog(Context context, Throwable ex) {
         String errorMsg = Log.getStackTraceString(ex);
-        Config.setExceptionMsg(context, errorMsg);
+        Config.setExceptionMsg(errorMsg);
 
         // 保存到本地
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.getDefault());

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

@@ -1,22 +1,26 @@
 package com.gh.base;
 
-import android.arch.lifecycle.Lifecycle;
 import android.content.Intent;
+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.view.Window;
+import android.view.WindowManager;
 
-import com.gh.common.util.DataUtils;
+import com.gh.common.constant.Constants;
 import com.gh.common.util.DialogUtils;
+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.lightgame.BaseAppCompatActivity;
 import com.lightgame.download.FileUtils;
 import com.lightgame.utils.Utils;
 import com.tencent.tauth.Tencent;
@@ -24,27 +28,40 @@ 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.util.List;
 
+import androidx.annotation.NonNull;
+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,6 +96,13 @@ public abstract class BaseActivity extends BaseToolBarActivity implements EasyPe
         EventBus.getDefault().register(this);
         ButterKnife.bind(this);
         mEntrance = getIntent().getStringExtra(KEY_ENTRANCE);
+        if (TextUtils.isEmpty(mEntrance)) {
+            mEntrance = Constants.ENTRANCE_UNKNOWN;
+        }
+
+        if (BuildConfig.DEBUG) {
+            Utils.log("ACTIVITY_ENTRANCE -> " + mEntrance);
+        }
     }
 
     @Override
@@ -88,76 +112,65 @@ public abstract class BaseActivity extends BaseToolBarActivity implements EasyPe
         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);
-
+    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);
+            MtaHelper.onEvent("内容分享", "内容分享", shareTitle + shareSummary);
         } else {
-            DataUtils.onEvent(this, "内容分享", shareTitle);
+            MtaHelper.onEvent("内容分享", "内容分享", shareTitle);
         }
     }
 
     @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))
+                            , () -> 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, 4,
-                                    null, showDialog.getPath() + "，问题反馈：下载链接失效");
-                        }, null);
             }
         }
     }
@@ -165,17 +178,28 @@ public abstract class BaseActivity extends BaseToolBarActivity implements EasyPe
     @Override
     protected void onPause() {
         super.onPause();
-        mIsPause = true;
+        if (isFinishing()) {
+            onFinish();
+        }
     }
 
     @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);
     }
@@ -189,4 +213,37 @@ public abstract class BaseActivity extends BaseToolBarActivity implements EasyPe
     public void onPermissionsGranted(int requestCode, List<String> perms) {
 
     }
+
+    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)) {
+            return StringUtils.buildString("(", path, ")");
+        }
+        if (!TextUtils.isEmpty(entrance) && TextUtils.isEmpty(path)) {
+            return entrance;
+        }
+        return StringUtils.buildString(entrance, "+(", path, ")");
+    }
+
 }

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

@@ -0,0 +1,113 @@
+package com.gh.base;
+
+import android.content.Intent;
+import android.os.Bundle;
+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.common.view.TabIndicatorView;
+import com.gh.gamecenter.R;
+import com.google.android.material.tabs.TabLayout;
+import com.lightgame.view.NoScrollableViewPager;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+
+/**
+ * Created by khy on 15/03/18.
+ */
+
+public abstract class BaseActivity_TabLayout extends ToolBarActivity implements ViewPager.OnPageChangeListener {
+
+    public static final String PAGE_INDEX = "PAGE_INDEX";
+
+    @BindView(R.id.activity_tab_layout)
+    protected TabLayout mTabLayout;
+    @BindView(R.id.activity_view_pager)
+    protected NoScrollableViewPager mViewPager;
+    @BindView(R.id.activity_tab_indicator)
+    protected TabIndicatorView mTabIndicatorView;
+
+    protected List<Fragment> mFragmentsList;
+
+    protected List<String> mTabTitleList;
+
+    protected int mCheckedIndex = 0;
+
+    protected abstract void initFragmentList(List<Fragment> fragments);
+
+    protected abstract void initTabTitleList(List<String> tabTitleList);
+
+    protected int provideIndicatorWidth() {
+        return 65;
+    }
+
+    protected View provideTabView(int position, String tabTitle) {
+        return null;
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_tablayout_viewpager;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        List<Fragment> fragments = getSupportFragmentManager().getFragments();
+        if (fragments != null) {
+            for (Fragment fragment : fragments) {
+                fragment.onActivityResult(requestCode, resultCode, data);
+            }
+        }
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getIntent() != null) mCheckedIndex = getIntent().getIntExtra(PAGE_INDEX, 0);
+        mFragmentsList = new ArrayList<>();
+        initFragmentList(mFragmentsList);
+        mTabTitleList = new ArrayList<>();
+        initTabTitleList(mTabTitleList);
+
+        mViewPager.setOffscreenPageLimit(mFragmentsList.size());
+        mViewPager.addOnPageChangeListener(this);
+        mViewPager.setAdapter(new FragmentAdapter(getSupportFragmentManager(), mFragmentsList, mTabTitleList));
+        mViewPager.setCurrentItem(mCheckedIndex);
+        mTabLayout.setupWithViewPager(mViewPager);
+        mTabIndicatorView.setupWithTabLayout(mTabLayout);
+        mTabIndicatorView.setupWithViewPager(mViewPager);
+        mTabIndicatorView.setIndicatorWidth(provideIndicatorWidth());
+
+        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;
+            tab.setCustomView(tabView);
+        }
+
+    }
+
+    @Override
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+    }
+
+    @Override
+    public void onPageSelected(int position) {
+
+    }
+
+    @Override
+    public void onPageScrollStateChanged(int state) {
+
+    }
+}

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

@@ -0,0 +1,270 @@
+package com.gh.base
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.content.ClipboardManager
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.text.TextUtils
+import android.view.View
+import android.webkit.JavascriptInterface
+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.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
+import com.halo.assistant.HaloApp
+import com.lightgame.utils.Utils
+import com.lightgame.view.CheckableImageView
+import kotterknife.bindView
+
+abstract class BaseRichEditorActivity : ToolBarActivity() {
+
+    val mRichEditor by bindView<RichEditor>(R.id.rich_editor)
+
+    private val mEditorFont by bindView<CheckableImageView>(R.id.editor_font)
+    private val mEditorLink by bindView<CheckableImageView>(R.id.editor_link)
+    private val mEditorParagraph by bindView<CheckableImageView>(R.id.editor_paragraph)
+    private val mEditorFontBold by bindView<CheckableImageView>(R.id.editor_font_bold)
+    private val mEditorFontItalic by bindView<CheckableImageView>(R.id.editor_font_italic)
+    private val mEditorFontStrikeThrough by bindView<CheckableImageView>(R.id.editor_font_strikethrough)
+    private val mEditorParagraphH1 by bindView<CheckableImageView>(R.id.editor_paragraph_h1)
+    private val mEditorParagraphH2 by bindView<CheckableImageView>(R.id.editor_paragraph_h2)
+    private val mEditorParagraphH3 by bindView<CheckableImageView>(R.id.editor_paragraph_h3)
+    private val mEditorParagraphH4 by bindView<CheckableImageView>(R.id.editor_paragraph_h4)
+    private val mEditorParagraphQuote by bindView<CheckableImageView>(R.id.editor_paragraph_quote)
+    private val mEditorFontContainer by bindView<View>(R.id.editor_font_container)
+    private val mEditorParagraphContainer by bindView<View>(R.id.editor_paragraph_container)
+    private val mEditorLinkContainer by bindView<View>(R.id.editor_link_container)
+    private val mEditorInsertDetail by bindView<View>(R.id.editor_insert_detail)
+
+    private var mCurrentParagraphStyle = ""
+
+
+    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) {
+            INSERT_ANSWER_CODE -> {
+                val answer = data?.getParcelableExtra<AnswerEntity>(AnswerEntity::class.java.simpleName)
+                if (answer != null) insertData = EditorInsertEntity.transform(answer)
+            }
+            INSERT_ARTICLE_CODE -> {
+                val article = data?.getParcelableExtra<ArticleEntity>(ArticleEntity::class.java.simpleName)
+                if (article != null) insertData = EditorInsertEntity.transform(article)
+            }
+            INSERT_GAME_CODE -> {
+                val game = data?.getParcelableExtra<GameEntity>(GameEntity::class.java.simpleName)
+                if (game != null) insertData = EditorInsertEntity.transform(game)
+            }
+            VideoActivity.INSERT_VIDEO_CODE -> {
+                val video = data?.getParcelableExtra<MyVideoEntity>(MyVideoEntity::class.java.simpleName)
+                if (video != null) mRichEditor.insertCustomVideo(video)
+                return
+            }
+        }
+
+        mRichEditor.insertCustomStyleLink(insertData)
+    }
+
+    @SuppressLint("AddJavascriptInterface")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        mRichEditor.setPadding(20, 15, 20, 15)
+        // 防止个别手机在Js里无法获取粘贴内容
+        mRichEditor.addJavascriptInterface(OnPasteListener(), "onPasteListener")
+        mRichEditor.addJavascriptInterface(OnCursorChangeListener(), "OnCursorChangeListener")
+        mRichEditor.setInputEnabled(true)
+    }
+
+    @OnClick(R.id.editor_image, R.id.editor_font, R.id.editor_link, R.id.editor_paragraph,
+            R.id.editor_font_bold, R.id.editor_font_italic, R.id.editor_font_strikethrough,
+            R.id.editor_paragraph_h1, R.id.editor_paragraph_h2, R.id.editor_paragraph_h3,
+            R.id.editor_paragraph_h4, R.id.editor_font_container, R.id.editor_paragraph_container,
+            R.id.editor_paragraph_quote, R.id.editor_link_answer, R.id.editor_link_article,
+            R.id.editor_link_game, R.id.editor_link_video)
+    fun onRichClick(view: View) {
+        when (view.id) {
+            R.id.editor_font -> {
+                mEditorFont.isChecked = !mEditorFont.isChecked
+                mEditorParagraph.isChecked = false
+                mEditorLink.isChecked = false
+                mEditorFontContainer.visibility = if (mEditorFont.isChecked) View.VISIBLE else View.GONE
+                mEditorParagraphContainer.visibility = if (!mEditorFont.isChecked) View.VISIBLE else View.GONE
+                mEditorLinkContainer.visibility = if (!mEditorFont.isChecked) View.VISIBLE else View.GONE
+                mEditorInsertDetail.visibility = mEditorFontContainer.visibility
+            }
+            R.id.editor_paragraph -> {
+                mEditorParagraph.isChecked = !mEditorParagraph.isChecked
+                mEditorFont.isChecked = false
+                mEditorLink.isChecked = false
+                mEditorParagraphContainer.visibility = if (mEditorParagraph.isChecked) View.VISIBLE else View.GONE
+                mEditorFontContainer.visibility = if (!mEditorParagraph.isChecked) View.VISIBLE else View.GONE
+                mEditorLinkContainer.visibility = if (!mEditorParagraph.isChecked) View.VISIBLE else View.GONE
+                mEditorInsertDetail.visibility = mEditorParagraphContainer.visibility
+            }
+            R.id.editor_link -> {
+                mEditorLink.isChecked = !mEditorLink.isChecked
+                mEditorFont.isChecked = false
+                mEditorParagraph.isChecked = false
+                mEditorLinkContainer.visibility = if (mEditorLink.isChecked) View.VISIBLE else View.GONE
+                mEditorParagraphContainer.visibility = if (!mEditorLink.isChecked) View.VISIBLE else View.GONE
+                mEditorFontContainer.visibility = if (!mEditorLink.isChecked) View.VISIBLE else View.GONE
+                mEditorInsertDetail.visibility = mEditorLinkContainer.visibility
+            }
+            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
+            }
+            R.id.editor_paragraph_h2 -> {
+                if (mEditorParagraphH2.isChecked) {
+                    mRichEditor.formatBlock()
+                } else {
+                    MtaHelper.onEvent(mtaEventName(), "段落样式", "段落样式-2级标题")
+                    mRichEditor.setHeading(2)
+                }
+                mEditorParagraphH2.isChecked = !mEditorParagraphH2.isChecked
+            }
+            R.id.editor_paragraph_h3 -> {
+                if (mEditorParagraphH3.isChecked) {
+                    mRichEditor.formatBlock()
+                } else {
+                    MtaHelper.onEvent(mtaEventName(), "段落样式", "段落样式-3级标题")
+                    mRichEditor.setHeading(3)
+                }
+                mEditorParagraphH3.isChecked = !mEditorParagraphH3.isChecked
+            }
+            R.id.editor_paragraph_h4 -> {
+                if (mEditorParagraphH4.isChecked) {
+                    mRichEditor.formatBlock()
+                } else {
+                    MtaHelper.onEvent(mtaEventName(), "段落样式", "段落样式-4级标题")
+                    mRichEditor.setHeading(4)
+                }
+                mEditorParagraphH4.isChecked = !mEditorParagraphH4.isChecked
+            }
+            R.id.editor_paragraph_quote -> {
+                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 -> {
+                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)
+            }
+        }
+    }
+
+    private inner class OnCursorChangeListener {
+        @JavascriptInterface
+        fun onElements(elements: String) {
+            Utils.log("-----------------------")
+            Utils.log(elements)
+            Utils.log(mRichEditor.html)
+            Utils.log("-----------------------")
+
+            mCurrentParagraphStyle = when {
+                elements.contains(ELEMENT_PARAGRAPH_QUOTE) -> ELEMENT_PARAGRAPH_QUOTE
+                elements.contains(ELEMENT_PARAGRAPH_P) -> ELEMENT_PARAGRAPH_P
+                else -> ""
+            }
+
+            mBaseHandler.post {
+                mEditorFontBold.isChecked = elements.contains(ELEMENT_NAME_BOLD)
+                mEditorFontItalic.isChecked = elements.contains(ELEMENT_NAME_ITALIC)
+                mEditorFontStrikeThrough.isChecked = elements.contains(ELEMENT_NAME_STRIKE)
+                mEditorParagraphH1.isChecked = elements.contains(ELEMENT_PARAGRAPH_H1)
+                mEditorParagraphH2.isChecked = elements.contains(ELEMENT_PARAGRAPH_H2)
+                mEditorParagraphH3.isChecked = elements.contains(ELEMENT_PARAGRAPH_H3)
+                mEditorParagraphH4.isChecked = elements.contains(ELEMENT_PARAGRAPH_H4)
+                mEditorParagraphQuote.isChecked = elements.contains(ELEMENT_PARAGRAPH_QUOTE)
+            }
+        }
+    }
+
+    private inner class OnPasteListener {
+        @JavascriptInterface
+        fun onPaste() {
+            val clipboard =
+                    HaloApp.getInstance().application.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+            val clipText = clipboard.text.toString()
+            if (!TextUtils.isEmpty(clipText)) {
+                // 替换换行符号否则 插入失败
+                val text = clipText.replace("[  ]".toRegex(), "&nbsp;").replace("[\r\n]".toRegex(), "<br/>")
+                mBaseHandler.post { mRichEditor.insertHtml(text) }
+            }
+        }
+    }
+
+    abstract fun mtaEventName(): String
+
+    companion object {
+        const val ELEMENT_NAME_BOLD = " b "
+        const val ELEMENT_NAME_ITALIC = " i "
+        const val ELEMENT_NAME_STRIKE = " strike "
+        const val ELEMENT_PARAGRAPH_H1 = " h1 "
+        const val ELEMENT_PARAGRAPH_H2 = " h2 "
+        const val ELEMENT_PARAGRAPH_H3 = " h3 "
+        const val ELEMENT_PARAGRAPH_H4 = " h4 "
+        const val ELEMENT_PARAGRAPH_P = " p "
+        const val ELEMENT_PARAGRAPH_QUOTE = " blockquote "
+        const val INSERT_ANSWER_CODE = 411
+        const val INSERT_ARTICLE_CODE = 412
+        const val INSERT_GAME_CODE = 413
+    }
+}

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

@@ -1,111 +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.widget.TextView;
-
-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));
-                }
-            }
-        }
-    }
-
-    @Override
-    public MenuItem getMenuItem(int res) {
-        if (mToolbar == null) return null; //后续页面做好判断
-        return mToolbar.getMenu().findItem(res);
-    }
-
-    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/CurrentActivityHolder.kt

@@ -0,0 +1,19 @@
+package com.gh.base
+
+import android.app.Activity
+
+object CurrentActivityHolder {
+
+    @JvmStatic
+    val activitySet = HashSet<Activity>()
+
+    @JvmStatic
+    fun getCurrentActivity(): Activity? {
+        return if (activitySet.isEmpty()) {
+            null
+        } else {
+            activitySet.iterator().next()
+        }
+    }
+
+}

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

@@ -4,6 +4,8 @@ import android.app.Activity;
 import android.app.Application.ActivityLifecycleCallbacks;
 import android.os.Bundle;
 
+import com.gh.common.im.ImManager;
+import com.gh.common.notifier.Notifier;
 import com.gh.common.util.DataUtils;
 import com.gh.download.DownloadManager;
 import com.lightgame.utils.AppManager;
@@ -34,6 +36,8 @@ public class GHActivityLifecycleCallbacksImpl implements ActivityLifecycleCallba
     public void onActivityResumed(Activity activity) {
 
         DataUtils.onResume(activity);
+        CurrentActivityHolder.getActivitySet().add(activity);
+        ImManager.updateFloatingWindow();
         //FIXME 这里应该只是部分Activity需要
         try {
             // 初始化gameMap
@@ -46,11 +50,12 @@ public class GHActivityLifecycleCallbacksImpl implements ActivityLifecycleCallba
     @Override
     public void onActivityPaused(Activity activity) {
         DataUtils.onPause(activity);
+        CurrentActivityHolder.getActivitySet().remove(activity);
     }
 
     @Override
     public void onActivityStopped(Activity activity) {
-
+        Notifier.hide();
     }
 
     @Override

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.SubjectActivity;
-import com.gh.gamecenter.WebActivity;
-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.getSimpleName());
-                    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

@@ -0,0 +1,231 @@
+package com.gh.base
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import android.preference.PreferenceManager
+import android.text.TextUtils
+import android.view.View
+import androidx.core.app.NotificationCompat
+import com.gh.common.notifier.Notifier
+import com.gh.common.util.EntranceUtils
+import com.gh.common.util.MtaHelper
+import com.gh.common.util.StringUtils
+import com.gh.common.util.toObject
+import com.gh.gamecenter.R
+import com.gh.gamecenter.entity.PushEntity
+import com.gh.gamecenter.entity.PushMessageEntity
+import com.gh.gamecenter.entity.PushMessageUnreadEntity
+import com.gh.gamecenter.entity.PushNotificationEntity
+import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.message.MessageUnreadRepository
+import com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity
+import com.gh.gamecenter.receiver.UmengMessageReceiver
+import com.gh.gamecenter.receiver.UmengMessageReceiver.Companion.TYPE_CLICK
+import com.gh.gamecenter.receiver.UmengMessageReceiver.Companion.TYPE_REMOVE
+import com.gh.gamecenter.retrofit.Response
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.google.gson.Gson
+import com.umeng.message.UmengMessageService
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import okhttp3.MediaType
+import okhttp3.RequestBody
+import okhttp3.ResponseBody
+import org.android.agoo.common.AgooConstants
+import org.json.JSONObject
+import retrofit2.HttpException
+import java.util.*
+
+class GHUmengNotificationService : UmengMessageService() {
+
+    companion object {
+        const val ACTION_UMENG = "com.gh.gamecenter.UMENG"
+        const val MESSAGE_FROM_SYSTEM = "message_from_system"
+        const val HALO_MESSAGE_DIALOG = "HALO_MESSAGE_DIALOG"
+        const val HALO_MESSAGE_CENTER = "HALO_MESSAGE_CENTER"
+        const val ANSWER = "answer"
+        const val FOLLOW_QUESTION = "follow_question"
+        const val NOTIFICATION_ID = 2015
+        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"
+    }
+
+    val notificationTags = arrayOf("GH_UMENG_TAG_1", "GH_UMENG_TAG_2", "GH_UMENG_TAG_3")
+    val gson = Gson()
+
+    override fun onMessage(context: Context, intent: Intent) {
+        val message = intent.getStringExtra(AgooConstants.MESSAGE_BODY)
+        val isMessageFromSystem = intent.getBooleanExtra(MESSAGE_FROM_SYSTEM, false)
+
+        try {
+            val pushData = message.toObject<PushEntity>()
+            pushData?.let { handlePushData(context, it, message, isMessageFromSystem) }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    private fun handlePushData(context: Context, pushData: PushEntity, message: String, isMessageFromSystem: Boolean) {
+        val notificationManager = context.applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+        if (pushData.displayType == DISPLAY_TYPE_NOTIFICATION) {
+            // 其它类型的透传信息
+            // 显示到通知栏
+            val msg = message.toObject<PushNotificationEntity>()
+            val data = msg?.extra?.data
+
+            // 系统推送(非自定义信息)，直接处理跳转
+            if (isMessageFromSystem) {
+                val intent = Intent()
+                intent.setClass(context, UmengMessageReceiver::class.java)
+                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"
+                    && !UserManager.getInstance().isLoggedIn) {
+                return
+            }
+
+            val clickIntent = Intent()
+            val removeIntent = Intent()
+
+            clickIntent.setClass(context, UmengMessageReceiver::class.java)
+            clickIntent.putExtra(EntranceUtils.KEY_DATA, data?.link)
+            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)
+            removeIntent.putExtra(EntranceUtils.KEY_TYPE, TYPE_REMOVE)
+            removeIntent.putExtra(EntranceUtils.KEY_MESSAGE, message)
+
+            val clickPendingIntent = PendingIntent.getBroadcast(context, System.currentTimeMillis().toInt(),
+                    clickIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+
+            val deletePendingIntent = PendingIntent.getBroadcast(context, System.currentTimeMillis().toInt() + 1,
+                    removeIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                val channel = NotificationChannel("Halo_Push", "Halo_Push", NotificationManager.IMPORTANCE_DEFAULT)
+                notificationManager.createNotificationChannel(channel)
+            }
+
+            val notification = NotificationCompat.Builder(context, "Halo_Push")
+                    .setSmallIcon(R.drawable.ic_notification)
+                    .setTicker(pushData.body?.ticker)
+                    .setContentTitle(pushData.body?.title)
+                    .setContentText(pushData.body?.text)
+                    .setContentIntent(clickPendingIntent)
+                    .setDeleteIntent(deletePendingIntent)
+                    .build()
+            notification.flags = notification.flags or Notification.FLAG_AUTO_CANCEL
+
+            notificationManager.notify(getNotificationTag(context), NOTIFICATION_ID, notification)
+        } else {
+            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
+
+                val type = if (ANSWER == data?.type) {
+                    "回答了你的问题"
+                } else {
+                    "回答了你关注的问题"
+                }
+
+                val userName = StringUtils.shrinkStringWithDot(data?.userEntity?.name, 8)
+                val displayText = userName + type
+
+                if (Notifier.isActivityValid(CurrentActivityHolder.getCurrentActivity()) &&
+                        Notifier.shouldShowNotifier(data?.answer?.id + displayText)) {
+                    Notifier.create(CurrentActivityHolder.getCurrentActivity())
+                            .setText(displayText)
+                            .setDuration(5000)
+                            .setIcon(data?.userEntity?.icon)
+                            .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)
+
+                                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())
+                                        .subscribe(object : Response<ResponseBody>() {
+                                            override fun onResponse(response: ResponseBody?) {
+                                                super.onResponse(response)
+                                                MessageUnreadRepository.loadMessageUnreadData()
+                                            }
+
+                                            override fun onFailure(e: HttpException?) {
+                                                e?.printStackTrace()
+                                            }
+                                        })
+                                Notifier.hide()
+                            })
+                            .show(false)
+                    Notifier.tagNotifierAsShowed(data?.answer?.id + displayText)
+                }
+            } else if (HALO_MESSAGE_CENTER == pushData.body?.custom) {
+                // 消息中心逻辑
+                val msg = gson.fromJson(message, PushMessageUnreadEntity::class.java)
+                val data = msg?.extra?.data
+                data?.let { MessageUnreadRepository.loadMessageUnreadData() }
+            }
+        }
+    }
+
+    /**
+     * 规则:最多三条消息,以旧换新
+     *
+     * @return NotificationTag
+     */
+    private fun getNotificationTag(context: Context): String {
+        val sp = PreferenceManager.getDefaultSharedPreferences(context)
+        val edit = sp.edit()
+
+        val timeTagMap = HashMap<Long, String>()
+        for (tag in notificationTags) {
+            val time = sp.getLong(tag, 0)
+            if (time == 0L) {
+                edit.putLong(tag, System.currentTimeMillis()).apply()
+                return tag
+            } else {
+                timeTagMap[time] = tag
+            }
+        }
+
+        val minTime = Collections.min(timeTagMap.keys)
+        val tag = timeTagMap[minTime]
+        edit.putLong(tag, System.currentTimeMillis()).apply()
+        return if (TextUtils.isEmpty(tag)) notificationTags[0] else tag!!
+    }
+}

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,256 @@
+package com.gh.base;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Build;
+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.view.WindowManager;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.gh.common.util.DisplayUtils;
+import com.gh.common.util.MtaHelper;
+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 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() {
+        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;
+    }
+}

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,21 +1,18 @@
 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 com.gh.base.OnListClickListener;
 import com.gh.base.OnRequestCallBackListener;
+import com.gh.common.constant.Constants;
+import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.eventbus.EBMiPush;
 import com.lightgame.OnTitleClickListener;
 import com.lightgame.utils.RuntimeUtils;
@@ -28,10 +25,16 @@ import org.greenrobot.eventbus.ThreadMode;
 import java.lang.ref.WeakReference;
 import java.util.List;
 
+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 butterknife.ButterKnife;
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE;
 
@@ -42,11 +45,14 @@ import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE;
 public abstract class BaseFragment<T> extends Fragment implements OnRequestCallBackListener<T>,
         View.OnClickListener, OnListClickListener, OnTitleClickListener {
 
+    public static final int RESULT_REFRESH = 9528;
+
     protected View mCachedView;
 
     protected boolean isEverPause;
 
-    protected String mEntrance;
+    @NonNull
+    protected String mEntrance = "";
 
     protected final Handler mBaseHandler = new BaseFragment.BaseHandler(this);
 
@@ -111,6 +117,17 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
         super.onCreate(savedInstanceState);
         final Intent intent = getActivity().getIntent();
         mEntrance = intent.getStringExtra(KEY_ENTRANCE);
+        if (TextUtils.isEmpty(mEntrance) && getArguments() != null) {
+            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);
@@ -126,10 +143,10 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
         initView(mCachedView);
     }
 
-    //TODO 尴尬，必须的有subscribe才能register
+    // 必须的有subscribe才能register
     @Subscribe(threadMode = ThreadMode.BACKGROUND)
     public void onDummyEvent(EBMiPush push) {
-        //
+
     }
 
     @Nullable
@@ -162,13 +179,15 @@ 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))
+        try {
             Utils.toast(getContext(), msg);
+        } catch (Exception ignore) {
+        
+        }
     }
 
     public void toastLong(@StringRes int msg) {
@@ -230,4 +249,10 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
         }
     }
 
+    // 为 fragment 附加 bundle (setArgument())
+    public BaseFragment with(Bundle bundle) {
+        this.setArguments(bundle);
+        return this;
+    }
+
 }

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

@@ -1,11 +1,12 @@
 package com.gh.base.fragment;
 
+import android.content.Intent;
 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.View;
 
 import com.gh.base.adapter.FragmentAdapter;
@@ -54,7 +55,18 @@ public abstract class BaseFragment_TabLayout extends NormalFragment implements V
 
     @Override
     protected int getLayoutId() {
-        return R.layout.fragment_taglyout_viewpager;
+        return R.layout.fragment_tablayout_viewpager;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        List<Fragment> fragments = getChildFragmentManager().getFragments();
+        if (fragments != null) {
+            for (Fragment fragment : fragments) {
+                fragment.onActivityResult(requestCode, resultCode, data);
+            }
+        }
     }
 
     @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,163 @@
+package com.gh.base.fragment
+
+import android.os.Bundle
+import com.gh.gamecenter.normal.NormalFragment
+
+/**
+ * 懒加载（支持多层嵌套）
+ */
+abstract class BaseLazyFragment : NormalFragment() {
+
+    private var mIsFirstVisible = true
+
+    private var isViewCreated = false
+
+    private 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) {
+                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/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;
 
 /**
@@ -21,6 +23,8 @@ public class WaitingDialogFragment extends BaseDialogFragment {
 
     private OnDialogBackListener mBackListener;
 
+    private TextView message;
+
     public static WaitingDialogFragment newInstance(String message) {
         Bundle args = new Bundle();
         args.putString(KEY_MSG, message);
@@ -41,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);
-        final TextView 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;
     }
@@ -62,6 +66,10 @@ public class WaitingDialogFragment extends BaseDialogFragment {
         this.mBackListener = backListener;
     }
 
+    public void uploadWaitingHint(String hint) {
+        if (message != null) message.setText(hint);
+    }
+
     @Override
     public boolean onBack() {
         if (mBackListener != null) {
@@ -71,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

@@ -0,0 +1,50 @@
+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.*
+
+/**
+ * APP 线程池管理类
+ *
+ * [ioExecutor] 是一个最大线程数固定的线程池，较为繁重的 IO 任务可以交给它
+ * [uiExecutor] 是主线程的包裹，需要切换至主线程执行可以用它
+ * [lightWeightIoExecutor] 是一个单线程的线程池，轻量级且需要保证同一线程的 IO 任务可以交给它
+ *
+ */
+object AppExecutor {
+
+    @JvmStatic
+    var uiExecutor = MainThreadExecutor()
+    @JvmStatic
+    var lightWeightIoExecutor = Executors.newSingleThreadExecutor()
+    @JvmStatic
+    var ioExecutor = Executors.newCachedThreadPool()
+
+    class MainThreadExecutor : Executor {
+        private val mainThreadHandler = Handler(Looper.getMainLooper())
+
+        override fun execute(command: Runnable) {
+            mainThreadHandler.post(command)
+        }
+
+        fun executeWithDelay(command: Runnable, delay: Long) {
+            mainThreadHandler.postDelayed(command, delay)
+        }
+    }
+}
+
+fun runOnIoThread(isLightWeightTask: Boolean = false, f: () -> Unit) {
+    if (isLightWeightTask) {
+        AppExecutor.lightWeightIoExecutor.execute(f)
+    } else {
+        AppExecutor.ioExecutor.execute(f)
+    }
+}
+
+fun runOnUiThread(f: () -> Unit) {
+    AppExecutor.uiExecutor.execute(f)
+}

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,153 @@
+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.gamecenter.LoginActivity
+import com.gh.gamecenter.ViewImageActivity
+import com.gh.gamecenter.entity.Badge
+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
+import wendu.dsbridge.CompletionHandler
+
+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 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 openBase64Image(event: Any) {
+        val context = CurrentActivityHolder.getCurrentActivity()
+
+        Base64ImageHolder.image = event.toString()
+
+        context?.startActivity(ViewImageActivity.getBase64ViewImageIntent(context, true))
+    }
+
+    @Keep
+    internal data class MtaEvent(var name: String = "", var key: String = "", var value: String = "")
+
+    @Keep
+    internal data class ImageEvent(var imageList: ArrayList<String> = arrayListOf(), var position: Int = 0)
+
+}

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

@@ -0,0 +1,136 @@
+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.EntranceUtils
+import com.gh.gamecenter.GameDetailActivity
+import com.gh.gamecenter.LibaoDetailActivity
+import com.gh.gamecenter.NewsDetailActivity
+import com.gh.gamecenter.WebActivity
+import com.gh.gamecenter.entity.CommunityEntity
+import com.gh.gamecenter.entity.VideoLinkEntity
+import com.gh.gamecenter.subject.SubjectActivity
+import com.lightgame.utils.Utils
+
+object DefaultWebViewUrlHandler {
+
+    @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: Exception) {
+                    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)
+                }
+
+                "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)
+//                    if (!CheckLoginUtils.isLogin()) {
+//                        HaloApp.put(EntranceUtils.HOST_UPLOAD_VIDEO, linkEntity)
+//                    }
+                    CheckLoginUtils.checkLogin(context, null, true, EntranceUtils.ENTRANCE_BROWSER) {
+                        DirectUtils.directToVideoManager(context, linkEntity, EntranceUtils.ENTRANCE_BROWSER, "")
+                    }
+                }
+                EntranceUtils.HOST_USERHOME -> {
+                    val position = uri.getQueryParameter("position")
+                    DirectUtils.directToHomeActivity(context, id, if(position.isNullOrEmpty()) -1 else position.toInt(), entrance, "")
+                }
+                else -> DialogUtils.showLowVersionDialog(context)
+            }
+            return true
+        }
+        if ("http" != uri.scheme && "https" != uri.scheme) return true
+        return false
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.gh.common
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.gh.common.im.ImManager
+import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.halo.assistant.HaloApp
+import com.m7.imkfsdk.chat.ChatActivity
+import io.reactivex.schedulers.Schedulers
+
+/**
+ * 可使用 [LocalBroadcastManager] 来进行简单的模块间消息通知
+ */
+
+class LocalBroadcastReceiver : BroadcastReceiver() {
+
+    override fun onReceive(context: Context?, intent: Intent?) {
+        intent?.let {
+            when (intent.action) {
+                ChatActivity.ACTION_DISMISS_FLOATING_WINDOW -> {
+                    ImManager.dismissFloatingWindow()
+
+                    RetrofitManager.getInstance(HaloApp.getInstance().application).api.postImEnding(UserManager.getInstance().userId)
+                            .subscribeOn(Schedulers.io())
+                            .subscribe()
+                }
+
+                ChatActivity.ACTION_HIDE_UNREAD_DOT -> {
+                    ImManager.updateShouldShowFloatingWindowDot(false)
+                }
+
+                else -> return
+            }
+        }
+    }
+
+}

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

@@ -0,0 +1,140 @@
+package com.gh.common
+
+import android.annotation.SuppressLint
+import android.preference.PreferenceManager
+import com.gh.base.GHUmengNotificationService
+import com.gh.common.constant.Config
+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.gamecenter.BuildConfig
+import com.gh.gamecenter.entity.AliasEntity
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.halo.assistant.HaloApp
+import com.lightgame.utils.Utils
+import com.umeng.commonsdk.UMConfigure
+import com.umeng.message.IUmengRegisterCallback
+import com.umeng.message.PushAgent
+import io.reactivex.schedulers.Schedulers
+import okhttp3.MediaType
+import okhttp3.RequestBody
+import org.android.agoo.huawei.HuaWeiRegister
+import org.android.agoo.mezu.MeizuRegister
+import org.android.agoo.xiaomi.MiPushRegistar
+import org.json.JSONObject
+
+object PushManager {
+
+    var deviceToken: String? = ""
+
+    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(mApplication,
+                Config.UMENG_APPKEY, channel,
+                UMConfigure.DEVICE_TYPE_PHONE,
+                Config.UMENG_MESSAGE_SECRET)
+
+        // 注册小米、华为和魅族通道
+        MiPushRegistar.register(mApplication, Config.MIPUSH_APPID, Config.MIPUSH_APPKEY)
+        HuaWeiRegister.register(mApplication)
+        MeizuRegister.register(mApplication, BuildConfig.MEIZUPUSH_APPID, BuildConfig.MEIZUPUSH_APPKEY)
+
+        //友盟推送
+        val pushAgent = PushAgent.getInstance(mApplication)
+        pushAgent.onAppStart() // 开启App统计
+
+        //注册推送服务，每次调用register方法都会回调该接口
+        registerDevice()
+
+        val aliasInSp = PreferenceManager.getDefaultSharedPreferences(mApplication).getString(SP_PUSH_ALIAS, "")
+        mPreviousAlias = aliasInSp?.toObject()
+
+        if (mPreviousAlias == null) {
+            getAndSetAlias()
+        }
+
+        // 完全自定义处理（透传）
+        pushAgent.setPushIntentServiceClass(GHUmengNotificationService::class.java)
+    }
+
+    private fun registerDevice() {
+        PushAgent.getInstance(mApplication).register(object : IUmengRegisterCallback {
+            override fun onSuccess(dToken: String) {
+                //注册成功会返回device token
+                deviceToken = dToken
+                getAndSetAlias()
+                Utils.log("deviceToken::$dToken")
+            }
+
+            override fun onFailure(s: String, s1: String) {
+                Utils.log("deviceToken::" + "注册失败")
+            }
+        })
+    }
+
+    @SuppressLint("CheckResult")
+    @JvmStatic
+    fun getAndSetAlias() {
+        if (deviceToken.isNullOrEmpty()) {
+            registerDevice()
+            return
+        }
+
+        val meta = MetaUtil.getMeta()
+
+        val jsonObject = JSONObject()
+        jsonObject.put("device_token", deviceToken)
+        jsonObject.put("imei", meta.imei)
+        jsonObject.put("android_id", meta.android_id)
+        jsonObject.put("model", meta.model)
+        jsonObject.put("manufacturer", meta.manufacturer)
+        jsonObject.put("os", meta.os)
+        jsonObject.put("os_version", meta.android_version)
+        jsonObject.put("mac", meta.mac)
+
+        val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString())
+
+        RetrofitManager.getInstance(mApplication).api.getAlias(body)
+                .subscribeOn(Schedulers.io())
+                .subscribe(
+                        { setAlias(it) },
+                        { it.printStackTrace() }
+                )
+    }
+
+    @JvmStatic
+    fun setAlias(alias: AliasEntity) {
+        val pushAgent = PushAgent.getInstance(mApplication)
+
+        mPreviousAlias = alias
+        PreferenceManager.getDefaultSharedPreferences(mApplication).edit {
+            putString(SP_PUSH_ALIAS, mPreviousAlias?.toJson())
+        }
+
+        pushAgent.setAlias(alias.alias, alias.aliasType) { b, s ->
+            Utils.log("注册别名 $b + $s")
+        }
+    }
+
+    @JvmStatic
+    fun deleteAlias() {
+        val pushAgent = PushAgent.getInstance(mApplication)
+
+        mPreviousAlias?.let {
+            pushAgent.deleteAlias(it.alias, it.aliasType) { b, s ->
+                Utils.log("删除别名 $b + $s")
+            }
+        }
+        PreferenceManager.getDefaultSharedPreferences(mApplication).edit {
+            putString(SP_PUSH_ALIAS, "")
+        }
+        mPreviousAlias = null
+    }
+}

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

@@ -0,0 +1,121 @@
+package com.gh.common
+
+import android.app.Activity
+import android.app.Application
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import com.halo.assistant.HaloApp
+import java.util.concurrent.Executors
+
+/**
+ * 统计用户在当前 Fragment/Activity 的停留时间，在 onViewDestroy 或 onDestroy 里获取 elapsedTime 即可，单位为秒
+ */
+class TimeElapsedHelper(val fragment: Fragment?, val activity: Activity?) {
+
+    constructor() : this(null, null)
+
+    constructor(fragment: Fragment) : this(fragment, null)
+
+    constructor(activity: Activity) : this(null, activity)
+
+    private var isWorking = false
+
+    var elapsedTime: Int = 0
+
+    var timeout: Int = 0
+    var timeoutCallback: TimeoutCallback? = null
+
+    init {
+        activity?.application?.registerActivityLifecycleCallbacks(object : Application.ActivityLifecycleCallbacks {
+            override fun onActivityStarted(a: Activity?) {
+            }
+
+            override fun onActivitySaveInstanceState(a: Activity?, outState: Bundle?) {
+            }
+
+            override fun onActivityStopped(a: Activity?) {
+            }
+
+            override fun onActivityCreated(a: Activity?, savedInstanceState: Bundle?) {
+            }
+
+            override fun onActivityPaused(a: Activity?) {
+                if (activity == a) {
+                    pauseCounting()
+                }
+            }
+
+            override fun onActivityResumed(a: Activity?) {
+                if (activity == a) {
+                    resumeCounting()
+                }
+            }
+
+            override fun onActivityDestroyed(a: Activity?) {
+                if (activity == a) {
+                    HaloApp.getInstance().application.unregisterActivityLifecycleCallbacks(this)
+                }
+            }
+        })
+
+        fragment?.fragmentManager?.registerFragmentLifecycleCallbacks(
+                object : FragmentManager.FragmentLifecycleCallbacks() {
+                    override fun onFragmentResumed(fm: FragmentManager, f: Fragment) {
+                        if (f === fragment) {
+                            resumeCounting()
+                        }
+                    }
+
+                    override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
+                        if (f === fragment) {
+                            pauseCounting()
+                        }
+                    }
+
+                    override fun onFragmentViewDestroyed(fm: FragmentManager, f: Fragment) {
+                        if (f === fragment) {
+                            fragment.fragmentManager?.unregisterFragmentLifecycleCallbacks(this)
+                        }
+                    }
+                }, false)
+    }
+
+    fun resumeCounting() {
+        isWorking = true
+        TimeElapsedThreadHolder.threadService.execute {
+            while (isWorking) {
+                try {
+                    elapsedTime++
+                    if (timeout != 0 && timeout == elapsedTime) {
+                        timeoutCallback?.run {
+                            AppExecutor.uiExecutor.execute {
+                                onTimeout()
+                            }
+                        }
+                    }
+                    Thread.sleep(1000)
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
+            }
+        }
+    }
+
+    fun resetCounting() {
+        elapsedTime = 0
+    }
+
+    fun pauseCounting() {
+        isWorking = false
+    }
+
+}
+
+object TimeElapsedThreadHolder {
+    val threadService = Executors.newSingleThreadExecutor()
+}
+
+interface TimeoutCallback {
+    fun onTimeout()
+}

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

@@ -1,33 +1,42 @@
 package com.gh.common.constant;
 
-
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 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;
 
     /**
      * 需要配置的请使用{@link PreferenceManager#getDefaultSharedPreferences(Context)}
      */
-//    @Deprecated
-//    public static final String PREFERENCE = "ghzhushou";
 
     // Third-Party confs
     public static final String WECHAT_APPID = BuildConfig.WECHAT_APPID;
@@ -41,45 +50,54 @@ 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 PATCH_VERSION_NAME = BuildConfig.PATCH_VERSION_NAME; // 补丁包版本 对应关于->版本号
     // http://www.ghzs666.com/article/${articleId}.html
-    public static final String URL_ARTICLE = "http://www.ghzs666.com/article/"; // TODO ghzs/ghzs666 统一
+    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;
 
+    public static final String FIX_DOWNLOAD_KEY = "isFixDownload";
+    public static final String FIX_PLUGIN_KEY = "isFixPlugin";
+    public static final String FIX_ARTICLE_KEY = "isFixArticle";
+    public static final String FIX_COMMUNITY_KEY = "isFixCommunity";
+
+    public static final int VIDEO_PAGE_SIZE = 21; // 视频列表大多都是一行3个
+
     public static boolean isShow() {
-        if (PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication())
-                .getBoolean("isFixDownload", false)) return true;
+        if (getPreferences().getBoolean(FIX_DOWNLOAD_KEY, false)) return true;
 
         if (!isExistDownloadFilter()) return false;
 
-        for (SettingsEntity.Download entity : mSettingsEntity.getDownload()) {
+        for (SettingsEntity.Download entity : getSettings().getDownload()) {
             if ("all".equals(entity.getGame())) {
-                if (entity.isPluginfy() && "normal".equals(entity.getPolicy()) && filterTime(entity.getTime())) {
+                if (entity.getPluginfy() && "normal".equals(entity.getPolicy()) && filterTime(entity.getTime())) {
                     return true;
                 }
             }
         }
-
         return false;
     }
 
-    public static String getExceptionMsg(Context context) {
-        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
-        return sp.getString("errMsg", null);
+    public static String getExceptionMsg() {
+        return getPreferences().getString("errMsg", null);
     }
 
-    public static void setExceptionMsg(Context context, String errMsg) {
-        PreferenceManager.getDefaultSharedPreferences(context).edit().putString("errMsg", errMsg).apply();
+    public static void setExceptionMsg(String errMsg) {
+        SPUtils.setString(getPreferences(), "errMsg", errMsg);  //先用apply(),保存不了再用commit() 9.0机型保存不了信息
     }
 
     public static boolean isShowDownload(String gameId) {
 
+        if (getPreferences().getBoolean(FIX_DOWNLOAD_KEY, false)) return true;
+
         if (TextUtils.isEmpty(gameId) || !isExistDownloadFilter())
             return false;
 
-        for (SettingsEntity.Download entity : mSettingsEntity.getDownload()) {
+        for (SettingsEntity.Download entity : getSettings().getDownload()) {
             if (gameId.equals(entity.getGame())) {
                 if ("normal".equals(entity.getPolicy()) && filterTime(entity.getTime())) {
                     return true;
@@ -87,8 +105,7 @@ public class Config {
                     return false;
                 }
             } else if ("all".equals(entity.getGame())) {
-                if ("normal".equals(entity.getPolicy()) && filterTime(entity.getTime())
-                        || PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication()).getBoolean("isFixDownload", false)) {
+                if ("normal".equals(entity.getPolicy()) && filterTime(entity.getTime())) {
                     return true;
                 }
             }
@@ -99,18 +116,25 @@ public class Config {
 
 
     public static boolean isShowPlugin(String gameId) {
+        SharedPreferences preferences = getPreferences();
+        boolean isFixPlugin = preferences.getBoolean(FIX_PLUGIN_KEY, false);
+        if (isFixPlugin) return true;
+
         if (TextUtils.isEmpty(gameId) || !isExistDownloadFilter())
             return false;
 
-        for (SettingsEntity.Download entity : mSettingsEntity.getDownload()) {
+        for (SettingsEntity.Download entity : getSettings().getDownload()) {
             if (gameId.equals(entity.getGame())) {
-                if (entity.isPluginfy() && filterTime(entity.getTime())) {
+                if (entity.getPluginfy() && filterTime(entity.getTime())) {
                     return true;
                 } else {
                     return false;
                 }
-            } else if ("all".equals(entity.getGame())) {
-                if (entity.isPluginfy() && filterTime(entity.getTime())) {
+            }
+
+            if ("all".equals(entity.getGame())) {
+                if (entity.getPluginfy() && filterTime(entity.getTime())) {
+                    preferences.edit().putBoolean(FIX_PLUGIN_KEY, true).apply();
                     return true;
                 }
             }
@@ -120,12 +144,17 @@ public class Config {
     }
 
     public static boolean isShowPlugin() {
+        SharedPreferences preferences = getPreferences();
+        boolean isFixPlugin = preferences.getBoolean(FIX_PLUGIN_KEY, false);
+        if (isFixPlugin) return true;
+
         if (!isExistDownloadFilter())
             return false;
 
-        for (SettingsEntity.Download entity : mSettingsEntity.getDownload()) {
+        for (SettingsEntity.Download entity : getSettings().getDownload()) {
             if ("all".equals(entity.getGame())) {
-                if (entity.isPluginfy() && filterTime(entity.getTime())) {
+                if (entity.getPluginfy() && filterTime(entity.getTime())) {
+                    preferences.edit().putBoolean(FIX_PLUGIN_KEY, true).apply();
                     return true;
                 }
             }
@@ -147,15 +176,33 @@ public class Config {
     }
 
     public static void setSettings(SettingsEntity settingsEntity) {
+        getPreferences().edit().putString(SETTINGS_KEY, GsonUtils.toJson(settingsEntity)).apply();
         mSettingsEntity = settingsEntity;
+
+        // 更新 FIX_ARTICLE_KEY 状态
+        mSettingsEntity.showArticleEntrance();
+
+        // 加载完设置后刷新下
+        PackageHelper.initList();
     }
 
+    @Nullable
     public static SettingsEntity getSettings() {
+        if (mSettingsEntity == null) {
+            try {
+                String json = getPreferences().getString(SETTINGS_KEY, null);
+                if (!TextUtils.isEmpty(json)) {
+                    mSettingsEntity = GsonUtils.fromJson(json, SettingsEntity.class);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
         return mSettingsEntity;
     }
 
     private static boolean isExistDownloadFilter() {
-        if (mSettingsEntity == null || mSettingsEntity.getDownload() == null || mSettingsEntity.getDownload().size() == 0) {
+        if (getSettings() == null || getSettings().getDownload() == null || getSettings().getDownload().size() == 0) {
             return false;
         } else {
             return true;
@@ -175,4 +222,52 @@ public class Config {
         }
     }
 
+    public static SharedPreferences getPreferences() {
+        return PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication());
+    }
+
+    public static boolean isExistHideFunction() {
+        SharedPreferences preferences = getPreferences();
+        if (!preferences.getBoolean(FIX_DOWNLOAD_KEY, false)) return true;
+        if (!preferences.getBoolean(FIX_PLUGIN_KEY, false)) return true;
+        if (!preferences.getBoolean(FIX_COMMUNITY_KEY, false)) return true;
+        if (!preferences.getBoolean(FIX_ARTICLE_KEY, false)) return true;
+        return false;
+    }
+
+    public static void fixHideFunction() {
+        SharedPreferences preferences = PreferenceManager.
+                getDefaultSharedPreferences(HaloApp.getInstance().getApplication());
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putBoolean(Config.FIX_DOWNLOAD_KEY, true);
+        editor.putBoolean(Config.FIX_ARTICLE_KEY, true);
+        editor.putBoolean(Config.FIX_COMMUNITY_KEY, true);
+        editor.putBoolean(Config.FIX_PLUGIN_KEY, true);
+        editor.apply();
+    }
+
+    public static void getGhzsSettings() {
+        String channel = HaloApp.getInstance().getChannel();
+        RetrofitManager.getInstance(HaloApp.getInstance().getApplication())
+                .getApi().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;
@@ -15,6 +17,52 @@ public class Constants {
     public static final String USER_TOKEN_KEY = "userTokenKey";
     public static final String USER_INFO_KEY = "userInfoKey";
 
+    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";
+
+    // 最近显示的弹窗信息
+    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_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";
+
     //手机号码匹配规则
     public static final String REGEX_MOBILE = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$";
     public static final String REGEX_ACCOUNT = "^[a-zA-Z_]\\w{5,17}$";
@@ -23,6 +71,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;
 
@@ -38,5 +94,17 @@ 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";
 }

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;    // 新闻头部布局
@@ -26,13 +27,17 @@ public class ItemViewType {
     public static final int GAME_PLUGIN = 18;     // 游戏插件模块
     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;
 
     /**
      * 普通列表
      */
     public static final int ITEM_BODY = 100;
     public static final int ITEM_FOOTER = 101;
-    public static final int ITEM_TOP = 102;
-
+    public static final int ITEM_HEADER = 102;
 
 }

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

@@ -1,10 +1,11 @@
 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.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;
@@ -15,31 +16,45 @@ import android.widget.TextView;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.gh.base.OnViewClickListener;
 import com.gh.common.constant.Config;
+import com.gh.common.dialog.ReserveDialogFragment;
 import com.gh.common.exposure.ExposureEvent;
 import com.gh.common.exposure.ExposureUtils;
+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.KaiFuUtils;
-import com.gh.common.util.NetworkUtils;
+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.StringUtils;
+import com.gh.common.util.PermissionHelper;
+import com.gh.common.util.PlatformUtils;
+import com.gh.common.util.ReservationHelper;
 import com.gh.common.view.DownloadDialog;
 import com.gh.common.view.DownloadProgressBar;
+import com.gh.common.view.DrawableView;
 import com.gh.download.DownloadManager;
 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.eventbus.EBReuse;
-import com.gh.gamecenter.manager.PackageManager;
+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;
@@ -50,19 +65,35 @@ import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Locale;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import androidx.databinding.BindingAdapter;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
 /**
  * Created by khy on 12/02/18.
  */
 
 public class BindingAdapters {
 
+    @BindingAdapter("imageIcon")
+    public static void loadIcon(SimpleDraweeView view, String imageUrl) {
+        ImageUtils.displayIcon(view, imageUrl);
+    }
+
     @BindingAdapter("imageUrl")
     public static void loadImage(SimpleDraweeView view, String imageUrl) {
-        view.setImageURI(imageUrl);
+        ImageUtils.display(view, imageUrl);
+    }
+
+    @BindingAdapter("setTextSize")
+    public static void setTextSize(TextView view, int number) {
+        view.setTextSize(number);
     }
 
     @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();
@@ -74,7 +105,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);
@@ -96,8 +127,14 @@ public class BindingAdapters {
         }
     }
 
+    // 如果超过10000，则转换为1.0W
+    @BindingAdapter("transSimpleCount")
+    public static void transSimpleCount(TextView view, int count) {
+        view.setText(NumberUtils.transSimpleCount(count));
+    }
+
     @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));
@@ -285,8 +322,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())
@@ -297,20 +341,129 @@ 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,
+                                () -> {
+                                    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);
+                    }
+                    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.getInstance(v.getContext()).showPopupWindow(v, gameEntity,
+                                entrance, location + 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);
+                        }
+                    }
+                    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:
+                    MtaHelper.onEvent("H5页面", "入口", "列表页_" + gameEntity.getName());
+                    LinkEntity linkEntity = gameEntity.getH5Link();
+                    Intent i = new Intent(WebActivity.getIntentForWebGame(progressBar.getContext(), linkEntity.getLink(), gameEntity.getName(), "play".equals(linkEntity.getType())));
+                    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);
+            String status = GameUtils.getDownloadBtnText(progressBar.getContext(), gameEntity, PluginLocation.only_game);
             switch (status) {
                 case "插件化":
                     progressBar.setDownloadType(DownloadProgressBar.DownloadType.PLUGIN);
                     break;
                 case "打开":
-                    if (gameEntity.getApk().size() == 1) {
-                        status = "启动";
-                    }
+                case "启动":
                     progressBar.setDownloadType(DownloadProgressBar.DownloadType.LAUNCH_OR_OPEN);
                     break;
                 default:
@@ -332,7 +485,7 @@ public class BindingAdapters {
                     case neterror:
                     case waiting:
                         progressBar.setText(R.string.downloading);
-                        if (downloadEntity.isPluggable() && PackageManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
+                        if (downloadEntity.isPluggable() && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
                             progressBar.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_PLUGIN);
                         } else {
                             progressBar.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_NORMAL);
@@ -341,7 +494,7 @@ public class BindingAdapters {
                     case done:
                         progressBar.setText(R.string.install);
                         if (downloadEntity.isPluggable()
-                                && PackageManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
+                                && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
                             progressBar.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_PLUGIN);
                         } else {
                             progressBar.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_NORMAL);
@@ -356,58 +509,30 @@ 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) {
-                        if (NetworkUtils.isWifiConnected(v.getContext())) {
-                            download(progressBar, gameEntity, traceEvent);
-                        } else {
-                            DialogUtils.showDownloadDialog(v.getContext(), () -> {
-                                download(progressBar, gameEntity, traceEvent);
-                            });
-                        }
-                    } 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());
-                        }
-                    }
-            }
-        });
     }
 
+
+    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) {
+    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("更新")) {
@@ -420,15 +545,18 @@ 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(), "(我的光环:我的游戏)", "下载开始");
-
-            ExposureEvent downloadExposureEvent = ExposureUtils.INSTANCE.logADownloadExposureEvent(gameEntity, apkEntity.getPlatform(), traceEvent, ExposureUtils.DownloadType.DOWNLOAD);
-
+            DataUtils.onGameDownloadEvent(progressBar.getContext(), gameEntity.getName(), apkEntity.getPlatform(), entrance, "下载开始", method);
+    
+            ExposureUtils.DownloadType downloadType = ExposureUtils.getDownloadType(apkEntity, method);
+            ExposureEvent downloadExposureEvent = ExposureUtils.logADownloadExposureEvent(gameEntity, apkEntity.getPlatform(), traceEvent, downloadType);
+    
             DownloadManager.createDownload(progressBar.getContext(),
                     apkEntity,
                     gameEntity,
                     method,
-                    StringUtils.buildString("(我的光环:我的游戏)"), "我的光环-我的游戏:" + gameEntity.getName(),
+                    entrance,
+                    location + gameEntity.getName(),
+                    isSubscribe,
                     downloadExposureEvent);
 
             progressBar.setProgress(0);
@@ -447,8 +575,8 @@ public class BindingAdapters {
             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);
-            String type = gameEntity.getTest().getType();
-            KaiFuUtils.setKaiFuType(testType, type);
+            testType.setText(gameEntity.getTest().getType());
+            testType.setBackgroundColor(ContextCompat.getColor(layout.getContext(), R.color.tag_yellow));
 
             if (gameEntity.getTest().getStart() == 0) {
                 testTime.setVisibility(View.GONE);
@@ -464,10 +592,75 @@ public class BindingAdapters {
 
     @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) {
+        if (isShowPlatform && game.getApk().size() > 0) {
+            view.setText(String.format("%s - %s", game.getName(),
+                    PlatformUtils.getInstance(view.getContext()).getPlatformName(
+                            game.getApk().get(0).getPlatform())));
+        } else {
+            view.setText(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,62 @@
+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
+
+    // 区分此 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)
+        }
+    }
+
+    override fun onCancel(dialog: DialogInterface) {
+        super.onCancel(dialog)
+        if (mIsCanceledByClickOutsideOfDialog.get()) {
+            onEvent("点击空白")
+        }
+    }
+
+    open fun trackWithBasicDeviceInfo() = false
+
+}

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

@@ -0,0 +1,70 @@
+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.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() {
+    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!!) {
+            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,198 @@
+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.common.constant.Config
+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 : 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 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()
+            }
+        }
+        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.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,47 @@
+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 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 ?: "点击空白")
+            }
+        }
+
+        setOnKeyListener { _, keyCode, event ->
+            if (keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_UP) {
+                mIsCanceledByClickOutsideOfDialog.set(false)
+                MtaHelper.onEvent(mEvent, mKey, mKeyBackValue ?: "点击返回")
+            }
+            false
+        }
+    }
+
+    override fun show() {
+        super.show()
+        if (mLogShowEvent) {
+            MtaHelper.onEvent(mEvent, mKey, "出现弹窗")
+        }
+    }
+
+}

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

@@ -1,8 +1,8 @@
 package com.gh.common.exposure
 
-import android.arch.persistence.room.TypeConverter
+import androidx.room.TypeConverter
 import com.gh.common.exposure.meta.Meta
-import com.google.gson.Gson
+import com.gh.common.util.GsonUtils
 import java.util.*
 import kotlin.collections.ArrayList
 
@@ -10,32 +10,32 @@ class ExposureConverters {
 
     @TypeConverter
     fun convertPayload2String(any: ExposureEntity): String {
-        return Gson().toJson(any)
+        return GsonUtils.toJson(any)
     }
 
     @TypeConverter
     fun convertString2Payload(string: String): ExposureEntity {
-        return Gson().fromJson(string, ExposureEntity::class.java)
+        return GsonUtils.fromJson(string, ExposureEntity::class.java)
     }
 
     @TypeConverter
     fun convertSource2String(sourceList: List<ExposureSource>): String {
-        return Gson().toJson(sourceList)
+        return GsonUtils.toJson(sourceList)
     }
 
     @TypeConverter
     fun convertString2Source(sourceList: String): List<ExposureSource> {
-        return ArrayList(Arrays.asList(Gson().fromJson(sourceList, Array<ExposureSource>::class.java))) as List<ExposureSource>
+        return ArrayList(Arrays.asList(GsonUtils.fromJson(sourceList, Array<ExposureSource>::class.java))) as List<ExposureSource>
     }
 
     @TypeConverter
     fun convertETrace2String(sourceList: List<ExposureEvent>?): String {
-        return Gson().toJson(sourceList)
+        return GsonUtils.toJson(sourceList)
     }
 
     @TypeConverter
     fun convertStringToETrace(sourceList: String): List<ExposureEvent> {
-        return ArrayList(Arrays.asList(Gson().fromJson(sourceList, Array<ExposureEvent>::class.java))) as List<ExposureEvent>
+        return ArrayList(Arrays.asList(GsonUtils.fromJson(sourceList, Array<ExposureEvent>::class.java))) as List<ExposureEvent>
     }
 
     @TypeConverter
@@ -50,12 +50,12 @@ class ExposureConverters {
 
     @TypeConverter
     fun convertMeta2String(any: Meta): String {
-        return Gson().toJson(any)
+        return GsonUtils.toJson(any)
     }
 
     @TypeConverter
     fun convertString2Meta(string: String): Meta {
-        return Gson().fromJson(string, Meta::class.java)
+        return GsonUtils.fromJson(string, Meta::class.java)
     }
 
 }

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
 

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

@@ -1,9 +1,9 @@
 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.exposure.meta.Meta
 import com.gh.common.exposure.meta.MetaUtil
 import com.gh.common.exposure.time.TimeUtil
@@ -15,7 +15,7 @@ import java.util.*
 @Parcelize
 @Entity(tableName = "exposureEvent")
 data class ExposureEvent(
-        val payload: ExposureEntity,
+        var payload: ExposureEntity,
         val source: List<ExposureSource>,
         var eTrace: List<ExposureEvent>? = arrayListOf(),
         val event: ExposureType,
@@ -24,9 +24,10 @@ 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 {
             return ExposureEvent(
-                    ExposureEntity(gameId = gameEntity?.id,
+                    payload = ExposureEntity(gameId = gameEntity?.id,
                             gameName = gameEntity?.name,
                             sequence = gameEntity?.sequence,
                             platform = gameEntity?.platform,
@@ -34,7 +35,7 @@ data class ExposureEvent(
                             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,10 +1,9 @@
 package com.gh.common.exposure
 
-import android.arch.persistence.room.*
+import androidx.room.*
 
 @Dao
 interface ExposureEventDao {
-
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insertMany(eventList: List<ExposureEvent>)
 

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

@@ -1,16 +1,13 @@
 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 rx.functions.Action1
+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
 
 /**
  * Exposure Event Listener for RecyclerView
- *
- * TODO 1. Pull down refresh change in first page without scroll down action
- * TODO 2. Item change not triggered by user scroll action (vm data change etc.)
  */
 class ExposureListener(var fragment: Fragment, var exposable: IExposable) : RecyclerView.OnScrollListener() {
 
@@ -21,13 +18,13 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
     init {
         fragment.fragmentManager?.registerFragmentLifecycleCallbacks(
                 object : FragmentManager.FragmentLifecycleCallbacks() {
-                    override fun onFragmentResumed(fm: FragmentManager?, f: Fragment?) {
-                        throttleBus = ExposureThrottleBus(Action1 { commitExposure(it) }, Action1(Throwable::printStackTrace))
+                    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?.unsubscribe()
+                        throttleBus?.clear()
                     }
                 }, false)
     }
@@ -48,8 +45,7 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
     }
 
     /**
-     * Check disappearMap items together with according data in displayMap,
-     * log any items displayed long enough to be called a EXPOSURE
+     * Just commit the exposureEvent that is stored in listItem.
      */
     private fun commitExposure(visibleState: ExposureThrottleBus.VisibleState) {
 
@@ -59,8 +55,8 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
             try {
                 exposable.getEventByPosition(pos)?.let { eventList.add(it) }
                 exposable.getEventListByPosition(pos)?.let { eventList.addAll(it) }
-            } catch (e: Exception) {
-                e.printStackTrace()
+            } catch (ignore: Exception) {
+                // Just ignore the error.
             }
         }
 

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

@@ -1,184 +1,145 @@
 package com.gh.common.exposure
 
-import android.app.Application
-import com.aliyun.sls.android.sdk.LogException
 import com.aliyun.sls.android.sdk.model.LogGroup
-import com.gh.common.exposure.aliyun.LGLOG
-import com.gh.common.exposure.aliyun.LGLOGClient
-import com.gh.common.exposure.meta.MetaUtil
 import com.gh.common.exposure.time.TimeUtil
-import com.google.gson.Gson
+import com.gh.common.util.toJson
+import com.gh.gamecenter.BuildConfig
+import com.gh.loghub.LgLOG
+import com.gh.loghub.LoghubHelper
+import com.halo.assistant.HaloApp
+import com.lightgame.utils.Utils
 import java.util.concurrent.Executors
 import kotlin.concurrent.fixedRateTimer
 
 /**
- * ExposureManager tool to commit logs to aliyun loghub
- * TODO handle logs that failed to be committed multiple times
+ * A handful tool for committing logs to aliyun loghub.
+ *
+ * 如何简单地统计列表中每个 item 的曝光事件？
+ *
+ * 1. Adapter 实现 IExposable 接口，在 BindView 阶段更新 ExposureEvent，ExposureEvent 供 getEventByPosition(pos) 方法获取用
+ * 2. 构建一个 ExposureListener 并作为入参添加至 recyclerview 的 Scroll 回调中
+ * 3. 没了
  */
 object ExposureManager {
 
-    private var TAG: String = ExposureManager::class.java.simpleName
-
-    private const val ACCESS_KEY_ID = "LTAIV3i0sNc4TPK1"
-    private const val ACCESS_KEY_SECRET = "8dKtTPeE5WYA6ZCeuIBcIVp7eB0ir4"
     private const val ENDPOINT = "cn-qingdao.log.aliyuncs.com"
     private const val PROJECT = "ghzs"
-    private const val LOG_STORE = "exposure"
     private const val STORE_SIZE = 100
     private const val STORE_FORCE_UPLOAD_PERIOD = 300 * 1000L
+    private const val LOG_STORE = BuildConfig.EXPOSURE_REPO
 
-    private lateinit var client: LGLOGClient
-    private lateinit var db: ExposureEventDao
-    private val storeList = arrayListOf<ExposureEvent>()
-    private val storeOpThread = Executors.newSingleThreadExecutor()
-    private val gson = Gson()
+    private val loghubHelper = LoghubHelper.getInstance()
 
-    private val exposureCache = FixedSizeLinkedHashSet<String>(20)
+    // exposureCache 用来过滤掉具有相同 id 的曝光事件，避免重复发送事件
+    private val exposureSet = hashSetOf<ExposureEvent>()
+    private val exposureExecutor = Executors.newSingleThreadExecutor()
+    private val exposureCache = FixedSizeLinkedHashSet<String>(300)
+    private val exposureDao by lazy { ExposureDatabase.buildDatabase(HaloApp.getInstance().application).logHubEventDao() }
 
-    /**
-     * Must be called early to init object then real use (for example in Application)
-     */
-    fun init(application: Application) {
+    @JvmStatic
+    fun init() {
+        TimeUtil.init()
 
-        client = LGLOGClient(ENDPOINT, ACCESS_KEY_ID, ACCESS_KEY_SECRET, PROJECT)
-        db = ExposureDatabase.buildDatabase(application).logHubEventDao()
+        loghubHelper.init(HaloApp.getInstance().application, ENDPOINT, PROJECT, LOG_STORE) { TimeUtil.currentTimeMillis() }
 
-        storeOpThread.execute({
-            val eventList = db.getAll()
-            storeList.addAll(eventList)
-        })
+        exposureExecutor.execute {
+            val eventList = exposureDao.getAll()
+            exposureSet.addAll(eventList)
+        }
 
         fixedRateTimer(name = "ExposureManager-Store-Checker", initialDelay = 500, period = STORE_FORCE_UPLOAD_PERIOD) {
-            checkAndUploadFromStore(true)
-        }
-
-        MetaUtil.init(application)
-        TimeUtil.init()
-    }
-
-    /**
-     * Log an Event
-     */
-    fun log(event: ExposureEvent, uploadImmediately: Boolean = false) {
-        when (uploadImmediately) {
-            false -> store(event)
-            true -> upload(event)
+            commitSavedExposureEvents(true)
         }
     }
 
     /**
-     * Log Many Events
+     * Log a single exposure event.
      */
-    fun log(eventList: List<ExposureEvent>, uploadImmediately: Boolean = false) {
-        when (uploadImmediately) {
-            false -> store(eventList)
-            true -> upload(eventList)
-        }
-    }
-
-    /**
-     * Store an Event to storeList, upload when storeList size exceeds STORE_SIZE
-     */
-    private fun store(event: ExposureEvent) {
-        storeOpThread.execute({
-            if (!exposureCache.contains(event.id)) {
-                storeList.add(event)
-                db.insert(event)
-                exposureCache.add(event.id)
-            }
-        })
-        checkAndUploadFromStore()
-    }
-
-    /**
-     * Store Many Events to storeList, upload when storeList size exceeds STORE_SIZE
-     */
-    private fun store(eventList: List<ExposureEvent>) {
-        storeOpThread.execute({
-            for (event in eventList) {
+    fun log(event: ExposureEvent) {
+        exposureExecutor.execute {
+            try {
                 if (!exposureCache.contains(event.id)) {
-                    storeList.add(event)
-                    db.insert(event)
+                    // Catch `android.database.sqlite.SQLiteFullException: database or disk is full` exception.
+
+                    exposureSet.add(event)
+                    exposureDao.insert(event)
                     exposureCache.add(event.id)
+
+                } else {
+                    Utils.log("Exposure", "遇到重复曝光事件，自动过滤 （${event.id} - ${event.payload.gameName}）")
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+    }
+
+    /**
+     * Log a collection of exposure event.
+     */
+    fun log(eventList: List<ExposureEvent>) {
+        exposureExecutor.execute {
+            for (event in eventList) {
+                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)
+                    } else {
+                        Utils.log("Exposure", "遇到重复曝光事件，自动过滤 （${event.id} - ${event.payload.gameName}）")
+                    }
+                } catch (e: Exception) {
+                    e.printStackTrace()
                 }
             }
-        })
-        checkAndUploadFromStore()
+            commitSavedExposureEvents()
+        }
     }
 
     /**
-     * Upload an Event
+     * @param forced Ignore all restrictions.
      */
-    private fun upload(event: ExposureEvent) {
-        storeOpThread.execute({
-            client.PostLog(buildLogGroup(event), LOG_STORE)
-        })
-    }
+    fun commitSavedExposureEvents(forced: Boolean = false) {
+        exposureExecutor.execute {
+            if (exposureSet.size < STORE_SIZE && !forced || exposureSet.size == 0) return@execute
 
-    /**
-     * Upload Many Events
-     */
-    private fun upload(eventList: List<ExposureEvent>) {
-        storeOpThread.execute({
-            client.PostLog(buildLogGroup(eventList), LOG_STORE)
-        })
-    }
+            val exposureList = exposureSet.toList()
+            // uploadLogGroup 是一个异步方法，LoghubHelper 里面实现了重传功能，所以这里交给它就好了
+            loghubHelper.uploadLogGroup(buildLogGroup(exposureList))
 
-    /**
-     * Upload Events From Store, and removed them
-     */
-    private fun checkAndUploadFromStore(isForceUpload: Boolean = false) {
-        if (storeList.size < STORE_SIZE && !isForceUpload || storeList.size == 0) return
-        storeOpThread.execute({
-            if (storeList.size < STORE_SIZE && !isForceUpload || storeList.size == 0) return@execute
-            val uploaded = storeList.toList()
-            try {
-                client.PostLog(buildLogGroup(uploaded), LOG_STORE)
-            } catch (exception: LogException) {
-                // Return to insure no logs lost because of online commit failure
-                return@execute
-            }
-            storeList.removeAll(uploaded)
-            db.deleteMany(uploaded)
-        })
-    }
-
-    private fun buildLog(event: ExposureEvent): LGLOG {
-        val log = LGLOG()
-
-        log.PutContent("id", event.id)
-        log.PutContent("payload", gson.toJson(event.payload))
-        log.PutContent("event", event.event.toString())
-        log.PutContent("source", eliminateMultipleBrackets(gson.toJson(event.source)))
-        log.PutContent("meta", gson.toJson(event.meta))
-        log.PutContent("e-traces", if (event.eTrace != null) eliminateMultipleBrackets(gson.toJson(event.eTrace)) else "")
-        log.PutTime(event.time)
-
-        return log
+            Utils.log("Exposure", "提交了${exposureList.size}条曝光记录")
+            exposureSet.removeAll(exposureList)
+            exposureDao.deleteMany(exposureList)
+        }
     }
 
     private fun eliminateMultipleBrackets(jsonWithMultipleBracket: String): String {
         return jsonWithMultipleBracket.replace("[[", "[").replace("]]", "]")
     }
 
-    private fun buildLogGroup(event: ExposureEvent): LogGroup {
-
+    private fun buildLogGroup(eventList: List<ExposureEvent>): LogGroup {
         val logGroup = LogGroup("sls android", "no ip")
 
-        logGroup.PutLog(buildLog(event))
+        eventList.forEach { logGroup.PutLog(buildLog(it)) }
 
         return logGroup
     }
 
-    private fun buildLogGroup(eventList: List<ExposureEvent>): LogGroup {
+    private fun buildLog(event: ExposureEvent): LgLOG {
+        val log = LgLOG(TimeUtil.currentTime())
 
-        val logGroup = LogGroup("sls android", "no ip")
+        log.PutContent("id", event.id)
+        log.PutContent("payload", event.payload.toJson())
+        log.PutContent("event", event.event.toString())
+        log.PutContent("source", eliminateMultipleBrackets(event.source.toJson()))
+        log.PutContent("meta", event.meta.toJson())
+        log.PutContent("e-traces", if (event.eTrace != null) {
+            eliminateMultipleBrackets(event.eTrace?.toJson() ?: "")
+        } else "")
+        log.PutTime(event.time)
 
-        eventList.forEach { event ->
-            logGroup.PutLog(buildLog(event))
-        }
-
-        return logGroup
+        return log
     }
 
     internal class FixedSizeLinkedHashSet<T>(var maxSize: Int) : LinkedHashSet<T>() {

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/ExposureThrottleBus.kt

@@ -1,38 +1,37 @@
 package com.gh.common.exposure
 
-import rx.Subscription
-import rx.functions.Action1
-import rx.schedulers.Schedulers
-import rx.subjects.PublishSubject
-import rx.subjects.Subject
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.functions.Consumer
+import io.reactivex.schedulers.Schedulers
+import io.reactivex.subjects.PublishSubject
 import java.util.concurrent.TimeUnit
 
-class ExposureThrottleBus(var onSuccess: Action1<VisibleState>, var onError: Action1<Throwable>) {
+class ExposureThrottleBus(var onSuccess: Consumer<VisibleState>, var onError: Consumer<Throwable>) {
 
     companion object {
         private const val THRESHOLD_TIME = 300L
     }
 
-    private val mPublishSubject: Subject<VisibleState, VisibleState>
-    private val mSubscription: Subscription
+    private val mPublishSubject: PublishSubject<VisibleState> = PublishSubject.create()
+    private val mCompositeDisposable: CompositeDisposable = CompositeDisposable()
 
     init {
-        mPublishSubject = PublishSubject.create()
 
         /**
          *  Since onScroll() callback will be triggered multiple times for every swipe, we use
          *  distinctUntilChanged() to prevent committing the same visibleState event and
          *  throttleWithTimeout() to pass a visibleState event with a delay and drop current event if another event arrives before the timeout.
          */
-        mSubscription = mPublishSubject
+        val disposable = mPublishSubject
                 .distinctUntilChanged()
                 .throttleWithTimeout(THRESHOLD_TIME, TimeUnit.MILLISECONDS)
                 .subscribeOn(Schedulers.io())
                 .subscribe(onSuccess, onError)
+        mCompositeDisposable.add(disposable)
     }
 
-    fun unsubscribe() {
-        mSubscription.unsubscribe()
+    fun clear() {
+        mCompositeDisposable.clear()
     }
 
     fun postVisibleState(visibleState: VisibleState) {

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

@@ -1,12 +1,19 @@
 package com.gh.common.exposure
 
+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.google.gson.Gson
+import com.halo.assistant.HaloApp
 import java.util.*
 
 object ExposureUtils {
 
-    fun logADownloadExposureEvent(entity: GameEntity, platform: String?, traceEvent: ExposureEvent?, downloadType: DownloadType): ExposureEvent {
+    @JvmStatic
+    fun logADownloadExposureEvent(entity: GameEntity,
+                                  platform: String?,
+                                  traceEvent: ExposureEvent?,
+                                  downloadType: DownloadType): ExposureEvent {
         val gameEntity = entity.clone()
         gameEntity.platform = platform
         gameEntity.downloadType = downloadType.toString()
@@ -14,20 +21,49 @@ object ExposureUtils {
                 source = traceEvent?.source ?: ArrayList(),
                 eTrace = ExposureTraceUtils.appendTrace(traceEvent),
                 event = ExposureType.DOWNLOAD)
-        ExposureManager.log(exposureEvent, false)
+        ExposureManager.log(exposureEvent)
         return exposureEvent
     }
 
-    fun logADownloadCompleteExposureEvent(entity: GameEntity, platform: String?, trace: String?, downloadType: DownloadType) {
+    @JvmStatic
+    fun logADownloadCompleteExposureEvent(entity: GameEntity,
+                                          platform: String?,
+                                          trace: String?,
+                                          downloadType: DownloadType) {
         val gameEntity = entity.clone()
         gameEntity.platform = platform
         gameEntity.downloadCompleteType = downloadType.toString()
-        val traceEvent = Gson().fromJson(trace, ExposureEvent::class.java)
+        val traceEvent = trace?.toObject<ExposureEvent>()
         val exposureEvent = ExposureEvent.createEvent(gameEntity = gameEntity,
                 source = traceEvent?.source ?: ArrayList(),
                 eTrace = ExposureTraceUtils.appendTrace(traceEvent),
                 event = ExposureType.DOWNLOAD_COMPLETE)
-        ExposureManager.log(exposureEvent, false)
+        ExposureManager.log(exposureEvent)
+        ExposureManager.commitSavedExposureEvents(forced = true)
+    }
+
+    @JvmStatic
+    fun getDownloadType(apkEntity: ApkEntity, method: String) : DownloadType {
+        return if ("更新" == method) {
+            if (PackageUtils.isSignature(HaloApp.getInstance().application, apkEntity.packageName)) {
+                DownloadType.PLUGIN_UPDATE
+            } else {
+                DownloadType.UPDATE
+            }
+        } else if ("插件化" == method) {
+            DownloadType.PLUGIN_DOWNLOAD
+        } else {
+            DownloadType.DOWNLOAD
+        }
+    }
+
+    @JvmStatic
+    fun getUpdateType(apkEntity: ApkEntity) : DownloadType {
+        return if (PackageUtils.isSignature(HaloApp.getInstance().application, apkEntity.packageName)) {
+            DownloadType.PLUGIN_UPDATE
+        } else {
+            DownloadType.UPDATE
+        }
     }
 
     enum class DownloadType {

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

@@ -1,7 +1,11 @@
 package com.gh.common.exposure
 
+/**
+ *  统计曝光的列表的 adapter 需要实现这个接口
+ */
 interface IExposable {
     fun getEventByPosition(pos: Int): ExposureEvent?
 
+    // 部分列表的 item 内嵌套了 recyclerview 这里获取这个 item 所携带的所有事件
     fun getEventListByPosition(pos: Int): List<ExposureEvent>?
 }

app/src/main/java/com/gh/common/exposure/aliyun/LGLOG.java

@@ -1,42 +0,0 @@
-package com.gh.common.exposure.aliyun;
-
-import com.aliyun.sls.android.sdk.model.Log;
-import com.gh.common.exposure.time.TimeUtil;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Extend to change __time__ field in mContent to use the correct time from TimeUtil
- */
-public class LGLOG extends Log {
-
-    private Map<String, Object> mContent = new HashMap<String, Object>();
-
-    public LGLOG() {
-        mContent.put("__time__", TimeUtil.INSTANCE.currentTime());
-    }
-
-    @Override
-    public void PutTime(int time) {
-        mContent.put("__time__", time);
-    }
-
-    @Override
-    public void PutContent(String key, String value) {
-        if (key == null || key.isEmpty()) {
-            return;
-        }
-        if (value == null) {
-            mContent.put(key, "");
-        } else {
-            mContent.put(key, value);
-        }
-    }
-
-    @Override
-    public Map<String, Object> GetContent() {
-        return mContent;
-    }
-
-}

app/src/main/java/com/gh/common/exposure/aliyun/LGLOGClient.java

@@ -1,67 +0,0 @@
-package com.gh.common.exposure.aliyun;
-
-import com.aliyun.sls.android.sdk.LOGClient;
-import com.aliyun.sls.android.sdk.LogException;
-import com.gh.common.exposure.time.TimeUtil;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-import java.util.Map;
-import java.util.TimeZone;
-
-/**
- * Extend to override GetHttpHeadersFrom, so we can change "Date" header attribute using
- * correct time from TimeUtil.
- * And accordingly, the value of "Authorization" attribute should also be re-calculate
- * since the sign became different as before.
- */
-public class LGLOGClient extends LOGClient {
-
-    private String mAccessKeyID;
-    private String mAccessKeySecret;
-    private String mAccessToken;
-
-    public LGLOGClient(String endPoint, String accessKeyID, String accessKeySecret, String projectName) {
-        super(endPoint, accessKeyID, accessKeySecret, projectName);
-        this.mAccessKeyID = accessKeyID;
-        this.mAccessKeySecret = accessKeySecret;
-        this.mAccessToken = "";
-    }
-
-    @Override
-    public Map<String, String> GetHttpHeadersFrom(String logStoreName, byte[] body, byte[] bodyZipped) throws LogException {
-
-        Map<String, String> headers = super.GetHttpHeadersFrom(logStoreName, body, bodyZipped);
-
-        SimpleDateFormat sdf = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.US);
-        sdf.setTimeZone(TimeZone.getTimeZone("GMT")); // 设置时区为GMT
-        String str = sdf.format(new Date(TimeUtil.INSTANCE.currentTimeMillis()));
-        headers.put("Date", str);
-
-        StringBuilder signStringBuf = new StringBuilder("POST" + "\n").
-                append(headers.get("Content-MD5") + "\n").
-                append(headers.get("Content-Type") + "\n").
-                append(headers.get("Date") + "\n");
-        String token = mAccessToken;
-        if (token != null && token != "") {
-            headers.put("x-acs-security-token", token);
-            signStringBuf.append("x-acs-security-token:" + headers.get("x-acs-security-token") + "\n");
-        }
-        signStringBuf.append("x-log-apiversion:0.6.0\n").
-                append("x-log-bodyrawsize:" + headers.get("x-log-bodyrawsize") + "\n").
-                append("x-log-compresstype:deflate\n").
-                append("x-log-signaturemethod:hmac-sha1\n").
-                append("/logstores/" + logStoreName + "/shards/lb");
-        String signString = signStringBuf.toString();
-        try {
-            String sign = hmac_sha1(signString, mAccessKeySecret);
-            headers.put("Authorization", "LOG " + mAccessKeyID + ":" + sign);
-        } catch (Exception e) {
-            throw new LogException("LogClientError", "fail to get encode signature", e, "");
-        }
-
-        return headers;
-    }
-
-
-}

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
@@ -15,9 +15,12 @@ data class Meta(
         val android_sdk: Int? = -1,
         val android_version: String? = "",
         val network: String? = "",
-        val ip: String? = "",
         val os: String? = "",
+        val gid: String? = "",
+        val oaid: String? = "",
         val channel: String? = "",
         val appVersion: String? = "",
-        val userId: String? = ""
+        val userId: String? = "",
+        val exposureVersion: String? = "",
+        val rom: String? = ""
 ) : Parcelable

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

@@ -12,23 +12,35 @@ import android.telephony.TelephonyManager
 import android.text.TextUtils
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.manager.UserManager
+import com.halo.assistant.HaloApp
 import com.leon.channel.helper.ChannelReaderUtil
+import com.walkud.rom.checker.RomIdentifier
 import java.io.File
 
 object MetaUtil {
 
-    private lateinit var application: Application
+    private val application: Application = HaloApp.getInstance().application
     private var channel = ""
 
     private var m: Meta? = null
 
-    fun init(application: Application) {
-        MetaUtil.application = application
-    }
-
     fun refreshMeta() {
-        m = Meta(getMac(), getIMEI(), getModel(), getManufacturer(), getAndroidId(), getAndroidSDK(),
-                getAndroidVersion(), getNetwork(), getIP(), getOS(), getChannel(), BuildConfig.VERSION_NAME, UserManager.getInstance().userId)
+        m = Meta(mac = getMac(),
+                imei = getIMEI(),
+                model = getModel(),
+                manufacturer = getManufacturer(),
+                android_id = getAndroidId(),
+                android_sdk = getAndroidSDK(),
+                android_version = getAndroidVersion(),
+                network = getNetwork(),
+                os = getOS(),
+                gid = HaloApp.getInstance().gid,
+                oaid = HaloApp.getInstance().oaid,
+                channel = getChannel(),
+                appVersion = BuildConfig.VERSION_NAME,
+                userId = UserManager.getInstance().userId,
+                exposureVersion = BuildConfig.EXPOSURE_VERSION,
+                rom = RomIdentifier.getRom().name + "" + RomIdentifier.getRom().versionName)
     }
 
     fun getMeta(): Meta {
@@ -51,7 +63,7 @@ object MetaUtil {
      */
     fun getMac(): String? {
 
-        var mac: String
+        var mac: String = ""
 
         //Plan A
         try {
@@ -71,7 +83,12 @@ object MetaUtil {
 
         // Plan C
         val wifiManager = application.getSystemService(Context.WIFI_SERVICE) as WifiManager
-        mac = wifiManager.connectionInfo.macAddress
+        try {
+            mac = wifiManager.connectionInfo.macAddress
+        } catch (e: Exception) {
+//            e.printStackTrace()
+        }
+
         return mac.trim()
 
     }
@@ -87,7 +104,7 @@ object MetaUtil {
         val telephonyManager = application.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
 
         if (Build.VERSION.SDK_INT >= 26) {
-            return "!" + telephonyManager.imei
+            return telephonyManager.imei
         }
 
         return telephonyManager.getDeviceId()
@@ -135,16 +152,16 @@ object MetaUtil {
                 val telephonyManager = application.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
                 if (telephonyManager.simState != TelephonyManager.SIM_STATE_READY) return "unknown"
                 when (telephonyManager.networkType) {
-                // Unknown
+                    // Unknown
                     TelephonyManager.NETWORK_TYPE_UNKNOWN -> "Cellular - Unknown"
-                // Cellular Data–2G
+                    // Cellular Data–2G
                     TelephonyManager.NETWORK_TYPE_EDGE, TelephonyManager.NETWORK_TYPE_GPRS, TelephonyManager.NETWORK_TYPE_CDMA,
                     TelephonyManager.NETWORK_TYPE_IDEN, TelephonyManager.NETWORK_TYPE_1xRTT -> "Cellular - 2G"
-                // Cellular Data–3G
+                    // Cellular Data–3G
                     TelephonyManager.NETWORK_TYPE_UMTS, TelephonyManager.NETWORK_TYPE_HSDPA, TelephonyManager.NETWORK_TYPE_HSPA,
                     TelephonyManager.NETWORK_TYPE_HSPAP, TelephonyManager.NETWORK_TYPE_HSUPA, TelephonyManager.NETWORK_TYPE_EVDO_0,
                     TelephonyManager.NETWORK_TYPE_EVDO_A, TelephonyManager.NETWORK_TYPE_EVDO_B -> "Cellular - 3G"
-                // Cellular Data–4G
+                    // Cellular Data–4G
                     TelephonyManager.NETWORK_TYPE_LTE -> "Cellular - 4G"
                     else -> "Cellular - Unknown Generation"
                 }
@@ -155,10 +172,6 @@ object MetaUtil {
 
     }
 
-    fun getIP(): String {
-        return "unknown"
-    }
-
     fun getOS(): String {
         return "android"
     }

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

@@ -1,8 +1,10 @@
 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 rx.schedulers.Schedulers
+import io.reactivex.schedulers.Schedulers
 import kotlin.concurrent.fixedRateTimer
 
 class Corrector {
@@ -17,11 +19,12 @@ class Corrector {
         fixedRateTimer("TimeUtil-Corrector-Checker", initialDelay = 0, period = TIME_CORRECTOR_ADJUST_PERIOD) {
             RetrofitManager.getInstance(HaloApp.getInstance().application).api.time
                     .subscribeOn(Schedulers.io())
-                    .subscribe({
-                        val serverTime = java.lang.Long.parseLong(it.string())
-                        delta = serverTime * 1000 - System.currentTimeMillis()
-                    }, Throwable::printStackTrace)
+                    .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

@@ -4,19 +4,20 @@ object TimeUtil {
 
     private lateinit var corrector: Corrector
 
+    fun init() {
+        corrector = Corrector()
+    }
+
     fun currentTimeMillis(): Long {
         return corrector.delta + System.currentTimeMillis()
     }
 
     fun currentTime(): Int {
-        return ( ( corrector.delta + System.currentTimeMillis() ) / 1000 ).toInt()
-    }
-
-    /**
-     * Must be called early then real use (for example in Application)
-     */
-    fun init() {
-        corrector = Corrector()
+        return if (::corrector.isInitialized) {
+            ((corrector.delta + System.currentTimeMillis()) / 1000).toInt()
+        } else {
+            (System.currentTimeMillis() / 1000).toInt()
+        }
     }
 
 }

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

@@ -0,0 +1,66 @@
+package com.gh.common.history
+
+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.*
+import com.halo.assistant.HaloApp
+
+@Database(entities = [AnswerEntity::class, ArticleEntity::class, NewsEntity::class, HistoryGameEntity::class, MyVideoEntity::class], version = 5, exportSchema = false)
+@TypeConverters(CountConverter::class,
+        CommunityConverter::class,
+        TimeConverter::class,
+        AnswerUserConverter::class,
+        ThumbnailConverter::class,
+        TagStyleListConverter::class,
+        StringArrayListConverter::class,
+        CommunityVideoConverter::class)
+
+abstract class HistoryDatabase : RoomDatabase() {
+
+    abstract fun answerDao(): AnswerHistoryDao
+    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 instance by lazy {
+            Room.databaseBuilder(HaloApp.getInstance().application, HistoryDatabase::class.java, "USER_TRACK_HISTORY_DATABASE")
+                    .addMigrations(MIGRATION_2_3)
+                    .addMigrations(MIGRATION_3_4)
+                    .addMigrations(MIGRATION_4_5)
+                    .build()
+        }
+    }
+
+}

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

@@ -0,0 +1,117 @@
+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.common.util.removeVideoContent
+import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.entity.HistoryGameEntity
+import com.gh.gamecenter.entity.NewsEntity
+import com.gh.gamecenter.qa.entity.AnswerDetailEntity
+import com.gh.gamecenter.qa.entity.AnswerEntity
+import com.gh.gamecenter.qa.entity.ArticleDetailEntity
+import com.gh.gamecenter.qa.entity.ArticleEntity
+
+object HistoryHelper {
+
+    fun insertAnswerEntity(answerDetailEntity: AnswerDetailEntity) {
+        val answerEntity = convertAnswerDetailToAnswer(answerDetailEntity)
+        runOnIoThread { HistoryDatabase.instance.answerDao().addAnswer(answerEntity) }
+    }
+
+    fun insertArticleEntity(articleDetailEntity: ArticleDetailEntity) {
+        val articleEntity = convertArticleDetailToArticle(articleDetailEntity)
+        runOnIoThread { HistoryDatabase.instance.articleDao().addArticle(articleEntity) }
+    }
+
+    fun insertGameEntity(gameEntity: GameEntity) {
+        val historyGameEntity = convertGameEntityToHistoryGameEntity(gameEntity)
+        runOnIoThread { HistoryDatabase.instance.gameDao().addGame(historyGameEntity) }
+    }
+
+    private fun convertGameEntityToHistoryGameEntity(gameEntity: GameEntity): HistoryGameEntity {
+        val historyGame = HistoryGameEntity()
+
+        historyGame.orderTag = System.currentTimeMillis()
+        historyGame.id = gameEntity.id
+        historyGame.brief = gameEntity.brief
+        historyGame.des = gameEntity.des
+        historyGame.icon = gameEntity.icon
+        historyGame.name = gameEntity.name
+        historyGame.tagStyle = gameEntity.tagStyle
+        historyGame.tag = gameEntity.getTag()
+        historyGame.isLibaoExist = gameEntity.isLibaoExists
+        return historyGame
+    }
+
+    @JvmStatic
+    fun insertNewsEntity(newsEntity: NewsEntity) {
+        newsEntity.orderTag = System.currentTimeMillis()
+        runOnIoThread { HistoryDatabase.instance.newsDao().addNews(newsEntity) }
+    }
+
+    @JvmStatic
+    fun deleteNewsEntity(newsId: String) {
+        runOnIoThread { HistoryDatabase.instance.newsDao().deleteNews(NewsEntity().apply { id = newsId }) }
+    }
+
+    @JvmStatic
+    fun deleteGameEntity(gameId: String) {
+        runOnIoThread { HistoryDatabase.instance.gameDao().deleteGame(HistoryGameEntity(id = gameId)) }
+    }
+
+    @JvmStatic
+    fun deleteArticleEntity(articleId: String) {
+        runOnIoThread { HistoryDatabase.instance.articleDao().deleteArticle(ArticleEntity(id = articleId)) }
+    }
+
+    @JvmStatic
+    fun deleteAnswerEntity(answerId: String) {
+        runOnIoThread { HistoryDatabase.instance.answerDao().deleteAnswer(AnswerEntity().apply { primaryKey = answerId }) }
+    }
+
+    @JvmStatic
+    fun emptyDatabase() {
+        runOnIoThread { HistoryDatabase.instance.clearAllTables() }
+    }
+
+    private fun convertArticleDetailToArticle(articleDetailEntity: ArticleDetailEntity): ArticleEntity {
+        val articleEntity = ArticleEntity()
+
+        articleEntity.id = articleDetailEntity.id
+        articleEntity.brief = articleDetailEntity.content.
+                removeVideoContent().
+                removeInsertedContent().
+                clearHtmlFormatCompletely().
+                replace(" +".toRegex()," ")
+        articleEntity.count = articleDetailEntity.count
+        articleEntity.community = articleDetailEntity.community
+        articleEntity.time = articleDetailEntity.time
+        articleEntity.title = articleDetailEntity.title
+        articleEntity.user = articleDetailEntity.user
+        articleEntity.orderTag = System.currentTimeMillis()
+
+        return articleEntity
+    }
+
+    private fun convertAnswerDetailToAnswer(answerDetailEntity: AnswerDetailEntity): AnswerEntity {
+        val answerEntity = AnswerEntity()
+
+        answerEntity.id = answerDetailEntity.id
+        answerEntity.primaryKey = answerDetailEntity.id
+        answerEntity.commentCount = answerDetailEntity.commentCount
+        answerEntity.questions = answerDetailEntity.question
+        answerEntity.vote = answerDetailEntity.vote
+        answerEntity.user = answerDetailEntity.user
+        answerEntity.orderTag = System.currentTimeMillis()
+        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

@@ -0,0 +1,67 @@
+package com.gh.common.im
+
+import android.app.Activity
+import androidx.core.view.ViewCompat
+import android.view.View
+import android.view.ViewGroup
+
+object ImHintHelper {
+
+    @JvmStatic
+    fun show(activity: Activity?) {
+        activity?.let {
+            var hintView = retrieveHintViewFromActivity(it)
+            if (hintView == null) {
+                hintView = ImHintView(it)
+                hintView.showDot(ImManager.shouldShowFloatingWindowDot)
+
+                val decorView = it.window.decorView as ViewGroup
+                it.runOnUiThread {
+                    decorView.addView(hintView)
+                }
+            } else {
+                hintView.showDot(ImManager.shouldShowFloatingWindowDot)
+            }
+        }
+    }
+
+    @JvmStatic
+    fun dismiss(activity: Activity?) {
+        activity?.let {
+            clearCurrent(it)
+        }
+    }
+
+    private fun retrieveHintViewFromActivity(activity: Activity?) : ImHintView? {
+        (activity?.window?.decorView as? ViewGroup)?.let {
+            for (i in 0..it.childCount) {
+                val childView = if (it.getChildAt(i) is ImHintView) it.getChildAt(i) as ImHintView else null
+                if (childView != null && childView.windowToken != null) {
+                    return childView
+                }
+            }
+            return null
+        }
+        return null
+    }
+
+    private fun clearCurrent(activity: Activity?) {
+        (activity?.window?.decorView as? ViewGroup)?.let {
+            for (i in 0..it.childCount) {
+                val childView = if (it.getChildAt(i) is ImHintView) it.getChildAt(i) as ImHintView else null
+                if (childView != null && childView.windowToken != null) {
+                    ViewCompat.animate(childView).alpha(0f).withEndAction(getRemoveViewRunnable(childView))
+                }
+            }
+        }
+    }
+
+    private fun getRemoveViewRunnable(childView: View?): Runnable {
+        return Runnable {
+            childView?.let {
+                (childView.parent as? ViewGroup)?.removeView(childView)
+            }
+        }
+    }
+
+}

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

@@ -0,0 +1,45 @@
+package com.gh.common.im
+
+import android.app.Activity
+import android.content.Context
+import android.util.AttributeSet
+import android.util.TypedValue
+import android.view.View
+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.*
+
+class ImHintView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0)
+    : RelativeLayout(context, attrs, defStyle) {
+
+    init {
+        inflate(context, R.layout.view_im_hint, this)
+
+        ViewCompat.setTranslationZ(this, Integer.MAX_VALUE.toFloat() - 1)
+
+        ivContainer.setOnClickListener {
+            if (context is Activity) {
+                ImManager.startChatActivity(context)
+                ImManager.removeNotification()
+            }
+        }
+
+        val lp = ivContainer.layoutParams as RelativeLayout.LayoutParams
+
+        lp.setMargins(0, 0, dp2px(30f), dp2px(106f) + DisplayUtils.retrieveNavigationHeight(context))
+    }
+
+    fun showDot(show: Boolean) {
+        if (show) {
+            unreadDot.visibility = View.VISIBLE
+        } else {
+            unreadDot.visibility = View.GONE
+        }
+    }
+
+    private fun dp2px(dp: Float): Int {
+        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, context.applicationContext.resources.displayMetrics).toInt()
+    }
+}

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

@@ -0,0 +1,161 @@
+package com.gh.common.im
+
+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.manager.UserManager
+import com.halo.assistant.HaloApp
+import com.m7.imkfsdk.KfStartHelper
+import com.m7.imkfsdk.utils.Utils
+import com.moor.imkf.ChatListener
+import com.moor.imkf.IMChat
+import com.moor.imkf.IMChatManager
+import com.moor.imkf.IMMessage
+import com.moor.imkf.utils.MoorUtils
+
+object ImManager {
+
+    const val IM_KEY = "893be270-9c75-11e8-a344-212975ba32b9"
+    const val SP_FLOATING_WINDOW_KEY = "IM_FLOATING_WINDOW"
+    const val SP_FLOATING_WINDOW_DOT_KEY = "IM_FLOATING_WINDOW_DOT"
+
+    var shouldShowFloatingWindow = false
+    var shouldShowFloatingWindowDot = false
+
+    // 记录当前用户 ID 避免重复初始化
+    var currentUserId = ""
+
+    @JvmStatic
+    fun attachIm() {
+        try {
+            if (UserManager.getInstance().userInfoEntity != null &&
+                    currentUserId != UserManager.getInstance().userId) {
+                currentUserId = UserManager.getInstance().userId
+                MoorUtils.init(HaloApp.getInstance().application)
+                Utils.init(HaloApp.getInstance().application)
+                IMChatManager.getInstance().init(
+                        HaloApp.getInstance().application,
+                        ImReceiver.UNIQUE_BROADCAST_ACTION,
+                        IM_KEY,
+                        UserManager.getInstance().userInfoEntity.name + "(" + UserManager.getInstance().userId + ")",
+                        UserManager.getInstance().userId)
+
+                shouldShowFloatingWindow = SPUtils.getBoolean(SP_FLOATING_WINDOW_KEY + UserManager.getInstance().userId)
+                shouldShowFloatingWindowDot = SPUtils.getBoolean(SP_FLOATING_WINDOW_DOT_KEY + UserManager.getInstance().userId)
+                updateFloatingWindow()
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    @JvmStatic
+    fun detachIm() {
+        try {
+            IMChatManager.getInstance().quitSDk()
+            shouldShowFloatingWindow = false
+            updateFloatingWindow()
+            removeNotification()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    @JvmStatic
+    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, inputContent, requestCode)
+                chatHelper.initSdkChat(
+                        ImReceiver.UNIQUE_BROADCAST_ACTION,
+                        IM_KEY,
+                        UserManager.getInstance().userInfoEntity.name + "(" + UserManager.getInstance().userId + ")"
+                                + "[" + BuildConfig.VERSION_NAME + "]",
+                        UserManager.getInstance().userId)
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+    }
+
+    @JvmStatic
+    fun showFloatingWindow() {
+        updateShouldShowFloatingWindow(true)
+        updateShouldShowFloatingWindowDot(true)
+        updateFloatingWindow()
+    }
+
+    @JvmStatic
+    fun dismissFloatingWindow() {
+        updateShouldShowFloatingWindow(false)
+        updateShouldShowFloatingWindowDot(false)
+        updateFloatingWindow()
+    }
+
+    @JvmStatic
+    fun removeNotification() {
+        val notificationManager = HaloApp.getInstance().application?.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        notificationManager.cancel(ImReceiver.NOTIFICATION_ID)
+    }
+
+    @JvmStatic
+    fun updateFloatingWindow() {
+        try {
+            CurrentActivityHolder.getCurrentActivity()?.let {
+                if (isActivityValid(it)) {
+                    if (shouldShowFloatingWindow) {
+                        ImHintHelper.show(it)
+                    } else {
+                        ImHintHelper.dismiss(it)
+                        removeNotification()
+                    }
+                }
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    @JvmStatic
+    fun sendFeedbackMessage(message: String) {
+        val fromToMessage = IMMessage.createTxtMessage(message)
+        runOnIoThread {
+            tryWithDefaultCatch {
+                IMChat.getInstance().sendMessage(fromToMessage, object : ChatListener {
+                    override fun onProgress(p0: Int) {}
+                    override fun onSuccess() {}
+                    override fun onFailed() {}
+                })
+            }
+        }
+    }
+
+    fun updateShouldShowFloatingWindow(show: Boolean) {
+        SPUtils.setBoolean(SP_FLOATING_WINDOW_KEY + UserManager.getInstance().userId, show)
+        shouldShowFloatingWindow = show
+    }
+
+    fun updateShouldShowFloatingWindowDot(show: Boolean) {
+        SPUtils.setBoolean(SP_FLOATING_WINDOW_DOT_KEY + UserManager.getInstance().userId, show)
+        shouldShowFloatingWindowDot = show
+    }
+
+    private fun isActivityValid(activity: Activity): Boolean {
+        return when (activity) {
+            is MainActivity -> true
+            is HelpAndFeedbackActivity -> true
+            is MessageActivity -> true
+            else -> false
+        }
+    }
+}

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

@@ -0,0 +1,76 @@
+package com.gh.common.im
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import com.gh.base.CurrentActivityHolder
+import com.gh.gamecenter.R
+import com.m7.imkfsdk.chat.ChatActivity
+import com.m7.imkfsdk.utils.Utils
+import com.moor.imkf.IMChatManager
+
+class ImReceiver : BroadcastReceiver() {
+
+    companion object {
+        const val UNIQUE_BROADCAST_ACTION = "com.gh.im"
+        const val NOTIFICATION_ID: Int = 987321
+    }
+
+    var notificationManager: NotificationManager? = null
+
+    override fun onReceive(context: Context?, intent: Intent?) {
+        intent?.let {
+            if (intent.action == IMChatManager.NEW_MSG_ACTION) {
+                notificationManager = context?.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+                // 判断 ImActivity 是否在最顶端
+                if (CurrentActivityHolder.getCurrentActivity() is ChatActivity) {
+                    ImManager.showFloatingWindow()
+                    ImManager.updateShouldShowFloatingWindowDot(false)
+                } else {
+                    val contentIntent = Intent(Utils.getApp(), ChatActivity::class.java)
+
+                    contentIntent.putExtra("PeerId", "")
+                    contentIntent.putExtra("type", "peedId")
+
+                    contentIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                    val resultPendingIntent = PendingIntent.getActivity(
+                            Utils.getApp(),
+                            0,
+                            contentIntent,
+                            PendingIntent.FLAG_UPDATE_CURRENT
+                    )
+
+                    // 新的通知
+                    val builder = NotificationCompat.Builder(Utils.getApp(), "Halo_IM")
+                    val notification = builder.setTicker("您有新的消息")
+                            .setDefaults(Notification.DEFAULT_ALL)
+                            .setSmallIcon(R.drawable.ic_notification)
+                            .setWhen(System.currentTimeMillis())
+                            .setContentIntent(resultPendingIntent)
+                            .setContentTitle("光环助手客服回复")
+                            .setContentText("您有新的消息")
+                            .setAutoCancel(true)
+                            .build()
+
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                        val channel = NotificationChannel("Halo_IM", "Halo_IM", NotificationManager.IMPORTANCE_DEFAULT)
+                        notificationManager?.createNotificationChannel(channel)
+                    }
+
+                    if (notification != null) {
+                        notificationManager?.notify(NOTIFICATION_ID, notification)
+                        ImManager.showFloatingWindow()
+                    }
+                }
+            } else if (intent.action == IMChatManager.FINISH_ACTION) {
+                ImManager.dismissFloatingWindow()
+            }
+        }
+    }
+}