tinker-3.7.3-base

# Conflicts:
#	app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java

app/build.gradle

@@ -90,6 +90,8 @@ android {
 
             buildConfigField "String", "EXPOSURE_REPO", "\"test\""
             buildConfigField "String", "EXPOSURE_VERSION", "\"E3\""
+
+            multiDexKeepProguard file("tinker_multidexkeep.pro")
         }
         release {
             debuggable false
@@ -100,6 +102,8 @@ android {
 
             buildConfigField "String", "EXPOSURE_REPO", "\"exposure\""
             buildConfigField "String", "EXPOSURE_VERSION", "\"E3\""
+
+            multiDexKeepProguard file("tinker_multidexkeep.pro")
         }
     }
 
@@ -193,6 +197,7 @@ dependencies {
     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}"
 
@@ -202,6 +207,7 @@ dependencies {
 
     implementation "com.facebook.fresco:fresco:${fresco}"
     implementation "com.facebook.fresco:animated-gif:${fresco}"
+    implementation "com.facebook.fresco:animated-drawable:${fresco}"
 
     implementation "com.squareup.okhttp3:okhttp:${okHttp}"
 
@@ -235,10 +241,10 @@ dependencies {
     // bugly with tinker support
     implementation "com.tencent.bugly:crashreport_upgrade:${buglyTinkerSupport}"
 
-    implementation "pub.devrel:easypermissions:${easypermissions}"
-
     implementation 'com.google.android:flexbox:1.1.0'
 
+    implementation "pub.devrel:easypermissions:${easypermissions}"
+
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     implementation 'com.contrarywind:Android-PickerView:4.1.3'
@@ -251,9 +257,16 @@ dependencies {
 
     implementation "top.zibin:Luban:${luban}"
 
+    implementation "com.squareup.picasso:picasso:${picasso}"
+
     // for video streaming
-    implementation "cn.jzvd:jiaozivideoplayer:${jiaoziVideoView}"
-    implementation "com.danikula:videocache:${videoCache}"
+    implementation ("com.shuyu:gsyVideoPlayer-java:$gsyVideo",{
+        exclude module: "gsyvideoplayer-androidvideocache"
+    })
+    implementation "com.shuyu:gsyVideoPlayer-armv7a:$gsyVideo"
+    implementation "com.shuyu:gsyVideoPlayer-x86:$gsyVideo"
+
+    implementation "com.github.wendux:DSBridge-Android:$dsBridge"
 
     implementation "android.arch.work:work-runtime:${workManager}"
 
@@ -266,15 +279,27 @@ dependencies {
     implementation "com.tencent.mm.opensdk:wechat-sdk-android-without-mta:5.3.1"
     implementation 'com.walkud.rom.checker:RomChecker:1.0.0'
 
+    debugImplementation "com.github.nichbar.chucker:library:$chucker"
+    releaseImplementation "com.github.nichbar.chucker:library-no-op:$chucker"
+    implementation "com.bytedance.applog:RangersAppLog-Lite-cn:$bytedanceApplog"
+
+    implementation 'com.aliyun.dpa:oss-android-sdk:2.9.2'
+
+    implementation "com.airbnb.android:lottie:$lottie"
+
+    implementation("com.github.piasy:BigImageViewer:$bigImageViewer", {
+        exclude group: 'com.squareup.okhttp3'
+    })
+
     implementation project(':libraries:LGLibrary')
     implementation project(':libraries:MTA')
     implementation project(':libraries:QQShare')
     implementation project(':libraries:TalkingData')
     implementation project(':libraries:UmengPush')
 //    implementation project(':libraries:WechatShare')
-    implementation project(':libraries:LogHub')
     implementation project(':libraries:im')
     implementation project(':libraries:Matisse')
+    implementation project(path: ':libraries:gsyVideoPlayer-proxy_cache')
 }
 File propFile = file('sign.properties')
 if (propFile.exists()) {

app/proguard-rules.txt

@@ -225,4 +225,19 @@
 -keep class com.qq.gdt.action.** {*;}
 
 ### AndroidX
--keep class androidx.core.app.CoreComponentFactory { *; }
+-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,504 +1,578 @@
 <?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" />
+    <uses-permission android:name="android.permission.VIBRATE" />
     <!-- 允许应用程序改变Wi-Fi连接状态 -->
-    <uses-permission android:name = "android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <!-- 允许应用程序打开系统窗口，显示其他应用程序 -->
-    <uses-permission android:name = "android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <!-- 修改系统设置的权限 -->
-    <uses-permission android:name = "android.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+
+    <uses-permission
+        android:name="android.permission.PACKAGE_USAGE_STATS"
+        tools:ignore="ProtectedPermissions" />
 
     <!-- bugly with tinker -->
-    <uses-permission android:name = "android.permission.READ_LOGS" />
-    <uses-permission android:name = "android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.READ_LOGS" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+
+    <uses-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,
+        pl.droidsonroids.gif" />
 
     <!-- 去掉 SDK 一些流氓权限 -->
-    <uses-permission android:name = "android.permission.READ_CONTACTS" tools:node = "remove"/>
+    <uses-permission
+        android:name="android.permission.READ_CONTACTS"
+        tools:node="remove" />
 
     <supports-screens
-        android:anyDensity = "true"
-        android:largeScreens = "true"
-        android:normalScreens = "true"
-        android:resizeable = "true"
-        android:smallScreens = "true" />
+        android:anyDensity="true"
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:resizeable="true"
+        android:smallScreens="true" />
 
     <!--android:largeHeap = "true"-->
     <application
-        android:name = "com.halo.assistant.TinkerApp"
-        android:allowBackup = "true"
-        android:icon = "@mipmap/logo"
-        android:label = "@string/app_name"
-        android:resizeableActivity = "true"
-        android:theme = "@style/AppCompatTheme.APP"
-        tools:targetApi = "n" >
+        android:name="com.halo.assistant.TinkerApp"
+        android:allowBackup="true"
+        android:icon="@mipmap/logo"
+        android:label="@string/app_name"
+        android:largeHeap="true"
+        android:resizeableActivity="true"
+        android:theme="@style/AppCompatTheme.APP"
+        tools:targetApi="n">
 
         <!--android:launchMode = "singleTask"-->
         <activity
-            android:name = "com.gh.gamecenter.SplashScreenActivity"
-            android:configChanges = "keyboardHidden|orientation|screenSize"
-            android:screenOrientation = "portrait"
-            android:theme = "@style/AppGuideTheme" >
-            <intent-filter >
-                <action android:name = "android.intent.action.MAIN" />
+            android:name="com.gh.gamecenter.SplashScreenActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.Launcher">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name = "android.intent.category.LAUNCHER" />
-            </intent-filter >
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
 
-        </activity >
+        </activity>
 
         <activity
-            android:name = "com.gh.gamecenter.MainActivity"
-            android:launchMode = "singleTask"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateAlwaysHidden|adjustResize" />
+            android:name="com.gh.gamecenter.MainActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppCompatTheme.APP"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
 
         <activity
-            android:name = "com.gh.gamecenter.DownloadManagerActivity"
-            android:launchMode = "singleTask"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.DownloadManagerActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
 
         <!--android:theme = "@android:style/Theme.Black.NoTitleBar.Fullscreen"  退出时屏幕抖动 -->
-        <activity android:name = "com.gh.gamecenter.ViewImageActivity" />
-        <activity
-            android:name = "com.gh.gamecenter.SearchActivity"
-            android:configChanges = "keyboardHidden"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.NewsDetailActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.SettingActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.ConcernActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.subject.SubjectActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.NewsSearchActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateHidden" />
-        <activity
-            android:name = "com.gh.gamecenter.GameNewsActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.CropImageActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.WebActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.ShareCardPicActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.ShareCardActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.MessageDetailActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.LibaoActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateHidden" />
-        <activity
-            android:name = "com.gh.gamecenter.LibaoDetailActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.ShareGhWfifActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.ShareGhActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.CleanApkActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.kuaichuan.view.KcSelectGameActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.kuaichuan.view.ChooseReceiverActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.kuaichuan.view.ReceiverWaitingActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.kuaichuan.view.FileSenderActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.kuaichuan.view.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.mygame.MyGameActivity"
-            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 = ".category.CategoryDirectoryActivity"
-            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.CategoryListActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.ShellActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.LoginActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateHidden" />
+            android:name="com.gh.gamecenter.NewsDetailActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.UserInfoActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.SettingActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.UserRegionActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.ConcernActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.CollectionActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.subject.SubjectActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.MessageActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.NewsSearchActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name = "com.gh.gamecenter.UserInfoEditActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateHidden" />
-        <activity
-            android:name = "com.gh.gamecenter.KaiFuActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.GameNewsActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.search.AskSearchActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.CropImageActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.WebActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.questions.detail.QuestionsDetailActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.ShareCardPicActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = ".qa.answer.fold.AnswerFoldActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.ShareCardActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.answer.edit.AnswerEditActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.MessageDetailActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.ConcernInfoActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.LibaoActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name = "com.gh.gamecenter.InfoActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.LibaoDetailActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.MessageKeFuActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.ShareGhActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.select.CommunitiesSelectActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.CleanApkActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.subject.CommunitySubjectActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.SelectUserIconActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.MessageInviteActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.AboutActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.MessageVoteActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.CommentDetailActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = ".qa.questions.invite.QuestionsInviteActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.mygame.MyGameActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.myqa.MyAskActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.GameDetailActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.column.order.AskTabOrderActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.SuggestionActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="com.gh.gamecenter.VoteActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.questions.edit.QuestionEditActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.ToolBoxActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name = "com.gh.gamecenter.kaifu.add.AddKaiFuActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateHidden" />
+            android:name="com.gh.gamecenter.WeiBoShareActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name = "com.gh.gamecenter.kaifu.patch.PatchKaifuActivity"
-            android:screenOrientation = "portrait" />
+            android:name=".category.CategoryDirectoryActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.BlockActivity"
-            android:screenOrientation = "portrait" />
+            android:name=".category.CategoryListActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.column.detail.AskColumnDetailActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.LoginActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name = "com.gh.gamecenter.NetworkDiagnosisActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.UserInfoActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.personalhome.fans.FansActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.UserRegionActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.personalhome.followers.FollowersActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.CollectionActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.PersonalHomeActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.MessageActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.personalhome.answer.PersonalAnswerActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.UserInfoEditActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name = "com.gh.gamecenter.personalhome.question.PersonalQuestionActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.qa.search.AskSearchActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.article.edit.ArticleEditActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.article.MyArticleActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.qa.questions.detail.QuestionsDetailActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.article.draft.ArticleDraftActivity"
-            android:screenOrientation = "portrait" />
+            android:name=".qa.answer.fold.AnswerFoldActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.article.detail.ArticleDetailActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.qa.answer.edit.AnswerEditActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.draft.CommunityDraftWrapperActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.ConcernInfoActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.gamedetail.rating.edit.RatingEditActivity"
-            android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateVisible" />
+            android:name="com.gh.gamecenter.InfoActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.questions.edit.manager.HistoryDetailActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.MessageKeFuActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.questions.edit.manager.HistoryActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.qa.select.CommunitiesSelectActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.editor.InsertAnswerWrapperActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.qa.subject.CommunitySubjectActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.editor.GameActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.MessageInviteActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.editor.InsertArticleWrapperActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.MessageVoteActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.gamedetail.rating.RatingReplyActivity"
-            android:screenOrientation = "portrait" />
+            android:name=".qa.questions.invite.QuestionsInviteActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.history.HistoryActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.qa.myqa.MyAskActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.kuaichuan.view.FileShareActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.qa.column.order.AskTabOrderActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.personalhome.rating.RatingActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.qa.questions.edit.QuestionEditActivity"
+            android:screenOrientation="portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.gamedetail.rating.logs.CommentLogsActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.servers.add.AddKaiFuActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateHidden" />
 
         <activity
-            android:name = "com.gh.gamecenter.tag.TagsActivity"
-            android:screenOrientation = "portrait" />
-
-        <activity android:name = "com.gh.gamecenter.qa.article.SimpleArticleListActivity"
-            android:screenOrientation = "portrait" />
+            android:name="com.gh.gamecenter.servers.patch.PatchKaifuActivity"
+            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.BlockActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.amway.AmwayActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.column.detail.AskColumnDetailActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.NetworkDiagnosisActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.personalhome.fans.FansActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.personalhome.followers.FollowersActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.personalhome.UserHomeActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.article.edit.ArticleEditActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.article.MyArticleActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.article.draft.ArticleDraftActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.article.detail.ArticleDetailActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.draft.CommunityDraftWrapperActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.gamedetail.rating.edit.RatingEditActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateVisible" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.questions.edit.manager.HistoryDetailActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.questions.edit.manager.HistoryActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.editor.InsertAnswerWrapperActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.editor.GameActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.editor.InsertArticleWrapperActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.gamedetail.rating.RatingReplyActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.history.HistoryActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.personalhome.rating.RatingActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.gamedetail.rating.logs.CommentLogsActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.tag.TagsActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.article.SimpleArticleListActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.video.videomanager.VideoManagerActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.video.upload.view.UploadVideoActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.video.game.GameVideoActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.editor.VideoActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.mygame.PlayedGameActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.servers.GameServersActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.game.columncollection.detail.ColumnCollectionDetailActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.game.upload.GameSubmissionActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.halo.assistant.fragment.user.UserPortraitCropImageActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.HelpAndFeedbackActivity"
+            android:windowSoftInputMode="stateHidden"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.help.HelpDetailActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name="com.gh.gamecenter.qa.comment.CommentActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.Transparent"
+            android:windowSoftInputMode="adjustNothing" />
+
+        <activity
+            android:name="com.gh.gamecenter.video.detail.VideoDetailActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:screenOrientation="portrait"
+            android:theme="@style/TransparentStatusBarAndNavigationBar" />
+        <activity
+            android:name=".gamedetail.myrating.MyRatingActivity"
+            android:screenOrientation="portrait" />
 
         <!-- 使用小米/华为推送弹窗功能提高推送成功率-->
         <activity
-            android:name = "com.gh.gamecenter.PushProxyActivity"
-            android:exported = "true"
-            android:theme = "@android:style/Theme.Translucent" />
+            android:name="com.gh.gamecenter.PushProxyActivity"
+            android:exported="true"
+            android:theme="@android:style/Theme.Translucent" />
 
         <activity
-            android:name = "com.gh.gamecenter.SkipActivity"
-            android:theme = "@style/Theme.AppCompat.Light.Fullscreen.Transparent" >
-            <intent-filter >
-                <data android:scheme = "ghzhushou" />
+            android:name="com.gh.gamecenter.SkipActivity"
+            android:theme="@style/Theme.AppCompat.Light.Fullscreen.Transparent">
+            <intent-filter>
+                <data android:scheme="ghzhushou" />
 
-                <category android:name = "android.intent.category.DEFAULT" />
-                <action android:name = "android.intent.action.VIEW" />
-                <category android:name = "android.intent.category.BROWSABLE" />
-            </intent-filter >
-        </activity >
+                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>
+        </activity>
 
         <activity
-            android:name = "${applicationId}.wxapi.WXEntryActivity"
-            android:exported = "true"
-            android:label = "@string/app_name"
-            android:launchMode = "singleTop"
-            android:screenOrientation = "portrait"
-            android:theme = "@android:style/Theme.Translucent.NoTitleBar" ></activity >
+            android:name="${applicationId}.wxapi.WXEntryActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"></activity>
 
         <provider
-            android:name = "androidx.core.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/editor.html

@@ -4,12 +4,14 @@
     <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="false"></div>
 <script type="text/javascript" src="zepto.min.js"></script>
 <script type="text/javascript" src="rich_editor.js"></script>
+<script type="text/javascript" src="video.min.js"></script>
 <!--<script type="text/javascript" src="content.js"></script>-->
 <!--<script type="text/javascript" src="https://resource.ghzs.com/js/halo_app.js"></script>-->
 </body>

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

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

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

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

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

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

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

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

app/src/main/assets/rich_editor.js

@@ -63,6 +63,12 @@ RE.setHtml = function(contents) {
     RE.editor.innerHTML = decodeURIComponent(contents.replace(/\+/g, '%20'));
 }
 
+// 后续初始化html代码,都用该方法
+RE.setHtmlByVideoStatus = function(contents) {
+    RE.editor.innerHTML = decodeURIComponent(contents.replace(/\+/g, '%20'));
+}
+
+// Deprecated
 RE.getHtml = function() {
     return RE.editor.innerHTML;
 }
@@ -229,7 +235,7 @@ RE.replaceTbImage = function(imgRuleFlag, gifRuleFlag) {
          var img = imgs[i];
          var imageClassName = img.className;
 //         console.log(imageClassName)
-         if (imageClassName == "image-link") continue;
+         if (imageClassName == "image-link" || img.className == "poster") continue;
          if(img.src.indexOf("?") > 0) continue;
 //         console.log(i)
          var tbImg
@@ -268,7 +274,7 @@ RE.replaceAllDfImage = function(imgRuleFlag, gifRuleFlag) {
     for (var i = 0; i < imgs.length; i++) {
          var img = imgs[i];
          var imageClassName = img.className;
-         if (imageClassName == "image-link") continue;
+         if (imageClassName == "image-link" || img.className == "poster") continue;
          if(img.src.indexOf("web_load_dfimg_icon") > 0) {
             img.parentNode.removeChild(img.parentNode.childNodes[0]);
             i--;
@@ -294,7 +300,7 @@ RE.hideShowBigPic = function() {
     for (var i = 0; i < imgs.length; i++) {
          var img = imgs[i];
          var imageClassName = img.className;
-         if (imageClassName == "image-link") continue;
+         if (imageClassName == "image-link" || img.className == "poster") continue;
          if(img.src.indexOf(",thumbnail") > 0 && img.src.indexOf(".gif") == -1) {
             j++;
          }
@@ -305,7 +311,7 @@ RE.hideShowBigPic = function() {
        for (var i = 0; i < imgs.length; i++) {
            var img = imgs[i];
            var imageClassName = img.className;
-           if (imageClassName == "image-link") continue;
+           if (imageClassName == "image-link" || img.className == "poster") continue;
            if(img.src.indexOf("web_load_dfimg_icon") > 0) {
              img.parentNode.removeChild(img.parentNode.childNodes[0]);
              break;
@@ -319,7 +325,7 @@ RE.replaceDfImageByUrl = function(imgUrl, imgRuleFlag, gifRuleFlag) {
     for (var i = 0; i < imgs.length; i++) {
          var img = imgs[i];
          var imageClassName = img.className;
-         if (imageClassName == "image-link") continue;
+         if (imageClassName == "image-link" || img.className == "poster") continue;
          if (img.src.indexOf(imgUrl) != -1) {
              img.style.cssText = "max-width: 100%; display:block; margin:8px auto; height: auto;"
              if(img.src.indexOf(".gif") > 0) {
@@ -337,7 +343,7 @@ RE.ImageClickListener = function() {
     for (var i = 0; i < imgs.length; i++) {
          var img = imgs[i];
          var imageClassName = img.className;
-         if (imageClassName == "image-link") continue;
+         if (imageClassName == "image-link"|| img.className == "poster") continue;
          window.imagelistener.imageArr(img.src);
          img.onclick = function() {
              window.imagelistener.imageClick(this.src);

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

@@ -1,19 +1,17 @@
 package com.gh.base;
 
-import android.app.Activity;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
 import android.view.Window;
-
-import androidx.annotation.NonNull;
-import androidx.lifecycle.Lifecycle;
+import android.view.WindowManager;
 
 import com.gh.common.constant.Constants;
-import com.gh.common.util.DataUtils;
 import com.gh.common.util.DialogUtils;
+import com.gh.common.util.MtaHelper;
 import com.gh.common.util.PackageUtils;
 import com.gh.common.util.RunningUtils;
 import com.gh.common.util.ShareUtils;
@@ -21,9 +19,8 @@ import com.gh.common.util.StringUtils;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.LoginActivity;
 import com.gh.gamecenter.R;
-import com.gh.gamecenter.SuggestionActivity;
 import com.gh.gamecenter.eventbus.EBShowDialog;
-import com.gh.gamecenter.suggest.SuggestType;
+import com.lightgame.BaseAppCompatActivity;
 import com.lightgame.download.FileUtils;
 import com.lightgame.utils.Utils;
 import com.tencent.tauth.Tencent;
@@ -31,30 +28,40 @@ import com.tencent.tauth.Tencent;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.lang.ref.WeakReference;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.lifecycle.Lifecycle;
 import butterknife.ButterKnife;
 import pub.devrel.easypermissions.EasyPermissions;
 
 import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE;
 
-public abstract class BaseActivity extends BaseToolBarActivity implements EasyPermissions.PermissionCallbacks {
+/**
+ * 只提供基础的服务(EventBus/ButterKnife/Share/GlobalDialog/Permissions)
+ * <p>
+ * 需要工具栏的页面请继承{@link ToolBarActivity}
+ */
+
+public abstract class BaseActivity extends BaseAppCompatActivity implements EasyPermissions.PermissionCallbacks {
+
+    // global dialog key
+    public final static String DOWNLOAD_HIJACK = "hijack";
+    public final static String LOGIN_EXCEPTION = "loginException";
+    public final static String PLUGGABLE = "plugin";
 
     @NonNull
     protected String mEntrance;
 
-    private boolean mIsPause;
     private boolean mIsExistLogoutDialog;
 
     protected final Handler mBaseHandler = new BaseHandler(this);
 
     protected static class BaseHandler extends Handler {
+
         private final WeakReference<BaseActivity> mActivityWeakReference;
 
         BaseHandler(BaseActivity activity) {
@@ -83,25 +90,9 @@ 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);
@@ -121,50 +112,48 @@ public abstract class BaseActivity extends BaseToolBarActivity implements EasyPe
         super.onDestroy();
     }
 
-    @Override
-    protected boolean onNavigationIconClicked() {
-        onBackPressed();
-        return true;
-    }
-
     public void toast(String msg) {
-        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-            Utils.toast(this, msg);
+        Utils.toast(this, msg);
     }
 
     public void toast(int msg) {
-        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-            toast(getString(msg));
+        toast(getString(msg));
     }
 
-    public void showShare(String url, String icon, String shareTitle, String shareSummary, ShareUtils.ShareType shareType) {
-
-        ShareUtils.getInstance(this).showShareWindows(this, getWindow().getDecorView(), url, icon, shareTitle, shareSummary, shareType);
-
+    public void showShare(String url,
+                          String icon,
+                          String shareTitle,
+                          String shareSummary,
+                          ShareUtils.ShareType shareType) {
+        ShareUtils.getInstance(this).showShareWindows(this,
+                getWindow().getDecorView(),
+                url,
+                icon,
+                shareTitle,
+                shareSummary,
+                shareType);
         if (shareType == ShareUtils.ShareType.game || shareType == ShareUtils.ShareType.plugin) {
-            DataUtils.onEvent(this, "内容分享", shareTitle + shareSummary);
+            MtaHelper.onEvent("内容分享", "内容分享", shareTitle + shareSummary);
         } else {
-            DataUtils.onEvent(this, "内容分享", shareTitle);
+            MtaHelper.onEvent("内容分享", "内容分享", shareTitle);
         }
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(final EBShowDialog showDialog) {
-        if (!mIsPause && this.getClass().getName().equals(RunningUtils.getTopActivity(this))) {
-            if ("hijack".equals(showDialog.getType())) {
-                DialogUtils.showQqSessionDialog(this, "2586716223");// 建议用户联系客服
-            } else if ("plugin".equals(showDialog.getType())) {
-                DialogUtils.showPluginDialog(this, new DialogUtils.ConfirmListener() {
-                    @Override
-                    public void onConfirm() {
-                        if (FileUtils.isEmptyFile(showDialog.getPath())) {
-                            toast(R.string.install_failure_hint);
-                        } else {
-                            startActivity(PackageUtils.getUninstallIntent(BaseActivity.this, showDialog.getPath()));
-                        }
+        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)
+                && this.getClass().getName().equals(RunningUtils.getTopActivity(this))) {
+            if (DOWNLOAD_HIJACK.equals(showDialog.getType())) {
+                DialogUtils.showQqSessionDialog(this);// 建议用户联系客服
+            } else if (PLUGGABLE.equals(showDialog.getType())) {
+                DialogUtils.showPluginDialog(this, () -> {
+                    if (FileUtils.isEmptyFile(showDialog.getPath())) {
+                        toast(R.string.install_failure_hint);
+                    } else {
+                        startActivity(PackageUtils.getUninstallIntent(BaseActivity.this, showDialog.getPath()));
                     }
                 });
-            } else if ("loginException".equals(showDialog.getType())) {
+            } else if (LOGIN_EXCEPTION.equals(showDialog.getType())) {
                 if (mIsExistLogoutDialog) return;
                 mIsExistLogoutDialog = true;
                 try {
@@ -179,16 +168,9 @@ public abstract class BaseActivity extends BaseToolBarActivity implements EasyPe
                                     "你的账号已在另外一台设备登录多设备-重新登录"))
                     );
                     mBaseHandler.postDelayed(() -> mIsExistLogoutDialog = false, 5000);
-                } catch (JSONException e) {
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
-            } else if ("notfound".equals(showDialog.getType())) {
-                DialogUtils.showAlertDialog(this, "下载失败", "下载链接已失效，建议提交反馈"
-                        , "立即反馈", "取消"
-                        , () -> {
-                            SuggestionActivity.startSuggestionActivity(this, SuggestType.gameQuestion,
-                                    null, showDialog.getPath() + "，问题反馈：下载链接失效");
-                        }, null);
             }
         }
     }
@@ -196,17 +178,17 @@ public abstract class BaseActivity extends BaseToolBarActivity implements EasyPe
     @Override
     protected void onPause() {
         super.onPause();
-        mIsPause = true;
     }
 
     @Override
     protected void onResume() {
         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);
     }
@@ -221,7 +203,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)) {
@@ -232,4 +234,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.view.View;
+
 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;
 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/BaseRichEditorActivity.kt

@@ -10,12 +10,16 @@ import android.text.TextUtils
 import android.view.View
 import android.webkit.JavascriptInterface
 import butterknife.OnClick
+import com.gh.common.util.DialogUtils
+import com.gh.common.util.MtaHelper
 import com.gh.common.view.RichEditor
 import com.gh.gamecenter.R
 import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.entity.MyVideoEntity
 import com.gh.gamecenter.qa.editor.GameActivity
 import com.gh.gamecenter.qa.editor.InsertAnswerWrapperActivity
 import com.gh.gamecenter.qa.editor.InsertArticleWrapperActivity
+import com.gh.gamecenter.qa.editor.VideoActivity
 import com.gh.gamecenter.qa.entity.AnswerEntity
 import com.gh.gamecenter.qa.entity.ArticleEntity
 import com.gh.gamecenter.qa.entity.EditorInsertEntity
@@ -24,7 +28,7 @@ import com.lightgame.utils.Utils
 import com.lightgame.view.CheckableImageView
 import kotterknife.bindView
 
-abstract class BaseRichEditorActivity : BaseActivity() {
+abstract class BaseRichEditorActivity : ToolBarActivity() {
 
     val mRichEditor by bindView<RichEditor>(R.id.rich_editor)
 
@@ -49,6 +53,7 @@ abstract class BaseRichEditorActivity : BaseActivity() {
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
+        DialogUtils.fixWebViewKeyboardNotWorking(this)
         if (resultCode != Activity.RESULT_OK) return
         var insertData: EditorInsertEntity? = null
         when (requestCode) {
@@ -64,6 +69,11 @@ abstract class BaseRichEditorActivity : BaseActivity() {
                 val game = data?.getParcelableExtra<GameEntity>(GameEntity::class.java.simpleName)
                 if (game != null) insertData = EditorInsertEntity.transform(game)
             }
+            VideoActivity.INSERT_VIDEO_CODE -> {
+                val video = data?.getParcelableExtra<MyVideoEntity>(MyVideoEntity::class.java.simpleName)
+                if (video != null) mRichEditor.insertCustomVideo(video)
+                return
+            }
         }
 
         mRichEditor.insertCustomStyleLink(insertData)
@@ -84,7 +94,7 @@ abstract class BaseRichEditorActivity : BaseActivity() {
             R.id.editor_paragraph_h1, R.id.editor_paragraph_h2, R.id.editor_paragraph_h3,
             R.id.editor_paragraph_h4, R.id.editor_font_container, R.id.editor_paragraph_container,
             R.id.editor_paragraph_quote, R.id.editor_link_answer, R.id.editor_link_article,
-            R.id.editor_link_game)
+            R.id.editor_link_game, R.id.editor_link_video)
     fun onRichClick(view: View) {
         when (view.id) {
             R.id.editor_font -> {
@@ -117,19 +127,30 @@ abstract class BaseRichEditorActivity : BaseActivity() {
             R.id.editor_font_bold -> {
                 mEditorFontBold.isChecked = !mEditorFontBold.isChecked
                 mRichEditor.setBold()
+                if (mEditorFontBold.isChecked) {
+                    MtaHelper.onEvent(mtaEventName(), "文字样式", "文字样式-加粗")
+                }
             }
             R.id.editor_font_italic -> {
                 mEditorFontItalic.isChecked = !mEditorFontItalic.isChecked
                 mRichEditor.setItalic()
+                if (mEditorFontItalic.isChecked) {
+                    MtaHelper.onEvent(mtaEventName(), "文字样式", "文字样式-斜体")
+                }
             }
             R.id.editor_font_strikethrough -> {
                 mEditorFontStrikeThrough.isChecked = !mEditorFontStrikeThrough.isChecked
                 mRichEditor.setStrikeThrough()
+
+                if (mEditorFontStrikeThrough.isChecked) {
+                    MtaHelper.onEvent(mtaEventName(), "文字样式", "文字样式-删除线")
+                }
             }
             R.id.editor_paragraph_h1 -> {
                 if (mEditorParagraphH1.isChecked) {
                     mRichEditor.formatBlock()
                 } else {
+                    MtaHelper.onEvent(mtaEventName(), "段落样式", "段落样式-1级标题")
                     mRichEditor.setHeading(1)
                 }
                 mEditorParagraphH1.isChecked = !mEditorParagraphH1.isChecked
@@ -138,6 +159,7 @@ abstract class BaseRichEditorActivity : BaseActivity() {
                 if (mEditorParagraphH2.isChecked) {
                     mRichEditor.formatBlock()
                 } else {
+                    MtaHelper.onEvent(mtaEventName(), "段落样式", "段落样式-2级标题")
                     mRichEditor.setHeading(2)
                 }
                 mEditorParagraphH2.isChecked = !mEditorParagraphH2.isChecked
@@ -146,6 +168,7 @@ abstract class BaseRichEditorActivity : BaseActivity() {
                 if (mEditorParagraphH3.isChecked) {
                     mRichEditor.formatBlock()
                 } else {
+                    MtaHelper.onEvent(mtaEventName(), "段落样式", "段落样式-3级标题")
                     mRichEditor.setHeading(3)
                 }
                 mEditorParagraphH3.isChecked = !mEditorParagraphH3.isChecked
@@ -154,6 +177,7 @@ abstract class BaseRichEditorActivity : BaseActivity() {
                 if (mEditorParagraphH4.isChecked) {
                     mRichEditor.formatBlock()
                 } else {
+                    MtaHelper.onEvent(mtaEventName(), "段落样式", "段落样式-4级标题")
                     mRichEditor.setHeading(4)
                 }
                 mEditorParagraphH4.isChecked = !mEditorParagraphH4.isChecked
@@ -162,18 +186,26 @@ abstract class BaseRichEditorActivity : BaseActivity() {
                 if (mEditorParagraphQuote.isChecked) {
                     mRichEditor.formatBlock()
                 } else {
+                    MtaHelper.onEvent(mtaEventName(), "段落样式", "段落样式-引用")
                     mRichEditor.setBlockquote()
                 }
                 mEditorParagraphQuote.isChecked = !mEditorParagraphQuote.isChecked
             }
             R.id.editor_link_answer -> {
+                MtaHelper.onEvent(mtaEventName(), "插入链接", "插入链接-回答")
                 startActivityForResult(InsertAnswerWrapperActivity.getIntent(this), INSERT_ANSWER_CODE)
             }
             R.id.editor_link_article -> {
+                MtaHelper.onEvent(mtaEventName(), "插入链接", "插入链接-文章")
                 startActivityForResult(InsertArticleWrapperActivity.getIntent(this), INSERT_ARTICLE_CODE)
             }
             R.id.editor_link_game -> {
-                startActivityForResult(GameActivity.getIntent(this), INSERT_GAME_CODE)
+                MtaHelper.onEvent(mtaEventName(), "插入链接", "插入链接-游戏")
+                startActivityForResult(GameActivity.getIntent(this, "插入游戏"), INSERT_GAME_CODE)
+            }
+            R.id.editor_link_video -> {
+                MtaHelper.onEvent(mtaEventName(), "插入链接", "插入链接-视频")
+                startActivityForResult(VideoActivity.getIntent(this), VideoActivity.INSERT_VIDEO_CODE)
             }
         }
     }
@@ -219,6 +251,8 @@ abstract class BaseRichEditorActivity : BaseActivity() {
         }
     }
 
+    abstract fun mtaEventName(): String
+
     companion object {
         const val ELEMENT_NAME_BOLD = " b "
         const val ELEMENT_NAME_ITALIC = " i "

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

@@ -1,154 +0,0 @@
-package com.gh.base;
-
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.ViewGroup;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import androidx.annotation.DrawableRes;
-import androidx.annotation.StringRes;
-import androidx.appcompat.widget.Toolbar;
-import androidx.fragment.app.Fragment;
-
-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));
-    }
-
-    /**
-     * 重写此方法以将标题靠左显示
-     */
-    public boolean showToolbarAtLeft() {
-        return false;
-    }
-
-    @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;
-                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);
-                }
-            }
-        }
-    }
-
-    @Override
-    public MenuItem getMenuItem(int res) {
-        if (mToolbar == null) return null; //后续页面做好判断
-        return mToolbar.getMenu().findItem(res);
-    }
-
-    public void clearMenu() {
-        if (mToolbar != null) {
-            mToolbar.getMenu().clear();
-        }
-    }
-
-    public Menu getMenu() {
-        return mToolbar.getMenu();
-    }
-
-    @Override
-    public boolean onMenuItemClick(MenuItem item) {
-        return false;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                return onNavigationIconClicked();
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    protected abstract boolean onNavigationIconClicked();
-
-}

app/src/main/java/com/gh/base/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

@@ -140,8 +140,9 @@ class GHUmengNotificationService : UmengMessageService() {
 
             notificationManager.notify(getNotificationTag(context), NOTIFICATION_ID, notification)
         } else {
-            if (UserManager.getInstance().isLoggedIn
-                    && HALO_MESSAGE_DIALOG == pushData.body?.custom) {
+            if (UserManager.getInstance().isLoggedIn &&
+                    HALO_MESSAGE_DIALOG == pushData.body?.custom &&
+                    MessageUnreadRepository.unreadLiveData.value != null) {
                 // 回答了问题或者关注了问题的消息
                 val msg = gson.fromJson(message, PushMessageEntity::class.java)
                 val data = msg?.extra?.data

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

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

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

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

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

@@ -1,12 +1,13 @@
 package com.gh.base.fragment;
 
 import android.app.Dialog;
-import androidx.lifecycle.Lifecycle;
 import android.os.Bundle;
+import android.view.KeyEvent;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 import androidx.fragment.app.DialogFragment;
-import android.view.KeyEvent;
+import androidx.lifecycle.Lifecycle;
 
 import com.gh.common.util.ClickUtils;
 import com.gh.gamecenter.R;
@@ -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/BaseFragment.java

@@ -9,14 +9,6 @@ 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;
@@ -33,6 +25,12 @@ import org.greenrobot.eventbus.ThreadMode;
 import java.lang.ref.WeakReference;
 import java.util.List;
 
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
 import butterknife.ButterKnife;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -181,13 +179,15 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
     }
 
     public void toast(@StringRes int res) {
-        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-            toast(getString(res));
+        toast(getString(res));
     }
 
     public void toast(String msg) {
-        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
+        try {
             Utils.toast(getContext(), msg);
+        } catch (Exception ignore) {
+        
+        }
     }
 
     public void toastLong(@StringRes int msg) {

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

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

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

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

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

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

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

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

@@ -0,0 +1,133 @@
+package com.gh.common
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.text.TextUtils
+import com.gh.common.util.CheckLoginUtils
+import com.gh.common.util.DialogUtils
+import com.gh.common.util.DirectUtils
+import com.gh.common.util.EntranceUtils
+import com.gh.gamecenter.GameDetailActivity
+import com.gh.gamecenter.LibaoDetailActivity
+import com.gh.gamecenter.NewsDetailActivity
+import com.gh.gamecenter.WebActivity
+import com.gh.gamecenter.entity.CommunityEntity
+import com.gh.gamecenter.entity.VideoLinkEntity
+import com.gh.gamecenter.subject.SubjectActivity
+import com.halo.assistant.HaloApp
+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, "文章链接")
+                    }
+                }
+                EntranceUtils.HOST_UPLOAD_VIDEO -> {
+                    val titleParameter = uri.getQueryParameter("title")
+                    val title = if (titleParameter.isNullOrEmpty()) "" else "#$titleParameter#"
+                    val categoryId = uri.getQueryParameter("category_id") ?: ""
+                    val link = uri.getQueryParameter("link") ?: ""
+                    val linkEntity = VideoLinkEntity(title, categoryId, link)
+                    if (!CheckLoginUtils.isLogin()) {
+                        HaloApp.put(EntranceUtils.HOST_UPLOAD_VIDEO, linkEntity)
+                    }
+                    CheckLoginUtils.checkLogin(context, EntranceUtils.ENTRANCE_BROWSER) {
+                        DirectUtils.directToVideoManager(context, linkEntity, EntranceUtils.ENTRANCE_BROWSER, "")
+                    }
+                }
+                else -> DialogUtils.showLowVersionDialog(context)
+            }
+            return true
+        }
+        if ("http" != uri.scheme && "https" != uri.scheme) return true
+        return false
+    }
+}

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

@@ -27,35 +27,36 @@ import org.json.JSONObject
 object PushManager {
 
     var deviceToken: String? = ""
-    var previousAlias: AliasEntity? = null
-    var application = HaloApp.getInstance().application
+
+    private var mPreviousAlias: AliasEntity? = null
+    private var mApplication = HaloApp.getInstance().application
 
     const val SP_PUSH_ALIAS = "push_alias"
 
     @JvmStatic
     fun init(channel: String) {
         //初始化友盟推送
-        UMConfigure.init(application,
+        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 = aliasInSp?.toObject()
+        val aliasInSp = PreferenceManager.getDefaultSharedPreferences(mApplication).getString(SP_PUSH_ALIAS, "")
+        mPreviousAlias = aliasInSp?.toObject()
 
-        if (previousAlias == null) {
+        if (mPreviousAlias == null) {
             getAndSetAlias()
         }
 
@@ -64,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
@@ -100,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) },
@@ -110,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, previousAlias?.toJson())
+        mPreviousAlias = alias
+        PreferenceManager.getDefaultSharedPreferences(mApplication).edit {
+            putString(SP_PUSH_ALIAS, mPreviousAlias?.toJson())
         }
 
         pushAgent.setAlias(alias.alias, alias.aliasType) { b, s ->
@@ -124,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/constant/Config.java

@@ -3,20 +3,31 @@ package com.gh.common.constant;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
+import androidx.annotation.Nullable;
+
 import com.gh.common.util.GsonUtils;
 import com.gh.common.util.PackageHelper;
+import com.gh.common.util.PackageUtils;
 import com.gh.common.util.SPUtils;
 import com.gh.gamecenter.BuildConfig;
+import com.gh.gamecenter.SuggestionActivity;
 import com.gh.gamecenter.entity.NewsEntity;
 import com.gh.gamecenter.entity.SettingsEntity;
+import com.gh.gamecenter.eventbus.EBReuse;
+import com.gh.gamecenter.retrofit.Response;
+import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.util.List;
 
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+
 public class Config {
 
     public static final String API_HOST = BuildConfig.API_HOST;
@@ -54,6 +65,7 @@ public class Config {
     public static final String FIX_ARTICLE_KEY = "isFixArticle";
     public static final String FIX_COMMUNITY_KEY = "isFixCommunity";
 
+    public static final int VIDEO_PAGE_SIZE = 21; // 视频列表大多都是一行3个
 
     public static boolean isShow() {
         if (getPreferences().getBoolean(FIX_DOWNLOAD_KEY, false)) return true;
@@ -167,6 +179,9 @@ public class Config {
         getPreferences().edit().putString(SETTINGS_KEY, GsonUtils.toJson(settingsEntity)).apply();
         mSettingsEntity = settingsEntity;
 
+        // 更新 FIX_ARTICLE_KEY 状态
+        mSettingsEntity.showArticleEntrance();
+
         // 加载完设置后刷新下
         PackageHelper.initList();
     }
@@ -230,4 +245,29 @@ public class Config {
         editor.putBoolean(Config.FIX_PLUGIN_KEY, true);
         editor.apply();
     }
+
+    public static void getGhzsSettings() {
+        String channel = HaloApp.getInstance().getChannel();
+        RetrofitManager.getInstance(HaloApp.getInstance().getApplication())
+                .getApi().getSettings(PackageUtils.getVersionName(), channel)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Response<SettingsEntity>() {
+                    @Override
+                    public void onResponse(SettingsEntity response) {
+                        Config.setSettings(response);
+
+                        // 意见反馈
+                        SharedPreferences.Editor edit = getPreferences().edit();
+                        edit.putString(SuggestionActivity.SUGGESTION_HINT_TYPE,
+                                GsonUtils.toJson(response.getSuggestion()));
+                        edit.apply();
+
+                        if (!getPreferences().getBoolean(Config.FIX_DOWNLOAD_KEY, false) && Config.isShow()) {
+                            getPreferences().edit().putBoolean(Config.FIX_DOWNLOAD_KEY, true).apply();
+                        }
+                        EventBus.getDefault().post(new EBReuse("Refresh"));
+                    }
+                });
+    }
 }

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

@@ -1,5 +1,7 @@
 package com.gh.common.constant;
 
+import com.gh.common.util.PackageUtils;
+
 public class Constants {
 
     public static final int SEND_NEWS_FEEDBACK = 0x126;
@@ -17,12 +19,38 @@ 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_LOGIN = "show_notification_login_hint";
+    public static final String SP_SHOWED_NOTIFICATION_QUESTION = "show_notification_question_hint";
+    public static final String SP_SHOWED_NOTIFICATION_ANSWER = "show_notification_answer_hint";
+    public static final String SP_SHOWED_NOTIFICATION_ARTICLE = "show_notification_article_hint";
+    public static final String SP_SHOWED_NOTIFICATION_VIDEO = "show_notification_video_hint";
+    public static final String SP_SHOWED_NOTIFICATION_RATING = "show_notification_rating_hint";
+    // 新版本 也要触发一次“通知管理” 引导弹窗
+    public static final String SP_SHOWED_NOTIFICATION_NEW_VERSION = "show_notification_new_version";
+    // 今天是否已经触发了 “通知管理” 引导弹窗
+    public static final String SP_IS_SHOWED_NOTIFICATION_TODAY = "show_is_notification_today";
+    // 标记安装的游戏为已玩过弹窗，最多取消2次 (https://gitlab.ghzs.com/pm/halo-app-issues/issues/722 调整为版本相关) (不是常量了也放这里好像有点奇怪)
+    public static final String SP_MARK_INSTALLED_GAME = "mark_installed_game" + PackageUtils.getVersionName();
+    //视频详情滑动引导
+    public static final String SP_SHOW_SLIDE_GUIDE = "show_slide_guide";
+    //视频详情点击引导
+    public static final String SP_SHOW_CLICK_GUIDE = "show_click_guide";
+
     //手机号码匹配规则
     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 +59,14 @@ public class Constants {
     //输入规则
     public static final String INPUT_RULE = "0123456789abcdefghijklnmopqrstuvwxyzABCDEFGHIJKLNMOPQRSTUVWXYZ_";
 
+    // 微信绑定地址地址
+    public static final String WECHAT_BIND_ADDRESS_DEV = "https://resource.ghzs.com/page/wechat_dev/index.html#/";
+    public static final String WECHAT_BIND_ADDRESS = "https://resource.ghzs.com/page/wechat_pro/index.html#/";
+
+    // 徽章
+    public static final String BADGE_ADDRESS_DEV = "http://resource.ghzs.com/page/badge_dev/index.html#/";
+    public static final String BADGE_ADDRESS = "http://resource.ghzs.com/page/badge_pro/index.html#/";
+
     //最少需要多少数据才能上传
     public static final int DATA_AMOUNT = 20;
 
@@ -46,8 +82,15 @@ public class Constants {
     public static final int SEARCH_CD = 5 * 60 * 1000;
     //评论 cd间隔
     public static final int COMMENT_CD = 60 * 1000;
+    //我的光环功能分组 cd间隔
+    public static final int ADDONS_CD = 10 * 60 * 1000;
 
     public static final String[] REPORT_LIST = new String[]{"垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息", "违法有害信息", "其它"};
 
     public static final String ENTRANCE_UNKNOWN = "(unknown)";
+
+    public static final String DEFAULT_TEXT_WRAPPER = "###";
+    
+    // 触发了安装事件的标记
+    public static final String MARK_ALREADY_TRIGGERED_INSTALLATION = "triggered_installation";
 }

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

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

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

@@ -1,7 +1,11 @@
 package com.gh.common.databind;
 
 import android.content.Intent;
+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;
@@ -9,15 +13,14 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-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;
@@ -25,25 +28,33 @@ import com.gh.common.util.DownloadDialogHelper;
 import com.gh.common.util.GameUtils;
 import com.gh.common.util.GameViewUtils;
 import com.gh.common.util.ImageUtils;
+import com.gh.common.util.LogUtils;
+import com.gh.common.util.MtaHelper;
 import com.gh.common.util.NewsUtils;
 import com.gh.common.util.NumberUtils;
 import com.gh.common.util.PackageUtils;
+import com.gh.common.util.PermissionHelper;
 import com.gh.common.util.PlatformUtils;
-import com.gh.common.util.StringUtils;
+import com.gh.common.util.ReservationHelper;
 import com.gh.common.view.DownloadDialog;
 import com.gh.common.view.DownloadProgressBar;
+import com.gh.common.view.DrawableView;
 import com.gh.download.DownloadManager;
 import com.gh.gamecenter.DownloadManagerActivity;
 import com.gh.gamecenter.R;
+import com.gh.gamecenter.WebActivity;
 import com.gh.gamecenter.baselist.LoadStatus;
 import com.gh.gamecenter.databinding.KaifuAddItemBinding;
 import com.gh.gamecenter.databinding.KaifuDetailItemRowBinding;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
-import com.gh.gamecenter.entity.KaiFuCalendarEntity;
+import com.gh.gamecenter.entity.LinkEntity;
 import com.gh.gamecenter.entity.PluginLocation;
+import com.gh.gamecenter.entity.ServerCalendarEntity;
+import com.gh.gamecenter.entity.TagStyleEntity;
 import com.gh.gamecenter.eventbus.EBReuse;
 import com.gh.gamecenter.manager.PackagesManager;
+import com.gh.gamecenter.qa.entity.CommunityVideoEntity;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.FileUtils;
 import com.lightgame.utils.Utils;
@@ -54,6 +65,12 @@ import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Locale;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import androidx.databinding.BindingAdapter;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
 /**
  * Created by khy on 12/02/18.
  */
@@ -76,7 +93,7 @@ public class BindingAdapters {
     }
 
     @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();
@@ -88,7 +105,7 @@ public class BindingAdapters {
             if (i == 0) {
                 binding.setIsTitle(true);
             } else {
-                KaiFuCalendarEntity serverEntity = list.get(i - 1);
+                ServerCalendarEntity serverEntity = list.get(i - 1);
                 binding.setEntity(serverEntity);
                 binding.getRoot().setOnClickListener(v -> {
                     listener.onClick(v, isReadyPatch != null && isReadyPatch ? serverEntity : null);
@@ -117,7 +134,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));
@@ -306,8 +323,14 @@ 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())
@@ -318,10 +341,121 @@ public class BindingAdapters {
             return;
         }
 
+        // 点击事件
+        progressBar.setOnClickListener(v -> {
+            if (clickCallBack != null) clickCallBack.onClick(v);
+            switch (progressBar.getDownloadType()) {
+                case DOWNLOADING_PLUGIN:
+                case DOWNLOADING_NORMAL:
+                    Intent intent = DownloadManagerActivity.getDownloadMangerIntent(v.getContext(),
+                            gameEntity.getApk().get(0).getUrl(), entrance);
+                    v.getContext().startActivity(intent);
+                    break;
+                case NONE:
+                    Utils.toast(v.getContext(), "该游戏已关闭下载");
+                    break;
+                case NORMAL:
+                case PLUGIN:
+                    if (gameEntity.getApk().size() == 1) {
+                        ApkEntity apk = gameEntity.getApk().get(0);
+                        DownloadDialogHelper.findAvailableDialogAndShow(
+                                v.getContext(),
+                                gameEntity,
+                                apk,
+                                () -> {
+                                    DialogUtils.checkDownload(v.getContext(), apk.getSize(),
+                                            isSubscribe -> download(progressBar, gameEntity, traceEvent, isSubscribe, entrance, location));
+                                });
+                    } else {
+                        DownloadDialog.getInstance(v.getContext()).showPopupWindow(v, gameEntity,
+                                entrance, location + gameEntity.getName(), traceEvent);
+                    }
+                    break;
+                case LAUNCH_OR_OPEN:
+                    if (gameEntity.getApk().size() == 1) {
+                        DataUtils.onGameLaunchEvent(v.getContext(), gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), location);
+                        PackageUtils.launchApplicationByPackageName(v.getContext(), gameEntity.getApk().get(0).getPackageName());
+                    } else {
+                        DownloadDialog.getInstance(v.getContext()).showPopupWindow(v, gameEntity,
+                                entrance, location + gameEntity.getName(), traceEvent);
+                    }
+                    break;
+                case INSTALL_PLUGIN:
+                case INSTALL_NORMAL:
+                    if (gameEntity.getApk().size() == 1) {
+                        DownloadEntity downloadEntity = DownloadManager.getInstance(progressBar.getContext()).getDownloadEntityByUrl(gameEntity.getApk().get(0).getUrl());
+                        if (downloadEntity != null) {
+                            PackageUtils.launchSetup(v.getContext(), downloadEntity);
+                        }
+                    }
+                    break;
+                case RESERVABLE:
+                    CheckLoginUtils.checkLogin(progressBar.getContext(), "", () -> {
+                        PermissionHelper.checkReadPhoneStatePermissionBeforeAction(progressBar.getContext(), () -> {
+                            ReserveDialogFragment dialogFragment = ReserveDialogFragment.getInstance(gameEntity, () -> {
+                                LogUtils.logReservation(gameEntity, traceEvent);
+                                updateReservation(progressBar, gameEntity);
+                            });
+                            dialogFragment.show(((AppCompatActivity) progressBar.getContext()).getSupportFragmentManager(), "reserve");
+                        });
+                    });
+                    break;
+                case RESERVED:
+                    if ("download".equals(gameEntity.getReserveStatus())) {
+                        ReservationHelper.showDeleteReservationDialog(progressBar.getContext(), () -> {
+                            ReservationHelper.deleteReservation(gameEntity, () -> {
+                                updateReservation(progressBar, gameEntity);
+                            });
+                        });
+                    } else {
+                        ReservationHelper.showCancelReservationDialog(progressBar.getContext(), () -> {
+                            ReservationHelper.cancelReservation(gameEntity, () -> {
+                                updateReservation(progressBar, gameEntity);
+                            });
+                        });
+                    }
+                    break;
+                case H5_GAME:
+                    MtaHelper.onEvent("H5页面", "入口", "列表页_" + gameEntity.getName());
+                    LinkEntity linkEntity = gameEntity.getH5Link();
+                    Intent i = new Intent(WebActivity.getIntentForWebGame(progressBar.getContext(), linkEntity.getLink(), gameEntity.getName(), "play".equals(linkEntity.getType())));
+                    progressBar.getContext().startActivity(i);
+                    break;
+            }
+        });
+
+        // 显示预约
+        if (gameEntity.isReservable()) {
+            if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.getId())) {
+                progressBar.setText("预约");
+                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVABLE);
+            } else {
+                progressBar.setText("已预约");
+                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVED);
+            }
+            return;
+        }
+
         // 显示下载按钮状态
-        if (gameEntity.getApk().isEmpty()) {
-            progressBar.setText("暂无下载");
-            progressBar.setDownloadType(DownloadProgressBar.DownloadType.NONE);
+        if (gameEntity.getApk().isEmpty() || gameEntity.getDownloadOffStatus() != null) {
+            LinkEntity h5LinkEntity = gameEntity.getH5Link();
+            String offStatus = gameEntity.getDownloadOffStatus();
+            if (h5LinkEntity != null) {
+                if ("play".equals(h5LinkEntity.getType())) {
+                    progressBar.setText("开始玩");
+                } else {
+                    progressBar.setText("查看");
+                }
+                progressBar.setDownloadType(DownloadProgressBar.DownloadType.H5_GAME);
+            } else {
+                if (offStatus != null && "dialog".equals(offStatus)) {
+                    progressBar.setText("查看");
+                } else {
+                    progressBar.setText("暂无");
+                }
+                progressBar.setDownloadType(DownloadProgressBar.DownloadType.NONE);
+            }
+            
         } else {
             String status = GameUtils.getDownloadBtnText(progressBar.getContext(), gameEntity, PluginLocation.only_game);
             switch (status) {
@@ -375,61 +509,30 @@ public class BindingAdapters {
                 }
             }
         }
-
-        // 点击事件
-        progressBar.setOnClickListener(v -> {
-            switch (progressBar.getDownloadType()) {
-                case DOWNLOADING_PLUGIN:
-                case DOWNLOADING_NORMAL:
-                    Intent intent = DownloadManagerActivity.getDownloadMangerIntent(v.getContext(),
-                            gameEntity.getApk().get(0).getUrl(), "(我的光环:我的游戏)");
-                    v.getContext().startActivity(intent);
-                    break;
-                case NONE:
-                    Utils.toast(v.getContext(), "该游戏已关闭下载");
-                    break;
-                case NORMAL:
-                case PLUGIN:
-                    if (gameEntity.getApk().size() == 1) {
-                        ApkEntity apk = gameEntity.getApk().get(0);
-                        DownloadDialogHelper.findAvailableDialogAndShow(
-                                v.getContext(),
-                                gameEntity,
-                                apk,
-                                () -> {
-                                    DialogUtils.checkDownload(v.getContext(), apk.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("更新")) {
@@ -442,15 +545,17 @@ public class BindingAdapters {
         ApkEntity apkEntity = gameEntity.getApk().get(0);
         String msg = FileUtils.isCanDownload(progressBar.getContext(), apkEntity.getSize());
         if (TextUtils.isEmpty(msg)) {
-            DataUtils.onGameDownloadEvent(progressBar.getContext(), gameEntity.getName(), apkEntity.getPlatform(), "(我的光环:我的游戏)", "下载开始", method);
-
-            ExposureEvent downloadExposureEvent = ExposureUtils.logADownloadExposureEvent(gameEntity, apkEntity.getPlatform(), traceEvent, ExposureUtils.DownloadType.DOWNLOAD);
-
+            DataUtils.onGameDownloadEvent(progressBar.getContext(), gameEntity.getName(), apkEntity.getPlatform(), entrance, "下载开始", method);
+    
+            ExposureUtils.DownloadType downloadType = ExposureUtils.getDownloadType(apkEntity, method);
+            ExposureEvent downloadExposureEvent = ExposureUtils.logADownloadExposureEvent(gameEntity, apkEntity.getPlatform(), traceEvent, downloadType);
+    
             DownloadManager.createDownload(progressBar.getContext(),
                     apkEntity,
                     gameEntity,
                     method,
-                    StringUtils.buildString("(我的光环:我的游戏)"), "我的光环-我的游戏:" + gameEntity.getName(),
+                    entrance,
+                    location + gameEntity.getName(),
                     isSubscribe,
                     downloadExposureEvent);
 
@@ -487,9 +592,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);
         }
     }
@@ -505,4 +608,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

@@ -22,12 +22,13 @@ 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.dialog.BaseDialogFragment
 import com.lightgame.utils.Utils
 import io.reactivex.schedulers.Schedulers
 import okhttp3.ResponseBody
+import org.json.JSONObject
 
-class ReserveDialogFragment : BaseDialogFragment() {
+// 预约弹窗
+class ReserveDialogFragment : BaseTrackableDialogFragment() {
 
     @BindView(R.id.reserve_hint_tv)
     lateinit var reserveHintTv: TextView
@@ -61,6 +62,14 @@ class ReserveDialogFragment : BaseDialogFragment() {
         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?) {
@@ -75,14 +84,14 @@ class ReserveDialogFragment : BaseDialogFragment() {
 
         mViewModel.reservation.observeNonNull(this) {
             if (it.success) {
-                showSuccessDialog(it.withMobile)
+                showSuccessDialog(it.withMobile, it.boundWechat)
                 mSuccessCallback?.onSuccess()
             }
         }
-        dialog.setCanceledOnTouchOutside(true)
+        dialog?.setCanceledOnTouchOutside(true)
     }
 
-    private fun showSuccessDialog(withMobile: Boolean) {
+    private fun showSuccessDialog(withMobile: Boolean, boundWechat: Boolean) {
         reserveHintTv.text = "游戏预约成功"
         reserveContainer.visibility = View.GONE
         reserveCompletedContainer.visibility = View.VISIBLE
@@ -90,13 +99,14 @@ class ReserveDialogFragment : BaseDialogFragment() {
         val reservation = Config.getSettings()?.appointment
         val dialogConfig = if (withMobile) reservation?.withMobile else reservation?.withoutMobile
 
-        reserveCompletedContentTv.text = Html.fromHtml(dialogConfig?.htmlContent)
+        reserveCompletedContentTv.text = dialogConfig?.htmlContent?.fromHtml()
         if (dialogConfig?.text.isNullOrEmpty()
-                || dialogConfig?.toLinkEntity()?.link.isNullOrEmpty()) {
+                || (dialogConfig?.type == "wechat_bind" && boundWechat)) {
             customizableBtn.visibility = View.GONE
         } else {
             customizableBtn.text = dialogConfig?.text
             customizableBtn.setOnClickListener {
+                MtaHelper.onEvent("预约游戏", "预约功能操作", "点击跳转按钮")
                 DirectUtils.directToLinkPage(
                         requireContext(),
                         dialogConfig!!.toLinkEntity(),
@@ -114,6 +124,7 @@ class ReserveDialogFragment : BaseDialogFragment() {
     fun onClick(view: View) {
         when (view.id) {
             R.id.reserve_without_mobile_btn -> {
+                MtaHelper.onEvent("预约游戏", "预约功能操作", "点击无手机号预约")
                 mViewModel.reserve(gameId = mGameId, gameName = mGameName)
             }
 
@@ -124,10 +135,12 @@ class ReserveDialogFragment : BaseDialogFragment() {
                     return
                 }
 
+                MtaHelper.onEvent("预约游戏", "预约功能操作", "点击立即预约")
                 mViewModel.reserve(gameId = mGameId, gameName = mGameName, mobile = mobile)
             }
 
             R.id.close_btn -> {
+                MtaHelper.onEvent("预约游戏", "预约功能操作", "点击关闭")
                 dismissAllowingStateLoss()
             }
         }
@@ -164,7 +177,12 @@ class ReserveViewModel(application: Application) : AndroidViewModel(application)
                 .subscribeOn(Schedulers.io())
                 .subscribe(object : BiResponse<ResponseBody>() {
                     override fun onSuccess(data: ResponseBody) {
-                        reservation.postValue(Reservation(success = true, withMobile = mobile.isNotEmpty()))
+                        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)
@@ -176,6 +194,5 @@ class ReserveViewModel(application: Application) : AndroidViewModel(application)
                 })
     }
 
-    class Reservation(var success: Boolean = false, var withMobile: Boolean = false)
-
+    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/ExposureEvent.kt

@@ -1,9 +1,9 @@
 package com.gh.common.exposure
 
-import androidx.room.Entity
-import androidx.room.PrimaryKey
 import android.os.Parcelable
 import androidx.annotation.Keep
+import androidx.room.Entity
+import androidx.room.PrimaryKey
 import com.gh.common.exposure.meta.Meta
 import com.gh.common.exposure.meta.MetaUtil
 import com.gh.common.exposure.time.TimeUtil
@@ -24,7 +24,8 @@ data class ExposureEvent(
         @PrimaryKey
         val id: String = UUID.randomUUID().toString()) : Parcelable {
     companion object {
-        fun createEvent(gameEntity: GameEntity?, source: List<ExposureSource>, eTrace: List<ExposureEvent>?, event: ExposureType): ExposureEvent {
+        @JvmStatic
+        fun createEvent(gameEntity: GameEntity?, source: List<ExposureSource>, eTrace: List<ExposureEvent>? = null, event: ExposureType = ExposureType.EXPOSURE): ExposureEvent {
             return ExposureEvent(
                     payload = ExposureEntity(gameId = gameEntity?.id,
                             gameName = gameEntity?.name,
@@ -34,7 +35,7 @@ data class ExposureEvent(
                             downloadCompleteType = gameEntity?.downloadCompleteType),
                     source = source,
                     eTrace = eTrace,
-                    event = event)
+                    event = event).apply { gameEntity?.exposureEvent = this }
         }
     }
 }

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

@@ -31,10 +31,10 @@ object ExposureManager {
     private val loghubHelper = LoghubHelper.getInstance()
 
     // exposureCache 用来过滤掉具有相同 id 的曝光事件，避免重复发送事件
-    private val exposureCache = FixedSizeLinkedHashSet<String>(100)
     private val exposureSet = hashSetOf<ExposureEvent>()
-    private val exposureDao by lazy { ExposureDatabase.buildDatabase(HaloApp.getInstance().application).logHubEventDao() }
     private val exposureExecutor = Executors.newSingleThreadExecutor()
+    private val exposureCache = FixedSizeLinkedHashSet<String>(300)
+    private val exposureDao by lazy { ExposureDatabase.buildDatabase(HaloApp.getInstance().application).logHubEventDao() }
 
     @JvmStatic
     fun init() {
@@ -48,7 +48,7 @@ object ExposureManager {
         }
 
         fixedRateTimer(name = "ExposureManager-Store-Checker", initialDelay = 500, period = STORE_FORCE_UPLOAD_PERIOD) {
-            commitSavedExposureEvent(true)
+            commitSavedExposureEvents(true)
         }
     }
 
@@ -57,17 +57,19 @@ object ExposureManager {
      */
     fun log(event: ExposureEvent) {
         exposureExecutor.execute {
-            if (!exposureCache.contains(event.id)) {
-                // Catch `android.database.sqlite.SQLiteFullException: database or disk is full` exception.
-                try {
+            try {
+                if (!exposureCache.contains(event.id)) {
+                    // Catch `android.database.sqlite.SQLiteFullException: database or disk is full` exception.
+
                     exposureSet.add(event)
                     exposureDao.insert(event)
                     exposureCache.add(event.id)
-                } catch (e: Exception) {
-                    e.printStackTrace()
+
+                } else {
+                    Utils.log("Exposure", "遇到重复曝光事件，自动过滤 （${event.id} - ${event.payload.gameName}）")
                 }
-            } else {
-                Utils.log("Exposure", "遇到重复曝光事件，自动过滤 （${event.id} - ${event.payload.gameName}）")
+            } catch (e: Exception) {
+                e.printStackTrace()
             }
         }
     }
@@ -78,24 +80,27 @@ object ExposureManager {
     fun log(eventList: List<ExposureEvent>) {
         exposureExecutor.execute {
             for (event in eventList) {
-                if (!exposureCache.contains(event.id)) {
-                    // Catch `android.database.sqlite.SQLiteFullException: database or disk is full` exception.
-                    try {
+                try {
+                    if (!exposureCache.contains(event.id)) {
+                        // Catch `android.database.sqlite.SQLiteFullException: database or disk is full` exception.
                         exposureSet.add(event)
                         exposureDao.insert(event)
                         exposureCache.add(event.id)
-                    } catch (e: Exception) {
-                        e.printStackTrace()
+                    } else {
+                        Utils.log("Exposure", "遇到重复曝光事件，自动过滤 （${event.id} - ${event.payload.gameName}）")
                     }
-                } else {
-                    Utils.log("Exposure", "遇到重复曝光事件，自动过滤 （${event.id} - ${event.payload.gameName}）")
+                } catch (e: Exception) {
+                    e.printStackTrace()
                 }
             }
-            commitSavedExposureEvent()
+            commitSavedExposureEvents()
         }
     }
 
-    fun commitSavedExposureEvent(forced: Boolean = false) {
+    /**
+     * @param forced Ignore all restrictions.
+     */
+    fun commitSavedExposureEvents(forced: Boolean = false) {
         exposureExecutor.execute {
             if (exposureSet.size < STORE_SIZE && !forced || exposureSet.size == 0) return@execute
 

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

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

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

@@ -1,7 +1,10 @@
 package com.gh.common.exposure
 
+import com.gh.common.util.PackageUtils
 import com.gh.common.util.toObject
+import com.gh.gamecenter.entity.ApkEntity
 import com.gh.gamecenter.entity.GameEntity
+import com.halo.assistant.HaloApp
 import java.util.*
 
 object ExposureUtils {
@@ -36,7 +39,31 @@ object ExposureUtils {
                 eTrace = ExposureTraceUtils.appendTrace(traceEvent),
                 event = ExposureType.DOWNLOAD_COMPLETE)
         ExposureManager.log(exposureEvent)
-        ExposureManager.commitSavedExposureEvent(forced = true)
+        ExposureManager.commitSavedExposureEvents(forced = true)
+    }
+
+    @JvmStatic
+    fun getDownloadType(apkEntity: ApkEntity, method: String) : DownloadType {
+        return if ("更新" == method) {
+            if (PackageUtils.isSignature(HaloApp.getInstance().application, apkEntity.packageName)) {
+                DownloadType.PLUGIN_UPDATE
+            } else {
+                DownloadType.UPDATE
+            }
+        } else if ("插件化" == method) {
+            DownloadType.PLUGIN_DOWNLOAD
+        } else {
+            DownloadType.DOWNLOAD
+        }
+    }
+
+    @JvmStatic
+    fun getUpdateType(apkEntity: ApkEntity) : DownloadType {
+        return if (PackageUtils.isSignature(HaloApp.getInstance().application, apkEntity.packageName)) {
+            DownloadType.PLUGIN_UPDATE
+        } else {
+            DownloadType.UPDATE
+        }
     }
 
     enum class DownloadType {

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

@@ -17,6 +17,7 @@ data class Meta(
         val network: String? = "",
         val os: String? = "",
         val gid: String? = "",
+        val oaid: String? = "",
         val channel: String? = "",
         val appVersion: String? = "",
         val userId: String? = "",

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

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

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

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

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

@@ -3,6 +3,7 @@ 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
@@ -78,7 +79,11 @@ object HistoryHelper {
         val articleEntity = ArticleEntity()
 
         articleEntity.id = articleDetailEntity.id
-        articleEntity.brief = articleDetailEntity.content.removeInsertedContent().clearHtmlFormatCompletely().replace(" +".toRegex()," ")
+        articleEntity.brief = articleDetailEntity.content.
+                removeVideoContent().
+                removeInsertedContent().
+                clearHtmlFormatCompletely().
+                replace(" +".toRegex()," ")
         articleEntity.count = articleDetailEntity.count
         articleEntity.community = articleDetailEntity.community
         articleEntity.time = articleDetailEntity.time
@@ -99,7 +104,11 @@ object HistoryHelper {
         answerEntity.vote = answerDetailEntity.vote
         answerEntity.user = answerDetailEntity.user
         answerEntity.orderTag = System.currentTimeMillis()
-        answerEntity.brief = answerDetailEntity.content.removeInsertedContent().clearHtmlFormatCompletely().replace(" +".toRegex(), " ")
+        answerEntity.brief = answerDetailEntity.content.
+                removeVideoContent().
+                removeInsertedContent().
+                clearHtmlFormatCompletely().
+                replace(" +".toRegex(), " ")
         answerEntity.time = answerDetailEntity.time
 
         return answerEntity

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

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

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

@@ -7,9 +7,9 @@ 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.HelpAndFeedbackActivity
 import com.gh.gamecenter.MainActivity
 import com.gh.gamecenter.MessageActivity
-import com.gh.gamecenter.SuggestSelectActivity
 import com.gh.gamecenter.manager.UserManager
 import com.halo.assistant.HaloApp
 import com.m7.imkfsdk.KfStartHelper
@@ -69,12 +69,12 @@ object ImManager {
     }
 
     @JvmStatic
-    fun startChatActivity(activity: Activity) {
+    fun startChatActivity(activity: Activity, inputContent: String? = "", requestCode: Int? = null) {
         if (!UserManager.getInstance().userId.isNullOrEmpty()) {
             try {
                 SPUtils.setBoolean(SP_FLOATING_WINDOW_DOT_KEY + UserManager.getInstance().userId, false)
                 shouldShowFloatingWindowDot = false
-                val chatHelper = KfStartHelper(activity, UserManager.getInstance().userInfoEntity.icon)
+                val chatHelper = KfStartHelper(activity, UserManager.getInstance().userInfoEntity.icon, inputContent, requestCode)
                 chatHelper.initSdkChat(
                         ImReceiver.UNIQUE_BROADCAST_ACTION,
                         IM_KEY,
@@ -152,7 +152,7 @@ object ImManager {
     private fun isActivityValid(activity: Activity): Boolean {
         return when (activity) {
             is MainActivity -> true
-            is SuggestSelectActivity -> true
+            is HelpAndFeedbackActivity -> true
             is MessageActivity -> true
             else -> false
         }

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

@@ -0,0 +1,21 @@
+package com.gh.common.loghub
+
+import android.content.Context
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+
+@Database(entities = [LoghubEvent::class], version = 1, exportSchema = false)
+abstract class LoghubDatabase : RoomDatabase() {
+    companion object {
+        private const val DATABASE = "gh_loghub_database"
+
+        fun buildDatabase(context: Context): LoghubDatabase {
+            return Room.databaseBuilder(context, LoghubDatabase::class.java, DATABASE)
+                    .fallbackToDestructiveMigration()
+                    .build()
+        }
+    }
+
+    abstract fun logHubEventDao(): LoghubEventDao
+}

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

@@ -0,0 +1,17 @@
+package com.gh.common.loghub
+
+import android.os.Parcelable
+import androidx.annotation.Keep
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import kotlinx.android.parcel.Parcelize
+import java.util.*
+
+@Keep
+@Parcelize
+@Entity(tableName = "loghubEvent")
+data class LoghubEvent(@PrimaryKey
+                       val id: String = UUID.randomUUID().toString(),
+                       var time: String,
+                       var content: String,
+                       var logStore: String) : Parcelable

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

@@ -0,0 +1,18 @@
+package com.gh.common.loghub
+
+import androidx.room.*
+
+@Dao
+interface LoghubEventDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertMany(eventList: List<LoghubEvent>)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insert(event: LoghubEvent)
+
+    @Query("SELECT * FROM LoghubEvent")
+    fun getAll(): List<LoghubEvent>
+
+    @Delete
+    fun deleteMany(eventList: List<LoghubEvent>)
+}

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

@@ -0,0 +1,88 @@
+package com.gh.common.loghub
+
+import android.app.Application
+import com.aliyun.sls.android.sdk.model.Log
+import com.aliyun.sls.android.sdk.model.LogGroup
+import com.gh.loghub.LoghubHelper
+import org.json.JSONObject
+import java.util.concurrent.Executors
+import kotlin.concurrent.fixedRateTimer
+
+object LoghubUtils {
+
+    private const val STORE_SIZE = 100
+    private const val STORE_FORCE_UPLOAD_INTERVAL = 120 * 1000L
+
+    private lateinit var mApplication: Application
+
+    private val loghubEventSet = hashSetOf<LoghubEvent>()
+    private val loghubEventExecutor by lazy { Executors.newSingleThreadExecutor() }
+    private val loghubEventDao by lazy { LoghubDatabase.buildDatabase(mApplication).logHubEventDao() }
+
+    @JvmStatic
+    fun init(application: Application) {
+        mApplication = application
+
+        loghubEventExecutor.execute {
+            val eventList = loghubEventDao.getAll()
+            loghubEventSet.addAll(eventList)
+        }
+
+        fixedRateTimer(name = "Loghub-Event-Checker", initialDelay = 1000, period = STORE_FORCE_UPLOAD_INTERVAL) {
+            commitSavedLoghubEvents()
+        }
+    }
+
+    @JvmStatic
+    fun log(logJson: JSONObject, logStore: String, forcedUpload: Boolean) {
+        loghubEventExecutor.execute {
+            try {
+                val event = LoghubEvent(time = (System.currentTimeMillis() / 1000L).toString(), content = logJson.toString(), logStore = logStore)
+                loghubEventSet.add(event)
+                loghubEventDao.insert(event)
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+
+            if (forcedUpload || loghubEventSet.size >= STORE_SIZE) {
+                commitSavedLoghubEvents()
+            }
+        }
+    }
+
+    private fun uploadLogGroup(logGroup: LogGroup, logStore: String) {
+        LoghubHelper.getInstance().uploadLogGroup(logGroup, logStore)
+    }
+
+    private fun commitSavedLoghubEvents() {
+        loghubEventExecutor.execute {
+            if (loghubEventSet.isEmpty()) return@execute
+
+            val exposureList = loghubEventSet.toList()
+
+            createLogGroupAndUpload()
+            loghubEventSet.removeAll(exposureList)
+            loghubEventDao.deleteMany(exposureList)
+        }
+    }
+
+    private fun createLogGroupAndUpload() {
+        val logGroupHashMap = hashMapOf<String, LogGroup>()
+
+        for (event in loghubEventSet) {
+            if (!logGroupHashMap.containsKey(event.logStore)) {
+                logGroupHashMap[event.logStore] = LogGroup("sls android", "no ip")
+            }
+
+            val log = Log()
+            log.PutContent("current time ", event.time)
+            log.PutContent("content", event.content)
+            logGroupHashMap[event.logStore]?.PutLog(log)
+        }
+
+        for ((logStore, logGroup) in logGroupHashMap) {
+            uploadLogGroup(logGroup, logStore)
+        }
+    }
+
+}

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

@@ -1,18 +1,19 @@
 package com.gh.common.notifier
 
 import android.animation.*
-import android.app.Activity
 import android.content.Context
 import android.graphics.Path
-import android.os.Build
 import android.text.TextUtils
 import android.util.AttributeSet
-import android.util.DisplayMetrics
 import android.util.Log
 import android.util.TypedValue
-import android.view.*
+import android.view.Gravity
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.core.view.ViewCompat
+import com.gh.common.util.DisplayUtils
 import com.gh.common.util.ImageUtils
 import com.gh.common.util.doOnEnd
 import com.gh.common.util.doOnStart
@@ -74,7 +75,7 @@ class NotifierView @JvmOverloads constructor(context: Context, attrs: AttributeS
 
         verticalAnimationOffset = dp2px(100F)
 
-        navigationHeight = retrieveNavigationHeight()
+        navigationHeight = DisplayUtils.retrieveNavigationHeight(context)
 
         rightToLeftPath = Path()
         leftToRightPath = Path()
@@ -290,41 +291,6 @@ class NotifierView @JvmOverloads constructor(context: Context, attrs: AttributeS
         return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, context.applicationContext.resources.displayMetrics).toInt()
     }
 
-    private fun hasSoftKeys(): Boolean {
-        if (context !is Activity) return false
-
-        val hasSoftwareKeys: Boolean
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            val d = (context as Activity).windowManager.defaultDisplay
-
-            val realDisplayMetrics = DisplayMetrics()
-            d.getRealMetrics(realDisplayMetrics)
-
-            val realHeight = realDisplayMetrics.heightPixels
-            val realWidth = realDisplayMetrics.widthPixels
-
-            val displayMetrics = DisplayMetrics()
-            d.getMetrics(displayMetrics)
-
-            val displayHeight = displayMetrics.heightPixels
-            val displayWidth = displayMetrics.widthPixels
-
-            hasSoftwareKeys = realWidth - displayWidth > 0 || realHeight - displayHeight > 0
-        } else {
-            val hasMenuKey = ViewConfiguration.get(context).hasPermanentMenuKey()
-            val hasBackKey = KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_BACK)
-            hasSoftwareKeys = !hasMenuKey && !hasBackKey
-        }
-        return hasSoftwareKeys
-    }
-
-    private fun retrieveNavigationHeight(): Int {
-        val resources = context.resources
-        val resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android")
-        return if (resourceId > 0 && hasSoftKeys()) resources.getDimensionPixelSize(resourceId) else 0
-    }
-
     interface OnShowNotificationListener {
         fun onShow()
     }

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

@@ -22,7 +22,7 @@ object ActivationHelper {
     @JvmStatic
     fun sendActivationInfo() {
         // 能获取到 IMEI 并且之前没发送过激活信息才发
-        if (mHasSentActivatedInfo
+        if (!mHasSentActivatedInfo
                 && Util_System_Phone_State.canGetImei(HaloApp.getInstance().application)) {
             RetrofitManager.getInstance(HaloApp.getInstance().application)
                     .api.postActivationInfo()

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

@@ -1,7 +1,7 @@
 package com.gh.common.util;
 
 import android.content.Context;
-import android.content.Intent;
+import android.os.Bundle;
 import android.text.TextUtils;
 
 import com.gh.gamecenter.LoginActivity;
@@ -19,8 +19,12 @@ public class CheckLoginUtils {
             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);
+
+            // 有可能App未启动
+            Bundle bundle = new Bundle();
+            bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance);
+            bundle.putString(EntranceUtils.KEY_TO, LoginActivity.class.getName());
+            EntranceUtils.jumpActivity(context, bundle);
         } else {
             if (listener != null) {
                 listener.onLogin();

app/src/main/java/com/gh/common/util/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/CommentHelper.kt

@@ -50,16 +50,30 @@ object CommentHelper {
                 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("回复")
         }
 
@@ -117,8 +131,10 @@ object CommentHelper {
 
                             if (answerId != null) {
                                 PostCommentUtils.postAnswerReportData(context, commentEntity.id, answerId, reportType, commentListener)
-                            } else {
+                            } else if (articleId != null) {
                                 PostCommentUtils.reportCommunityArticleComment(context, communityId, articleId, commentEntity.id, reportType, commentListener)
+                            } else {
+                                PostCommentUtils.reportVideoComment(context, videoId, commentEntity.id, reportType, commentListener)
                             }
                         }
                     }
@@ -128,9 +144,12 @@ object CommentHelper {
                     if (answerId != null) {
                         context.startActivity(CommentDetailActivity
                                 .getAnswerCommentIntent(context, commentEntity.id, answerId, null))
-                    } else {
+                    } else if (articleId != null) {
                         context.startActivity(CommentDetailActivity
                                 .getCommunityArticleCommentIntent(context, articleId, commentEntity.id, communityId, null))
+                    } else {
+                        context.startActivity(CommentDetailActivity
+                                .getVideoCommentIntent(context, commentEntity.id, videoId, null))
                     }
                 }
             }
@@ -154,7 +173,7 @@ object CommentHelper {
                 || me.moderatorPermissions.topCommunityArticleComment > Permissions.GUEST) {
             dialogOptions.add(highlight)
             if (me.moderatorPermissions.topAnswerComment > Permissions.REPORTER
-                    || me.moderatorPermissions.topCommunityArticleComment > Permissions.REPORTER ) {
+                    || me.moderatorPermissions.topCommunityArticleComment > Permissions.REPORTER) {
                 canHighlightCommentDirectly = true
             }
         }
@@ -163,7 +182,7 @@ object CommentHelper {
                 || me.moderatorPermissions.hideCommunityArticleComment > Permissions.GUEST) {
             dialogOptions.add(hide)
             if (me.moderatorPermissions.hideAnswerComment > Permissions.REPORTER
-                    || me.moderatorPermissions.hideCommunityArticleComment > Permissions.REPORTER ) {
+                    || me.moderatorPermissions.hideCommunityArticleComment > Permissions.REPORTER) {
                 canHideCommentDirectly = true
             }
         }
@@ -187,7 +206,7 @@ object CommentHelper {
         }
 
         comment.me?.let {
-            if (it.isAnswerCommented) {
+            if (it.isCommentOwner) {
                 disabledOptions.add(highlight)
             }
         }
@@ -201,7 +220,7 @@ object CommentHelper {
                     }
 
                     comment.me?.let { me ->
-                        if (me.isAnswerCommented) {
+                        if (me.isCommentOwner) {
                             Utils.toast(context, "不能置顶自己的评论")
                             return@showListDialog
                         }

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

@@ -1,10 +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 androidx.core.content.ContextCompat;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.Window;
@@ -21,11 +21,17 @@ import com.gh.gamecenter.entity.CommentEntity;
 import com.gh.gamecenter.entity.MeEntity;
 import com.gh.gamecenter.entity.UserInfoEntity;
 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 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;
@@ -33,6 +39,10 @@ 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.ResponseBody;
 import retrofit2.HttpException;
 
 /**
@@ -87,7 +97,7 @@ public class CommentUtils {
 
         List<String> dialogType = new ArrayList<>();
 
-        if (commentEntity.getMe() == null || !commentEntity.getMe().isCommentOwn()) {
+        if (commentEntity.getMe() == null || !commentEntity.getMe().isCommentOwner()) {
             dialogType.add("回复");
         }
 
@@ -259,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)) {
@@ -278,7 +294,7 @@ public class CommentUtils {
             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) {
@@ -289,7 +305,6 @@ 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);
@@ -330,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);
             }
@@ -338,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());
@@ -353,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());
@@ -371,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/DataUtils.java

@@ -238,18 +238,12 @@ public class DataUtils {
     }
 
     public static void onError(Context context, Throwable throwable) {
-        // MTA主动上传错误
+        //bugly 作为默认处理异常的类库，已经上报了，此处不重复上报
         try {
-            StatService.reportException(context, throwable);
+            CrashReport.postCatchedException(throwable);
         } catch (Exception e) {
         }
 
-//        //bugly 作为默认处理异常的类库，已经上报了，此处不重复上报
-//        try {
-//            CrashReport.postCatchedException(throwable);
-//        } catch (Exception e) {
-//        }
-
         //talkingdata
         try {
             TCAgent.onError(context, throwable);

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

@@ -9,6 +9,7 @@ import com.gh.common.view.DownloadProgressBar;
 import com.gh.download.DownloadManager;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.DetailViewHolder;
+import com.gh.gamecenter.entity.LinkEntity;
 import com.gh.gamecenter.entity.PluginLocation;
 import com.gh.gamecenter.manager.PackagesManager;
 import com.lightgame.download.DownloadEntity;
@@ -33,7 +34,11 @@ public class DetailDownloadUtils {
 
         if (viewHolder.gameEntity.isReservable()) {
             if (!ReservationRepository.thisGameHasBeenReserved(viewHolder.gameEntity.getId())) {
-                viewHolder.mDownloadPb.setText("预约《" + viewHolder.gameEntity.getName() + "》");
+                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() + "》");
@@ -42,9 +47,26 @@ 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.getApk().isEmpty() || viewHolder.gameEntity.getDownloadOffStatus() != null) {
+            LinkEntity h5LinkEntity = viewHolder.gameEntity.getH5Link();
+    
+            if (h5LinkEntity != null) {
+                if ("play".equals(h5LinkEntity.getType())) {
+                    String defaultString  = String.format("开始玩" + "《%s》", viewHolder.gameEntity.getName());
+                    viewHolder.mDownloadPb.setText(TextUtils.isEmpty(h5LinkEntity.getText()) ? defaultString : h5LinkEntity.getText());
+                } else {
+                    viewHolder.mDownloadPb.setText(TextUtils.isEmpty(h5LinkEntity.getText()) ? "查看" : h5LinkEntity.getText());
+                }
+                viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.H5_GAME);
+            } else {
+                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) {

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

@@ -11,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;
 
@@ -164,7 +164,7 @@ public class DeviceUtils {
                 }
 
             } else if (info.getType() == ConnectivityManager.TYPE_WIFI) {//当前使用无线网络
-                return WifiMgr.getInstance(context).getCurrentIpAddress();
+                return getCurrentIpAddress();
             }
         } else {
             //当前无网络连接,请在设置中打开网络
@@ -266,4 +266,21 @@ public class DeviceUtils {
         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/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/DialogUtils.java

@@ -5,11 +5,10 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.graphics.Bitmap;
+import android.content.SharedPreferences;
 import android.graphics.Color;
-import android.os.Handler;
+import android.graphics.drawable.ColorDrawable;
+import android.preference.PreferenceManager;
 import android.text.Html;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
@@ -17,10 +16,11 @@ import android.text.TextPaint;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
-import android.view.Display;
 import android.view.Gravity;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.Button;
@@ -31,23 +31,29 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
 
+import com.facebook.drawee.generic.GenericDraweeHierarchy;
+import com.gh.common.AppExecutor;
+import com.gh.common.constant.Config;
+import com.gh.common.dialog.TrackableDialog;
+import com.gh.common.view.DrawableView;
+import com.gh.common.view.FixLinearLayoutManager;
 import com.gh.gamecenter.AboutActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.WebActivity;
-import com.gh.gamecenter.kuaichuan.WifiMgr;
-import com.gh.gamecenter.kuaichuan.view.KcSelectGameActivity;
+import com.gh.gamecenter.adapter.viewholder.PrivacyPolicyItemViewHolder;
+import com.gh.gamecenter.databinding.PrivacyItemBinding;
+import com.gh.gamecenter.entity.PrivacyPolicyEntity;
+import com.gh.gamecenter.entity.TrackableEntity;
 import com.halo.assistant.HaloApp;
+import com.halo.assistant.fragment.SettingsFragment;
+import com.lightgame.adapter.BaseRecyclerAdapter;
 import com.lightgame.utils.AppManager;
 import com.lightgame.utils.Utils;
 
-import java.io.File;
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
-import java.util.Locale;
-import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class DialogUtils {
 
@@ -65,161 +71,6 @@ public class DialogUtils {
         return dialog;
     }
 
-    // 快传成绩单
-    public static void showKuaiChuanResult(final Activity activity, Handler handler, int requestCode, final String picName) {
-
-        HaloApp.remove(KcSelectGameActivity.KEY_FILE_INFO);
-
-        List<Map<String, String>> mapList = (List<Map<String, String>>) HaloApp.get("sendData", true);
-        if (mapList == null || mapList.size() == 0) return;
-
-        WifiMgr.getInstance(activity).disconnectCurrentNetwork(); // 断开当前WiFi
-
-        int filesCount = mapList.size();
-        int filesSize = 0;
-        int sendTime = 0;
-
-        View view = View.inflate(activity, R.layout.dialog_kuaichuan, null);
-        final LinearLayout mShareLl = view.findViewById(R.id.kuaichuan_dialog_ll);
-        final LinearLayout mShareBottomLl = view.findViewById(R.id.kuaichuan_dialog_share_rl);
-        LinearLayout shareIconLl = view.findViewById(R.id.kuaichuan_icon_ll);
-        ImageView qrCode = view.findViewById(R.id.kuaichuan_qrcode);
-        TextView dateTv = view.findViewById(R.id.kuaichuan_dialog_date);
-        TextView countTv = view.findViewById(R.id.kuaichuan_send_count);
-        TextView sizeTv = view.findViewById(R.id.kuaichuan_send_size);
-        TextView speedTv = view.findViewById(R.id.kuaichuan_send_speed);
-        TextView timeCount = view.findViewById(R.id.kuaichuan_time_count);
-        TextView timeTv = view.findViewById(R.id.kuaichuan_time_tv);
-        TextView sendCountTv = view.findViewById(R.id.dialog_send_tv);
-        ImageView closeIv = view.findViewById(R.id.kuaichuan_dialog_colse);
-
-        final Dialog dialog = new Dialog(activity);
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setCanceledOnTouchOutside(false);
-        dialog.setContentView(view);
-        dialog.show();
-
-        Window dialogWindow = dialog.getWindow();
-        WindowManager m = activity.getWindowManager();
-        Display d = m.getDefaultDisplay();
-        if (dialogWindow != null) {
-            WindowManager.LayoutParams p = dialogWindow.getAttributes();
-            p.height = (int) (d.getHeight() * 0.82);
-            p.width = (int) (d.getWidth() * 0.80);
-            dialogWindow.setAttributes(p);
-        }
-
-        SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日", Locale.getDefault());
-        dateTv.setText(format.format(new Date().getTime()));
-
-        for (Map<String, String> map : mapList) {
-            int size = Integer.parseInt(map.get("apkSize"));
-            int time = 10;
-            try {
-                time = Integer.parseInt(map.get("sendTime"));
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-
-            String apkPath = map.get("apkPath");
-            filesSize = filesSize + size;
-            sendTime = sendTime + time;
-
-            if (shareIconLl.getChildCount() >= 5) continue;
-
-            android.content.pm.PackageManager pm = activity.getPackageManager();
-            PackageInfo info = pm.getPackageArchiveInfo(apkPath,
-                    android.content.pm.PackageManager.GET_ACTIVITIES);
-            if (info != null) {
-                ApplicationInfo appInfo = info.applicationInfo;
-                appInfo.sourceDir = apkPath;
-                appInfo.publicSourceDir = apkPath;
-                Bitmap bitmap = BitmapUtils.drawableToBitmap(appInfo.loadIcon(pm), true);
-
-                ImageView imageView = new ImageView(activity);
-                imageView.setLayoutParams(new LinearLayout.LayoutParams(DisplayUtils.dip2px(activity, 25)
-                        , DisplayUtils.dip2px(activity, 24)));
-                imageView.setImageBitmap(bitmap);
-                shareIconLl.addView(imageView);
-            }
-        }
-
-        if (requestCode == 0x170) { // 发送
-            qrCode.setImageResource(R.drawable.kc_qrcode_120);
-            sendCountTv.setText("成功传送游戏");
-        } else {
-            qrCode.setImageResource(R.drawable.kc_qrcode_110);
-            sendCountTv.setText("成功接收游戏");
-        }
-
-        double size = (((float) filesSize / 1024) / 1024);
-        String sizeName;
-        if (size > 1024) {
-            DecimalFormat df = new DecimalFormat("#.0");
-            sizeName = df.format(size / 1024) + "GB";
-        } else {
-            DecimalFormat df = new DecimalFormat("#.0");
-            sizeName = df.format(size) + "MB";
-        }
-
-        if (sendTime < 1000) { // 最少设置发送时间为1s（为了简易计算）
-            sendTime = 1000;
-        }
-
-        int i = (filesSize / 1024) / (sendTime / 1000);
-        String speed;
-        if (i >= 1000) {
-            float mSpeed = i / 1024f;
-            DecimalFormat df = new DecimalFormat("#.0");
-            String str = df.format(mSpeed);
-            if (str.length() > 4) {
-                str = str.substring(0, 4);
-            }
-            speed = str + "MB/s";
-        } else {
-            speed = i + "KB/s";
-        }
-
-        if (sendTime > 60000) {
-            timeCount.setText(String.valueOf(sendTime / 1000 / 60));
-            timeTv.setText("分钟传送完成");
-        } else {
-            timeCount.setText(String.valueOf(sendTime / 1000));
-            timeTv.setText("秒传送完成");
-        }
-
-        sizeTv.setText(sizeName);
-        speedTv.setText(speed);
-        countTv.setText(filesCount + "个");
-
-        // 延迟操作，等待截图部分绘制完成
-        handler.postDelayed(() -> {
-            mShareLl.setDrawingCacheEnabled(true);
-            mShareLl.buildDrawingCache();
-            Bitmap drawingCache = mShareLl.getDrawingCache();
-            saveBitmap(drawingCache, activity, picName);
-            MessageShareUtils.getInstance(activity).showShareWindows(activity, mShareBottomLl, drawingCache, picName, 2);
-            mShareBottomLl.setVisibility(View.VISIBLE);
-        }, 200);
-
-        closeIv.setOnClickListener(v -> dialog.cancel());
-    }
-
-    public static void saveBitmap(Bitmap bm, Activity activity, String picName) {
-        File externalCacheDir = activity.getExternalCacheDir();
-        if (externalCacheDir == null) return;
-
-        File file = new File(externalCacheDir.getPath() + "/ShareImg");
-        if (!file.isDirectory()) {
-            file.delete();
-            file.mkdirs();
-        }
-        if (!file.exists()) {
-            file.mkdirs();
-        }
-        MessageShareUtils.getInstance(activity).writeBitmap(file.getPath(), picName, bm, false);
-
-    }
 
     public static void showInstallHintDialog(Context context, final ConfirmListener cmListener) {
         context = checkDialogContext(context);
@@ -311,29 +162,33 @@ public class DialogUtils {
     }
 
     // 网络劫持时 打开QQ客户端，创建临时会话
-    public static void showQqSessionDialog(final Context context, final String qq) {
+    public static void showQqSessionDialog(final Context context) {
+        String qq = "";
+        if (Config.getSettings() != null && Config.getSettings().getSupport() != null) {
+            qq = Config.getSettings().getSupport().getQq();
+        }
+        String finalQq = qq;
         showWarningDialog(context, "警告", "您当前网络环境异常，下载地址可能被运营商恶意替换（网络劫持）" +
                         "，如多次下载失败，请联系客服获取正确的下载地址（客服QQ：" + qq + "）"
-                , "取消", "前往QQ", () -> DirectUtils.directToQqConversation(context, qq), null);
+                , "取消", "前往QQ", () -> DirectUtils.directToQqConversation(context, finalQq), null);
     }
 
     public static void checkDownload(Context context, String size, CheckDownloadCallBack callBack) {
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication());
         if (!NetworkUtils.isNetworkConnected(context)) {
             showNoConnectionDownloadDialog(context, null,
                     () -> callBack.onResponse(true));
-        } else if (NetworkUtils.isWifiConnected(context) || filter4GorSize(context, size)) {
+        } else if (NetworkUtils.isWifiConnected(context)
+                || filter4GorSize(context, size)) {
+            callBack.onResponse(false);
+        } else if (!preferences.getBoolean(SettingsFragment.getTrafficDownloadHintKey(), true)) {
+            AppExecutor.getUiExecutor().executeWithDelay(() -> Utils.toast(context, "当前使用移动网络下载，请注意流量消耗"), 500);
             callBack.onResponse(false);
         } else {
             MtaHelper.onEvent("移动网络下载", NetworkUtils.getMobileNetworkType(context), "出现弹窗提示");
             showDownloadDialog(context,
-                    () -> {
-                        callBack.onResponse(false);
-                        MtaHelper.onEvent("移动网络下载", NetworkUtils.getMobileNetworkType(context), "立即下载");
-                    },
-                    () -> {
-                        callBack.onResponse(true);
-                        MtaHelper.onEvent("移动网络下载", NetworkUtils.getMobileNetworkType(context), "连上WiFi后自动下载");
-                    });
+                    () -> callBack.onResponse(false),
+                    () -> callBack.onResponse(true));
         }
     }
 
@@ -345,7 +200,8 @@ public class DialogUtils {
             String mb = size.toUpperCase().replaceAll("MB", "").trim();
             Float i = Float.valueOf(mb);
             if (NetworkUtils.isWifiOr4GConnected(context) && i <= 50) {
-                Utils.toast(context, "当前使用移动流量下载");
+                AppExecutor.getUiExecutor().executeWithDelay(() -> Utils.toast(context, "当前使用移动网络下载，请注意流量消耗"),500);
+
                 return true;
             }
         } catch (Exception e) {
@@ -373,14 +229,54 @@ public class DialogUtils {
     }
 
     public static void showDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener) {
-        showWarningDialog(context, "下载提示", "当前正在使用移动网络，立即下载会消耗手机流量", "连上WiFi后自动下载", "立即下载", listener, cancelListener);
+        context = checkDialogContext(context);
+
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
+
+        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_download_traffic, null);
+        View allowOnce = contentView.findViewById(R.id.allow_once);
+        View allowAlways = contentView.findViewById(R.id.allow_always);
+        View wifiAuto = contentView.findViewById(R.id.wifi_auto);
+
+        Context finalContext = context;
+        allowOnce.setOnClickListener(v -> {
+            AppExecutor.getUiExecutor().executeWithDelay(() -> {
+                Utils.toast(HaloApp.getInstance().getApplication(), "已使用移动网络下载，请注意流量消耗");
+            }, 500);
+            listener.onConfirm();
+            dialog.dismiss();
+            MtaHelper.onEvent("移动网络下载", NetworkUtils.getMobileNetworkType(finalContext), "本次允许");
+        });
+        wifiAuto.setOnClickListener(v -> {
+            cancelListener.onCancel();
+            dialog.dismiss();
+            MtaHelper.onEvent("移动网络下载", NetworkUtils.getMobileNetworkType(finalContext), "连上WiFi后自动下载");
+        });
+        allowAlways.setOnClickListener(v -> {
+            PreferenceManager
+                    .getDefaultSharedPreferences(finalContext)
+                    .edit()
+                    .putBoolean(SettingsFragment.getTrafficDownloadHintKey(), false)
+                    .apply();
+            AppExecutor.getUiExecutor().executeWithDelay(() -> {
+                // 显示了弹窗以后，即便下面这个 toast 放在 listener.onConfirm 后调用也是显示 listener.onConfirm 里的 toast
+                // 喷了，延时包治疑难杂症
+                Utils.toast(HaloApp.getInstance().getApplication(), "已使用移动网络下载，请注意流量消耗");
+            }, 500);
+            listener.onConfirm();
+            dialog.dismiss();
+            MtaHelper.onEvent("移动网络下载", NetworkUtils.getMobileNetworkType(finalContext), "总是允许");
+        });
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(contentView);
+        dialog.show();
     }
 
     public static void showResumeDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener) {
         showWarningDialog(context, "下载提示", "当前正在使用移动网络，继续下载会消耗手机流量", "连上WiFi后自动下载", "继续下载", listener, cancelListener);
     }
 
-
     public static void showDownloadDialog(Context context, ConfirmListener listener) {
         showWarningDialog(context, "下载提示", "您当前使用的网络为2G/3G/4G，开始下载将会消耗移动流量，确定下载？", listener);
     }
@@ -391,10 +287,30 @@ public class DialogUtils {
     }
 
     public static void showPluginDialog(Context context, final ConfirmListener listener) {
-        Spanned spanned = Html.fromHtml("您将进行插件化安装以实现插件功能，此过程将"
-                + "<font color=\"#ff0000\">卸载</font>" + "当前使用的版本并"
-                + "<font color=\"#ff0000\">安装插件版本</font>");
-        showWarningDialog(context, "插件化安装", spanned, listener);
+        context = checkDialogContext(context);
+
+        MtaHelper.onEvent("插件化", "插件化安装弹窗", "出现弹窗提示");
+
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
+
+        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_plugin, null);
+        TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
+        TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
+        negativeTv.setOnClickListener(v -> {
+            dialog.dismiss();
+            MtaHelper.onEvent("插件化", "插件化安装弹窗", "取消");
+        });
+        positiveTv.setOnClickListener(view -> {
+            if (listener != null) {
+                listener.onConfirm();
+            }
+            dialog.dismiss();
+            MtaHelper.onEvent("插件化", "插件化安装弹窗", "确认并开始");
+        });
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(contentView);
+        dialog.show();
     }
 
     /**
@@ -567,8 +483,6 @@ public class DialogUtils {
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         dialog.setContentView(contentView);
         dialog.show();
-
-
     }
 
     /**
@@ -589,7 +503,7 @@ public class DialogUtils {
         contentTv.setText(message);
         titleTv.setText(title);
         negativeTv.setText(negative);
-        negativeTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
+        //negativeTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
         positiveTv.setText(positive);
 
         negativeTv.setOnClickListener(new View.OnClickListener() {
@@ -805,6 +719,29 @@ public class DialogUtils {
         dialog.show();
     }
 
+    public static void showLowSystemVersionDialog(Context context) {
+        final Context activityContext = checkDialogContext(context);
+
+        final Dialog dialog = new Dialog(activityContext, R.style.GhAlertDialog);
+
+        View contentView = LayoutInflater.from(activityContext).inflate(R.layout.dialog_alert, null);
+        TextView contentTv = contentView.findViewById(R.id.dialog_content);
+        TextView titleTv = contentView.findViewById(R.id.dialog_title);
+        TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
+
+        titleTv.setText("提示");
+        contentTv.setText("抱歉，您当前系统版本过低，暂不支持视频功能");
+        positiveTv.setText("我知道了");
+
+        positiveTv.setOnClickListener(view -> {
+            dialog.dismiss();
+        });
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(contentView);
+        dialog.show();
+    }
+
     public static void showListDialog(Context context,
                                       List<String> selectionList,
                                       DialogInterface.OnClickListener onClickListener) {
@@ -932,37 +869,76 @@ public class DialogUtils {
         return dialog;
     }
 
-    public static void showPrivacyPolicyDialog(Context context, String title, String content, EmptyCallback callback) {
+    public static void showPrivacyPolicyDialog(Context context,
+                                               @NonNull PrivacyPolicyEntity entity,
+                                               EmptyCallback callback) {
+
         final Context activityContext = checkDialogContext(context);
 
-        String privacyPolicyContent;
-        String privacyPolicyTitle = (TextUtils.isEmpty(title)) ? "个人信息保护指引" : title;
-        if (TextUtils.isEmpty(content)) {
-            privacyPolicyContent = "你的个人信息安全对我们来说至关重要。一直以来，光环助手都致力于为每位用户提供更安全的互联网环境" +
-                    "。我们将依据《中华人民共和国网络安全法》、《信息安全技术个人信息安全规范》（GB/T 35273-2017）" +
-                    "以及其他相关法律法规和技术规范来收集和使用你的个人信息，以帮助我们向你提供更优质的产品和服务。" +
-                    "<br/>1.为帮助你浏览内容、互动交流、注册认证等，我们会收集部分必要的信息" +
-                    "<br/>2.为提供上述服务，我们可能需要获取 IMEI号码、IMSI号码 等信息的读取权限" +
-                    "<br/>3.以上获取个人信息的权限均不会默认开启，只有在运行相关功能或服务时才会明确提示授权，光环助手不会在未经你同意的情况下收集相关信息";
-        } else {
-            privacyPolicyContent = content;
+        // 区分此 dialog 是点击 dialog 外部取消的还是点击返回取消的
+        AtomicBoolean isCanceledByClickOutsideOfDialog = new AtomicBoolean(true);
+
+        final Dialog dialog = new Dialog(activityContext, android.R.style.Theme_Black_NoTitleBar_Fullscreen);
+        View contentView = LayoutInflater.from(activityContext).inflate(R.layout.dialog_privacy_policy, null);
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(contentView);
+
+        Window window = dialog.getWindow();
+        if (window != null) {
+            window.getDecorView().setPadding(0, 0, 0, 0);
+            window.setBackgroundDrawableResource(android.R.color.transparent);
+            WindowManager.LayoutParams params = window.getAttributes();
+            params.horizontalMargin = 0;
+            params.width = context.getResources().getDisplayMetrics().widthPixels;
+            params.height = context.getResources().getDisplayMetrics().heightPixels;
+            window.setAttributes(params);
         }
 
-        final Dialog dialog = new Dialog(activityContext, R.style.GhAlertDialog);
+        TextView title = contentView.findViewById(R.id.title);
+        TextView bottomContent = contentView.findViewById(R.id.bottom_content);
+        TextView topContent = contentView.findViewById(R.id.top_content);
+        TextView allowButton = contentView.findViewById(R.id.allow_button);
+        TextView linkContent = contentView.findViewById(R.id.link_content);
+        RecyclerView permissions = contentView.findViewById(R.id.permissions_content);
 
-        View contentView = LayoutInflater.from(activityContext).inflate(R.layout.dialog_privacy_policy, null);
-        TextView contentTv = contentView.findViewById(R.id.dialog_content);
-        TextView titleTv = contentView.findViewById(R.id.dialog_title);
-        TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
-        TextView skipTv = contentView.findViewById(R.id.dialog_skip);
+        permissions.setLayoutManager(new FixLinearLayoutManager(context));
+        permissions.setAdapter(new BaseRecyclerAdapter(context) {
+            @NonNull
+            @Override
+            public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+                View view = mLayoutInflater.inflate(R.layout.privacy_item, parent, false);
+                return new PrivacyPolicyItemViewHolder(PrivacyItemBinding.bind(view));
+            }
 
-        SpannableStringBuilder skipText = new SpannableStringBuilder("查看完整版的 隐私政策");
+            @Override
+            public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+                if (holder instanceof PrivacyPolicyItemViewHolder) {
+                    PrivacyPolicyItemViewHolder viewHolder = (PrivacyPolicyItemViewHolder) holder;
+                    PrivacyItemBinding binding = viewHolder.getBinding();
+                    binding.setData(entity.getPermissions().get(position));
+                    GenericDraweeHierarchy hierarchy = binding.icon.getHierarchy();
+                    if (hierarchy != null) {
+                        if (position == 0) {
+                            hierarchy.setPlaceholderImage(R.drawable.permission_storage);
+                        } else {
+                            hierarchy.setPlaceholderImage(R.drawable.permission_phone_state);
+                        }
+                    }
+                }
+            }
+
+            @Override
+            public int getItemCount() {
+                return entity.getPermissions().size();
+            }
+        });
+
+        SpannableStringBuilder skipText = new SpannableStringBuilder("查看完整版的隐私政策和用户协议");
         skipText.setSpan(new ClickableSpan() {
-
             @Override
             public void updateDrawState(@NonNull TextPaint ds) {
                 super.updateDrawState(ds);
-                ds.setColor(ContextCompat.getColor(activityContext, R.color.theme));
+                ds.setColor(ContextCompat.getColor(activityContext, R.color.text_1383EB));
                 ds.setUnderlineText(false);
             }
 
@@ -972,16 +948,31 @@ public class DialogUtils {
                 Intent intent = WebActivity.getPrivacyPolicyIntent(activityContext);
                 activityContext.startActivity(intent);
             }
+        }, skipText.length() - 9, skipText.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+        skipText.setSpan(new ClickableSpan() {
+            @Override
+            public void updateDrawState(@NonNull TextPaint ds) {
+                super.updateDrawState(ds);
+                ds.setColor(ContextCompat.getColor(activityContext, R.color.text_1383EB));
+                ds.setUnderlineText(false);
+            }
+
+            @Override
+            public void onClick(@NonNull View widget) {
+                MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击用户协议");
+                activityContext.startActivity(WebActivity.getWebIntent(activityContext));
+            }
         }, skipText.length() - 4, skipText.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
 
+        title.setText(entity.getTitle());
+        linkContent.setText(skipText);
+        linkContent.setMovementMethod(new LinkMovementMethod());
+        allowButton.setText("我知道了");
+        topContent.setText(entity.getTopContent());
+        bottomContent.setText(entity.getBottomContent());
 
-        skipTv.setText(skipText);
-        skipTv.setMovementMethod(new LinkMovementMethod());
-        contentTv.setText(Html.fromHtml(privacyPolicyContent));
-        titleTv.setText(privacyPolicyTitle);
-        positiveTv.setText("我知道了");
-
-        positiveTv.setOnClickListener(view -> {
+        allowButton.setOnClickListener(view -> {
             dialog.dismiss();
             MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击我知道了");
         });
@@ -990,11 +981,173 @@ public class DialogUtils {
             callback.onCallback();
         });
 
+        dialog.setOnCancelListener(cd -> {
+            if (isCanceledByClickOutsideOfDialog.get()) {
+                MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击空白");
+            }
+        });
+
+        dialog.setOnKeyListener((dialog1, keyCode, event) -> {
+            if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_UP) {
+                isCanceledByClickOutsideOfDialog.set(false);
+                MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击返回");
+            }
+            return false;
+        });
+
         MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "出现弹窗");
 
+        try {
+            dialog.show();
+        } catch (Exception ignored) {
+        }
+    }
+
+    /**
+     * 特殊：目前只在提交问题错误返回时弹出
+     */
+    public static Dialog showUploadDraftDialog(Context context,
+                                               final CancelListener clListener,
+                                               final ConfirmListener cmListener) {
+        context = checkDialogContext(context);
+
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
+
+        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_video_upload_draft, null);
+        TextView negativeTv = contentView.findViewById(R.id.negative);
+        TextView positiveTv = contentView.findViewById(R.id.positive);
+        TextView content = contentView.findViewById(R.id.content);
+        positiveTv.setBackground(DrawableView.getOvalDrawable(R.color.text_f5f5f5, 999));
+        negativeTv.setBackground(DrawableView.getOvalDrawable(R.color.theme, 999));
+        content.setText(Html.fromHtml(context.getString(R.string.video_upload_draft_dialog_content)));
+
+        negativeTv.setOnClickListener(view -> {
+            if (clListener != null) {
+                clListener.onCancel();
+            }
+            dialog.dismiss();
+        });
+
+        positiveTv.setOnClickListener(view -> {
+            if (cmListener != null) {
+                cmListener.onConfirm();
+            }
+            dialog.dismiss();
+        });
+
+
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         dialog.setContentView(contentView);
         dialog.show();
+        return dialog;
+    }
+
+    public static Dialog showTrackableDialog(Context context,
+                                             String title,
+                                             CharSequence message,
+                                             String positive,
+                                             String negative,
+                                             final ConfirmListener cmListener,
+                                             final CancelListener clListener,
+                                             TrackableEntity trackableEntity) {
+        context = checkDialogContext(context);
+
+        final TrackableDialog dialog = new TrackableDialog(context,
+                R.style.GhAlertDialog,
+                trackableEntity.getEvent(),
+                trackableEntity.getKey(),
+                trackableEntity.getCancelValue(),
+                trackableEntity.getKeyBackValue(),
+                trackableEntity.getLogShowEvent());
+
+        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_alert, null);
+        TextView contentTv = contentView.findViewById(R.id.dialog_content);
+        TextView titleTv = contentView.findViewById(R.id.dialog_title);
+        TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
+        TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
+        if (message.toString().contains("红包奖励")) {//将红包奖励四个字标红
+            String str = message.toString().substring(0, message.toString().indexOf("红包奖励")) + "<font color='#FF0000'>红包奖励</font>";
+            contentTv.setText(Html.fromHtml(str));
+        } else {
+            contentTv.setText(message);
+        }
+        titleTv.setText(title);
+        negativeTv.setText(negative);
+        positiveTv.setText(positive);
+
+        negativeTv.setOnClickListener(view -> {
+            if (clListener != null) {
+                clListener.onCancel();
+            }
+            dialog.dismiss();
+        });
+
+        positiveTv.setOnClickListener(view -> {
+            if (cmListener != null) {
+                cmListener.onConfirm();
+            }
+            dialog.dismiss();
+        });
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(contentView);
+        dialog.show();
+        return dialog;
+    }
+
+    public static Dialog fixWebViewKeyboardNotWorking(Activity activity) {
+        final Dialog dialog = new Dialog(activity, R.style.TransparentDialog);
+        View view = new View(activity);
+        view.setOnClickListener(v -> dialog.dismiss());
+        view.postDelayed(() -> {
+            if (!activity.isFinishing()) {
+                dialog.show();
+                dialog.dismiss();
+            }
+        }, 500);
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(view);
+        return dialog;
+    }
+
+    public static Dialog showUsageStatsDialog(Context context, final ConfirmListener cmListener, final CancelListener clListener) {
+        context = checkDialogContext(context);
+
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
+
+        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_usage_stats, null);
+        TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
+        TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
+
+        Window window = dialog.getWindow();
+        if (window != null) {
+            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+        }
+
+        negativeTv.setOnClickListener(view -> {
+            if (clListener != null) {
+                clListener.onCancel();
+            }
+            dialog.dismiss();
+        });
+
+        positiveTv.setOnClickListener(view -> {
+            if (cmListener != null) {
+                cmListener.onConfirm();
+            }
+            dialog.dismiss();
+        });
+
+        dialog.setOnDismissListener(dialog1 -> {
+            if (clListener != null) {
+                clListener.onCancel();
+            }
+        });
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(contentView);
+        dialog.show();
+        return dialog;
     }
 
     /**

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

@@ -3,29 +3,43 @@ 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.constant.Config
+import com.gh.common.exposure.ExposureEvent
 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.*
 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.gamedetail.GameDetailFragment
 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.gh.gamecenter.video.detail.VideoDetailContainerViewModel
+import com.gh.gamecenter.video.game.GameVideoActivity
+import com.gh.gamecenter.video.videomanager.VideoManagerActivity
 import com.lightgame.utils.Util_System_ClipboardManager
 import com.lightgame.utils.Utils
 import org.greenrobot.eventbus.EventBus
@@ -41,27 +55,27 @@ object DirectUtils {
     @JvmStatic
     fun directToSpecificPage(context: Context, type: String, link: String, text: String? = "", entrance: String? = null, path: String? = null) {
         when (type) {
-            EntranceUtils.HOST_ARTICLE -> directToArticle(context, id = link, entrance = entrance)
+            HOST_ARTICLE -> directToArticle(context, id = link, entrance = entrance)
 
-            EntranceUtils.HOST_GAME -> directToGameDetail(context, id = link, entrance = entrance)
+            HOST_GAME -> directToGameDetail(context, id = link, entrance = entrance)
 
-            EntranceUtils.HOST_GAME_DOWNLOAD -> directToGameDetail(context, id = link, entrance = entrance, autoDownload = true)
+            HOST_GAME_DOWNLOAD -> directToGameDetail(context, id = link, entrance = entrance, autoDownload = true)
 
-            EntranceUtils.HOST_COLUMN -> directToSubject(context, id = link, subjectName = text, entrance = entrance)
+            HOST_COLUMN -> directToSubject(context, id = link, subjectName = text, entrance = entrance)
 
-            EntranceUtils.HOST_QUESTION -> directToQuestionDetail(context, id = link, entrance = entrance, path = path)
+            HOST_QUESTION -> directToQuestionDetail(context, id = link, entrance = entrance, path = path)
 
-            EntranceUtils.HOST_ANSWER -> directToAnswerDetail(context, id = link, entrance = entrance, path = path)
+            HOST_ANSWER -> directToAnswerDetail(context, id = link, entrance = entrance, path = path)
 
-            EntranceUtils.HOST_WEB -> directToWebView(context, url = link, entrance = entrance)
+            HOST_WEB -> directToWebView(context, url = link, entrance = entrance)
 
-            EntranceUtils.HOST_DOWNLOAD -> directToDownloadManagerAndStartDownload(context, gameId = link, packageName = text, entrance = entrance)
+            HOST_DOWNLOAD -> directToDownloadManagerAndStartDownload(context, gameId = link, packageName = text, entrance = entrance)
 
-            EntranceUtils.HOST_UPDATE -> directToDownloadManagerAndStartUpdate(context, gameId = link, packageName = text, entrance = entrance)
+            HOST_UPDATE -> directToDownloadManagerAndStartUpdate(context, gameId = link, packageName = text, entrance = entrance)
 
-            EntranceUtils.HOST_LIBAO -> directToGiftDetail(context, giftId = link, entrance = entrance)
+            HOST_LIBAO -> directToGiftDetail(context, giftId = link, entrance = entrance)
 
-            EntranceUtils.HOST_COMMUNITY -> directToCommunity(context, CommunityEntity(link, text!!))
+            HOST_COMMUNITY -> directToCommunity(context, CommunityEntity(link, text!!))
         }
     }
 
@@ -70,37 +84,80 @@ object DirectUtils {
      */
     @JvmStatic
     fun directToLinkPage(context: Context, linkEntity: LinkEntity, entrance: String, path: String) {
+        directToLinkPage(context, linkEntity, entrance, path, null)
+    }
+
+    fun directToLinkPage(context: Context, linkEntity: LinkEntity, entrance: String, path: String, exposureEvent: ExposureEvent? = null) {
+        directToLinkPage(context, linkEntity, entrance, path, exposureEvent, null)
+    }
+
+    // 用于判断是否已经对接相关类型
+    var directLinkTypes = arrayOf(
+            "article", "news",
+            "game",
+            "column",
+            "question",
+            "answer",
+            "community",
+            "community_article",
+            "community_column",
+            "community_special_column",
+            "web", "inurl",
+            "qq", "QQ",
+            "qqqun",
+            "tag",
+            "all_community_article",
+            "category",
+            "block",
+            "column_collection",
+            "server",
+            "top_game_comment",
+            "wechat_bind",
+            "video")
+
+    fun directToLinkPage(context: Context,
+                         linkEntity: LinkEntity,
+                         entrance: String,
+                         path: String,
+                         exposureEvent: ExposureEvent? = null,
+                         unknownCallback: (() -> Unit)?) {
         when (linkEntity.type) {
-            "article", "news" -> {
+            "article", "news", "文章" -> {
                 NewsUtils.statNewsViews(context, linkEntity.link) // 统计阅读量
                 context.startActivity(NewsDetailActivity.getIntentById(context, linkEntity.link, BaseActivity.mergeEntranceAndPath(entrance, path)))
             }
 
-            "game" -> GameDetailActivity.startGameDetailActivity(context, linkEntity.link, BaseActivity.mergeEntranceAndPath(entrance, path))
+            "game", "游戏" -> {
+                if (exposureEvent != null) {
+                    GameDetailActivity.startGameDetailActivity(context, linkEntity.link, BaseActivity.mergeEntranceAndPath(entrance, path), exposureEvent)
+                } else {
+                    GameDetailActivity.startGameDetailActivity(context, linkEntity.link, BaseActivity.mergeEntranceAndPath(entrance, path))
+                }
+            }
 
-            "column" -> SubjectActivity.startSubjectActivity(context, linkEntity.link, linkEntity.text, false, BaseActivity.mergeEntranceAndPath(entrance, path))
+            "column", "游戏专题" -> SubjectActivity.startSubjectActivity(context, linkEntity.link, linkEntity.text, false, BaseActivity.mergeEntranceAndPath(entrance, path))
 
-            "question" -> context.startActivity(QuestionsDetailActivity.getIntent(context, linkEntity.link, entrance, path))
+            "question", "社区问题" -> context.startActivity(QuestionsDetailActivity.getIntent(context, linkEntity.link, entrance, path))
 
-            "answer" -> context.startActivity(AnswerDetailActivity.getIntent(context, linkEntity.link, entrance, path))
+            "answer", "社区回答" -> context.startActivity(AnswerDetailActivity.getIntent(context, linkEntity.link, entrance, path))
 
-            "community" -> directToCommunity(context, CommunityEntity(linkEntity.link!!, linkEntity.text!!))
+            "community", "问答社区" -> directToCommunity(context, CommunityEntity(linkEntity.link!!, linkEntity.text!!))
 
-            "community_article" -> context.startActivity(ArticleDetailActivity.getIntent(context, linkEntity.community!!, linkEntity.link!!, entrance, path))
+            "community_article", "社区文章" -> context.startActivity(ArticleDetailActivity.getIntent(context, linkEntity.community!!, linkEntity.link!!, entrance, path))
 
-            "community_column" -> directToCommunityColumn(context, linkEntity.community, linkEntity.link!!, entrance, path)
+            "community_column", "社区专题" -> directToCommunityColumn(context, linkEntity.community, linkEntity.link!!, entrance, path)
 
             "community_special_column" -> context.startActivity(AskColumnDetailActivity.getIntentByColumnId(context, linkEntity.link, linkEntity.community!!, entrance, path))
 
-            "web", "inurl" -> directToWebView(context, url = linkEntity.link!!, entrance = BaseActivity.mergeEntranceAndPath(entrance, path))
+            "web", "inurl", "web链接" -> directToWebView(context, url = linkEntity.link!!, entrance = BaseActivity.mergeEntranceAndPath(entrance, path))
 
-            "qq" -> directToQqConversation(context, linkEntity.link)
+            "qq", "QQ" -> directToQqConversation(context, linkEntity.link)
 
             "outurl" -> directToExternalBrowser(context, linkEntity.link!!)
 
-            "qqqun" -> directToQqGroup(context, linkEntity.link!!)
+            "qqqun", "QQ群" -> directToQqGroup(context, linkEntity.link!!)
 
-            "tag" -> context.startActivity(TagsActivity.getIntent(context, linkEntity.text!!, entrance, path))
+            "tag" -> context.startActivity(TagsActivity.getIntent(context, linkEntity.text!!, linkEntity.title, entrance, path))
 
             "all_community_article" -> {
                 context.startActivity(SimpleArticleListActivity.getIntent(
@@ -110,11 +167,11 @@ object DirectUtils {
                         path))
             }
 
-            "category" -> {
+            "category", "分类" -> {
                 context.startActivity(CategoryDirectoryActivity.getIntent(context, linkEntity.link!!, linkEntity.text!!))
             }
 
-            "block" -> {
+            "block", "版块" -> {
                 context.startActivity(BlockActivity.getIntent(context, SubjectRecommendEntity(
                         link = linkEntity.link,
                         text = linkEntity.text,
@@ -122,10 +179,41 @@ object DirectUtils {
                         display = linkEntity.display ?: Display())))
             }
 
-            else -> DialogUtils.showLowVersionDialog(context)
+            "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))
+
+            "video", "video_stream" -> directToVideoDetail(context,
+                    videoId = linkEntity.link!!,
+                    fromLocation = VideoDetailContainerViewModel.Location.VIDEO_CHOICENESS.value,
+                    entrance = entrance,
+                    path = path)
+
+            "game_video" -> directToGameVideo(context, linkEntity.link ?: "", entrance, path)
+
+            else -> {
+                if (unknownCallback != null) {
+                    unknownCallback.invoke()
+                } else {
+                    DialogUtils.showLowVersionDialog(context)
+                }
+            }
         }
     }
 
+    /**
+     * 跳转至专题合集
+     */
+    fun directToColumnCollection(context: Context, id: String, position: Int = -1, entrance: String) {
+        context.startActivity(ColumnCollectionDetailActivity.getIntent(context, id, position, entrance))
+    }
+
     /**
      * 跳转到新闻详情
      */
@@ -135,7 +223,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)
     }
 
     /**
@@ -148,7 +252,27 @@ 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)
+    }
+
+    /**
+     * 跳转视频流-游戏介绍进入
+     */
+    @JvmStatic
+    fun directToGameDetailVideoStreaming(context: Context, id: String, entrance: String? = null) {
+        val bundle = Bundle()
+        bundle.putString(KEY_TO, GameVideoActivity::class.java.name)
+        bundle.putString(KEY_ENTRANCE, entrance)
+        bundle.putString(KEY_GAMEID, id)
+        bundle.putBoolean(KEY_OPEN_VIDEO_STREAMING, true)
+        bundle.putInt(KEY_TARGET, GameDetailFragment.INDEX_DESC)
+//        GameDetailActivity.startGameDetailToVideoStreaming(context, id, entrance)
+        jumpActivity(context, bundle)
+    }
+
+    // 跳转至用户玩过的游戏
+    fun directToPlayedGame(context: Context, userId: String, entrance: String = "", path: String = "") {
+        context.startActivity(PlayedGameActivity.getIntent(context, userId, entrance, path))
     }
 
     // 专栏
@@ -159,7 +283,7 @@ object DirectUtils {
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_TO, SubjectActivity::class.java.name)
         bundle.putParcelable(EntranceUtils.KEY_SUBJECT_DATA, subjectData)
-        EntranceUtils.jumpActivity(context, bundle)
+        jumpActivity(context, bundle)
     }
 
     // 反馈
@@ -171,7 +295,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
@@ -179,7 +303,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)
     }
 
     /**
@@ -194,7 +318,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)
         }
     }
 
@@ -206,7 +330,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
@@ -216,7 +350,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
@@ -226,7 +360,7 @@ 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
@@ -235,7 +369,7 @@ object DirectUtils {
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_TO, WebActivity::class.java.simpleName)
         bundle.putString(EntranceUtils.KEY_URL, url)
-        EntranceUtils.jumpActivity(context, bundle)
+        jumpActivity(context, bundle)
     }
 
     // 个人-系统消息
@@ -244,7 +378,7 @@ object DirectUtils {
         val bundle = Bundle()
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_TO, MessageKeFuActivity::class.java.simpleName)
-        EntranceUtils.jumpActivity(context, bundle)
+        jumpActivity(context, bundle)
     }
 
     @JvmStatic
@@ -253,16 +387,16 @@ object DirectUtils {
         context.startActivity(browserIntent)
     }
 
-    // 跳转 QQ
+    // 跳转 QQ，qqNumber 为空选择默认客服 QQ
     @JvmStatic
     fun directToQqConversation(context: Context, qqNumber: String? = null) {
         var qq = qqNumber
 
         if (TextUtils.isEmpty(qq)) {
-            qq = "2586716223"
+            qq = Config.getSettings()?.support?.qq ?: "3509629529"
         }
         if (ShareUtils.isQQClientAvailable(context)) {
-            // 安装了 QQ 直接调用QQ，打开手机QQ进行会话 默认 QQ 号：2586716223
+            // 安装了 QQ 直接调用QQ，打开手机QQ进行会话 默认 QQ 号：3509629529
             val chatType: String
             if (qq!!.startsWith("400") || qq.startsWith("800")) {
                 chatType = "crm"
@@ -302,7 +436,7 @@ object DirectUtils {
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_TO, LibaoDetailActivity::class.java.simpleName)
         bundle.putString(EntranceUtils.KEY_ID, giftId)
-        EntranceUtils.jumpActivity(context, bundle)
+        jumpActivity(context, bundle)
     }
 
     /**
@@ -319,8 +453,23 @@ 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 directToCommunity(context: Context) {
+        if (MainActivity::class.java.name != RunningUtils.getTopActivity(context)) {
+            val intent = Intent(context, MainActivity::class.java)
+            intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+            context.startActivity(intent)
+        }
+
+        // 这里换个线程操作是为了做一点延时
+        AppExecutor.ioExecutor.execute {
+            EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_ASK))
+            EventBus.getDefault().post(EBReuse(CommunityFragment.EB_RETRY_PAGE))
         }
     }
 
@@ -348,4 +497,74 @@ object DirectUtils {
         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, gameId: String = "", entrance: String? = null, path: String? = "", referer: 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_GAMEID, gameId)
+            bundle.putString(KEY_LOCATION, fromLocation)
+            bundle.putBoolean(KEY_SHOW_COMMENT, showComment)
+            bundle.putString(KEY_REFERER, referer)
+            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))
+    }
+
+    /**
+     * 跳转至上传视频
+     */
+    @JvmStatic
+    fun directToVideoManager(context: Context, linkEntity: VideoLinkEntity, entrance: String? = null, path: String? = "") {
+        val bundle = Bundle()
+        bundle.putString(KEY_PATH, path)
+        bundle.putParcelable(VideoLinkEntity::class.java.simpleName, linkEntity)
+        bundle.putString(KEY_TO, VideoManagerActivity::class.java.name)
+        bundle.putString(KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path))
+        jumpActivity(context, bundle)
+    }
+
+    /**
+     * 跳转视频合集
+     */
+    @JvmStatic
+    fun directToGameVideo(context: Context, gameId: String, entrance: String? = null, path: String? = "") {
+        val bundle = Bundle()
+        bundle.putString(KEY_PATH, path)
+        bundle.putString(KEY_TO, GameVideoActivity::class.java.name)
+        bundle.putString(KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path))
+        bundle.putString(KEY_GAMEID, gameId)
+//        context.startActivity(GameVideoActivity.getIntent(context, gameId, entrance, path))
+        jumpActivity(context, bundle)
+    }
 }

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

@@ -1,10 +1,28 @@
 package com.gh.common.util;
 
+import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
+import android.graphics.Color;
+import android.os.Build;
+import android.text.TextUtils;
+import android.util.DisplayMetrics;
+import android.view.Display;
+import android.view.KeyCharacterMap;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.Window;
+import android.view.WindowManager;
 
 import com.halo.assistant.HaloApp;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+import androidx.core.content.ContextCompat;
+
 public class DisplayUtils {
 
     /**
@@ -27,7 +45,10 @@ public class DisplayUtils {
      * 根据手机的分辨率从 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);
     }
 
@@ -75,4 +96,174 @@ 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 isKeepLowVersionMiui) {
+        if (!isMiuiOs()) {
+            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);
+            }
+        } else {
+            setMIUIStatusBarStyle(activity, lightStatusBar, isKeepLowVersionMiui);
+        }
+    }
+
+    public static void setLightStatusBar(Activity activity, boolean lightStatusBar) {
+        setLightStatusBar(activity, lightStatusBar, true);
+    }
+
+    private static void setMIUIStatusBarStyle(Activity activity, boolean lightStatusBar, boolean isKeepLowVersionMiui) {
+        Window window = activity.getWindow();
+        if (window != null) {
+
+            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);
+            }
+
+            if (isKeepLowVersionMiui) {
+                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);//状态栏透明且黑色字体
+
+                    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
+                }
+            }
+
+        }
+    }
+
+    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);
+
+        }
+    }
+
+
+    private static boolean isMiuiOs() {
+        String property = getSystemProperty("ro.miui.ui.version.name", "");
+        return !TextUtils.isEmpty(property);
+    }
+
+    private static String getSystemProperty(String key, String defaultValue) {
+        try {
+            @SuppressLint("PrivateApi") Class<?> clz = Class.forName("android.os.SystemProperties");
+            Method method = clz.getMethod("get", String.class, String.class);
+            return (String) method.invoke(clz, key, defaultValue);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return defaultValue;
+    }
+
+    public static int retrieveNavigationHeight(Context context) {
+        Resources resources = context.getResources();
+        int resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android");
+        return (resourceId > 0 && hasSoftKeys(context)) ? resources.getDimensionPixelSize(resourceId) : 0;
+    }
+
+    public static boolean hasSoftKeys(Context context) {
+        if (!(context instanceof Activity)) return false;
+
+        boolean hasSoftwareKeys;
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            Display d = ((Activity) context).getWindowManager().getDefaultDisplay();
+
+            DisplayMetrics realDisplayMetrics = new DisplayMetrics();
+            d.getRealMetrics(realDisplayMetrics);
+
+            int realHeight = realDisplayMetrics.heightPixels;
+            int realWidth = realDisplayMetrics.widthPixels;
+
+            DisplayMetrics displayMetrics = new DisplayMetrics();
+            d.getMetrics(displayMetrics);
+
+            int displayHeight = displayMetrics.heightPixels;
+            int displayWidth = displayMetrics.widthPixels;
+
+            hasSoftwareKeys = realWidth - displayWidth > 0 || realHeight - displayHeight > 0;
+        } else {
+            boolean hasMenuKey = ViewConfiguration.get(context).hasPermanentMenuKey();
+            boolean hasBackKey = KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_BACK);
+            hasSoftwareKeys = !hasMenuKey && !hasBackKey;
+        }
+        return hasSoftwareKeys;
+    }
+
 }

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

@@ -1,18 +1,13 @@
 package com.gh.common.util;
 
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Color;
 import android.os.Message;
 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;
@@ -22,9 +17,11 @@ import com.gh.common.view.DownloadDialog;
 import com.gh.download.DownloadManager;
 import com.gh.gamecenter.DownloadManagerActivity;
 import com.gh.gamecenter.R;
+import com.gh.gamecenter.WebActivity;
 import com.gh.gamecenter.adapter.viewholder.GameViewHolder;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
+import com.gh.gamecenter.entity.LinkEntity;
 import com.gh.gamecenter.entity.PluginLocation;
 import com.gh.gamecenter.manager.PackagesManager;
 import com.lightgame.download.DownloadConfig;
@@ -35,6 +32,12 @@ import com.lightgame.utils.Utils;
 
 import java.util.concurrent.LinkedBlockingQueue;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.collection.ArrayMap;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
 public class DownloadItemUtils {
 
     // 更新下载进度条
@@ -167,14 +170,34 @@ public class DownloadItemUtils {
             return;
         }
 
-        if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty()) {
+        if (gameEntity.getApk().isEmpty()
+            || gameEntity.getDownloadOffStatus() != null) {
+            LinkEntity h5LinkEntity = gameEntity.getH5Link();
+            String offStatus = gameEntity.getDownloadOffStatus();
+            
             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));
-            holder.gameDownloadBtn.setClickable(false);
+    
+            if (h5LinkEntity != null) {
+                if ("play".equals(h5LinkEntity.getType())) {
+                    holder.gameDownloadBtn.setText("开始玩");
+                } else {
+                    holder.gameDownloadBtn.setText("查看");
+                }
+                holder.gameDownloadBtn.setClickable(true);
+            } else {
+                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);
         } else {
@@ -360,20 +383,26 @@ public class DownloadItemUtils {
             if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.getId())) {
                 downloadBtn.setOnClickListener(v -> {
                     CheckLoginUtils.checkLogin(context, entrance, () -> {
-                        PermissionHelper.checkReadPhoneStatePermissionBeforeAction(context, () -> {
-                            ReserveDialogFragment dialogFragment = ReserveDialogFragment.getInstance(
-                                    gameEntity,
-                                    () -> adapter.notifyItemChanged(position)
-                            );
-                            dialogFragment.show(((AppCompatActivity) context).getSupportFragmentManager(), "reserve");
-                        });
                         if (clickCallback != null) {
                             clickCallback.onCallback();
                         }
+                        PermissionHelper.checkReadPhoneStatePermissionBeforeAction(context, () -> {
+                            ReserveDialogFragment dialogFragment = ReserveDialogFragment.getInstance(
+                                    gameEntity,
+                                    () -> {
+                                        LogUtils.logReservation(gameEntity, traceEvent);
+                                        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, () -> {
@@ -391,14 +420,20 @@ public class DownloadItemUtils {
             }
             return;
         }
-
-        if (gameEntity.getApk().size() == 1) {
+        
+        if (gameEntity.getApk().size() == 0 && gameEntity.getH5Link() != null) {
+            downloadBtn.setOnClickListener(v -> {
+                MtaHelper.onEvent("H5页面", "入口", "列表页_" + gameEntity.getName());
+                Intent i = WebActivity.getIntentForWebGame(context, gameEntity.getH5Link().getLink(), gameEntity.getName(), "play".equals(gameEntity.getH5Link().getType()));
+                context.startActivity(i);
+            });
+        } else if (gameEntity.getApk().size() == 1) {
             downloadBtn.setOnClickListener(v -> {
                 EmptyCallback clickRunnable = () -> {
-                    onNormalClick(context, downloadBtn, gameEntity, position, adapter, entrance, location, traceEvent);
                     if (clickCallback != null) {
                         clickCallback.onCallback();
                     }
+                    onNormalClick(context, downloadBtn, gameEntity, position, adapter, entrance, location, traceEvent);
                 };
 
                 // 启动不需要请求存储权限
@@ -410,11 +445,11 @@ public class DownloadItemUtils {
             });
         } else {
             downloadBtn.setOnClickListener(v -> {
+                if (clickCallback != null) {
+                    clickCallback.onCallback();
+                }
                 PermissionHelper.checkStoragePermissionBeforeAction(context, () -> {
                     DownloadDialog.getInstance(context).showPopupWindow(v, gameEntity, entrance, location, traceEvent);
-                    if (clickCallback != null) {
-                        clickCallback.onCallback();
-                    }
                 });
             });
         }
@@ -501,8 +536,6 @@ public class DownloadItemUtils {
             downloadBtn.setText(R.string.downloading);
             downloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style);
             downloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style));
-
-//            DownloadManager.getInstance(context).putStatus(gameEntity.getApk().get(0).getUrl(), "downloading");
         } else {
             Utils.toast(context, msg);
         }
@@ -523,8 +556,6 @@ public class DownloadItemUtils {
             downloadBtn.setText(R.string.downloading);
             downloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style);
             downloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style));
-
-//            DownloadManager.getInstance(context).putStatus(gameEntity.getApk().get(0).getUrl(), "downloading");
         } else {
             Utils.toast(context, msg);
         }
@@ -545,16 +576,20 @@ public class DownloadItemUtils {
                 }
                 adapter.notifyItemChanged(position);
             } else {
-                PackageUtils.launchSetup(context, path);
+                PackageUtils.launchSetup(context, downloadEntity);
             }
         }
     }
 
     //更新
-    private static void update(Context context, GameEntity gameEntity, String entrance, String location,
-                               boolean isSubscribe, @Nullable ExposureEvent traceEvent) {
-        DataUtils.onGameUpdateEvent(context, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), "下载开始");
-        ExposureEvent downloadExposureEvent = ExposureUtils.logADownloadExposureEvent(gameEntity, gameEntity.getApk().get(0).getPlatform(), traceEvent, ExposureUtils.DownloadType.UPDATE);
+    private static void update(Context context, GameEntity gameEntity, String entrance, String location, boolean isSubscribe, @Nullable ExposureEvent traceEvent) {
+        ApkEntity apkEntity = gameEntity.getApk().get(0);
+        
+        ExposureUtils.DownloadType downloadType = ExposureUtils.getUpdateType(apkEntity);
+        DataUtils.onGameUpdateEvent(context, gameEntity.getName(), apkEntity.getPlatform(), "下载开始");
+    
+        ExposureEvent downloadExposureEvent = ExposureUtils.logADownloadExposureEvent(gameEntity, apkEntity
+            .getPlatform(), traceEvent, downloadType);
         DownloadManager.createDownload(context, gameEntity, "更新", entrance, location, isSubscribe, downloadExposureEvent);
     }
 

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

@@ -0,0 +1,161 @@
+package com.gh.common.util
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import com.gh.common.AppExecutor
+import com.gh.common.constant.Constants
+import com.gh.gamecenter.R
+import com.halo.assistant.HaloApp
+import com.lightgame.download.DownloadEntity
+import com.lightgame.download.DownloadStatus
+
+object DownloadNotificationHelper {
+
+    private const val DOWNLOAD_GROUP_KEY = "download_group_key"
+    private const val DOWNLOAD_CHANNEL_ID = "download"
+    private const val DOWNLOAD_NOTIFICATION_FOLD_ID = 889
+    private const val DOWNLOAD_NOTIFICATION_ID = 888
+    private const val PROGRESS_MAX = 100
+
+    const val ACTION_INSTALL = "com.gh.gamecenter.INSTALL"
+    const val ACTION_DOWNLOAD = "com.gh.gamecenter.DOWNLOAD"
+
+    private val mNotifyMap: MutableMap<String, Long> = mutableMapOf()
+
+    private fun getNotificationManager(): NotificationManager {
+        return HaloApp.getInstance().application.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+    }
+
+    @JvmStatic
+    @Synchronized
+    fun addOrUpdateDownloadNotification(entity: DownloadEntity) {
+        var requireUpdateNotificationGroupDelay = false
+        val notificationManager = getNotificationManager()
+        val downloadNotificationId = (entity.gameId + entity.packageName).hashCode()
+
+        val intent = Intent()
+        if (entity.status == DownloadStatus.done) {
+            intent.putExtra(EntranceUtils.KEY_DATA, entity.toJson())
+            intent.putExtra(EntranceUtils.KEY_PATH, entity.path)
+            intent.action = ACTION_INSTALL
+        } else {
+            intent.action = ACTION_DOWNLOAD
+        }
+        val pendingIntent = PendingIntent.getBroadcast(HaloApp.getInstance().application,
+                downloadNotificationId,
+                intent,
+                PendingIntent.FLAG_UPDATE_CURRENT)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            // importance == IMPORTANCE_DEFAULT 时每次更新都会触发震动
+            val channel = NotificationChannel(DOWNLOAD_CHANNEL_ID, DOWNLOAD_CHANNEL_ID, NotificationManager.IMPORTANCE_LOW)
+            notificationManager.createNotificationChannel(channel)
+        }
+
+        val whenTime = 1000 * 60 * (System.currentTimeMillis() / 1000 / 60)
+        val builder = NotificationCompat.Builder(HaloApp.getInstance().application, DOWNLOAD_CHANNEL_ID)
+                .setContentTitle(entity.name)
+                .setSmallIcon(R.mipmap.logo)
+                .setContentIntent(pendingIntent)
+                .setGroup(DOWNLOAD_GROUP_KEY)
+                .setWhen(whenTime)
+                .setProgress(PROGRESS_MAX, entity.percent.toInt(), false)
+
+        when (entity.status) {
+            DownloadStatus.downloading -> builder.setContentText(String.format("%s(剩%s)",
+                    SpeedUtils.getSpeed(entity.speed),
+                    SpeedUtils.getRemainTime(entity.size, entity.progress, entity.speed * 1024)))
+            DownloadStatus.done -> builder.setContentText("下载完成，点击立即安装")
+            DownloadStatus.waiting -> builder.setContentText("等待中")
+            DownloadStatus.subscribe,
+            DownloadStatus.timeout,
+            DownloadStatus.neterror -> builder.setContentText("已暂停，连接WiFi自动下载")
+            else -> builder.setContentText("暂停中")
+        }
+
+        when {
+            entity.status == DownloadStatus.done -> {
+                builder.setSortKey("A")
+                builder.setOngoing(true) // 垃圾华为 sortKey 不起效 priority 也不起效，要将下载完成任务的通知置顶只能设置为 ongoing，喷了
+            }
+            entity.status == DownloadStatus.downloading -> builder.setSortKey("B")
+            else -> builder.setSortKey("C")
+        }
+
+        val notification = builder.build()
+        notification.flags = notification.flags or Notification.FLAG_NO_CLEAR
+
+        if (entity.status == DownloadStatus.delete
+                || entity.status == DownloadStatus.cancel
+                || entity.status == DownloadStatus.hijack
+                || entity.status == DownloadStatus.notfound
+                || entity.status == DownloadStatus.overflow
+                || (entity.status == DownloadStatus.done // 触发安装事件以后也 cancel 掉通知
+                        && !entity.meta[Constants.MARK_ALREADY_TRIGGERED_INSTALLATION].isNullOrEmpty())) {
+            requireUpdateNotificationGroupDelay = true
+            notificationManager.cancel(entity.path, DOWNLOAD_NOTIFICATION_ID)
+        } else {
+            if (entity.status != DownloadStatus.downloading) {
+                notificationManager.notify(entity.path, DOWNLOAD_NOTIFICATION_ID, notification)
+            } else {
+                val time = mNotifyMap[entity.path]
+                val curTime = System.currentTimeMillis()
+                if (time == null || curTime - time > 2000) {
+                    mNotifyMap[entity.path] = curTime
+                    notificationManager.notify(entity.path, DOWNLOAD_NOTIFICATION_ID, notification)
+                }
+            }
+        }
+        if (requireUpdateNotificationGroupDelay) {
+            // 虽然运行到这里时 notification 已经被 cancel 了，但在下面的 notificationManager.getActiveNotifications 里它有可能还是 active 状态,
+            // 这里延时 100 ms 避免出现所有的任务都取消了以后依旧有一条 notification group 常驻
+            AppExecutor.uiExecutor.executeWithDelay(Runnable { updateNotificationGroup() }, 100)
+        } else {
+            updateNotificationGroup()
+        }
+    }
+
+    private fun updateNotificationGroup() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            val notificationManager = getNotificationManager()
+            val activeNotifications = notificationManager.activeNotifications
+            var downloadNotificationSize = 0
+            var downloadGroupNotificationSize = 0
+            for (activeNotification in activeNotifications) {
+                if (activeNotification.id == DOWNLOAD_NOTIFICATION_ID) {
+                    downloadNotificationSize++
+                }
+                if (activeNotification.id == DOWNLOAD_NOTIFICATION_FOLD_ID) {
+                    downloadGroupNotificationSize++
+                }
+            }
+
+            if (downloadNotificationSize == 0 && downloadGroupNotificationSize != 0) {
+                // 删除组可能会把组内所有通知一并删除
+                notificationManager.cancel(DOWNLOAD_NOTIFICATION_FOLD_ID)
+            } else if (downloadNotificationSize != 0 && downloadGroupNotificationSize == 0) {
+                val groupBuilder = NotificationCompat.Builder(HaloApp.getInstance().application, DOWNLOAD_CHANNEL_ID)
+                        .setSmallIcon(R.mipmap.logo)
+                        .setGroup(DOWNLOAD_GROUP_KEY)
+                        .setGroupSummary(true)
+                        .setStyle(NotificationCompat.BigTextStyle().bigText("下载任务"))
+                val groupNotification = groupBuilder.build()
+                groupNotification.flags = groupNotification.flags or Notification.FLAG_NO_CLEAR
+                notificationManager.notify(DOWNLOAD_NOTIFICATION_FOLD_ID, groupNotification)
+            }
+        }
+    }
+
+    @JvmStatic
+    fun initDownloadNotification(downloadTasks: MutableList<DownloadEntity>) {
+        for (downloadTask in downloadTasks) {
+            addOrUpdateDownloadNotification(downloadTask)
+        }
+    }
+}

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

@@ -3,7 +3,6 @@ package com.gh.common.util;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.text.TextUtils;
 
 import com.gh.gamecenter.MainActivity;
 import com.gh.gamecenter.NormalActivity;
@@ -25,6 +24,13 @@ public class EntranceUtils {
     public static final String KEY_URL = "url";
     public static final String KEY_GAMENAME = "gameName";
     public static final String HOST_ARTICLE = "article";
+    public static final String HOST_UPLOAD_VIDEO = "upload_video";//上传视频
+    public static final String HOST_VIDEO_SINGLE = "video_single";//指定视频-不能划动
+    public static final String HOST_VIDEO_MORE = "video_more";//指定视频-能划动
+    public static final String HOST_VIDEO_STREAMING_HOME = "video_streaming_home";//视频流-首页
+    public static final String HOST_VIDEO_STREAMING_DESC = "video_streaming_desc";//视频流-游戏介绍进入
+    public static final String HOST_VIDEO_COLLECTION = "video_collection";//视频合集
+    public static final String HOST_VIDEO = "video";
     public static final String HOST_COMMUNITY_ARTICLE = "community_article";
     public static final String HOST_COMMUNITY_COLUMN = "community_column";
     public static final String HOST_GAME = "game";
@@ -32,6 +38,7 @@ public class EntranceUtils {
     public static final String HOST_COLUMN = "column";
     public static final String HOST_WEB = "web";
     public static final String HOST_QQ = "qq";
+    public static final String HOST_QQ_GROUP = "qqgroup";
     public static final String HOST_DOWNLOAD = "download";
     public static final String HOST_UPDATE = "update";
     public static final String HOST_LIBAO = "libao";
@@ -39,13 +46,16 @@ public class EntranceUtils {
     public static final String HOST_SUGGESTION = "suggestion";
     public static final String HOST_ANSWER = "answer";
     public static final String HOST_QUESTION = "question";
+    public static final String HOST_TOOLBOX = "toolbox";
     public static final String KEY_DATA = "data";
     public static final String KEY_MESSAGE = "message";
     public static final String KEY_MESSAGE_ID = "message_id";
     public static final String KEY_TYPE = "type";
     public static final String KEY_LINK = "link";
     public static final String KEY_NAME = "name";
+    public static final String KEY_POSITION = "position";
     public static final String KEY_ENTRANCE = "entrance";
+    public static final String KEY_ENTRANCE_LINK = "entrance_link";
     public static final String KEY_TARGET = "target";
     public static final String ENTRANCE_BROWSER = "(浏览器)";
     public static final String ENTRANCE_WELCOME = "(启动弹窗)";
@@ -61,8 +71,10 @@ public class EntranceUtils {
     public static final String KEY_VERSION = "version";
     public static final String KEY_CONTENT = "content";
     public static final String KEY_PLUGIN = "plugin";
+    public static final String KEY_LOCATION = "location";
     public static final String KEY_CURRENTITEM = "currentItem";
     public static final String KEY_COMMENTID = "commentId";
+    public static final String KEY_SHOW_KEYBOARD_IF_NEEDED = "show_key_board_if_needed";
     public static final String KEY_PATH = "path";
     public static final String KEY_OUTER_INFO = "outerInfo";
     public static final String KEY_OLDERUSER = "isOldUser";
@@ -83,6 +95,7 @@ public class EntranceUtils {
     public static final String KEY_INVITE_SEARCH_KEY = "inviteSearchKey";
     public static final String KEY_MESSAGE_TYPE = "messageType";
     public static final String KEY_QUESTIONS_SEARCH_KEY = "questionsSearchKey";
+    public static final String KEY_SHOW_COMMENT = "showComment";
     public static final String KEY_SHOW_ANSWER_COMMENT = "showAnswerComment";
     public static final String KEY_RECOMMENDS_CONTENTS = "isRecommendsContents";
     public static final String KEY_VERSION_UPDATE = "versionUpdate";
@@ -113,6 +126,20 @@ public class EntranceUtils {
     public static final String KEY_SKIP_GAME_COMMENT = "skipGameComment";
     public static final String KEY_OPEN_PLATFORM_WINDOW = "openPlatformWindow";
     public static final String KEY_OPEN_KEYBOARD = "openKeyboard";
+    public static final String KEY_PATH_VIDEO = "pathVideo";
+    public static final String KEY_VIDEO_ID = "videoId";
+    public static final String KEY_DIRECT_COMMENT = "directComment";
+    public static final String KEY_SORT = "sort";
+    public static final String KEY_AMWAY = "amway";
+    public static final String KEY_COLLECTION_ID = "collectionId";
+    public static final String KEY_NAVIGATION_TITLE = "navigationTitle";
+    public static final String KEY_IMAGE_CROP_RATIO = "imageCropRatio";
+    public static final String KEY_OPEN_VIDEO_STREAMING = "openVideoStreaming";
+    public static final String KEY_REFERER = "referer";
+    public static final String KEY_UUID = "uuid";
+    public static final String KEY_IS_HOME_VIDEO = "isHomeVideo";
+    public static final String KEY_IS_HOME = "isHome";
+    public static final String KEY_WEB_SHARE = "webShare";
 
     public static void jumpActivity(Context context, Bundle bundle) {
 
@@ -121,18 +148,15 @@ public class EntranceUtils {
                 && MainActivity.class.getName().equals(RunningUtils.getBaseActivity(context))) {
             // 应用正在运行，前台或后台
             String to = bundle.getString(KEY_TO);
-            if (!TextUtils.isEmpty(to)) {
-                Class<?> clazz = ClassUtils.forName(to);
-                if (clazz != null) {
-                    if (NormalFragment.class.isAssignableFrom(clazz)) { // 兼容NormalFragment
-                        NormalActivity.startFragmentNewTask(context, (Class<? extends NormalFragment>) clazz, bundle);
-                    } else {
-                        Intent intent1 = new Intent(context, clazz);
-                        intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        intent1.putExtras(bundle);
-                        context.startActivity(intent1);
-                    }
-                }
+            Class<?> clazz = ClassUtils.forName(to);
+            if (clazz == null) clazz = MainActivity.class;
+            if (NormalFragment.class.isAssignableFrom(clazz)) { // 兼容NormalFragment
+                NormalActivity.startFragmentNewTask(context, (Class<? extends NormalFragment>) clazz, bundle);
+            } else {
+                Intent intent1 = new Intent(context, clazz);
+                intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                intent1.putExtras(bundle);
+                context.startActivity(intent1);
             }
         } else {
             // 应用未在运行

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

@@ -1,10 +1,10 @@
 package com.gh.common.util
 
 import android.content.Context
+import com.gh.common.constant.Config
 import com.gh.gamecenter.R
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.entity.ErrorEntity
-import com.halo.assistant.fragment.WebFragment
 import com.lightgame.utils.Utils
 
 /**
@@ -86,6 +86,7 @@ object ErrorHelper {
             403045,
             403054,
             403069,
+            403071,
             403047 -> handleErrorWithCommunityBannedDialog(context, errorEntity)
 
             403057,
@@ -109,6 +110,11 @@ object ErrorHelper {
             404001 -> Utils.toast(context, "请求的资源不存在")
             403016 -> Utils.toast(context, "标签内容可能包含敏感信息，请修改后再提交")
             403018 -> Utils.toast(context, R.string.comment_failed_unable)
+            403070 -> Utils.toast(context, "请勿重复提交~")
+            403073 -> Utils.toast(context, "标题违规，请重新编辑")
+            403074 -> Utils.toast(context, "该微信号（${errorEntity.data?.nickname}）已绑定")
+            403078 -> Utils.toast(context, "已点赞")
+            403072 -> Utils.toast(context, R.string.comment_failed_userblocked)
 
             403020 -> if (showHighPriorityHint) {
                 DialogUtils.showAlertDialog(context,
@@ -130,8 +136,8 @@ object ErrorHelper {
         }
     }
 
-    private fun handleErrorWithCommentBannedDialog(context: Context, errorEntity: ErrorEntity) {
-        val bannedType = if (errorEntity.data?.alwaysBlock!!) {
+    private fun handleErrorWithCommentBannedDialog(context: Context, errorEntity: ErrorEntity?) {
+        val bannedType = if (errorEntity?.data?.alwaysBlock == true) {
             ""
         } else {
             "（非永久）"
@@ -139,14 +145,14 @@ object ErrorHelper {
         val dialogContext = DialogUtils.checkDialogContext(context)
         DialogUtils.showAlertDialog(dialogContext,
                 "提示",
-                "你因违反《光环助手评论规则》，已被禁言，如有疑问$bannedType，请联系客服（QQ：3467475980）",
+                "你因违反《光环助手评论规则》，已被禁言$bannedType，如有疑问，请联系客服（QQ：${Config.getSettings()?.support?.qq}）",
                 "去看看", "关闭", {
             dialogContext.startActivity(WebActivity.getCommentRulesIntent(dialogContext))
         }, null)
     }
 
     private fun handleErrorWithCommunityBannedDialog(context: Context, errorEntity: ErrorEntity) {
-        val bannedType = if (errorEntity.data?.alwaysBlock!!) {
+        val bannedType = if (errorEntity.data?.alwaysBlock == true) {
             ""
         } else {
             "（非永久）"
@@ -154,7 +160,7 @@ object ErrorHelper {
         val dialogContext = DialogUtils.checkDialogContext(context)
         DialogUtils.showAlertDialog(dialogContext,
                 "提示",
-                "你因违反《问答版块规则》，已被禁言$bannedType，如有疑问，请联系客服（QQ：3467475980）",
+                "你因违反《问答版块规则》，已被禁言$bannedType，如有疑问，请联系客服（QQ：1562479331）",
                 "去看看", "关闭", {
             dialogContext.startActivity(WebActivity.getCommunityRuleIntent(dialogContext))
         }, null)

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

@@ -1,23 +1,41 @@
 package com.gh.common.util
 
+import android.animation.Animator
 import android.content.ClipboardManager
 import android.content.Context
+import android.text.Editable
 import android.text.Html
 import android.text.Spanned
+import android.text.TextWatcher
+import android.util.TypedValue
 import android.view.Gravity
 import android.view.View
 import android.widget.PopupWindow
+import android.widget.TextView
+import androidx.annotation.ColorRes
+import androidx.core.text.HtmlCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.*
+import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager.widget.ViewPager
+import com.airbnb.lottie.LottieAnimationView
+import com.facebook.drawee.view.SimpleDraweeView
+import com.gh.common.constant.Config
+import com.gh.common.constant.Constants
+import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.R
 import com.google.gson.reflect.TypeToken
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.Disposable
 import okhttp3.MediaType
 import okhttp3.RequestBody
 import java.net.URI
+import java.util.concurrent.TimeUnit
+import kotlin.math.abs
 
 /**
  * 创建以 activity 为观察者上下文的 viewModel
@@ -67,6 +85,43 @@ fun ViewPager.addOnPageChangeListener(onSelected: ((position: Int) -> Unit)? = n
     addOnPageChangeListener(listener)
 }
 
+fun ViewPager.addOnScrollStateChanged(onStateChanged: ((state: Int) -> Unit)? = null) {
+    val listener = object : ViewPager.OnPageChangeListener {
+        override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
+        }
+
+        override fun onPageSelected(position: Int) {
+        }
+
+        override fun onPageScrollStateChanged(state: Int) {
+            onStateChanged?.invoke(state)
+        }
+    }
+    addOnPageChangeListener(listener)
+}
+
+/**
+ * RecyclerView Extensions
+ */
+
+// 监听滚动距离
+fun RecyclerView.doOnScrolledSpecificDistance(distanceX: Int = 0, distanceY: Int = 0, singleTimeEvent: Boolean = false, action: () -> Unit) {
+    val listener = object : RecyclerView.OnScrollListener() {
+        override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+            super.onScrolled(recyclerView, dx, dy)
+
+            if ((distanceX != 0 && abs(dx) > distanceX) || (distanceY != 0 && abs(dy) > distanceY)) {
+                action.invoke()
+                if (singleTimeEvent) {
+                    removeOnScrollListener(this)
+                }
+            }
+        }
+    }
+
+    addOnScrollListener(listener)
+}
+
 /**
  * View Extensions
  */
@@ -86,6 +141,16 @@ fun View.goneIf(predicate: Boolean) {
     }
 }
 
+fun View.addSelectableItemBackground() {
+    val outValue = TypedValue()
+    context.theme.resolveAttribute(android.R.attr.selectableItemBackground, outValue, true)
+    setBackgroundResource(outValue.resourceId);
+}
+
+fun View.removeSelectableItemBackground() {
+    background = null
+}
+
 /**
  * LiveData Extensions
  */
@@ -161,16 +226,26 @@ inline fun tryWithDefaultCatch(action: (() -> Unit)) {
  * String related
  */
 fun String.fromHtml(): Spanned {
-    return Html.fromHtml(this)
+    return HtmlCompat.fromHtml(this, HtmlCompat.FROM_HTML_MODE_LEGACY)
+}
+
+// 将双引号换成单引号避免 JSON 解析异常 ( escape 后会有其它异常，暂时先替换成单引号了)
+fun String.eliminateDoubleQuote(): String {
+    return this.replace("\"", "'")
 }
 
 // 去掉文章/答案的插入内容
 fun String.removeInsertedContent(): String {
     val textRegex = "(?s)<div class=\"gh-internal-content content-right\".*?</div>"
-
     return this.replace(textRegex.toRegex(), "")
 }
 
+// 去除视频相关文本
+fun String.removeVideoContent(): String {
+    val videoRegex = "(?s)<div class=\"insert-video-container\".*?</div>"
+    return this.replace(videoRegex.toRegex(), "")
+}
+
 // 完全地清除所有 Html 格式
 fun String.clearHtmlFormatCompletely(): String {
     return Html.fromHtml(this).toString().replace('\n', 32.toChar())
@@ -198,6 +273,16 @@ fun Map<String, String>.createRequestBody(): RequestBody {
     return RequestBody.create(MediaType.parse("application/json"), json)
 }
 
+fun Map<String, Any>.createRequestBodyAny(): RequestBody {
+    val json = GsonUtils.toJson(this)
+    return RequestBody.create(MediaType.parse("application/json"), json)
+}
+
+fun Any.toRequestBody(): RequestBody {
+    val json = GsonUtils.toJson(this)
+    return RequestBody.create(MediaType.parse("application/json"), json)
+}
+
 // 对在浏览器(WebView)显示的路径进行转码
 fun String.decodeURI(): String {
     return URI(null, null, this, null).rawPath
@@ -212,31 +297,37 @@ fun Float.dip2px(): Int {
 }
 
 /**
- * PopupWindow 自动适配方向
+ * 根据手机的分辨率从 px(像素) 的单位 转成为 dip
  */
-fun PopupWindow.showAutoOrientation(anchorView: View) {
+fun Float.px2dip(): Int {
+    val scale = HaloApp.getInstance().application.resources.displayMetrics.density
+    return (this / scale + 0.5f).toInt()
+}
+
+/**
+ * PopupWindow 自动适配方向
+ * 弹出与锚点右对齐
+ */
+fun PopupWindow.showAutoOrientation(anchorView: View, distanceY: Int = 0, distanceX: Int = 0) {
     val windowPos = IntArray(2)
     val anchorLoc = IntArray(2)
     // 获取锚点View在屏幕上的左上角坐标位置
     anchorView.getLocationOnScreen(anchorLoc)
-    val anchorHeight = anchorView.height
+    val anchorHeight = anchorView.height + distanceY
     // 获取屏幕的高宽
     val screenHeight = anchorView.context.resources.displayMetrics.heightPixels
-    val screenWidth = anchorView.context.resources.displayMetrics.widthPixels
     // 测量contentView
     contentView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED)
     // 计算contentView的高宽
     val windowHeight = contentView.measuredHeight
     val windowWidth = contentView.measuredWidth
+
     // 判断需要向上弹出还是向下弹出显示
     val isNeedShowUp = screenHeight - anchorLoc[1] - anchorHeight < windowHeight
-    if (isNeedShowUp) {
-        windowPos[0] = screenWidth - windowWidth
-        windowPos[1] = anchorLoc[1] - windowHeight
-    } else {
-        windowPos[0] = screenWidth - windowWidth
-        windowPos[1] = anchorLoc[1] + anchorHeight
-    }
+    windowPos[1] = if (isNeedShowUp) {
+        anchorLoc[1] - windowHeight
+    } else anchorLoc[1] + anchorHeight
+    windowPos[0] = anchorLoc[0] - windowWidth + anchorView.width - distanceX
 
     animationStyle = R.style.popwindow_option_anim_style
     showAtLocation(anchorView, Gravity.TOP or Gravity.START, windowPos[0], windowPos[1])
@@ -267,4 +358,168 @@ fun Fragment.checkStoragePermissionBeforeAction(action: (() -> Unit)) {
             action.invoke()
         }
     })
+}
+
+fun FragmentActivity.checkReadPhoneStateAndStoragePermissionBeforeAction(action: (() -> Unit)) {
+    PermissionHelper.checkReadPhoneStateAndStoragePermissionBeforeAction(this, object : EmptyCallback {
+        override fun onCallback() {
+            action.invoke()
+        }
+    })
+}
+
+fun FragmentActivity.checkReadPhoneStatePermissionBeforeAction(action: (() -> Unit)) {
+    PermissionHelper.checkReadPhoneStatePermissionBeforeAction(this, object : EmptyCallback {
+        override fun onCallback() {
+            action.invoke()
+        }
+    })
+}
+
+fun FragmentActivity.checkStoragePermissionBeforeAction(action: (() -> Unit)) {
+    PermissionHelper.checkStoragePermissionBeforeAction(this, object : EmptyCallback {
+        override fun onCallback() {
+            action.invoke()
+        }
+    })
+}
+
+/**
+ * TextView related.
+ */
+fun TextView.setTextWithHighlightedTextWrappedInsideWrapper(text: CharSequence,
+                                                            wrapper: String = Constants.DEFAULT_TEXT_WRAPPER,
+                                                            @ColorRes
+                                                            highlightColorId: Int = R.color.theme,
+                                                            copyClickedText: Boolean = false,
+                                                            highlightedTextClickListener: (() -> Unit)? = null) {
+    TextHelper.highlightTextThatIsWrappedInsideWrapper(this, text, wrapper, highlightColorId, object : SimpleCallback<String> {
+        override fun onCallback(arg: String) {
+            if (copyClickedText) {
+                arg.copyTextAndToast("已复制：$arg")
+            }
+            highlightedTextClickListener?.invoke()
+        }
+    })
+}
+
+fun TextView.setTextChangedListener(action: (s: CharSequence, start: Int, before: Int, count: Int) -> Unit) {
+    this.addTextChangedListener(object : TextWatcher {
+        override fun afterTextChanged(s: Editable?) {
+
+        }
+
+        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+        }
+
+        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+            action.invoke(s ?: "", start, before, count)
+        }
+    })
+}
+
+fun Int.toColor(): Int {
+    return HaloApp.getInstance().application.resources.getColor(this)
+}
+
+fun Int.toResString(): String {
+    return HaloApp.getInstance().application.resources.getString(this)
+}
+
+fun Int.toSimpleCount(): String {
+    return NumberUtils.transSimpleCount(this)
+}
+
+/**
+ * Image related
+ */
+fun SimpleDraweeView.display(url: String) {
+    ImageUtils.display(this, url)
+}
+
+/**
+ * 测试用包裹
+ */
+inline fun debugOnly(f: () -> Unit) {
+    if (BuildConfig.DEBUG) {
+        f()
+    }
+}
+
+inline fun testChannelOnly(f: () -> Unit) {
+    if (HaloApp.getInstance().channel == Config.DEFAULT_CHANNEL) {
+        f()
+    }
+}
+
+/**
+ * 倒计时，单位s
+ */
+inline fun countDownTimer(
+        millisUntilFinish: Long,
+        crossinline block: (finish: Boolean, millisUntilFinished: Long) -> Unit
+): Disposable {
+    var subscribe: Disposable? = null
+    subscribe = Observable.interval(0, 1000, TimeUnit.MILLISECONDS)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe {
+                if (it < millisUntilFinish) {
+                    block.invoke(false, millisUntilFinish - it)
+                } else {
+                    block.invoke(true, 0)
+                    if (subscribe != null && !subscribe!!.isDisposed) {
+                        subscribe?.dispose()
+                    }
+                }
+            }
+    return subscribe
+}
+
+/**
+ * 正计时
+ * @start 起始时间
+ */
+inline fun countUpTimer(
+        start: Long,
+        period: Long = 1000,
+        crossinline block: (millisUntilFinished: Long) -> Unit
+): Disposable {
+    var startTime = start
+    return Observable.interval(0, period, TimeUnit.MILLISECONDS)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe {
+                startTime += period
+                block.invoke(startTime)
+            }
+}
+
+/**
+ * 计时器(注意不需要的时候要取消订阅)
+ */
+inline fun rxTimer(interval: Long, crossinline block: (times: Long) -> Unit): Disposable {
+    return Observable.interval(0, interval, TimeUnit.MILLISECONDS)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe {
+                block.invoke(it)
+            }
+}
+
+fun LottieAnimationView.doOnAnimationEnd(action: () -> Unit) {
+    this.addAnimatorListener(object : Animator.AnimatorListener {
+        override fun onAnimationRepeat(animation: Animator?) {
+
+        }
+
+        override fun onAnimationEnd(animation: Animator?) {
+            action.invoke()
+        }
+
+        override fun onAnimationCancel(animation: Animator?) {
+
+        }
+
+        override fun onAnimationStart(animation: Animator?) {
+
+        }
+    })
 }

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

@@ -2,10 +2,11 @@ package com.gh.common.util;
 
 import android.content.Context;
 import android.graphics.Color;
-import androidx.core.content.ContextCompat;
 import android.text.TextUtils;
 import android.widget.TextView;
 
+import androidx.core.content.ContextCompat;
+
 import com.gh.common.constant.Config;
 import com.gh.download.DownloadManager;
 import com.gh.gamecenter.R;
@@ -147,6 +148,8 @@ public class GameUtils {
         gameUpdateEntity.setTagStyle(gameEntity.getTagStyle());
         gameUpdateEntity.setBrief(gameEntity.getBrief());
         gameUpdateEntity.setPlugin(apkEntity.getPlugin());
+        gameUpdateEntity.setDownload(gameEntity.getDownload());
+        gameUpdateEntity.setIndexPlugin(gameEntity.getIndexPlugin());
         return gameUpdateEntity;
     }
 

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

@@ -3,7 +3,6 @@ package com.gh.common.util;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.GradientDrawable;
-import androidx.core.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.View;
@@ -22,6 +21,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 
+import androidx.core.content.ContextCompat;
+
 /**
  * @author 温冠超
  * @email 294299195@qq.com
@@ -53,6 +54,28 @@ public class GameViewUtils {
         }
     }
 
+    public static void setLabelList(Context context, LinearLayout labelLayout, String tagType, List<TagStyleEntity> tagStyle) {
+        labelLayout.removeAllViews();
+        if (tagStyle == null || tagStyle.isEmpty()) {
+            labelLayout.addView(getGameTagView(context, "官方版", 0, tagType, null));
+        } else {
+            for (int i = 0; i < tagStyle.size() - 1; i++) {
+                View view;
+                if (i == tagStyle.size() - 1) {
+                    view = getGameTagView(context, tagStyle.get(i).getName(), 0, tagType, tagStyle.size() > i ? tagStyle.get(i) : null);
+                } else {
+                    view = getGameTagView(context, tagStyle.get(i).getName(), DisplayUtils.dip2px(context, 8), tagType, tagStyle.size() > i ? tagStyle.get(i) : null);
+                }
+                if (view != null) {
+                    labelLayout.addView(view);
+                }
+                if (labelLayout.getChildCount() == 3) {
+                    break;
+                }
+            }
+        }
+    }
+
     private static TextView getGameTagView(Context context, String tagStr, int rightMargin, String tagType, TagStyleEntity tagEntity) {
         LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams(
                 LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);

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

@@ -8,6 +8,8 @@ import org.json.JSONObject
 
 /**
  * 广点通辅助类 [https://gitlab.ghzhushou.com/pm/halo-app-issues/issues/403]
+ *
+ * 更换帐号 [https://gitlab.ghzs.com/pm/yunying/issues/893]
  */
 object GdtHelper {
 
@@ -21,7 +23,7 @@ object GdtHelper {
     const val PLATFORM = "PLATFORM"
 
     fun init(application: Application) {
-        GDTAction.init(application, "1108222478", "0b2bb2b971c8221be45a8454f05a0b1f")
+        GDTAction.init(application, "1110071928", "7fe03caa04ed382e9dce401312b1d0ae")
     }
 
     fun logAction(type: String) {

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

@@ -1,303 +0,0 @@
-package com.gh.common.util;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.widget.Toast;
-
-import com.gh.common.constant.Config;
-import com.gh.gamecenter.R;
-import com.gh.gamecenter.user.LoginTag;
-import com.lightgame.utils.RuntimeUtils;
-import com.lightgame.utils.Utils;
-import com.sina.weibo.sdk.WbSdk;
-import com.sina.weibo.sdk.auth.AuthInfo;
-import com.sina.weibo.sdk.auth.Oauth2AccessToken;
-import com.sina.weibo.sdk.auth.WbAuthListener;
-import com.sina.weibo.sdk.auth.WbConnectErrorMessage;
-import com.sina.weibo.sdk.auth.sso.SsoHandler;
-import com.tencent.mm.opensdk.modelmsg.SendAuth;
-import com.tencent.mm.opensdk.openapi.IWXAPI;
-import com.tencent.mm.opensdk.openapi.WXAPIFactory;
-import com.tencent.tauth.IUiListener;
-import com.tencent.tauth.Tencent;
-import com.tencent.tauth.UiError;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.text.SimpleDateFormat;
-
-/**
- * Created by khy on 14/06/17.
- * <p>
- * 获取第三方登录数据
- */
-
-public class GetLoginDataUtils {
-
-    private static GetLoginDataUtils instance;
-
-    private Context mContext;
-    private OnLoginDataListener mLoginListener; //登录成功回调
-
-    private Tencent mTencent;
-    private IWXAPI mIWXAPI;
-    private SsoHandler mSsoHandler;
-
-    private Oauth2AccessToken mAccessToken; // weibo
-    public static final String SCOPE =
-            "email,direct_messages_read,direct_messages_write,"
-                    + "friendships_groups_read,friendships_groups_write,statuses_to_me_read,"
-                    + "follow_app_official_microblog," + "invitation_write"; // weiboCode
-
-    private GetLoginDataUtils(Context context) {
-        mContext = context;
-        mTencent = Tencent.createInstance(Config.TENCENT_APPID, mContext); //初始化QQ分享
-
-        mIWXAPI = WXAPIFactory.createWXAPI(mContext, Config.WECHAT_APPID, true); //初始化微信分享
-
-        WbSdk.install(context, new AuthInfo(mContext, Config.WEIBO_APPKEY, "http://www.sina.com", SCOPE));
-
-        Utils.log(GetLoginDataUtils.class.getSimpleName(), "initLogin");
-    }
-
-    public static GetLoginDataUtils getInstance(Context context) {
-        if (instance == null) {
-            instance = new GetLoginDataUtils(context.getApplicationContext());
-        }
-        return instance;
-    }
-
-    //QQ登录回调处理
-    public IUiListener QqLoginListener = new IUiListener() {
-        @Override
-        public void onComplete(Object o) {
-            Utils.log(GetLoginDataUtils.class.getSimpleName(), "QQ 登录成功");
-            if (o instanceof JSONObject) {
-                JSONObject jsonObject = (JSONObject) o;
-                String s = jsonObject.toString();
-                Utils.log(GetLoginDataUtils.class.getSimpleName(), "QQLoginComplete::" + s);
-                try {
-                    mTencent.setOpenId(jsonObject.getString("openid"));
-                    mTencent.setAccessToken(jsonObject.getString("access_token"), jsonObject.getString("expires_in"));
-
-                    JSONObject content = new JSONObject();
-                    content.put("openid", jsonObject.getString("openid"));
-                    content.put("access_token_expire", Utils.getTime(mContext) + jsonObject.getLong("expires_in"));
-                    content.put("access_token", jsonObject.getString("access_token"));
-                    if (mLoginListener != null) {
-                        mLoginListener.OnLoginData(content, LoginTag.qq);// QQ 登录回调
-                    }
-
-                } catch (JSONException e) {
-                    Utils.log(GetLoginDataUtils.class.getSimpleName(), "QQ登录数据回调异常：：" + e.toString());
-                    e.printStackTrace();
-                }
-
-            }
-
-//            QQToken qqToken = mTencent.getQQToken();
-//            UserInfo userInfo = new UserInfo(mContext, qqToken);
-//            userInfo.getUserInfo(new IUiListener() { // 获取QQ用户信息
-//                @Override
-//                public void onComplete(Object o) {
-//                    Utils.log(GetLoginDataUtils.class.getSimpleName(), "QQUserInfo::" + o.toString());
-//                }
-//
-//                @Override
-//                public void onError(UiError uiError) {
-//                    Utils.log(GetLoginDataUtils.class.getSimpleName(), "QQUserInfoUiError::" + uiError.errorDetail + "==" + uiError.errorMessage + "==" + uiError.errorCode);
-//                }
-//
-//                @Override
-//                public void onCancel() {
-//                    Utils.log(GetLoginDataUtils.class.getSimpleName(), "QQUserInfoonCancel");
-//                }
-//            });
-
-        }
-
-        @Override
-        public void onError(UiError uiError) {
-            Utils.toast(mContext, "登录失败");
-            Utils.log(GetLoginDataUtils.class.getSimpleName(), "QQ 登录失败");
-        }
-
-        @Override
-        public void onCancel() {
-            Utils.toast(mContext, "登录取消");
-            Utils.log(GetLoginDataUtils.class.getSimpleName(), "QQ 登录取消");
-        }
-    };
-
-    public void onQQCallback(int requestCode, int resultCode, Intent data) {
-        Tencent.onActivityResultData(requestCode, resultCode, data, QqLoginListener);
-    }
-
-    // QQ登录
-    public void QQLogin(OnLoginDataListener listener, Activity activity) {
-        mLoginListener = listener;
-        if (mTencent != null && !mTencent.isSessionValid()) {
-            Utils.log(GetLoginDataUtils.class.getSimpleName(), "QQLogin");
-            mTencent.login(activity, "all", QqLoginListener);
-        }
-    }
-
-    public void QQLogout() {
-        if (mTencent != null && mTencent.isSessionValid()) {
-            mTencent.logout(mContext);
-        }
-    }
-
-
-    // 微信登录
-    public void WCLogin(OnLoginDataListener listener) {
-        mLoginListener = listener;
-        if (mIWXAPI != null) {
-            boolean register = mIWXAPI.registerApp(Config.WECHAT_APPID);
-
-            SendAuth.Req req = new SendAuth.Req();
-            req.scope = "snsapi_userinfo";
-            req.state = mContext.getString(R.string.app_name);
-            boolean b = mIWXAPI.sendReq(req);
-            Utils.log(GetLoginDataUtils.class.getSimpleName(), "微信注册状态：：" + register + "\n 发送状态：：" + b);
-            if (!register || !b) {
-                Utils.toast(mContext, "请检查是否安装微信客户端");
-            }
-        }
-    }
-
-    public void WCLoginCallBack(JSONObject content) {
-        if (mLoginListener != null) {
-            mLoginListener.OnLoginData(content, LoginTag.wechat);
-        }
-    }
-
-    public void onWeiboCallback(int requestCode, int resultCode, Intent data) {
-        if (mSsoHandler != null) {
-            mSsoHandler.authorizeCallBack(requestCode, resultCode, data);
-        }
-    }
-    // 微博登录
-    public void WeiBoLogin(OnLoginDataListener listener, Activity context) {
-        mSsoHandler = new SsoHandler(context);
-        mLoginListener = listener;
-        mSsoHandler.authorizeClientSso(new SelfWbAuthListener());
-        // 第一次启动本应用，AccessToken 不可用
-        mAccessToken = AccessTokenKeeper.readAccessToken(mContext);
-
-//        if (mAccessToken.isSessionValid()) {
-//            updateTokenView(true);
-//        }
-    }
-
-    // 微博登录回调处理
-    private class SelfWbAuthListener implements WbAuthListener {
-
-        @Override
-        public void onSuccess(final Oauth2AccessToken token) {
-            RuntimeUtils.getInstance().runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    mAccessToken = token;
-                    if (mAccessToken.isSessionValid()) {
-                        // 显示 Token
-//                        updateTokenView(false);
-                        // 保存 Token 到 SharedPreferences
-                        AccessTokenKeeper.writeAccessToken(mContext, mAccessToken);
-                        Toast.makeText(mContext, "授权成功", Toast.LENGTH_SHORT).show();
-                    }
-                }
-            });
-
-            JSONObject content = new JSONObject();
-            try {
-                content.put("uid", token.getUid());
-                content.put("access_token", token.getToken());
-                content.put("access_token_expire", Utils.getTime(mContext) + token.getExpiresTime());
-                content.put("refresh_token", token.getRefreshToken());
-//                content.put("refresh_token_expire",  Utils.getTime(mContext) + 86400 * 30); //  refresh_token 有效期30天
-                if (mLoginListener != null) {
-                    mLoginListener.OnLoginData(content, LoginTag.weibo);// 微博 登录回调
-                }
-            } catch (JSONException e) {
-                e.printStackTrace();
-            }
-
-//            AppController.MAIN_EXECUTOR.execute(new Runnable() {
-//                @Override
-//                public void run() {
-//                    getWeiBoUserInfo(token.getToken(), token.getUid());
-//                }
-//            });
-        }
-
-        @Override
-        public void cancel() {
-            Utils.toast(mContext, "取消授权");
-        }
-
-        @Override
-        public void onFailure(WbConnectErrorMessage errorMessage) {
-            Utils.toast(mContext, "微博登录需要客户端支持，请先安装微博");
-        }
-    }
-
-    //微博 获取用户信息
-    private void getWeiBoUserInfo(String accessToken, String uid) {
-        String path = "https://api.weibo.com/2/users/show.json?access_token=" + accessToken + "&uid=" + uid;
-        Utils.log(GetLoginDataUtils.class.getSimpleName(), "getWeiBoUserInfo-url::" + path);
-
-        try {
-            URL url = new URL(path);
-            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-            conn.setConnectTimeout(5000);
-            conn.setRequestMethod("GET");
-            conn.setDoInput(true);
-            int code = conn.getResponseCode();
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            byte[] buffer = new byte[1024];
-            int len;
-            Utils.log(GetLoginDataUtils.class.getSimpleName(), "getWeiBoUserInfo-RequestCode::" + code);
-            if (code == 200) {
-                InputStream is = conn.getInputStream();
-                while ((len = is.read(buffer)) != -1) {
-                    baos.write(buffer, 0, len);
-                }
-                String str = new String(baos.toByteArray());
-                Utils.log(GetLoginDataUtils.class.getSimpleName(), "getWeiBoUserInfo-Body::" + str);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 微博显示当前 Token 信息。
-     *
-     * @param hasExisted 配置文件中是否已存在 token 信息并且合法
-     */
-    private void updateTokenView(boolean hasExisted) {
-        String date = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(
-                new java.util.Date(mAccessToken.getExpiresTime()));
-        String format = "Token：%1$s \\n有效期：%2$s";
-        String token = String.format(format, mAccessToken.getToken(), date);
-        Utils.log(GetLoginDataUtils.class.getSimpleName(), "::WB_TOKEN::" + token);
-        String message = String.format(format, mAccessToken.getToken(), date);
-        if (hasExisted) {
-            message = "Token 仍在有效期内，无需再次登录。" + "\n" + message;
-        }
-        Utils.log(GetLoginDataUtils.class.getSimpleName(), "::WB_MESSAGE::" + message);
-    }
-
-    // 登录成功回调
-    public interface OnLoginDataListener {
-        void OnLoginData(JSONObject content, LoginTag loginTag);
-    }
-
-}

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

@@ -0,0 +1,22 @@
+package com.gh.common.util
+
+import android.content.Context
+import com.lightgame.utils.Utils
+import com.zhihu.matisse.filter.ApplyFilter
+import com.zhihu.matisse.internal.entity.Item
+
+class GhMatisseVideoApplyFilter : ApplyFilter() {
+
+    override fun applyFiltering(context: Context, itemList: MutableList<Item>, callBack: OnApplyFilterCallBack) {
+        if (!NetworkUtils.isNetworkConnected(context)) {
+            Utils.toast(context, "网络异常，请检查手机网络状态")
+        } else if (!NetworkUtils.isWifiConnected(context)) {
+            DialogUtils.showAlertDialog(context, "提示",
+                    "您当前正在使用移动网络上传视频，确定继续上传吗？",
+                    "继续上传", "暂时不了",
+                    DialogUtils.ConfirmListener { callBack.onApply() }, null)
+        } else {
+            callBack.onApply()
+        }
+    }
+}

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

@@ -0,0 +1,27 @@
+package com.gh.common.util
+
+import android.content.Context
+import com.zhihu.matisse.MimeType
+import com.zhihu.matisse.filter.Filter
+import com.zhihu.matisse.internal.entity.IncapableCause
+import com.zhihu.matisse.internal.entity.Item
+
+class GhMatisseVideoFilter : Filter() {
+
+    override fun constraintTypes(): MutableSet<MimeType> {
+        return MimeType.ofVideo()
+    }
+
+    override fun filter(context: Context, item: Item): IncapableCause? {
+        if (!needFiltering(context, item)) return null
+        if (item.mimeType != MimeType.MP4.toString()) {
+            return IncapableCause(IncapableCause.TOAST, "请把视频格式转换为MP4后再上传")
+        }
+
+        if (item.size > 500 * 1024 * 1024) {
+            return IncapableCause(IncapableCause.TOAST, "视频大小限制为500M")
+        }
+        return null
+    }
+
+}

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

@@ -1,6 +1,8 @@
 package com.gh.common.util
 
 import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import org.json.JSONArray
 
 
 /**
@@ -14,11 +16,11 @@ object GsonUtils {
         return gson.fromJson(json, t)
     }
 
-//    @JvmStatic
-//    fun <T> fromJsonList(json: String): List<T> {
-//        val type = object : TypeToken<List<T>>() {}.type
-//        return gson.fromJson(json, type)
-//    }
+    @JvmStatic
+    fun <T> fromJsonList(json: JSONArray): List<T> {
+        val type = object : TypeToken<List<T>>() {}.type
+        return gson.fromJson(json.toString(), type)
+    }
 
     @JvmStatic
     fun toJson(any: Any?): String {

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

@@ -0,0 +1,38 @@
+package com.gh.common.util
+
+import com.gh.gamecenter.entity.Display
+import com.gh.gamecenter.entity.SubjectRecommendEntity
+import com.halo.assistant.HaloApp
+
+object HomeBottomBarHelper {
+    private const val GAME_BAR_KEY = "game_bar_key"
+
+    @JvmStatic
+    fun getDefaultGameBarData(): SubjectRecommendEntity {
+        try {
+            val json = SPUtils.getString(GAME_BAR_KEY)
+            if (json.isNotEmpty()) {
+                return GsonUtils.fromJson(json, SubjectRecommendEntity::class.java)
+            }
+        } catch (ignore: Exception) {
+
+        }
+        val animationCode = HaloApp.getInstance().application.assets
+                .open("lottie/tab_game.json")
+                .bufferedReader().use { it.readText() }
+        return SubjectRecommendEntity(link = "5de21b5d75e6fa054f784882",
+                type = "block",
+                text = "游戏库",
+                name = "游戏库",
+                iconSelect = "https://resource.ghzs.com/image/game/library/entrance/5e183202913fbd002c75f247.png",
+                iconUnselect = "https://resource.ghzs.com/image/game/library/entrance/5e1831fd913fbd003024641e.png",
+                animationCode = animationCode,
+                default = false,
+                display = Display())
+    }
+
+    @JvmStatic
+    fun updateDefaultGameBarData(data: SubjectRecommendEntity) {
+        SPUtils.setString(GAME_BAR_KEY, data.toJson())
+    }
+}

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

@@ -259,7 +259,8 @@ object ImageUtils {
     }
 
     // Wifi/4G:x2 traffic:x1
-    private fun getTransformLimitUrl(url: String?, width: Int?, context: Context?): String? {
+    @JvmStatic
+    fun getTransformLimitUrl(url: String?, width: Int?, context: Context?): String? {
         var transformUrl: String? = url
         if (width != null && width > 0) {
             val transformUrlX2 = addLimitWidth(url, width * 2)

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

@@ -6,30 +6,103 @@ import android.os.Build;
 import android.provider.Settings;
 import android.text.TextUtils;
 
+import com.gh.common.exposure.ExposureEvent;
+import com.gh.common.exposure.ExposureSource;
+import com.gh.common.exposure.meta.Meta;
+import com.gh.common.exposure.meta.MetaUtil;
+import com.gh.common.loghub.LoghubUtils;
+import com.gh.download.DownloadDataHelper;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.entity.CommunityEntity;
+import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.entity.SpecialColumn;
 import com.gh.gamecenter.manager.UserManager;
 import com.gh.gamecenter.qa.entity.Questions;
-import com.gh.loghub.LogHubUtils;
 import com.halo.assistant.HaloApp;
+import com.lightgame.download.DownloadEntity;
 import com.lightgame.utils.Util_System_Phone_State;
 import com.lightgame.utils.Utils;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.annotation.Nullable;
+
 /**
  * Created by khy on 2/01/18.
  */
 public class LogUtils {
 
-    public static void uploadCommunityArticle(String tracers,
-                                              String articleId,
-                                              String articleTitle,
-                                              int readTime,
-                                              CommunityEntity community,
-                                              SpecialColumn specialColumn) {
+    public static void logVideoStreamingUpload(String action, String entrance, String entranceDetail, String videoId) {
+        JSONObject object = new JSONObject();
+        JSONObject payloadObject = new JSONObject();
+
+        try {
+            object.put("event", "UPLOAD_VIDEO_STEAMING");
+            object.put("action", action);
+            payloadObject.put("entrance", entrance);
+            payloadObject.put("entrance_detail", entranceDetail);
+            payloadObject.put("video_id", videoId);
+            object.put("payload", payloadObject);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        uploadVideoStreaming(object);
+    }
+
+    public static void uploadDownloadEvent(DownloadEntity downloadEntity) {
+        Context context = HaloApp.getInstance().getApplication();
+        Meta meta = MetaUtil.INSTANCE.getMeta();
+        JSONObject object = new JSONObject();
+
+        try {
+            object.put("event", DownloadDataHelper.getDownloadStatusAlias(downloadEntity));
+            object.put("msg", downloadEntity.getError());
+            object.put("status", downloadEntity.getStatus().getStatus());
+
+            // payload
+            JSONObject payloadObject = new JSONObject();
+            payloadObject.put("game_id", downloadEntity.getGameId());
+            payloadObject.put("gameName", downloadEntity.getName());
+            payloadObject.put("platform", downloadEntity.getPlatform());
+            payloadObject.put("package", downloadEntity.getPackageName());
+            payloadObject.put("filename", downloadEntity.getPath().substring(downloadEntity.getPath().lastIndexOf("/") + 1));
+            payloadObject.put("total_size", (downloadEntity.getSize() / 1024 / 1024));
+            payloadObject.put("completed_size", (downloadEntity.getProgress() / 1024 / 1024));
+
+            object.put("payload", payloadObject);
+
+            // meta
+            JSONObject metaObject = new JSONObject();
+            metaObject.put("android_id", meta.getAndroid_id());
+            metaObject.put("android_sdk", meta.getAndroid_sdk());
+            metaObject.put("android_version", meta.getAndroid_version());
+            metaObject.put("appVersion", meta.getAppVersion());
+            metaObject.put("channel", meta.getChannel());
+            metaObject.put("gid", meta.getGid());
+            metaObject.put("imei", meta.getImei());
+            metaObject.put("mac", meta.getMac());
+            metaObject.put("manufacturer", meta.getManufacturer());
+            metaObject.put("model", meta.getModel());
+            metaObject.put("network", DeviceUtils.getNetwork(context));
+            metaObject.put("os", meta.getOs());
+            metaObject.put("userId", meta.getUserId());
+
+            object.put("meta", metaObject);
+            object.put("timestamp", System.currentTimeMillis() / 1000);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (BuildConfig.DEBUG) {
+            Utils.log("LogUtils->" + object.toString());
+        }
+        LoghubUtils.log(object, "download_debug", false);
+    }
+
+    public static void uploadCommunityArticle(String tracers, String articleId, String articleTitle, int readTime, CommunityEntity community, SpecialColumn specialColumn) {
         JSONObject object = new JSONObject();
         try {
             object.put("subject", "community_article");
@@ -54,7 +127,7 @@ public class LogUtils {
             e.printStackTrace();
         }
 
-        upload(object);
+        uploadToCommunity(object);
     }
 
     public static void uploadDevice(LunchType launchType) {
@@ -69,16 +142,10 @@ public class LogUtils {
             e.printStackTrace();
         }
 
-        upload(object);
+        uploadToCommunity(object, true);
     }
 
-    public static void uploadAnswerReadTime(String tracers,
-                                            int readTime,
-                                            String answerId,
-                                            Questions questions,
-                                            String communityId,
-                                            String CommunityName,
-                                            SpecialColumn specialColumn) {
+    public static void uploadAnswerReadTime(String tracers, int readTime, String answerId, Questions questions, String communityId, String CommunityName, SpecialColumn specialColumn) {
         JSONObject object = new JSONObject();
         try {
             object.put("subject", "answer");
@@ -104,15 +171,10 @@ public class LogUtils {
             e.printStackTrace();
         }
 
-        upload(object);
+        uploadToCommunity(object);
     }
 
-    public static void uploadQuestionReadTime(String tracers,
-                                              int readTime,
-                                              Questions questions,
-                                              String communityId,
-                                              String communityName,
-                                              SpecialColumn specialColumn) {
+    public static void uploadQuestionReadTime(String tracers, int readTime, Questions questions, String communityId, String communityName, SpecialColumn specialColumn) {
         JSONObject object = new JSONObject();
         try {
             object.put("subject", "question");
@@ -137,7 +199,7 @@ public class LogUtils {
             e.printStackTrace();
         }
 
-        upload(object);
+        uploadToCommunity(object);
     }
 
     public static void uploadSearch(String searchKey) {
@@ -153,10 +215,9 @@ public class LogUtils {
             e.printStackTrace();
         }
 
-        upload(object);
+        uploadToCommunity(object);
     }
 
-
     public static void communityRefresh(int dataCount, boolean manualRefresh) {
         JSONObject object = new JSONObject();
         try {
@@ -169,7 +230,7 @@ public class LogUtils {
             e.printStackTrace();
         }
 
-        upload(object);
+        uploadToCommunity(object);
     }
 
     public static void login(String loginStep, String loginType, String entrance) {
@@ -183,10 +244,51 @@ public class LogUtils {
             e.printStackTrace();
         }
 
-        upload(object);
+        uploadToCommunity(object, true);
     }
 
-    private static void upload(JSONObject object) {
+    public static void qaAccess(String access, CommunityEntity communityEntity) {
+        JSONObject object = new JSONObject();
+        try {
+            object.put("subject", "qa_access");
+            object.put("access", access);
+            object.put("community_id", communityEntity.getId());
+            object.put("community_name", communityEntity.getName());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        uploadToCommunity(object);
+    }
+
+    public static void logReservation(GameEntity gameEntity, @Nullable ExposureEvent event) {
+        JSONObject object = new JSONObject();
+        List<ExposureSource> exposureSourceList;
+
+        if (event == null) {
+            exposureSourceList = new ArrayList<>();
+            exposureSourceList.add(new ExposureSource("其它", ""));
+        } else {
+            exposureSourceList = event.getSource();
+        }
+
+        try {
+            object.put("source", GsonUtils.toJson(exposureSourceList));
+            object.put("game_name", gameEntity.getName());
+            object.put("game_id", gameEntity.getId());
+            object.put("game_platform", gameEntity.getPlatform());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        uploadToReservation(object);
+    }
+    
+    private static void uploadToCommunity(JSONObject object) {
+        uploadToCommunity(object, false);
+    }
+
+    private static void uploadToCommunity(JSONObject object, boolean forcedUpload) {
         if (BuildConfig.DEBUG) {
             Utils.log("LogUtils->" + object.toString());
         }
@@ -201,13 +303,120 @@ public class LogUtils {
             object.put("user_id", UserManager.getInstance().getUserId());
             object.put("device_system", android.os.Build.VERSION.RELEASE);
             object.put("device_model", android.os.Build.MODEL);
-            object.put("imei", Util_System_Phone_State.getImei(HaloApp.getInstance().getApplication()));
+            object.put("imei", Util_System_Phone_State.getImei(HaloApp.getInstance()
+                    .getApplication()));
             object.put("G_ID", UserManager.getInstance().getDeviceId());
         } catch (JSONException e) {
             e.printStackTrace();
         }
 
         // 暂时除了曝光外的数据都是扔到 community 这个库的，要是不是这个这个库的话这里要改一下
-        LogHubUtils.uploadLog(DeviceUtils.getIPAddress(context), object, "community");
+        LoghubUtils.log(object, "community", forcedUpload);
+    }
+
+    /**
+     * 上传数据到“预约”的 logStore
+     */
+    private static void uploadToReservation(JSONObject object) {
+        Context context = HaloApp.getInstance().getApplication();
+        try {
+            object.put("version", PackageUtils.getVersionName());
+            object.put("channel", HaloApp.getInstance().getChannel());
+            object.put("android_id", Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID));
+            object.put("time", Utils.getTime(context));
+            object.put("network", DeviceUtils.getNetwork(context));
+            object.put("user_id", UserManager.getInstance().getUserId());
+            object.put("device_system", android.os.Build.VERSION.RELEASE);
+            object.put("device_model", android.os.Build.MODEL);
+            object.put("imei", Util_System_Phone_State.getImei(HaloApp.getInstance()
+                    .getApplication()));
+            object.put("G_ID", UserManager.getInstance().getDeviceId());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        LoghubUtils.log(object, "appointment", false);
+    }
+
+    private static void uploadVideoStreaming(JSONObject object) {
+        Meta meta = MetaUtil.INSTANCE.getMeta();
+        JSONObject metaObject = new JSONObject();
+        try {
+            metaObject.put("android_id", meta.getAndroid_id());
+            metaObject.put("android_sdk", meta.getAndroid_sdk());
+            metaObject.put("android_version", meta.getAndroid_version());
+            metaObject.put("appVersion", meta.getAppVersion());
+            metaObject.put("channel", meta.getChannel());
+            metaObject.put("gid", meta.getGid());
+            metaObject.put("imei", meta.getImei());
+            metaObject.put("mac", meta.getMac());
+            metaObject.put("manufacturer", meta.getManufacturer());
+            metaObject.put("model", meta.getModel());
+            metaObject.put("network", meta.getNetwork());
+            metaObject.put("os", meta.getOs());
+            metaObject.put("userId", meta.getUserId());
+
+            object.put("meta", metaObject);
+            object.put("timestamp", System.currentTimeMillis() / 1000);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        if (BuildConfig.DEBUG) {
+            Utils.log("LogUtils->" + object.toString());
+        }
+
+        LoghubUtils.log(object, "video_streaming", false);
+    }
+
+    public static void uploadVideoStreamingEnter(String entrance, String entranceDetail, String videoId, String streamingId) {
+        JSONObject object = new JSONObject();
+        JSONObject payloadObject = new JSONObject();
+
+        try {
+            object.put("event", "ENTERING_VIDEO_STEAMING");
+            payloadObject.put("entrance", entrance);
+            if (!TextUtils.isEmpty(entranceDetail)) {
+                payloadObject.put("entrance_detail", entranceDetail);
+            }
+            payloadObject.put("video_id", videoId);
+            payloadObject.put("streaming_id", streamingId);
+            object.put("payload", payloadObject);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        uploadVideoStreaming(object);
+    }
+
+    public static void uploadVideoStreamingPlaying(String action, String msg, String entrance, String entranceDetail, String videoId, String streamingId, double videoSize, int videoTotalTime, int progress, String videoPlayStatus) {
+        JSONObject object = new JSONObject();
+        JSONObject payloadObject = new JSONObject();
+
+        try {
+            object.put("event", "VIDEO_PLAYING");
+            object.put("action", action);
+            if (!TextUtils.isEmpty(msg)) {
+                object.put("msg", msg);
+            }
+
+            payloadObject.put("entrance", entrance);
+            if (!TextUtils.isEmpty(entranceDetail)) {
+                payloadObject.put("entrance_detail", entranceDetail);
+            }
+            payloadObject.put("video_id", videoId);
+            payloadObject.put("streaming_id", streamingId);
+            if (videoSize > 0) {
+                payloadObject.put("video_size", videoSize);
+            }
+            if (videoTotalTime > 0) {
+                payloadObject.put("video_total_time", videoTotalTime);
+            }
+            payloadObject.put("progress", progress);
+            payloadObject.put("video_play_status", videoPlayStatus);
+
+            object.put("payload", payloadObject);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        uploadVideoStreaming(object);
     }
 }

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

@@ -0,0 +1,196 @@
+package com.gh.common.util
+
+import android.app.Activity
+import android.content.Intent
+import android.widget.Toast
+import com.gh.common.constant.Config
+import com.gh.gamecenter.R
+import com.gh.gamecenter.user.LoginTag
+import com.halo.assistant.HaloApp
+import com.lightgame.utils.RuntimeUtils
+import com.lightgame.utils.Utils
+import com.sina.weibo.sdk.WbSdk
+import com.sina.weibo.sdk.auth.AuthInfo
+import com.sina.weibo.sdk.auth.Oauth2AccessToken
+import com.sina.weibo.sdk.auth.WbAuthListener
+import com.sina.weibo.sdk.auth.WbConnectErrorMessage
+import com.sina.weibo.sdk.auth.sso.SsoHandler
+import com.tencent.mm.opensdk.modelmsg.SendAuth
+import com.tencent.mm.opensdk.openapi.IWXAPI
+import com.tencent.mm.opensdk.openapi.WXAPIFactory
+import com.tencent.tauth.IUiListener
+import com.tencent.tauth.Tencent
+import com.tencent.tauth.UiError
+import org.json.JSONException
+import org.json.JSONObject
+
+
+/**
+ * 第三方登录辅助类
+ */
+object LoginHelper {
+
+    const val WEIBO_SCOPE = (
+            "email,direct_messages_read,direct_messages_write,"
+                    + "friendships_groups_read,friendships_groups_write,statuses_to_me_read,"
+                    + "follow_app_official_microblog," + "invitation_write") // weiboCode
+
+    private var mTencent: Tencent // QQ
+    private var mIWXAPI: IWXAPI // 微信
+    private var mSsoHandler: SsoHandler? = null // 微博 // TODO 完成回调时清掉这个 handler ？
+
+    private var mQqLoginListener: IUiListener
+
+    private var mAccessToken: Oauth2AccessToken? = null // weibo
+    private var mLoginCallback: LoginCallback? = null
+
+    init {
+        val context = HaloApp.getInstance().application.applicationContext
+        mTencent = Tencent.createInstance(Config.TENCENT_APPID, context) //初始化QQ分享
+        mIWXAPI = WXAPIFactory.createWXAPI(context, Config.WECHAT_APPID, true) //初始化微信分享
+
+        mQqLoginListener = object : IUiListener {
+            override fun onComplete(o: Any?) {
+                Utils.log("QQ 登录成功")
+                if (o is JSONObject) {
+                    val s = o.toString()
+                    Utils.log("QQLoginComplete::$s")
+                    try {
+                        mTencent.openId = o.getString("openid")
+                        mTencent.setAccessToken(o.getString("access_token"), o.getString("expires_in"))
+
+                        val content = JSONObject()
+                        content.put("openid", o.getString("openid"))
+                        content.put("access_token_expire", Utils.getTime(context) + o.getLong("expires_in"))
+                        content.put("access_token", o.getString("access_token"))
+
+                        mLoginCallback?.onLoginSuccess(LoginTag.qq, content) // 回调QQ登录成功
+                    } catch (e: JSONException) {
+                        val errorString = "QQ登录数据回调异常：：$e"
+
+                        mLoginCallback?.onLoginFailure(LoginTag.qq, errorString) // 回调QQ登录失败
+
+                        Utils.log(errorString)
+                        e.printStackTrace()
+                    }
+                }
+            }
+
+            override fun onCancel() {
+                mLoginCallback?.onLoginFailure(LoginTag.qq,"登录取消")
+                Utils.log("QQ 登录取消")
+            }
+
+            override fun onError(p0: UiError?) {
+                mLoginCallback?.onLoginFailure(LoginTag.qq,"登录失败")
+                Utils.log("QQ 登录失败")
+            }
+        }
+
+        WbSdk.install(context, AuthInfo(context, Config.WEIBO_APPKEY, "http://www.sina.com", WEIBO_SCOPE))
+
+        Utils.log("LoginHelper initialization")
+    }
+
+    @JvmStatic
+    fun onQQLoginCallback(requestCode: Int, resultCode: Int, data: Intent?) {
+        Tencent.onActivityResultData(requestCode, resultCode, data, mQqLoginListener);
+    }
+
+    @JvmStatic
+    fun onWechatLoginSuccess(content: JSONObject) {
+        mLoginCallback?.onLoginSuccess(LoginTag.wechat, content)
+    }
+
+    @JvmStatic
+    fun onWechatLoginFailure(error: String) {
+        mLoginCallback?.onLoginFailure(LoginTag.wechat, error)
+    }
+
+    @JvmStatic
+    fun onWeiboLoginCallback(requestCode: Int, resultCode: Int, data: Intent?) {
+        mSsoHandler?.authorizeCallBack(requestCode, resultCode, data)
+    }
+
+    // QQ登录
+    @JvmStatic
+    fun loginWithQQ(loginCallback: LoginCallback, activity: Activity) {
+        mLoginCallback = loginCallback
+        if (!mTencent.isSessionValid) {
+            Utils.log("QQLogin")
+            mTencent.login(activity, "all", mQqLoginListener)
+        }
+    }
+
+    @JvmStatic
+    fun logoutWithQQ() {
+        if (mTencent.isSessionValid) {
+            mTencent.logout(HaloApp.getInstance().application.applicationContext)
+        }
+    }
+
+    // 微信登录
+    @JvmStatic
+    fun loginWithWechat(loginCallback: LoginCallback) {
+        mLoginCallback = loginCallback
+        val register = mIWXAPI.registerApp(Config.WECHAT_APPID)
+
+        val req = SendAuth.Req()
+        req.scope = "snsapi_userinfo"
+        req.state = HaloApp.getInstance().application.getString(R.string.app_name)
+        val b = mIWXAPI.sendReq(req)
+        Utils.log("微信注册状态：：$register\n 发送状态：：$b")
+        if (!register || !b) {
+            loginCallback.onLoginFailure(LoginTag.wechat, "请检查是否安装微信客户端")
+            Utils.toast(HaloApp.getInstance().application, "请检查是否安装微信客户端")
+        }
+    }
+
+    // 微博登录
+    @JvmStatic
+    fun loginWithWeibo(loginCallback: LoginCallback, context: Activity) {
+        mLoginCallback = loginCallback
+        mSsoHandler = SsoHandler(context)
+        mSsoHandler?.authorizeClientSso(object : WbAuthListener {
+            override fun onSuccess(token: Oauth2AccessToken?) {
+                token?.let {
+                    RuntimeUtils.getInstance().runOnUiThread {
+                        mAccessToken = token
+                        if (mAccessToken?.isSessionValid == true) {
+                            // 保存 Token 到 SharedPreferences
+                            AccessTokenKeeper.writeAccessToken(context, mAccessToken)
+                            Toast.makeText(context, "授权成功", Toast.LENGTH_SHORT).show()
+                        }
+                    }
+
+                    val content = JSONObject()
+                    tryWithDefaultCatch {
+                        content.put("uid", token.uid)
+                        content.put("access_token", token.token)
+                        content.put("access_token_expire", Utils.getTime(context) + token.expiresTime)
+                        content.put("refresh_token", token.refreshToken)
+                        // content.put("refresh_token_expire",  Utils.getTime(mContext) + 86400 * 30); //  refresh_token 有效期30天
+                        mLoginCallback?.onLoginSuccess(LoginTag.weibo, content)// 微博 登录回调
+                    }
+                }
+            }
+
+            override fun onFailure(p0: WbConnectErrorMessage?) {
+                mLoginCallback?.onLoginFailure(LoginTag.weibo, "微博登录需要客户端支持，请先安装微博")
+            }
+
+            override fun cancel() {
+                mLoginCallback?.onLoginFailure(LoginTag.weibo, "取消授权")
+            }
+        })
+        // 第一次启动本应用，AccessToken 不可用
+        mAccessToken = AccessTokenKeeper.readAccessToken(context)
+    }
+
+    interface LoginCallback {
+        fun onLoginSuccess(loginType: LoginTag, jsonContent: JSONObject)
+
+        fun onLoginFailure(loginType: LoginTag, error: String)
+    }
+
+}

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

@@ -264,6 +264,12 @@ public class LoginUtils {
             case 400212:
                 Utils.toast(context, "请输入正确的手机号");
                 break;
+            case 400010:
+                Utils.toast(context, "身份证无效，请重新输入");
+                break;
+            case 400011:
+                Utils.toast(context, "请输入正确的身份信息");
+                break;
             default:
                 Utils.toast(context, code + "");
                 break;

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

@@ -16,8 +16,10 @@ object MtaHelper {
         val prop = Properties()
 
         if (kv.size == 1) {
-            prop.setProperty(kv[0], "")
+            prop.setProperty(kv[0], kv[0])
             StatService.trackCustomKVEvent(HaloApp.getInstance().application, eventId, prop)
+            Utils.log("MTA","$eventId + [${kv.joinToString(" , ")}]")
+            return
         }
 
         for (i in kv.indices) {
@@ -47,6 +49,10 @@ object MtaHelper {
             }
         }
 
+        if (prop.size == 0 && kv.size == 1) {
+            prop.setProperty(kv[0], kv[0])
+        }
+
         if (prop.size == 0) return
         Utils.log("MTA","$eventId + [${kv.joinToString(" , ")}] + last $time seconds")
         StatService.trackCustomKVTimeIntervalEvent(HaloApp.getInstance().application, time, eventId, prop)

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

@@ -67,12 +67,9 @@ public class NetworkUtils {
      */
     public static boolean isMobileConnected(Context context) {
         if (context != null) {
-            ConnectivityManager mConnectivityManager = (ConnectivityManager) context
-                    .getSystemService(Context.CONNECTIVITY_SERVICE);
-            NetworkInfo mMobileNetworkInfo = mConnectivityManager
-                    .getNetworkInfo(ConnectivityManager.TYPE_MOBILE);
-            if (mMobileNetworkInfo != null) {
-                return mMobileNetworkInfo.isAvailable();
+            if (isNetworkConnected(context)) {
+                String network = DeviceUtils.getNetwork(context);
+                return !"WIFI".equals(network);
             }
         }
         return false;
@@ -127,41 +124,31 @@ public class NetworkUtils {
      * @return 当前移动网络连接的类型信息
      */
     public static String getMobileNetworkType(Context context) {
-        TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-        ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        NetworkInfo info = connectivityManager.getActiveNetworkInfo();
-
-        if (info == null) return "unknown";
-
-        switch (info.getType()) {
-            // Unknown
-            case TelephonyManager.NETWORK_TYPE_UNKNOWN:
-                return "unknown";
-            // Cellular Data–2G
-            case TelephonyManager.NETWORK_TYPE_EDGE:
+        TelephonyManager mTelephonyManager = (TelephonyManager)
+                context.getSystemService(Context.TELEPHONY_SERVICE);
+        int networkType = mTelephonyManager.getNetworkType();
+        switch (networkType) {
             case TelephonyManager.NETWORK_TYPE_GPRS:
+            case TelephonyManager.NETWORK_TYPE_EDGE:
             case TelephonyManager.NETWORK_TYPE_CDMA:
-            case TelephonyManager.NETWORK_TYPE_IDEN:
             case TelephonyManager.NETWORK_TYPE_1xRTT:
+            case TelephonyManager.NETWORK_TYPE_IDEN:
                 return "2G";
-            // Cellular Data–3G
             case TelephonyManager.NETWORK_TYPE_UMTS:
-            case TelephonyManager.NETWORK_TYPE_HSDPA:
-            case TelephonyManager.NETWORK_TYPE_HSPA:
-            case TelephonyManager.NETWORK_TYPE_HSPAP:
-            case TelephonyManager.NETWORK_TYPE_HSUPA:
             case TelephonyManager.NETWORK_TYPE_EVDO_0:
             case TelephonyManager.NETWORK_TYPE_EVDO_A:
+            case TelephonyManager.NETWORK_TYPE_HSDPA:
+            case TelephonyManager.NETWORK_TYPE_HSUPA:
+            case TelephonyManager.NETWORK_TYPE_HSPA:
             case TelephonyManager.NETWORK_TYPE_EVDO_B:
+            case TelephonyManager.NETWORK_TYPE_EHRPD:
+            case TelephonyManager.NETWORK_TYPE_HSPAP:
                 return "3G";
-            // Cellular Data–4G
             case TelephonyManager.NETWORK_TYPE_LTE:
                 return "4G";
-
             default:
                 return "unknown";
         }
-
     }
 
 }

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

@@ -0,0 +1,129 @@
+package com.gh.common.util
+
+import android.annotation.SuppressLint
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.NotificationManagerCompat
+import com.gh.common.constant.Constants
+import com.gh.common.dialog.NotificationHintDialogFragment
+import com.gh.gamecenter.entity.NotificationHint
+import com.gh.gamecenter.entity.NotificationUgc
+import com.gh.gamecenter.retrofit.BiResponse
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.halo.assistant.HaloApp
+import com.lightgame.utils.AppManager
+import com.lightgame.utils.Utils
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+
+object NotificationHelper {
+
+    @JvmStatic
+    fun showNotificationHintDialog(ugc: NotificationUgc) {
+        val showedNewVersion = SPUtils.getInt(Constants.SP_SHOWED_NOTIFICATION_NEW_VERSION, 0)
+        val currentVersion = PackageUtils.getVersionCode()
+        // 版本升级后重置数据
+        if (currentVersion > showedNewVersion) {
+            SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_LOGIN, false)
+            SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_QUESTION, false)
+            SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_ANSWER, false)
+            SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_ARTICLE, false)
+            SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_VIDEO, false)
+            SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_RATING, false)
+            SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, "")
+
+            SPUtils.setInt(Constants.SP_SHOWED_NOTIFICATION_NEW_VERSION, currentVersion)
+        }
+
+
+        val isShowedToday = SPUtils.getString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, "")
+        // 每天最多只需提示一次
+        if (isShowedToday == TimeUtils.getToday()) return
+
+        val isShowedLogin = SPUtils.getBoolean(Constants.SP_SHOWED_NOTIFICATION_LOGIN, false)
+        val isShowedQuestion = SPUtils.getBoolean(Constants.SP_SHOWED_NOTIFICATION_QUESTION, false)
+        val isShowedAnswer = SPUtils.getBoolean(Constants.SP_SHOWED_NOTIFICATION_ANSWER, false)
+        val isShowedArticle = SPUtils.getBoolean(Constants.SP_SHOWED_NOTIFICATION_ARTICLE, false)
+        val isShowedVideo = SPUtils.getBoolean(Constants.SP_SHOWED_NOTIFICATION_VIDEO, false)
+        val isShowedRating = SPUtils.getBoolean(Constants.SP_SHOWED_NOTIFICATION_RATING, false)
+
+        if (isShowedLogin && isShowedQuestion && isShowedAnswer && isShowedArticle && isShowedVideo && isShowedRating) return
+
+        when (ugc) {
+            NotificationUgc.LOGIN -> {
+                if (!isShowedLogin) {
+                    show(AppManager.getInstance().currentActivity() as AppCompatActivity)
+                    SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_LOGIN, true)
+                    // 设置今天的时间，表示今天已经触发过了
+                    SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday())
+                }
+            }
+            NotificationUgc.QUESTION -> {
+                if (!isShowedQuestion) {
+                    show(AppManager.getInstance().currentActivity() as AppCompatActivity)
+                    SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_QUESTION, true)
+                    SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday())
+                }
+            }
+            NotificationUgc.ANSWER -> {
+                if (!isShowedAnswer) {
+                    show(AppManager.getInstance().currentActivity() as AppCompatActivity)
+                    SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_ANSWER, true)
+                    SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday())
+                }
+            }
+            NotificationUgc.ARTICLE -> {
+                if (!isShowedArticle) {
+                    show(AppManager.getInstance().currentActivity() as AppCompatActivity)
+                    SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_ARTICLE, true)
+                    SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday())
+                }
+            }
+            NotificationUgc.VIDEO -> {
+                if (!isShowedVideo) {
+                    show(AppManager.getInstance().currentActivity() as AppCompatActivity)
+                    SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_VIDEO, true)
+                    SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday())
+                }
+            }
+            NotificationUgc.RATING -> {
+                if (!isShowedRating) {
+                    show(AppManager.getInstance().currentActivity() as AppCompatActivity)
+                    SPUtils.setBoolean(Constants.SP_SHOWED_NOTIFICATION_RATING, true)
+                    SPUtils.setString(Constants.SP_IS_SHOWED_NOTIFICATION_TODAY, TimeUtils.getToday())
+                }
+            }
+        }
+    }
+
+    @SuppressLint("CheckResult")
+    private fun show(activity: AppCompatActivity?) {
+        if (activity == null) return
+        RetrofitManager.getInstance(activity).api.bootPopup
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(object : BiResponse<NotificationHint>() {
+                    override fun onSuccess(data: NotificationHint) {
+                        try {
+                            showEnableNotificationDialogIfItsDisabled(activity, data)
+                        } catch (ignore: Exception) {
+                        }
+                    }
+                })
+    }
+
+    @JvmStatic
+    fun showEnableNotificationDialogIfItsDisabled(activity: AppCompatActivity, notificationHint: NotificationHint) {
+        if (notificationIsEnable()) {
+            Utils.log("notification is enable")
+        } else {
+            NotificationHintDialogFragment.getInstance(notificationHint).show(activity.supportFragmentManager, "notification")
+        }
+    }
+
+    @JvmStatic
+    fun notificationIsEnable(): Boolean {
+        val manager = NotificationManagerCompat.from(HaloApp.getInstance().application)
+        return manager.areNotificationsEnabled()
+    }
+
+}

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

@@ -7,13 +7,22 @@ object NumberUtils {
     @JvmStatic
     fun transSimpleCount(count: Int): String {
         val s: String
-        s = if (count > 100000) {
+        s = if (count > 10000) {
             val number = count / 10000f
-            val fmt = DecimalFormat("#")
+            val fmt = DecimalFormat("#.0")
             fmt.format(number) + "万"
         } else {
             count.toString()
         }
         return s
     }
+
+    @JvmStatic
+    fun transSimpleUsageTime(second: Long): String {
+        val totalMinute = second / 60
+        if (totalMinute < 60) return ((if (totalMinute == 0L) 1 else totalMinute).toString() + "分钟")
+        val hour = Math.round((totalMinute / 60).toFloat())
+        val minute = Math.round((totalMinute - hour * 60).toFloat())
+        return hour.toString() + "小时" + if (minute == 0) "" else minute.toString() + "分钟"
+    }
 }

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

@@ -13,14 +13,14 @@ import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 
-import androidx.core.content.FileProvider;
-
 import com.g00fy2.versioncompare.Version;
+import com.gh.common.constant.Constants;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.entity.GameUpdateEntity;
 import com.halo.assistant.HaloApp;
+import com.lightgame.download.DownloadEntity;
 import com.lightgame.utils.Utils;
 
 import org.json.JSONArray;
@@ -35,6 +35,8 @@ import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.core.content.FileProvider;
+
 public class PackageUtils {
 
     public static final String publicKey = "OpenSSLRSAPublicKey{modulus=a8c4bb5748fec8d5c35db1a7a182d41ba4721a91131a417330af79ef4ddb43f9fa0ff4907b0a613bfe152de0ed8fc1b2e6f94a908aa98a5f7adc1ce814ba7ec919d75d9910bdfd8649b4789da6a90ffb61f0d23ac4f828a78fcd0d6f6120c1c43c1f87f7498a89eb40ca8e32dfc2f9d5c10d612b95192870223674e241e53305abf320d7eed76ded398778576e4db7b17b3bc6a792f13de5e43a6a5fae4276c73e6990ce97f68dff0ec16fc9594f175c8d49cd0d7877340d9de60942ca0efc737e50b6c295dfe0713e4532b4e810e1ea11b702b4a27753e41559cbceb247e7f044ec4e3ab2e8bccd8b9fd71286e63307550bcde86deee95adb8133076269135b,publicExponent=10001}";
@@ -72,6 +74,8 @@ public class PackageUtils {
                     updateEntity.setBrief(gameEntity.getBrief());
                     updateEntity.setTag(gameEntity.getTag());
                     updateEntity.setTagStyle(gameEntity.getTagStyle());
+                    updateEntity.setDownload(gameEntity.getDownload());
+                    updateEntity.setIndexPlugin(gameEntity.getIndexPlugin());
                     updateList.add(updateEntity);
                 }
             }
@@ -107,6 +111,7 @@ public class PackageUtils {
                         updateEntity.setBrief(gameEntity.getBrief());
                         updateEntity.setTag(gameEntity.getTag());
                         updateEntity.setTagStyle(gameEntity.getTagStyle());
+                        updateEntity.setIndexPlugin(gameEntity.getIndexPlugin());
                         updateList.add(updateEntity);
                     }
                 }
@@ -187,11 +192,18 @@ public class PackageUtils {
         }
         return ret;
     }
-
+    
     /*
      * 启动安装应用程序
      */
-    public static void launchSetup(final Context context, final String path) {
+    public static void launchSetup(final Context context, DownloadEntity downloadEntity) {
+        // 取消状态栏下载完成的通知，若存在
+        downloadEntity.getMeta().put(Constants.MARK_ALREADY_TRIGGERED_INSTALLATION, "YES");
+        DownloadNotificationHelper.addOrUpdateDownloadNotification(downloadEntity);
+        launchSetup(context, downloadEntity.getPath());
+    }
+
+    private static void launchSetup(final Context context, final String path) {
         try {
             if (isCanLaunchSetup(context, path)) {
                 context.startActivity(PackageUtils.getInstallIntent(context, path));
@@ -236,6 +248,10 @@ public class PackageUtils {
      * 根据路径，获取安装游戏的意图
      */
     public static Intent getInstallIntent(Context context, String path) {
+        return getInstallIntent(context, path, false);
+    }
+
+    public static Intent getInstallIntent(Context context, String path, boolean isInAppUpdate) {
         Uri uri = Uri.fromFile(new File(path));
         Intent installIntent = new Intent(Intent.ACTION_VIEW);
         if ("smartisan".equals(Build.MANUFACTURER)) {
@@ -248,6 +264,10 @@ public class PackageUtils {
             installIntent.setDataAndType(uri, "application/vnd.android.package-archive");
             installIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
         } else {
+            if (isInAppUpdate) {
+                // 应用内更新不加 FLAG_ACTIVITY_NEW_TASK 在模拟器上会出现安装完成后安装界面也一并消失的类似闪退的表现
+                installIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            }
             installIntent.setDataAndType(uri, "application/vnd.android.package-archive");
         }
         InstallUtils.getInstance(context).addInstall(getPackageNameByPath(context, path));

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

@@ -4,6 +4,8 @@ import android.util.Patterns;
 
 import java.util.regex.Matcher;
 
+import kotlin.text.Regex;
+
 /**
  * @author CsHeng
  * @Date 17/05/2017
@@ -32,6 +34,25 @@ public class PatternUtils {
         Matcher matcher = Patterns.PHONE.matcher(phone);
         return matcher.matches();
     }
+    /**
+     * 判断字符串中是否有连续2个以上的空格 忽略 \t \r \n
+     */
+    public static boolean isHasSpace(String text) {
+        String pattern = "[\\s|\\t|\\r|\\n]{2,}";
+        Regex regex = new Regex(pattern);
+        return regex.find(text, 0) != null;
+    }
 
+    /**
+     * 替换字符串中连续2个以上的空格为一个空格 忽略 \t \r \n
+     */
+    public static String replaceSpace(String text) {
+        String pattern = "[\\s|\\t|\\r|\\n]{2,}";
+        String newText = text;
+        if (isHasSpace(text)) {
+            newText = text.replaceAll(pattern, " ");
+        }
+        return newText;
+    }
 
 }

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

@@ -2,51 +2,96 @@ package com.gh.common.util
 
 import android.Manifest
 import android.annotation.SuppressLint
+import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
 import android.provider.Settings
 import androidx.fragment.app.FragmentActivity
 import com.tbruyelle.rxpermissions2.RxPermissions
 
 object PermissionHelper {
 
+    @JvmStatic
+    fun requestReadPhoneStateAndStoragePermissionFromStartUp(context: Context) {
+        if (context is FragmentActivity) {
+            val rxPermission = RxPermissions(context)
+
+            var requestCount = 0
+            val permissionsStatusMap = hashMapOf<String, Boolean>()
+            permissionsStatusMap[Manifest.permission.READ_PHONE_STATE] = false
+            permissionsStatusMap[Manifest.permission.READ_EXTERNAL_STORAGE] = false
+            permissionsStatusMap[Manifest.permission.WRITE_EXTERNAL_STORAGE] = false
+
+            tryWithDefaultCatch {
+                rxPermission
+                        .requestEach(Manifest.permission.READ_PHONE_STATE,
+                                Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                                Manifest.permission.READ_EXTERNAL_STORAGE)
+                        .subscribe { permission ->
+                            requestCount++
+                            permissionsStatusMap[permission.name] = permission.granted
+
+                            if (requestCount == 2) {
+                                val hasReadPhoneStatePermission = permissionsStatusMap[Manifest.permission.READ_PHONE_STATE] == true
+                                val hasReadStoragePermission = permissionsStatusMap[Manifest.permission.READ_EXTERNAL_STORAGE] == true
+
+                                if (hasReadPhoneStatePermission && hasReadStoragePermission) {
+                                    MtaHelper.onEvent("授权情况", "启动授权", "都授权")
+                                } else if (!hasReadPhoneStatePermission && !hasReadStoragePermission) {
+                                    MtaHelper.onEvent("授权情况", "启动授权", "都不授权")
+                                } else if (hasReadPhoneStatePermission) {
+                                    MtaHelper.onEvent("授权情况", "启动授权", "只授权IMEI")
+                                } else if (hasReadStoragePermission) {
+                                    MtaHelper.onEvent("授权情况", "启动授权", "只授权存储")
+                                }
+                            }
+                        }
+            }
+
+        }
+    }
+
     @SuppressLint("CheckResult")
     @JvmStatic
     fun checkStoragePermissionBeforeAction(context: Context, emptyCallback: EmptyCallback) {
         if (context is FragmentActivity) {
             val rxPermission = RxPermissions(context)
-            rxPermission
-                    .requestEachCombined(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE)
-                    .subscribe { permission ->
-                        when {
-                            permission.granted -> {
-                                emptyCallback.onCallback()
-                            }
-                            permission.shouldShowRequestPermissionRationale -> {
-                                DialogUtils.showPermissionDialog(context,
-                                        "权限申请",
-                                        "光环助手需要存储权限，以保证能正常使用相关功能",
-                                        "重试",
-                                        "放弃",
-                                        { checkStoragePermissionBeforeAction(context, emptyCallback) },
-                                        null)
-                            }
-                            else -> {
-                                DialogUtils.showPermissionDialog(context,
-                                        "权限申请",
-                                        "在设置-应用-光环助手-权限中开启存储权限，以保证能正常使用相关功能",
-                                        "去设置",
-                                        "放弃",
-                                        {
-                                            val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-                                            intent.data = Uri.parse("package:" + context.getPackageName())
-                                            context.startActivity(intent)
-                                        },
-                                        null)
+
+            tryWithDefaultCatch {
+                rxPermission
+                        .requestEachCombined(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE)
+                        .subscribe { permission ->
+                            when {
+                                permission.granted -> {
+                                    emptyCallback.onCallback()
+                                }
+                                permission.shouldShowRequestPermissionRationale -> {
+                                    DialogUtils.showPermissionDialog(context,
+                                            "权限申请",
+                                            "光环助手需要存储权限，以保证能正常使用相关功能",
+                                            "重试",
+                                            "放弃",
+                                            { checkStoragePermissionBeforeAction(context, emptyCallback) },
+                                            null)
+                                }
+                                else -> {
+                                    DialogUtils.showPermissionDialog(context,
+                                            "权限申请",
+                                            "在设置-应用-光环助手-权限中开启存储权限，以保证能正常使用相关功能",
+                                            "去设置",
+                                            "放弃",
+                                            {
+                                                val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+                                                intent.data = Uri.parse("package:" + context.getPackageName())
+                                                context.startActivity(intent)
+                                            },
+                                            null)
+                                }
                             }
                         }
-                    }
+            }
         }
     }
 
@@ -55,36 +100,39 @@ object PermissionHelper {
     fun checkReadPhoneStateAndStoragePermissionBeforeAction(context: Context, emptyCallback: EmptyCallback) {
         if (context is FragmentActivity) {
             val rxPermission = RxPermissions(context)
-            rxPermission
-                    .requestEachCombined(
-                            Manifest.permission.READ_PHONE_STATE,
-                            Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                            Manifest.permission.READ_EXTERNAL_STORAGE)
-                    .subscribe { permission ->
-                        when {
-                            permission.granted -> {
-                                emptyCallback.onCallback()
 
-                                ActivationHelper.sendActivationInfo()
-                            }
-                            permission.shouldShowRequestPermissionRationale -> {
-                                DialogUtils.showPermissionDialog(context, "权限申请",
-                                        "光环助手需要获取存储权限和手机信息权限，以保证能正常使用相关功能", "重试", "放弃",
-                                        { checkStoragePermissionBeforeAction(context, emptyCallback) }, null)
-                            }
-                            else -> {
-                                DialogUtils.showPermissionDialog(context, "权限申请",
-                                        "在设置-应用-光环助手-权限中开启获取存储权限和手机信息，以保证能正常使用相关功能",
-                                        "去设置",
-                                        "放弃",
-                                        {
-                                            val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-                                            intent.data = Uri.parse("package:" + context.getPackageName())
-                                            context.startActivity(intent)
-                                        }, null)
+            tryWithDefaultCatch {
+                rxPermission
+                        .requestEachCombined(
+                                Manifest.permission.READ_PHONE_STATE,
+                                Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                                Manifest.permission.READ_EXTERNAL_STORAGE)
+                        .subscribe { permission ->
+                            when {
+                                permission.granted -> {
+                                    emptyCallback.onCallback()
+
+                                    ActivationHelper.sendActivationInfo()
+                                }
+                                permission.shouldShowRequestPermissionRationale -> {
+                                    DialogUtils.showPermissionDialog(context, "权限申请",
+                                            "光环助手需要获取存储权限和手机信息权限，以保证能正常使用相关功能", "重试", "放弃",
+                                            { checkStoragePermissionBeforeAction(context, emptyCallback) }, null)
+                                }
+                                else -> {
+                                    DialogUtils.showPermissionDialog(context, "权限申请",
+                                            "在设置-应用-光环助手-权限中开启获取存储权限和手机信息，以保证能正常使用相关功能",
+                                            "去设置",
+                                            "放弃",
+                                            {
+                                                val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+                                                intent.data = Uri.parse("package:" + context.getPackageName())
+                                                context.startActivity(intent)
+                                            }, null)
+                                }
                             }
                         }
-                    }
+            }
         }
     }
 
@@ -93,35 +141,85 @@ object PermissionHelper {
     fun checkReadPhoneStatePermissionBeforeAction(context: Context, emptyCallback: EmptyCallback) {
         if (context is FragmentActivity) {
             val rxPermission = RxPermissions(context)
-            rxPermission
-                    .requestEachCombined(Manifest.permission.READ_PHONE_STATE)
-                    .subscribe { permission ->
-                        when {
-                            permission.granted -> {
-                                emptyCallback.onCallback()
 
-                                ActivationHelper.sendActivationInfo()
-                            }
-                            permission.shouldShowRequestPermissionRationale -> {
-                                DialogUtils.showPermissionDialog(context, "权限申请",
-                                        "光环助手需要获取手机信息权限，以保证能正常使用相关功能", "重试", "放弃",
-                                        { checkStoragePermissionBeforeAction(context, emptyCallback) }, null)
-                            }
-                            else -> {
-                                DialogUtils.showPermissionDialog(context, "权限申请",
-                                        "在设置-应用-光环助手-权限中开启获取手机信息，以保证能正常使用相关功能",
-                                        "去设置",
-                                        "放弃",
-                                        {
-                                            val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-                                            intent.data = Uri.parse("package:" + context.getPackageName())
-                                            context.startActivity(intent)
-                                        }, null)
+            tryWithDefaultCatch {
+                rxPermission
+                        .requestEachCombined(Manifest.permission.READ_PHONE_STATE)
+                        .subscribe { permission ->
+                            when {
+                                permission.granted -> {
+                                    emptyCallback.onCallback()
+
+                                    ActivationHelper.sendActivationInfo()
+                                }
+                                permission.shouldShowRequestPermissionRationale -> {
+                                    DialogUtils.showPermissionDialog(context, "权限申请",
+                                            "光环助手需要获取手机信息权限，以保证能正常使用相关功能", "重试", "放弃",
+                                            { checkStoragePermissionBeforeAction(context, emptyCallback) }, null)
+                                }
+                                else -> {
+                                    DialogUtils.showPermissionDialog(context, "权限申请",
+                                            "在设置-应用-光环助手-权限中开启获取手机信息，以保证能正常使用相关功能",
+                                            "去设置",
+                                            "放弃",
+                                            {
+                                                val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+                                                intent.data = Uri.parse("package:" + context.getPackageName())
+                                                context.startActivity(intent)
+                                            }, null)
+                                }
                             }
                         }
-                    }
+            }
         }
     }
 
+    /**
+     * 跳转到权限设置
+     *
+     * @param activity
+     */
+    fun toPermissionSetting(activity: Activity) {
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1) {
+            toSystemConfig(activity)
+        } else {
+            try {
+                toApplicationInfo(activity)
+            } catch (e: Exception) {
+                e.printStackTrace()
+                toSystemConfig(activity)
+            }
+
+        }
+    }
+
+    /**
+     * 应用信息界面
+     *
+     * @param activity
+     */
+    private fun toApplicationInfo(activity: Activity) {
+        val localIntent = Intent()
+        localIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        localIntent.action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS
+        localIntent.data = Uri.fromParts("package", activity.packageName, null)
+        activity.startActivity(localIntent)
+    }
+
+    /**
+     * 系统设置界面
+     *
+     * @param activity
+     */
+    private fun toSystemConfig(activity: Activity) {
+        try {
+            val intent = Intent(Settings.ACTION_SETTINGS)
+            activity.startActivity(intent)
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+
+    }
+
 
 }

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

@@ -97,16 +97,23 @@ public class PostCommentUtils {
                 });
     }
 
-    public static void voteAnswerComment(final Context context, final String answerId, String articleId, String articleCommunityId,
-                                         final String commentId, final PostCommentListener listener) {
+    public static void likeComment(final Context context,
+                                   final String answerId,
+                                   String articleId,
+                                   String articleCommunityId,
+                                   String videoId,
+                                   final String commentId,
+                                   final PostCommentListener listener) {
 
 
         Observable<ResponseBody> observable;
 
         if (!TextUtils.isEmpty(answerId)) {
             observable = RetrofitManager.getInstance(context).getApi().postVoteAnswerComment(answerId, commentId);
-        } else {
+        } else if (!TextUtils.isEmpty(articleId)) {
             observable = RetrofitManager.getInstance(context).getApi().postVoteCommunityArticleComment(articleCommunityId, articleId, commentId);
+        } else {
+            observable = RetrofitManager.getInstance(context).getApi().postVoteToVideo(videoId, commentId);
         }
         observable
                 .subscribeOn(Schedulers.io())
@@ -215,6 +222,30 @@ public class PostCommentUtils {
                 });
     }
 
+    public static void reportVideoComment(final Context context,
+                                          final String videoId,
+                                          final String commentId,
+                                          final String reportData,
+                                          final PostCommentListener listener) {
+        RequestBody body = RequestBody.create(MediaType.parse("application/json"), reportData);
+        RetrofitManager.getInstance(context).getApi()
+                .postVideoCommentReport(videoId, commentId, body)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Response<ResponseBody>() {
+                    @Override
+                    public void onResponse(ResponseBody response) {
+                        listener.postSuccess(null);
+                    }
+
+                    @Override
+                    public void onFailure(HttpException e) {
+                        listener.postFailed(e);
+                    }
+                });
+    }
+
+
     public interface PostCommentListener {
         void postSuccess(JSONObject response);
 

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

@@ -1,5 +1,9 @@
 package com.gh.common.util;
 
+import androidx.annotation.ColorRes;
+
+import com.gh.gamecenter.R;
+
 import java.math.BigDecimal;
 import java.util.Random;
 
@@ -44,6 +48,7 @@ public class RandomUtils {
 
     /**
      * 四舍五入取整
+     *
      * @return
      */
     public static int getInt(double d) {
@@ -51,4 +56,13 @@ public class RandomUtils {
         return bigDecimal.intValue();
     }
 
+    public static final int[] placeholderColors = {
+            R.color.placeholder_5C8399, R.color.placeholder_5C9599,
+            R.color.placeholder_6F5EA8, R.color.placeholder_996283,
+            R.color.placeholder_748054, R.color.placeholder_946262};
+
+    @ColorRes
+    public static int getRandomPlaceholderColor() {
+        return placeholderColors[nextInt(placeholderColors.length - 1)];
+    }
 }

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

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

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

@@ -10,6 +10,7 @@ import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Matrix;
+import android.media.ThumbnailUtils;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.Gravity;
@@ -23,9 +24,6 @@ import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
 import com.facebook.common.references.CloseableReference;
 import com.facebook.datasource.DataSource;
 import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber;
@@ -52,7 +50,11 @@ import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.gh.common.util.GetLoginDataUtils.SCOPE;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import kotlin.jvm.functions.Function0;
+
+import static com.gh.common.util.LoginHelper.WEIBO_SCOPE;
 
 /**
  * Created by khy on 2016/9/4.
@@ -87,7 +89,8 @@ public class ShareUtils {
         askInvite,
         askNormal,  // 问答问题/答案
         shareGh,
-        communityArticle
+        communityArticle,
+        video
     }
 
     private String[] arrLabel = {"微信好友", "朋友圈", "QQ好友", "QQ空间", "新浪微博", "短信", "复制链接", "取消"};
@@ -120,7 +123,7 @@ public class ShareUtils {
     private ShareUtils(Context context) {
         mTencent = Tencent.createInstance(Config.TENCENT_APPID, context); //初始化QQ分享
         mIWXAPI = WXAPIFactory.createWXAPI(context, Config.WECHAT_APPID); //初始化微信分享
-        WbSdk.install(context, new AuthInfo(context, Config.WEIBO_APPKEY, "http://www.sina.com", SCOPE));
+        WbSdk.install(context, new AuthInfo(context, Config.WEIBO_APPKEY, "http://www.sina.com", WEIBO_SCOPE));
         mContext = context.getApplicationContext();
     }
 
@@ -146,6 +149,79 @@ public class ShareUtils {
         return false;
     }
 
+    public void showShareWindowsCancelCallback(Activity activity, View view, String url, String icon, String shareTitle, String shareSummary, ShareType shareType, Function0 function) {
+        if (activity.isFinishing()) return;
+        this.mActivity = new WeakReference<>(activity);
+        this.shareIcon = icon;
+        this.shareUrl = url;
+        this.mSummary = shareSummary;
+        this.mTitle = shareTitle;
+        this.mShareType = shareType;
+
+        View contentView = View.inflate(activity, R.layout.share_popup_layout, null);
+        contentView.setFocusable(true);
+        contentView.setFocusableInTouchMode(true);
+        RecyclerView shareRecyclerView = contentView.findViewById(R.id.share_rv);
+
+        shareRecyclerView.setPadding(DisplayUtils.dip2px(mContext, 20), DisplayUtils.dip2px(mContext, 10), DisplayUtils.dip2px(mContext, 20), 0);
+
+        //RecyclerView禁止滑动
+        GridLayoutManager gridLayoutManager = new GridLayoutManager(mContext, 4) {
+            @Override
+            public boolean canScrollVertically() {
+                return false;
+            }
+        };
+
+        shareRecyclerView.setLayoutManager(gridLayoutManager);
+        ShareRecyclerViewAdapter shareRecyclerViewAdapter = new ShareRecyclerViewAdapter();
+        shareRecyclerView.setAdapter(shareRecyclerViewAdapter);
+        shareRecyclerViewAdapter.setOnItemClickListener(position -> {
+            if ("取消".equals(arrLabel[position])) {
+                function.invoke();
+            }
+        });
+
+        if (mShareType == ShareType.shareGh) {
+            RelativeLayout layout = (RelativeLayout) view;
+            layout.addView(contentView);
+            arrLabel[6] = "邮件";
+            arrLogo[6] = R.drawable.share_email_logo;
+            arrLabel[7] = "复制链接";
+            arrLogo[7] = R.drawable.share_copyfont_logo;
+            return;
+        } else {
+            arrLabel[6] = "复制链接";
+            arrLogo[6] = R.drawable.share_copyfont_logo;
+            arrLabel[7] = "取消";
+            arrLogo[7] = R.drawable.share_cancel_logo;
+        }
+
+        popupWindow = new PopupWindow(contentView, LinearLayout.LayoutParams.MATCH_PARENT
+                , LinearLayout.LayoutParams.MATCH_PARENT, true);
+        popupWindow.setAnimationStyle(R.style.mypopwindow_anim_style);
+        //解决PopupWindow无法覆盖状态栏
+        popupWindow.setClippingEnabled(false);
+        try {
+            popupWindow.showAtLocation(view, Gravity.BOTTOM, 0, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        contentView.setOnClickListener(v -> popupWindow.dismiss());
+
+        contentView.setOnKeyListener((v, keyCode, event) -> {
+            if (keyCode == KeyEvent.KEYCODE_BACK
+                    && event.getRepeatCount() == 0
+                    && popupWindow != null
+                    && popupWindow.isShowing()) {
+                function.invoke();
+                popupWindow.dismiss();
+            }
+            return false;
+        });
+    }
+
 
     public void showShareWindows(Activity activity, View view, String url, String icon, String shareTitle, String shareSummary, ShareType shareType) {
         if (activity.isFinishing()) return;
@@ -221,6 +297,7 @@ public class ShareUtils {
                 mSummary += "（光环加速版）";
                 break;
             case askNormal:
+            case video:
             case communityArticle:
                 mTitle += " - 光环助手";
                 break;
@@ -261,6 +338,7 @@ public class ShareUtils {
                 mSummary += "（光环加速版）";
                 break;
             case askNormal:
+            case video:
             case communityArticle:
                 mTitle += " - 光环助手";
                 break;
@@ -289,6 +367,12 @@ public class ShareUtils {
         ImageUtils.display(mContext, iconUrl, new BaseBitmapDataSubscriber() {
             @Override
             protected void onNewResultImpl(Bitmap bitmap) {
+                if (mShareType == ShareType.video) {
+                    // 分享类型为视频时裁为正方形
+                    int dimension = Math.min(bitmap.getWidth(), bitmap.getHeight());
+                    bitmap = ThumbnailUtils.extractThumbnail(bitmap, dimension, dimension);
+                }
+
                 Bitmap compressBp = compressBitmap(bitmap);
                 if (mShareType == ShareType.askNormal || mShareType == ShareType.askInvite) {
                     msg.thumbData = ImageUtils.bmpToByteArray(compressBp, true);
@@ -362,6 +446,7 @@ public class ShareUtils {
                 mSummary += "（光环加速版）";
                 break;
             case askNormal:
+            case video:
             case communityArticle:
                 mTitle += " - 光环助手";
                 break;
@@ -411,6 +496,7 @@ public class ShareUtils {
                 msg.title = mSummary;
                 break;
             case askNormal:
+            case video:
             case communityArticle:
                 msg.title = mTitle + " - 光环助手";
                 break;
@@ -472,6 +558,7 @@ public class ShareUtils {
                 break;
             case askInvite:
             case askNormal:
+            case video:
             case communityArticle:
                 smsBody = mTitle + " - 光环助手" + shareUrl;
                 break;
@@ -507,37 +594,56 @@ public class ShareUtils {
 
     private class ShareRecyclerViewAdapter extends RecyclerView.Adapter<ShareRecyclerViewAdapter.ViewHolder> {
 
+        private OnItemClickListener listener;
+
         @Override
         public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
             View view = LayoutInflater.from(mContext).inflate(R.layout.share_popup_item, parent, false);
             return new ViewHolder(view);
         }
 
+        public void setOnItemClickListener(OnItemClickListener listener) {
+            this.listener = listener;
+        }
+
         @Override
         public void onBindViewHolder(final ViewHolder holder, int position) {
             holder.shareLogo.setImageResource(arrLogo[position]);
             holder.shareLabel.setText(arrLabel[position]);
             holder.itemView.setOnClickListener(v -> {
+                if (mShareType == ShareUtils.ShareType.shareGh) {
+                    MtaHelper.onEvent("我的光环_新", "分享光环", arrLabel[position]);
+                }
+                if (listener != null) {
+                    listener.onItemClick(holder.getAdapterPosition());
+                }
                 switch (holder.getPosition()) {
                     case 0:
+                        MtaHelper.onEvent("内容分享", "微信好友", mTitle);
                         wechatShare();
                         break;
                     case 1:
+                        MtaHelper.onEvent("内容分享", "微信朋友圈", mTitle);
                         wechatMomentsShare();
                         break;
                     case 2:
+                        MtaHelper.onEvent("内容分享", "QQ好友", mTitle);
                         qqShare();
                         break;
                     case 3:
+                        MtaHelper.onEvent("内容分享", "QQ空间", mTitle);
                         qZoneShare();
                         break;
                     case 4:
+                        MtaHelper.onEvent("内容分享", "新浪微博", mTitle);
                         sinaWeiboShare();
                         break;
                     case 5:
+                        MtaHelper.onEvent("内容分享", "短信", mTitle);
                         shortMessageShare();
                         break;
                     case 6:
+                        MtaHelper.onEvent("内容分享", "复制链接", mTitle);
                         if (mShareType == ShareType.askInvite) {
                             copyLink(mTitle + " - 光环助手" + shareUrl);
                         } else if (mShareType == ShareType.askNormal) {
@@ -584,4 +690,8 @@ public class ShareUtils {
         }
     }
 
+    interface OnItemClickListener {
+        void onItemClick(int position);
+    }
+
 }

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

@@ -0,0 +1,5 @@
+package com.gh.common.util
+
+interface SimpleCallback<T> {
+    fun onCallback(arg: T)
+}