3.7.1-game tinker base

升级fresco库
对DiffUtilAdapter DiffUtil 进行 try catch 处理

.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

@@ -30,4 +30,60 @@
   - 删除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修改

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
@@ -38,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资源，其他删掉
@@ -69,6 +62,11 @@ android {
         buildConfigField "String", "MTA_APPKEY", "\"${MTA_APPKEY}\""
         buildConfigField "String", "TD_APPID", "\"${TD_APPID}\""
 
+        /**
+         * Build Time 供区分 jenkins 打包时间用
+         */
+        buildConfigField "long", "BUILD_TIME", "0"
+
     }
 
     // gradle 2.2以上默认同时启用v1和v2（优先用于Android N）
@@ -91,7 +89,9 @@ android {
             signingConfig signingConfigs.debug
 
             buildConfigField "String", "EXPOSURE_REPO", "\"test\""
-            buildConfigField "String", "EXPOSURE_VERSION", "\"E2\""
+            buildConfigField "String", "EXPOSURE_VERSION", "\"E3\""
+
+            multiDexKeepProguard file("tinker_multidexkeep.pro")
         }
         release {
             debuggable false
@@ -101,7 +101,9 @@ android {
             signingConfig signingConfigs.release
 
             buildConfigField "String", "EXPOSURE_REPO", "\"exposure\""
-            buildConfigField "String", "EXPOSURE_VERSION", "\"E2\""
+            buildConfigField "String", "EXPOSURE_VERSION", "\"E3\""
+
+            multiDexKeepProguard file("tinker_multidexkeep.pro")
         }
     }
 
@@ -115,10 +117,7 @@ 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", "UMENG_APPKEY", "\"${UMENG_APPKEY}\""
@@ -129,7 +128,6 @@ android {
             buildConfigField "String", "MEIZUPUSH_APPKEY", "\"${MEIZUPUSH_APPKEY}\""
 
             buildConfigField "String", "BUGLY_APPID", "\"${BUGLY_APPID}\""
-
         }
         // internal test dev host
         internal {
@@ -137,10 +135,7 @@ android {
             versionNameSuffix "-debug"
 
             buildConfigField "String", "API_HOST", "\"${DEV_API_HOST}\""
-            buildConfigField "String", "USER_HOST", "\"${DEV_USER_HOST}\""
             buildConfigField "String", "COMMENT_HOST", "\"${DEV_COMMENT_HOST}\""
-            buildConfigField "String", "LIBAO_HOST", "\"${DEV_LIBAO_HOST}\""
-            buildConfigField "String", "MESSAGE_HOST", "\"${DEV_MESSAGE_HOST}\""
             buildConfigField "String", "DATA_HOST", "\"${DEV_DATA_HOST}\""
 
             buildConfigField "String", "UMENG_APPKEY", "\"${DEBUG_UMENG_APPKEY}\""
@@ -153,11 +148,6 @@ android {
             buildConfigField "String", "BUGLY_APPID", "\"${DEBUG_BUGLY_APPID}\""
         }
     }
-
-//    productFlavors.all { flavor ->
-//        flavor.manifestPlaceholders = [CHANNEL_VALUE: name]//命令 gradlew assembleRelease
-//    }
-
 }
 
 // apkChannelPackage
@@ -194,14 +184,25 @@ dependencies {
     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.facebook.fresco:fresco:${fresco}"
@@ -233,27 +234,17 @@ dependencies {
     implementation "com.google.zxing:android-core:${zxing}"
 
     implementation "com.daimajia.swipelayout:library:${swipeLayout}"
-    implementation("cn.trinea.android.view.autoscrollviewpager:android-auto-scroll-view-pager:${autoScrollViewPager}") {
-        exclude module: 'support-v4'
-    }
 
     implementation "com.sina.weibo.sdk:core:${weiboSDK}"
 
     // bugly with tinker support
     implementation "com.tencent.bugly:crashreport_upgrade:${buglyTinkerSupport}"
 
-    implementation "pub.devrel:easypermissions:${easypermissions}"
-    // mvvm
-    implementation "android.arch.lifecycle:runtime:${archLifecycleVersion}"
-    kapt "android.arch.lifecycle:compiler:${archLifecycleVersion}"
-    implementation "android.arch.lifecycle:extensions:${archLifecycleVersion}"
-    implementation "android.arch.persistence.room:runtime:${archRoomVersion}"
-    kapt "android.arch.persistence.room:compiler:${archRoomVersion}"
+    implementation '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.1.3'
 
     implementation 'com.contrarywind:Android-PickerView:4.1.3'
 
@@ -265,24 +256,42 @@ dependencies {
 
     implementation "top.zibin:Luban:${luban}"
 
+    implementation "com.squareup.picasso:picasso:${picasso}"
+
     // for video streaming
-    implementation "cn.jzvd:jiaozivideoplayer:${jiaoziVideoView}"
-    implementation "com.danikula:videocache:${videoCache}"
+    implementation "com.shuyu:gsyVideoPlayer-java:$gsyVideo"
+    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.aliyun.dpa:oss-android-sdk:2.9.2'
+
+    implementation "com.airbnb.android:lottie:$lottie"
 
-    implementation project(':libraries:gid')
     implementation project(':libraries:LGLibrary')
     implementation project(':libraries:MTA')
     implementation project(':libraries:QQShare')
     implementation project(':libraries:TalkingData')
     implementation project(':libraries:UmengPush')
-    implementation project(':libraries:WechatShare')
+//    implementation project(':libraries:WechatShare')
     implementation project(':libraries:LogHub')
     implementation project(':libraries:im')
+    implementation project(':libraries:Matisse')
 }
 File propFile = file('sign.properties')
 if (propFile.exists()) {

app/proguard-rules.txt

@@ -194,9 +194,9 @@
 
 -ignorewarnings
 
--keep @android.support.annotation.Keep class *
+-keep @androidx.annotation.Keep class *
 -keepclassmembers class ** {
-  @android.support.annotation.Keep *;
+    @androidx.annotation.Keep *;
 }
 
 -keep class com.gh.loghub.** { *; }
@@ -222,4 +222,22 @@
 
 ### 广点通
 -dontwarn com.qq.gdt.action.**
--keep class com.qq.gdt.action.** {*;}
+-keep class com.qq.gdt.action.** {*;}
+
+### AndroidX
+-keep class androidx.core.app.CoreComponentFactory { *; }
+
+#阿里云上传
+-keep class com.alibaba.sdk.android.oss.** { *; }
+-dontwarn okio.**
+-dontwarn org.apache.commons.codec.binary.**
+
+#视频相关
+-keep class com.shuyu.gsyvideoplayer.video.** { *; }
+-dontwarn com.shuyu.gsyvideoplayer.video.**
+-keep class com.shuyu.gsyvideoplayer.video.base.** { *; }
+-dontwarn com.shuyu.gsyvideoplayer.video.base.**
+-keep class com.shuyu.gsyvideoplayer.utils.** { *; }
+-dontwarn com.shuyu.gsyvideoplayer.utils.**
+-keep class tv.danmaku.ijk.** { *; }
+-dontwarn tv.danmaku.ijk.**

app/src/main/AndroidManifest.xml

@@ -1,472 +1,559 @@
 <?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" />
 
     <!-- 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.REQUEST_INSTALL_PACKAGES" />
+    <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,
+        shuyu.com.androidvideocache" />
+
+    <!-- 去掉 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: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:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppCompatTheme.APP"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
 
         <activity
-            android:name = "com.gh.gamecenter.DownloadManagerActivity"
-            android:launchMode = "singleTask"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.DownloadManagerActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
 
         <!--android:theme = "@android:style/Theme.Black.NoTitleBar.Fullscreen"  退出时屏幕抖动 -->
-        <activity android:name = "com.gh.gamecenter.ViewImageActivity" />
-        <activity
-            android:name = "com.gh.gamecenter.SearchActivity"
-            android:configChanges = "keyboardHidden"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.NewsDetailActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.SettingActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.ConcernActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.subject.SubjectActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.NewsSearchActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateHidden" />
-        <activity
-            android:name = "com.gh.gamecenter.GameNewsActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.CropImageActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.WebActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.ShareCardPicActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.ShareCardActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.MessageDetailActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.LibaoActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateHidden" />
-        <activity
-            android:name = "com.gh.gamecenter.LibaoDetailActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.ShareGhWfifActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.ShareGhActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.CleanApkActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.KcSelectGameActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.ChooseReceiverActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.ReceiverWaitingActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.FileSenderActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.FileReceiverActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.SelectUserIconActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.AboutActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.CommentDetailActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.GameDetailActivity"
-            android:configChanges = "orientation|screenSize|keyboardHidden"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.SuggestSelectActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.SuggestionActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.VoteActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateAlwaysHidden|adjustResize" />
-        <activity
-            android:name = "com.gh.gamecenter.ToolBoxActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateHidden" />
+        <activity android:name="com.gh.gamecenter.ViewImageActivity" />
 
         <activity
-            android:name = "com.gh.gamecenter.WeiBoShareActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateHidden" />
+            android:name="com.gh.gamecenter.SearchActivity"
+            android:configChanges="keyboardHidden"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppCompatTheme.APP" />
 
         <activity
-            android:name = "com.gh.gamecenter.InstallActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.amway.search.AmwaySearchActivity"
+            android:configChanges="keyboardHidden"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppCompatTheme.APP" />
 
         <activity
-            android:name = ".category.CategoryDirectoryActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.ShellActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = ".category.CategoryListActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.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.SuggestSelectActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.column.order.AskTabOrderActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.SuggestionActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="com.gh.gamecenter.VoteActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.questions.edit.QuestionEditActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.ToolBoxActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name = "com.gh.gamecenter.kaifu.add.AddKaiFuActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateHidden" />
+            android:name="com.gh.gamecenter.WeiBoShareActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name = "com.gh.gamecenter.kaifu.patch.PatchKaifuActivity"
-            android:screenOrientation = "portrait" />
+            android:name=".category.CategoryDirectoryActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.BlockActivity"
-            android:screenOrientation = "portrait" />
+            android:name=".category.CategoryListActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.column.detail.AskColumnDetailActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.LoginActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name = "com.gh.gamecenter.NetworkDiagnosisActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.UserInfoActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.personalhome.fans.FansActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.UserRegionActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.personalhome.followers.FollowersActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.CollectionActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.PersonalHomeActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.MessageActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.personalhome.answer.PersonalAnswerActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.UserInfoEditActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name = "com.gh.gamecenter.personalhome.question.PersonalQuestionActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.qa.search.AskSearchActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.article.edit.ArticleEditActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.article.MyArticleActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.qa.questions.detail.QuestionsDetailActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.article.draft.ArticleDraftActivity"
-            android:screenOrientation = "portrait" />
+            android:name=".qa.answer.fold.AnswerFoldActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.article.detail.ArticleDetailActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.qa.answer.edit.AnswerEditActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.draft.CommunityDraftWrapperActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.ConcernInfoActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.gamedetail.rating.edit.RatingEditActivity"
-            android:windowSoftInputMode = "stateVisible"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.InfoActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.questions.edit.manager.HistoryDetailActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.MessageKeFuActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.questions.edit.manager.HistoryActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.qa.select.CommunitiesSelectActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.comment.CommentActivity"
-            android:screenOrientation = "portrait"
-            android:theme = "@style/Theme.Transparent"
-            android:windowSoftInputMode = "adjustNothing" />
+            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.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:screenOrientation="portrait"
+            android:theme="@style/TransparentStatusBarAndNavigationBar" />
 
         <!-- 使用小米/华为推送弹窗功能提高推送成功率-->
         <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="${applicationId}.wxapi.WXEntryActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"></activity>
 
         <provider
-            android:name = "android.support.v4.content.FileProvider"
-            android:authorities = "${applicationId}"
-            android:exported = "false"
-            android:grantUriPermissions = "true" >
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}"
+            android:exported="false"
+            android:grantUriPermissions="true">
             <meta-data
-                android:name = "android.support.FILE_PROVIDER_PATHS"
-                android:resource = "@xml/provider_paths" />
-        </provider >
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths" />
+        </provider>
 
         <receiver
-            android:name = "com.gh.gamecenter.receiver.DownloadReceiver"
-            android:exported = "false" >
-            <intent-filter >
-                <action android:name = "com.gh.gamecenter.DOWNLOAD" />
-            </intent-filter >
-        </receiver >
+            android:name="com.gh.gamecenter.receiver.DownloadReceiver"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.gh.gamecenter.DOWNLOAD" />
+            </intent-filter>
+        </receiver>
         <receiver
-            android:name = "com.gh.gamecenter.receiver.InstallReceiver"
-            android:exported = "false" >
-            <intent-filter >
-                <action android:name = "com.gh.gamecenter.INSTALL" />
-            </intent-filter >
-        </receiver >
+            android:name="com.gh.gamecenter.receiver.InstallReceiver"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.gh.gamecenter.INSTALL" />
+            </intent-filter>
+        </receiver>
 
         <receiver
-            android:name = "com.gh.gamecenter.receiver.ActivitySkipReceiver"
-            android:exported = "true" >
-            <intent-filter >
-                <action android:name = "com.gh.gamecenter.ACTIVITYSKIP" />
-            </intent-filter >
-        </receiver >
+            android:name="com.gh.gamecenter.receiver.ActivitySkipReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.gh.gamecenter.ACTIVITYSKIP" />
+            </intent-filter>
+        </receiver>
 
-        <receiver android:name = "com.gh.gamecenter.receiver.UmengMessageReceiver" >
-            <intent-filter >
-                <action android:name = "com.gh.gamecenter.UMENG" />
-            </intent-filter >
-        </receiver >
+        <receiver android:name="com.gh.gamecenter.receiver.UmengMessageReceiver">
+            <intent-filter>
+                <action android:name="com.gh.gamecenter.UMENG" />
+            </intent-filter>
+        </receiver>
 
         <!--魅族push应用定义消息receiver声明 -->
-        <receiver android:name = "com.gh.gamecenter.receiver.MeizuPushReceiver" >
-            <intent-filter >
+        <receiver android:name="com.gh.gamecenter.receiver.MeizuPushReceiver">
+            <intent-filter>
                 <!-- 接收push消息 -->
-                <action android:name = "com.meizu.flyme.push.intent.MESSAGE" />
+                <action android:name="com.meizu.flyme.push.intent.MESSAGE" />
                 <!-- 接收register消息 -->
-                <action android:name = "com.meizu.flyme.push.intent.REGISTER.FEEDBACK" />
+                <action android:name="com.meizu.flyme.push.intent.REGISTER.FEEDBACK" />
                 <!-- 接收unregister消息-->
-                <action android:name = "com.meizu.flyme.push.intent.UNREGISTER.FEEDBACK" />
+                <action android:name="com.meizu.flyme.push.intent.UNREGISTER.FEEDBACK" />
                 <!-- 兼容低版本Flyme3推送服务配置 -->
-                <action android:name = "com.meizu.c2dm.intent.REGISTRATION" />
-                <action android:name = "com.meizu.c2dm.intent.RECEIVE" />
+                <action android:name="com.meizu.c2dm.intent.REGISTRATION" />
+                <action android:name="com.meizu.c2dm.intent.RECEIVE" />
 
-                <category android:name = "${applicationId}" />
-            </intent-filter >
-        </receiver >
+                <category android:name="${applicationId}" />
+            </intent-filter>
+        </receiver>
 
         <receiver
-            android:name = "com.gh.common.im.ImReceiver"
-            android:enabled = "true" >
-            <intent-filter android:priority = "2147483647" >
-                <action android:name = "com.gh.im" />
-                <action android:name = "action_finish" />
-            </intent-filter >
-        </receiver >
+            android:name="com.gh.common.im.ImReceiver"
+            android:enabled="true">
+            <intent-filter android:priority="2147483647">
+                <action android:name="com.gh.im" />
+                <action android:name="action_finish" />
+            </intent-filter>
+        </receiver>
 
-        <service android:name = "com.gh.base.GHUmengNotificationService" />
+        <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,28 +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>');
-        if("" != text) {
-          document.execCommand("insertHTML", false, text);
-        } else {
-          window.onPasteListener.onPaste();
-        }
-    });
-
-    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,16 +1,18 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta name="viewport" content="user-scalable=no">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <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 src="https://cdnjs.cloudflare.com/ajax/libs/vanilla-lazyload/10.15.0/lazyload.min.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/rich_editor.js

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+// alert("")
+
 var RE = {};
 
 RE.currentSelection = {
@@ -22,6 +24,32 @@ 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(); });
@@ -94,16 +122,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 +186,7 @@ RE.setFontSize = function(fontSize){
 
 RE.setHeading = function(heading) {
     document.execCommand('formatBlock', false, '<h'+heading+'>');
+    RE.sendElementNameToNative()
 }
 
 RE.setIndent = function() {
@@ -190,6 +211,9 @@ 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) {
@@ -197,19 +221,17 @@ RE.insertImage = function(url) {
     RE.insertHTML(html);
 }
 
-//RE.lazyLoad = function() {
-//   var myLazyLoad = new LazyLoad({
-//    elements_selector: ".lazy"
-//   })
-//}
-
 // 替换成缩略图
 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];
+         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
@@ -220,7 +242,7 @@ RE.replaceTbImage = function(imgRuleFlag, gifRuleFlag) {
          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:15px 0 0 0; height: auto;"
@@ -236,6 +258,7 @@ RE.replaceTbImage = function(imgRuleFlag, gifRuleFlag) {
              }
 
          }
+         index ++;
     }
 }
 
@@ -244,6 +267,8 @@ 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--;
@@ -268,6 +293,8 @@ RE.hideShowBigPic = function() {
     var j = 0;
     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(",thumbnail") > 0 && img.src.indexOf(".gif") == -1) {
             j++;
          }
@@ -277,6 +304,8 @@ RE.hideShowBigPic = 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;
            if(img.src.indexOf("web_load_dfimg_icon") > 0) {
              img.parentNode.removeChild(img.parentNode.childNodes[0]);
              break;
@@ -289,6 +318,8 @@ RE.replaceDfImageByUrl = function(imgUrl, 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(imgUrl) != -1) {
              img.style.cssText = "max-width: 100%; display:block; margin:8px auto; height: auto;"
              if(img.src.indexOf(".gif") > 0) {
@@ -305,6 +336,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);
@@ -357,12 +390,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) {
@@ -432,12 +469,145 @@ 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);
+        }
+    }
+}

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,26 +1,32 @@
 package com.gh.base;
 
-import android.app.Activity;
-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 androidx.annotation.NonNull;
+import androidx.lifecycle.Lifecycle;
+
+import com.gh.common.constant.Constants;
 import com.gh.common.util.DataUtils;
 import com.gh.common.util.DialogUtils;
 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.common.util.TeaHelper;
+import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.LoginActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.SuggestionActivity;
 import com.gh.gamecenter.eventbus.EBShowDialog;
 import com.gh.gamecenter.suggest.SuggestType;
+import com.lightgame.BaseAppCompatActivity;
 import com.lightgame.download.FileUtils;
 import com.lightgame.utils.Utils;
 import com.tencent.tauth.Tencent;
@@ -28,12 +34,9 @@ import com.tencent.tauth.Tencent;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.lang.ref.WeakReference;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.List;
 
 import butterknife.ButterKnife;
@@ -41,16 +44,29 @@ 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 DOWNLOAD_NOT_FOUND = "notfound";
+    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,28 +95,19 @@ public abstract class BaseActivity extends BaseToolBarActivity implements EasyPe
         }
     }
 
-    // 小米沉浸式黑色字体
-    public void setStatusBarDarkMode(boolean darkmode, Activity activity) {
-        Class<? extends Window> clazz = activity.getWindow().getClass();
-        try {
-            int darkModeFlag = 0;
-            Class<?> layoutParams = Class.forName("android.view.MiuiWindowManager$LayoutParams");
-            Field field = layoutParams.getField("EXTRA_FLAG_STATUS_BAR_DARK_MODE");
-            darkModeFlag = field.getInt(layoutParams);
-            Method extraFlagField = clazz.getMethod("setExtraFlags", int.class, int.class);
-            extraFlagField.invoke(activity.getWindow(), darkmode ? darkModeFlag : 0, darkModeFlag);
-        } catch (Exception ignore) {
-
-        }
-    }
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setStatusBarDarkMode(true, this);
         EventBus.getDefault().register(this);
         ButterKnife.bind(this);
         mEntrance = getIntent().getStringExtra(KEY_ENTRANCE);
+        if (TextUtils.isEmpty(mEntrance)) {
+            mEntrance = Constants.ENTRANCE_UNKNOWN;
+        }
+
+        if (BuildConfig.DEBUG) {
+            Utils.log("ACTIVITY_ENTRANCE -> " + mEntrance);
+        }
     }
 
     @Override
@@ -110,26 +117,26 @@ 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);
         } else {
@@ -139,64 +146,62 @@ public abstract class BaseActivity extends BaseToolBarActivity implements EasyPe
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(final EBShowDialog showDialog) {
-        if (!mIsPause && this.getClass().getName().equals(RunningUtils.getTopActivity(this))) {
-            if ("hijack".equals(showDialog.getType())) {
+        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)
+                && this.getClass().getName().equals(RunningUtils.getTopActivity(this))) {
+            if (DOWNLOAD_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()));
-                        }
+            } else if (PLUGGABLE.equals(showDialog.getType())) {
+                DialogUtils.showPluginDialog(this, () -> {
+                    if (FileUtils.isEmptyFile(showDialog.getPath())) {
+                        toast(R.string.install_failure_hint);
+                    } else {
+                        startActivity(PackageUtils.getUninstallIntent(BaseActivity.this, showDialog.getPath()));
                     }
                 });
-            } else if ("loginException".equals(showDialog.getType())) {
+            } else if (LOGIN_EXCEPTION.equals(showDialog.getType())) {
                 if (mIsExistLogoutDialog) return;
                 mIsExistLogoutDialog = true;
                 try {
                     JSONObject object = new JSONObject(showDialog.getPath());
                     JSONObject device = object.getJSONObject("device");
-                    String manufacturer = device.getString("manufacturer");
                     String model = device.getString("model");
                     DialogUtils.showAlertDialog(this, "你的账号已在另外一台设备登录"
-                            , StringUtils.buildString("（", manufacturer, " - ", model, "）")
+                            , StringUtils.buildString("（", model, "）")
                             , "知道了", "重新登录"
                             , null
                             , () -> startActivity(LoginActivity.getIntent(BaseActivity.this,
                                     "你的账号已在另外一台设备登录多设备-重新登录"))
                     );
                     mBaseHandler.postDelayed(() -> mIsExistLogoutDialog = false, 5000);
-                } catch (JSONException e) {
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
-            } else if ("notfound".equals(showDialog.getType())) {
+            } else if (DOWNLOAD_NOT_FOUND.equals(showDialog.getType())) {
                 DialogUtils.showAlertDialog(this, "下载失败", "下载链接已失效，建议提交反馈"
                         , "立即反馈", "取消"
-                        , () -> {
-                            SuggestionActivity.startSuggestionActivity(this, SuggestType.gameQuestion,
-                                    null, showDialog.getPath() + "，问题反馈：下载链接失效");
-                        }, null);
+                        , () -> SuggestionActivity.startSuggestionActivity(this,
+                                SuggestType.gameQuestion, null,
+                                (showDialog.getPath() + "，问题反馈：下载链接失效")), null);
             }
         }
     }
 
     @Override
     protected void onPause() {
+        TeaHelper.onPause(this);
         super.onPause();
-        mIsPause = true;
     }
 
     @Override
     protected void onResume() {
+        TeaHelper.onResume(this);
         super.onResume();
-        mIsPause = false;
     }
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+    public void onRequestPermissionsResult(int requestCode,
+                                           @NonNull String[] permissions,
+                                           @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
     }
@@ -211,7 +216,27 @@ public abstract class BaseActivity extends BaseToolBarActivity implements EasyPe
 
     }
 
+    protected void setStatusBarColor(int color) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window window = getWindow();
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+            window.setStatusBarColor(color);
+        }
+    }
 
+    /**
+     * 提供当前 activity 的中文名 (不重载的话为类名)
+     */
+    public String getActivityNameInChinese() {
+        return getClass().getSimpleName();
+    }
+
+    /**
+     * @param entrance 上一个页面的链式入口名称
+     * @param path     当前页面名称
+     * @return 完整的链式入口名称
+     */
     public static String mergeEntranceAndPath(String entrance, String path) {
         if (TextUtils.isEmpty(entrance) && TextUtils.isEmpty(path)) return "";
         if (TextUtils.isEmpty(entrance) && !TextUtils.isEmpty(path)) {
@@ -222,4 +247,5 @@ public abstract class BaseActivity extends BaseToolBarActivity implements EasyPe
         }
         return StringUtils.buildString(entrance, "+(", path, ")");
     }
+
 }

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

@@ -2,15 +2,16 @@ package com.gh.base;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+
 import com.gh.base.adapter.FragmentAdapter;
 import com.gh.common.view.TabIndicatorView;
 import com.gh.gamecenter.R;
+import com.google.android.material.tabs.TabLayout;
 import com.lightgame.view.NoScrollableViewPager;
 
 import java.util.ArrayList;
@@ -22,7 +23,7 @@ import butterknife.BindView;
  * Created by khy on 15/03/18.
  */
 
-public abstract class BaseActivity_TabLayout extends BaseActivity implements ViewPager.OnPageChangeListener {
+public abstract class BaseActivity_TabLayout extends ToolBarActivity implements ViewPager.OnPageChangeListener {
 
     public static final String PAGE_INDEX = "PAGE_INDEX";
 

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,249 @@
+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.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)
+            }
+            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()
+            }
+            R.id.editor_font_italic -> {
+                mEditorFontItalic.isChecked = !mEditorFontItalic.isChecked
+                mRichEditor.setItalic()
+            }
+            R.id.editor_font_strikethrough -> {
+                mEditorFontStrikeThrough.isChecked = !mEditorFontStrikeThrough.isChecked
+                mRichEditor.setStrikeThrough()
+            }
+            R.id.editor_paragraph_h1 -> {
+                if (mEditorParagraphH1.isChecked) {
+                    mRichEditor.formatBlock()
+                } else {
+                    mRichEditor.setHeading(1)
+                }
+                mEditorParagraphH1.isChecked = !mEditorParagraphH1.isChecked
+            }
+            R.id.editor_paragraph_h2 -> {
+                if (mEditorParagraphH2.isChecked) {
+                    mRichEditor.formatBlock()
+                } else {
+                    mRichEditor.setHeading(2)
+                }
+                mEditorParagraphH2.isChecked = !mEditorParagraphH2.isChecked
+            }
+            R.id.editor_paragraph_h3 -> {
+                if (mEditorParagraphH3.isChecked) {
+                    mRichEditor.formatBlock()
+                } else {
+                    mRichEditor.setHeading(3)
+                }
+                mEditorParagraphH3.isChecked = !mEditorParagraphH3.isChecked
+            }
+            R.id.editor_paragraph_h4 -> {
+                if (mEditorParagraphH4.isChecked) {
+                    mRichEditor.formatBlock()
+                } else {
+                    mRichEditor.setHeading(4)
+                }
+                mEditorParagraphH4.isChecked = !mEditorParagraphH4.isChecked
+            }
+            R.id.editor_paragraph_quote -> {
+                if (mEditorParagraphQuote.isChecked) {
+                    mRichEditor.formatBlock()
+                } else {
+                    mRichEditor.setBlockquote()
+                }
+                mEditorParagraphQuote.isChecked = !mEditorParagraphQuote.isChecked
+            }
+            R.id.editor_link_answer -> {
+                startActivityForResult(InsertAnswerWrapperActivity.getIntent(this), INSERT_ANSWER_CODE)
+            }
+            R.id.editor_link_article -> {
+                startActivityForResult(InsertArticleWrapperActivity.getIntent(this), INSERT_ARTICLE_CODE)
+            }
+            R.id.editor_link_game -> {
+                startActivityForResult(GameActivity.getIntent(this, "插入游戏"), INSERT_GAME_CODE)
+            }
+            R.id.editor_link_video -> {
+                startActivityForResult(VideoActivity.getIntent(this), 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) }
+            }
+        }
+    }
+
+    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
+        const val INSERT_VIDEO_CODE = 414
+    }
+}

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

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

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

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

@@ -9,15 +9,14 @@ import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.preference.PreferenceManager
-import android.support.v4.app.NotificationCompat
 import android.text.TextUtils
 import android.view.View
+import androidx.core.app.NotificationCompat
 import com.gh.common.notifier.Notifier
-import com.gh.common.util.DataUtils
 import com.gh.common.util.EntranceUtils
-import com.gh.common.util.PackageUtils
+import com.gh.common.util.MtaHelper
 import com.gh.common.util.StringUtils
-import com.gh.gamecenter.BuildConfig
+import com.gh.common.util.toObject
 import com.gh.gamecenter.R
 import com.gh.gamecenter.entity.PushEntity
 import com.gh.gamecenter.entity.PushMessageEntity
@@ -32,7 +31,6 @@ 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.halo.assistant.HaloApp
 import com.umeng.message.UmengMessageService
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
@@ -48,22 +46,17 @@ 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")
@@ -74,7 +67,7 @@ class GHUmengNotificationService : UmengMessageService() {
         val isMessageFromSystem = intent.getBooleanExtra(MESSAGE_FROM_SYSTEM, false)
 
         try {
-            val pushData = gson.fromJson(message, PushEntity::class.java)
+            val pushData = message.toObject<PushEntity>()
             pushData?.let { handlePushData(context, it, message, isMessageFromSystem) }
         } catch (e: Exception) {
             e.printStackTrace()
@@ -87,59 +80,68 @@ class GHUmengNotificationService : UmengMessageService() {
         if (pushData.displayType == DISPLAY_TYPE_NOTIFICATION) {
             // 其它类型的透传信息
             // 显示到通知栏
-            val msg = gson.fromJson(message, PushNotificationEntity::class.java)
+            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 (validatePush(data?.condition)) {
-                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(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)
+            // 用户未登录的情况下不生成消息中心通知，避免用户掉登录了还收到跳转至消息中心的通知
+            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 (HALO_MESSAGE_DIALOG == pushData.body?.custom) {
+            if (UserManager.getInstance().isLoggedIn
+                    && HALO_MESSAGE_DIALOG == pushData.body?.custom) {
                 // 回答了问题或者关注了问题的消息
                 val msg = gson.fromJson(message, PushMessageEntity::class.java)
                 val data = msg?.extra?.data
@@ -159,20 +161,20 @@ class GHUmengNotificationService : UmengMessageService() {
                             .setText(displayText)
                             .setDuration(5000)
                             .setIcon(data?.userEntity?.icon)
-                            .setOnClickListener(View.OnClickListener { _ ->
+                            .setOnClickListener(View.OnClickListener {
                                 val bundle = Bundle()
                                 bundle.putString(EntranceUtils.KEY_ANSWER_ID, data?.answer?.id)
                                 bundle.putString(EntranceUtils.KEY_ENTRANCE, EntranceUtils.ENTRANCE_UMENG)
                                 bundle.putString(EntranceUtils.KEY_TO, AnswerDetailActivity::class.java.name)
                                 EntranceUtils.jumpActivity(context, bundle)
 
-                                DataUtils.onMtaEvent(context, "消息弹窗",
-                                        type, "Does not contains any parameter.")
+                                MtaHelper.onEvent("消息弹窗", type, "Does not contains any parameter.")
 
                                 // 标记已读
                                 val jsonObject = JSONObject()
                                 jsonObject.put("type", type)
                                 val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString())
+
                                 RetrofitManager.getInstance(application).api.postMessageRead(UserManager.getInstance().userId, data?.id, body)
                                         .subscribeOn(Schedulers.io())
                                         .observeOn(AndroidSchedulers.mainThread())
@@ -186,7 +188,6 @@ class GHUmengNotificationService : UmengMessageService() {
                                                 e?.printStackTrace()
                                             }
                                         })
-
                                 Notifier.hide()
                             })
                             .show(false)
@@ -201,37 +202,6 @@ class GHUmengNotificationService : UmengMessageService() {
         }
     }
 
-    private fun validatePush(condition: PushNotificationEntity.Data.Condition?): Boolean {
-        if (condition == null) return true
-
-        // 校验渠道是否匹配
-        condition.ghzs?.channel?.let {
-            if (it.isNotEmpty() && it != HaloApp.getInstance().channel) {
-                return false
-            }
-        }
-
-        // 校验光环版本版本是否匹配
-        condition.ghzs?.version?.let {
-            if (it.isNotEmpty() && !BuildConfig.VERSION_NAME.contains(it)) {
-                return false
-            }
-        }
-
-        // 校验已安装的应用里是否存在条件的包名
-        if (condition.packageName.isNotEmpty()) {
-            val installedPackageList = PackageUtils.getAllPackageName(HaloApp.getInstance().application)
-            for (packageName in installedPackageList) {
-                if (condition.packageName == packageName) {
-                    return true
-                }
-            }
-            return false
-        }
-
-        return true
-    }
-
     /**
      * 规则:最多三条消息,以旧换新
      *

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,245 @@
+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.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;
+
+        int count = DownloadManager.getInstance(getApplicationContext()).getDownloadOrUpdateCount(updateList);
+        if (count != 0) {
+            mDownloadCountHint.setVisibility(View.VISIBLE);
+            mDownloadCountHint.setText(String.valueOf(count));
+        } 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,22 +1,26 @@
 package com.gh.base.fragment;
 
-import android.arch.lifecycle.Lifecycle;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.lifecycle.Lifecycle;
+
 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;
@@ -49,6 +53,7 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
 
     protected boolean isEverPause;
 
+    @NonNull
     protected String mEntrance;
 
     protected final Handler mBaseHandler = new BaseFragment.BaseHandler(this);
@@ -118,6 +123,14 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
             mEntrance = getArguments().getString(KEY_ENTRANCE);
         }
 
+        if (TextUtils.isEmpty(mEntrance)) {
+            mEntrance = Constants.ENTRANCE_UNKNOWN;
+        }
+
+        if (BuildConfig.DEBUG) {
+            Utils.log("FRAGMENT_ENTRANCE -> " + mEntrance);
+        }
+
         isEverPause = false;
         EventBus.getDefault().register(this);
 
@@ -168,13 +181,11 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
     }
 
     public void toast(@StringRes int res) {
-        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-            toast(getString(res));
+        toast(getString(res));
     }
 
     public void toast(String msg) {
-        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-            Utils.toast(getContext(), msg);
+        Utils.toast(getContext(), msg);
     }
 
     public void toastLong(@StringRes int msg) {
@@ -236,4 +247,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

@@ -2,11 +2,11 @@ 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;

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 androidx.annotation.IdRes;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.viewpager.widget.ViewPager;
+
+import com.gh.gamecenter.fragment.MainWrapperFragment;
+
+import java.util.List;
+
 
 /**
  * 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的生命周期
+            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();
+                }
+            }
+
+            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();
+                }
+            }
+            mLastPosition = index;
+        } catch (Exception ignore) {
+
+        }
     }
 
     @Override

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

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

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

@@ -22,4 +22,12 @@ object AppExecutor {
             mainThreadHandler.postDelayed(command, delay)
         }
     }
+}
+
+fun runOnIoThread(f: () -> Unit) {
+    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 UserManager.getInstance().loginTokenEntity.accessToken.value
+    }
+
+    @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,116 @@
+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.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.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, 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, "文章链接")
+                    }
+                }
+                else -> DialogUtils.showLowVersionDialog(context)
+            }
+            return true
+        }
+        return false
+    }
+}

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

@@ -1,14 +1,16 @@
 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.google.gson.Gson
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
 import com.umeng.commonsdk.UMConfigure
@@ -24,37 +26,37 @@ import org.json.JSONObject
 
 object PushManager {
 
-    var gson = Gson()
     var deviceToken: String? = ""
-    var previousAlias: AliasEntity? = null
-    var application = HaloApp.getInstance().application
+
+    private var mPreviousAlias: AliasEntity? = null
+    private var mApplication = HaloApp.getInstance().application
 
     const val SP_PUSH_ALIAS = "push_alias"
 
     @JvmStatic
     fun init(channel: String) {
         //初始化友盟推送
-        UMConfigure.init(application,
+        UMConfigure.init(mApplication,
                 Config.UMENG_APPKEY, channel,
                 UMConfigure.DEVICE_TYPE_PHONE,
                 Config.UMENG_MESSAGE_SECRET)
 
         // 注册小米、华为和魅族通道
-        MiPushRegistar.register(application, Config.MIPUSH_APPID, Config.MIPUSH_APPKEY)
-        HuaWeiRegister.register(application)
-        MeizuRegister.register(application, BuildConfig.MEIZUPUSH_APPID, BuildConfig.MEIZUPUSH_APPKEY)
+        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(application)
+        val pushAgent = PushAgent.getInstance(mApplication)
         pushAgent.onAppStart() // 开启App统计
 
         //注册推送服务，每次调用register方法都会回调该接口
         registerDevice()
 
-        val aliasInSp = PreferenceManager.getDefaultSharedPreferences(application).getString(SP_PUSH_ALIAS, "")
-        previousAlias = gson.fromJson(aliasInSp, AliasEntity::class.java)
+        val aliasInSp = PreferenceManager.getDefaultSharedPreferences(mApplication).getString(SP_PUSH_ALIAS, "")
+        mPreviousAlias = aliasInSp?.toObject()
 
-        if (previousAlias == null) {
+        if (mPreviousAlias == null) {
             getAndSetAlias()
         }
 
@@ -63,7 +65,7 @@ object PushManager {
     }
 
     private fun registerDevice() {
-        PushAgent.getInstance(application).register(object : IUmengRegisterCallback {
+        PushAgent.getInstance(mApplication).register(object : IUmengRegisterCallback {
             override fun onSuccess(dToken: String) {
                 //注册成功会返回device token
                 deviceToken = dToken
@@ -77,6 +79,7 @@ object PushManager {
         })
     }
 
+    @SuppressLint("CheckResult")
     @JvmStatic
     fun getAndSetAlias() {
         if (deviceToken.isNullOrEmpty()) {
@@ -98,7 +101,7 @@ object PushManager {
 
         val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString())
 
-        RetrofitManager.getInstance(application).api.getAlias(body)
+        RetrofitManager.getInstance(mApplication).api.getAlias(body)
                 .subscribeOn(Schedulers.io())
                 .subscribe(
                         { setAlias(it) },
@@ -108,11 +111,11 @@ object PushManager {
 
     @JvmStatic
     fun setAlias(alias: AliasEntity) {
-        val pushAgent = PushAgent.getInstance(application)
+        val pushAgent = PushAgent.getInstance(mApplication)
 
-        previousAlias = alias
-        PreferenceManager.getDefaultSharedPreferences(application).edit {
-            putString(SP_PUSH_ALIAS, gson.toJson(previousAlias))
+        mPreviousAlias = alias
+        PreferenceManager.getDefaultSharedPreferences(mApplication).edit {
+            putString(SP_PUSH_ALIAS, mPreviousAlias?.toJson())
         }
 
         pushAgent.setAlias(alias.alias, alias.aliasType) { b, s ->
@@ -122,16 +125,16 @@ object PushManager {
 
     @JvmStatic
     fun deleteAlias() {
-        val pushAgent = PushAgent.getInstance(application)
+        val pushAgent = PushAgent.getInstance(mApplication)
 
-        previousAlias?.let {
+        mPreviousAlias?.let {
             pushAgent.deleteAlias(it.alias, it.aliasType) { b, s ->
                 Utils.log("删除别名 $b + $s")
             }
         }
-        PreferenceManager.getDefaultSharedPreferences(application).edit {
+        PreferenceManager.getDefaultSharedPreferences(mApplication).edit {
             putString(SP_PUSH_ALIAS, "")
         }
-        previousAlias = null
+        mPreviousAlias = null
     }
 }

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

@@ -3,8 +3,8 @@ package com.gh.common
 import android.app.Activity
 import android.app.Application
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
 import com.halo.assistant.HaloApp
 import java.util.concurrent.Executors
 
@@ -13,6 +13,8 @@ import java.util.concurrent.Executors
  */
 class TimeElapsedHelper(val fragment: Fragment?, val activity: Activity?) {
 
+    constructor() : this(null, null)
+
     constructor(fragment: Fragment) : this(fragment, null)
 
     constructor(activity: Activity) : this(null, activity)
@@ -59,19 +61,19 @@ class TimeElapsedHelper(val fragment: Fragment?, val activity: Activity?) {
 
         fragment?.fragmentManager?.registerFragmentLifecycleCallbacks(
                 object : FragmentManager.FragmentLifecycleCallbacks() {
-                    override fun onFragmentResumed(fm: FragmentManager?, f: Fragment?) {
+                    override fun onFragmentResumed(fm: FragmentManager, f: Fragment) {
                         if (f === fragment) {
                             resumeCounting()
                         }
                     }
 
-                    override fun onFragmentPaused(fm: FragmentManager?, f: Fragment?) {
+                    override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
                         if (f === fragment) {
                             pauseCounting()
                         }
                     }
 
-                    override fun onFragmentViewDestroyed(fm: FragmentManager?, f: Fragment?) {
+                    override fun onFragmentViewDestroyed(fm: FragmentManager, f: Fragment) {
                         if (f === fragment) {
                             fragment.fragmentManager?.unregisterFragmentLifecycleCallbacks(this)
                         }
@@ -79,7 +81,7 @@ class TimeElapsedHelper(val fragment: Fragment?, val activity: Activity?) {
                 }, false)
     }
 
-    private fun resumeCounting() {
+    fun resumeCounting() {
         isWorking = true
         TimeElapsedThreadHolder.threadService.execute {
             while (isWorking) {
@@ -100,7 +102,11 @@ class TimeElapsedHelper(val fragment: Fragment?, val activity: Activity?) {
         }
     }
 
-    private fun pauseCounting() {
+    fun resetCounting() {
+        elapsedTime = 0
+    }
+
+    fun pauseCounting() {
         isWorking = false
     }
 

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/constant/Config.java

@@ -1,12 +1,15 @@
 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.SPUtils;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.entity.NewsEntity;
 import com.gh.gamecenter.entity.SettingsEntity;
@@ -18,17 +21,12 @@ import java.util.List;
 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;
@@ -46,13 +44,21 @@ public class Config {
     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;
 
@@ -63,23 +69,20 @@ public class Config {
                 }
             }
         }
-
         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 (PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication())
-                .getBoolean("isFixDownload", false)) return true;
+        if (getPreferences().getBoolean(FIX_DOWNLOAD_KEY, false)) return true;
 
         if (TextUtils.isEmpty(gameId) || !isExistDownloadFilter())
             return false;
@@ -103,6 +106,10 @@ 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;
 
@@ -113,8 +120,11 @@ public class Config {
                 } else {
                     return false;
                 }
-            } else if ("all".equals(entity.getGame())) {
+            }
+
+            if ("all".equals(entity.getGame())) {
                 if (entity.getPluginfy() && filterTime(entity.getTime())) {
+                    preferences.edit().putBoolean(FIX_PLUGIN_KEY, true).apply();
                     return true;
                 }
             }
@@ -124,12 +134,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 : getSettings().getDownload()) {
             if ("all".equals(entity.getGame())) {
                 if (entity.getPluginfy() && filterTime(entity.getTime())) {
+                    preferences.edit().putBoolean(FIX_PLUGIN_KEY, true).apply();
                     return true;
                 }
             }
@@ -151,19 +166,20 @@ public class Config {
     }
 
     public static void setSettings(SettingsEntity settingsEntity) {
-        SharedPreferences.Editor edit = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication()).edit();
-        edit.putString(SETTINGS_KEY, GsonUtils.getInstance().toJson(settingsEntity)).apply();
-
+        getPreferences().edit().putString(SETTINGS_KEY, GsonUtils.toJson(settingsEntity)).apply();
         mSettingsEntity = settingsEntity;
+
+        // 加载完设置后刷新下
+        PackageHelper.initList();
     }
 
+    @Nullable
     public static SettingsEntity getSettings() {
         if (mSettingsEntity == null) {
             try {
-                SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication());
-                String json = sp.getString(SETTINGS_KEY, null);
+                String json = getPreferences().getString(SETTINGS_KEY, null);
                 if (!TextUtils.isEmpty(json)) {
-                    mSettingsEntity = GsonUtils.getInstance().fromJsonBean(json, SettingsEntity.class);
+                    mSettingsEntity = GsonUtils.fromJson(json, SettingsEntity.class);
                 }
             } catch (Exception e) {
                 e.printStackTrace();
@@ -193,4 +209,27 @@ 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();
+    }
 }

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

@@ -17,12 +17,24 @@ public class Constants {
 
     public static final String DEVICE_KEY = "deviceKey";
 
+    public static final String HAS_REQUESTED_NOTIFICATION_PERMISSIONS = "has_requested_notification_permissions";
+
+    public static final String SHOULD_SHOW_VIDEO_MOBILE_WARNING = "should_show_video_mobile_warning";
+
+    public static final String GAME_DETAIL_COME_IN = "game_detail_come_in"; // 从游戏详情进入
+
     public static final String XPOSED_INSTALLER_PACKAGE_NAME = "de.robv.android.xposed.installer";
+    
+    public static final String EB_QUIT_LOGIN = "quit_login";
 
     // 最近显示的弹窗信息
     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_HINT = "show_notification_hint";
+    //标记安装的游戏为已玩过弹窗，最多取消2次
+    public static final String SP_MARK_INSTALLED_GAME = "mark_installed_game";
+
     //手机号码匹配规则
     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}$";
@@ -31,6 +43,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;
 
@@ -47,4 +67,9 @@ public class Constants {
     //评论 cd间隔
     public static final int COMMENT_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 = "###";
 }

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

@@ -9,6 +9,7 @@ public class ItemViewType {
     public static final int GAME_SLIDE = 1;     // 滚动图布局
     public static final int GAME_NORMAL = 2;    // 正常游戏布局
     public static final int GAME_SUBJECT = 19;
+    public static final int GAME_SUBJECT_SLIDE = 26;
     public static final int GAME_TEST = 3;      // 测试游戏布局
     public static final int GAME_IMAGE = 4;     // 游戏大图布局
     public static final int NEWS_HEADER = 5;    // 新闻头部布局
@@ -27,13 +28,16 @@ public class ItemViewType {
     public static final int ASK_REFRESH = 19;     // 问答精选 刷新
     public static final int ITEM_EMPTY = 20;
     public static final int ASK_CONCERN = 21;     // 问答精选 关注
+    public static final int RATING_ITEM = 22;     // 问答精选 关注
+    public static final int IMAGE_SLIDE_ITEM = 23;
+    public static final int VERTICAL_SLIDE_ITEM = 24;
+    public static final int COLUMN_COLLECTION = 25;
 
     /**
      * 普通列表
      */
     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;
@@ -12,25 +13,36 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import androidx.databinding.BindingAdapter;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.gh.base.OnViewClickListener;
 import com.gh.common.constant.Config;
+import com.gh.common.dialog.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.ImageUtils;
-import com.gh.common.util.KaiFuUtils;
 import com.gh.common.util.NewsUtils;
 import com.gh.common.util.NumberUtils;
 import com.gh.common.util.PackageUtils;
+import com.gh.common.util.PermissionHelper;
 import com.gh.common.util.PlatformUtils;
-import com.gh.common.util.StringUtils;
+import com.gh.common.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;
@@ -39,10 +51,12 @@ 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.PluginLocation;
+import com.gh.gamecenter.entity.ServerCalendarEntity;
+import com.gh.gamecenter.entity.TagStyleEntity;
 import com.gh.gamecenter.eventbus.EBReuse;
 import com.gh.gamecenter.manager.PackagesManager;
+import com.gh.gamecenter.qa.entity.CommunityVideoEntity;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.FileUtils;
 import com.lightgame.utils.Utils;
@@ -64,14 +78,18 @@ public class BindingAdapters {
         ImageUtils.displayIcon(view, imageUrl);
     }
 
-
     @BindingAdapter("imageUrl")
     public static void loadImage(SimpleDraweeView view, String 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();
@@ -83,7 +101,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);
@@ -112,7 +130,7 @@ public class BindingAdapters {
     }
 
     @BindingAdapter({"addKaiFuView", "clickListener"})
-    public static void addKaiFuView(LinearLayout view, List<KaiFuCalendarEntity> list, OnViewClickListener listener) {
+    public static void addKaiFuView(LinearLayout view, List<ServerCalendarEntity> list, OnViewClickListener listener) {
         if (list == null) return;
         view.removeAllViews();
         view.addView(LayoutInflater.from(view.getContext()).inflate(R.layout.kaifu_add_item_title, null));
@@ -300,8 +318,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())
@@ -312,9 +337,102 @@ 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.getPath());
+                        }
+                    }
+                    break;
+                case RESERVABLE:
+                    CheckLoginUtils.checkLogin(progressBar.getContext(), "", () -> {
+                        PermissionHelper.checkReadPhoneStatePermissionBeforeAction(progressBar.getContext(), () -> {
+                            ReserveDialogFragment dialogFragment = ReserveDialogFragment.getInstance(
+                                    gameEntity,
+                                    () -> 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;
+            }
+        });
+
+        // 显示预约
+        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("暂无下载");
+        if (gameEntity.getApk().isEmpty() || gameEntity.getDownloadOffStatus() != null) {
+            String offStatus = gameEntity.getDownloadOffStatus();
+            if (offStatus != null && "dialog".equals(offStatus)) {
+                progressBar.setText("查看");
+            } else {
+                progressBar.setText("暂无");
+            }
             progressBar.setDownloadType(DownloadProgressBar.DownloadType.NONE);
         } else {
             String status = GameUtils.getDownloadBtnText(progressBar.getContext(), gameEntity, PluginLocation.only_game);
@@ -369,54 +487,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) {
-                        DialogUtils.checkDownload(v.getContext(), gameEntity.getApk().get(0).getSize(),
-                                isSubscribe -> download(progressBar, gameEntity, traceEvent, isSubscribe));
-                    } else {
-                        DownloadDialog.getInstance(v.getContext()).showPopupWindow(v, gameEntity,
-                                "(我的光环:我的游戏)", "我的光环-我的游戏:" + gameEntity.getName(), traceEvent);
-                    }
-                    break;
-                case LAUNCH_OR_OPEN:
-                    if (gameEntity.getApk().size() == 1) {
-                        DataUtils.onGameLaunchEvent(v.getContext(), gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), "我的光环-我的游戏");
-                        PackageUtils.launchApplicationByPackageName(v.getContext(), gameEntity.getApk().get(0).getPackageName());
-                    } else {
-                        DownloadDialog.getInstance(v.getContext()).showPopupWindow(v, gameEntity,
-                                "(我的光环:我的游戏)", "我的光环-我的游戏:" + gameEntity.getName(), traceEvent);
-                    }
-                    break;
-                case INSTALL_PLUGIN:
-                case INSTALL_NORMAL:
-                    if (gameEntity.getApk().size() == 1) {
-                        DownloadEntity downloadEntity = DownloadManager.getInstance(progressBar.getContext()).getDownloadEntityByUrl(gameEntity.getApk().get(0).getUrl());
-                        if (downloadEntity != null) {
-                            PackageUtils.launchSetup(v.getContext(), downloadEntity.getPath());
-                        }
-                    }
-                    break;
-            }
-        });
     }
 
+
+    private static void updateReservation(DownloadProgressBar progressBar, GameEntity gameEntity) {
+        // 显示预约
+        if (gameEntity.isReservable()) {
+            if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.getId())) {
+                progressBar.setText("预约");
+                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVABLE);
+            } else {
+                progressBar.setText("已预约");
+                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVED);
+            }
+        }
+    }
+
+
     // 开始下载
-    private static void download(DownloadProgressBar progressBar, GameEntity
-            gameEntity, ExposureEvent traceEvent, boolean isSubscribe) {
+    private static void download(DownloadProgressBar progressBar,
+                                 GameEntity gameEntity,
+                                 ExposureEvent traceEvent,
+                                 boolean isSubscribe,
+                                 String entrance,
+                                 String location) {
         String str = progressBar.getText();
         String method;
         if (str.contains("更新")) {
@@ -429,7 +523,7 @@ public class BindingAdapters {
         ApkEntity apkEntity = gameEntity.getApk().get(0);
         String msg = FileUtils.isCanDownload(progressBar.getContext(), apkEntity.getSize());
         if (TextUtils.isEmpty(msg)) {
-            DataUtils.onGameDownloadEvent(progressBar.getContext(), gameEntity.getName(), apkEntity.getPlatform(), "(我的光环:我的游戏)", "下载开始", method);
+            DataUtils.onGameDownloadEvent(progressBar.getContext(), gameEntity.getName(), apkEntity.getPlatform(), entrance, "下载开始", method);
 
             ExposureEvent downloadExposureEvent = ExposureUtils.logADownloadExposureEvent(gameEntity, apkEntity.getPlatform(), traceEvent, ExposureUtils.DownloadType.DOWNLOAD);
 
@@ -437,7 +531,8 @@ public class BindingAdapters {
                     apkEntity,
                     gameEntity,
                     method,
-                    StringUtils.buildString("(我的光环:我的游戏)"), "我的光环-我的游戏:" + gameEntity.getName(),
+                    entrance,
+                    location + gameEntity.getName(),
                     isSubscribe,
                     downloadExposureEvent);
 
@@ -457,8 +552,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);
@@ -474,9 +569,7 @@ 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);
         }
     }
@@ -492,4 +585,59 @@ public class BindingAdapters {
         }
 
     }
+
+    @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))
+                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,9 +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.gh.common.util.GsonUtils
-import com.google.gson.Gson
 import java.util.*
 import kotlin.collections.ArrayList
 
@@ -11,32 +10,32 @@ class ExposureConverters {
 
     @TypeConverter
     fun convertPayload2String(any: ExposureEntity): String {
-        return GsonUtils.getInstance().mGson.toJson(any)
+        return GsonUtils.toJson(any)
     }
 
     @TypeConverter
     fun convertString2Payload(string: String): ExposureEntity {
-        return GsonUtils.getInstance().mGson.fromJson(string, ExposureEntity::class.java)
+        return GsonUtils.fromJson(string, ExposureEntity::class.java)
     }
 
     @TypeConverter
     fun convertSource2String(sourceList: List<ExposureSource>): String {
-        return GsonUtils.getInstance().mGson.toJson(sourceList)
+        return GsonUtils.toJson(sourceList)
     }
 
     @TypeConverter
     fun convertString2Source(sourceList: String): List<ExposureSource> {
-        return ArrayList(Arrays.asList(GsonUtils.getInstance().mGson.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 GsonUtils.getInstance().mGson.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
@@ -51,12 +50,12 @@ class ExposureConverters {
 
     @TypeConverter
     fun convertMeta2String(any: Meta): String {
-        return GsonUtils.getInstance().mGson.toJson(any)
+        return GsonUtils.toJson(any)
     }
 
     @TypeConverter
     fun convertString2Meta(string: String): Meta {
-        return GsonUtils.getInstance().mGson.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 androidx.room.Entity
+import androidx.room.PrimaryKey
 import android.os.Parcelable
-import android.support.annotation.Keep
+import androidx.annotation.Keep
 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,
@@ -26,7 +26,7 @@ data class ExposureEvent(
     companion object {
         fun createEvent(gameEntity: GameEntity?, source: List<ExposureSource>, eTrace: List<ExposureEvent>?, event: ExposureType): ExposureEvent {
             return ExposureEvent(
-                    ExposureEntity(gameId = gameEntity?.id,
+                    payload = ExposureEntity(gameId = gameEntity?.id,
                             gameName = gameEntity?.name,
                             sequence = gameEntity?.sequence,
                             platform = gameEntity?.platform,

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

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

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

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

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

@@ -2,10 +2,10 @@ package com.gh.common.exposure
 
 import com.aliyun.sls.android.sdk.model.LogGroup
 import com.gh.common.exposure.time.TimeUtil
+import com.gh.common.util.toJson
 import com.gh.gamecenter.BuildConfig
 import com.gh.loghub.LgLOG
 import com.gh.loghub.LoghubHelper
-import com.google.gson.Gson
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
 import java.util.concurrent.Executors
@@ -30,8 +30,6 @@ object ExposureManager {
 
     private val loghubHelper = LoghubHelper.getInstance()
 
-    private val gson = Gson()
-
     // exposureCache 用来过滤掉具有相同 id 的曝光事件，避免重复发送事件
     private val exposureCache = FixedSizeLinkedHashSet<String>(100)
     private val exposureSet = hashSetOf<ExposureEvent>()
@@ -97,9 +95,9 @@ object ExposureManager {
         }
     }
 
-    private fun commitSavedExposureEvent(force: Boolean = false) {
+    fun commitSavedExposureEvent(forced: Boolean = false) {
         exposureExecutor.execute {
-            if (exposureSet.size < STORE_SIZE && !force || exposureSet.size == 0) return@execute
+            if (exposureSet.size < STORE_SIZE && !forced || exposureSet.size == 0) return@execute
 
             val exposureList = exposureSet.toList()
             // uploadLogGroup 是一个异步方法，LoghubHelper 里面实现了重传功能，所以这里交给它就好了
@@ -127,11 +125,13 @@ object ExposureManager {
         val log = LgLOG(TimeUtil.currentTime())
 
         log.PutContent("id", event.id)
-        log.PutContent("payload", gson.toJson(event.payload))
+        log.PutContent("payload", event.payload.toJson())
         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.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)
 
         return log

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

@@ -1,7 +1,7 @@
 package com.gh.common.exposure
 
 import android.os.Parcelable
-import android.support.annotation.Keep
+import androidx.annotation.Keep
 import kotlinx.android.parcel.Parcelize
 
 @Keep

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

@@ -1,6 +1,6 @@
 package com.gh.common.exposure
 
-import com.gh.common.util.fromObject
+import com.gh.common.util.toObject
 import com.gh.gamecenter.entity.GameEntity
 import java.util.*
 
@@ -30,12 +30,13 @@ object ExposureUtils {
         val gameEntity = entity.clone()
         gameEntity.platform = platform
         gameEntity.downloadCompleteType = downloadType.toString()
-        val traceEvent = trace?.fromObject<ExposureEvent>()
+        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)
+        ExposureManager.commitSavedExposureEvent(forced = true)
     }
 
     enum class DownloadType {

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

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

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

@@ -14,6 +14,7 @@ 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 {
@@ -37,7 +38,8 @@ object MetaUtil {
                 channel = getChannel(),
                 appVersion = BuildConfig.VERSION_NAME,
                 userId = UserManager.getInstance().userId,
-                exposureVersion = BuildConfig.EXPOSURE_VERSION)
+                exposureVersion = BuildConfig.EXPOSURE_VERSION,
+                rom = RomIdentifier.getRom().name + "" + RomIdentifier.getRom().versionName)
     }
 
     fun getMeta(): Meta {

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

@@ -0,0 +1,60 @@
+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.NewsEntity
+import com.gh.gamecenter.qa.entity.AnswerEntity
+import com.gh.gamecenter.qa.entity.ArticleEntity
+import com.gh.gamecenter.room.converter.*
+import com.gh.gamecenter.room.dao.AnswerHistoryDao
+import com.gh.gamecenter.room.dao.ArticleHistoryDao
+import com.gh.gamecenter.room.dao.GameDao
+import com.gh.gamecenter.room.dao.NewsHistoryDao
+import com.halo.assistant.HaloApp
+
+@Database(entities = [AnswerEntity::class, ArticleEntity::class, NewsEntity::class, HistoryGameEntity::class], version = 4, 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
+
+    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 instance by lazy {
+            Room.databaseBuilder(HaloApp.getInstance().application, HistoryDatabase::class.java, "USER_TRACK_HISTORY_DATABASE")
+                    .addMigrations(MIGRATION_2_3)
+                    .addMigrations(MIGRATION_3_4)
+                    .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

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

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

@@ -3,7 +3,7 @@ package com.gh.common.im
 import android.app.Activity
 import android.content.Context
 import android.os.Build
-import android.support.v4.view.ViewCompat
+import androidx.core.view.ViewCompat
 import android.util.AttributeSet
 import android.util.DisplayMetrics
 import android.util.TypedValue

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

@@ -5,16 +5,20 @@ import android.app.NotificationManager
 import android.content.Context
 import com.gh.base.CurrentActivityHolder
 import com.gh.common.util.SPUtils
+import com.gh.common.util.tryWithDefaultCatch
+import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.MainActivity
 import com.gh.gamecenter.MessageActivity
 import com.gh.gamecenter.SuggestSelectActivity
 import com.gh.gamecenter.manager.UserManager
 import com.halo.assistant.HaloApp
 import com.m7.imkfsdk.KfStartHelper
+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 {
 
@@ -25,10 +29,17 @@ object ImManager {
     var shouldShowFloatingWindow = false
     var shouldShowFloatingWindowDot = false
 
+    // 记录当前用户 ID 避免重复初始化
+    var currentUserId = ""
+
     @JvmStatic
     fun attachIm() {
         try {
-            if (UserManager.getInstance().userInfoEntity != null) {
+            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,
@@ -67,7 +78,8 @@ object ImManager {
                 chatHelper.initSdkChat(
                         ImReceiver.UNIQUE_BROADCAST_ACTION,
                         IM_KEY,
-                        UserManager.getInstance().userInfoEntity.name + "(" + UserManager.getInstance().userId + ")",
+                        UserManager.getInstance().userInfoEntity.name + "(" + UserManager.getInstance().userId + ")"
+                                + "[" + BuildConfig.VERSION_NAME + "]",
                         UserManager.getInstance().userId)
             } catch (e: Exception) {
                 e.printStackTrace()
@@ -117,11 +129,13 @@ object ImManager {
     fun sendFeedbackMessage(message: String) {
         val fromToMessage = IMMessage.createTxtMessage(message)
         HaloApp.getInstance().mainExecutor.execute {
-            IMChat.getInstance().sendMessage(fromToMessage, object : ChatListener {
-                override fun onProgress(p0: Int) {}
-                override fun onSuccess() {}
-                override fun onFailed() {}
-            })
+            tryWithDefaultCatch {
+                IMChat.getInstance().sendMessage(fromToMessage, object : ChatListener {
+                    override fun onProgress(p0: Int) {}
+                    override fun onSuccess() {}
+                    override fun onFailed() {}
+                })
+            }
         }
     }
 

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

@@ -8,12 +8,12 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import android.support.v4.app.NotificationCompat
+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
-import com.moor.imkf.utils.Utils
 
 class ImReceiver : BroadcastReceiver() {
 

app/src/main/java/com/gh/common/notifier/Notifier.kt

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

app/src/main/java/com/gh/common/notifier/NotifierView.kt

@@ -5,7 +5,6 @@ import android.app.Activity
 import android.content.Context
 import android.graphics.Path
 import android.os.Build
-import android.support.v4.view.ViewCompat
 import android.text.TextUtils
 import android.util.AttributeSet
 import android.util.DisplayMetrics
@@ -13,6 +12,7 @@ import android.util.Log
 import android.util.TypedValue
 import android.view.*
 import android.widget.FrameLayout
+import androidx.core.view.ViewCompat
 import com.gh.common.util.ImageUtils
 import com.gh.common.util.doOnEnd
 import com.gh.common.util.doOnStart

app/src/main/java/com/gh/common/notifier/SwipeDismissTouchListener.kt

@@ -22,7 +22,7 @@ import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.animation.ValueAnimator
 import android.os.Build
-import android.support.annotation.RequiresApi
+import androidx.annotation.RequiresApi
 import android.view.MotionEvent
 import android.view.VelocityTracker
 import android.view.View

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

@@ -28,6 +28,8 @@ object RemenkapaiRepository {
      * 选择随机数量的热门卡牌
      */
     private fun pickRandomSizeEntity(size: Int): List<GameEntity> {
+        if (size > remenkapaiList.size) return remenkapaiList
+
         val randomGameList = arrayListOf<GameEntity>()
         val randomArray = RandomUtils.getRandomArray(size, remenkapaiList.size)
         for (i in randomArray) {

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

@@ -0,0 +1,72 @@
+package com.gh.common.repository
+
+import android.annotation.SuppressLint
+import com.gh.common.util.CheckLoginUtils
+import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.retrofit.BiResponse
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.halo.assistant.HaloApp
+import com.lightgame.utils.Utils
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+
+/**
+ * 预约游戏仓库，存储了用户已预约的游戏列表
+ */
+object ReservationRepository {
+
+    private var mReservationSet = hashSetOf<String>()
+
+    @JvmStatic
+    fun refreshReservationsIfNeeded() {
+        if (mReservationSet.isEmpty()) {
+            refreshReservations()
+        }
+    }
+
+    fun addReservationToMemoryAndRefresh(gameId: String) {
+        mReservationSet.add(gameId)
+        refreshReservations()
+    }
+
+    @JvmStatic
+    fun removeReservationFromMemoryAndRefresh(gamedId: String) {
+        mReservationSet.remove(gamedId)
+        refreshReservations()
+    }
+
+    @SuppressLint("CheckResult")
+    @JvmStatic
+    fun refreshReservations() {
+        if (CheckLoginUtils.isLogin()) {
+            RetrofitManager.getInstance(HaloApp.getInstance().application).api
+                    .getAllTheGameReservations(UserManager.getInstance().userId, Utils.getTime(HaloApp.getInstance().application))
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(object : BiResponse<List<String>>() {
+
+                        override fun onSuccess(data: List<String>) {
+                            mReservationSet = HashSet(data)
+                        }
+
+                    })
+        }
+    }
+
+    @JvmStatic
+    fun clearReservations() {
+        mReservationSet.clear()
+    }
+
+    @JvmStatic
+    fun thisGameHasBeenReserved(gameId: String): Boolean {
+        return if (!CheckLoginUtils.isLogin()) false else {
+            if (mReservationSet.isEmpty()) {
+                false
+            } else {
+                mReservationSet.contains(gameId)
+            }
+        }
+    }
+
+}

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

@@ -0,0 +1,41 @@
+package com.gh.common.util
+
+import com.gh.gamecenter.retrofit.Response
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.halo.assistant.HaloApp
+import com.lightgame.utils.Util_System_Phone_State
+import io.reactivex.schedulers.Schedulers
+import okhttp3.ResponseBody
+
+/**
+ * 激活信息辅助类
+ */
+object ActivationHelper {
+
+    private const val HAS_SENT_ACTIVATED_INFO = "has_sent_activated_info"
+
+    var mHasSentActivatedInfo = SPUtils.getBoolean(HAS_SENT_ACTIVATED_INFO, false)
+
+    /**
+     * 发送激活信息 (用于推广)
+     */
+    @JvmStatic
+    fun sendActivationInfo() {
+        // 能获取到 IMEI 并且之前没发送过激活信息才发
+        if (!mHasSentActivatedInfo
+                && Util_System_Phone_State.canGetImei(HaloApp.getInstance().application)) {
+            RetrofitManager.getInstance(HaloApp.getInstance().application)
+                    .api.postActivationInfo()
+                    .subscribeOn(Schedulers.io())
+                    .subscribe(object : Response<ResponseBody>() {
+                        override fun onResponse(response: ResponseBody?) {
+                            super.onResponse(response)
+
+                            mHasSentActivatedInfo = true
+                            SPUtils.setBoolean(HAS_SENT_ACTIVATED_INFO, true)
+                        }
+                    })
+        }
+    }
+
+}

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

@@ -17,7 +17,8 @@
 package com.gh.common.util
 
 import android.animation.Animator
-import android.support.annotation.RequiresApi
+import androidx.annotation.RequiresApi
+import android.view.ViewPropertyAnimator
 
 /**
  * Since [Android KTX] has not release a stable build yet,
@@ -125,4 +126,26 @@ fun Animator.addPauseListener(
     }
     addPauseListener(listener)
     return listener
+}
+
+fun ViewPropertyAnimator.doOnEnd(onEnd: ((animator: Animator?) -> Unit)? = null): ViewPropertyAnimator {
+    val listener = object : Animator.AnimatorListener {
+        override fun onAnimationRepeat(animation: Animator?) {
+
+        }
+
+        override fun onAnimationEnd(animation: Animator?) {
+            onEnd?.invoke(animation)
+        }
+
+        override fun onAnimationCancel(animation: Animator?) {
+
+        }
+
+        override fun onAnimationStart(animation: Animator?) {
+
+        }
+    }
+    this.setListener(listener)
+    return this
 }

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

@@ -1,93 +0,0 @@
-package com.gh.common.util;
-
-import android.content.Context;
-
-import com.lightgame.utils.Utils;
-
-import org.json.JSONObject;
-
-import retrofit2.HttpException;
-
-/**
- * Created by khy on 28/12/17.
- */
-
-public class AskErrorResponseUtils {
-
-    public static void errorResponseControl(Context context, HttpException e) {
-        if (e == null) return;
-        int code = e.code();
-        try {
-            if (code == 403 || code == 401) {
-                JSONObject object = new JSONObject(e.response().errorBody().string());
-                errorResponseControl(context, object);
-            } else {
-                Utils.toast(context, "网络错误");
-            }
-        } catch (Exception e1) {
-            e1.printStackTrace();
-        }
-    }
-
-    public static void errorResponseControl(Context context, JSONObject jsonObject) {
-        int errorCode = 0;
-        try {
-            errorCode = jsonObject.getInt("code");
-            switch (errorCode) {
-                case 403001:
-                    Utils.toast(context, "标签名称太长了");
-                    break;
-                case 403002:
-                    Utils.toast(context, "已经被邀请了");
-                    break;
-                case 403003:
-                    Utils.toast(context, "每天最多可以邀请10次");
-                    break;
-                case 403004:
-                    Utils.toast(context, "客户端提供的ID无效（空/无效ID）");
-                    break;
-                case 403005:
-                    Utils.toast(context, "已经回答过了（限制频率）");
-                    break;
-                case 403006:
-                    Utils.toast(context, "图片数量达到限制点");
-                    break;
-                case 403007:
-                    Utils.toast(context, "不合法的用户");
-                    break;
-                case 403008:
-                    Utils.toast(context, "已投票");
-                    break;
-                case 403009:
-                    Utils.toast(context, "已经收藏过了");
-                    break;
-                case 403010:
-                    Utils.toast(context, "无效的标签栏");
-                    break;
-                case 403011:
-                    Utils.toast(context, "标题内容过长");
-                    break;
-                case 403012:
-                    Utils.toast(context, "描述内容过长");
-                    break;
-                case 403013:
-                    Utils.toast(context, "无效的标签");
-                    break;
-                case 403014:
-                    Utils.toast(context, "标签数量太多了");
-                    break;
-                case 403015:
-                    Utils.toast(context, "已经关注过了");
-                    break;
-                case 404001:
-                    Utils.toast(context, "请求的资源不存在");
-                    break;
-                default:
-                    Utils.toast(context, "网络错误");
-                    break;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}

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

@@ -7,6 +7,9 @@ import android.graphics.Matrix;
 import android.graphics.PixelFormat;
 import android.graphics.drawable.Drawable;
 import android.media.ExifInterface;
+import android.os.Build;
+
+import com.halo.assistant.HaloApp;
 
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;
@@ -186,15 +189,30 @@ public class BitmapUtils {
 
     /**
      * Drawable转Bitmap
+     * @param isSquare 是否是正方形
      */
-    public static Bitmap drawableToBitmap(Drawable drawable) {
+    public static Bitmap drawableToBitmap(Drawable drawable, boolean isSquare) {
         if (drawable == null) {
             return null;
         }
 
+        int w,h;
+
         // 取 drawable 的长宽
-        int w = drawable.getIntrinsicWidth();
-        int h = drawable.getIntrinsicHeight();
+        w = drawable.getIntrinsicWidth();
+        h = drawable.getIntrinsicHeight();
+
+        // 在低于 5.1 和运行内存小于 2G 的设备上减小图片大小，避免 OOM，128 * 128 又不是不能看
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP
+                || DeviceUtils.getTotalRamSizeOfDevice(HaloApp.getInstance().getApplication()) < 2000) {
+            if (isSquare) {
+                w = w > 128 ? 128 : w;
+                h = h > 128 ? 128 : h;
+            } else {
+                w = w > 128 ? w / 2 : w;
+                h = h > 128 ? h / 2 : h;
+            }
+        }
         // 取 drawable 的颜色格式
         Bitmap.Config config = drawable.getOpacity() != PixelFormat.OPAQUE ? Bitmap.Config.ARGB_8888
                 : Bitmap.Config.RGB_565;

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

@@ -15,14 +15,16 @@ import com.lightgame.utils.Utils;
 public class CheckLoginUtils {
 
     public static void checkLogin(final Context context, String entrance, OnLoginListener listener) {
-        if (TextUtils.isEmpty(UserManager.getInstance().getToken())) {
+        if (!isLogin()) {
             if (listener != null) Utils.toast(context, "需要登录");
             LogUtils.login("dialog", null, entrance);
             LogUtils.login("activity", null, entrance);
             Intent intent = LoginActivity.getIntent(context, entrance);
             context.startActivity(intent);
         } else {
-            listener.onLogin();
+            if (listener != null) {
+                listener.onLogin();
+            }
         }
     }
 

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

@@ -1,9 +1,16 @@
 package com.gh.common.util;
 
 
+import android.text.TextUtils;
+
+import androidx.annotation.Nullable;
+
 public class ClassUtils {
 
+    @Nullable
     public static Class<?> forName(String name) {
+        if (TextUtils.isEmpty(name)) return null;
+
         if ("NewsActivity".equals(name)) {
             name = "NewsDetailActivity";
         } else if ("GameDetailsActivity".equals(name)) {

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

@@ -46,7 +46,7 @@ object CollectionUtils {
                             try {
                                 val string = e.response()?.errorBody()?.string()
                                 val errorBody = JSONObject(string)
-                                if (errorBody.getInt("detail") == 403009) {
+                                if (errorBody.getInt("code") == 403009) {
                                     listener.onSuccess()
                                     return
                                 }

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

@@ -8,6 +8,7 @@ import com.gh.gamecenter.MessageDetailActivity
 import com.gh.gamecenter.adapter.OnCommentCallBackListener
 import com.gh.gamecenter.entity.CommentEntity
 import com.gh.gamecenter.entity.MeEntity
+import com.gh.gamecenter.entity.Permissions
 import com.gh.gamecenter.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.lightgame.utils.Utils
@@ -21,91 +22,69 @@ import retrofit2.HttpException
 
 object CommentHelper {
 
-    // TODO 合并这两个方法的共同部分
     @JvmStatic
-    fun showCommunityArticleCommentOptions(
-            context: Context,
-            commentEntity: CommentEntity,
-            showConversation: Boolean,
-            articleId: String,
-            communityId: String,
-            listener: OnCommentCallBackListener?) {
-        val dialogOptions = ArrayList<String>()
-
-        if (commentEntity.me == null || !commentEntity.me?.isAnswerCommented!!) {
-            dialogOptions.add("回复")
-        }
-
-        dialogOptions.add("复制")
-        dialogOptions.add("举报")
-
-        if (commentEntity.parentUser != null && showConversation) {
-            dialogOptions.add("查看对话")
-        }
-
-        DialogUtils.showListDialog(context, dialogOptions, null) {
-            when (it) {
-                "回复" -> {
-                    context.ifLogin("社区文章详情-评论-回复") {
-                        if (listener != null) {
-                            listener.onCommentCallback(commentEntity)
-                        } else if (!TextUtils.isEmpty(commentEntity.id)) {
-                            context.startActivity(MessageDetailActivity.getMessageDetailIntent(context, commentEntity, commentEntity.id))
-                        } else {
-                            Utils.toast(context, "缺少关键属性")
-                        }
-                    }
-                }
-
-                "复制" -> copyText(commentEntity.content, context)
-
-                "举报" -> context.ifLogin("社区文章详情-评论-举报") {
-                    showReportTypeDialog(context) { reportType ->
-                        PostCommentUtils.reportCommunityArticleComment(context, communityId, articleId, commentEntity.id, reportType,
-                                object : PostCommentUtils.PostCommentListener {
-                                    override fun postSuccess(response: JSONObject?) {
-                                        Utils.toast(context, "感谢您的举报")
-                                    }
-
-                                    override fun postFailed(error: Throwable?) {
-                                        if (error == null) {
-                                            Utils.toast(context, "举报失败，请稍后重试")
-                                        } else {
-                                            Utils.toast(context, "举报失败，${error.message}")
-                                        }
-                                    }
-                                })
-                    }
-                }
-
-                "查看对话" -> {
-                    context.startActivity(CommentDetailActivity
-                            .getCommunityArticleCommentIntent(context, articleId, commentEntity.id, communityId, null))
-                }
-            }
-        }
+    fun showCommunityArticleCommentOptions(context: Context,
+                                           commentEntity: CommentEntity,
+                                           showConversation: Boolean,
+                                           articleId: String,
+                                           communityId: String,
+                                           listener: OnCommentCallBackListener?) {
+        showCommentOptions(context = context,
+                commentEntity = commentEntity,
+                showConversation = showConversation,
+                articleId = articleId,
+                communityId = communityId,
+                listener = listener)
     }
 
     @JvmStatic
-    fun showAnswerCommentOptions(
-            context: Context,
-            commentEntity: CommentEntity,
-            showConversation: Boolean,
-            answerId: String,
-            listener: OnCommentCallBackListener?) {
+    fun showAnswerCommentOptions(context: Context,
+                                 commentEntity: CommentEntity,
+                                 showConversation: Boolean,
+                                 answerId: String,
+                                 listener: OnCommentCallBackListener?) {
+        showCommentOptions(context = context,
+                commentEntity = commentEntity,
+                showConversation = showConversation,
+                answerId = answerId,
+                listener = listener)
+    }
+
+    @JvmStatic
+    fun showVideoCommentOptions(context: Context,
+                                commentEntity: CommentEntity,
+                                showConversation: Boolean,
+                                videoId: String,
+                                listener: OnCommentCallBackListener?) {
+        showCommentOptions(context = context,
+                commentEntity = commentEntity,
+                showConversation = showConversation,
+                videoId = videoId,
+                listener = listener)
+    }
+
+    private fun showCommentOptions(context: Context,
+                                   commentEntity: CommentEntity,
+                                   showConversation: Boolean,
+                                   articleId: String? = null,
+                                   communityId: String? = null,
+                                   answerId: String? = null,
+                                   videoId: String? = null,
+                                   listener: OnCommentCallBackListener? = null) {
         val dialogOptions = ArrayList<String>()
 
-        if (commentEntity.me == null || !commentEntity.me?.isAnswerCommented!!) {
+        if (commentEntity.me == null || !commentEntity.me?.isCommentOwner!!) {
             dialogOptions.add("回复")
         }
 
         dialogOptions.add("复制")
-        dialogOptions.add("举报")
+        dialogOptions.add("投诉")
 
         commentEntity.me?.let {
-            if (it.isModerator && (
-                            it.moderatorPermissions.contains(MeEntity.HIDE_ANSWER_COMMENT)
-                                    || it.moderatorPermissions.contains(MeEntity.TOP_ANSWER_COMMENT))) {
+            if (it.isModerator || (it.moderatorPermissions.hideAnswerComment > Permissions.GUEST
+                            || it.moderatorPermissions.topAnswerComment > Permissions.GUEST
+                            || it.moderatorPermissions.hideCommunityArticleComment > Permissions.GUEST
+                            || it.moderatorPermissions.topCommunityArticleComment > Permissions.GUEST)) {
                 dialogOptions.add("管理")
             }
         }
@@ -116,7 +95,7 @@ object CommentHelper {
 
         DialogUtils.showListDialog(context, dialogOptions, null) {
             when (it) {
-                "管理" -> showControlDialog(context, answerId, commentEntity, commentEntity.me!!)
+                "管理" -> showControlDialog(context, answerId, articleId, communityId, commentEntity, commentEntity.me!!)
 
                 "回复" -> {
                     context.ifLogin("回答详情-评论-回复") {
@@ -132,58 +111,102 @@ object CommentHelper {
 
                 "复制" -> copyText(commentEntity.content, context)
 
-                "举报" -> context.ifLogin("回答详情-评论-举报") {
-                    showReportTypeDialog(context) { reportType ->
-                        PostCommentUtils.postAnswerReportData(context, commentEntity.id, answerId, reportType,
-                                object : PostCommentUtils.PostCommentListener {
-                                    override fun postSuccess(response: JSONObject?) {
-                                        Utils.toast(context, "感谢您的举报")
-                                    }
+                "投诉" -> {
+                    context.ifLogin("回答详情-评论-投诉") {
+                        showReportTypeDialog(context) { reportType ->
 
-                                    override fun postFailed(error: Throwable?) {
-                                        if (error == null) {
-                                            Utils.toast(context, "举报失败，请稍后重试")
-                                        } else {
-                                            Utils.toast(context, "举报失败，${error.message}")
-                                        }
+                            val commentListener = object : PostCommentUtils.PostCommentListener {
+                                override fun postSuccess(response: JSONObject?) {
+                                    Utils.toast(context, "感谢您的投诉")
+                                }
+
+                                override fun postFailed(error: Throwable?) {
+                                    if (error == null) {
+                                        Utils.toast(context, "投诉失败，请稍后重试")
+                                    } else {
+                                        Utils.toast(context, "投诉失败，${error.message}")
                                     }
-                                })
+                                }
+                            }
+
+                            if (answerId != null) {
+                                PostCommentUtils.postAnswerReportData(context, commentEntity.id, answerId, reportType, commentListener)
+                            } else if (articleId != null) {
+                                PostCommentUtils.reportCommunityArticleComment(context, communityId, articleId, commentEntity.id, reportType, commentListener)
+                            } else {
+                                PostCommentUtils.reportVideoComment(context, videoId, commentEntity.id, reportType, commentListener)
+                            }
+                        }
                     }
                 }
 
                 "查看对话" -> {
-                    context.startActivity(CommentDetailActivity
-                            .getAnswerCommentIntent(context, commentEntity.id, answerId, null))
+                    if (answerId != null) {
+                        context.startActivity(CommentDetailActivity
+                                .getAnswerCommentIntent(context, commentEntity.id, answerId, null))
+                    } else if (articleId != null) {
+                        context.startActivity(CommentDetailActivity
+                                .getCommunityArticleCommentIntent(context, articleId, commentEntity.id, communityId, null))
+                    } else {
+                        context.startActivity(CommentDetailActivity
+                                .getVideoCommentIntent(context, commentEntity.id, videoId, null))
+                    }
                 }
             }
         }
     }
 
-    private fun showControlDialog(context: Context, answerId: String, comment: CommentEntity, me: MeEntity) {
+    private fun showControlDialog(context: Context,
+                                  answerId: String? = null,
+                                  articleId: String? = null,
+                                  communityId: String? = null,
+                                  comment: CommentEntity,
+                                  me: MeEntity) {
         val dialogOptions = arrayListOf<String>()
         val highlight = "置顶评论"
         val hide = "隐藏评论"
 
-        if (me.moderatorPermissions.contains(MeEntity.TOP_ANSWER_COMMENT)) {
+        var canHighlightCommentDirectly = false
+        var canHideCommentDirectly = false
+
+        if (me.moderatorPermissions.topAnswerComment > Permissions.GUEST
+                || me.moderatorPermissions.topCommunityArticleComment > Permissions.GUEST) {
             dialogOptions.add(highlight)
+            if (me.moderatorPermissions.topAnswerComment > Permissions.REPORTER
+                    || me.moderatorPermissions.topCommunityArticleComment > Permissions.REPORTER) {
+                canHighlightCommentDirectly = true
+            }
         }
 
-        if (me.moderatorPermissions.contains(MeEntity.HIDE_ANSWER_COMMENT)) {
+        if (me.moderatorPermissions.hideAnswerComment > Permissions.GUEST
+                || me.moderatorPermissions.hideCommunityArticleComment > Permissions.GUEST) {
             dialogOptions.add(hide)
+            if (me.moderatorPermissions.hideAnswerComment > Permissions.REPORTER
+                    || me.moderatorPermissions.hideCommunityArticleComment > Permissions.REPORTER) {
+                canHideCommentDirectly = true
+            }
         }
 
-        val content = if (me.moderatorLevel == MeEntity.MODERATOR_LEVEL_PRIMARY) {
-            "你的操作将提交给小编审核，确定提交吗？"
-        } else {
+        val highlightDialogHintContent = if (canHighlightCommentDirectly) {
             "你的操作将立即生效，确定提交吗？（你的管理权限为：高级）"
+        } else {
+            "你的操作将提交给小编审核，确定提交吗？"
+        }
+
+        val hideDialogHintContent = if (canHideCommentDirectly) {
+            "你的操作将立即生效，确定提交吗？（你的管理权限为：高级）"
+        } else {
+            "你的操作将提交给小编审核，确定提交吗？"
         }
 
         val disabledOptions = arrayListOf<String>()
+
         if (comment.priority != 0) {
             disabledOptions.add(highlight)
         }
+
         comment.me?.let {
-            if (it.isAnswerCommented) {
+            if (it.isCommentOwner) {
                 disabledOptions.add(highlight)
             }
         }
@@ -191,90 +214,113 @@ object CommentHelper {
         DialogUtils.showListDialog(context, dialogOptions, disabledOptions) {
             when (it) {
                 highlight -> {
-
                     if (comment.priority != 0) {
                         Utils.toast(context, "评论已经置顶")
                         return@showListDialog
                     }
 
                     comment.me?.let { me ->
-                        if (me.isAnswerCommented) {
+                        if (me.isCommentOwner) {
                             Utils.toast(context, "不能置顶自己的评论")
                             return@showListDialog
                         }
                     }
 
-                    DialogUtils.showAlertDialog(context, highlight, content,
-                            "确定", "取消",
-                            {
-                                RetrofitManager.getInstance(context).api
-                                        .highlightAnswerComment(answerId, comment.id)
-                                        .observeOn(AndroidSchedulers.mainThread())
-                                        .subscribeOn(Schedulers.io())
-                                        .subscribe(object : Response<ResponseBody>() {
-                                            override fun onResponse(response: ResponseBody?) {
-                                                if (me.moderatorLevel == MeEntity.MODERATOR_LEVEL_PRIMARY) {
-                                                    Utils.toast(context, "提交成功")
-                                                } else {
-                                                    Utils.toast(context, "置顶成功，请刷新列表")
-                                                }
-                                            }
+                    val highlightObserver = object : Response<ResponseBody>() {
+                        override fun onResponse(response: ResponseBody?) {
+                            if (canHighlightCommentDirectly) {
+                                Utils.toast(context, "置顶成功，请刷新列表")
+                            } else {
+                                Utils.toast(context, "提交成功")
+                            }
+                        }
 
-                                            override fun onFailure(e: HttpException?) {
-                                                super.onFailure(e)
-                                                e?.let { httpException ->
-                                                    if (httpException.code() == 403) {
-                                                        val string = e.response().errorBody()?.string()
-                                                        val errorJson = JSONObject(string)
-                                                        val errorCode = errorJson.getInt("code")
-                                                        if (errorCode == 403059) {
-                                                            Utils.toast(getApplication(), "权限错误，请刷新后重试")
-                                                            return
-                                                        } else {
-                                                            Utils.toast(getApplication(), e.message())
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        })
-                            }, null)
+                        override fun onFailure(e: HttpException?) {
+                            super.onFailure(e)
+                            e?.let { httpException ->
+                                if (httpException.code() == 403) {
+                                    val string = e.response().errorBody()?.string()
+                                    val errorJson = JSONObject(string)
+                                    val errorCode = errorJson.getInt("code")
+                                    if (errorCode == 403059) {
+                                        Utils.toast(getApplication(), "权限错误，请刷新后重试")
+                                        return
+                                    } else {
+                                        Utils.toast(getApplication(), e.message())
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    if (answerId != null) {
+                        DialogUtils.showAlertDialog(context, highlight, highlightDialogHintContent,
+                                "确定", "取消", {
+                            RetrofitManager.getInstance(context).api
+                                    .highlightAnswerComment(answerId, comment.id)
+                                    .observeOn(AndroidSchedulers.mainThread())
+                                    .subscribeOn(Schedulers.io())
+                                    .subscribe(highlightObserver)
+                        }, null)
+                    } else {
+                        DialogUtils.showAlertDialog(context, highlight, highlightDialogHintContent,
+                                "确定", "取消", {
+                            RetrofitManager.getInstance(context).api
+                                    .highlightCommunityArticleComment(communityId, articleId, comment.id)
+                                    .observeOn(AndroidSchedulers.mainThread())
+                                    .subscribeOn(Schedulers.io())
+                                    .subscribe(highlightObserver)
+                        }, null)
+                    }
                 }
 
                 hide -> {
-                    DialogUtils.showAlertDialog(context, hide, content,
-                            "确定", "取消",
-                            {
-                                RetrofitManager.getInstance(context).api
-                                        .hideAnswerComment(answerId, comment.id)
-                                        .observeOn(AndroidSchedulers.mainThread())
-                                        .subscribeOn(Schedulers.io())
-                                        .subscribe(object : Response<ResponseBody>() {
-                                            override fun onResponse(response: ResponseBody?) {
-                                                if (me.moderatorLevel == MeEntity.MODERATOR_LEVEL_PRIMARY) {
-                                                    Utils.toast(context, "提交成功")
-                                                } else {
-                                                    Utils.toast(context, "隐藏成功，请刷新列表")
-                                                }
-                                            }
+                    val hideObserver = object : Response<ResponseBody>() {
+                        override fun onResponse(response: ResponseBody?) {
+                            if (canHideCommentDirectly) {
+                                Utils.toast(context, "隐藏成功，请刷新列表")
+                            } else {
+                                Utils.toast(context, "提交成功")
+                            }
+                        }
 
-                                            override fun onFailure(e: HttpException?) {
-                                                super.onFailure(e)
-                                                e?.let { httpException ->
-                                                    if (httpException.code() == 403) {
-                                                        val string = e.response().errorBody()?.string()
-                                                        val errorJson = JSONObject(string)
-                                                        val errorCode = errorJson.getInt("code")
-                                                        if (errorCode == 403059) {
-                                                            Utils.toast(getApplication(), "权限错误，请刷新后重试")
-                                                            return
-                                                        } else {
-                                                            Utils.toast(getApplication(), e.message())
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        })
-                            }, null)
+                        override fun onFailure(e: HttpException?) {
+                            super.onFailure(e)
+                            e?.let { httpException ->
+                                if (httpException.code() == 403) {
+                                    val string = e.response().errorBody()?.string()
+                                    val errorJson = JSONObject(string)
+                                    val errorCode = errorJson.getInt("code")
+                                    if (errorCode == 403059) {
+                                        Utils.toast(getApplication(), "权限错误，请刷新后重试")
+                                        return
+                                    } else {
+                                        Utils.toast(getApplication(), e.message())
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    if (answerId != null) {
+                        DialogUtils.showAlertDialog(context, hide, hideDialogHintContent,
+                                "确定", "取消", {
+                            RetrofitManager.getInstance(context).api
+                                    .hideAnswerComment(answerId, comment.id)
+                                    .observeOn(AndroidSchedulers.mainThread())
+                                    .subscribeOn(Schedulers.io())
+                                    .subscribe(hideObserver)
+                        }, null)
+                    } else {
+                        DialogUtils.showAlertDialog(context, hide, hideDialogHintContent,
+                                "确定", "取消", {
+                            RetrofitManager.getInstance(context).api
+                                    .hideCommunityArticleComment(communityId, articleId, comment.id)
+                                    .observeOn(AndroidSchedulers.mainThread())
+                                    .subscribeOn(Schedulers.io())
+                                    .subscribe(hideObserver)
+                        }, null)
+                    }
                 }
             }
         }

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

@@ -1,11 +1,10 @@
 package com.gh.common.util;
 
+import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.graphics.Color;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.Window;
@@ -20,16 +19,19 @@ import com.gh.gamecenter.adapter.OnCommentCallBackListener;
 import com.gh.gamecenter.adapter.viewholder.CommentViewHolder;
 import com.gh.gamecenter.entity.CommentEntity;
 import com.gh.gamecenter.entity.MeEntity;
-import com.gh.gamecenter.entity.RatingComment;
 import com.gh.gamecenter.entity.UserInfoEntity;
 import com.gh.gamecenter.manager.UserManager;
-import com.gh.gamecenter.retrofit.Response;
+import com.gh.gamecenter.retrofit.BiResponse;
 import com.gh.gamecenter.retrofit.RetrofitManager;
+import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
 
+import org.jetbrains.annotations.NotNull;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.IOException;
+import java.lang.ref.WeakReference;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -37,10 +39,9 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
+import androidx.core.content.ContextCompat;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
-import okhttp3.MediaType;
-import okhttp3.RequestBody;
 import okhttp3.ResponseBody;
 import retrofit2.HttpException;
 
@@ -80,111 +81,6 @@ public class CommentUtils {
         }
     }
 
-    public static void showGameCommentOptions(final Context context,
-                                              final RatingComment comment,
-                                              final String gameId,
-                                              final String entrance) {
-
-        final Dialog dialog = new Dialog(context);
-
-        LinearLayout container = new LinearLayout(context);
-        container.setOrientation(LinearLayout.VERTICAL);
-        container.setBackgroundColor(Color.WHITE);
-        container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
-
-        List<String> dialogType = new ArrayList<>();
-
-        dialogType.add("复制");
-        dialogType.add("举报");
-
-
-        for (String s : dialogType) {
-            final TextView reportTv = new TextView(context);
-            reportTv.setText(s);
-            reportTv.setTextSize(17);
-            reportTv.setTextColor(ContextCompat.getColor(context, R.color.title));
-            reportTv.setBackgroundResource(R.drawable.textview_white_style);
-            int widthPixels = context.getResources().getDisplayMetrics().widthPixels;
-            reportTv.setLayoutParams(new LinearLayout.LayoutParams((widthPixels * 9) / 10,
-                    LinearLayout.LayoutParams.WRAP_CONTENT));
-            reportTv.setPadding(DisplayUtils.dip2px(context, 20), DisplayUtils.dip2px(context, 12),
-                    0, DisplayUtils.dip2px(context, 12));
-            container.addView(reportTv);
-
-            reportTv.setOnClickListener(v -> {
-                dialog.cancel();
-                switch (reportTv.getText().toString()) {
-                    case "复制":
-                        copyText(comment.getContent(), context);
-                        break;
-                    case "举报":
-                        CheckLoginUtils.checkLogin(context, entrance, () -> showGameCommentReportDialog(gameId, comment, context));
-                        break;
-                }
-            });
-        }
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(container);
-        dialog.show();
-    }
-
-    private static void showGameCommentReportDialog(final String gameId, final RatingComment comment, final Context context) {
-        final String[] arrReportType = new String[]{"垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息",
-                "违法有害信息", "其它"};
-        int widthPixels = context.getResources().getDisplayMetrics().widthPixels;
-
-        final Dialog reportTypeDialog = new Dialog(context);
-        LinearLayout container = new LinearLayout(context);
-        container.setOrientation(LinearLayout.VERTICAL);
-        container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
-        container.setBackgroundColor(Color.WHITE);
-
-        for (final String s : arrReportType) {
-            TextView reportTypeTv = new TextView(context);
-            reportTypeTv.setText(s);
-            reportTypeTv.setTextSize(17);
-            reportTypeTv.setTextColor(ContextCompat.getColor(context, R.color.title));
-            reportTypeTv.setBackgroundResource(R.drawable.textview_white_style);
-            reportTypeTv.setLayoutParams(new LinearLayout.LayoutParams((widthPixels * 9) / 10,
-                    LinearLayout.LayoutParams.WRAP_CONTENT));
-            reportTypeTv.setPadding(DisplayUtils.dip2px(context, 20), DisplayUtils.dip2px(context, 12),
-                    0, DisplayUtils.dip2px(context, 12));
-            container.addView(reportTypeTv);
-
-            reportTypeTv.setOnClickListener(v -> {
-                JSONObject jsonObject = new JSONObject();
-                try {
-                    jsonObject.put("reason", s);
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                }
-                RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
-                RetrofitManager.getInstance(context).getApi()
-                        .reportGameComment(gameId, comment.getId(), body)
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(new Response<ResponseBody>() {
-                            @Override
-                            public void onResponse(@Nullable ResponseBody response) {
-                                Utils.toast(context, "感谢您的举报");
-                            }
-
-                            @Override
-                            public void onFailure(@Nullable HttpException e) {
-                                Utils.toast(context, "举报失败，请先检查网络设置");
-                            }
-                        });
-
-                reportTypeDialog.cancel();
-            });
-        }
-
-        reportTypeDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        reportTypeDialog.setContentView(container);
-        reportTypeDialog.show();
-    }
-
 
     public static void showReportDialog(final CommentEntity commentEntity,
                                         final Context context,
@@ -201,12 +97,12 @@ public class CommentUtils {
 
         List<String> dialogType = new ArrayList<>();
 
-        if (commentEntity.getMe() == null || !commentEntity.getMe().isCommentOwn()) {
+        if (commentEntity.getMe() == null || !commentEntity.getMe().isCommentOwner()) {
             dialogType.add("回复");
         }
 
         dialogType.add("复制");
-        dialogType.add("举报");
+        dialogType.add("投诉");
 
         if (commentEntity.getParent() != null && showConversation) {
             dialogType.add("查看对话");
@@ -244,8 +140,8 @@ public class CommentUtils {
                         case "复制":
                             copyText(commentEntity.getContent(), context);
                             break;
-                        case "举报":
-                            CheckLoginUtils.checkLogin(context, patch + "-举报",
+                        case "投诉":
+                            CheckLoginUtils.checkLogin(context, patch + "-投诉",
                                     () -> showReportTypeDialog(commentEntity, context));
 
                             break;
@@ -263,135 +159,6 @@ public class CommentUtils {
 
     }
 
-//    public static void showAnswerCommentOptions(final CommentEntity commentEntity, final Context context,
-//                                                final OnCommentCallBackListener listener, final String id,
-//                                                boolean showConversation, String answerId, String articleId, String articleCommunityId) {
-//
-//        final Dialog dialog = new Dialog(context);
-//
-//        LinearLayout container = new LinearLayout(context);
-//        container.setOrientation(LinearLayout.VERTICAL);
-//        container.setBackgroundColor(Color.WHITE);
-//        container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
-//
-//        List<String> dialogType = new ArrayList<>();
-//
-//        if (commentEntity.getMe() == null || !commentEntity.getMe().isAnswerCommented()) {
-//            dialogType.add("回复");
-//        }
-//
-//        dialogType.add("复制");
-//        dialogType.add("举报");
-//
-//        if (commentEntity.getParentUser() != null && showConversation) {
-//            dialogType.add("查看对话");
-//        }
-//
-//        for (String s : dialogType) {
-//            final TextView reportTv = new TextView(context);
-//            reportTv.setText(s);
-//            reportTv.setTextSize(17);
-//            reportTv.setTextColor(ContextCompat.getColor(context, R.color.title));
-//            reportTv.setBackgroundResource(R.drawable.textview_white_style);
-//            int widthPixels = context.getResources().getDisplayMetrics().widthPixels;
-//            reportTv.setLayoutParams(new LinearLayout.LayoutParams((widthPixels * 9) / 10,
-//                    LinearLayout.LayoutParams.WRAP_CONTENT));
-//            reportTv.setPadding(DisplayUtils.dip2px(context, 20), DisplayUtils.dip2px(context, 12),
-//                    0, DisplayUtils.dip2px(context, 12));
-//            container.addView(reportTv);
-//
-//            reportTv.setOnClickListener(v -> {
-//                dialog.cancel();
-//                switch (reportTv.getText().toString()) {
-//                    case "回复":
-//                        CheckLoginUtils.checkLogin(context, () -> {
-//                            if (listener != null) {
-//                                listener.onCommentCallback(commentEntity);
-//                            } else if (!TextUtils.isEmpty(id)) {
-//                                context.startActivity(MessageDetailActivity.getMessageDetailIntent(context, commentEntity, id));
-//                            } else {
-//                                Utils.toast(context, "缺少关键属性");
-//                            }
-//                        });
-//                        break;
-//                    case "复制":
-//                        copyText(commentEntity.getContent(), context);
-//                        break;
-//                    case "举报":
-//                        CheckLoginUtils.checkLogin(context, () -> showAnswerReportDialog(answerId, commentEntity, context));
-//                        break;
-//                    case "查看对话":
-//                        if (TextUtils.isEmpty(articleId)) {
-//                            context.startActivity(CommentDetailActivity.getAnswerCommentIntent(context, commentEntity.getId(), answerId, null));
-//                        } else {
-//                            context.startActivity(CommentDetailActivity.getCommunityArticleCommentIntent(context, articleId, commentEntity.getId(), articleCommunityId, null));
-//                        }
-//                        break;
-//                }
-//            });
-//        }
-//
-//        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-//        dialog.setContentView(container);
-//        dialog.show();
-//    }
-
-//    private static void showAnswerReportDialog(final String answerId, final CommentEntity commentEntity, final Context context) {
-//        final String[] arrReportType = new String[]{"垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息",
-//                "违法有害信息", "其它"};
-//        int widthPixels = context.getResources().getDisplayMetrics().widthPixels;
-//
-//        final Dialog reportTypeDialog = new Dialog(context);
-//        LinearLayout container = new LinearLayout(context);
-//        container.setOrientation(LinearLayout.VERTICAL);
-//        container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
-//        container.setBackgroundColor(Color.WHITE);
-//
-//        for (final String s : arrReportType) {
-//            TextView reportTypeTv = new TextView(context);
-//            reportTypeTv.setText(s);
-//            reportTypeTv.setTextSize(17);
-//            reportTypeTv.setTextColor(ContextCompat.getColor(context, R.color.title));
-//            reportTypeTv.setBackgroundResource(R.drawable.textview_white_style);
-//            reportTypeTv.setLayoutParams(new LinearLayout.LayoutParams((widthPixels * 9) / 10,
-//                    LinearLayout.LayoutParams.WRAP_CONTENT));
-//            reportTypeTv.setPadding(DisplayUtils.dip2px(context, 20), DisplayUtils.dip2px(context, 12),
-//                    0, DisplayUtils.dip2px(context, 12));
-//            container.addView(reportTypeTv);
-//
-//            reportTypeTv.setOnClickListener(v -> {
-//                JSONObject jsonObject = new JSONObject();
-//                try {
-//                    jsonObject.put("reason", s);
-//                } catch (JSONException e) {
-//                    e.printStackTrace();
-//                }
-//
-//                PostCommentUtils.postAnswerReportData(context, commentEntity.getId(), answerId, jsonObject.toString(),
-//                        new PostCommentUtils.PostCommentListener() {
-//                            @Override
-//                            public void postSuccess(JSONObject response) {
-//                                Utils.toast(context, "感谢您的举报");
-//                            }
-//
-//                            @Override
-//                            public void postFailed(Throwable error) {
-//                                if (error != null) {
-//                                    Utils.toast(context, "举报失败" + error.getMessage());
-//                                } else {
-//                                    Utils.toast(context, "举报失败，请稍候重试");
-//                                }
-//                            }
-//                        });
-//                reportTypeDialog.cancel();
-//            });
-//        }
-//
-//        reportTypeDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-//        reportTypeDialog.setContentView(container);
-//        reportTypeDialog.show();
-//    }
-
     private static void showReportTypeDialog(final CommentEntity commentEntity, final Context context) {
         final String[] arrReportType = new String[]{"垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息",
                 "违法有害信息", "其它"};
@@ -430,12 +197,12 @@ public class CommentUtils {
                             new PostCommentUtils.PostCommentListener() {
                                 @Override
                                 public void postSuccess(JSONObject response) {
-                                    Utils.toast(context, "感谢您的举报");
+                                    Utils.toast(context, "感谢您的投诉");
                                 }
 
                                 @Override
                                 public void postFailed(Throwable error) {
-                                    Utils.toast(context, "举报失败，请检查网络设置");
+                                    Utils.toast(context, "投诉失败，请检查网络设置");
                                 }
                             });
                     reportTypeDialog.cancel();
@@ -458,7 +225,7 @@ public class CommentUtils {
         commentEntity.setVote(commentEntity.getVote() + 1);
         commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme));
         commentLikeIv.setImageResource(R.drawable.vote_icon_select);
-        commentLikeCountTv.setText(String.valueOf(commentEntity.getVote()));
+        commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
         commentLikeCountTv.setVisibility(View.VISIBLE);
 
         PostCommentUtils.addCommentVote(context, commentEntity.getId(),
@@ -476,7 +243,7 @@ public class CommentUtils {
                         commentEntity.setVote(commentEntity.getVote() - 1);
                         commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
                         commentLikeIv.setImageResource(R.drawable.vote_icon_unselect);
-                        commentLikeCountTv.setText(String.valueOf(commentEntity.getVote()));
+                        commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
                         if (commentEntity.getVote() == 0) {
                             commentLikeCountTv.setVisibility(View.GONE);
                         } else {
@@ -502,9 +269,15 @@ public class CommentUtils {
                 });
     }
 
-    public static void postVoteToAnswerComment(final Context context, String answerId, String articleId,
-                                               String articleCommunityId, final CommentEntity commentEntity,
-                                               final TextView commentLikeCountTv, final ImageView commentLikeIv, final OnVoteListener listener) {
+    public static void likeComment(final Context context,
+                                   String answerId,
+                                   String articleId,
+                                   String articleCommunityId,
+                                   String videoId,
+                                   final CommentEntity commentEntity,
+                                   final TextView commentLikeCountTv,
+                                   final ImageView commentLikeIv,
+                                   final OnVoteListener listener) {
 
         String entrance = "回答详情-评论-点赞";
         if (TextUtils.isEmpty(articleId)) {
@@ -518,10 +291,10 @@ public class CommentUtils {
             commentEntity.setVote(commentEntity.getVote() + 1);
             commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme));
             commentLikeIv.setImageResource(R.drawable.vote_icon_select);
-            commentLikeCountTv.setText(String.valueOf(commentEntity.getVote()));
+            commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
             commentLikeCountTv.setVisibility(View.VISIBLE);
 
-            PostCommentUtils.voteAnswerComment(context, answerId, articleId, articleCommunityId, commentEntity.getId(),
+            PostCommentUtils.likeComment(context, answerId, articleId, articleCommunityId, videoId, commentEntity.getId(),
                     new PostCommentUtils.PostCommentListener() {
                         @Override
                         public void postSuccess(JSONObject response) {
@@ -532,11 +305,10 @@ public class CommentUtils {
 
                         @Override
                         public void postFailed(Throwable e) {
-
                             commentEntity.setVote(commentEntity.getVote() - 1);
                             commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
                             commentLikeIv.setImageResource(R.drawable.vote_icon_unselect);
-                            commentLikeCountTv.setText(String.valueOf(commentEntity.getVote()));
+                            commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
                             if (commentEntity.getVote() == 0) {
                                 commentLikeCountTv.setVisibility(View.GONE);
                             } else {
@@ -573,7 +345,7 @@ public class CommentUtils {
         if (entity.getVote() == 0) {
             holder.commentLikeCountTv.setVisibility(View.GONE);
         } else { // 检查是否已点赞
-            if (userDataEntity != null && (userDataEntity.isCommentVoted() || userDataEntity.isAnswerCommentVoted())) {
+            if (userDataEntity != null && (userDataEntity.isCommentVoted())) {
                 holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, R.color.theme));
                 holder.commentLikeIv.setImageResource(R.drawable.vote_icon_select);
             }
@@ -581,10 +353,20 @@ public class CommentUtils {
             holder.commentLikeCountTv.setText(NumberUtils.transSimpleCount(entity.getVote()));
         }
 
+        if (entity.getUser().getBadge() != null) {
+            holder.userBadgeSdv.setVisibility(View.VISIBLE);
+            holder.badgeNameTv.setVisibility(View.VISIBLE);
+            ImageUtils.display(holder.userBadgeSdv, entity.getUser().getBadge().getIcon());
+            holder.badgeNameTv.setText(entity.getUser().getBadge().getName());
+        } else {
+            holder.userBadgeSdv.setVisibility(View.GONE);
+            holder.badgeNameTv.setVisibility(View.GONE);
+        }
+
         //检查是否是自身评论
         UserInfoEntity userInfo = UserManager.getInstance().getUserInfoEntity();
-        if (userDataEntity != null && userDataEntity.isCommentOwn() && userInfo != null) {
-            if (entity.getMe() != null && entity.getMe().isAnswerOwn()) {
+        if (userDataEntity != null && userDataEntity.isCommentOwner() && userInfo != null) {
+            if (entity.getMe() != null && entity.getMe().isContentOwner()) {
                 holder.commentUserNameTv.setText(userInfo.getName() + "（作者）");
             } else {
                 holder.commentUserNameTv.setText(userInfo.getName());
@@ -596,7 +378,7 @@ public class CommentUtils {
             }
             ImageUtils.displayIcon(holder.commentUserIconDv, userInfo.getIcon());
         } else {
-            if (entity.getMe() != null && entity.getMe().isAnswerOwn()) {
+            if (entity.getMe() != null && entity.getMe().isContentOwner()) {
                 holder.commentUserNameTv.setText(entity.getUser().getName() + "（作者）");
             } else {
                 holder.commentUserNameTv.setText(entity.getUser().getName());
@@ -614,6 +396,36 @@ public class CommentUtils {
         }
     }
 
+    @SuppressLint("CheckResult")
+    public static void isUserCommentedOnThisGame(String gameId, WeakReference<SimpleCallback<Boolean>> callback) {
+        RetrofitManager.getInstance(HaloApp.getInstance().getApplication())
+                .getApi()
+                .isUserCommentedOnThisGame(UserManager.getInstance().getUserId(), gameId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new BiResponse<ResponseBody>() {
+                    @Override
+                    public void onSuccess(ResponseBody data) {
+                        SimpleCallback<Boolean> cb = callback.get();
+                        if (cb != null) {
+                            try {
+                                JSONObject object = new JSONObject(data.string());
+                                cb.onCallback(object.getBoolean("status"));
+                            } catch (JSONException e) {
+                                e.printStackTrace();
+                            } catch (IOException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(@NotNull Exception exception) {
+                        Utils.toast(HaloApp.getInstance().getApplication(), "网络异常");
+                    }
+                });
+    }
+
     //复制文字
     public static void copyText(String copyContent, Context context) {
         ClipboardManager cmb = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);

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

@@ -1,45 +1,47 @@
 package com.gh.common.util
 
-import com.gh.gamecenter.qa.entity.AskGameSelectEntity
-import com.gh.gamecenter.retrofit.Response
-import com.gh.gamecenter.retrofit.RetrofitManager
-import com.halo.assistant.HaloApp
-import io.reactivex.schedulers.Schedulers
+import com.gh.gamecenter.packagehelper.PackageRepository
+import com.gh.gamecenter.qa.entity.CommunitySelectEntity
 
-/**
- * 用于判断社区跳转前社区是否可用
- */
 object CommunityHelper {
 
-    private var availableCommunityList = listOf<AskGameSelectEntity>()
+    /**
+     * 为已开通的社区排序
+     * 排序规则为将本地存在已安装游戏或已关联游戏的社区置顶
+     */
+    fun sortOpenedCommunity(rawList: List<CommunitySelectEntity>?): ArrayList<CommunitySelectEntity> {
+        val sortedList = ArrayList<CommunitySelectEntity>()
+        rawList?.let {
+            for (game in rawList) {
+                var thisGameIsInstalled = false
+                for (installGame in PackageRepository.gameInstalled) {
+                    if (PackageHelper.downloadPackageNameBlackList.contains(installGame.packageName)) {
+                        continue
+                    }
 
-    @JvmStatic
-    fun getAvailableCommunityList() {
-        RetrofitManager.getInstance(HaloApp.getInstance().application).api
-                .getAskGameSelect(HaloApp.getInstance().channel
-                        , UrlFilterUtils.getFilterQuery("status", "opened"), 1, 100)
-                .subscribeOn(Schedulers.io())
-                .subscribe(object : Response<List<AskGameSelectEntity>>() {
-                    override fun onResponse(response: List<AskGameSelectEntity>?) {
-                        if (response != null && response.isNotEmpty()) {
-                            availableCommunityList = response
+                    // 判断是否已安装
+                    if (installGame.id == game.game.id) {
+                        thisGameIsInstalled = true
+                        break
+                    }
+
+                    // 判断是否关联了别游戏
+                    for (relatedGameId in game.game.relation) {
+                        if (installGame.id == relatedGameId) {
+                            thisGameIsInstalled = true
+                            break
                         }
                     }
-                })
-    }
+                }
 
-    @JvmStatic
-    fun isCommunityAvailable(communityId: String?): Boolean {
-        communityId?.let {
-            if (availableCommunityList.isEmpty()) return true
-            for (entity in availableCommunityList) {
-                if (communityId == entity.id) {
-                    return true
+                // 将已安装的置顶
+                if (thisGameIsInstalled) {
+                    sortedList.add(0, game)
+                } else {
+                    sortedList.add(game)
                 }
             }
         }
-
-        return false
+        return sortedList
     }
-
 }

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

@@ -29,12 +29,12 @@ object CompressImageUtils {
      */
     @Throws(Exception::class)
     fun compressImageAndSaveToFile(imageFile: File, compressGif: Boolean): File {
-        // 小于300K直接返回原图
+        // 小于某一个设定的值时，直接返回原图
         if (imageFile.length() < getImageSetting().processLimitSize) {
             return imageFile
         }
 
-        val cacheDir = getImageCacheDir()
+        val cacheDir = getImageCachePatch()
         val parentFile = cacheDir.parentFile
         if (!parentFile.exists()) parentFile.mkdirs()
         var fileOutputStream: FileOutputStream? = null
@@ -55,6 +55,10 @@ object CompressImageUtils {
             fileOutputStream = FileOutputStream(cacheDir)
             // write the compressed bitmap at the destination specified by destinationPath.
             decodeSampledBitmapFromFile(imageFile).compress(formatType, getImageSetting().quality, fileOutputStream)
+
+            if (cacheDir.length() == 0L) {
+                return imageFile //预防压缩失败
+            }
             return cacheDir
         } catch (e: Exception) {
             e.printStackTrace()
@@ -70,7 +74,7 @@ object CompressImageUtils {
         return imageFile
     }
 
-    private fun getImageCacheDir(): File {
+    private fun getImageCachePatch(): File {
 //        return File(Environment.getExternalStorageDirectory().absolutePath + "/Pictures/test/" + System.currentTimeMillis() + ".jpg")
         // 统一用jpg保存应该没有影响吧
         return File(HaloApp.getInstance().application.cacheDir.absolutePath + File.separator + System.currentTimeMillis() + ".jpg")
@@ -103,7 +107,6 @@ object CompressImageUtils {
             } else {
                 inSampleSize = if (longSide / compressLimit == 0) 1 else longSide / compressLimit
                 compressType = CompressType.LIMIT_LONG // 纵向长方形
-
             }
         } else if (longSide > compressLimit && shortSide < compressLimit) {
             if (scale <= getImageSetting().ratio) {
@@ -136,14 +139,18 @@ object CompressImageUtils {
                 }
             }
             matrix.setScale(targetMatrixScale, targetMatrixScale)
-            scaledBitmap = Bitmap.createBitmap(scaledBitmap, 0, 0, scaledBitmap.width, scaledBitmap.height, matrix, true)
+            try {
+                scaledBitmap = Bitmap.createBitmap(scaledBitmap, 0, 0, scaledBitmap.width, scaledBitmap.height, matrix, true)
+            } catch (ignore: OutOfMemoryError) {
+
+            }
         }
         return scaledBitmap
     }
 
-    fun getImageSetting(): SettingsEntity.Image {
+    private fun getImageSetting(): SettingsEntity.Image {
         val settings = Config.getSettings()
-        if (settings == null && settings?.image != null) {
+        if (settings?.image != null) {
             return settings.image!!
         }
         val image = SettingsEntity.Image()

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

@@ -2,7 +2,6 @@ package com.gh.common.util;
 
 import android.content.Context;
 import android.content.Intent;
-import android.view.View;
 import android.widget.LinearLayout;
 
 import com.facebook.drawee.drawable.ScalingUtils;
@@ -93,12 +92,9 @@ public class ConcernContentUtils {
                         ScalingUtils.ScaleType.CENTER_CROP, list.get(position));
                 break;
         }
-        imageView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent checkIntent = ViewImageActivity.getViewImageIntent(context, (ArrayList<String>) list, position, entrance);
-                context.startActivity(checkIntent);
-            }
+        imageView.setOnClickListener(v -> {
+            Intent checkIntent = ViewImageActivity.getViewImageIntent(context, (ArrayList<String>) list, position, entrance);
+            context.startActivity(checkIntent);
         });
         return imageView;
     }

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

@@ -1,6 +1,7 @@
 package com.gh.common.util
 
 import android.content.Context
+import android.text.TextUtils
 import com.gh.gamecenter.eventbus.EBConcernChanged
 import com.gh.gamecenter.manager.UserManager
 import com.gh.gamecenter.retrofit.Response
@@ -20,9 +21,17 @@ import retrofit2.HttpException
  */
 object ConcernUtils {
 
-    fun postConcernGameId(context: Context, gameId: String, listener: onConcernListener?) {
-        RetrofitManager.getInstance(context).getApi()
-                .postConcern(UserManager.getInstance().userId, gameId)
+    /**
+     * autoConcern:是否自动关注'关联关注'
+     */
+    fun postConcernGameId(context: Context, gameId: String, listener: onConcernListener?, autoConcern: Boolean = false) {
+        val mode = if (autoConcern) "auto" else "manual"
+
+        val userId = UserManager.getInstance().userId
+        if (TextUtils.isEmpty(userId)) return
+
+        RetrofitManager.getInstance(context).api
+                .postConcern(UserManager.getInstance().userId, gameId, mode)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(object : Response<ResponseBody>() {
@@ -40,7 +49,7 @@ object ConcernUtils {
     }
 
     fun deleteConcernData(context: Context, gameId: String, listener: onConcernListener?) {
-        RetrofitManager.getInstance(context).getApi()
+        RetrofitManager.getInstance(context).api
                 .deleteConcern(UserManager.getInstance().userId, gameId)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -61,7 +70,7 @@ object ConcernUtils {
     fun updateConcernData(context: Context, data: JSONArray) {
         val body = RequestBody.create(MediaType.parse("application/json"),
                 data.toString())
-        RetrofitManager.getInstance(context).getApi()
+        RetrofitManager.getInstance(context).api
                 .putConcern(UserManager.getInstance().userId, body)
                 .subscribeOn(Schedulers.io())
                 .observeOn(Schedulers.io())
@@ -73,7 +82,7 @@ object ConcernUtils {
     }
 
     fun deleteConcernQuestions(context: Context, questionsId: String, listener: onConcernListener?) {
-        RetrofitManager.getInstance(context).getApi()
+        RetrofitManager.getInstance(context).api
                 .deleteConcernQuestions(UserManager.getInstance().userId, questionsId)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -86,13 +95,19 @@ object ConcernUtils {
                     override fun onFailure(e: HttpException?) {
                         super.onFailure(e)
                         listener?.onError()
-                        AskErrorResponseUtils.errorResponseControl(context, e)
+                        var errorString: String? = null
+                        try {
+                            errorString = e?.response()?.errorBody()?.string()
+                        } catch (e1: Exception) {
+                            e1.printStackTrace()
+                        }
+                        ErrorHelper.handleError(context, errorString, false)
                     }
                 })
     }
 
     fun postConcernQuestions(context: Context, questionsId: String, listener: onConcernListener?) {
-        RetrofitManager.getInstance(context).getApi()
+        RetrofitManager.getInstance(context).api
                 .postConcernQuestions(UserManager.getInstance().userId, questionsId)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -105,7 +120,13 @@ object ConcernUtils {
                     override fun onFailure(e: HttpException?) {
                         super.onFailure(e)
                         listener?.onError()
-                        AskErrorResponseUtils.errorResponseControl(context, e)
+                        var errorString: String? = null
+                        try {
+                            errorString = e?.response()?.errorBody()?.string()
+                        } catch (e1: Exception) {
+                            e1.printStackTrace()
+                        }
+                        ErrorHelper.handleError(context, errorString, false)
                     }
                 })
     }

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

@@ -27,13 +27,29 @@ import okhttp3.ResponseBody;
 public class DataLogUtils {
 
     // 轮播图
-    public static void uploadLunbotuLog(Context context, String type, String title, String location) {
+    public static void uploadLunbotuLog(Context context, String type, String text, String index, String source) {
         Map<String, Object> map = new HashMap<>();
-        map.put("location", location);
+        map.put("index", index);
         map.put("type", type);
-        map.put("title", title);
-        map.put("form", "click");
-        uploadLog(context, "lunbotu", map);
+        map.put("text", text);
+        map.put("source", source);
+        uploadLog(context, "slide", map);
+    }
+
+    // 搜索热门标签
+    public static void uploadHotTagLog(Context context, String tag) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("tag", tag);
+        uploadLog(context, "search-hot-tag", map);
+    }
+
+    // 点击下载按钮或进入游戏详情
+    public static void uploadGameLog(Context context, String gameId, String gameName, String entrance) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("game_id", gameId);
+        map.put("game_name", gameName);
+        map.put("entrance", entrance);
+        uploadLog(context, "game", map);
     }
 
     // 上传日志

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

@@ -4,13 +4,19 @@ import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
 import android.os.Build;
+import android.preference.PreferenceManager;
 import android.text.TextUtils;
 
 import com.gh.common.constant.Config;
+import com.gh.common.constant.Constants;
+import com.gh.common.exposure.meta.MetaUtil;
 import com.gh.gamecenter.BuildConfig;
+import com.gh.gid.GidCallback;
+import com.gh.gid.GidHelper;
 import com.halo.assistant.HaloApp;
 import com.lightgame.config.CommonDebug;
 import com.lightgame.utils.Util_System_Phone_State;
+import com.lightgame.utils.Utils;
 import com.tencent.bugly.crashreport.CrashReport;
 import com.tencent.stat.MtaSDkException;
 import com.tencent.stat.StatConfig;
@@ -69,7 +75,7 @@ public class DataUtils {
 
             // 设置数据上报策略
             // 测试渠道的时候即时上传，方便查看日志
-            if ("GH_TEST".equals(HaloApp.getInstance().getChannel())) {
+            if (Config.DEFAULT_CHANNEL.equals(HaloApp.getInstance().getChannel())) {
                 StatConfig.setStatSendStrategy(StatReportStrategy.INSTANT);
             } else {
                 StatConfig.setStatSendStrategy(StatReportStrategy.PERIOD);
@@ -93,7 +99,7 @@ public class DataUtils {
 
         // init bugly
         try {
-            CrashReport.setIsDevelopmentDevice(context, "GH_TEST".equals(channel));
+            CrashReport.setIsDevelopmentDevice(context, Config.DEFAULT_CHANNEL.equals(channel));
 
             CrashReport.UserStrategy strategy = new CrashReport.UserStrategy(context);
             strategy.setEnableANRCrashMonitor(false);
@@ -117,6 +123,25 @@ public class DataUtils {
         MtaHelper.onEvent(eventId, kv);
     }
 
+    public static void getGid() {
+        GidHelper.getInstance().registerDevice(new GidCallback() {
+            @Override
+            public void onSuccess(String s) {
+                Utils.log("Gid", s);
+                PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication()).edit().putString(Constants.DEVICE_KEY, s).apply();
+
+                HaloApp.getInstance().setGid(s);
+                // 避免初始化顺序问题导致 MetaUtil 一直持有空的 gid
+                MetaUtil.INSTANCE.refreshMeta();
+            }
+
+            @Override
+            public void onFailure(String s) {
+                Utils.log(s);
+            }
+        });
+    }
+
     public static void onEvent(Context var0, String var1, String var2) {
         TCAgent.onEvent(var0, var1, var2);
         Properties prop = new Properties();

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

@@ -4,6 +4,7 @@ import android.text.TextUtils;
 import android.view.View;
 
 import com.gh.common.constant.Config;
+import com.gh.common.repository.ReservationRepository;
 import com.gh.common.view.DownloadProgressBar;
 import com.gh.download.DownloadManager;
 import com.gh.gamecenter.R;
@@ -30,9 +31,29 @@ public class DetailDownloadUtils {
             return;
         }
 
-        if (viewHolder.gameEntity.getApk().isEmpty()) {
-            viewHolder.mDownloadPb.setText(TextUtils.isEmpty(viewHolder.downloadOffText) ? "暂无下载" : viewHolder.downloadOffText);
-            viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.NONE);
+        if (viewHolder.gameEntity.isReservable()) {
+            if (!ReservationRepository.thisGameHasBeenReserved(viewHolder.gameEntity.getId())) {
+                if (TextUtils.isEmpty(viewHolder.downloadAddWord)) {
+                    viewHolder.mDownloadPb.setText(String.format("预约" + "《%s》", viewHolder.gameEntity.getName()));
+                } else {
+                    viewHolder.mDownloadPb.setText(String.format("预约" + "《%s》%s", viewHolder.gameEntity.getName(), viewHolder.downloadAddWord));
+                }
+                viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.RESERVABLE);
+            } else {
+                viewHolder.mDownloadPb.setText("已预约《" + viewHolder.gameEntity.getName() + "》");
+                viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.RESERVED);
+            }
+            return;
+        }
+
+        if (viewHolder.gameEntity.getApk().isEmpty() || viewHolder.gameEntity.getDownloadOffStatus() != null) {
+            if ("dialog".equals(viewHolder.gameEntity.getDownloadOffStatus())) {
+                viewHolder.mDownloadPb.setText(TextUtils.isEmpty(viewHolder.downloadOffText) ? "查看详情" : viewHolder.downloadOffText);
+                viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.NONE_WITH_HINT);
+            } else {
+                viewHolder.mDownloadPb.setText(TextUtils.isEmpty(viewHolder.downloadOffText) ? "暂无下载" : viewHolder.downloadOffText);
+                viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.NONE);
+            }
         } else {
             String status = GameUtils.getDownloadBtnText(viewHolder.context, viewHolder.gameEntity, PluginLocation.only_game);
             switch (status) {
@@ -72,6 +93,7 @@ public class DetailDownloadUtils {
         switch (downloadEntity.getStatus()) {
             case downloading:
             case pause:
+            case overflow:
                 viewHolder.mDownloadPb.setText(R.string.downloading);
                 if (downloadEntity.isPluggable() && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
                     viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_PLUGIN);

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

@@ -1,5 +1,6 @@
 package com.gh.common.util;
 
+import android.app.ActivityManager;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
@@ -10,7 +11,7 @@ import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.gh.gamecenter.kuaichuan.WifiMgr;
+import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Util_System_Phone_State;
 import com.tencent.stat.StatConfig;
 
@@ -128,6 +129,20 @@ public class DeviceUtils {
         return builder.toString();
     }
 
+    public static String getUserAgent() {
+        String userAgent = "";
+        userAgent = System.getProperty("http.agent");
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0, length = userAgent.length(); i < length; i++) {
+            char c = userAgent.charAt(i);
+            if (c <= '\u001f' || c >= '\u007f') {
+                sb.append(String.format("\\u%04x", (int) c));
+            } else {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
 
     public static String getIPAddress(Context context) {
         NetworkInfo info = ((ConnectivityManager) context
@@ -149,7 +164,7 @@ public class DeviceUtils {
                 }
 
             } else if (info.getType() == ConnectivityManager.TYPE_WIFI) {//当前使用无线网络
-                return WifiMgr.getInstance(context).getCurrentIpAddress();
+                return getCurrentIpAddress();
             }
         } else {
             //当前无网络连接,请在设置中打开网络
@@ -224,7 +239,6 @@ public class DeviceUtils {
         return "";
     }
 
-
     // ping domain
     public static String ping(String domain) {
         try {
@@ -243,5 +257,30 @@ public class DeviceUtils {
         }
     }
 
+    public static long getTotalRamSizeOfDevice(Context context) {
+        ActivityManager actManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+        ActivityManager.MemoryInfo memInfo = new ActivityManager.MemoryInfo();
+        if (actManager != null) {
+            actManager.getMemoryInfo(memInfo);
+        }
+        return memInfo.totalMem / (1024 * 1024);
+    }
+
+
+    // 只能获取WiFi的IpAddress
+    public static String getCurrentIpAddress() {
+        String ipAddress;
+        WifiManager wifiManager = (WifiManager) HaloApp.getInstance().
+                getApplication().
+                getApplicationContext().
+                getSystemService(Context.WIFI_SERVICE);
+        int address = wifiManager.getDhcpInfo().ipAddress;
+        ipAddress = ((address & 0xFF)
+                + "." + ((address >> 8) & 0xFF)
+                + "." + ((address >> 16) & 0xFF)
+                + "." + ((address >> 24) & 0xFF));
+        return ipAddress;
+    }
+
 
 }

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

@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2015 Baidu, Inc. All Rights Reserved.
- */
-package com.gh.common.util;
-
-import android.content.Context;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * Created by sunpengfei on 15/11/4.
- */
-public class DexUtils {
-
-    private static final int BUF_SIZE = 2048;
-
-    public static boolean prepareAssetsDex(Context context, File dexInternalStoragePath, String dex_file) {
-        BufferedInputStream bis = null;
-        OutputStream dexWriter = null;
-
-        try {
-            bis = new BufferedInputStream(context.getAssets().open(dex_file));
-            dexWriter = new BufferedOutputStream(new FileOutputStream(dexInternalStoragePath));
-            byte[] buf = new byte[BUF_SIZE];
-            int len;
-            while ((len = bis.read(buf, 0, BUF_SIZE)) > 0) {
-                dexWriter.write(buf, 0, len);
-            }
-            dexWriter.close();
-            bis.close();
-            return true;
-        } catch (IOException e) {
-            if (dexWriter != null) {
-                try {
-                    dexWriter.close();
-                } catch (IOException ioe) {
-                    ioe.printStackTrace();
-                }
-            }
-            if (bis != null) {
-                try {
-                    bis.close();
-                } catch (IOException ioe) {
-                    ioe.printStackTrace();
-                }
-            }
-            return false;
-        }
-    }
-
-    public static boolean prepareDex(File dexInternalStoragePath, File dex_file) {
-        BufferedInputStream bis = null;
-        OutputStream dexWriter = null;
-
-        try {
-            bis = new BufferedInputStream(new FileInputStream(dex_file));
-            dexWriter = new BufferedOutputStream(new FileOutputStream(dexInternalStoragePath));
-            byte[] buf = new byte[BUF_SIZE];
-            int len;
-            while ((len = bis.read(buf, 0, BUF_SIZE)) > 0) {
-                dexWriter.write(buf, 0, len);
-            }
-            dexWriter.close();
-            bis.close();
-            return true;
-        } catch (IOException e) {
-            if (dexWriter != null) {
-                try {
-                    dexWriter.close();
-                } catch (IOException ioe) {
-                    ioe.printStackTrace();
-                }
-            }
-            if (bis != null) {
-                try {
-                    bis.close();
-                } catch (IOException ioe) {
-                    ioe.printStackTrace();
-                }
-            }
-            return false;
-        }
-    }
-
-}

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

@@ -0,0 +1,93 @@
+package com.gh.common.util
+
+import android.app.Dialog
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.Window
+import android.widget.TextView
+import com.gh.common.dialog.TrackableDialog
+import com.gh.common.util.DialogUtils.checkDialogContext
+import com.gh.gamecenter.R
+
+object DialogHelper {
+
+    /**
+     * Material Design 风格弹窗
+     *
+     * @param context
+     * @param title      标题
+     * @param content    内容
+     * @param positiveText   确认按钮文本
+     * @param negativeText   取消按钮文本
+     * @param positiveClickCallback 确认按钮监听
+     * @param negativeClickCallback 取消按钮监听
+     * @param trackMtaEvent 是否记录出现、关闭弹窗MTA事件
+     * @param mtaEvent MTA 的事件名
+     * @param mtaKey MTA 的事件 Key
+     */
+    fun showDialog(context: Context,
+                   title: String,
+                   content: CharSequence,
+                   positiveText: String,
+                   negativeText: String,
+                   positiveClickCallback: (() -> Unit)? = null,
+                   negativeClickCallback: (() -> Unit)? = null,
+                   trackMtaEvent: Boolean = false,
+                   mtaEvent: String = "",
+                   mtaKey: String = ""): Dialog {
+        val solidContext = checkDialogContext(context)
+
+        val dialog = if (trackMtaEvent) {
+            TrackableDialog(solidContext, R.style.GhAlertDialog, mtaEvent, mtaKey)
+        } else {
+            Dialog(solidContext, R.style.GhAlertDialog)
+        }
+
+        val contentView = LayoutInflater.from(solidContext).inflate(R.layout.dialog_alert, null)
+        val contentTv = contentView.findViewById<TextView>(R.id.dialog_content)
+        val titleTv = contentView.findViewById<TextView>(R.id.dialog_title)
+        val negativeTv = contentView.findViewById<TextView>(R.id.dialog_negative)
+        val positiveTv = contentView.findViewById<TextView>(R.id.dialog_positive)
+        contentTv.text = content
+        titleTv.text = title
+        negativeTv.text = negativeText
+        positiveTv.text = positiveText
+
+        negativeTv.setOnClickListener {
+            if (trackMtaEvent) MtaHelper.onEvent(mtaEvent, mtaKey, "点击" + negativeText)
+
+            negativeClickCallback?.invoke()
+            dialog.dismiss()
+        }
+
+        positiveTv.setOnClickListener {
+            if (trackMtaEvent) MtaHelper.onEvent(mtaEvent, mtaKey, "点击$positiveText")
+
+            positiveClickCallback?.invoke()
+            dialog.dismiss()
+        }
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
+        dialog.setContentView(contentView)
+        dialog.show()
+        return dialog
+    }
+
+    /**
+     * For legacy java invocation
+     */
+    @JvmStatic
+    fun showDialog(context: Context,
+                   title: String,
+                   content: CharSequence,
+                   positiveText: String,
+                   negativeText: String,
+                   positiveClickCallback: EmptyCallback,
+                   negativeClickCallback: EmptyCallback,
+                   trackMtaEvent: Boolean = false,
+                   mtaEvent: String = "",
+                   mtaKey: String = ""): Dialog {
+        return showDialog(context, title, content, positiveText, negativeText, { positiveClickCallback.onCallback() }, { negativeClickCallback.onCallback() }, trackMtaEvent, mtaEvent, mtaKey)
+    }
+
+}

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

@@ -3,27 +3,37 @@ package com.gh.common.util
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.text.TextUtils
+import com.gh.base.BaseActivity
 import com.gh.base.fragment.BaseFragment_TabLayout
 import com.gh.common.AppExecutor
 import com.gh.common.util.EntranceUtils.*
 import com.gh.gamecenter.*
+import com.gh.gamecenter.amway.AmwayActivity
+import com.gh.gamecenter.category.CategoryDirectoryActivity
 import com.gh.gamecenter.download.DownloadFragment.Companion.INDEX_UPDATE
-import com.gh.gamecenter.entity.CommunityEntity
-import com.gh.gamecenter.entity.LinkEntity
-import com.gh.gamecenter.entity.SubjectData
+import com.gh.gamecenter.entity.*
 import com.gh.gamecenter.eventbus.EBReuse
 import com.gh.gamecenter.eventbus.EBSkip
+import com.gh.gamecenter.fragment.MainWrapperFragment
+import com.gh.gamecenter.game.columncollection.detail.ColumnCollectionDetailActivity
 import com.gh.gamecenter.manager.UserManager
-import com.gh.gamecenter.qa.AskFragment
+import com.gh.gamecenter.mygame.PlayedGameActivity
+import com.gh.gamecenter.personalhome.UserHomeActivity
+import com.gh.gamecenter.qa.CommunityFragment
 import com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity
+import com.gh.gamecenter.qa.article.SimpleArticleListActivity
 import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity
 import com.gh.gamecenter.qa.column.detail.AskColumnDetailActivity
 import com.gh.gamecenter.qa.questions.detail.QuestionsDetailActivity
 import com.gh.gamecenter.qa.subject.CommunitySubjectActivity
+import com.gh.gamecenter.servers.GameServersActivity
 import com.gh.gamecenter.subject.SubjectActivity
 import com.gh.gamecenter.suggest.SuggestType
+import com.gh.gamecenter.tag.TagsActivity
+import com.gh.gamecenter.video.detail.VideoDetailActivity
 import com.lightgame.utils.Util_System_ClipboardManager
 import com.lightgame.utils.Utils
 import org.greenrobot.eventbus.EventBus
@@ -71,12 +81,12 @@ object DirectUtils {
         when (linkEntity.type) {
             "article", "news" -> {
                 NewsUtils.statNewsViews(context, linkEntity.link) // 统计阅读量
-                context.startActivity(NewsDetailActivity.getIntentById(context, linkEntity.link, entrance))
+                context.startActivity(NewsDetailActivity.getIntentById(context, linkEntity.link, BaseActivity.mergeEntranceAndPath(entrance, path)))
             }
 
-            "game" -> GameDetailActivity.startGameDetailActivity(context, linkEntity.link, entrance)
+            "game" -> GameDetailActivity.startGameDetailActivity(context, linkEntity.link, BaseActivity.mergeEntranceAndPath(entrance, path))
 
-            "column" -> SubjectActivity.startSubjectActivity(context, linkEntity.link, linkEntity.text, false, entrance)
+            "column" -> SubjectActivity.startSubjectActivity(context, linkEntity.link, linkEntity.text, false, BaseActivity.mergeEntranceAndPath(entrance, path))
 
             "question" -> context.startActivity(QuestionsDetailActivity.getIntent(context, linkEntity.link, entrance, path))
 
@@ -86,20 +96,63 @@ object DirectUtils {
 
             "community_article" -> context.startActivity(ArticleDetailActivity.getIntent(context, linkEntity.community!!, linkEntity.link!!, entrance, path))
 
-            "community_column" -> context.startActivity(CommunitySubjectActivity.getIntent(context, linkEntity.community!!, linkEntity.link, entrance))
+            "community_column" -> directToCommunityColumn(context, linkEntity.community, linkEntity.link!!, entrance, path)
 
             "community_special_column" -> context.startActivity(AskColumnDetailActivity.getIntentByColumnId(context, linkEntity.link, linkEntity.community!!, entrance, path))
 
-            "web" -> directToWebView(context, url = linkEntity.link!!, entrance = entrance)
+            "web", "inurl" -> directToWebView(context, url = linkEntity.link!!, entrance = BaseActivity.mergeEntranceAndPath(entrance, path))
 
             "qq" -> directToQqConversation(context, linkEntity.link)
 
+            "outurl" -> directToExternalBrowser(context, linkEntity.link!!)
+
+            "qqqun" -> directToQqGroup(context, linkEntity.link!!)
+
+            "tag" -> context.startActivity(TagsActivity.getIntent(context, linkEntity.text!!, entrance, path))
+
+            "all_community_article" -> {
+                context.startActivity(SimpleArticleListActivity.getIntent(
+                        context,
+                        linkEntity.link ?: "",
+                        entrance,
+                        path))
+            }
+
+            "category" -> {
+                context.startActivity(CategoryDirectoryActivity.getIntent(context, linkEntity.link!!, linkEntity.text!!))
+            }
+
+            "block" -> {
+                context.startActivity(BlockActivity.getIntent(context, SubjectRecommendEntity(
+                        link = linkEntity.link,
+                        text = linkEntity.text,
+                        name = linkEntity.name,
+                        display = linkEntity.display ?: Display())))
+            }
+
+            "column_collection" -> directToColumnCollection(context, linkEntity.link!!, -1, entrance)
+
+            "server" -> {
+                context.startActivity(GameServersActivity.getIntent(context, entrance, path))
+            }
+
+            "top_game_comment" -> directToAmway(context, null, entrance, path)
+
+            "wechat_bind" -> context.startActivity(WebActivity.getBindWechatIntent(context))
+
             else -> DialogUtils.showLowVersionDialog(context)
         }
     }
 
     /**
-     * 跳转到文章详情
+     * 跳转至专题合集
+     */
+    fun directToColumnCollection(context: Context, id: String, position: Int = -1, entrance: String) {
+        context.startActivity(ColumnCollectionDetailActivity.getIntent(context, id, position, entrance))
+    }
+
+    /**
+     * 跳转到新闻详情
      */
     @JvmStatic
     fun directToArticle(context: Context, id: String, entrance: String? = null) {
@@ -107,7 +160,23 @@ object DirectUtils {
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_TO, NewsDetailActivity::class.java.simpleName)
         bundle.putString(KEY_NEWSID, id)
-        EntranceUtils.jumpActivity(context, bundle)
+        jumpActivity(context, bundle)
+    }
+
+    /**
+     * 跳转至个人主页
+     */
+    @JvmStatic
+    fun directToHomeActivity(context: Context, userId: String?, entrance: String? = null, path: String? = null) {
+        context.startActivity(UserHomeActivity.getIntent(context, userId ?: "", entrance, path))
+    }
+
+    /**
+     * 回到首页
+     */
+    fun directToMainActivity(context: Context) {
+        val intent = Intent(context, MainActivity::class.java).apply { flags = Intent.FLAG_ACTIVITY_CLEAR_TOP }
+        context.startActivity(intent)
     }
 
     /**
@@ -120,17 +189,23 @@ object DirectUtils {
         bundle.putString(KEY_TO, GameDetailActivity::class.java.simpleName)
         bundle.putString(KEY_GAMEID, id)
         bundle.putBoolean(KEY_AUTO_DOWNLOAD, autoDownload ?: false)
-        EntranceUtils.jumpActivity(context, bundle)
+        jumpActivity(context, bundle)
+    }
+
+    // 跳转至用户玩过的游戏
+    fun directToPlayedGame(context: Context, userId: String, entrance: String = "", path: String = "") {
+        context.startActivity(PlayedGameActivity.getIntent(context, userId, entrance, path))
     }
 
     // 专栏
     @JvmStatic
     fun directToSubject(context: Context, id: String, subjectName: String? = "", entrance: String? = null) {
         val bundle = Bundle()
+        val subjectData = SubjectData(subjectId = id, subjectName = subjectName, isOrder = false)
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_TO, SubjectActivity::class.java.name)
-        bundle.putParcelable(EntranceUtils.KEY_SUBJECT_DATA, SubjectData(id, subjectName, false, null, null, null, null))
-        EntranceUtils.jumpActivity(context, bundle)
+        bundle.putParcelable(EntranceUtils.KEY_SUBJECT_DATA, subjectData)
+        jumpActivity(context, bundle)
     }
 
     // 反馈
@@ -142,7 +217,7 @@ object DirectUtils {
         bundle.putString(KEY_CONTENT, content)
         bundle.putString(KEY_SUGGEST_HINT_TYPE, KEY_PLUGIN)
         bundle.putSerializable(EntranceUtils.KEY_SUGGESTTYPE, SuggestType.gameQuestion)
-        EntranceUtils.jumpActivity(context, bundle)
+        jumpActivity(context, bundle)
     }
 
     @JvmStatic
@@ -150,7 +225,7 @@ object DirectUtils {
         val bundle = Bundle()
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_TO, DownloadManagerActivity.TAG)
-        EntranceUtils.jumpActivity(context, bundle)
+        jumpActivity(context, bundle)
     }
 
     /**
@@ -165,7 +240,7 @@ object DirectUtils {
             bundle.putString(KEY_GAMEID, gameId)
             bundle.putString(KEY_PACKAGENAME, packageName)
             bundle.putBoolean(KEY_AUTO_DOWNLOAD, true)
-            EntranceUtils.jumpActivity(context, bundle)
+            jumpActivity(context, bundle)
         }
     }
 
@@ -177,7 +252,17 @@ object DirectUtils {
         bundle.putString(KEY_GAMEID, gameId)
         bundle.putString(KEY_PACKAGENAME, packageName)
         bundle.putInt(BaseFragment_TabLayout.PAGE_INDEX, INDEX_UPDATE)
-        EntranceUtils.jumpActivity(context, bundle)
+        jumpActivity(context, bundle)
+    }
+
+    @JvmStatic
+    fun directToToolbox(context: Context, gameId: String, toolboxUrl: String, entrance: String = ENTRANCE_BROWSER) {
+        val bundle = Bundle()
+        bundle.putString(KEY_ENTRANCE, entrance)
+        bundle.putString(KEY_TO, ToolBoxActivity::class.java.simpleName)
+        bundle.putString(KEY_GAMEID, gameId)
+        bundle.putString(KEY_URL, toolboxUrl)
+        jumpActivity(context, bundle)
     }
 
     @JvmStatic
@@ -187,7 +272,7 @@ object DirectUtils {
         bundle.putString(KEY_TO, AnswerDetailActivity::class.java.name)
         bundle.putString(KEY_PATH, path)
         bundle.putString(KEY_ANSWER_ID, id)
-        EntranceUtils.jumpActivity(context, bundle)
+        jumpActivity(context, bundle)
     }
 
     @JvmStatic
@@ -197,25 +282,31 @@ object DirectUtils {
         bundle.putString(KEY_TO, QuestionsDetailActivity::class.java.name)
         bundle.putString(KEY_PATH, path)
         bundle.putString(KEY_QUESTIONS_ID, id)
-        EntranceUtils.jumpActivity(context, bundle)
+        jumpActivity(context, bundle)
     }
 
     @JvmStatic
     fun directToWebView(context: Context, url: String, entrance: String? = null) {
         val bundle = Bundle()
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
-        bundle.putString(EntranceUtils.KEY_TO, WebActivity::class.java.simpleName)
+        bundle.putString(KEY_TO, WebActivity::class.java.simpleName)
         bundle.putString(EntranceUtils.KEY_URL, url)
-        EntranceUtils.jumpActivity(context, bundle)
+        jumpActivity(context, bundle)
     }
 
     // 个人-系统消息
     @JvmStatic
     fun directToOfficialNotification(context: Context, entrance: String? = null) {
         val bundle = Bundle()
-        bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
-        bundle.putString(EntranceUtils.KEY_TO, MessageKeFuActivity::class.java.simpleName)
-        EntranceUtils.jumpActivity(context, bundle)
+        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+        bundle.putString(KEY_TO, MessageKeFuActivity::class.java.simpleName)
+        jumpActivity(context, bundle)
+    }
+
+    @JvmStatic
+    fun directToExternalBrowser(context: Context, url: String) {
+        val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+        context.startActivity(browserIntent)
     }
 
     // 跳转 QQ
@@ -265,9 +356,9 @@ object DirectUtils {
     fun directToGiftDetail(context: Context, giftId: String, entrance: String? = null) {
         val bundle = Bundle()
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
-        bundle.putString(EntranceUtils.KEY_TO, LibaoDetailActivity::class.java.simpleName)
+        bundle.putString(KEY_TO, LibaoDetailActivity::class.java.simpleName)
         bundle.putString(EntranceUtils.KEY_ID, giftId)
-        EntranceUtils.jumpActivity(context, bundle)
+        jumpActivity(context, bundle)
     }
 
     /**
@@ -284,18 +375,74 @@ object DirectUtils {
 
         // 这里换个线程操作是为了做一点延时
         AppExecutor.ioExecutor.execute {
-            EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_GAMEFRAGMENT, 1))
-            EventBus.getDefault().post(EBReuse(AskFragment.EB_RETRY_PAGE))
+            EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_ASK))
+            EventBus.getDefault().post(EBReuse(CommunityFragment.EB_RETRY_PAGE))
         }
     }
 
     @JvmStatic
-    fun directToCommunityArticle(context: Context, articleId: String?, communityId: String?, entrance: String?) {
+    fun directToCommunityArticle(context: Context, articleId: String?, communityId: String?, entrance: String?, path: String?) {
         val bundle = Bundle()
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
-        bundle.putString(EntranceUtils.KEY_TO, ArticleDetailActivity::class.java.name)
-        bundle.putString(EntranceUtils.KEY_COMMUNITY_ARTICLE_ID, articleId)
-        bundle.putParcelable(EntranceUtils.KEY_COMMUNITY_DATA, CommunityEntity(id = communityId!!))
-        EntranceUtils.jumpActivity(context, bundle)
+        bundle.putString(KEY_PATH, path)
+        bundle.putString(KEY_TO, ArticleDetailActivity::class.java.name)
+        bundle.putString(KEY_COMMUNITY_ARTICLE_ID, articleId)
+        bundle.putParcelable(KEY_COMMUNITY_DATA, CommunityEntity(id = communityId!!))
+        jumpActivity(context, bundle)
+    }
+
+    /**
+     * 跳转到社区专题
+     */
+    @JvmStatic
+    fun directToCommunityColumn(context: Context, community: CommunityEntity?, subjectId: String, entrance: String?, path: String?) {
+        val bundle = Bundle()
+        bundle.putString(KEY_PATH, path)
+        bundle.putString(KEY_TO, CommunitySubjectActivity::class.java.name)
+        bundle.putString(KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path))
+        bundle.putString(KEY_COLUMN_ID, subjectId)
+        bundle.putParcelable(KEY_COMMUNITY_DATA, community)
+        jumpActivity(context, bundle)
+    }
+
+    /**
+     * @param fromLocation 可见 [VideoDetailContainerViewModel.Location]
+     */
+    @JvmStatic
+    fun directToVideoDetail(context: Context, videoId: String, fromLocation: String, showComment: Boolean = false, entrance: String? = null, path: String? = "") {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            val bundle = Bundle()
+            bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+            bundle.putString(KEY_TO, VideoDetailActivity::class.java.name)
+            bundle.putString(KEY_PATH, path)
+            bundle.putString(KEY_ID, videoId)
+            bundle.putString(KEY_LOCATION, fromLocation)
+            bundle.putBoolean(KEY_SHOW_COMMENT, showComment)
+            jumpActivity(context, bundle)
+        } else {
+            DialogUtils.showLowSystemVersionDialog(context)
+        }
+    }
+
+    /**
+     * 跳转至安利墙
+     * @param fixedTopAmwayCommentId 需要置顶的安利Id
+     */
+    @JvmStatic
+    fun directToAmway(context: Context, fixedTopAmwayCommentId: String? = null, entrance: String? = null, path: String? = "") {
+        val bundle = Bundle()
+        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+        bundle.putString(KEY_TO, AmwayActivity::class.java.name)
+        bundle.putString(KEY_ID, fixedTopAmwayCommentId)
+        bundle.putString(KEY_PATH, path)
+        jumpActivity(context, bundle)
+    }
+
+    /**
+     * 跳转至徽章墙
+     */
+    @JvmStatic
+    fun directToBadgeWall(context: Context, userId: String?, name: String?, icon: String?) {
+        context.startActivity(WebActivity.getBadgeCenterIntent(context, userId, name, icon))
     }
 }

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

@@ -1,12 +1,23 @@
 package com.gh.common.util;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
+import android.graphics.Color;
+import android.os.Build;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
 
 import com.halo.assistant.HaloApp;
 
-public class DisplayUtils {
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 
+import androidx.core.content.ContextCompat;
+
+public class DisplayUtils {
+    
     /**
      * 根据手机的分辨率从 dip(像素) 的单位 转成为 px
      */
@@ -14,7 +25,7 @@ public class DisplayUtils {
         final float scale = context.getResources().getDisplayMetrics().density;
         return (int) (dpValue * scale + 0.5f);
     }
-
+    
     /**
      * 根据手机的分辨率从 px(像素) 的单位 转成为 dip
      */
@@ -22,16 +33,19 @@ public class DisplayUtils {
         final float scale = context.getResources().getDisplayMetrics().density;
         return (int) (pxValue / scale + 0.5f);
     }
-
+    
     /**
      * 根据手机的分辨率从 dip(像素) 的单位 转成为 px
      */
     public static int dip2px(float dpValue) {
-        final float scale = HaloApp.getInstance().getApplication().getResources().getDisplayMetrics().density;
+        final float scale = HaloApp.getInstance()
+            .getApplication()
+            .getResources()
+            .getDisplayMetrics().density;
         return (int) (dpValue * scale + 0.5f);
     }
-
-
+    
+    
     /**
      * 将px值转换为sp值，保证文字大小不变
      *
@@ -43,7 +57,7 @@ public class DisplayUtils {
         final float fontScale = context.getResources().getDisplayMetrics().scaledDensity;
         return (int) (pxValue / fontScale + 0.5f);
     }
-
+    
     /**
      * 将sp值转换为px值，保证文字大小不变
      *
@@ -55,7 +69,7 @@ public class DisplayUtils {
         final float fontScale = context.getResources().getDisplayMetrics().scaledDensity;
         return (int) (spValue * fontScale + 0.5f);
     }
-
+    
     /**
      * 获取状态栏的高度
      *
@@ -65,7 +79,7 @@ public class DisplayUtils {
     public static int getStatusBarHeight(Resources resources) {
         return getInternalDimensionSize(resources, "status_bar_height");
     }
-
+    
     public static int getInternalDimensionSize(Resources res, String key) {
         int result = 0;
         int resourceId = res.getIdentifier(key, "dimen", "android");
@@ -74,5 +88,107 @@ public class DisplayUtils {
         }
         return result;
     }
+    
+    public static void transparentStatusBar(Activity activity) {
+        //make full transparent statusBar
+        if (Build.VERSION.SDK_INT >= 19 && Build.VERSION.SDK_INT < 21) {
+            setWindowFlag(activity, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, true);
+        }
+        if (Build.VERSION.SDK_INT >= 19) {
+            activity.getWindow()
+                .getDecorView()
+                .setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
+        }
+        if (Build.VERSION.SDK_INT >= 21) {
+            setWindowFlag(activity, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, false);
+            activity.getWindow().setStatusBarColor(Color.TRANSPARENT);
+        }
+    }
+    
+    public static void transparentStatusAndNavigation(Activity activity) {
+        //make full transparent statusBar
+        if (Build.VERSION.SDK_INT >= 19 && Build.VERSION.SDK_INT < 21) {
+            setWindowFlag(activity, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, true);
+        }
+        if (Build.VERSION.SDK_INT >= 19) {
+            activity.getWindow()
+                .getDecorView()
+                .setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
+        }
+        if (Build.VERSION.SDK_INT >= 21) {
+            setWindowFlag(activity, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, false);
+            activity.getWindow().setStatusBarColor(Color.TRANSPARENT);
+            activity.getWindow().setNavigationBarColor(Color.TRANSPARENT);
+        }
+    }
+    
+    private static void setWindowFlag(Activity activity, final int bits, boolean on) {
+        Window win = activity.getWindow();
+        WindowManager.LayoutParams winParams = win.getAttributes();
+        if (on) {
+            winParams.flags |= bits;
+        } else {
+            winParams.flags &= ~bits;
+        }
+        win.setAttributes(winParams);
+    }
+    
+    public static void setLightStatusBar(Activity activity, boolean lightStatusBar) {
+        boolean isMIUI = setMIUIStatusBarStyle(activity, lightStatusBar);
+        
+        if (!isMIUI) {
+            Window window = activity.getWindow();
+            View decor = window.getDecorView();
+            
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                if (lightStatusBar) {
+                    decor.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+                } else {
+                    decor.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
+                }
+            } else {
+                decor.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
+            }
+        }
+    }
+    
+    private static boolean setMIUIStatusBarStyle(Activity activity, boolean lightStatusBar) {
+        boolean result = false;
+        Window window = activity.getWindow();
+        if (window != null) {
+            Class clazz = window.getClass();
+            try {
+                int darkModeFlag = 0;
+                Class layoutParams = Class.forName("android.view.MiuiWindowManager$LayoutParams");
+                Field field = layoutParams.getField("EXTRA_FLAG_STATUS_BAR_DARK_MODE");
+                darkModeFlag = field.getInt(layoutParams);
+                Method extraFlagField = clazz.getMethod("setExtraFlags", int.class, int.class);
+                extraFlagField.invoke(window, lightStatusBar ? darkModeFlag : 0, darkModeFlag);//状态栏透明且黑色字体
+                result = true;
+                
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && lightStatusBar) {
+                    //开发版 7.7.13 及以后版本采用了系统API，旧方法无效但不会报错，所以两个方式都要加上
+                    activity.getWindow()
+                        .getDecorView()
+                        .setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+                }
+            } catch (Exception e) {
+                // do nothing
+            }
+        }
+        return result;
+    }
 
+    public static void setStatusBarColor(Activity activity,  int color, boolean lightStatusBar) {
+        Window window = activity.getWindow();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            window.setStatusBarColor(ContextCompat.getColor(activity,color));
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+
+            setLightStatusBar(activity,lightStatusBar);
+
+        }
+    }
+    
 }

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

@@ -0,0 +1,101 @@
+package com.gh.common.util
+
+import android.content.Context
+import android.os.Build
+import com.gh.gamecenter.entity.ApkEntity
+import com.gh.gamecenter.entity.GameEntity
+
+object DownloadDialogHelper {
+
+    /**
+     * [callback] 执行点击关闭以后会执行的代码块，没有弹窗也会执行这个代码块
+     */
+    @JvmStatic
+    fun findAvailableDialogAndShow(context: Context, gameEntity: GameEntity, apkEntity: ApkEntity, callback: EmptyCallback) {
+        val dialog = retrieveAvailableDialog(gameEntity, apkEntity)
+        if (dialog != null) {
+            showDownloadDialog(context, dialog, callback)
+        } else {
+            callback.onCallback()
+        }
+    }
+
+    private fun retrieveAvailableDialog(gameEntity: GameEntity, apkEntity: ApkEntity): GameEntity.Dialog? {
+        if (gameEntity.downloadDialog.isNullOrEmpty()) return null
+
+        for (dialog in gameEntity.downloadDialog!!) {
+
+            // 共有 8 种可能
+            // 1. 不指定包名、机型和系统版本
+            if (dialog.rule.packageName.isEmpty()
+                    && dialog.rule.models.isEmpty()
+                    && dialog.rule.systemVersions.isEmpty()) {
+                return dialog
+            }
+
+            // 2. 指定包名不管机型和系统
+            if (dialog.rule.packageName == apkEntity.packageName
+                    && dialog.rule.models.isEmpty()
+                    && dialog.rule.systemVersions.isEmpty()) {
+                return dialog
+            }
+
+            // 3. 指定机型不管包名和系统
+            if (dialog.rule.models.contains(Build.MODEL)
+                    && dialog.rule.packageName.isEmpty()
+                    && dialog.rule.systemVersions.isEmpty()) {
+                return dialog
+            }
+
+            // 4. 指定系统不管包名和机型
+            if (dialog.rule.systemVersions.contains(Build.VERSION.RELEASE)
+                    && dialog.rule.packageName.isEmpty()
+                    && dialog.rule.models.isEmpty()) {
+                return dialog
+            }
+
+            // 5. 指定包名和机型不管系统
+            if (dialog.rule.packageName == apkEntity.packageName
+                    && dialog.rule.models.contains(Build.MODEL)
+                    && dialog.rule.systemVersions.isEmpty()) {
+                return dialog
+            }
+
+            // 6. 指定包名和系统不管机型
+            if (dialog.rule.packageName == apkEntity.packageName
+                    && dialog.rule.systemVersions.contains(Build.VERSION.RELEASE)
+                    && dialog.rule.models.isEmpty()) {
+                return dialog
+            }
+
+            // 7. 指定机型和系统不管包名
+            if (dialog.rule.systemVersions.contains(Build.VERSION.RELEASE)
+                    && dialog.rule.models.contains(Build.MODEL)
+                    && dialog.rule.packageName.isEmpty()) {
+                return dialog
+            }
+
+            // 8.指定包名、机型和系统版本
+            if (dialog.rule.packageName == apkEntity.packageName
+                    && dialog.rule.models.contains(Build.MODEL)
+                    && dialog.rule.systemVersions.contains(Build.VERSION.RELEASE)) {
+                return dialog
+            }
+
+        }
+
+        return null
+    }
+
+    private fun showDownloadDialog(context: Context, dialog: GameEntity.Dialog, callback: EmptyCallback) {
+        DialogUtils.showDialogWithHtmlContent(
+                context,
+                dialog.title,
+                dialog.content,
+                "继续下载",
+                "取消",
+                { callback.onCallback() },
+                null)
+    }
+
+}

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

@@ -3,17 +3,21 @@ package com.gh.common.util;
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Message;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.util.ArrayMap;
-import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.collection.ArrayMap;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
 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.view.DownloadDialog;
 import com.gh.download.DownloadManager;
 import com.gh.gamecenter.DownloadManagerActivity;
@@ -69,7 +73,7 @@ public class DownloadItemUtils {
 //                adapter.notifyItemChanged(index);
 //            }
         } else {
-            if (!queue.contains(platform)) {
+            if (!queue.contains(platform) && !TextUtils.isEmpty(platform)) {
                 queue.offer(platform);
                 if (AppDebugConfig.IS_DEBUG) {
                     AppDebugConfig.logMethodWithParams(DownloadItemUtils.class, queue.size(), gameEntity.getBrief(), downloadEntity.getPlatform(), index);
@@ -83,7 +87,7 @@ public class DownloadItemUtils {
                     DownloadManager.getInstance(context).sendMessageDelayed(msg, 3000);
                 }
             }
-            if (platform.equals(queue.peek())) {
+            if (platform != null && platform.equals(queue.peek())) {
                 if (entryMap == null) {
                     entryMap = new ArrayMap<>();
                     gameEntity.setEntryMap(entryMap);
@@ -96,6 +100,35 @@ public class DownloadItemUtils {
         }
     }
 
+    // 下载按钮显示为查看，并且不提供下载功能
+    public static void updateItemWithViewOnlyStyle(GameViewHolder holder) {
+        holder.gameDownloadBtn.setVisibility(View.VISIBLE);
+        holder.gameDownloadBtn.setText("查看");
+        holder.gameDownloadBtn.setClickable(false);
+    }
+
+    // 根据预约状态更新下载按钮
+    public static void updateItemWithReserveStatus(GameViewHolder holder, GameEntity gameEntity) {
+        if ("download".equals(gameEntity.getReserveStatus())) {
+            // 已上线
+            holder.gameDownloadBtn.setVisibility(View.VISIBLE);
+            holder.gameDownloadBtn.setText("已上线");
+            holder.gameDownloadBtn.setTextColor(Color.WHITE);
+            holder.gameDownloadBtn.setBackground(ContextCompat.getDrawable(holder.gameDes.getContext(), R.drawable.game_item_btn_pause_dn));
+        } else if ("appointment".equals(gameEntity.getReserveStatus())) {
+            // 已预约
+            holder.gameDownloadBtn.setVisibility(View.VISIBLE);
+            holder.gameDownloadBtn.setText("已预约");
+            holder.gameDownloadBtn.setTextColor(Color.WHITE);
+            holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_pause_dn);
+        }
+        if (gameEntity.isLibaoExists()) {
+            holder.gameLibaoIcon.setVisibility(View.VISIBLE);
+        } else {
+            holder.gameLibaoIcon.setVisibility(View.GONE);
+        }
+    }
+
     public static void updateItem(Context context, GameEntity gameEntity, GameViewHolder holder,
                                   boolean isShowPlatform) {
         updateItem(context, gameEntity, holder, isShowPlatform, PluginLocation.only_game);
@@ -117,13 +150,38 @@ public class DownloadItemUtils {
             holder.gameLibaoIcon.setVisibility(View.GONE);
         }
 
-        if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty()) {
+        // 显示预约
+        if (gameEntity.isReservable()) {
             holder.gameDes.setVisibility(View.VISIBLE);
             holder.gameProgressbar.setVisibility(View.GONE);
             holder.gameInfo.setVisibility(View.GONE);
-            holder.gameDownloadBtn.setBackgroundResource(R.drawable.news_detail_comment);
-            holder.gameDownloadBtn.setText("暂无");
-            holder.gameDownloadBtn.setTextColor(ContextCompat.getColor(context, R.color.button_gray));
+            if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.getId())) {
+                holder.gameDownloadBtn.setText("预约");
+                holder.gameDownloadBtn.setTextColor(Color.WHITE);
+                holder.gameDownloadBtn.setBackgroundResource(R.drawable.button_reserve);
+            } else {
+                holder.gameDownloadBtn.setText("已预约");
+                holder.gameDownloadBtn.setTextColor(Color.WHITE);
+                holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_pause_dn);
+            }
+            return;
+        }
+
+        if (gameEntity.getApk().isEmpty() || gameEntity.getDownloadOffStatus() != null) {
+            holder.gameDes.setVisibility(View.VISIBLE);
+            holder.gameProgressbar.setVisibility(View.GONE);
+            holder.gameInfo.setVisibility(View.GONE);
+            
+            String offStatus = gameEntity.getDownloadOffStatus();
+            if ("dialog".equals(offStatus)) {
+                holder.gameDownloadBtn.setText("查看");
+                holder.gameDownloadBtn.setTextColor(ContextCompat.getColor(context, R.color.white));
+                holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style);
+            } else {
+                holder.gameDownloadBtn.setText("暂无");
+                holder.gameDownloadBtn.setTextColor(ContextCompat.getColor(context, R.color.button_gray));
+                holder.gameDownloadBtn.setBackgroundResource(R.drawable.news_detail_comment);
+            }
             holder.gameDownloadBtn.setClickable(false);
         } else if (gameEntity.getApk().size() == 1) {
             updateNormalItem(context, holder, gameEntity, isShowPlatform, pluginLocation);
@@ -159,6 +217,7 @@ public class DownloadItemUtils {
     // 更新插件的条目，有多个apk包
     private static void updatePluginItem(Context context, GameViewHolder holder, GameEntity gameEntity,
                                          boolean isShowPlatform, PluginLocation pluginLocation) {
+        GameUtils.setDownloadBtnStatus(context, gameEntity, holder.gameDownloadBtn, pluginLocation);
 
         ArrayMap<String, DownloadEntity> entryMap = gameEntity.getEntryMap();
         if (entryMap != null && !entryMap.isEmpty()) {
@@ -177,8 +236,6 @@ public class DownloadItemUtils {
             }
         }
 
-        GameUtils.setDownloadBtnStatus(context, gameEntity, holder.gameDownloadBtn, pluginLocation);
-
         holder.gameDes.setVisibility(View.VISIBLE);
         holder.gameProgressbar.setVisibility(View.GONE);
         holder.gameInfo.setVisibility(View.GONE);
@@ -230,7 +287,8 @@ public class DownloadItemUtils {
         } else if (status.equals(DownloadStatus.pause)
                 || status.equals(DownloadStatus.timeout)
                 || status.equals(DownloadStatus.neterror)
-                || status.equals(DownloadStatus.subscribe)) {
+                || status.equals(DownloadStatus.subscribe)
+                || status.equals(DownloadStatus.overflow)) {
             holder.gameProgressbar.setProgress((int) (downloadEntity.getPercent() * 10));
             if (isShowPlatform && platform != null) {
                 holder.gameDownloadSpeed.setText(String.format("%s - 暂停", platform));
@@ -240,10 +298,10 @@ public class DownloadItemUtils {
             holder.gameDownloadPercentage.setText(downloadEntity.getPercent() + "%");
 
             if (isNormal) {
-                if (status.equals(DownloadStatus.pause)) {
-                    holder.gameDownloadBtn.setText(R.string.downloading);
-                } else {
+                if (status.equals(DownloadStatus.waiting)) {
                     holder.gameDownloadBtn.setText(R.string.waiting);
+                } else {
+                    holder.gameDownloadBtn.setText(R.string.downloading);
                 }
                 holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style);
                 holder.gameDownloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style));
@@ -290,10 +348,86 @@ public class DownloadItemUtils {
                                           final String location,
                                           final ExposureEvent traceEvent) {
 
+        setOnClickListener(context, downloadBtn, gameEntity, position, adapter, entrance, location, traceEvent, null);
+    }
+
+    /**
+     * @param clickCallback 供那些需要知道点击回调的地方使用
+     */
+    public static void setOnClickListener(final Context context,
+                                          final TextView downloadBtn,
+                                          final GameEntity gameEntity,
+                                          final int position,
+                                          final RecyclerView.Adapter<? extends RecyclerView.ViewHolder> adapter,
+                                          final String entrance,
+                                          final String location,
+                                          final ExposureEvent traceEvent,
+                                          @Nullable final EmptyCallback clickCallback) {
+
+        if (gameEntity.isReservable()) {
+            if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.getId())) {
+                downloadBtn.setOnClickListener(v -> {
+                    CheckLoginUtils.checkLogin(context, entrance, () -> {
+                        if (clickCallback != null) {
+                            clickCallback.onCallback();
+                        }
+                        PermissionHelper.checkReadPhoneStatePermissionBeforeAction(context, () -> {
+                            ReserveDialogFragment dialogFragment = ReserveDialogFragment.getInstance(
+                                    gameEntity,
+                                    () -> adapter.notifyItemChanged(position)
+                            );
+                            dialogFragment.show(((AppCompatActivity) context).getSupportFragmentManager(), "reserve");
+                        });
+                    });
+                });
+            } else {
+                downloadBtn.setOnClickListener(v -> {
+                    if (clickCallback != null) {
+                        clickCallback.onCallback();
+                    }
+                    if ("download".equals(gameEntity.getReserveStatus())) {
+                        ReservationHelper.showDeleteReservationDialog(context, () -> {
+                            ReservationHelper.deleteReservation(gameEntity, () -> {
+                                adapter.notifyItemChanged(position);
+                            });
+                        });
+                    } else {
+                        ReservationHelper.showCancelReservationDialog(context, () -> {
+                            ReservationHelper.cancelReservation(gameEntity, () -> {
+                                adapter.notifyItemChanged(position);
+                            });
+                        });
+                    }
+                });
+            }
+            return;
+        }
+
         if (gameEntity.getApk().size() == 1) {
-            downloadBtn.setOnClickListener(v -> onNormalClick(context, downloadBtn, gameEntity, position, adapter, entrance, location, traceEvent));
+            downloadBtn.setOnClickListener(v -> {
+                EmptyCallback clickRunnable = () -> {
+                    if (clickCallback != null) {
+                        clickCallback.onCallback();
+                    }
+                    onNormalClick(context, downloadBtn, gameEntity, position, adapter, entrance, location, traceEvent);
+                };
+
+                // 启动不需要请求存储权限
+                if (downloadBtn.getText().toString().equals(context.getString(R.string.launch))) {
+                    clickRunnable.onCallback();
+                } else {
+                    PermissionHelper.checkStoragePermissionBeforeAction(context, clickRunnable);
+                }
+            });
         } else {
-            downloadBtn.setOnClickListener(v -> DownloadDialog.getInstance(context).showPopupWindow(v, gameEntity, entrance, location, traceEvent));
+            downloadBtn.setOnClickListener(v -> {
+                if (clickCallback != null) {
+                    clickCallback.onCallback();
+                }
+                PermissionHelper.checkStoragePermissionBeforeAction(context, () -> {
+                    DownloadDialog.getInstance(context).showPopupWindow(v, gameEntity, entrance, location, traceEvent);
+                });
+            });
         }
 
     }
@@ -317,33 +451,44 @@ public class DownloadItemUtils {
                                      final String location,
                                      @Nullable final ExposureEvent traceEvent) {
         String str = downloadBtn.getText().toString();
+        ApkEntity apk = gameEntity.getApk().get(0);
+
         if (str.equals(context.getString(R.string.download))) {
-            DialogUtils.checkDownload(context, gameEntity.getApk().get(0).getSize(),
-                    isSubscribe -> download(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent));
+            // 先弹下载弹窗(如果需要的话)
+            DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, () -> {
+                DialogUtils.checkDownload(context, apk.getSize(),
+                        isSubscribe -> download(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent));
+            });
+
+            DataLogUtils.uploadGameLog(context, gameEntity.getId(), gameEntity.getName(), entrance);
         } else if (str.equals(context.getString(R.string.pluggable))) {
             if (entrance.contains("我的游戏")) {
-                DataUtils.onMtaEvent(context, "我的游戏_启动", "插件化", gameEntity.getName());
+                MtaHelper.onEvent("我的游戏_启动", "插件化", gameEntity.getName());
             }
-            DialogUtils.checkDownload(context, gameEntity.getApk().get(0).getSize(),
-                    isSubscribe -> plugin(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent));
+            DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, () -> {
+                DialogUtils.checkDownload(context, apk.getSize(),
+                        isSubscribe -> plugin(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent));
+            });
         } else if (str.equals(context.getString(R.string.install))) {
             install(context, gameEntity, position, adapter);
         } else if (str.equals(context.getString(R.string.launch))) {
             if (entrance.contains("我的游戏")) {
-                DataUtils.onMtaEvent(context, "我的游戏_启动", "启动", gameEntity.getName());
+                MtaHelper.onEvent("我的游戏_启动", "启动", gameEntity.getName());
             }
             DataUtils.onGameLaunchEvent(context, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), location);
             PackageUtils.launchApplicationByPackageName(context, gameEntity.getApk().get(0).getPackageName());
         } else if (str.equals(context.getString(R.string.waiting))
                 || str.equals(context.getString(R.string.downloading))) {
             context.startActivity(DownloadManagerActivity.getDownloadMangerIntent(context,
-                    gameEntity.getApk().get(0).getUrl(), entrance + "+(" + location.split(":")[0] + ")"));
+                    apk.getUrl(), entrance + "+(" + location.split(":")[0] + ")"));
         } else if (str.equals(context.getString(R.string.update))) {
             if (entrance.contains("我的游戏")) {
-                DataUtils.onMtaEvent(context, "我的游戏_启动", "更新", gameEntity.getName());
+                MtaHelper.onEvent("我的游戏_启动", "更新", gameEntity.getName());
             }
-            DialogUtils.checkDownload(context, gameEntity.getApk().get(0).getSize(),
-                    isSubscribe -> update(context, gameEntity, entrance, location, isSubscribe, traceEvent));
+            DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, () -> {
+                DialogUtils.checkDownload(context, apk.getSize(),
+                        isSubscribe -> update(context, gameEntity, entrance, location, isSubscribe, traceEvent));
+            });
         }
     }