tinkerBase:3.6.2

3.6.1 Tinker Base

.gitignore

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

CHANGELOG.md

@@ -1,4 +1,10 @@
-### Ver 3.1
+# 版本升级备忘
+
+### Ver 2.5
+* 此处写本次更新所做的业务和代码修改
+
+### Ver 2.6
+* xx
 
 ### Ver 3.0
 * 升级账号系统(登录流程/用户信息相关/用户账号相关操作(评论,礼包...))
@@ -10,8 +16,23 @@
 * 游戏下载平台面板修改(加快弹出速度,不再读取本地平台图片)
 * 接入bugly(tinker)
 
-### Ver 2.6
-* xx
+### VER 3.1
+### VER 3.2
+### VER 3.3
+### VER 3.4
+### VER 3.5
 
-### Ver 2.5
-* 此处写本次更新所做的业务和代码修改
+### Ver 3.6
+* 首页游戏增加预览骨架,游戏ITEM样式微调和开服标签
+* 首页问答增加关注页面
+* 重构游戏更新管理(游戏更新/插件化/已安装的游戏),具体细节参考PackageRepository & PackageViewModel
+* 重构APP更新管理(已VersionVode为更新基准,小版本更新改为光环后台控制)
+  - 删除TINKER_VERISON_NAME
+  - tinker打包方式变更(以小版本作为Base包,防止与数据后台小版本更新发生冲突)
+* 社区增加版主功能(版主可以对存在的相关内容进行修改/隐藏操作,内容包括问题/回答/回答评论)
+* 社区互动引导优化(问答推荐增加`推荐关注`,回答详情增加一些交互动效)
+
+### Ver 3.6.1
+* 可以后台控制关闭资讯功能
+* 版块、分类、专题详情、游戏详情、礼包详情增加预览骨架
+* 下载按钮状态可以通过接口屏蔽相应的包

README.md

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

app/build.gradle

@@ -25,7 +25,8 @@ android {
     }
 
     dexOptions {
-        jumboMode = true
+//        jumboMode = true
+        javaMaxHeapSize "4g"
     }
 
     defaultConfig {
@@ -67,7 +68,6 @@ android {
         buildConfigField "String", "WEIBO_APPKEY", "\"${WEIBO_APPKEY}\""
         buildConfigField "String", "MTA_APPKEY", "\"${MTA_APPKEY}\""
         buildConfigField "String", "TD_APPID", "\"${TD_APPID}\""
-        buildConfigField "String", "PATCH_VERSION_NAME", "\"${PATCH_VERSION_NAME}\""
 
     }
 
@@ -88,13 +88,10 @@ android {
             debuggable true
             minifyEnabled false
             zipAlignEnabled false
-            versionNameSuffix "-debug"
             signingConfig signingConfigs.debug
 
-            buildConfigField "String", "UMENG_APPKEY", "\"${DEBUG_UMENG_APPKEY}\""
-            buildConfigField "String", "UMENG_MESSAGE_SECRET", "\"${DEBUG_UMENG_MESSAGE_SECRET}\""
-            buildConfigField "String", "MIPUSH_APPID", "\"${DEBUG_MIPUSH_APPID}\""
-            buildConfigField "String", "MIPUSH_APPKEY", "\"${DEBUG_MIPUSH_APPKEY}\""
+            buildConfigField "String", "EXPOSURE_REPO", "\"test\""
+            buildConfigField "String", "EXPOSURE_VERSION", "\"E2\""
         }
         release {
             debuggable false
@@ -103,10 +100,8 @@ android {
             shrinkResources true
             signingConfig signingConfigs.release
 
-            buildConfigField "String", "UMENG_APPKEY", "\"${UMENG_APPKEY}\""
-            buildConfigField "String", "UMENG_MESSAGE_SECRET", "\"${UMENG_MESSAGE_SECRET}\""
-            buildConfigField "String", "MIPUSH_APPID", "\"${MIPUSH_APPID}\""
-            buildConfigField "String", "MIPUSH_APPKEY", "\"${MIPUSH_APPKEY}\""
+            buildConfigField "String", "EXPOSURE_REPO", "\"exposure\""
+            buildConfigField "String", "EXPOSURE_VERSION", "\"E2\""
         }
     }
 
@@ -126,12 +121,21 @@ android {
             buildConfigField "String", "MESSAGE_HOST", "\"${MESSAGE_HOST}\""
             buildConfigField "String", "DATA_HOST", "\"${DATA_HOST}\""
 
+            buildConfigField "String", "UMENG_APPKEY", "\"${UMENG_APPKEY}\""
+            buildConfigField "String", "UMENG_MESSAGE_SECRET", "\"${UMENG_MESSAGE_SECRET}\""
+            buildConfigField "String", "MIPUSH_APPID", "\"${MIPUSH_APPID}\""
+            buildConfigField "String", "MIPUSH_APPKEY", "\"${MIPUSH_APPKEY}\""
+            buildConfigField "String", "MEIZUPUSH_APPID", "\"${MEIZUPUSH_APPID}\""
+            buildConfigField "String", "MEIZUPUSH_APPKEY", "\"${MEIZUPUSH_APPKEY}\""
+
             buildConfigField "String", "BUGLY_APPID", "\"${BUGLY_APPID}\""
 
         }
         // internal test dev host
         internal {
             dimension "nonsense"
+            versionNameSuffix "-debug"
+
             buildConfigField "String", "API_HOST", "\"${DEV_API_HOST}\""
             buildConfigField "String", "USER_HOST", "\"${DEV_USER_HOST}\""
             buildConfigField "String", "COMMENT_HOST", "\"${DEV_COMMENT_HOST}\""
@@ -139,6 +143,13 @@ android {
             buildConfigField "String", "MESSAGE_HOST", "\"${DEV_MESSAGE_HOST}\""
             buildConfigField "String", "DATA_HOST", "\"${DEV_DATA_HOST}\""
 
+            buildConfigField "String", "UMENG_APPKEY", "\"${DEBUG_UMENG_APPKEY}\""
+            buildConfigField "String", "UMENG_MESSAGE_SECRET", "\"${DEBUG_UMENG_MESSAGE_SECRET}\""
+            buildConfigField "String", "MIPUSH_APPID", "\"${DEBUG_MIPUSH_APPID}\""
+            buildConfigField "String", "MIPUSH_APPKEY", "\"${DEBUG_MIPUSH_APPKEY}\""
+            buildConfigField "String", "MEIZUPUSH_APPID", "\"${DEBUG_MEIZUPUSH_APPID}\""
+            buildConfigField "String", "MEIZUPUSH_APPKEY", "\"${DEBUG_MEIZUPUSH_APPKEY}\""
+
             buildConfigField "String", "BUGLY_APPID", "\"${DEBUG_BUGLY_APPID}\""
         }
     }
@@ -166,9 +177,17 @@ rebuildChannel {
 //    releaseOutputDir = Release渠道包输出目录
 }
 
+repositories {
+    flatDir {
+        dirs 'libs/aars'
+    }
+}
+
 dependencies {
 
-    implementation fileTree(include: '*.jar', dir: 'libs')
+    implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
+
+    testImplementation 'junit:junit:4.12'
 
     debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakcanary}"
     debugImplementation "com.facebook.stetho:stetho:${stetho}"
@@ -184,7 +203,6 @@ dependencies {
     implementation "com.android.support:percent:${androidSupport}"
     implementation "com.android.support.constraint:constraint-layout:${constraintLayout}"
     implementation "com.kyleduo.switchbutton:library:${switchButton}"
-    implementation "com.readystatesoftware.systembartint:systembartint:${systemBarTint}"
 
     implementation "com.facebook.fresco:fresco:${fresco}"
     implementation "com.facebook.fresco:animated-gif:${fresco}"
@@ -195,28 +213,21 @@ dependencies {
 
     implementation "com.squareup.retrofit2:retrofit:${retrofit}"
     implementation "com.squareup.retrofit2:converter-gson:${retrofit}"   // include gson 2.7
-    implementation "com.squareup.retrofit2:adapter-rxjava:${retrofit}"
-//    implementation "com.google.code.gson:gson:${gson}"
+    implementation "com.squareup.retrofit2:adapter-rxjava2:${retrofit}"
 
     implementation "com.j256.ormlite:ormlite-android:${ormlite}"
     implementation "com.j256.ormlite:ormlite-core:${ormlite}"
 
     implementation "com.jakewharton:butterknife:${butterKnife}"
-    annotationProcessor "com.jakewharton:butterknife-compiler:${butterKnife}"
     kapt "com.jakewharton:butterknife-compiler:${butterKnife}"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
 
     implementation "org.greenrobot:eventbus:${eventbus}"
-    annotationProcessor "org.greenrobot:eventbus-annotation-processor:${eventbusApt}"
+    kapt "org.greenrobot:eventbus-annotation-processor:${eventbusApt}"
 
-    implementation "io.reactivex:rxjava:${rxJava}"
-    implementation "io.reactivex:rxandroid:${rxAndroid}"
-    implementation "com.jakewharton.rxbinding:rxbinding:${rxBinding}"
-
-    //TODO update to rx 2.x
-//    implementation "io.reactivex.rxjava2:rxjava:${rxJava2}"
-//    implementation "io.reactivex.rxjava2:rxandroid:${rxAndroid2}"
-//    implementation "com.jakewharton.rxbinding2:rxbinding:${rxBinding2}"
+    implementation "io.reactivex.rxjava2:rxjava:${rxJava2}"
+    implementation "io.reactivex.rxjava2:rxandroid:${rxAndroid2}"
+    implementation "com.jakewharton.rxbinding2:rxbinding:${rxBinding2}"
 
     implementation "com.google.zxing:core:${zxing}"
     implementation "com.google.zxing:android-core:${zxing}"
@@ -242,22 +253,36 @@ dependencies {
     implementation 'com.google.android:flexbox:0.2.2'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    kapt 'com.android.databinding:compiler:3.0.1'
+    kapt 'com.android.databinding:compiler:3.1.3'
 
     implementation 'com.contrarywind:Android-PickerView:4.1.3'
 
     implementation "com.scwang.smartrefresh:SmartRefreshLayout:${smartRefreshLayout}"
     implementation "net.cachapa.expandablelayout:expandablelayout:${expandableLayout}"
 
+    // 用于比较 versionName 是大于小于或等于
+    implementation "com.g00fy2:versioncompare:${versioncompare}"
+
+    implementation "top.zibin:Luban:${luban}"
+
+    // for video streaming
+    implementation "cn.jzvd:jiaozivideoplayer:${jiaoziVideoView}"
+    implementation "com.danikula:videocache:${videoCache}"
+
+    implementation "com.llew.huawei:verifier:1.0.6"
+
+    implementation 'com.ethanhua:skeleton:1.1.1'
+    implementation 'io.supercharge:shimmerlayout:2.1.0'
+
+    implementation project(':libraries:gid')
     implementation project(':libraries:LGLibrary')
     implementation project(':libraries:MTA')
     implementation project(':libraries:QQShare')
     implementation project(':libraries:TalkingData')
     implementation project(':libraries:UmengPush')
     implementation project(':libraries:WechatShare')
-    implementation project(':libraries:iosched')
     implementation project(':libraries:LogHub')
-
+    implementation project(':libraries:im')
 }
 File propFile = file('sign.properties')
 if (propFile.exists()) {
@@ -287,3 +312,31 @@ if (propFile.exists()) {
 } else {
     android.buildTypes.release.signingConfig = null
 }
+
+// 用于测试读取 META-INF 里的 JSON 的代码
+//task generateMetaJson {
+//    def resDir = new File(buildDir, 'generated/FILES_FOR_META_INF/')
+//    def destDir = new File(resDir, 'META-INF/')
+//    // Add resDir as a resource directory so that it is automatically included in the APK.
+//    android {
+//        sourceSets {
+//            main.resources {
+//                srcDir resDir
+//            }
+//        }
+//    }
+//
+//    doLast {
+//        if (!destDir.exists()) destDir.mkdirs()
+//        copy {
+//            into destDir
+//            from new File('generated/FILES_FOR_META_INF/META-INF/halo_skip.json')
+//        }
+//    }
+//}
+//// Specify when put_files_in_META_INF should run
+//project.afterEvaluate {
+//    tasks.findAll { task ->
+//        task.name.startsWith('merge') && task.name.endsWith('Resources')
+//    }.each { t -> t.dependsOn generateMetaJson }
+//}

app/proguard-rules.txt

@@ -197,4 +197,29 @@
 -keep @android.support.annotation.Keep class *
 -keepclassmembers class ** {
   @android.support.annotation.Keep *;
-}
+}
+
+-keep class com.gh.loghub.** { *; }
+
+### greenDAO 3
+-keepclassmembers class * extends org.greenrobot.greendao.AbstractDao {
+    public static java.lang.String TABLENAME;
+}
+-keep class **$Properties
+-keep class org.greenrobot.greendao.** { *; }
+# If you do not use SQLCipher:
+-dontwarn org.greenrobot.greendao.database.**
+# If you do not use RxJava:
+-dontwarn rx.**
+-dontwarn org.greenrobot.greendao.rx.**
+-dontwarn org.greenrobot.greendao.**
+
+### fastJson
+-dontwarn com.alibaba.fastjson.**
+-keep class com.alibaba.fastjson.** { *; }
+-keepattributes Signature
+-keepattributes Annotation
+
+### 广点通
+-dontwarn com.qq.gdt.action.**
+-keep class com.qq.gdt.action.** {*;}

app/src/main/AndroidManifest.xml

@@ -47,6 +47,7 @@
     <uses-permission android:name = "android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name = "android.permission.READ_LOGS" />
     <uses-permission android:name = "android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name = "android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <supports-screens
         android:anyDensity = "true"
@@ -69,7 +70,6 @@
         <activity
             android:name = "com.gh.gamecenter.SplashScreenActivity"
             android:configChanges = "keyboardHidden|orientation|screenSize"
-            android:noHistory = "true"
             android:screenOrientation = "portrait"
             android:theme = "@style/AppGuideTheme" >
             <intent-filter >
@@ -107,10 +107,7 @@
             android:name = "com.gh.gamecenter.ConcernActivity"
             android:screenOrientation = "portrait" />
         <activity
-            android:name = "com.gh.gamecenter.SubjectActivity"
-            android:screenOrientation = "portrait" />
-        <activity
-            android:name = "com.gh.gamecenter.PluginActivity"
+            android:name = "com.gh.gamecenter.subject.SubjectActivity"
             android:screenOrientation = "portrait" />
         <activity
             android:name = "com.gh.gamecenter.NewsSearchActivity"
@@ -176,6 +173,7 @@
             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"
@@ -299,13 +297,13 @@
             android:screenOrientation = "portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.qa.ask.QuestionEditActivity"
+            android:name = "com.gh.gamecenter.qa.questions.edit.QuestionEditActivity"
             android:screenOrientation = "portrait" />
 
         <activity
             android:name = "com.gh.gamecenter.kaifu.add.AddKaiFuActivity"
             android:screenOrientation = "portrait"
-            android:windowSoftInputMode = "stateHidden"/>
+            android:windowSoftInputMode = "stateHidden" />
 
         <activity
             android:name = "com.gh.gamecenter.kaifu.patch.PatchKaifuActivity"
@@ -323,6 +321,65 @@
             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.PersonalHomeActivity"
+            android:screenOrientation = "portrait" />
+
+        <activity
+            android:name = "com.gh.gamecenter.personalhome.answer.PersonalAnswerActivity"
+            android:screenOrientation = "portrait" />
+
+        <activity
+            android:name = "com.gh.gamecenter.personalhome.question.PersonalQuestionActivity"
+            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:windowSoftInputMode = "stateVisible"
+            android:screenOrientation = "portrait" />
+
+        <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.comment.CommentActivity"
+            android:screenOrientation = "portrait"
+            android:theme = "@style/Theme.Transparent"
+            android:windowSoftInputMode = "adjustNothing" />
+
         <!-- 使用小米/华为推送弹窗功能提高推送成功率-->
         <activity
             android:name = "com.gh.gamecenter.PushProxyActivity"
@@ -341,19 +398,15 @@
             </intent-filter >
         </activity >
 
-        <activity
-            android:name = ".CommonActivity"
-            android:screenOrientation = "portrait" />
-
-        <receiver android:name = "com.gh.gamecenter.receiver.InstallAndUninstallReceiver" >
-            <intent-filter >
-                <action android:name = "android.intent.action.PACKAGE_ADDED" />
-                <action android:name = "android.intent.action.PACKAGE_REMOVED" />
-                <action android:name = "android.intent.action.PACKAGE_REPLACED" />
-
-                <data android:scheme = "package" />
-            </intent-filter >
-        </receiver >
+        <provider
+            android:name = "android.support.v4.content.FileProvider"
+            android:authorities = "${applicationId}"
+            android:exported = "false"
+            android:grantUriPermissions = "true" >
+            <meta-data
+                android:name = "android.support.FILE_PROVIDER_PATHS"
+                android:resource = "@xml/provider_paths" />
+        </provider >
 
         <receiver
             android:name = "com.gh.gamecenter.receiver.DownloadReceiver"
@@ -369,11 +422,6 @@
                 <action android:name = "com.gh.gamecenter.INSTALL" />
             </intent-filter >
         </receiver >
-        <receiver android:name = "com.gh.gamecenter.receiver.NetworkStateReceiver" >
-            <intent-filter >
-                <action android:name = "android.net.conn.CONNECTIVITY_CHANGE" />
-            </intent-filter >
-        </receiver >
 
         <receiver
             android:name = "com.gh.gamecenter.receiver.ActivitySkipReceiver"
@@ -383,6 +431,40 @@
             </intent-filter >
         </receiver >
 
+        <receiver android:name = "com.gh.gamecenter.receiver.UmengMessageReceiver" >
+            <intent-filter >
+                <action android:name = "com.gh.gamecenter.UMENG" />
+            </intent-filter >
+        </receiver >
+
+        <!--魅族push应用定义消息receiver声明 -->
+        <receiver android:name = "com.gh.gamecenter.receiver.MeizuPushReceiver" >
+            <intent-filter >
+                <!-- 接收push消息 -->
+                <action android:name = "com.meizu.flyme.push.intent.MESSAGE" />
+                <!-- 接收register消息 -->
+                <action android:name = "com.meizu.flyme.push.intent.REGISTER.FEEDBACK" />
+                <!-- 接收unregister消息-->
+                <action android:name = "com.meizu.flyme.push.intent.UNREGISTER.FEEDBACK" />
+                <!-- 兼容低版本Flyme3推送服务配置 -->
+                <action android:name = "com.meizu.c2dm.intent.REGISTRATION" />
+                <action android:name = "com.meizu.c2dm.intent.RECEIVE" />
+
+                <category android:name = "${applicationId}" />
+            </intent-filter >
+        </receiver >
+
+        <receiver
+            android:name = "com.gh.common.im.ImReceiver"
+            android:enabled = "true" >
+            <intent-filter android:priority = "2147483647" >
+                <action android:name = "com.gh.im" />
+                <action android:name = "action_finish" />
+            </intent-filter >
+        </receiver >
+
+        <service android:name = "com.gh.base.GHUmengNotificationService" />
+
         <!--<service android:name = "com.gh.gamecenter.statistics.AppStaticService" />-->
 
     </application >

app/src/main/assets/content.js

@@ -13,7 +13,11 @@ function setupWhenContentEditable() {
         e.preventDefault();
         var text = (e.originalEvent || e).clipboardData.getData('text/plain');
         text = text.replace(/\n/g, '<br>');
-        document.execCommand("insertHTML", false, text);
+        if("" != text) {
+          document.execCommand("insertHTML", false, text);
+        } else {
+          window.onPasteListener.onPaste();
+        }
     });
 
     requestContentFocus();

app/src/main/assets/editor.html

@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta name="viewport" content="user-scalable=no">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <link rel="stylesheet" type="text/css" href="normalize.css">
     <link rel="stylesheet" type="text/css" href="style.css">
@@ -11,5 +10,6 @@
 <script type="text/javascript" src="zepto.min.js"></script>
 <script type="text/javascript" src="rich_editor.js"></script>
 <script type="text/javascript" src="content.js"></script>
+<!--<script src="https://cdnjs.cloudflare.com/ajax/libs/vanilla-lazyload/10.15.0/lazyload.min.js"></script>-->
 </body>
 </html>

app/src/main/assets/emojikf

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

app/src/main/assets/microlog.properties

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

app/src/main/assets/rich_editor.js

@@ -28,7 +28,7 @@ document.addEventListener("selectionchange", function() { RE.backuprange(); });
 
 // Initializations
 RE.callback = function() {
-    window.location.href = "re-callback://" + encodeURI(RE.getHtml());
+    window.location.href = "re-callback://" + encodeURIComponent(RE.getHtml());
 }
 
 RE.setHtml = function(contents) {
@@ -193,38 +193,54 @@ RE.setBlockquote = function() {
 }
 
 RE.insertImage = function(url) {
-    var html = "<div><img src =\"" + url + "\" style=\" max-width: 100%; display:block; margin:8px auto; height: auto;\"></div><br>"
+    var html = "<div><img src =\"" + url + "\" style=\" max-width: 100%; display:block; margin:15px auto; height: auto;\"></div><br>"
     RE.insertHTML(html);
 }
 
-RE.replaceTbImage = function() {
+//RE.lazyLoad = function() {
+//   var myLazyLoad = new LazyLoad({
+//    elements_selector: ".lazy"
+//   })
+//}
+
+// 替换成缩略图
+RE.replaceTbImage = function(imgRuleFlag, gifRuleFlag) {
     var imgs = document.getElementsByTagName("img");
     for (var i = 0; i < imgs.length; i++) {
          var img = imgs[i];
-         if(img.src.indexOf("/tb/") > 0) continue;
-         var imgArr = img.src.split("/");
-         var tbImg = ""
-         for (var j = 0; j < imgArr.length; j++) {
-             if (j == imgArr.length - 1) {
-                 tbImg += "tb/" + imgArr[j];
-             } else {
-                 tbImg += imgArr[j] + "/";
-             }
+         if(img.src.indexOf("?") > 0) continue;
+
+         var tbImg
+         if(img.src.indexOf(".gif") > 0) {
+           tbImg = img.src + gifRuleFlag
+         } else {
+           tbImg = img.src + imgRuleFlag
          }
-         img.style.cssText = "max-width: 30%; display:block; margin:8px auto; height: auto;"
+
+         img.style.cssText = "max-width: 60%; display:block; margin:15px auto; height: auto;"
          img.src = tbImg;
 
          if (i == 0) {
              var bigImg = document.createElement('img');
              bigImg.src = "file:///android_asset/web_load_dfimg_icon.png";
-             bigImg.style.cssText = "max-width: 20%; margin:8px 0 0 0; height: auto;"
+             bigImg.style.cssText = "max-width: 20%; margin:15px 0 0 0; height: auto;"
              img.parentNode.insertBefore(bigImg, img.parentNode.childNodes[0]);
              i++;
+
+             if(img.parentNode != null) {
+                 img.parentNode.style.cssText += "text-align: left;"
+             }
+
+             if(img.parentNode != null && img.parentNode.parentNode != null) {
+                 img.parentNode.parentNode.style.cssText += "text-align: left;"
+             }
+
          }
     }
 }
 
-RE.replaceAllDfImage = function() {
+// 替换成默认图
+RE.replaceAllDfImage = function(imgRuleFlag, gifRuleFlag) {
     var imgs = document.getElementsByTagName("img");
     for (var i = 0; i < imgs.length; i++) {
          var img = imgs[i];
@@ -232,34 +248,54 @@ RE.replaceAllDfImage = function() {
             img.parentNode.removeChild(img.parentNode.childNodes[0]);
             i--;
          } else {
-           img.style.cssText = "max-width: 100%; display:block; margin:8px auto; height: auto;"
-           img.src = img.src.replace("/tb/", "/");
+           if(img.src.indexOf(".gif") > 0) {
+              if(gifRuleFlag.indexOf(",default") > 0) {
+                 img.style.cssText = "max-width: 100%; display:block; margin:8px auto; height: auto;"
+                 img.src = img.src.split("?")[0] + gifRuleFlag
+              }
+           } else {
+             img.style.cssText = "max-width: 100%; display:block; margin:8px auto; height: auto;"
+             img.src = img.src.split("?")[0] + imgRuleFlag
+           }
          }
     }
 
 }
 
+// 去除显示大图
 RE.hideShowBigPic = function() {
     var imgs = document.getElementsByTagName("img");
     var j = 0;
     for (var i = 0; i < imgs.length; i++) {
          var img = imgs[i];
-         if(img.src.indexOf("/tb/") > 0) {
+         if(img.src.indexOf(",thumbnail") > 0 && img.src.indexOf(".gif") == -1) {
             j++;
          }
     }
+    // 去除显示大图
     if (j == 0) {
-        RE.replaceAllDfImage();
+       var imgs = document.getElementsByTagName("img");
+       for (var i = 0; i < imgs.length; i++) {
+           var img = imgs[i];
+           if(img.src.indexOf("web_load_dfimg_icon") > 0) {
+             img.parentNode.removeChild(img.parentNode.childNodes[0]);
+             break;
+           }
+       }
     }
 }
 
-RE.replaceDfImageByUrl = function(imgUrl) {
+RE.replaceDfImageByUrl = function(imgUrl, imgRuleFlag, gifRuleFlag) {
     var imgs = document.getElementsByTagName("img");
     for (var i = 0; i < imgs.length; i++) {
          var img = imgs[i];
-         if (img.src == imgUrl) {
+         if (img.src.indexOf(imgUrl) != -1) {
              img.style.cssText = "max-width: 100%; display:block; margin:8px auto; height: auto;"
-             img.src = img.src.replace("/tb/", "/");
+             if(img.src.indexOf(".gif") > 0) {
+               img.src = img.src.split("?")[0] + gifRuleFlag
+             } else {
+               img.src = img.src.split("?")[0] + imgRuleFlag
+             }
          }
     }
     RE.hideShowBigPic();

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

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

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

@@ -1,11 +1,14 @@
 package com.gh.base;
 
+import android.app.Activity;
 import android.arch.lifecycle.Lifecycle;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.support.annotation.NonNull;
+import android.text.TextUtils;
+import android.view.Window;
 
 import com.gh.common.util.DataUtils;
 import com.gh.common.util.DialogUtils;
@@ -17,6 +20,7 @@ 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.download.FileUtils;
 import com.lightgame.utils.Utils;
 import com.tencent.tauth.Tencent;
@@ -28,6 +32,8 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.lang.ref.WeakReference;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.List;
 
 import butterknife.ButterKnife;
@@ -73,9 +79,25 @@ 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);
@@ -143,19 +165,18 @@ public abstract class BaseActivity extends BaseToolBarActivity implements EasyPe
                             , StringUtils.buildString("（", manufacturer, " - ", model, "）")
                             , "知道了", "重新登录"
                             , null
-                            , () -> startActivity(LoginActivity.getIntent(BaseActivity.this))
+                            , () -> startActivity(LoginActivity.getIntent(BaseActivity.this,
+                                    "你的账号已在另外一台设备登录多设备-重新登录"))
                     );
                     mBaseHandler.postDelayed(() -> mIsExistLogoutDialog = false, 5000);
                 } catch (JSONException e) {
                     e.printStackTrace();
                 }
-
-
             } else if ("notfound".equals(showDialog.getType())) {
                 DialogUtils.showAlertDialog(this, "下载失败", "下载链接已失效，建议提交反馈"
                         , "立即反馈", "取消"
                         , () -> {
-                            SuggestionActivity.startSuggestionActivity(this, 4,
+                            SuggestionActivity.startSuggestionActivity(this, SuggestType.gameQuestion,
                                     null, showDialog.getPath() + "，问题反馈：下载链接失效");
                         }, null);
             }
@@ -189,4 +210,16 @@ public abstract class BaseActivity extends BaseToolBarActivity implements EasyPe
     public void onPermissionsGranted(int requestCode, List<String> perms) {
 
     }
+
+
+    public static String mergeEntranceAndPath(String entrance, String path) {
+        if (TextUtils.isEmpty(entrance) && TextUtils.isEmpty(path)) return "";
+        if (TextUtils.isEmpty(entrance) && !TextUtils.isEmpty(path)) {
+            return StringUtils.buildString("(", path, ")");
+        }
+        if (!TextUtils.isEmpty(entrance) && TextUtils.isEmpty(path)) {
+            return entrance;
+        }
+        return StringUtils.buildString(entrance, "+(", path, ")");
+    }
 }

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

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

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

@@ -7,8 +7,11 @@ import android.support.v4.app.Fragment;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.ViewGroup;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.gh.common.util.DisplayUtils;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.normal.ToolbarController;
 import com.lightgame.BaseAppCompatActivity;
@@ -80,6 +83,16 @@ public abstract class BaseToolBarActivity extends BaseAppCompatActivity implemen
                 }
             }
         }
+
+        // 限制标题实际宽度 防止标题挡住toolbar menu按钮
+        if (menu.size() > 2 && mTitleTv != null) {
+            ViewGroup.LayoutParams layoutParams = mTitleTv.getLayoutParams();
+            if (layoutParams instanceof RelativeLayout.LayoutParams) {
+                RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) layoutParams;
+                params.setMargins(DisplayUtils.dip2px(90), 0, DisplayUtils.dip2px(90), 0);
+                mTitleTv.setLayoutParams(params);
+            }
+        }
     }
 
     @Override
@@ -88,6 +101,12 @@ public abstract class BaseToolBarActivity extends BaseAppCompatActivity implemen
         return mToolbar.getMenu().findItem(res);
     }
 
+    public void clearMenu() {
+        if (mToolbar != null) {
+            mToolbar.getMenu().clear();
+        }
+    }
+
     public Menu getMenu() {
         return mToolbar.getMenu();
     }

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

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

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

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

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

@@ -6,8 +6,8 @@ import android.os.Bundle;
 import com.gh.common.util.EntranceUtils;
 import com.gh.gamecenter.GameDetailActivity;
 import com.gh.gamecenter.NewsDetailActivity;
-import com.gh.gamecenter.SubjectActivity;
 import com.gh.gamecenter.WebActivity;
+import com.gh.gamecenter.subject.SubjectActivity;
 import com.umeng.message.UmengNotificationClickHandler;
 import com.umeng.message.entity.UMessage;
 
@@ -38,7 +38,7 @@ public class GHUmengNotificationClickHandler extends UmengNotificationClickHandl
                     bundle.putString(EntranceUtils.KEY_GAMEID, target);
                     break;
                 case EntranceUtils.HOST_COLUMN:
-                    bundle.putString(EntranceUtils.KEY_TO, SubjectActivity.class.getSimpleName());
+                    bundle.putString(EntranceUtils.KEY_TO, SubjectActivity.class.getName());
                     bundle.putString(EntranceUtils.KEY_ID, target);
                     break;
                 case EntranceUtils.HOST_WEB:

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

@@ -0,0 +1,227 @@
+package com.gh.base
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import android.preference.PreferenceManager
+import android.support.v4.app.NotificationCompat
+import android.text.TextUtils
+import android.view.View
+import com.gh.common.notifier.Notifier
+import com.gh.common.util.DataUtils
+import com.gh.common.util.EntranceUtils
+import com.gh.common.util.StringUtils
+import com.gh.common.util.toObject
+import com.gh.gamecenter.R
+import com.gh.gamecenter.entity.PushEntity
+import com.gh.gamecenter.entity.PushMessageEntity
+import com.gh.gamecenter.entity.PushMessageUnreadEntity
+import com.gh.gamecenter.entity.PushNotificationEntity
+import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.message.MessageUnreadRepository
+import com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity
+import com.gh.gamecenter.receiver.UmengMessageReceiver
+import com.gh.gamecenter.receiver.UmengMessageReceiver.Companion.TYPE_CLICK
+import com.gh.gamecenter.receiver.UmengMessageReceiver.Companion.TYPE_REMOVE
+import com.gh.gamecenter.retrofit.Response
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.google.gson.Gson
+import com.umeng.message.UmengMessageService
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import okhttp3.MediaType
+import okhttp3.RequestBody
+import okhttp3.ResponseBody
+import org.android.agoo.common.AgooConstants
+import org.json.JSONObject
+import retrofit2.HttpException
+import java.util.*
+
+class GHUmengNotificationService : UmengMessageService() {
+
+    companion object {
+        const val ACTION_UMENG = "com.gh.gamecenter.UMENG"
+        const val MESSAGE_FROM_SYSTEM = "message_from_system"
+        const val HALO_MESSAGE_DIALOG = "HALO_MESSAGE_DIALOG"
+        const val HALO_MESSAGE_CENTER = "HALO_MESSAGE_CENTER"
+        const val ANSWER = "answer"
+        const val FOLLOW_QUESTION = "follow_question"
+        const val NOTIFICATION_ID = 2015
+        const val DISPLAY_TYPE_NOTIFICATION = "notification"
+        const val DISPLAY_TYPE_CUSTOM = "custom"
+        const val MESSAGE_ID = "message_id"
+        const val PUSH_ID = "push_id"
+    }
+
+    val notificationTags = arrayOf("GH_UMENG_TAG_1", "GH_UMENG_TAG_2", "GH_UMENG_TAG_3")
+    val gson = Gson()
+
+    override fun onMessage(context: Context, intent: Intent) {
+        val message = intent.getStringExtra(AgooConstants.MESSAGE_BODY)
+        val isMessageFromSystem = intent.getBooleanExtra(MESSAGE_FROM_SYSTEM, false)
+
+        try {
+            val pushData = message.toObject<PushEntity>()
+            pushData?.let { handlePushData(context, it, message, isMessageFromSystem) }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    private fun handlePushData(context: Context, pushData: PushEntity, message: String, isMessageFromSystem: Boolean) {
+        val notificationManager = context.applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+        if (pushData.displayType == DISPLAY_TYPE_NOTIFICATION) {
+            // 其它类型的透传信息
+            // 显示到通知栏
+            val msg = message.toObject<PushNotificationEntity>()
+            val data = msg?.extra?.data
+
+            // 系统推送(非自定义信息)，直接处理跳转
+            if (isMessageFromSystem) {
+                val intent = Intent()
+                intent.setClass(context, UmengMessageReceiver::class.java)
+                intent.putExtra(EntranceUtils.KEY_DATA, data?.link)
+                intent.putExtra(EntranceUtils.KEY_TYPE, UmengMessageReceiver.DIRECT_ONLY)
+                intent.putExtra(EntranceUtils.KEY_MESSAGE, message)
+                context.sendBroadcast(intent)
+                return
+            }
+
+            // 用户未登录的情况下不生成消息中心通知，避免用户掉登录了还收到跳转至消息中心的通知
+            if (data != null
+                    && data.link?.target == "system"
+                    && !UserManager.getInstance().isLoggedIn) {
+                return
+            }
+
+            val clickIntent = Intent()
+            val removeIntent = Intent()
+
+            clickIntent.setClass(context, UmengMessageReceiver::class.java)
+            clickIntent.putExtra(EntranceUtils.KEY_DATA, data?.link)
+            clickIntent.putExtra(EntranceUtils.KEY_MESSAGE, message)
+            clickIntent.putExtra(MESSAGE_ID, msg?.msgId)
+            clickIntent.putExtra(PUSH_ID, data?.pushId)
+            clickIntent.putExtra(EntranceUtils.KEY_TYPE, TYPE_CLICK)
+
+            removeIntent.setClass(context, UmengMessageReceiver::class.java)
+            removeIntent.putExtra(EntranceUtils.KEY_TYPE, TYPE_REMOVE)
+            removeIntent.putExtra(EntranceUtils.KEY_MESSAGE, message)
+
+            val clickPendingIntent = PendingIntent.getBroadcast(context, System.currentTimeMillis().toInt(),
+                    clickIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+
+            val deletePendingIntent = PendingIntent.getBroadcast(context, System.currentTimeMillis().toInt() + 1,
+                    removeIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                val channel = NotificationChannel("Halo_Push", "Halo_Push", NotificationManager.IMPORTANCE_DEFAULT)
+                notificationManager.createNotificationChannel(channel)
+            }
+
+            val notification = NotificationCompat.Builder(context, "Halo_Push")
+                    .setSmallIcon(R.drawable.ic_notification)
+                    .setTicker(pushData.body?.ticker)
+                    .setContentTitle(pushData.body?.title)
+                    .setContentText(pushData.body?.text)
+                    .setContentIntent(clickPendingIntent)
+                    .setDeleteIntent(deletePendingIntent)
+                    .build()
+            notification.flags = notification.flags or Notification.FLAG_AUTO_CANCEL
+
+            notificationManager.notify(getNotificationTag(context), NOTIFICATION_ID, notification)
+        } else {
+            if (HALO_MESSAGE_DIALOG == pushData.body?.custom) {
+                // 回答了问题或者关注了问题的消息
+                val msg = gson.fromJson(message, PushMessageEntity::class.java)
+                val data = msg?.extra?.data
+
+                val type = if (ANSWER == data?.type) {
+                    "回答了你的问题"
+                } else {
+                    "回答了你关注的问题"
+                }
+
+                val userName = StringUtils.shrinkStringWithDot(data?.userEntity?.name, 8)
+                val displayText = userName + type
+
+                if (Notifier.isActivityValid(CurrentActivityHolder.getCurrentActivity()) &&
+                        Notifier.shouldShowNotifier(data?.answer?.id + displayText)) {
+                    Notifier.create(CurrentActivityHolder.getCurrentActivity())
+                            .setText(displayText)
+                            .setDuration(5000)
+                            .setIcon(data?.userEntity?.icon)
+                            .setOnClickListener(View.OnClickListener { _ ->
+                                val bundle = Bundle()
+                                bundle.putString(EntranceUtils.KEY_ANSWER_ID, data?.answer?.id)
+                                bundle.putString(EntranceUtils.KEY_ENTRANCE, EntranceUtils.ENTRANCE_UMENG)
+                                bundle.putString(EntranceUtils.KEY_TO, AnswerDetailActivity::class.java.name)
+                                EntranceUtils.jumpActivity(context, bundle)
+
+                                DataUtils.onMtaEvent(context, "消息弹窗",
+                                        type, "Does not contains any parameter.")
+
+                                // 标记已读
+                                val jsonObject = JSONObject()
+                                jsonObject.put("type", type)
+                                val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString())
+                                RetrofitManager.getInstance(application).api.postMessageRead(UserManager.getInstance().userId, data?.id, body)
+                                        .subscribeOn(Schedulers.io())
+                                        .observeOn(AndroidSchedulers.mainThread())
+                                        .subscribe(object : Response<ResponseBody>() {
+                                            override fun onResponse(response: ResponseBody?) {
+                                                super.onResponse(response)
+                                                MessageUnreadRepository.loadMessageUnreadData()
+                                            }
+
+                                            override fun onFailure(e: HttpException?) {
+                                                e?.printStackTrace()
+                                            }
+                                        })
+
+                                Notifier.hide()
+                            })
+                            .show(false)
+                    Notifier.tagNotifierAsShowed(data?.answer?.id + displayText)
+                }
+            } else if (HALO_MESSAGE_CENTER == pushData.body?.custom) {
+                // 消息中心逻辑
+                val msg = gson.fromJson(message, PushMessageUnreadEntity::class.java)
+                val data = msg?.extra?.data
+                data?.let { MessageUnreadRepository.loadMessageUnreadData() }
+            }
+        }
+    }
+
+    /**
+     * 规则:最多三条消息,以旧换新
+     *
+     * @return NotificationTag
+     */
+    private fun getNotificationTag(context: Context): String {
+        val sp = PreferenceManager.getDefaultSharedPreferences(context)
+        val edit = sp.edit()
+
+        val timeTagMap = HashMap<Long, String>()
+        for (tag in notificationTags) {
+            val time = sp.getLong(tag, 0)
+            if (time == 0L) {
+                edit.putLong(tag, System.currentTimeMillis()).apply()
+                return tag
+            } else {
+                timeTagMap[time] = tag
+            }
+        }
+
+        val minTime = Collections.min(timeTagMap.keys)
+        val tag = timeTagMap[minTime]
+        edit.putLong(tag, System.currentTimeMillis()).apply()
+        return if (TextUtils.isEmpty(tag)) notificationTags[0] else tag!!
+    }
+}

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

@@ -10,6 +10,7 @@ import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -29,9 +30,9 @@ import java.lang.ref.WeakReference;
 import java.util.List;
 
 import butterknife.ButterKnife;
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE;
 
@@ -42,6 +43,8 @@ import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE;
 public abstract class BaseFragment<T> extends Fragment implements OnRequestCallBackListener<T>,
         View.OnClickListener, OnListClickListener, OnTitleClickListener {
 
+    public static final int RESULT_REFRESH = 9528;
+
     protected View mCachedView;
 
     protected boolean isEverPause;
@@ -111,6 +114,9 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
         super.onCreate(savedInstanceState);
         final Intent intent = getActivity().getIntent();
         mEntrance = intent.getStringExtra(KEY_ENTRANCE);
+        if (TextUtils.isEmpty(mEntrance) && getArguments() != null) {
+            mEntrance = getArguments().getString(KEY_ENTRANCE);
+        }
 
         isEverPause = false;
         EventBus.getDefault().register(this);
@@ -126,10 +132,10 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
         initView(mCachedView);
     }
 
-    //TODO 尴尬，必须的有subscribe才能register
+    // 必须的有subscribe才能register
     @Subscribe(threadMode = ThreadMode.BACKGROUND)
     public void onDummyEvent(EBMiPush push) {
-        //
+
     }
 
     @Nullable

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

@@ -1,5 +1,6 @@
 package com.gh.base.fragment;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -54,7 +55,18 @@ public abstract class BaseFragment_TabLayout extends NormalFragment implements V
 
     @Override
     protected int getLayoutId() {
-        return R.layout.fragment_taglyout_viewpager;
+        return R.layout.fragment_tablayout_viewpager;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        List<Fragment> fragments = getChildFragmentManager().getFragments();
+        if (fragments != null) {
+            for (Fragment fragment : fragments) {
+                fragment.onActivityResult(requestCode, resultCode, data);
+            }
+        }
     }
 
     @Override

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

@@ -21,6 +21,8 @@ public class WaitingDialogFragment extends BaseDialogFragment {
 
     private OnDialogBackListener mBackListener;
 
+    private TextView message;
+
     public static WaitingDialogFragment newInstance(String message) {
         Bundle args = new Bundle();
         args.putString(KEY_MSG, message);
@@ -43,7 +45,7 @@ public class WaitingDialogFragment extends BaseDialogFragment {
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         final View view = inflater.inflate(R.layout.set_wait_dialog, null);
-        final TextView message = (TextView) view.findViewById(R.id.set_wait_message);
+        message = (TextView) view.findViewById(R.id.set_wait_message);
         message.setText(getArguments().getString(KEY_MSG));
         return view;
     }
@@ -62,6 +64,10 @@ public class WaitingDialogFragment extends BaseDialogFragment {
         this.mBackListener = backListener;
     }
 
+    public void uploadWaitingHint(String hint) {
+        if (message != null) message.setText(hint);
+    }
+
     @Override
     public boolean onBack() {
         if (mBackListener != null) {

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

@@ -0,0 +1,25 @@
+package com.gh.common
+
+import android.os.Handler
+import android.os.Looper
+import java.util.concurrent.Executor
+import java.util.concurrent.Executors
+
+object AppExecutor {
+    @JvmStatic
+    var ioExecutor = Executors.newSingleThreadExecutor()
+    @JvmStatic
+    var uiExecutor = MainThreadExecutor()
+
+    class MainThreadExecutor : Executor {
+        private val mainThreadHandler = Handler(Looper.getMainLooper())
+
+        override fun execute(command: Runnable) {
+            mainThreadHandler.post(command)
+        }
+
+        fun executeWithDelay(command: Runnable, delay: Long) {
+            mainThreadHandler.postDelayed(command, delay)
+        }
+    }
+}

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

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

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

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

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

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

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

@@ -1,11 +1,13 @@
 package com.gh.common.constant;
 
-
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
+import com.gh.common.util.GsonUtils;
+import com.gh.common.util.PackageHelper;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.entity.NewsEntity;
 import com.gh.gamecenter.entity.SettingsEntity;
@@ -41,45 +43,51 @@ public class Config {
     public static final String UMENG_APPKEY = BuildConfig.UMENG_APPKEY;
     public static final String UMENG_MESSAGE_SECRET = BuildConfig.UMENG_MESSAGE_SECRET;
     public static final String BUGLY_APPID = BuildConfig.BUGLY_APPID;
-    public static final String PATCH_VERSION_NAME = BuildConfig.PATCH_VERSION_NAME; // 补丁包版本 对应关于->版本号
     // http://www.ghzs666.com/article/${articleId}.html
-    public static final String URL_ARTICLE = "http://www.ghzs666.com/article/"; // TODO ghzs/ghzs666 统一
+    public static final String URL_ARTICLE = "http://www.ghzs666.com/article/"; // ghzs/ghzs666 统一
     public static final String PATCHES = "patches";
 
+    private static String SETTINGS_KEY = "settingsKey";
+
     private static SettingsEntity mSettingsEntity;
 
+    public static final String FIX_DOWNLOAD_KEY = "isFixDownload";
+    public static final String FIX_PLUGIN_KEY = "isFixPlugin";
+    public static final String FIX_ARTICLE_KEY = "isFixArticle";
+    public static final String FIX_COMMUNITY_KEY = "isFixCommunity";
+
+
     public static boolean isShow() {
-        if (PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication())
-                .getBoolean("isFixDownload", false)) return true;
+        if (getPreferences().getBoolean(FIX_DOWNLOAD_KEY, false)) return true;
 
         if (!isExistDownloadFilter()) return false;
 
-        for (SettingsEntity.Download entity : mSettingsEntity.getDownload()) {
+        for (SettingsEntity.Download entity : getSettings().getDownload()) {
             if ("all".equals(entity.getGame())) {
-                if (entity.isPluginfy() && "normal".equals(entity.getPolicy()) && filterTime(entity.getTime())) {
+                if (entity.getPluginfy() && "normal".equals(entity.getPolicy()) && filterTime(entity.getTime())) {
                     return true;
                 }
             }
         }
-
         return false;
     }
 
-    public static String getExceptionMsg(Context context) {
-        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
-        return sp.getString("errMsg", null);
+    public static String getExceptionMsg() {
+        return getPreferences().getString("errMsg", null);
     }
 
-    public static void setExceptionMsg(Context context, String errMsg) {
-        PreferenceManager.getDefaultSharedPreferences(context).edit().putString("errMsg", errMsg).apply();
+    public static void setExceptionMsg(String errMsg) {
+        getPreferences().edit().putString("errMsg", errMsg).apply();
     }
 
     public static boolean isShowDownload(String gameId) {
 
+        if (getPreferences().getBoolean(FIX_DOWNLOAD_KEY, false)) return true;
+
         if (TextUtils.isEmpty(gameId) || !isExistDownloadFilter())
             return false;
 
-        for (SettingsEntity.Download entity : mSettingsEntity.getDownload()) {
+        for (SettingsEntity.Download entity : getSettings().getDownload()) {
             if (gameId.equals(entity.getGame())) {
                 if ("normal".equals(entity.getPolicy()) && filterTime(entity.getTime())) {
                     return true;
@@ -87,8 +95,7 @@ public class Config {
                     return false;
                 }
             } else if ("all".equals(entity.getGame())) {
-                if ("normal".equals(entity.getPolicy()) && filterTime(entity.getTime())
-                        || PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication()).getBoolean("isFixDownload", false)) {
+                if ("normal".equals(entity.getPolicy()) && filterTime(entity.getTime())) {
                     return true;
                 }
             }
@@ -102,15 +109,22 @@ public class Config {
         if (TextUtils.isEmpty(gameId) || !isExistDownloadFilter())
             return false;
 
-        for (SettingsEntity.Download entity : mSettingsEntity.getDownload()) {
+        for (SettingsEntity.Download entity : getSettings().getDownload()) {
             if (gameId.equals(entity.getGame())) {
-                if (entity.isPluginfy() && filterTime(entity.getTime())) {
+                if (entity.getPluginfy() && filterTime(entity.getTime())) {
                     return true;
                 } else {
                     return false;
                 }
-            } else if ("all".equals(entity.getGame())) {
-                if (entity.isPluginfy() && filterTime(entity.getTime())) {
+            }
+
+            SharedPreferences preferences = getPreferences();
+            boolean isFixPlugin = preferences.getBoolean(FIX_PLUGIN_KEY, false);
+            if (isFixPlugin) return true;
+
+            if ("all".equals(entity.getGame())) {
+                if (entity.getPluginfy() && filterTime(entity.getTime())) {
+                    preferences.edit().putBoolean(FIX_PLUGIN_KEY, true).apply();
                     return true;
                 }
             }
@@ -123,9 +137,9 @@ public class Config {
         if (!isExistDownloadFilter())
             return false;
 
-        for (SettingsEntity.Download entity : mSettingsEntity.getDownload()) {
+        for (SettingsEntity.Download entity : getSettings().getDownload()) {
             if ("all".equals(entity.getGame())) {
-                if (entity.isPluginfy() && filterTime(entity.getTime())) {
+                if (entity.getPluginfy() && filterTime(entity.getTime())) {
                     return true;
                 }
             }
@@ -147,15 +161,30 @@ public class Config {
     }
 
     public static void setSettings(SettingsEntity settingsEntity) {
+        getPreferences().edit().putString(SETTINGS_KEY, GsonUtils.toJson(settingsEntity)).apply();
         mSettingsEntity = settingsEntity;
+
+        // 加载完设置后刷新下
+        PackageHelper.initList();
     }
 
+    @Nullable
     public static SettingsEntity getSettings() {
+        if (mSettingsEntity == null) {
+            try {
+                String json = getPreferences().getString(SETTINGS_KEY, null);
+                if (!TextUtils.isEmpty(json)) {
+                    mSettingsEntity = GsonUtils.fromJson(json, SettingsEntity.class);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
         return mSettingsEntity;
     }
 
     private static boolean isExistDownloadFilter() {
-        if (mSettingsEntity == null || mSettingsEntity.getDownload() == null || mSettingsEntity.getDownload().size() == 0) {
+        if (getSettings() == null || getSettings().getDownload() == null || getSettings().getDownload().size() == 0) {
             return false;
         } else {
             return true;
@@ -175,4 +204,27 @@ public class Config {
         }
     }
 
+    public static SharedPreferences getPreferences() {
+        return PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication());
+    }
+
+    public static boolean isExistHideFunction() {
+        SharedPreferences preferences = getPreferences();
+        if (!preferences.getBoolean(FIX_DOWNLOAD_KEY, false)) return true;
+        if (!preferences.getBoolean(FIX_PLUGIN_KEY, false)) return true;
+        if (!preferences.getBoolean(FIX_COMMUNITY_KEY, false)) return true;
+        if (!preferences.getBoolean(FIX_ARTICLE_KEY, false)) return true;
+        return false;
+    }
+
+    public static void fixHideFunction() {
+        SharedPreferences preferences = PreferenceManager.
+                getDefaultSharedPreferences(HaloApp.getInstance().getApplication());
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putBoolean(Config.FIX_DOWNLOAD_KEY, true);
+        editor.putBoolean(Config.FIX_ARTICLE_KEY, true);
+        editor.putBoolean(Config.FIX_COMMUNITY_KEY, true);
+        editor.putBoolean(Config.FIX_PLUGIN_KEY, true);
+        editor.apply();
+    }
 }

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

@@ -15,6 +15,14 @@ public class Constants {
     public static final String USER_TOKEN_KEY = "userTokenKey";
     public static final String USER_INFO_KEY = "userInfoKey";
 
+    public static final String DEVICE_KEY = "deviceKey";
+
+    public static final String XPOSED_INSTALLER_PACKAGE_NAME = "de.robv.android.xposed.installer";
+
+    // 最近显示的弹窗信息
+    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 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}$";

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

@@ -26,6 +26,7 @@ public class ItemViewType {
     public static final int GAME_PLUGIN = 18;     // 游戏插件模块
     public static final int ASK_REFRESH = 19;     // 问答精选 刷新
     public static final int ITEM_EMPTY = 20;
+    public static final int ASK_CONCERN = 21;     // 问答精选 关注
 
     /**
      * 普通列表

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

@@ -22,10 +22,12 @@ import com.gh.common.util.DialogUtils;
 import com.gh.common.util.DisplayUtils;
 import com.gh.common.util.GameUtils;
 import com.gh.common.util.GameViewUtils;
+import com.gh.common.util.ImageUtils;
 import com.gh.common.util.KaiFuUtils;
-import com.gh.common.util.NetworkUtils;
 import com.gh.common.util.NewsUtils;
+import com.gh.common.util.NumberUtils;
 import com.gh.common.util.PackageUtils;
+import com.gh.common.util.PlatformUtils;
 import com.gh.common.util.StringUtils;
 import com.gh.common.view.DownloadDialog;
 import com.gh.common.view.DownloadProgressBar;
@@ -38,8 +40,9 @@ import com.gh.gamecenter.databinding.KaifuDetailItemRowBinding;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.entity.KaiFuCalendarEntity;
+import com.gh.gamecenter.entity.PluginLocation;
 import com.gh.gamecenter.eventbus.EBReuse;
-import com.gh.gamecenter.manager.PackageManager;
+import com.gh.gamecenter.manager.PackagesManager;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.FileUtils;
 import com.lightgame.utils.Utils;
@@ -56,9 +59,15 @@ import java.util.Locale;
 
 public class BindingAdapters {
 
+    @BindingAdapter("imageIcon")
+    public static void loadIcon(SimpleDraweeView view, String imageUrl) {
+        ImageUtils.displayIcon(view, imageUrl);
+    }
+
+
     @BindingAdapter("imageUrl")
     public static void loadImage(SimpleDraweeView view, String imageUrl) {
-        view.setImageURI(imageUrl);
+        ImageUtils.display(view, imageUrl);
     }
 
     @BindingAdapter({"addDetailKaiFuView", "addDetailKaiFuViewListener", "isReadyPatch"})
@@ -96,6 +105,12 @@ public class BindingAdapters {
         }
     }
 
+    // 如果超过10000，则转换为1.0W
+    @BindingAdapter("transSimpleCount")
+    public static void transSimpleCount(TextView view, int count) {
+        view.setText(NumberUtils.transSimpleCount(count));
+    }
+
     @BindingAdapter({"addKaiFuView", "clickListener"})
     public static void addKaiFuView(LinearLayout view, List<KaiFuCalendarEntity> list, OnViewClickListener listener) {
         if (list == null) return;
@@ -302,15 +317,13 @@ public class BindingAdapters {
             progressBar.setText("暂无下载");
             progressBar.setDownloadType(DownloadProgressBar.DownloadType.NONE);
         } else {
-            String status = GameUtils.getDownloadBtnText(progressBar.getContext(), gameEntity);
+            String status = GameUtils.getDownloadBtnText(progressBar.getContext(), gameEntity, PluginLocation.only_game);
             switch (status) {
                 case "插件化":
                     progressBar.setDownloadType(DownloadProgressBar.DownloadType.PLUGIN);
                     break;
                 case "打开":
-                    if (gameEntity.getApk().size() == 1) {
-                        status = "启动";
-                    }
+                case "启动":
                     progressBar.setDownloadType(DownloadProgressBar.DownloadType.LAUNCH_OR_OPEN);
                     break;
                 default:
@@ -332,7 +345,7 @@ public class BindingAdapters {
                     case neterror:
                     case waiting:
                         progressBar.setText(R.string.downloading);
-                        if (downloadEntity.isPluggable() && PackageManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
+                        if (downloadEntity.isPluggable() && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
                             progressBar.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_PLUGIN);
                         } else {
                             progressBar.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_NORMAL);
@@ -341,7 +354,7 @@ public class BindingAdapters {
                     case done:
                         progressBar.setText(R.string.install);
                         if (downloadEntity.isPluggable()
-                                && PackageManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
+                                && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
                             progressBar.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_PLUGIN);
                         } else {
                             progressBar.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_NORMAL);
@@ -372,13 +385,8 @@ public class BindingAdapters {
                 case NORMAL:
                 case PLUGIN:
                     if (gameEntity.getApk().size() == 1) {
-                        if (NetworkUtils.isWifiConnected(v.getContext())) {
-                            download(progressBar, gameEntity, traceEvent);
-                        } else {
-                            DialogUtils.showDownloadDialog(v.getContext(), () -> {
-                                download(progressBar, gameEntity, traceEvent);
-                            });
-                        }
+                        DialogUtils.checkDownload(v.getContext(), gameEntity.getApk().get(0).getSize(),
+                                isSubscribe -> download(progressBar, gameEntity, traceEvent, isSubscribe));
                     } else {
                         DownloadDialog.getInstance(v.getContext()).showPopupWindow(v, gameEntity,
                                 "(我的光环:我的游戏)", "我的光环-我的游戏:" + gameEntity.getName(), traceEvent);
@@ -401,13 +409,14 @@ public class BindingAdapters {
                             PackageUtils.launchSetup(v.getContext(), downloadEntity.getPath());
                         }
                     }
+                    break;
             }
         });
     }
 
     // 开始下载
     private static void download(DownloadProgressBar progressBar, GameEntity
-            gameEntity, ExposureEvent traceEvent) {
+            gameEntity, ExposureEvent traceEvent, boolean isSubscribe) {
         String str = progressBar.getText();
         String method;
         if (str.contains("更新")) {
@@ -420,15 +429,16 @@ public class BindingAdapters {
         ApkEntity apkEntity = gameEntity.getApk().get(0);
         String msg = FileUtils.isCanDownload(progressBar.getContext(), apkEntity.getSize());
         if (TextUtils.isEmpty(msg)) {
-            DataUtils.onGameDownloadEvent(progressBar.getContext(), gameEntity.getName(), apkEntity.getPlatform(), "(我的光环:我的游戏)", "下载开始");
+            DataUtils.onGameDownloadEvent(progressBar.getContext(), gameEntity.getName(), apkEntity.getPlatform(), "(我的光环:我的游戏)", "下载开始", method);
 
-            ExposureEvent downloadExposureEvent = ExposureUtils.INSTANCE.logADownloadExposureEvent(gameEntity, apkEntity.getPlatform(), traceEvent, ExposureUtils.DownloadType.DOWNLOAD);
+            ExposureEvent downloadExposureEvent = ExposureUtils.logADownloadExposureEvent(gameEntity, apkEntity.getPlatform(), traceEvent, ExposureUtils.DownloadType.DOWNLOAD);
 
             DownloadManager.createDownload(progressBar.getContext(),
                     apkEntity,
                     gameEntity,
                     method,
                     StringUtils.buildString("(我的光环:我的游戏)"), "我的光环-我的游戏:" + gameEntity.getName(),
+                    isSubscribe,
                     downloadExposureEvent);
 
             progressBar.setProgress(0);
@@ -470,4 +480,16 @@ public class BindingAdapters {
             layout.setRefreshing(false);
         }
     }
+
+    @BindingAdapter({"setGameName", "isShowPlatform"})
+    public static void setGameName(TextView view, GameEntity game, boolean isShowPlatform) {
+        if (isShowPlatform && game.getApk().size() > 0) {
+            view.setText(String.format("%s - %s", game.getName(),
+                    PlatformUtils.getInstance(view.getContext()).getPlatformName(
+                            game.getApk().get(0).getPlatform())));
+        } else {
+            view.setText(game.getName());
+        }
+
+    }
 }

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

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

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

@@ -15,7 +15,7 @@ import java.util.*
 @Parcelize
 @Entity(tableName = "exposureEvent")
 data class ExposureEvent(
-        val payload: ExposureEntity,
+        var payload: ExposureEntity,
         val source: List<ExposureSource>,
         var eTrace: List<ExposureEvent>? = arrayListOf(),
         val event: ExposureType,
@@ -26,7 +26,7 @@ data class ExposureEvent(
     companion object {
         fun createEvent(gameEntity: GameEntity?, source: List<ExposureSource>, eTrace: List<ExposureEvent>?, event: ExposureType): ExposureEvent {
             return ExposureEvent(
-                    ExposureEntity(gameId = gameEntity?.id,
+                    payload = ExposureEntity(gameId = gameEntity?.id,
                             gameName = gameEntity?.name,
                             sequence = gameEntity?.sequence,
                             platform = gameEntity?.platform,

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

@@ -4,7 +4,6 @@ import android.arch.persistence.room.*
 
 @Dao
 interface ExposureEventDao {
-
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insertMany(eventList: List<ExposureEvent>)
 

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

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

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

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

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

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

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

@@ -1,12 +1,16 @@
 package com.gh.common.exposure
 
+import com.gh.common.util.toObject
 import com.gh.gamecenter.entity.GameEntity
-import com.google.gson.Gson
 import java.util.*
 
 object ExposureUtils {
 
-    fun logADownloadExposureEvent(entity: GameEntity, platform: String?, traceEvent: ExposureEvent?, downloadType: DownloadType): ExposureEvent {
+    @JvmStatic
+    fun logADownloadExposureEvent(entity: GameEntity,
+                                  platform: String?,
+                                  traceEvent: ExposureEvent?,
+                                  downloadType: DownloadType): ExposureEvent {
         val gameEntity = entity.clone()
         gameEntity.platform = platform
         gameEntity.downloadType = downloadType.toString()
@@ -14,20 +18,24 @@ object ExposureUtils {
                 source = traceEvent?.source ?: ArrayList(),
                 eTrace = ExposureTraceUtils.appendTrace(traceEvent),
                 event = ExposureType.DOWNLOAD)
-        ExposureManager.log(exposureEvent, false)
+        ExposureManager.log(exposureEvent)
         return exposureEvent
     }
 
-    fun logADownloadCompleteExposureEvent(entity: GameEntity, platform: String?, trace: String?, downloadType: DownloadType) {
+    @JvmStatic
+    fun logADownloadCompleteExposureEvent(entity: GameEntity,
+                                          platform: String?,
+                                          trace: String?,
+                                          downloadType: DownloadType) {
         val gameEntity = entity.clone()
         gameEntity.platform = platform
         gameEntity.downloadCompleteType = downloadType.toString()
-        val traceEvent = Gson().fromJson(trace, ExposureEvent::class.java)
+        val traceEvent = trace?.toObject<ExposureEvent>()
         val exposureEvent = ExposureEvent.createEvent(gameEntity = gameEntity,
                 source = traceEvent?.source ?: ArrayList(),
                 eTrace = ExposureTraceUtils.appendTrace(traceEvent),
                 event = ExposureType.DOWNLOAD_COMPLETE)
-        ExposureManager.log(exposureEvent, false)
+        ExposureManager.log(exposureEvent)
     }
 
     enum class DownloadType {

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

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

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

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

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

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

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

@@ -15,9 +15,10 @@ data class Meta(
         val android_sdk: Int? = -1,
         val android_version: String? = "",
         val network: String? = "",
-        val ip: String? = "",
         val os: String? = "",
+        val gid: String? = "",
         val channel: String? = "",
         val appVersion: String? = "",
-        val userId: String? = ""
+        val userId: String? = "",
+        val exposureVersion: String? = ""
 ) : Parcelable

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

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

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

@@ -1,8 +1,10 @@
 package com.gh.common.exposure.time
 
+import com.gh.gamecenter.entity.TimeEntity
+import com.gh.gamecenter.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
-import rx.schedulers.Schedulers
+import io.reactivex.schedulers.Schedulers
 import kotlin.concurrent.fixedRateTimer
 
 class Corrector {
@@ -17,11 +19,12 @@ class Corrector {
         fixedRateTimer("TimeUtil-Corrector-Checker", initialDelay = 0, period = TIME_CORRECTOR_ADJUST_PERIOD) {
             RetrofitManager.getInstance(HaloApp.getInstance().application).api.time
                     .subscribeOn(Schedulers.io())
-                    .subscribe({
-                        val serverTime = java.lang.Long.parseLong(it.string())
-                        delta = serverTime * 1000 - System.currentTimeMillis()
-                    }, Throwable::printStackTrace)
+                    .subscribe(object : Response<TimeEntity>() {
+                        override fun onResponse(response: TimeEntity?) {
+                            val serverTime = response?.time
+                            serverTime?.let { delta = it * 1000 - System.currentTimeMillis() }
+                        }
+                    })
         }
     }
-
 }

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,170 @@
+package com.gh.common.notifier
+
+import android.app.Activity
+import android.support.v4.view.ViewCompat
+import android.view.View
+import android.view.ViewGroup
+import com.gh.common.util.SPUtils
+import com.gh.gamecenter.*
+import java.lang.ref.WeakReference
+
+@Suppress("DEPRECATION")
+class Notifier private constructor() {
+
+    companion object {
+
+        private var activityWeakReference: WeakReference<Activity>? = null
+
+        private const val SP_VIEWED_NOTIFIER = "viewed_notifier"
+
+        /**
+         * 根据内容决定是否显示 Notifier
+         */
+        @JvmStatic
+        fun shouldShowNotifier(content: String): Boolean {
+            val viewedNotifierCollection = SPUtils.getString(SP_VIEWED_NOTIFIER)
+            return !viewedNotifierCollection.contains(content)
+        }
+
+        /**
+         * 标记相应内容的 Notifier 已经显示过了
+         */
+        @JvmStatic
+        fun tagNotifierAsShowed(content: String) {
+            val viewedNotifierCollection = SPUtils.getString(SP_VIEWED_NOTIFIER)
+            if (viewedNotifierCollection.length > 3000) {
+                SPUtils.setString(SP_VIEWED_NOTIFIER, content)
+            } else {
+                SPUtils.setString(SP_VIEWED_NOTIFIER, viewedNotifierCollection + content)
+            }
+        }
+
+        @JvmStatic
+        fun create(activity: Activity?): Notifier {
+            if (activity == null) {
+                throw IllegalArgumentException("Activity cannot be null!")
+            }
+
+            val notifier = Notifier()
+
+            // Hide current NotifierView, if one is active
+            clearCurrent(activity)
+
+            notifier.setActivity(activity)
+            notifier.notifierView = NotifierView(activity)
+
+            return notifier
+        }
+
+        @JvmStatic
+        fun isActivityValid(activity: Activity?): Boolean {
+            if (activity == null) return false
+
+            return when (activity) {
+                is MessageActivity -> false
+                is DownloadManagerActivity -> false
+                is CleanApkActivity -> false
+                is SplashScreenActivity -> false
+                else -> isNotExistInActivity(activity)
+            }
+        }
+
+        @JvmStatic
+        fun isNotExistInActivity(activity: Activity?): Boolean {
+            if (activity == null) return false
+
+            (activity.window?.decorView as? ViewGroup)?.let {
+                //Find all NotifierView Views in Parent layout
+                for (i in 0..it.childCount) {
+                    val childView = if (it.getChildAt(i) is NotifierView) it.getChildAt(i) as NotifierView else null
+                    if (childView != null && childView.windowToken != null) {
+                        return false
+                    }
+                }
+            }
+            return true
+        }
+
+        /**
+         * Cleans up the currently showing notifierView view, if one is present
+         *
+         * @param activity The current Activity
+         */
+        @JvmStatic
+        fun clearCurrent(activity: Activity?) {
+            (activity?.window?.decorView as? ViewGroup)?.let {
+                //Find all NotifierView Views in Parent layout
+                for (i in 0..it.childCount) {
+                    val childView = if (it.getChildAt(i) is NotifierView) it.getChildAt(i) as NotifierView else null
+                    if (childView != null && childView.windowToken != null) {
+                        ViewCompat.animate(childView).alpha(0f).withEndAction(getRemoveViewRunnable(childView))
+                    }
+                }
+            }
+        }
+
+        @JvmStatic
+        fun hide() {
+            activityWeakReference?.get()?.let { clearCurrent(it) }
+        }
+
+        private fun getRemoveViewRunnable(childView: NotifierView?): Runnable {
+            return Runnable {
+                childView?.let {
+                    (childView.parent as? ViewGroup)?.removeView(childView)
+                }
+            }
+        }
+    }
+
+    private var notifierView: NotifierView? = null
+
+    private val activityDecorView: ViewGroup?
+        get() {
+            var decorView: ViewGroup? = null
+
+            activityWeakReference?.get()?.let {
+                decorView = it.window.decorView as ViewGroup
+            }
+
+            return decorView
+        }
+
+    fun show(showVerticalTranslateAnimation: Boolean, delay: Long? = 0): NotifierView? {
+        activityWeakReference?.get()?.let {
+            it.runOnUiThread {
+                activityDecorView?.postDelayed({
+                    notifierView?.showVerticalTranslateAnimation = showVerticalTranslateAnimation
+                    activityDecorView?.addView(notifierView)
+                }, delay!!)
+            }
+        }
+
+        return notifierView
+    }
+
+    fun setIcon(url: String?): Notifier {
+        url?.let { notifierView?.setIcon(it) }
+        return this
+    }
+
+    fun setText(text: String?): Notifier {
+        notifierView?.setText(text)
+
+        return this
+    }
+
+    fun setDuration(time: Long): Notifier {
+        notifierView?.duration = time
+        return this
+    }
+
+    fun setOnClickListener(onClickListener: View.OnClickListener): Notifier {
+        notifierView?.findViewById<View>(R.id.cardView)?.setOnClickListener(onClickListener)
+        return this
+    }
+
+    private fun setActivity(activity: Activity) {
+        activityWeakReference = WeakReference(activity)
+    }
+}

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

@@ -0,0 +1,336 @@
+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.support.v4.view.ViewCompat
+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.widget.FrameLayout
+import com.gh.common.util.ImageUtils
+import com.gh.common.util.doOnEnd
+import com.gh.common.util.doOnStart
+import com.gh.gamecenter.R
+import kotlinx.android.synthetic.main.view_notifier.view.*
+
+class NotifierView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0)
+    : FrameLayout(context, attrs, defStyle) {
+
+    companion object {
+        const val SCALE_MINI = 0.2F
+        const val SCALE_DEFAULT = 1F
+
+        const val DEFAULT_DURATION = 500L
+    }
+
+    var onShowListener: OnShowNotificationListener? = null
+    var onHideListener: OnHideNotificationListener? = null
+
+    lateinit var expandAnimator: ValueAnimator
+    lateinit var shrinkAnimator: ValueAnimator
+
+    lateinit var translateUpAnimator: ObjectAnimator
+    lateinit var translateDownAnimator: ObjectAnimator
+
+    lateinit var translateToLeftAnimator: ObjectAnimator
+    lateinit var translateToRightAnimator: ObjectAnimator
+
+    lateinit var zoomInAnimator: ObjectAnimator
+    lateinit var zoomOutAnimator: ObjectAnimator
+
+    var showAnimatorSet: AnimatorSet
+    var hideAnimatorSet: AnimatorSet
+
+    var rightToLeftPath: Path
+    var leftToRightPath: Path
+
+    var veryRight: Float = 0F
+    var veryBottom: Float = 0F
+    var centerX: Float = 0F
+
+    var navigationHeight = 0
+
+    var textWidth: Int = 0
+    var cardViewWidth: Int = 0
+    var verticalAnimationOffset: Int = 0
+
+    var duration = DEFAULT_DURATION
+
+    var showVerticalTranslateAnimation: Boolean = true
+
+    init {
+        inflate(context, R.layout.view_notifier, this)
+
+        ViewCompat.setTranslationZ(this, Integer.MAX_VALUE.toFloat())
+
+        cardView.scaleX = SCALE_MINI
+        cardView.scaleY = SCALE_MINI
+
+        verticalAnimationOffset = dp2px(100F)
+
+        navigationHeight = retrieveNavigationHeight()
+
+        rightToLeftPath = Path()
+        leftToRightPath = Path()
+
+        showAnimatorSet = AnimatorSet()
+        hideAnimatorSet = AnimatorSet()
+    }
+
+    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
+        super.onLayout(changed, left, top, right, bottom)
+
+        centerX = (left + right - cardViewWidth) / 2F
+
+        // TODO Provide method to change these absolute offset.
+        val r = right - dp2px(72F).toFloat()
+        val b = bottom - dp2px(145F).toFloat() - navigationHeight
+
+        // Only set
+        if (veryRight != r || veryBottom != b) {
+            veryRight = r
+            veryBottom = b
+
+            rightToLeftPath.moveTo(r, b)
+            rightToLeftPath.lineTo(centerX, b)
+
+            leftToRightPath.moveTo(centerX, b)
+            leftToRightPath.lineTo(r, b)
+
+            initAnimator()
+        }
+    }
+
+    private fun initAnimator() {
+        expandAnimator = ValueAnimator.ofFloat(0F, 1F)
+        expandAnimator.duration = DEFAULT_DURATION
+        expandAnimator.addUpdateListener { a ->
+            val progress = a?.animatedValue as Float
+            tvText.width = (textWidth * progress).toInt()
+        }
+        expandAnimator.doOnEnd {
+            enableSwipeToDismiss()
+            shrinkAfterDelay()
+        }
+
+        shrinkAnimator = ValueAnimator.ofFloat(1F, 0F)
+        shrinkAnimator.duration = DEFAULT_DURATION
+        shrinkAnimator.addUpdateListener { a ->
+            val progress = a?.animatedValue as Float
+            tvText.width = (textWidth * progress).toInt()
+        }
+        shrinkAnimator.doOnEnd {
+            val lp = FrameLayout.LayoutParams(cardView.layoutParams)
+            lp.gravity = Gravity.NO_GRAVITY
+            cardView.layoutParams = lp
+
+            disableSwipeToDismiss()
+        }
+
+        translateToLeftAnimator = ObjectAnimator.ofFloat(cardView, "translationX", veryRight, centerX)
+        translateToLeftAnimator.duration = DEFAULT_DURATION
+        translateToLeftAnimator.doOnEnd {
+            onShowListener?.onShow()
+
+            val lp = FrameLayout.LayoutParams(cardView.layoutParams)
+            lp.gravity = Gravity.CENTER_HORIZONTAL
+            cardView.layoutParams = lp
+            cardView.translationX = 0f
+
+            expandAnimator.start()
+        }
+
+        translateToRightAnimator = ObjectAnimator.ofFloat(cardView, "translationX", centerX, veryRight)
+        translateToRightAnimator.duration = DEFAULT_DURATION
+
+        translateUpAnimator = ObjectAnimator.ofFloat(cardView, "translationY", veryBottom + verticalAnimationOffset, veryBottom)
+        translateUpAnimator.duration = DEFAULT_DURATION
+        translateUpAnimator.doOnStart { cardView.translationX = veryRight }
+
+        translateDownAnimator = ObjectAnimator.ofFloat(cardView, "translationY", veryBottom, veryBottom + verticalAnimationOffset)
+        translateDownAnimator.duration = DEFAULT_DURATION
+
+        zoomInAnimator = ObjectAnimator.ofPropertyValuesHolder(cardView, PropertyValuesHolder.ofFloat("scaleX", SCALE_DEFAULT),
+                PropertyValuesHolder.ofFloat("scaleY", SCALE_DEFAULT))
+        zoomInAnimator.duration = DEFAULT_DURATION
+        zoomInAnimator.doOnStart { cardView.translationX = veryRight }
+        zoomInAnimator.doOnStart { cardView.translationY = veryBottom }
+
+        zoomOutAnimator = ObjectAnimator.ofPropertyValuesHolder(cardView, PropertyValuesHolder.ofFloat("scaleX", SCALE_MINI),
+                PropertyValuesHolder.ofFloat("scaleY", SCALE_MINI))
+        zoomOutAnimator.duration = DEFAULT_DURATION
+        zoomOutAnimator.doOnEnd { removeFromParent() }
+
+        if (showVerticalTranslateAnimation) {
+            showAnimatorSet.play(translateUpAnimator).with(zoomInAnimator).before(translateToLeftAnimator)
+        } else {
+            showAnimatorSet.play(zoomInAnimator).before(translateToLeftAnimator)
+        }
+        showAnimatorSet.start()
+    }
+
+    private fun enableSwipeToDismiss() {
+        cardView?.setOnTouchListener(SwipeDismissTouchListener(cardView, object : SwipeDismissTouchListener.DismissCallbacks {
+            override fun canDismiss(): Boolean {
+                return true
+            }
+
+            override fun onDismiss(view: View) {
+                removeFromParent()
+            }
+
+            override fun onTouch(view: View, touch: Boolean) {
+                // Ignore.
+            }
+        }))
+    }
+
+    private fun disableSwipeToDismiss() {
+        cardView?.setOnTouchListener(null)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+
+        showAnimatorSet.cancel()
+        hideAnimatorSet.cancel()
+
+        try {
+            removeAllListeners(expandAnimator,
+                    shrinkAnimator,
+                    translateUpAnimator,
+                    translateDownAnimator,
+                    translateToLeftAnimator,
+                    translateToRightAnimator)
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    private fun removeAllListeners(vararg ts: Animator) {
+        for (a in ts) {
+            a.removeAllListeners()
+            if (a is ValueAnimator) {
+                a.removeAllUpdateListeners()
+            }
+        }
+    }
+
+    override fun onTouchEvent(event: MotionEvent): Boolean {
+        performClick()
+        return super.onTouchEvent(event)
+    }
+
+    private fun shrinkAfterDelay() {
+        postDelayed({ shrink() }, duration)
+    }
+
+    private fun shrink() {
+        shrinkAnimator.doOnEnd { hide() }
+        shrinkAnimator.start()
+    }
+
+    private fun removeFromParent() {
+        clearAnimation()
+        visibility = View.GONE
+
+        postDelayed(object : Runnable {
+            override fun run() {
+                try {
+                    if (parent == null) {
+                        Log.e(javaClass.simpleName, "getParent() returning Null")
+                    } else {
+                        try {
+                            (parent as ViewGroup).removeView(this@NotifierView)
+
+                            onHideListener?.onHide()
+                        } catch (ex: Exception) {
+                            Log.e(javaClass.simpleName, "Cannot remove from parent layout")
+                        }
+                    }
+                } catch (ex: Exception) {
+                    Log.e(javaClass.simpleName, Log.getStackTraceString(ex))
+                }
+            }
+        }, 100)
+    }
+
+    fun setText(text: String?) {
+        if (!TextUtils.isEmpty(text)) {
+            tvText.text = text
+            tvText.measure(0, 0)
+            textWidth = tvText.measuredWidth
+            tvText.width = 0
+
+            cardView.measure(0, 0)
+            cardViewWidth = cardView.measuredWidth
+        }
+    }
+
+    fun hide() {
+        if (showVerticalTranslateAnimation) {
+            hideAnimatorSet.play(translateDownAnimator).with(zoomOutAnimator).after(translateToRightAnimator)
+        } else {
+            hideAnimatorSet.play(zoomOutAnimator).after(translateToRightAnimator)
+        }
+        hideAnimatorSet.start()
+    }
+
+    fun setIcon(url: String) {
+        ImageUtils.display(ivIcon, url)
+    }
+
+    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
+    }
+
+    interface OnShowNotificationListener {
+        fun onShow()
+    }
+
+    interface OnHideNotificationListener {
+        fun onHide()
+    }
+
+}

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

@@ -0,0 +1,238 @@
+package com.gh.common.notifier
+
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Modifications Copyright (C) 2017 David Kwon
+ */
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.animation.ValueAnimator
+import android.os.Build
+import android.support.annotation.RequiresApi
+import android.view.MotionEvent
+import android.view.VelocityTracker
+import android.view.View
+import android.view.ViewConfiguration
+
+/**
+ * A [View.OnTouchListener] that makes any [View] dismissable when the
+ * user swipes (drags her finger) horizontally across the view.
+ *
+ * @param view     The view to make dismissable.
+ * @param callbacks The callback to trigger when the user has indicated that she would like to
+ * dismiss this view.
+ */
+class SwipeDismissTouchListener(
+        private val mView: View,
+        private val mCallbacks: DismissCallbacks) : View.OnTouchListener {
+
+    // Cached ViewConfiguration and system-wide constant values
+    private val mSlop: Int
+    private val mMinFlingVelocity: Int
+    private val mAnimationTime: Long
+    private var mViewWidth = 1 // 1 and not 0 to prevent dividing by zero
+
+    // Transient properties
+    private var mDownX: Float = 0.toFloat()
+    private var mDownY: Float = 0.toFloat()
+    private var mSwiping: Boolean = false
+    private var mSwipingSlop: Int = 0
+    private var mVelocityTracker: VelocityTracker? = null
+    private var mTranslationX: Float = 0.toFloat()
+
+    init {
+        val vc = ViewConfiguration.get(mView.context)
+        mSlop = vc.scaledTouchSlop
+        mMinFlingVelocity = vc.scaledMinimumFlingVelocity * 16
+        mAnimationTime = mView.context.resources.getInteger(
+                android.R.integer.config_shortAnimTime).toLong()
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB_MR1)
+    override fun onTouch(view: View, motionEvent: MotionEvent): Boolean {
+        // offset because the view is translated during swipe
+        motionEvent.offsetLocation(mTranslationX, 0f)
+
+        if (mViewWidth < 2) {
+            mViewWidth = mView.width
+        }
+
+        when (motionEvent.actionMasked) {
+            MotionEvent.ACTION_DOWN -> {
+                mDownX = motionEvent.rawX
+                mDownY = motionEvent.rawY
+                if (mCallbacks.canDismiss()) {
+                    mVelocityTracker = VelocityTracker.obtain()
+                    mVelocityTracker!!.addMovement(motionEvent)
+                }
+                mCallbacks.onTouch(view, true)
+                return false
+            }
+            MotionEvent.ACTION_UP -> {
+                mVelocityTracker?.run {
+                    val deltaX = motionEvent.rawX - mDownX
+                    this.addMovement(motionEvent)
+                    this.computeCurrentVelocity(1000)
+                    val velocityX = this.xVelocity
+                    val absVelocityX = Math.abs(velocityX)
+                    val absVelocityY = Math.abs(this.yVelocity)
+                    var dismiss = false
+                    var dismissRight = false
+                    if (Math.abs(deltaX) > mViewWidth / 2 && mSwiping) {
+                        dismiss = true
+                        dismissRight = deltaX > 0
+                    } else if (mMinFlingVelocity <= absVelocityX && absVelocityY < absVelocityX && mSwiping) {
+                        // dismiss only if flinging in the same direction as dragging
+                        dismiss = velocityX < 0 == deltaX < 0
+                        dismissRight = this.xVelocity > 0
+                    }
+                    if (dismiss) {
+                        // dismiss
+                        mView.animate()
+                                .translationX((if (dismissRight) mViewWidth else -mViewWidth).toFloat())
+                                .alpha(0f)
+                                .setDuration(mAnimationTime)
+                                .setListener(object : AnimatorListenerAdapter() {
+                                    override fun onAnimationEnd(animation: Animator) {
+                                        performDismiss()
+                                    }
+                                })
+                    } else if (mSwiping) {
+                        // cancel
+                        mView.animate()
+                                .translationX(0f)
+                                .alpha(1f)
+                                .setDuration(mAnimationTime)
+                                .setListener(null)
+                        mCallbacks.onTouch(view, false)
+                    }
+                    this.recycle()
+                    mVelocityTracker = null
+                    mTranslationX = 0f
+                    mDownX = 0f
+                    mDownY = 0f
+                    mSwiping = false
+                }
+            }
+            MotionEvent.ACTION_CANCEL -> {
+                mVelocityTracker?.run {
+                    mView.animate()
+                            .translationX(0f)
+                            .alpha(1f)
+                            .setDuration(mAnimationTime)
+                            .setListener(null)
+                    this.recycle()
+                    mVelocityTracker = null
+                    mTranslationX = 0f
+                    mDownX = 0f
+                    mDownY = 0f
+                    mSwiping = false
+                }
+            }
+            MotionEvent.ACTION_MOVE -> {
+                mVelocityTracker?.run {
+                    this.addMovement(motionEvent)
+                    val deltaX = motionEvent.rawX - mDownX
+                    val deltaY = motionEvent.rawY - mDownY
+                    if (Math.abs(deltaX) > mSlop && Math.abs(deltaY) < Math.abs(deltaX) / 2) {
+                        mSwiping = true
+                        mSwipingSlop = if (deltaX > 0) mSlop else -mSlop
+                        mView.parent.requestDisallowInterceptTouchEvent(true)
+
+                        // Cancel listview's touch
+                        val cancelEvent = MotionEvent.obtain(motionEvent)
+                        cancelEvent.action = MotionEvent.ACTION_CANCEL or (motionEvent.actionIndex shl MotionEvent.ACTION_POINTER_INDEX_SHIFT)
+                        mView.onTouchEvent(cancelEvent)
+                        cancelEvent.recycle()
+                    }
+
+                    if (mSwiping) {
+                        mTranslationX = deltaX
+                        mView.translationX = deltaX - mSwipingSlop
+                        // TODO: use an ease-out interpolator or such
+                        mView.alpha = Math.max(0f, Math.min(1f,
+                                1f - 2f * Math.abs(deltaX) / mViewWidth))
+                        return true
+                    }
+                }
+            }
+            else -> {
+                view.performClick()
+                return false
+            }
+        }
+        return false
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
+    private fun performDismiss() {
+        // Animate the dismissed view to zero-height and then fire the dismiss callback.
+        // This triggers layout on each animation frame; in the future we may want to do something
+        // smarter and more performant.
+
+        val lp = mView.layoutParams
+        val originalHeight = mView.height
+
+        val animator = ValueAnimator.ofInt(originalHeight, 1).setDuration(mAnimationTime)
+
+        animator.addListener(object : AnimatorListenerAdapter() {
+            override fun onAnimationEnd(animation: Animator) {
+                mCallbacks.onDismiss(mView)
+                // Reset view presentation
+                mView.alpha = 1f
+                mView.translationX = 0f
+                lp.height = originalHeight
+                mView.layoutParams = lp
+            }
+        })
+
+        animator.addUpdateListener { valueAnimator ->
+            lp.height = valueAnimator.animatedValue as Int
+            mView.layoutParams = lp
+        }
+
+        animator.start()
+    }
+
+    /**
+     * The callback interface used by [SwipeDismissTouchListener] to inform its client
+     * about a successful dismissal of the view for which it was created.
+     */
+    interface DismissCallbacks {
+        /**
+         * Called to determine whether the view can be dismissed.
+         *
+         * @return boolean The view can dismiss.
+         */
+        fun canDismiss(): Boolean
+
+        /**
+         * Called when the user has indicated they she would like to dismiss the view.
+         *
+         * @param view  The originating [View]
+         */
+        fun onDismiss(view: View)
+
+        /**
+         * Called when the user touches the view or release the view.
+         *
+         * @param view  The originating [View]
+         * @param touch The view is being touched.
+         */
+        fun onTouch(view: View, touch: Boolean)
+    }
+}

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

@@ -0,0 +1,43 @@
+package com.gh.common.observer
+
+import android.content.Context
+import android.database.ContentObserver
+import android.media.AudioManager
+import android.os.Handler
+
+class VolumeObserver(var context: Context, handler: Handler, var callback: MuteCallback? = null)
+    : ContentObserver(handler) {
+    var previousVolume: Int = 0
+
+    init {
+        val audio = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+        previousVolume = audio.getStreamVolume(AudioManager.STREAM_MUSIC)
+    }
+
+    override fun onChange(selfChange: Boolean) {
+        super.onChange(selfChange)
+
+        val audio = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+        val currentVolume = audio.getStreamVolume(AudioManager.STREAM_MUSIC)
+
+        val delta = previousVolume - currentVolume
+
+        if (delta != 0) {
+            if (currentVolume == 0) {
+                callback?.onMute(true)
+            } else {
+                callback?.onMute(false)
+            }
+        }
+
+        if (delta > 0) {
+            previousVolume = currentVolume
+        } else if (delta < 0) {
+            previousVolume = currentVolume
+        }
+    }
+}
+
+interface MuteCallback {
+    fun onMute(isMute: Boolean)
+}

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

@@ -0,0 +1,56 @@
+package com.gh.common.repository
+
+import com.gh.common.util.ApkActiveUtils
+import com.gh.common.util.RandomUtils
+import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.tencent.bugly.beta.tinker.TinkerManager.getApplication
+import io.reactivex.Observable
+
+// 热门卡牌的仓库
+object RemenkapaiRepository {
+
+    var remenkapaiList = arrayListOf<GameEntity>()
+
+    @JvmStatic
+    fun getRemenkapai(size: Int): Observable<List<GameEntity>> {
+        return if (remenkapaiList.isEmpty()) {
+            RetrofitManager.getInstance(getApplication()).api.remenkapai
+                    .map { gameList -> filterEntityWithoutApk(gameList) }
+                    .map { pickRandomSizeEntity(size) }
+                    .map(ApkActiveUtils.filterMapperList)
+        } else {
+            Observable.create { emitter -> emitter.onNext(pickRandomSizeEntity(size)) }
+        }
+    }
+
+    /**
+     * 选择随机数量的热门卡牌
+     */
+    private fun pickRandomSizeEntity(size: Int): List<GameEntity> {
+        if (size > remenkapaiList.size) return remenkapaiList
+
+        val randomGameList = arrayListOf<GameEntity>()
+        val randomArray = RandomUtils.getRandomArray(size, remenkapaiList.size)
+        for (i in randomArray) {
+            randomGameList.add(remenkapaiList[i])
+        }
+        return randomGameList
+    }
+
+    /**
+     * 过滤没有 Apk 的实体
+     */
+    private fun filterEntityWithoutApk(gameList: List<GameEntity>): List<GameEntity> {
+        val realGameList = arrayListOf<GameEntity>()
+        for (gameEntity in gameList) {
+            val apk = gameEntity.getApk()
+            if (apk.size != 0) {
+                realGameList.add(gameEntity)
+            }
+        }
+        remenkapaiList = realGameList
+        return remenkapaiList
+    }
+
+}

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

@@ -0,0 +1,37 @@
+package com.gh.common.util
+
+import com.gh.common.constant.Config
+import com.gh.gamecenter.entity.SettingsEntity
+
+object AdHelper {
+
+    // 搜索为空/求版本/意见反馈-功能收录/发现
+    const val LOCATION_SEARCH_EMPTY = "search_empty"
+    const val LOCATION_GAME_REQUEST_VERSION = "game_request_version"
+    const val LOCATION_SUGGESTION_FUNCTION = "suggestion_function"
+    const val LOCATION_DISCOVER = "discover"
+
+    fun getAd(location: String): SettingsEntity.AD? {
+        val adList = Config.getSettings()?.adList ?: return null
+
+        for (ad in adList) {
+            if (ad.location == location) return ad
+        }
+        return null
+    }
+
+    fun getDiscoverAds(): List<SettingsEntity.AD> {
+        val adList = Config.getSettings()?.adList ?: return listOf()
+
+        val discoverAdList = arrayListOf<SettingsEntity.AD>()
+
+        for (ad in adList) {
+            if (ad.location == LOCATION_DISCOVER) {
+                discoverAdList.add(ad)
+            }
+        }
+
+        return discoverAdList
+    }
+
+}

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

@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.gh.common.util
+
+import android.animation.Animator
+import android.support.annotation.RequiresApi
+
+/**
+ * Since [Android KTX] has not release a stable build yet,
+ * we copy a single class to achieve the same goal.
+ *
+ * You might check the original extension class in the link below.
+ *
+ * https://github.com/android/android-ktx/blob/master/src/main/java/androidx/core/animation/Animator.kt.
+ */
+
+/**
+ * Add an action which will be invoked when the animation has ended.
+ *
+ * @return the [Animator.AnimatorListener] added to the Animator
+ * @see Animator.end
+ */
+fun Animator.doOnEnd(action: (animator: Animator) -> Unit) = addListener(onEnd = action)
+
+/**
+ * Add an action which will be invoked when the animation has started.
+ *
+ * @return the [Animator.AnimatorListener] added to the Animator
+ * @see Animator.start
+ */
+fun Animator.doOnStart(action: (animator: Animator) -> Unit) = addListener(onStart = action)
+
+/**
+ * Add an action which will be invoked when the animation has been cancelled.
+ *
+ * @return the [Animator.AnimatorListener] added to the Animator
+ * @see Animator.cancel
+ */
+fun Animator.doOnCancel(action: (animator: Animator) -> Unit) = addListener(onCancel = action)
+
+/**
+ * Add an action which will be invoked when the animation has repeated.
+ * @return the [Animator.AnimatorListener] added to the Animator
+ */
+fun Animator.doOnRepeat(action: (animator: Animator) -> Unit) = addListener(onRepeat = action)
+
+/**
+ * Add an action which will be invoked when the animation has resumed after a pause.
+ *
+ * @return the [Animator.AnimatorPauseListener] added to the Animator
+ * @see Animator.resume
+ */
+@RequiresApi(19)
+fun Animator.doOnResume(action: (animator: Animator) -> Unit) = addPauseListener(onResume = action)
+
+/**
+ * Add an action which will be invoked when the animation has been paused.
+ *
+ * @return the [Animator.AnimatorPauseListener] added to the Animator
+ * @see Animator.pause
+ */
+@RequiresApi(19)
+fun Animator.doOnPause(action: (animator: Animator) -> Unit) = addPauseListener(onPause = action)
+
+/**
+ * Add a listener to this Animator using the provided actions.
+ */
+fun Animator.addListener(
+        onEnd: ((animator: Animator) -> Unit)? = null,
+        onStart: ((animator: Animator) -> Unit)? = null,
+        onCancel: ((animator: Animator) -> Unit)? = null,
+        onRepeat: ((animator: Animator) -> Unit)? = null
+): Animator.AnimatorListener {
+    val listener = object : Animator.AnimatorListener {
+        override fun onAnimationRepeat(animator: Animator) {
+            onRepeat?.invoke(animator)
+        }
+
+        override fun onAnimationEnd(animator: Animator) {
+            onEnd?.invoke(animator)
+        }
+
+        override fun onAnimationCancel(animator: Animator) {
+            onCancel?.invoke(animator)
+        }
+
+        override fun onAnimationStart(animator: Animator) {
+            onStart?.invoke(animator)
+        }
+    }
+    addListener(listener)
+    return listener
+}
+
+/**
+ * Add a pause and resume listener to this Animator using the provided actions.
+ */
+@RequiresApi(19)
+fun Animator.addPauseListener(
+        onResume: ((animator: Animator) -> Unit)? = null,
+        onPause: ((animator: Animator) -> Unit)? = null
+): Animator.AnimatorPauseListener {
+    val listener = object : Animator.AnimatorPauseListener {
+        override fun onAnimationPause(animator: Animator) {
+            onPause?.invoke(animator)
+        }
+
+        override fun onAnimationResume(animator: Animator) {
+            onResume?.invoke(animator)
+        }
+    }
+    addPauseListener(listener)
+    return listener
+}

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

@@ -1,31 +1,52 @@
 package com.gh.common.util;
 
+import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
-import com.gh.gamecenter.manager.PackageManager;
+import com.gh.gamecenter.manager.PackagesManager;
+import com.lightgame.utils.Utils;
 
 import java.util.List;
 
+import io.reactivex.functions.Function;
+
 /**
  * Created by khy on 10/05/17.
  */
 
 public class ApkActiveUtils {
 
-    // 过滤隐藏apk包
     public static void filterHideApk(GameEntity gameEntity) {
-        if (gameEntity == null || gameEntity.getApk() == null
-                || gameEntity.getApk().size() == 0) return;
-
-        List<ApkEntity> apkList = gameEntity.getApk();
-        for (int i = 0; i < apkList.size(); i++) {
-            ApkEntity apkEntity = apkList.get(i);
-            String packageName = apkEntity.getPackageName();
-            String id = gameEntity.getId();
-            if (!apkEntity.isActive() && !PackageManager.INSTANCE.isCanPluggable(id, packageName)) {
-                apkList.remove(i);
-                i--;
+        try {
+            if (gameEntity == null || gameEntity.getOriginalApk().size() == 0) return;
+            List<ApkEntity> apkList = gameEntity.getOriginalApk();
+            for (int i = 0; i < apkList.size(); i++) {
+                ApkEntity apkEntity = apkList.get(i);
+                String packageName = apkEntity.getPackageName();
+                String id = gameEntity.getId();
+                if (!apkEntity.isActive() && !PackagesManager.INSTANCE.isCanPluggable(id, packageName)) {
+                    apkList.remove(i);
+                    i--;
+                }
+            }
+        } catch (Exception e) {
+            if (BuildConfig.DEBUG) {
+                Utils.log("filter hide game apk throws exception:" + e.toString());
             }
         }
     }
+
+    // 过滤隐藏apk包
+    public static Function<List<GameEntity>, List<GameEntity>> filterMapperList = list -> {
+        for (GameEntity gameEntity : list) {
+            ApkActiveUtils.filterHideApk(gameEntity);
+        }
+        return list;
+    };
+
+    // 过滤隐藏apk包
+    public static Function<GameEntity, GameEntity> filterMapper = list -> {
+        ApkActiveUtils.filterHideApk(list);
+        return list;
+    };
 }

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

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

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

@@ -1,122 +0,0 @@
-package com.gh.common.util;
-
-import android.content.Context;
-import android.provider.Settings;
-import android.text.TextUtils;
-
-import com.gh.gamecenter.BuildConfig;
-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.utils.Util_System_Phone_State;
-import com.lightgame.utils.Utils;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Created by khy on 2/01/18.
- */
-public class AskLogUtils {
-
-
-    public static void uploadQuestions(Context context, String tracers, Questions questions) {
-        if (context == null) return;
-        JSONObject object = new JSONObject();
-        try {
-            object.put("community_id", UserManager.getInstance().getCommunity().getId());
-            object.put("community_name", UserManager.getInstance().getCommunity().getName());
-            object.put("question_id", questions.getId());
-            object.put("question_name", questions.getTitle());
-            object.put("subject", "question");
-            object.put("tracers", tracers);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-
-        upload(context, object);
-    }
-
-    public static void uploadAnswers(Context context, String tracers, Questions questions, String answerId) {
-        if (context == null) return;
-        JSONObject object = new JSONObject();
-        try {
-            object.put("community_id", UserManager.getInstance().getCommunity().getId());
-            object.put("community_name", UserManager.getInstance().getCommunity().getName());
-            object.put("question_id", questions.getId());
-            object.put("question_name", questions.getTitle());
-            object.put("subject", "answer");
-            object.put("tracers", tracers);
-            object.put("answer_id", answerId);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-
-        upload(context, object);
-    }
-
-    public static void uploadSearch(Context context, String searchKey) {
-        if (TextUtils.isEmpty(searchKey) || context == null) return;
-
-        JSONObject object = new JSONObject();
-        try {
-            object.put("community_id", UserManager.getInstance().getCommunity().getId());
-            object.put("community_name", UserManager.getInstance().getCommunity().getName());
-            object.put("keyword", searchKey);
-            object.put("subject", "search");
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-
-        upload(context, object);
-    }
-
-
-    public static void communityRefresh(Context context, int dataCount) {
-        if (context == null) return;
-        JSONObject object = new JSONObject();
-        try {
-            object.put("subject", "community_refresh");
-            object.put("community_id", UserManager.getInstance().getCommunity().getId());
-            object.put("refresh_type", "recommend");
-            object.put("data_count", dataCount);
-            object.put("user_id", UserManager.getInstance().getUserId());
-            object.put("network", DeviceUtils.getNetwork(context));
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-
-        upload(context, object);
-    }
-
-    public static void login(Context context, String loginStep, String loginType) {
-        if (context == null) return;
-        JSONObject object = new JSONObject();
-        try {
-            object.put("subject", "login");
-            object.put("step", loginStep);
-            object.put("login_type", loginType);
-            object.put("network", DeviceUtils.getNetwork(context));
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-
-        upload(context, object);
-    }
-
-    private static void upload(Context context, JSONObject object) {
-        if (context == null) return;
-        try {
-            object.put("version", BuildConfig.PATCH_VERSION_NAME);
-            object.put("channel", HaloApp.getInstance().getChannel());
-            object.put("android_id", Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID));
-            object.put("imei", Util_System_Phone_State.getDeviceId(context));
-            object.put("time", Utils.getTime(context));
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-
-        LogHubUtils.uploadLog(DeviceUtils.getIPAddress(context), object);
-    }
-}

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

@@ -2,7 +2,6 @@ package com.gh.common.util;
 
 import android.text.TextUtils;
 
-import java.text.DecimalFormat;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -12,16 +11,16 @@ import java.util.regex.Pattern;
 
 public class AskUtils {
 
-    public static String voteCountFormat(int voteCount) {
-        String vote;
-        if (voteCount >= 10000) {
-            DecimalFormat df = new DecimalFormat("#.0万");
-            vote = df.format(voteCount / 10000f);
-        } else {
-            vote = String.valueOf(voteCount);
-        }
-        return vote;
-    }
+//    public static String voteCountFormat(int voteCount) {
+//        String vote;
+//        if (voteCount >= 10000) {
+//            DecimalFormat df = new DecimalFormat("#.0万");
+//            vote = df.format(voteCount / 10000f);
+//        } else {
+//            vote = String.valueOf(voteCount);
+//        }
+//        return vote;
+//    }
 
     public static String stripHtml(String htmlStr) {
 

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

@@ -6,6 +6,7 @@ import android.text.TextUtils;
 
 import com.gh.gamecenter.LoginActivity;
 import com.gh.gamecenter.manager.UserManager;
+import com.lightgame.utils.Utils;
 
 /**
  * Created by khy on 28/06/17.
@@ -13,21 +14,17 @@ import com.gh.gamecenter.manager.UserManager;
 
 public class CheckLoginUtils {
 
-    public static void checkLogin(final Context context, OnLoginListener listener) {
-//        String token = LoginUtils.getToken(context);
-        if (TextUtils.isEmpty(UserManager.getInstance().getToken())) {
-            AskLogUtils.login(context, "dialog", null);
-            DialogUtils.showWarningDialog(context, "登录提示", "需要登录才能使用该功能喔！", "取消", "快速登录",
-                    new DialogUtils.ConfirmListener() {
-                        @Override
-                        public void onConfirm() {
-                            AskLogUtils.login(context, "activity", null);
-                            Intent intent = LoginActivity.getIntent(context);
-                            context.startActivity(intent);
-                        }
-                    }, null);
+    public static void checkLogin(final Context context, String entrance, OnLoginListener listener) {
+        if (!isLogin()) {
+            if (listener != null) Utils.toast(context, "需要登录");
+            LogUtils.login("dialog", null, entrance);
+            LogUtils.login("activity", null, entrance);
+            Intent intent = LoginActivity.getIntent(context, entrance);
+            context.startActivity(intent);
         } else {
-            listener.onLogin();
+            if (listener != null) {
+                listener.onLogin();
+            }
         }
     }
 

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

@@ -10,7 +10,11 @@ public class ClassUtils {
             name = "GameDetailActivity";
         }
         try {
-            return Class.forName("com.gh.gamecenter." + name);
+            if (!name.contains("com.gh")) {
+                return Class.forName("com.gh.gamecenter." + name);
+            } else {
+                return Class.forName(name);
+            }
         } catch (ClassNotFoundException e) {
             e.printStackTrace();
         }

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

@@ -5,13 +5,13 @@ import com.gh.gamecenter.eventbus.EBCollectionChanged
 import com.gh.gamecenter.manager.UserManager
 import com.gh.gamecenter.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
 import okhttp3.ResponseBody
 import org.greenrobot.eventbus.EventBus
 import org.json.JSONObject
 import retrofit2.HttpException
-import rx.Observable
-import rx.android.schedulers.AndroidSchedulers
-import rx.schedulers.Schedulers
 
 /**
  * Created by khy on 26/07/17.
@@ -19,7 +19,7 @@ import rx.schedulers.Schedulers
 object CollectionUtils {
 
     enum class CollectionType {
-        toolkit, article, answer
+        toolkit, article, answer, communityArticle
     }
 
     fun postCollection(context: Context, content: String, type: CollectionType, listener: OnCollectionListener) {
@@ -28,6 +28,7 @@ object CollectionUtils {
             CollectionType.article -> RetrofitManager.getInstance(context).getApi().postCollectionArticle(UserManager.getInstance().userId, content)
             CollectionType.toolkit -> RetrofitManager.getInstance(context).getApi().postCollectionTools(UserManager.getInstance().userId, content)
             CollectionType.answer -> RetrofitManager.getInstance(context).getApi().postCollectionAnswer(UserManager.getInstance().userId, content)
+            else -> return
         }
         postCollection
                 .subscribeOn(Schedulers.io())
@@ -36,7 +37,6 @@ object CollectionUtils {
                     override fun onResponse(response: ResponseBody?) {
                         super.onResponse(response)
                         listener.onSuccess()
-                        if(type != CollectionType.answer)
                         EventBus.getDefault().post(EBCollectionChanged(content, true, type))
                     }
 
@@ -66,6 +66,7 @@ object CollectionUtils {
             CollectionType.article -> postCollection = RetrofitManager.getInstance(context).getApi().deletaCollectionArticle(UserManager.getInstance().userId, id)
             CollectionType.toolkit -> postCollection = RetrofitManager.getInstance(context).getApi().deleteCollectionTools(UserManager.getInstance().userId, id)
             CollectionType.answer -> postCollection = RetrofitManager.getInstance(context).getApi().deleteCollectionAnswer(UserManager.getInstance().userId, id)
+            else -> return
         }
         postCollection
                 .subscribeOn(Schedulers.io())
@@ -74,7 +75,6 @@ object CollectionUtils {
                     override fun onResponse(response: ResponseBody?) {
                         super.onResponse(response)
                         listener.onSuccess()
-                        if(type != CollectionType.answer)
                         EventBus.getDefault().post(EBCollectionChanged(id, false, type))
                     }
 

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

@@ -0,0 +1,297 @@
+package com.gh.common.util
+
+import android.content.Context
+import android.text.TextUtils
+import com.gh.common.util.CommentUtils.copyText
+import com.gh.gamecenter.CommentDetailActivity
+import com.gh.gamecenter.MessageDetailActivity
+import com.gh.gamecenter.adapter.OnCommentCallBackListener
+import com.gh.gamecenter.entity.CommentEntity
+import com.gh.gamecenter.entity.MeEntity
+import com.gh.gamecenter.retrofit.Response
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.lightgame.utils.Utils
+import com.tencent.bugly.beta.tinker.TinkerManager.getApplication
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import okhttp3.ResponseBody
+import org.json.JSONException
+import org.json.JSONObject
+import retrofit2.HttpException
+
+object CommentHelper {
+
+    // TODO 合并这两个方法的共同部分
+    @JvmStatic
+    fun showCommunityArticleCommentOptions(
+            context: Context,
+            commentEntity: CommentEntity,
+            showConversation: Boolean,
+            articleId: String,
+            communityId: String,
+            listener: OnCommentCallBackListener?) {
+        val dialogOptions = ArrayList<String>()
+
+        if (commentEntity.me == null || !commentEntity.me?.isAnswerCommented!!) {
+            dialogOptions.add("回复")
+        }
+
+        dialogOptions.add("复制")
+        dialogOptions.add("举报")
+
+        if (commentEntity.parentUser != null && showConversation) {
+            dialogOptions.add("查看对话")
+        }
+
+        DialogUtils.showListDialog(context, dialogOptions, null) {
+            when (it) {
+                "回复" -> {
+                    context.ifLogin("社区文章详情-评论-回复") {
+                        if (listener != null) {
+                            listener.onCommentCallback(commentEntity)
+                        } else if (!TextUtils.isEmpty(commentEntity.id)) {
+                            context.startActivity(MessageDetailActivity.getMessageDetailIntent(context, commentEntity, commentEntity.id))
+                        } else {
+                            Utils.toast(context, "缺少关键属性")
+                        }
+                    }
+                }
+
+                "复制" -> copyText(commentEntity.content, context)
+
+                "举报" -> context.ifLogin("社区文章详情-评论-举报") {
+                    showReportTypeDialog(context) { reportType ->
+                        PostCommentUtils.reportCommunityArticleComment(context, communityId, articleId, commentEntity.id, reportType,
+                                object : PostCommentUtils.PostCommentListener {
+                                    override fun postSuccess(response: JSONObject?) {
+                                        Utils.toast(context, "感谢您的举报")
+                                    }
+
+                                    override fun postFailed(error: Throwable?) {
+                                        if (error == null) {
+                                            Utils.toast(context, "举报失败，请稍后重试")
+                                        } else {
+                                            Utils.toast(context, "举报失败，${error.message}")
+                                        }
+                                    }
+                                })
+                    }
+                }
+
+                "查看对话" -> {
+                    context.startActivity(CommentDetailActivity
+                            .getCommunityArticleCommentIntent(context, articleId, commentEntity.id, communityId, null))
+                }
+            }
+        }
+    }
+
+    @JvmStatic
+    fun showAnswerCommentOptions(
+            context: Context,
+            commentEntity: CommentEntity,
+            showConversation: Boolean,
+            answerId: String,
+            listener: OnCommentCallBackListener?) {
+        val dialogOptions = ArrayList<String>()
+
+        if (commentEntity.me == null || !commentEntity.me?.isAnswerCommented!!) {
+            dialogOptions.add("回复")
+        }
+
+        dialogOptions.add("复制")
+        dialogOptions.add("举报")
+
+        commentEntity.me?.let {
+            if (it.isModerator && (
+                            it.moderatorPermissions.contains(MeEntity.HIDE_ANSWER_COMMENT)
+                                    || it.moderatorPermissions.contains(MeEntity.TOP_ANSWER_COMMENT))) {
+                dialogOptions.add("管理")
+            }
+        }
+
+        if (commentEntity.parentUser != null && showConversation) {
+            dialogOptions.add("查看对话")
+        }
+
+        DialogUtils.showListDialog(context, dialogOptions, null) {
+            when (it) {
+                "管理" -> showControlDialog(context, answerId, commentEntity, commentEntity.me!!)
+
+                "回复" -> {
+                    context.ifLogin("回答详情-评论-回复") {
+                        if (listener != null) {
+                            listener.onCommentCallback(commentEntity)
+                        } else if (!TextUtils.isEmpty(commentEntity.id)) {
+                            context.startActivity(MessageDetailActivity.getMessageDetailIntent(context, commentEntity, commentEntity.id))
+                        } else {
+                            Utils.toast(context, "缺少关键属性")
+                        }
+                    }
+                }
+
+                "复制" -> copyText(commentEntity.content, context)
+
+                "举报" -> context.ifLogin("回答详情-评论-举报") {
+                    showReportTypeDialog(context) { reportType ->
+                        PostCommentUtils.postAnswerReportData(context, commentEntity.id, answerId, reportType,
+                                object : PostCommentUtils.PostCommentListener {
+                                    override fun postSuccess(response: JSONObject?) {
+                                        Utils.toast(context, "感谢您的举报")
+                                    }
+
+                                    override fun postFailed(error: Throwable?) {
+                                        if (error == null) {
+                                            Utils.toast(context, "举报失败，请稍后重试")
+                                        } else {
+                                            Utils.toast(context, "举报失败，${error.message}")
+                                        }
+                                    }
+                                })
+                    }
+                }
+
+                "查看对话" -> {
+                    context.startActivity(CommentDetailActivity
+                            .getAnswerCommentIntent(context, commentEntity.id, answerId, null))
+                }
+            }
+        }
+    }
+
+    private fun showControlDialog(context: Context, answerId: String, comment: CommentEntity, me: MeEntity) {
+        val dialogOptions = arrayListOf<String>()
+        val highlight = "置顶评论"
+        val hide = "隐藏评论"
+
+        if (me.moderatorPermissions.contains(MeEntity.TOP_ANSWER_COMMENT)) {
+            dialogOptions.add(highlight)
+        }
+
+        if (me.moderatorPermissions.contains(MeEntity.HIDE_ANSWER_COMMENT)) {
+            dialogOptions.add(hide)
+        }
+
+        val content = if (me.moderatorLevel == MeEntity.MODERATOR_LEVEL_PRIMARY) {
+            "你的操作将提交给小编审核，确定提交吗？"
+        } else {
+            "你的操作将立即生效，确定提交吗？（你的管理权限为：高级）"
+        }
+
+        val disabledOptions = arrayListOf<String>()
+        if (comment.priority != 0) {
+            disabledOptions.add(highlight)
+        }
+        comment.me?.let {
+            if (it.isAnswerCommented) {
+                disabledOptions.add(highlight)
+            }
+        }
+
+        DialogUtils.showListDialog(context, dialogOptions, disabledOptions) {
+            when (it) {
+                highlight -> {
+
+                    if (comment.priority != 0) {
+                        Utils.toast(context, "评论已经置顶")
+                        return@showListDialog
+                    }
+
+                    comment.me?.let { me ->
+                        if (me.isAnswerCommented) {
+                            Utils.toast(context, "不能置顶自己的评论")
+                            return@showListDialog
+                        }
+                    }
+
+                    DialogUtils.showAlertDialog(context, highlight, content,
+                            "确定", "取消",
+                            {
+                                RetrofitManager.getInstance(context).api
+                                        .highlightAnswerComment(answerId, comment.id)
+                                        .observeOn(AndroidSchedulers.mainThread())
+                                        .subscribeOn(Schedulers.io())
+                                        .subscribe(object : Response<ResponseBody>() {
+                                            override fun onResponse(response: ResponseBody?) {
+                                                if (me.moderatorLevel == MeEntity.MODERATOR_LEVEL_PRIMARY) {
+                                                    Utils.toast(context, "提交成功")
+                                                } else {
+                                                    Utils.toast(context, "置顶成功，请刷新列表")
+                                                }
+                                            }
+
+                                            override fun onFailure(e: HttpException?) {
+                                                super.onFailure(e)
+                                                e?.let { httpException ->
+                                                    if (httpException.code() == 403) {
+                                                        val string = e.response().errorBody()?.string()
+                                                        val errorJson = JSONObject(string)
+                                                        val errorCode = errorJson.getInt("code")
+                                                        if (errorCode == 403059) {
+                                                            Utils.toast(getApplication(), "权限错误，请刷新后重试")
+                                                            return
+                                                        } else {
+                                                            Utils.toast(getApplication(), e.message())
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        })
+                            }, null)
+                }
+
+                hide -> {
+                    DialogUtils.showAlertDialog(context, hide, content,
+                            "确定", "取消",
+                            {
+                                RetrofitManager.getInstance(context).api
+                                        .hideAnswerComment(answerId, comment.id)
+                                        .observeOn(AndroidSchedulers.mainThread())
+                                        .subscribeOn(Schedulers.io())
+                                        .subscribe(object : Response<ResponseBody>() {
+                                            override fun onResponse(response: ResponseBody?) {
+                                                if (me.moderatorLevel == MeEntity.MODERATOR_LEVEL_PRIMARY) {
+                                                    Utils.toast(context, "提交成功")
+                                                } else {
+                                                    Utils.toast(context, "隐藏成功，请刷新列表")
+                                                }
+                                            }
+
+                                            override fun onFailure(e: HttpException?) {
+                                                super.onFailure(e)
+                                                e?.let { httpException ->
+                                                    if (httpException.code() == 403) {
+                                                        val string = e.response().errorBody()?.string()
+                                                        val errorJson = JSONObject(string)
+                                                        val errorCode = errorJson.getInt("code")
+                                                        if (errorCode == 403059) {
+                                                            Utils.toast(getApplication(), "权限错误，请刷新后重试")
+                                                            return
+                                                        } else {
+                                                            Utils.toast(getApplication(), e.message())
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        })
+                            }, null)
+                }
+            }
+        }
+    }
+
+    private fun showReportTypeDialog(context: Context, reportCallback: (reportType: String) -> Unit) {
+        val reportTypes = arrayListOf("垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息", "违法有害信息", "其它")
+
+        DialogUtils.showListDialog(context, reportTypes, null) { text ->
+            val jsonObject = JSONObject()
+            try {
+                jsonObject.put("reason", text)
+                reportCallback.invoke(jsonObject.toString())
+            } catch (e: JSONException) {
+                e.printStackTrace()
+            }
+        }
+    }
+
+}

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

@@ -4,6 +4,7 @@ import android.app.Dialog;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.graphics.Color;
+import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.view.View;
@@ -19,8 +20,11 @@ import com.gh.gamecenter.adapter.OnCommentCallBackListener;
 import com.gh.gamecenter.adapter.viewholder.CommentViewHolder;
 import com.gh.gamecenter.entity.CommentEntity;
 import com.gh.gamecenter.entity.MeEntity;
+import com.gh.gamecenter.entity.RatingComment;
 import com.gh.gamecenter.entity.UserInfoEntity;
 import com.gh.gamecenter.manager.UserManager;
+import com.gh.gamecenter.retrofit.Response;
+import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.lightgame.utils.Utils;
 
 import org.json.JSONException;
@@ -33,6 +37,11 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 import retrofit2.HttpException;
 
 /**
@@ -71,8 +80,10 @@ public class CommentUtils {
         }
     }
 
-    public static void showReportDialog(final CommentEntity commentEntity, final Context context, final boolean showConversation,
-                                        final OnCommentCallBackListener listener, final String newsId) {
+    public static void showGameCommentOptions(final Context context,
+                                              final RatingComment comment,
+                                              final String gameId,
+                                              final String entrance) {
 
         final Dialog dialog = new Dialog(context);
 
@@ -83,6 +94,113 @@ public class CommentUtils {
 
         List<String> dialogType = new ArrayList<>();
 
+        dialogType.add("复制");
+        dialogType.add("举报");
+
+
+        for (String s : dialogType) {
+            final TextView reportTv = new TextView(context);
+            reportTv.setText(s);
+            reportTv.setTextSize(17);
+            reportTv.setTextColor(ContextCompat.getColor(context, R.color.title));
+            reportTv.setBackgroundResource(R.drawable.textview_white_style);
+            int widthPixels = context.getResources().getDisplayMetrics().widthPixels;
+            reportTv.setLayoutParams(new LinearLayout.LayoutParams((widthPixels * 9) / 10,
+                    LinearLayout.LayoutParams.WRAP_CONTENT));
+            reportTv.setPadding(DisplayUtils.dip2px(context, 20), DisplayUtils.dip2px(context, 12),
+                    0, DisplayUtils.dip2px(context, 12));
+            container.addView(reportTv);
+
+            reportTv.setOnClickListener(v -> {
+                dialog.cancel();
+                switch (reportTv.getText().toString()) {
+                    case "复制":
+                        copyText(comment.getContent(), context);
+                        break;
+                    case "举报":
+                        CheckLoginUtils.checkLogin(context, entrance, () -> showGameCommentReportDialog(gameId, comment, context));
+                        break;
+                }
+            });
+        }
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(container);
+        dialog.show();
+    }
+
+    private static void showGameCommentReportDialog(final String gameId, final RatingComment comment, final Context context) {
+        final String[] arrReportType = new String[]{"垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息",
+                "违法有害信息", "其它"};
+        int widthPixels = context.getResources().getDisplayMetrics().widthPixels;
+
+        final Dialog reportTypeDialog = new Dialog(context);
+        LinearLayout container = new LinearLayout(context);
+        container.setOrientation(LinearLayout.VERTICAL);
+        container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
+        container.setBackgroundColor(Color.WHITE);
+
+        for (final String s : arrReportType) {
+            TextView reportTypeTv = new TextView(context);
+            reportTypeTv.setText(s);
+            reportTypeTv.setTextSize(17);
+            reportTypeTv.setTextColor(ContextCompat.getColor(context, R.color.title));
+            reportTypeTv.setBackgroundResource(R.drawable.textview_white_style);
+            reportTypeTv.setLayoutParams(new LinearLayout.LayoutParams((widthPixels * 9) / 10,
+                    LinearLayout.LayoutParams.WRAP_CONTENT));
+            reportTypeTv.setPadding(DisplayUtils.dip2px(context, 20), DisplayUtils.dip2px(context, 12),
+                    0, DisplayUtils.dip2px(context, 12));
+            container.addView(reportTypeTv);
+
+            reportTypeTv.setOnClickListener(v -> {
+                JSONObject jsonObject = new JSONObject();
+                try {
+                    jsonObject.put("reason", s);
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+                RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
+                RetrofitManager.getInstance(context).getApi()
+                        .reportGameComment(gameId, comment.getId(), body)
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(new Response<ResponseBody>() {
+                            @Override
+                            public void onResponse(@Nullable ResponseBody response) {
+                                Utils.toast(context, "感谢您的举报");
+                            }
+
+                            @Override
+                            public void onFailure(@Nullable HttpException e) {
+                                Utils.toast(context, "举报失败，请先检查网络设置");
+                            }
+                        });
+
+                reportTypeDialog.cancel();
+            });
+        }
+
+        reportTypeDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        reportTypeDialog.setContentView(container);
+        reportTypeDialog.show();
+    }
+
+
+    public static void showReportDialog(final CommentEntity commentEntity,
+                                        final Context context,
+                                        final boolean showConversation,
+                                        final OnCommentCallBackListener listener,
+                                        final String newsId,
+                                        final String patch) {
+        final Dialog dialog = new Dialog(context);
+
+        LinearLayout container = new LinearLayout(context);
+        container.setOrientation(LinearLayout.VERTICAL);
+        container.setBackgroundColor(Color.WHITE);
+        container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
+
+        List<String> dialogType = new ArrayList<>();
+
         if (commentEntity.getMe() == null || !commentEntity.getMe().isCommentOwn()) {
             dialogType.add("回复");
         }
@@ -113,7 +231,7 @@ public class CommentUtils {
                     dialog.cancel();
                     switch (reportTv.getText().toString()) {
                         case "回复":
-                            CheckLoginUtils.checkLogin(context, () -> {
+                            CheckLoginUtils.checkLogin(context, patch + "-回复", () -> {
                                 if (listener != null) {
                                     listener.onCommentCallback(commentEntity);
                                 } else if (!TextUtils.isEmpty(newsId)) {
@@ -127,7 +245,8 @@ public class CommentUtils {
                             copyText(commentEntity.getContent(), context);
                             break;
                         case "举报":
-                            CheckLoginUtils.checkLogin(context, () -> showReportTypeDialog(commentEntity, context));
+                            CheckLoginUtils.checkLogin(context, patch + "-举报",
+                                    () -> showReportTypeDialog(commentEntity, context));
 
                             break;
                         case "查看对话":
@@ -144,125 +263,134 @@ public class CommentUtils {
 
     }
 
-    public static void showAnswerCommentOptions(final CommentEntity commentEntity, final Context context,
-                                                final OnCommentCallBackListener listener, final String id, boolean showConversation, String answerId) {
+//    public static void showAnswerCommentOptions(final CommentEntity commentEntity, final Context context,
+//                                                final OnCommentCallBackListener listener, final String id,
+//                                                boolean showConversation, String answerId, String articleId, String articleCommunityId) {
+//
+//        final Dialog dialog = new Dialog(context);
+//
+//        LinearLayout container = new LinearLayout(context);
+//        container.setOrientation(LinearLayout.VERTICAL);
+//        container.setBackgroundColor(Color.WHITE);
+//        container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
+//
+//        List<String> dialogType = new ArrayList<>();
+//
+//        if (commentEntity.getMe() == null || !commentEntity.getMe().isAnswerCommented()) {
+//            dialogType.add("回复");
+//        }
+//
+//        dialogType.add("复制");
+//        dialogType.add("举报");
+//
+//        if (commentEntity.getParentUser() != null && showConversation) {
+//            dialogType.add("查看对话");
+//        }
+//
+//        for (String s : dialogType) {
+//            final TextView reportTv = new TextView(context);
+//            reportTv.setText(s);
+//            reportTv.setTextSize(17);
+//            reportTv.setTextColor(ContextCompat.getColor(context, R.color.title));
+//            reportTv.setBackgroundResource(R.drawable.textview_white_style);
+//            int widthPixels = context.getResources().getDisplayMetrics().widthPixels;
+//            reportTv.setLayoutParams(new LinearLayout.LayoutParams((widthPixels * 9) / 10,
+//                    LinearLayout.LayoutParams.WRAP_CONTENT));
+//            reportTv.setPadding(DisplayUtils.dip2px(context, 20), DisplayUtils.dip2px(context, 12),
+//                    0, DisplayUtils.dip2px(context, 12));
+//            container.addView(reportTv);
+//
+//            reportTv.setOnClickListener(v -> {
+//                dialog.cancel();
+//                switch (reportTv.getText().toString()) {
+//                    case "回复":
+//                        CheckLoginUtils.checkLogin(context, () -> {
+//                            if (listener != null) {
+//                                listener.onCommentCallback(commentEntity);
+//                            } else if (!TextUtils.isEmpty(id)) {
+//                                context.startActivity(MessageDetailActivity.getMessageDetailIntent(context, commentEntity, id));
+//                            } else {
+//                                Utils.toast(context, "缺少关键属性");
+//                            }
+//                        });
+//                        break;
+//                    case "复制":
+//                        copyText(commentEntity.getContent(), context);
+//                        break;
+//                    case "举报":
+//                        CheckLoginUtils.checkLogin(context, () -> showAnswerReportDialog(answerId, commentEntity, context));
+//                        break;
+//                    case "查看对话":
+//                        if (TextUtils.isEmpty(articleId)) {
+//                            context.startActivity(CommentDetailActivity.getAnswerCommentIntent(context, commentEntity.getId(), answerId, null));
+//                        } else {
+//                            context.startActivity(CommentDetailActivity.getCommunityArticleCommentIntent(context, articleId, commentEntity.getId(), articleCommunityId, null));
+//                        }
+//                        break;
+//                }
+//            });
+//        }
+//
+//        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+//        dialog.setContentView(container);
+//        dialog.show();
+//    }
 
-        final Dialog dialog = new Dialog(context);
-
-        LinearLayout container = new LinearLayout(context);
-        container.setOrientation(LinearLayout.VERTICAL);
-        container.setBackgroundColor(Color.WHITE);
-        container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
-
-        List<String> dialogType = new ArrayList<>();
-
-        if (commentEntity.getMe() == null || !commentEntity.getMe().isAnswerCommented()) {
-            dialogType.add("回复");
-        }
-
-        dialogType.add("复制");
-        dialogType.add("举报");
-
-        if (commentEntity.getParentUser() != null && showConversation) {
-            dialogType.add("查看对话");
-        }
-
-        for (String s : dialogType) {
-            final TextView reportTv = new TextView(context);
-            reportTv.setText(s);
-            reportTv.setTextSize(17);
-            reportTv.setTextColor(ContextCompat.getColor(context, R.color.title));
-            reportTv.setBackgroundResource(R.drawable.textview_white_style);
-            int widthPixels = context.getResources().getDisplayMetrics().widthPixels;
-            reportTv.setLayoutParams(new LinearLayout.LayoutParams((widthPixels * 9) / 10,
-                    LinearLayout.LayoutParams.WRAP_CONTENT));
-            reportTv.setPadding(DisplayUtils.dip2px(context, 20), DisplayUtils.dip2px(context, 12),
-                    0, DisplayUtils.dip2px(context, 12));
-            container.addView(reportTv);
-
-            reportTv.setOnClickListener(v -> {
-                dialog.cancel();
-                switch (reportTv.getText().toString()) {
-                    case "回复":
-                        CheckLoginUtils.checkLogin(context, () -> {
-                            if (listener != null) {
-                                listener.onCommentCallback(commentEntity);
-                            } else if (!TextUtils.isEmpty(id)) {
-                                context.startActivity(MessageDetailActivity.getMessageDetailIntent(context, commentEntity, id));
-                            } else {
-                                Utils.toast(context, "缺少关键属性");
-                            }
-                        });
-                        break;
-                    case "复制":
-                        copyText(commentEntity.getContent(), context);
-                        break;
-                    case "举报":
-                        CheckLoginUtils.checkLogin(context, () -> showAnswerReportDialog(answerId, commentEntity, context));
-                        break;
-                    case "查看对话":
-                        context.startActivity(CommentDetailActivity.getAnswerCommentIntent(context, commentEntity.getId(), answerId));
-                        break;
-                }
-            });
-        }
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(container);
-        dialog.show();
-    }
-
-    private static void showAnswerReportDialog(final String answerId, final CommentEntity commentEntity, final Context context) {
-        final String[] arrReportType = new String[]{"垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息",
-                "违法有害信息", "其它"};
-        int widthPixels = context.getResources().getDisplayMetrics().widthPixels;
-
-        final Dialog reportTypeDialog = new Dialog(context);
-        LinearLayout container = new LinearLayout(context);
-        container.setOrientation(LinearLayout.VERTICAL);
-        container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
-        container.setBackgroundColor(Color.WHITE);
-
-        for (final String s : arrReportType) {
-            TextView reportTypeTv = new TextView(context);
-            reportTypeTv.setText(s);
-            reportTypeTv.setTextSize(17);
-            reportTypeTv.setTextColor(ContextCompat.getColor(context, R.color.title));
-            reportTypeTv.setBackgroundResource(R.drawable.textview_white_style);
-            reportTypeTv.setLayoutParams(new LinearLayout.LayoutParams((widthPixels * 9) / 10,
-                    LinearLayout.LayoutParams.WRAP_CONTENT));
-            reportTypeTv.setPadding(DisplayUtils.dip2px(context, 20), DisplayUtils.dip2px(context, 12),
-                    0, DisplayUtils.dip2px(context, 12));
-            container.addView(reportTypeTv);
-
-            reportTypeTv.setOnClickListener(v -> {
-                JSONObject jsonObject = new JSONObject();
-                try {
-                    jsonObject.put("reason", s);
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                }
-
-                PostCommentUtils.postAnswerReportData(context, commentEntity.getId(), answerId, jsonObject.toString(),
-                        new PostCommentUtils.PostCommentListener() {
-                            @Override
-                            public void postSuccess(JSONObject response) {
-                                Utils.toast(context, "感谢您的举报");
-                            }
-
-                            @Override
-                            public void postFailed(Throwable error) {
-                                Utils.toast(context, error.toString());
-                            }
-                        });
-                reportTypeDialog.cancel();
-            });
-        }
-
-        reportTypeDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        reportTypeDialog.setContentView(container);
-        reportTypeDialog.show();
-    }
+//    private static void showAnswerReportDialog(final String answerId, final CommentEntity commentEntity, final Context context) {
+//        final String[] arrReportType = new String[]{"垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息",
+//                "违法有害信息", "其它"};
+//        int widthPixels = context.getResources().getDisplayMetrics().widthPixels;
+//
+//        final Dialog reportTypeDialog = new Dialog(context);
+//        LinearLayout container = new LinearLayout(context);
+//        container.setOrientation(LinearLayout.VERTICAL);
+//        container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
+//        container.setBackgroundColor(Color.WHITE);
+//
+//        for (final String s : arrReportType) {
+//            TextView reportTypeTv = new TextView(context);
+//            reportTypeTv.setText(s);
+//            reportTypeTv.setTextSize(17);
+//            reportTypeTv.setTextColor(ContextCompat.getColor(context, R.color.title));
+//            reportTypeTv.setBackgroundResource(R.drawable.textview_white_style);
+//            reportTypeTv.setLayoutParams(new LinearLayout.LayoutParams((widthPixels * 9) / 10,
+//                    LinearLayout.LayoutParams.WRAP_CONTENT));
+//            reportTypeTv.setPadding(DisplayUtils.dip2px(context, 20), DisplayUtils.dip2px(context, 12),
+//                    0, DisplayUtils.dip2px(context, 12));
+//            container.addView(reportTypeTv);
+//
+//            reportTypeTv.setOnClickListener(v -> {
+//                JSONObject jsonObject = new JSONObject();
+//                try {
+//                    jsonObject.put("reason", s);
+//                } catch (JSONException e) {
+//                    e.printStackTrace();
+//                }
+//
+//                PostCommentUtils.postAnswerReportData(context, commentEntity.getId(), answerId, jsonObject.toString(),
+//                        new PostCommentUtils.PostCommentListener() {
+//                            @Override
+//                            public void postSuccess(JSONObject response) {
+//                                Utils.toast(context, "感谢您的举报");
+//                            }
+//
+//                            @Override
+//                            public void postFailed(Throwable error) {
+//                                if (error != null) {
+//                                    Utils.toast(context, "举报失败" + error.getMessage());
+//                                } else {
+//                                    Utils.toast(context, "举报失败，请稍候重试");
+//                                }
+//                            }
+//                        });
+//                reportTypeDialog.cancel();
+//            });
+//        }
+//
+//        reportTypeDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+//        reportTypeDialog.setContentView(container);
+//        reportTypeDialog.show();
+//    }
 
     private static void showReportTypeDialog(final CommentEntity commentEntity, final Context context) {
         final String[] arrReportType = new String[]{"垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息",
@@ -321,74 +449,79 @@ public class CommentUtils {
     }
 
     public static void postVote(final Context context, final CommentEntity commentEntity,
-                                final TextView commentLikeCountTv, final ImageView commentLikeIv, final OnVoteListener listener) {
-        CheckLoginUtils.checkLogin(context, () -> {
-            if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.theme)) {
-                Utils.toast(context, "已经点过赞啦！");
-                return;
-            }
-            commentEntity.setVote(commentEntity.getVote() + 1);
-            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme));
-            commentLikeIv.setImageResource(R.drawable.ic_like_select);
-            commentLikeCountTv.setText(String.valueOf(commentEntity.getVote()));
-            commentLikeCountTv.setVisibility(View.VISIBLE);
+                                final TextView commentLikeCountTv, final ImageView commentLikeIv,
+                                final OnVoteListener listener) {
+        if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.theme)) {
+            Utils.toast(context, "已经点过赞啦！");
+            return;
+        }
+        commentEntity.setVote(commentEntity.getVote() + 1);
+        commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme));
+        commentLikeIv.setImageResource(R.drawable.vote_icon_select);
+        commentLikeCountTv.setText(String.valueOf(commentEntity.getVote()));
+        commentLikeCountTv.setVisibility(View.VISIBLE);
 
-            PostCommentUtils.addCommentVoto(context, commentEntity.getId(),
-                    new PostCommentUtils.PostCommentListener() {
-                        @Override
-                        public void postSuccess(JSONObject response) {
-                            if (listener != null) {
-                                listener.onVote();
-                            }
+        PostCommentUtils.addCommentVote(context, commentEntity.getId(),
+                new PostCommentUtils.PostCommentListener() {
+                    @Override
+                    public void postSuccess(JSONObject response) {
+                        if (listener != null) {
+                            listener.onVote();
+                        }
+                    }
+
+                    @Override
+                    public void postFailed(Throwable e) {
+
+                        commentEntity.setVote(commentEntity.getVote() - 1);
+                        commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
+                        commentLikeIv.setImageResource(R.drawable.vote_icon_unselect);
+                        commentLikeCountTv.setText(String.valueOf(commentEntity.getVote()));
+                        if (commentEntity.getVote() == 0) {
+                            commentLikeCountTv.setVisibility(View.GONE);
+                        } else {
+                            commentLikeCountTv.setVisibility(View.VISIBLE);
                         }
 
-                        @Override
-                        public void postFailed(Throwable e) {
-
-                            commentEntity.setVote(commentEntity.getVote() - 1);
-                            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
-                            commentLikeIv.setImageResource(R.drawable.ic_like_unselect);
-                            commentLikeCountTv.setText(String.valueOf(commentEntity.getVote()));
-                            if (commentEntity.getVote() == 0) {
-                                commentLikeCountTv.setVisibility(View.GONE);
-                            } else {
-                                commentLikeCountTv.setVisibility(View.VISIBLE);
-                            }
-
-                            if (e instanceof HttpException) {
-                                HttpException exception = (HttpException) e;
-                                if (exception.code() == 403) {
-                                    try {
-                                        String detail = new JSONObject(exception.response().errorBody().string()).getString("detail");
-                                        if ("voted".equals(detail)) {
-                                            Utils.toast(context, "已经点过赞啦！");
-                                        }
-                                    } catch (Exception ex) {
-                                        ex.printStackTrace();
+                        if (e instanceof HttpException) {
+                            HttpException exception = (HttpException) e;
+                            if (exception.code() == 403) {
+                                try {
+                                    String detail = new JSONObject(exception.response().errorBody().string()).getString("detail");
+                                    if ("voted".equals(detail)) {
+                                        Utils.toast(context, "已经点过赞啦！");
                                     }
-                                    return;
+                                } catch (Exception ex) {
+                                    ex.printStackTrace();
                                 }
+                                return;
                             }
-                            Utils.toast(context, "网络异常，点赞失败");
                         }
-                    });
-        });
+                        Utils.toast(context, "网络异常，点赞失败");
+                    }
+                });
     }
 
-    public static void postVoteToAnswerComment(final Context context, String answerId, final CommentEntity commentEntity,
+    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) {
-        CheckLoginUtils.checkLogin(context, () -> {
+
+        String entrance = "回答详情-评论-点赞";
+        if (TextUtils.isEmpty(articleId)) {
+            entrance = "社区文章详情-评论-点赞";
+        }
+        CheckLoginUtils.checkLogin(context, entrance, () -> {
             if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.theme)) {
                 Utils.toast(context, "已经点过赞啦！");
                 return;
             }
             commentEntity.setVote(commentEntity.getVote() + 1);
             commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme));
-            commentLikeIv.setImageResource(R.drawable.ic_like_select);
+            commentLikeIv.setImageResource(R.drawable.vote_icon_select);
             commentLikeCountTv.setText(String.valueOf(commentEntity.getVote()));
             commentLikeCountTv.setVisibility(View.VISIBLE);
 
-            PostCommentUtils.voteAnswerComment(context, answerId, commentEntity.getId(),
+            PostCommentUtils.voteAnswerComment(context, answerId, articleId, articleCommunityId, commentEntity.getId(),
                     new PostCommentUtils.PostCommentListener() {
                         @Override
                         public void postSuccess(JSONObject response) {
@@ -402,7 +535,7 @@ public class CommentUtils {
 
                             commentEntity.setVote(commentEntity.getVote() - 1);
                             commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
-                            commentLikeIv.setImageResource(R.drawable.ic_like_unselect);
+                            commentLikeIv.setImageResource(R.drawable.vote_icon_unselect);
                             commentLikeCountTv.setText(String.valueOf(commentEntity.getVote()));
                             if (commentEntity.getVote() == 0) {
                                 commentLikeCountTv.setVisibility(View.GONE);
@@ -435,17 +568,17 @@ public class CommentUtils {
     public static void setCommentUserView(Context mContext, CommentViewHolder holder, CommentEntity entity) {
         MeEntity userDataEntity = entity.getMe();
         holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, R.color.hint));
-        holder.commentLikeIv.setImageResource(R.drawable.ic_like_unselect);
+        holder.commentLikeIv.setImageResource(R.drawable.vote_icon_unselect);
 
         if (entity.getVote() == 0) {
             holder.commentLikeCountTv.setVisibility(View.GONE);
         } else { // 检查是否已点赞
             if (userDataEntity != null && (userDataEntity.isCommentVoted() || userDataEntity.isAnswerCommentVoted())) {
                 holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, R.color.theme));
-                holder.commentLikeIv.setImageResource(R.drawable.ic_like_select);
+                holder.commentLikeIv.setImageResource(R.drawable.vote_icon_select);
             }
             holder.commentLikeCountTv.setVisibility(View.VISIBLE);
-            holder.commentLikeCountTv.setText(String.valueOf(entity.getVote()));
+            holder.commentLikeCountTv.setText(NumberUtils.transSimpleCount(entity.getVote()));
         }
 
         //检查是否是自身评论
@@ -456,17 +589,27 @@ public class CommentUtils {
             } else {
                 holder.commentUserNameTv.setText(userInfo.getName());
             }
-            ImageUtils.Companion.display(holder.commentUserIconDv, userInfo.getIcon());
+            if (userInfo.getAuth() != null) {
+                ImageUtils.display(holder.commentUserBadgeIv, userInfo.getAuth().getIcon());
+            } else {
+                ImageUtils.display(holder.commentUserBadgeIv, "");
+            }
+            ImageUtils.displayIcon(holder.commentUserIconDv, userInfo.getIcon());
         } else {
             if (entity.getMe() != null && entity.getMe().isAnswerOwn()) {
                 holder.commentUserNameTv.setText(entity.getUser().getName() + "（作者）");
             } else {
                 holder.commentUserNameTv.setText(entity.getUser().getName());
             }
-            if (TextUtils.isEmpty(entity.getUser().getIcon())) {
-                ImageUtils.Companion.display(holder.commentUserIconDv, R.drawable.user_default_icon_comment);
+            if (entity.getUser().getAuth() != null) {
+                ImageUtils.display(holder.commentUserBadgeIv, entity.getUser().getAuth().getIcon());
             } else {
-                ImageUtils.Companion.display(holder.commentUserIconDv, entity.getUser().getIcon());
+                ImageUtils.display(holder.commentUserBadgeIv, "");
+            }
+            if (TextUtils.isEmpty(entity.getUser().getIcon())) {
+                ImageUtils.display(holder.commentUserIconDv, R.drawable.user_default_icon_comment);
+            } else {
+                ImageUtils.displayIcon(holder.commentUserIconDv, entity.getUser().getIcon());
             }
         }
     }

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

@@ -0,0 +1,45 @@
+package com.gh.common.util
+
+import com.gh.gamecenter.qa.entity.AskGameSelectEntity
+import com.gh.gamecenter.retrofit.Response
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.halo.assistant.HaloApp
+import io.reactivex.schedulers.Schedulers
+
+/**
+ * 用于判断社区跳转前社区是否可用
+ */
+object CommunityHelper {
+
+    private var availableCommunityList = listOf<AskGameSelectEntity>()
+
+    @JvmStatic
+    fun getAvailableCommunityList() {
+        RetrofitManager.getInstance(HaloApp.getInstance().application).api
+                .getAskGameSelect(HaloApp.getInstance().channel
+                        , UrlFilterUtils.getFilterQuery("status", "opened"), 1, 100)
+                .subscribeOn(Schedulers.io())
+                .subscribe(object : Response<List<AskGameSelectEntity>>() {
+                    override fun onResponse(response: List<AskGameSelectEntity>?) {
+                        if (response != null && response.isNotEmpty()) {
+                            availableCommunityList = response
+                        }
+                    }
+                })
+    }
+
+    @JvmStatic
+    fun isCommunityAvailable(communityId: String?): Boolean {
+        communityId?.let {
+            if (availableCommunityList.isEmpty()) return true
+            for (entity in availableCommunityList) {
+                if (communityId == entity.id) {
+                    return true
+                }
+            }
+        }
+
+        return false
+    }
+
+}

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

@@ -0,0 +1,163 @@
+package com.gh.common.util
+
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.Matrix
+import com.gh.common.constant.Config
+import com.gh.gamecenter.entity.SettingsEntity
+import com.halo.assistant.HaloApp
+import java.io.File
+import java.io.FileOutputStream
+
+/**
+ * Created by khy on 02/08/18.
+ * 图片压缩工具类
+ * 资料参考:https://github.com/zetbaitsu/Compressor
+ * 压缩算法:http://gitlab.ghzhushou.com/pm/halo-app-issues/issues/298
+ */
+object CompressImageUtils {
+
+    private const val compressLimitSize: Long = 50 * 1024
+    private const val defaultQuality = 90
+    private const val defaultRatio = 2
+    private const val defaultCompressBorder = 1280
+
+    /**
+     * 压缩图片并保存到目标文件
+     * 该压缩方法是同步执行 请勿在主线程执行
+     * 返回源文件的三种情况:小于特定值,图片类型为GIF,压缩失败
+     */
+    @Throws(Exception::class)
+    fun compressImageAndSaveToFile(imageFile: File, compressGif: Boolean): File {
+        // 小于300K直接返回原图
+        if (imageFile.length() < getImageSetting().processLimitSize) {
+            return imageFile
+        }
+
+        val cacheDir = getImageCacheDir()
+        val parentFile = cacheDir.parentFile
+        if (!parentFile.exists()) parentFile.mkdirs()
+        var fileOutputStream: FileOutputStream? = null
+
+        try {
+            // 确定图片类型
+            val options = BitmapFactory.Options()
+            options.inJustDecodeBounds = true
+            BitmapFactory.decodeFile(imageFile.absolutePath, options)
+            val formatType = if (options.outMimeType.contains("png")) {
+                Bitmap.CompressFormat.PNG
+            } else if (options.outMimeType.contains("gif") && !compressGif) { // gif直接返回原图
+                return imageFile
+            } else {
+                Bitmap.CompressFormat.WEBP
+            }
+
+            fileOutputStream = FileOutputStream(cacheDir)
+            // write the compressed bitmap at the destination specified by destinationPath.
+            decodeSampledBitmapFromFile(imageFile).compress(formatType, getImageSetting().quality, fileOutputStream)
+            return cacheDir
+        } catch (e: Exception) {
+            e.printStackTrace()
+            if (cacheDir.exists()) {
+                cacheDir.delete()
+            }
+        } finally {
+            if (fileOutputStream != null) {
+                fileOutputStream.flush()
+                fileOutputStream.close()
+            }
+        }
+        return imageFile
+    }
+
+    private fun getImageCacheDir(): File {
+//        return File(Environment.getExternalStorageDirectory().absolutePath + "/Pictures/test/" + System.currentTimeMillis() + ".jpg")
+        // 统一用jpg保存应该没有影响吧
+        return File(HaloApp.getInstance().application.cacheDir.absolutePath + File.separator + System.currentTimeMillis() + ".jpg")
+    }
+
+    // 根据图片获取压缩后的位图
+    @Throws(Exception::class)
+    private fun decodeSampledBitmapFromFile(imageFile: File): Bitmap {
+        // First decode with inJustDecodeBounds=true to check dimensions
+        val options = BitmapFactory.Options()
+        options.inJustDecodeBounds = true
+        BitmapFactory.decodeFile(imageFile.absolutePath, options)
+
+        // Raw height and width of image
+        val height = options.outHeight
+        val width = options.outWidth
+        var inSampleSize = 1
+
+        var compressType: CompressType? = null
+
+        val longSide = Math.max(height, width) //最长边
+        val shortSide = Math.min(height, width) //最短边
+        val scale = longSide.toFloat() / shortSide  // 长短边比例
+        val compressLimit = getImageSetting().size
+
+        if (longSide > compressLimit && shortSide > compressLimit) {
+            if (scale > getImageSetting().ratio) {
+                inSampleSize = if (shortSide / compressLimit == 0) 1 else shortSide / compressLimit
+                compressType = CompressType.LIMIT_SHORT // 横向长方形
+            } else {
+                inSampleSize = if (longSide / compressLimit == 0) 1 else longSide / compressLimit
+                compressType = CompressType.LIMIT_LONG // 纵向长方形
+
+            }
+        } else if (longSide > compressLimit && shortSide < compressLimit) {
+            if (scale <= getImageSetting().ratio) {
+                inSampleSize = if (longSide / compressLimit == 0) 1 else longSide / compressLimit
+                compressType = CompressType.LIMIT_LONG
+            }
+        }
+
+        // Calculate inSampleSize
+        options.inSampleSize = inSampleSize
+
+        // Decode bitmap with inSampleSize set
+        options.inJustDecodeBounds = false
+
+        var scaledBitmap = BitmapFactory.decodeFile(imageFile.absolutePath, options)
+
+        val matrix = Matrix() // 精确缩放
+        if (compressType != null) {
+            val targetMatrixScale = if (compressType == CompressType.LIMIT_SHORT) {
+                if (scaledBitmap.width > scaledBitmap.height) {
+                    compressLimit.toFloat() / scaledBitmap.height
+                } else {
+                    compressLimit.toFloat() / scaledBitmap.width
+                }
+            } else {
+                if (scaledBitmap.width > scaledBitmap.height) {
+                    compressLimit.toFloat() / scaledBitmap.width
+                } else {
+                    compressLimit.toFloat() / scaledBitmap.height
+                }
+            }
+            matrix.setScale(targetMatrixScale, targetMatrixScale)
+            scaledBitmap = Bitmap.createBitmap(scaledBitmap, 0, 0, scaledBitmap.width, scaledBitmap.height, matrix, true)
+        }
+        return scaledBitmap
+    }
+
+    fun getImageSetting(): SettingsEntity.Image {
+        val settings = Config.getSettings()
+        if (settings == null && settings?.image != null) {
+            return settings.image!!
+        }
+        val image = SettingsEntity.Image()
+        image.processLimitSize = compressLimitSize
+        image.size = defaultCompressBorder
+        image.ratio = defaultRatio
+        image.quality = defaultQuality
+        return image
+    }
+}
+
+enum class CompressType {
+    //  0: 短边等比压缩至1280 H:长边 W:短边
+    LIMIT_SHORT,
+    //  1: 取长边等比压缩至1280 H:短边 W: 长边
+    LIMIT_LONG
+}

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

@@ -69,7 +69,7 @@ public class ConcernContentUtils {
                         DisplayUtils.dip2px(context, 2), DisplayUtils.dip2px(context, 4));
                 lparams.weight = 1;
                 imageView.setLayoutParams(lparams);
-                ImageUtils.Companion.getInstance().display(context.getResources(), imageView,
+                ImageUtils.display(context.getResources(), imageView, width / 3 - DisplayUtils.dip2px(context, 4),
                         ScalingUtils.ScaleType.CENTER_CROP, list.get(position));
                 break;
             case 1:
@@ -78,7 +78,7 @@ public class ConcernContentUtils {
                 lparams.setMargins(DisplayUtils.dip2px(context, 2), 0,
                         DisplayUtils.dip2px(context, 2), DisplayUtils.dip2px(context, 4));
                 imageView.setLayoutParams(lparams);
-                ImageUtils.Companion.getInstance().display(context.getResources(), imageView,
+                ImageUtils.display(context.getResources(), imageView, lparams.width,
                         ScalingUtils.ScaleType.CENTER_CROP, list.get(position));
                 break;
             default:
@@ -89,7 +89,7 @@ public class ConcernContentUtils {
                         DisplayUtils.dip2px(context, 2), DisplayUtils.dip2px(context, 4));
                 lparams.weight = 1;
                 imageView.setLayoutParams(lparams);
-                ImageUtils.Companion.getInstance().display(context.getResources(), imageView,
+                ImageUtils.display(context.getResources(), imageView, width / 2 - DisplayUtils.dip2px(context, 4),
                         ScalingUtils.ScaleType.CENTER_CROP, list.get(position));
                 break;
         }

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

@@ -1,18 +1,19 @@
 package com.gh.common.util
 
 import android.content.Context
+import android.text.TextUtils
 import com.gh.gamecenter.eventbus.EBConcernChanged
 import com.gh.gamecenter.manager.UserManager
 import com.gh.gamecenter.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
 import okhttp3.MediaType
 import okhttp3.RequestBody
 import okhttp3.ResponseBody
 import org.greenrobot.eventbus.EventBus
 import org.json.JSONArray
 import retrofit2.HttpException
-import rx.android.schedulers.AndroidSchedulers
-import rx.schedulers.Schedulers
 
 /**
  * Created by khy on 2016/8/24.
@@ -20,12 +21,14 @@ import rx.schedulers.Schedulers
  */
 object ConcernUtils {
 
-    fun postConcernGameId(context: Context, gameId: String, listener: onConcernListener?) {
-//        val params = JSONArray()
-//        params.put(gameId)
-//        val body = RequestBody.create(MediaType.parse("application/json"), params.toString())
-        RetrofitManager.getInstance(context).getApi()
-                .postConcern(UserManager.getInstance().userId, gameId)
+    fun postConcernGameId(context: Context, gameId: String, listener: onConcernListener?, autoConcern: Boolean = false) {
+        val mode = if (autoConcern) "auto" else "manual"
+
+        val userId = UserManager.getInstance().userId
+        if (TextUtils.isEmpty(userId)) return
+
+        RetrofitManager.getInstance(context).api
+                .postConcern(UserManager.getInstance().userId, gameId, mode)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(object : Response<ResponseBody>() {
@@ -43,7 +46,7 @@ object ConcernUtils {
     }
 
     fun deleteConcernData(context: Context, gameId: String, listener: onConcernListener?) {
-        RetrofitManager.getInstance(context).getApi()
+        RetrofitManager.getInstance(context).api
                 .deleteConcern(UserManager.getInstance().userId, gameId)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -64,20 +67,19 @@ object ConcernUtils {
     fun updateConcernData(context: Context, data: JSONArray) {
         val body = RequestBody.create(MediaType.parse("application/json"),
                 data.toString())
-        RetrofitManager.getInstance(context).getApi()
+        RetrofitManager.getInstance(context).api
                 .putConcern(UserManager.getInstance().userId, body)
                 .subscribeOn(Schedulers.io())
                 .observeOn(Schedulers.io())
                 .subscribe(object : Response<ResponseBody>() {
-                    override fun onResponse(response: ResponseBody) {
-                        super.onResponse(response)
+                    override fun onResponse(response: ResponseBody?) {
                         EventBus.getDefault().post(EBConcernChanged())
                     }
                 })
     }
 
     fun deleteConcernQuestions(context: Context, questionsId: String, listener: onConcernListener?) {
-        RetrofitManager.getInstance(context).getApi()
+        RetrofitManager.getInstance(context).api
                 .deleteConcernQuestions(UserManager.getInstance().userId, questionsId)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -96,7 +98,7 @@ object ConcernUtils {
     }
 
     fun postConcernQuestions(context: Context, questionsId: String, listener: onConcernListener?) {
-        RetrofitManager.getInstance(context).getApi()
+        RetrofitManager.getInstance(context).api
                 .postConcernQuestions(UserManager.getInstance().userId, questionsId)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())

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

@@ -6,7 +6,7 @@ import android.os.Build;
 import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.entity.NewsDetailEntity;
 import com.gh.gamecenter.manager.DataCollectionManager;
-import com.gh.gamecenter.manager.PackageManager;
+import com.gh.gamecenter.manager.PackagesManager;
 import com.lightgame.download.DownloadEntity;
 
 import org.json.JSONArray;
@@ -118,7 +118,7 @@ public class DataCollectionUtils {
         Map<String, Object> map = new HashMap<>();
         map.put("type", Build.MODEL);
         map.put("system", Build.VERSION.SDK_INT + "=" + Build.VERSION.RELEASE);
-        map.put("install", PackageManager.INSTANCE.getInstalledList());
+        map.put("install", PackagesManager.INSTANCE.getInstalledList());
         DataCollectionManager.upsert(context, "user", map);
     }
 

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

@@ -2,10 +2,11 @@ package com.gh.common.util;
 
 import android.content.Context;
 
-import com.halo.assistant.HaloApp;
-import com.lightgame.download.DownloadEntity;
 import com.gh.gamecenter.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
+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.JSONObject;
@@ -13,11 +14,11 @@ import org.json.JSONObject;
 import java.util.HashMap;
 import java.util.Map;
 
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
 import okhttp3.ResponseBody;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
 
 /**
  * Created by LGT on 2016/12/8.
@@ -37,12 +38,12 @@ public class DataLogUtils {
 
     // 上传日志
     public static void uploadLog(Context context, String topic, Map<String, Object> map) {
-        String version = PackageUtils.getPatchVersionName();
+        String version = PackageUtils.getVersionName();
         String user = Installation.getUUID(context);
         String channel = HaloApp.getInstance().getChannel();
         map.put("version", version);
         map.put("user", user);
-        map.put("device_id", TokenUtils.getDeviceId(context));
+        map.put("device_id", Util_System_Phone_State.getDeviceId(context));
         map.put("channel", channel);
 
         Map<String, String> params = new HashMap<>();

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

@@ -82,12 +82,11 @@ public class DataUtils {
             StatConfig.init(context);
             StatConfig.setInstallChannel(channel);
             StatConfig.setAntoActivityLifecycleStat(true);
-            StatConfig.setAppVersion(PackageUtils.getPatchVersionName());
+            StatConfig.setAppVersion(PackageUtils.getVersionName());
 
             // 开启收集服务
             StatService.startStatService(context, Config.MTA_APPKEY, com.tencent.stat.common.StatConstants.VERSION);
             StatService.registerActivityLifecycleCallbacks(context);
-
         } catch (MtaSDkException e) {
             e.printStackTrace();
         }
@@ -100,7 +99,7 @@ public class DataUtils {
             strategy.setEnableANRCrashMonitor(false);
             strategy.setEnableNativeCrashMonitor(false);
             strategy.setAppChannel(channel);
-            strategy.setAppVersion(PackageUtils.getPatchVersionName());
+            strategy.setAppVersion(PackageUtils.getVersionName());
 
             CrashReport.initCrashReport(context, Config.BUGLY_APPID, false, strategy);
 
@@ -115,17 +114,7 @@ public class DataUtils {
 //        if (CommonDebug.IS_DEBUG && (kv == null || kv.length % 2 != 0)) {
 //            throw new IllegalStateException("onEvent kv 必须不为空且数量为偶数");
 //        }
-        Properties prop = new Properties();
-        for (int i = 0; i < kv.length; i++) {
-            if (i % 2 != 0 || i != 0) {
-                String key = kv[i - 1];
-                String value = kv[i];
-                if (!TextUtils.isEmpty(key) && !TextUtils.isEmpty(value)) {
-                    prop.setProperty(key, value);
-                }
-            }
-        }
-        StatService.trackCustomKVEvent(context, eventId, prop);
+        MtaHelper.onEvent(eventId, kv);
     }
 
     public static void onEvent(Context var0, String var1, String var2) {
@@ -163,26 +152,55 @@ public class DataUtils {
         StatService.trackCustomKVEvent(var0, var1, prop);
     }
 
+    public static void trackTimeEvent(Context context, String eventId, int costTime, String... kv) {
+
+        Properties prop = new Properties();
+        for (int i = 0; i < kv.length; i++) {
+            if (i % 2 != 0 || i != 0) {
+                String key = kv[i - 1];
+                String value = kv[i];
+                if (!TextUtils.isEmpty(key) && !TextUtils.isEmpty(value)) {
+                    prop.setProperty(key, value);
+                }
+            }
+        }
+
+        if (prop.size() == 0) return;
+
+        StatService.trackCustomKVTimeIntervalEvent(context, costTime, eventId, prop);
+    }
+
     // 游戏下载
-    public static void onGameDownloadEvent(Context context, String gameName, String platform, String entrance, String status) {
+    public static void onGameDownloadEvent(Context context, String gameName, String platform, String entrance, String status, String method) {
         Map<String, Object> kv = new HashMap<>();
 
         platform = PlatformUtils.getInstance(HaloApp.getInstance().getApplication()).getPlatformName(platform);
 
         kv.put("版本", platform);
-        kv.put("状态", status);
         kv.put("用户机型", Build.MODEL);
         kv.put("设备IMEI", Util_System_Phone_State.getDeviceId(HaloApp.getInstance().getApplication()));
         kv.put("网络状态", DeviceUtils.getNetwork(HaloApp.getInstance().getApplication()));
         kv.put("光环助手版本", BuildConfig.VERSION_NAME);
+        kv.put("位置", entrance);
+        kv.put("类型", method);
+        kv.put("厂商", Build.MANUFACTURER);
+        kv.put("Android版本", Build.VERSION.RELEASE);
         onEvent(context, "游戏下载", gameName, kv);
 
         Map<String, Object> kv2 = new HashMap<>();
-        kv2.put("版本", platform);
         kv2.put("状态", status);
         kv2.put("位置", entrance);
-        kv2.put("游戏分平台", gameName + "-" + platform);
-        kv2.put("光环助手版本", BuildConfig.VERSION_NAME);
+
+        if (status.equals("开始")) {
+            kv2.put("版本", entrance + "-开始");
+            kv2.put("游戏分平台", gameName + "-" + platform + "-开始");
+            kv2.put("光环助手版本", BuildConfig.VERSION_NAME + "-开始");
+        } else {
+            kv2.put("版本", platform);
+            kv2.put("游戏分平台", gameName + "-" + platform);
+            kv2.put("光环助手版本", BuildConfig.VERSION_NAME);
+        }
+
         onEvent(context, "游戏下载位置", gameName, kv2);
     }
 

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

@@ -8,7 +8,8 @@ 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.manager.PackageManager;
+import com.gh.gamecenter.entity.PluginLocation;
+import com.gh.gamecenter.manager.PackagesManager;
 import com.lightgame.download.DownloadEntity;
 
 /**
@@ -33,15 +34,13 @@ public class DetailDownloadUtils {
             viewHolder.mDownloadPb.setText(TextUtils.isEmpty(viewHolder.downloadOffText) ? "暂无下载" : viewHolder.downloadOffText);
             viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.NONE);
         } else {
-            String status = GameUtils.getDownloadBtnText(viewHolder.context, viewHolder.gameEntity);
+            String status = GameUtils.getDownloadBtnText(viewHolder.context, viewHolder.gameEntity, PluginLocation.only_game);
             switch (status) {
                 case "插件化":
                     viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.PLUGIN);
                     break;
                 case "打开":
-                    if (viewHolder.gameEntity.getApk().size() == 1) {
-                        status = "启动";
-                    }
+                case "启动":
                     viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.LAUNCH_OR_OPEN);
                     break;
                 default:
@@ -73,11 +72,19 @@ public class DetailDownloadUtils {
         switch (downloadEntity.getStatus()) {
             case downloading:
             case pause:
+                viewHolder.mDownloadPb.setText(R.string.downloading);
+                if (downloadEntity.isPluggable() && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
+                    viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_PLUGIN);
+                } else {
+                    viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_NORMAL);
+                }
+                break;
             case timeout:
             case neterror:
             case waiting:
-                viewHolder.mDownloadPb.setText(R.string.downloading);
-                if (downloadEntity.isPluggable() && PackageManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
+            case subscribe:
+                viewHolder.mDownloadPb.setText(R.string.waiting);
+                if (downloadEntity.isPluggable() && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
                     viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_PLUGIN);
                 } else {
                     viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_NORMAL);
@@ -86,7 +93,7 @@ public class DetailDownloadUtils {
             case done:
                 viewHolder.mDownloadPb.setText(R.string.install);
                 if (downloadEntity.isPluggable()
-                        && PackageManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
+                        && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
                     viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_PLUGIN);
                 } else {
                     viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_NORMAL);

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

@@ -0,0 +1,134 @@
+package com.gh.common.util
+
+import android.content.Context
+import android.os.Environment
+import android.preference.PreferenceManager
+import com.gh.gamecenter.BuildConfig
+import com.gh.gamecenter.entity.TimeEntity
+import com.gh.gamecenter.retrofit.Response
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.halo.assistant.HaloApp
+import com.lightgame.utils.Util_System_Phone_State
+import com.lightgame.utils.Utils
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import java.io.File
+
+object DeviceTokenUtils {
+
+    const val DEVICE_ID = "uuid"
+
+    // 同步服务器时间
+    @JvmStatic
+    @Synchronized
+    fun syncServerTime(context: Context) {
+        val sp = PreferenceManager.getDefaultSharedPreferences(context)
+        RetrofitManager.getInstance(context).api.time
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(object : Response<TimeEntity>() {
+                    override fun onResponse(response: TimeEntity?) {
+                        val editor = sp.edit()
+                        response?.time?.let {
+                            editor.putLong("server_time", it)
+                            editor.putLong("client_time", System.currentTimeMillis() / 1000)
+                            editor.apply()
+                        }
+                    }
+                })
+    }
+
+    @JvmStatic
+    fun getLaunchType(): LunchType {
+        var lunchType: LunchType? = null
+        val values = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().application).all
+        // 版本更新
+        if (values.isNotEmpty()) {
+            for (value in values) {
+                if (value.key.contains("isNewFirstLaunchV")) {
+                    lunchType = LunchType.UPDATE
+                    break
+                }
+            }
+        }
+        // 再次重装
+        if (lunchType == null && !getDeviceId().isNullOrEmpty()) {
+            lunchType = LunchType.AGAIN
+        }
+        // 首次安装
+        if (lunchType == null) {
+            lunchType = LunchType.FIRST
+        }
+        // 保存deviceId
+        var deviceId = Util_System_Phone_State.getDeviceId(HaloApp.getInstance().application)
+        if (deviceId.isNullOrEmpty()) {
+            deviceId = Utils.getTime(HaloApp.getInstance().application).toString()
+        }
+        setDeviceId(deviceId)
+
+        return lunchType
+    }
+
+    private fun getDeviceFileList(): List<File> {
+        val sdCardDir = Environment.getExternalStorageDirectory()
+        val fileList: MutableList<File> = ArrayList()
+        fileList.add(File(sdCardDir.path + "/gh-uuid/$DEVICE_ID"))
+        fileList.add(File(sdCardDir.path + "/system/$DEVICE_ID"))
+        fileList.add(File(sdCardDir.path + "/data/$DEVICE_ID"))
+        return fileList
+    }
+
+
+    @Synchronized
+    private fun setDeviceId(deviceId: String) {
+        //将deviceId存到sp
+        val sp = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().application)
+        val edit = sp.edit()
+        edit.putString(DEVICE_ID, deviceId)
+        edit.apply()
+        Utils.log("saveDeviceId", "保存成功SP")
+
+        //将deviceId存到SD卡
+        for (file in getDeviceFileList()) {
+            try {
+                val parentFile = file.parentFile
+                if (!parentFile.exists()) parentFile.mkdirs()
+                file.writeText(deviceId)
+                Utils.log("saveDeviceId", "保存成功SDCard目录为：${file.path}")
+            } catch (e: Exception) {
+                Utils.log("保存u${DEVICE_ID}到SDCard异常${file.path} " + e.toString())
+                e.printStackTrace()
+            }
+        }
+    }
+
+    private fun getDeviceId(): String? {
+        val sp = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().application)
+        var deviceId = sp.getString(DEVICE_ID, null)
+        if (deviceId.isNullOrEmpty()) {
+            val fileList = getDeviceFileList()
+            for (file in fileList) {
+                if (file.exists()) {
+                    try {
+                        deviceId = file.readText()
+                        Utils.log("getDeviceId", "获取成功DataFile$DEVICE_ID")
+                        return deviceId
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                    }
+                }
+            }
+        }
+        if (BuildConfig.DEBUG) {
+            Utils.log("getDeviceId", "获取成功SP$DEVICE_ID")
+        }
+        return deviceId
+    }
+
+}
+
+enum class LunchType {
+    FIRST,
+    UPDATE,
+    AGAIN
+}

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

@@ -128,6 +128,20 @@ public class DeviceUtils {
         return builder.toString();
     }
 
+    public static String getUserAgent() {
+        String userAgent = "";
+        userAgent = System.getProperty("http.agent");
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0, length = userAgent.length(); i < length; i++) {
+            char c = userAgent.charAt(i);
+            if (c <= '\u001f' || c >= '\u007f') {
+                sb.append(String.format("\\u%04x", (int) c));
+            } else {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
 
     public static String getIPAddress(Context context) {
         NetworkInfo info = ((ConnectivityManager) context
@@ -158,45 +172,50 @@ public class DeviceUtils {
     }
 
     public static String getNetwork(Context context) {
-        NetworkInfo info = ((ConnectivityManager) context
-                .getSystemService(Context.CONNECTIVITY_SERVICE)).getActiveNetworkInfo();
+        ConnectivityManager connManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        if (connManager == null) return null;
+        NetworkInfo info = connManager.getActiveNetworkInfo();
         if (info != null && info.isConnected()) {
             int typeMobile = info.getType();
             if (typeMobile == ConnectivityManager.TYPE_WIFI) {
                 return "WIFI";
             } else if (typeMobile == ConnectivityManager.TYPE_MOBILE) {
-                String status;
-                switch (typeMobile) {
-                    case TelephonyManager.NETWORK_TYPE_GPRS:
-                    case TelephonyManager.NETWORK_TYPE_EDGE:
-                    case TelephonyManager.NETWORK_TYPE_CDMA:
-                    case TelephonyManager.NETWORK_TYPE_1xRTT:
-                    case TelephonyManager.NETWORK_TYPE_IDEN:
-                        status = "2G";
-                        break;
-                    case TelephonyManager.NETWORK_TYPE_UMTS:
-                    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:
-                        status = "3G";
-                        break;
-                    case TelephonyManager.NETWORK_TYPE_LTE:
-                        status = "4G";
-                        break;
-                    default:
-                        status = "未知";
-                        break;
+                TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+                if (telephonyManager != null) {
+                    int networkType = telephonyManager.getNetworkType();
+                    String status;
+                    switch (networkType) {
+                        case TelephonyManager.NETWORK_TYPE_GPRS:
+                        case TelephonyManager.NETWORK_TYPE_EDGE:
+                        case TelephonyManager.NETWORK_TYPE_CDMA:
+                        case TelephonyManager.NETWORK_TYPE_1xRTT:
+                        case TelephonyManager.NETWORK_TYPE_IDEN:
+                            status = "2G";
+                            break;
+                        case TelephonyManager.NETWORK_TYPE_UMTS:
+                        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:
+                            status = "3G";
+                            break;
+                        case TelephonyManager.NETWORK_TYPE_LTE:
+                            status = "4G";
+                            break;
+                        default:
+                            status = "未知";
+                            break;
+                    }
+                    return status;
                 }
-                return status;
             }
         }
 
-        return null;
+        return "无网络";
     }
 
 

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

@@ -7,12 +7,14 @@ import android.content.DialogInterface;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.os.Handler;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
 import android.text.Html;
 import android.text.Spanned;
 import android.text.TextPaint;
+import android.text.TextUtils;
 import android.view.Display;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -24,10 +26,12 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.gh.gamecenter.AboutActivity;
 import com.gh.gamecenter.KcSelectGameActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.kuaichuan.WifiMgr;
 import com.halo.assistant.HaloApp;
+import com.lightgame.utils.Utils;
 
 import java.io.File;
 import java.text.DecimalFormat;
@@ -325,7 +329,6 @@ public class DialogUtils {
     }
 
     public static void showWarningDialog(Context context, String title, CharSequence msg, final ConfirmListener listener) {
-        //TODO fix this
         if (!(context instanceof Activity)) {
             return;
         }
@@ -345,15 +348,66 @@ public class DialogUtils {
                 , "取消", "前往QQ", new ConfirmListener() {
                     @Override
                     public void onConfirm() {
-                        QQUtils.startQQSession(context, qq);
+                        DirectUtils.directToQqConversation(context, qq);
                     }
                 }, null);
     }
 
-    public static void showDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener) {
-        showWarningDialog(context, "下载提示", "您当前使用的网络为2G/3G/4G，开始下载将会消耗移动流量，确定下载？", "取消", "确定", listener, cancelListener);
+    public static void checkDownload(Context context, String size, CheckDownloadCallBack callBack) {
+        if (!NetworkUtils.isNetworkConnected(context)) {
+            showNoConnectionDownloadDialog(context, null,
+                    () -> callBack.onResponse(true));
+        } else if (NetworkUtils.isWifiConnected(context) || filter4GorSize(context, size)) {
+            callBack.onResponse(false);
+        } else {
+            showDownloadDialog(context,
+                    () -> callBack.onResponse(false),
+                    () -> callBack.onResponse(true));
+        }
     }
 
+    private static boolean filter4GorSize(Context context, String size) {
+        try {
+            if (TextUtils.isEmpty(size)) {
+                return false;
+            }
+            String mb = size.toUpperCase().replaceAll("MB", "").trim();
+            Float i = Float.valueOf(mb);
+            if (NetworkUtils.isWifiOr4GConnected(context) && i <= 50) {
+                Utils.toast(context, "当前使用移动流量下载");
+                return true;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    public static void checkResumeDownload(Context context, CheckDownloadCallBack callBack) {
+        if (NetworkUtils.isWifiConnected(context)) {
+            callBack.onResponse(false);
+        } else {
+            showResumeDownloadDialog(context, () -> {
+                callBack.onResponse(false);
+            }, () -> {
+                callBack.onResponse(true);
+            });
+        }
+    }
+
+    public static void showNoConnectionDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener) {
+        showWarningDialog(context, "下载提示", "网络异常，请检查手机网络状态", "连上WiFi后自动下载", "关闭", listener, cancelListener);
+    }
+
+    public static void showDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener) {
+        showWarningDialog(context, "下载提示", "当前正在使用移动网络，立即下载会消耗手机流量", "连上WiFi后自动下载", "立即下载", listener, cancelListener);
+    }
+
+    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);
     }
@@ -701,6 +755,88 @@ public class DialogUtils {
         dialog.show();
     }
 
+    public static void showLowVersionDialog(Context context) {
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
+
+        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);
+
+        contentTv.setText("链接超出范围，请检查升级至最新版本的光环助手");
+        titleTv.setText("提示");
+        negativeTv.setText("关闭");
+        positiveTv.setText("检查升级");
+
+        negativeTv.setOnClickListener(view -> dialog.dismiss());
+
+        positiveTv.setOnClickListener(view -> {
+            context.startActivity(AboutActivity.getIntent(context, true));
+            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) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+
+        String[] selectionArray = new String[selectionList.size()];
+        selectionArray = selectionList.toArray(selectionArray);
+        builder.setItems(selectionArray, onClickListener);
+        AlertDialog dialog = builder.create();
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.show();
+    }
+
+    /**
+     * @param options        供以显示的选项
+     * @param disabledOptions 显示为灰色的选项（是 options 的子集）
+     */
+    public static void showListDialog(Context context,
+                                      List<String> options,
+                                      List<String> disabledOptions,
+                                      OptionCallback callback) {
+        Dialog dialog = new Dialog(context);
+
+        LinearLayout container = new LinearLayout(context);
+        container.setOrientation(LinearLayout.VERTICAL);
+        container.setBackgroundColor(Color.WHITE);
+        container.setPadding(0, DisplayUtils.dip2px(context, 12f), 0, DisplayUtils.dip2px(context, 12f));
+
+        for (String option : options) {
+            TextView reportTv = new TextView(context);
+            reportTv.setText(option);
+            reportTv.setTextSize(17f);
+            if (disabledOptions != null && disabledOptions.contains(option)) {
+                reportTv.setTextColor(ContextCompat.getColor(context, R.color.btn_gray));
+            } else {
+                reportTv.setTextColor(ContextCompat.getColor(context, R.color.title));
+                reportTv.setBackgroundResource(R.drawable.textview_white_style);
+            }
+            int widthPixels = context.getResources().getDisplayMetrics().widthPixels;
+            reportTv.setLayoutParams(new LinearLayout.LayoutParams(widthPixels * 9 / 10,
+                    LinearLayout.LayoutParams.WRAP_CONTENT));
+            reportTv.setPadding(DisplayUtils.dip2px(context, 20f), DisplayUtils.dip2px(context, 12f),
+                    0, DisplayUtils.dip2px(context, 12f));
+            container.addView(reportTv);
+
+            reportTv.setOnClickListener(v -> {
+                dialog.cancel();
+                callback.onClicked(reportTv.getText().toString());
+            });
+        }
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(container);
+        dialog.show();
+    }
+
     public interface ConfirmListener {
         void onConfirm();
     }
@@ -709,4 +845,12 @@ public class DialogUtils {
         void onCancel();
     }
 
+    public interface OptionCallback {
+        void onClicked(String text);
+    }
+
+    public interface CheckDownloadCallBack {
+        void onResponse(boolean isSubscribe);
+    }
+
 }

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

@@ -0,0 +1,301 @@
+package com.gh.common.util
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.text.TextUtils
+import com.gh.base.fragment.BaseFragment_TabLayout
+import com.gh.common.AppExecutor
+import com.gh.common.util.EntranceUtils.*
+import com.gh.gamecenter.*
+import com.gh.gamecenter.download.DownloadFragment.Companion.INDEX_UPDATE
+import com.gh.gamecenter.entity.CommunityEntity
+import com.gh.gamecenter.entity.LinkEntity
+import com.gh.gamecenter.entity.SubjectData
+import com.gh.gamecenter.eventbus.EBReuse
+import com.gh.gamecenter.eventbus.EBSkip
+import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.qa.AskFragment
+import com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity
+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.subject.SubjectActivity
+import com.gh.gamecenter.suggest.SuggestType
+import com.lightgame.utils.Util_System_ClipboardManager
+import com.lightgame.utils.Utils
+import org.greenrobot.eventbus.EventBus
+
+/**
+ * 跳转用的方法
+ */
+object DirectUtils {
+
+    /**
+     * 跳转到特定页面，根据 [type] 决定跳转页面，[path] 为跳转前的页面名称
+     */
+    @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)
+
+            EntranceUtils.HOST_GAME -> directToGameDetail(context, id = link, entrance = entrance)
+
+            EntranceUtils.HOST_GAME_DOWNLOAD -> directToGameDetail(context, id = link, entrance = entrance, autoDownload = true)
+
+            EntranceUtils.HOST_COLUMN -> directToSubject(context, id = link, subjectName = text, entrance = entrance)
+
+            EntranceUtils.HOST_QUESTION -> directToQuestionDetail(context, id = link, entrance = entrance, path = path)
+
+            EntranceUtils.HOST_ANSWER -> directToAnswerDetail(context, id = link, entrance = entrance, path = path)
+
+            EntranceUtils.HOST_WEB -> directToWebView(context, url = link, entrance = entrance)
+
+            EntranceUtils.HOST_DOWNLOAD -> directToDownloadManagerAndStartDownload(context, gameId = link, packageName = text, entrance = entrance)
+
+            EntranceUtils.HOST_UPDATE -> directToDownloadManagerAndStartUpdate(context, gameId = link, packageName = text, entrance = entrance)
+
+            EntranceUtils.HOST_LIBAO -> directToGiftDetail(context, giftId = link, entrance = entrance)
+
+            EntranceUtils.HOST_COMMUNITY -> directToCommunity(context, CommunityEntity(link, text!!))
+        }
+    }
+
+    /**
+     * 跳转到特定页面,只支持App内部跳转
+     */
+    @JvmStatic
+    fun directToLinkPage(context: Context, linkEntity: LinkEntity, entrance: String, path: String) {
+        when (linkEntity.type) {
+            "article", "news" -> {
+                NewsUtils.statNewsViews(context, linkEntity.link) // 统计阅读量
+                context.startActivity(NewsDetailActivity.getIntentById(context, linkEntity.link, entrance))
+            }
+
+            "game" -> GameDetailActivity.startGameDetailActivity(context, linkEntity.link, entrance)
+
+            "column" -> SubjectActivity.startSubjectActivity(context, linkEntity.link, linkEntity.text, false, entrance)
+
+            "question" -> context.startActivity(QuestionsDetailActivity.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_article" -> context.startActivity(ArticleDetailActivity.getIntent(context, linkEntity.community!!, linkEntity.link!!, entrance, path))
+
+            "community_column" -> context.startActivity(CommunitySubjectActivity.getIntent(context, linkEntity.community!!, linkEntity.link, entrance))
+
+            "community_special_column" -> context.startActivity(AskColumnDetailActivity.getIntentByColumnId(context, linkEntity.link, linkEntity.community!!, entrance, path))
+
+            "web" -> directToWebView(context, url = linkEntity.link!!, entrance = entrance)
+
+            "qq" -> directToQqConversation(context, linkEntity.link)
+
+            else -> DialogUtils.showLowVersionDialog(context)
+        }
+    }
+
+    /**
+     * 跳转到文章详情
+     */
+    @JvmStatic
+    fun directToArticle(context: Context, id: String, entrance: String? = null) {
+        val bundle = Bundle()
+        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+        bundle.putString(KEY_TO, NewsDetailActivity::class.java.simpleName)
+        bundle.putString(KEY_NEWSID, id)
+        EntranceUtils.jumpActivity(context, bundle)
+    }
+
+    /**
+     * 跳转到游戏详情
+     */
+    @JvmStatic
+    fun directToGameDetail(context: Context, id: String, entrance: String? = null, autoDownload: Boolean? = null) {
+        val bundle = Bundle()
+        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+        bundle.putString(KEY_TO, GameDetailActivity::class.java.simpleName)
+        bundle.putString(KEY_GAMEID, id)
+        bundle.putBoolean(KEY_AUTO_DOWNLOAD, autoDownload ?: false)
+        EntranceUtils.jumpActivity(context, bundle)
+    }
+
+    // 专栏
+    @JvmStatic
+    fun directToSubject(context: Context, id: String, subjectName: String? = "", entrance: String? = null) {
+        val bundle = Bundle()
+        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+        bundle.putString(KEY_TO, SubjectActivity::class.java.name)
+        bundle.putParcelable(EntranceUtils.KEY_SUBJECT_DATA, SubjectData(id, subjectName, false, null, null, null, null))
+        EntranceUtils.jumpActivity(context, bundle)
+    }
+
+    // 反馈
+    @JvmStatic
+    fun directToFeedback(context: Context, content: String? = null, entrance: String? = null) {
+        val bundle = Bundle()
+        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+        bundle.putString(KEY_TO, SuggestionActivity::class.java.simpleName)
+        bundle.putString(KEY_CONTENT, content)
+        bundle.putString(KEY_SUGGEST_HINT_TYPE, KEY_PLUGIN)
+        bundle.putSerializable(EntranceUtils.KEY_SUGGESTTYPE, SuggestType.gameQuestion)
+        EntranceUtils.jumpActivity(context, bundle)
+    }
+
+    @JvmStatic
+    fun directToDownloadManager(context: Context, entrance: String? = null) {
+        val bundle = Bundle()
+        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+        bundle.putString(KEY_TO, DownloadManagerActivity.TAG)
+        EntranceUtils.jumpActivity(context, bundle)
+    }
+
+    /**
+     * 跳转到下载管理器并开始下载 [gameId] 和 [packageName] 用于唯一确定一个下载文件
+     */
+    @JvmStatic
+    fun directToDownloadManagerAndStartDownload(context: Context, gameId: String? = "", packageName: String? = "", entrance: String? = null) {
+        DownloadHelper.createABrandNewDownloadTaskQuietly(gameId, packageName) {
+            val bundle = Bundle()
+            bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+            bundle.putString(KEY_TO, DownloadManagerActivity.TAG)
+            bundle.putString(KEY_GAMEID, gameId)
+            bundle.putString(KEY_PACKAGENAME, packageName)
+            bundle.putBoolean(KEY_AUTO_DOWNLOAD, true)
+            EntranceUtils.jumpActivity(context, bundle)
+        }
+    }
+
+    @JvmStatic
+    fun directToDownloadManagerAndStartUpdate(context: Context, gameId: String? = "", packageName: String? = "", entrance: String? = null) {
+        val bundle = Bundle()
+        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+        bundle.putString(KEY_TO, DownloadManagerActivity.TAG)
+        bundle.putString(KEY_GAMEID, gameId)
+        bundle.putString(KEY_PACKAGENAME, packageName)
+        bundle.putInt(BaseFragment_TabLayout.PAGE_INDEX, INDEX_UPDATE)
+        EntranceUtils.jumpActivity(context, bundle)
+    }
+
+    @JvmStatic
+    fun directToAnswerDetail(context: Context, id: String, entrance: String? = null, path: String? = null) {
+        val bundle = Bundle()
+        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+        bundle.putString(KEY_TO, AnswerDetailActivity::class.java.name)
+        bundle.putString(KEY_PATH, path)
+        bundle.putString(KEY_ANSWER_ID, id)
+        EntranceUtils.jumpActivity(context, bundle)
+    }
+
+    @JvmStatic
+    fun directToQuestionDetail(context: Context, id: String, entrance: String? = null, path: String? = null) {
+        val bundle = Bundle()
+        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+        bundle.putString(KEY_TO, QuestionsDetailActivity::class.java.name)
+        bundle.putString(KEY_PATH, path)
+        bundle.putString(KEY_QUESTIONS_ID, id)
+        EntranceUtils.jumpActivity(context, bundle)
+    }
+
+    @JvmStatic
+    fun directToWebView(context: Context, url: String, entrance: String? = null) {
+        val bundle = Bundle()
+        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+        bundle.putString(EntranceUtils.KEY_TO, WebActivity::class.java.simpleName)
+        bundle.putString(EntranceUtils.KEY_URL, url)
+        EntranceUtils.jumpActivity(context, bundle)
+    }
+
+    // 个人-系统消息
+    @JvmStatic
+    fun directToOfficialNotification(context: Context, entrance: String? = null) {
+        val bundle = Bundle()
+        bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+        bundle.putString(EntranceUtils.KEY_TO, MessageKeFuActivity::class.java.simpleName)
+        EntranceUtils.jumpActivity(context, bundle)
+    }
+
+    // 跳转 QQ
+    @JvmStatic
+    fun directToQqConversation(context: Context, qqNumber: String? = null) {
+        var qq = qqNumber
+
+        if (TextUtils.isEmpty(qq)) {
+            qq = "2586716223"
+        }
+        if (ShareUtils.isQQClientAvailable(context)) {
+            // 安装了 QQ 直接调用QQ，打开手机QQ进行会话 默认 QQ 号：2586716223
+            val chatType: String
+            if (qq!!.startsWith("400") || qq.startsWith("800")) {
+                chatType = "crm"
+            } else {
+                chatType = "wpa"
+            }
+            val str = "mqqwpa://im/chat?chat_type=$chatType&uin=$qq&version=1&src_type=web"
+            context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(str)))
+        } else {
+            // 没有安装QQ 复制账号
+            Util_System_ClipboardManager.setText(context, qq)
+            Utils.toast(context, "已复制 QQ $qq")
+        }
+    }
+
+    // 跳转 QQ 群
+    @JvmStatic
+    fun directToQqGroup(context: Context, groupNumber: String? = null): Boolean {
+        val intent = Intent()
+        intent.data = Uri.parse("mqqopensdkapi://bizAgent/qm/qr?url=http%3A%2F%2Fqm.qq.com%2Fcgi-bin%2Fqm%2Fqr%3Ffrom%3Dapp%26p%3Dandroid%26k%3D$groupNumber")
+        // 此Flag可根据具体产品需要自定义，如设置，则在加群界面按返回，返回手Q主界面，不设置，按返回会返回到呼起产品界面    //intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        try {
+            context.startActivity(intent)
+            return true
+        } catch (e: Exception) {
+            // 未安装手Q或安装的版本不支持
+            return false
+        }
+    }
+
+    /**
+     * 跳转到 礼包详情
+     */
+    @JvmStatic
+    fun directToGiftDetail(context: Context, giftId: String, entrance: String? = null) {
+        val bundle = Bundle()
+        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+        bundle.putString(EntranceUtils.KEY_TO, LibaoDetailActivity::class.java.simpleName)
+        bundle.putString(EntranceUtils.KEY_ID, giftId)
+        EntranceUtils.jumpActivity(context, bundle)
+    }
+
+    /**
+     * 切换到社区页面
+     */
+    @JvmStatic
+    fun directToCommunity(context: Context, community: CommunityEntity?) {
+        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)
+        }
+        UserManager.getInstance().setCommunityData(community)
+
+        // 这里换个线程操作是为了做一点延时
+        AppExecutor.ioExecutor.execute {
+            EventBus.getDefault().post(EBSkip(MainActivity.EB_SKIP_GAMEFRAGMENT, 1))
+            EventBus.getDefault().post(EBReuse(AskFragment.EB_RETRY_PAGE))
+        }
+    }
+
+    @JvmStatic
+    fun directToCommunityArticle(context: Context, articleId: String?, communityId: String?, entrance: String?) {
+        val bundle = Bundle()
+        bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+        bundle.putString(EntranceUtils.KEY_TO, ArticleDetailActivity::class.java.name)
+        bundle.putString(EntranceUtils.KEY_COMMUNITY_ARTICLE_ID, articleId)
+        bundle.putParcelable(EntranceUtils.KEY_COMMUNITY_DATA, CommunityEntity(id = communityId!!))
+        EntranceUtils.jumpActivity(context, bundle)
+    }
+}

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

@@ -0,0 +1,52 @@
+package com.gh.common.util
+
+import com.gh.download.DownloadManager
+import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.retrofit.Response
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.halo.assistant.HaloApp
+import io.reactivex.schedulers.Schedulers
+import retrofit2.HttpException
+
+/**
+ * 不想写这个类的，但是与其在一个糟糕的类里插入同样的代码，我想独立写一个类相较而已还没那么糟糕
+ */
+object DownloadHelper {
+
+    /**
+     * 根据 game_id 和 packageName 悄悄地开启一个下载任务，如果可以的话
+     * @param block 成功添加下载任务后执行的代码块
+     */
+    fun createABrandNewDownloadTaskQuietly(gameId: String? = "", packageName: String? = "", block: () -> Unit) {
+        RetrofitManager.getInstance(HaloApp.getInstance().application)
+                .api
+                .getGameDigest(gameId)
+                .map(ApkActiveUtils.filterMapper)
+                .subscribeOn(Schedulers.io())
+                .subscribe(object : Response<GameEntity>() {
+                    override fun onResponse(response: GameEntity?) {
+                        response?.let {
+                            if (response.getApk().size > 1) {
+                                for (apk in response.getApk()) {
+                                    if (packageName == apk.packageName) {
+                                        DownloadManager.createDownload(HaloApp.getInstance().application,
+                                                apk, response, "", EntranceUtils.ENTRANCE_RECOMMEND, "", false, null)
+                                        block.invoke()
+                                    }
+                                }
+                            } else if (response.getApk().size == 1) {
+                                DownloadManager.createDownload(HaloApp.getInstance().application,
+                                        response, "", EntranceUtils.ENTRANCE_RECOMMEND, "", false, null)
+                                block.invoke()
+                            }
+                        }
+                    }
+
+                    override fun onFailure(e: HttpException?) {
+                        e?.printStackTrace()
+                        block.invoke()
+                    }
+                })
+    }
+
+}

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

@@ -21,7 +21,8 @@ import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.GameViewHolder;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
-import com.gh.gamecenter.manager.PackageManager;
+import com.gh.gamecenter.entity.PluginLocation;
+import com.gh.gamecenter.manager.PackagesManager;
 import com.lightgame.download.DownloadConfig;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.DownloadStatus;
@@ -68,7 +69,7 @@ public class DownloadItemUtils {
 //                adapter.notifyItemChanged(index);
 //            }
         } else {
-            if (!queue.contains(platform)) {
+            if (!queue.contains(platform) && !TextUtils.isEmpty(platform)) {
                 queue.offer(platform);
                 if (AppDebugConfig.IS_DEBUG) {
                     AppDebugConfig.logMethodWithParams(DownloadItemUtils.class, queue.size(), gameEntity.getBrief(), downloadEntity.getPlatform(), index);
@@ -95,7 +96,13 @@ public class DownloadItemUtils {
         }
     }
 
-    public static void updateItem(Context context, GameEntity gameEntity, GameViewHolder holder, boolean isShowPlatform) {
+    public static void updateItem(Context context, GameEntity gameEntity, GameViewHolder holder,
+                                  boolean isShowPlatform) {
+        updateItem(context, gameEntity, holder, isShowPlatform, PluginLocation.only_game);
+    }
+
+    public static void updateItem(Context context, GameEntity gameEntity, GameViewHolder holder,
+                                  boolean isShowPlatform, PluginLocation pluginLocation) {
 
         // 控制是否显示下载按钮
         if (!Config.isShowDownload(gameEntity.getId()) || context.getString(R.string.app_name).equals(gameEntity.getName())) {
@@ -119,17 +126,16 @@ public class DownloadItemUtils {
             holder.gameDownloadBtn.setTextColor(ContextCompat.getColor(context, R.color.button_gray));
             holder.gameDownloadBtn.setClickable(false);
         } else if (gameEntity.getApk().size() == 1) {
-            updateNormalItem(context, holder, gameEntity, isShowPlatform);
+            updateNormalItem(context, holder, gameEntity, isShowPlatform, pluginLocation);
         } else {
-//            updateNormalItem(context, holder, gameEntity, isShowPlatform);
-            updatePluginItem(context, holder, gameEntity, isShowPlatform);
+            updatePluginItem(context, holder, gameEntity, isShowPlatform, pluginLocation);
         }
 
     }
 
     // 更新正常的条目，只有一个apk包
     static void updateNormalItem(Context context, GameViewHolder holder, GameEntity gameEntity,
-                                 boolean isShowPlatform) {
+                                 boolean isShowPlatform, PluginLocation pluginLocation) {
 
         final ArrayMap<String, DownloadEntity> entryMap = gameEntity.getEntryMap();
         final ApkEntity apkEntity = gameEntity.getApk().get(0);
@@ -143,74 +149,22 @@ public class DownloadItemUtils {
             }
         }
 
+        GameUtils.setDownloadBtnStatus(context, gameEntity, holder.gameDownloadBtn, pluginLocation);
+
         holder.gameDes.setVisibility(View.VISIBLE);
         holder.gameProgressbar.setVisibility(View.GONE);
         holder.gameInfo.setVisibility(View.GONE);
-
-        holder.gameDownloadBtn.setTextColor(Color.WHITE);
-
-        final String packageName = apkEntity.getPackageName();
-
-        if (gameEntity.isPluggable()) {
-            holder.gameDownloadBtn.setText(R.string.pluggable);
-            setwhat(context, holder, apkEntity, packageName);
-        } else if (PackageManager.INSTANCE.isInstalled(packageName)) {
-            if (PackageManager.INSTANCE.isCanUpdate(gameEntity.getId(), packageName)) {
-                holder.gameDownloadBtn.setText(R.string.update);
-                holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style);
-            } else {
-                Object gh_id = PackageUtils.getMetaData(context, packageName, "gh_id");
-                if (gameEntity.getTag() != null && gameEntity.getTag().size() != 0
-                        && !TextUtils.isEmpty(apkEntity.getGhVersion())
-                        && !PackageUtils.isSignature(context, packageName)) {
-                    holder.gameDownloadBtn.setText(R.string.pluggable);
-                    setwhat(context, holder, apkEntity, packageName);
-                } else if (gh_id == null || gh_id.equals(gameEntity.getId())) {
-                    holder.gameDownloadBtn.setText(R.string.launch);
-                    holder.gameDownloadBtn.setTextColor(ContextCompat.getColor(context, R.color.theme));
-                    holder.gameDownloadBtn.setBackgroundResource(R.drawable.detail_download_open_style);
-                } else {
-                    holder.gameDownloadBtn.setText(R.string.download);
-                    holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style);
-                }
-            }
-        } else {
-            holder.gameDownloadBtn.setText(R.string.download);
-            holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style);
-        }
-    }
-
-    /**
-     * 这个干什么鬼?
-     *
-     * @param context
-     * @param holder
-     * @param apkEntity
-     * @param packageName
-     */
-    public static void setwhat(Context context, GameViewHolder holder, ApkEntity apkEntity, String packageName) {
-        DownloadEntity downloadEntity = DownloadManager.getInstance(context).getDownloadEntityByPackageName(packageName);
-        if (downloadEntity == null || downloadEntity.getUrl().equals(apkEntity.getUrl())) {
-            holder.gameDownloadBtn.setClickable(true);
-            holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_plugin_style);
-        } else {
-            holder.gameDownloadBtn.setClickable(false);
-            holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_pause_up);
-        }
     }
 
     // 更新插件的条目，有多个apk包
-    static void updatePluginItem(Context context, GameViewHolder holder, GameEntity gameEntity,
-                                 boolean isShowPlatform) {
-
-        GameUtils.setDownloadBtnStatus(context, gameEntity, holder.gameDownloadBtn);
+    private static void updatePluginItem(Context context, GameViewHolder holder, GameEntity gameEntity,
+                                         boolean isShowPlatform, PluginLocation pluginLocation) {
+        GameUtils.setDownloadBtnStatus(context, gameEntity, holder.gameDownloadBtn, pluginLocation);
 
         ArrayMap<String, DownloadEntity> entryMap = gameEntity.getEntryMap();
         if (entryMap != null && !entryMap.isEmpty()) {
-
-            DownloadEntity downloadEntity;
-
             LinkedBlockingQueue<String> queue = DownloadManager.getInstance(context).getQueue(gameEntity.getName());
+            DownloadEntity downloadEntity;
             if (queue != null && !queue.isEmpty()) {
                 downloadEntity = entryMap.get(queue.peek());
             } else {
@@ -274,7 +228,8 @@ public class DownloadItemUtils {
             }
         } else if (status.equals(DownloadStatus.pause)
                 || status.equals(DownloadStatus.timeout)
-                || status.equals(DownloadStatus.neterror)) {
+                || status.equals(DownloadStatus.neterror)
+                || status.equals(DownloadStatus.subscribe)) {
             holder.gameProgressbar.setProgress((int) (downloadEntity.getPercent() * 10));
             if (isShowPlatform && platform != null) {
                 holder.gameDownloadSpeed.setText(String.format("%s - 暂停", platform));
@@ -284,7 +239,11 @@ public class DownloadItemUtils {
             holder.gameDownloadPercentage.setText(downloadEntity.getPercent() + "%");
 
             if (isNormal) {
-                holder.gameDownloadBtn.setText(R.string.downloading);
+                if (status.equals(DownloadStatus.pause)) {
+                    holder.gameDownloadBtn.setText(R.string.downloading);
+                } else {
+                    holder.gameDownloadBtn.setText(R.string.waiting);
+                }
                 holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style);
                 holder.gameDownloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style));
             }
@@ -298,10 +257,10 @@ public class DownloadItemUtils {
             holder.gameDownloadPercentage.setText(R.string.hundred_percent);
 
             if (isNormal) {
-                holder.gameDownloadBtn.setText("安装");
+                holder.gameDownloadBtn.setText(R.string.install);
                 holder.gameDownloadBtn.setTextColor(Color.WHITE);
                 if (downloadEntity.isPluggable()
-                        && PackageManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
+                        && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
                     holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_plugin_style);
                 } else {
                     holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style);
@@ -356,51 +315,34 @@ public class DownloadItemUtils {
                                      final String entrance,
                                      final String location,
                                      @Nullable final ExposureEvent traceEvent) {
-
         String str = downloadBtn.getText().toString();
-        switch (str) {
-            case "下载":
-                if (NetworkUtils.isWifiConnected(context)) {
-                    download(context, gameEntity, downloadBtn, entrance, location, traceEvent);
-                } else {
-                    DialogUtils.showDownloadDialog(context, () -> download(context, gameEntity, downloadBtn, entrance, location, traceEvent));
-                }
-                break;
-            case "插件化":
-                if (entrance.contains("我的游戏")) {
-                    DataUtils.onMtaEvent(context, "我的游戏_启动", "插件化", gameEntity.getName());
-                }
-                if (NetworkUtils.isWifiConnected(context)) {
-                    plugin(context, gameEntity, downloadBtn, entrance, location, traceEvent);
-                } else {
-                    DialogUtils.showDownloadDialog(context, () -> plugin(context, gameEntity, downloadBtn, entrance, location, traceEvent));
-                }
-                break;
-            case "安装":
-                install(context, gameEntity, position, adapter);
-                break;
-            case "启动":
-                if (entrance.contains("我的游戏")) {
-                    DataUtils.onMtaEvent(context, "我的游戏_启动", "启动", gameEntity.getName());
-                }
-                DataUtils.onGameLaunchEvent(context, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), location);
-
-                PackageUtils.launchApplicationByPackageName(context, gameEntity.getApk().get(0).getPackageName());
-                break;
-            case "下载中":
-                context.startActivity(
-                        DownloadManagerActivity.getDownloadMangerIntent(context, gameEntity.getApk().get(0).getUrl(), entrance + "+(" + location.split(":")[0] + ")"));
-                break;
-            case "更新":
-                if (entrance.contains("我的游戏")) {
-                    DataUtils.onMtaEvent(context, "我的游戏_启动", "更新", gameEntity.getName());
-                }
-                if (NetworkUtils.isWifiConnected(context)) {
-                    update(context, gameEntity, entrance, location, traceEvent);
-                } else {
-                    DialogUtils.showDownloadDialog(context, () -> update(context, gameEntity, entrance, location, traceEvent));
-                }
-                break;
+        if (str.equals(context.getString(R.string.download))) {
+            DialogUtils.checkDownload(context, gameEntity.getApk().get(0).getSize(),
+                    isSubscribe -> download(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent));
+        } else if (str.equals(context.getString(R.string.pluggable))) {
+            if (entrance.contains("我的游戏")) {
+                DataUtils.onMtaEvent(context, "我的游戏_启动", "插件化", gameEntity.getName());
+            }
+            DialogUtils.checkDownload(context, gameEntity.getApk().get(0).getSize(),
+                    isSubscribe -> plugin(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent));
+        } else if (str.equals(context.getString(R.string.install))) {
+            install(context, gameEntity, position, adapter);
+        } else if (str.equals(context.getString(R.string.launch))) {
+            if (entrance.contains("我的游戏")) {
+                DataUtils.onMtaEvent(context, "我的游戏_启动", "启动", gameEntity.getName());
+            }
+            DataUtils.onGameLaunchEvent(context, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), location);
+            PackageUtils.launchApplicationByPackageName(context, gameEntity.getApk().get(0).getPackageName());
+        } else if (str.equals(context.getString(R.string.waiting))
+                || str.equals(context.getString(R.string.downloading))) {
+            context.startActivity(DownloadManagerActivity.getDownloadMangerIntent(context,
+                    gameEntity.getApk().get(0).getUrl(), entrance + "+(" + location.split(":")[0] + ")"));
+        } else if (str.equals(context.getString(R.string.update))) {
+            if (entrance.contains("我的游戏")) {
+                DataUtils.onMtaEvent(context, "我的游戏_启动", "更新", gameEntity.getName());
+            }
+            DialogUtils.checkDownload(context, gameEntity.getApk().get(0).getSize(),
+                    isSubscribe -> update(context, gameEntity, entrance, location, isSubscribe, traceEvent));
         }
     }
 
@@ -410,14 +352,15 @@ public class DownloadItemUtils {
                                  TextView downloadBtn,
                                  String entrance,
                                  String location,
+                                 boolean isSubscribe,
                                  @Nullable ExposureEvent traceEvent) {
         String msg = FileUtils.isCanDownload(context, gameEntity.getApk().get(0).getSize());
         if (TextUtils.isEmpty(msg)) {
-            DataUtils.onGameDownloadEvent(context, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), entrance, "下载开始");
+            DataUtils.onGameDownloadEvent(context, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), entrance, "下载开始", "下载");
 
-            ExposureEvent downloadExposureEvent = ExposureUtils.INSTANCE.logADownloadExposureEvent(gameEntity, gameEntity.getApk().get(0).getPlatform(), traceEvent, ExposureUtils.DownloadType.DOWNLOAD);
+            ExposureEvent downloadExposureEvent = ExposureUtils.logADownloadExposureEvent(gameEntity, gameEntity.getApk().get(0).getPlatform(), traceEvent, ExposureUtils.DownloadType.DOWNLOAD);
 
-            DownloadManager.createDownload(context, gameEntity, context.getString(R.string.download), entrance, location, downloadExposureEvent);
+            DownloadManager.createDownload(context, gameEntity, context.getString(R.string.download), entrance, location, isSubscribe, downloadExposureEvent);
             Utils.toast(context, gameEntity.getName() + "已加入下载队列");
 
             downloadBtn.setText(R.string.downloading);
@@ -432,14 +375,14 @@ public class DownloadItemUtils {
 
     //插件化
     private static void plugin(Context context, GameEntity gameEntity, TextView downloadBtn, String entrance,
-                               String location, @Nullable ExposureEvent traceEvent) {
+                               String location, boolean isSubscribe, @Nullable ExposureEvent traceEvent) {
         String msg = FileUtils.isCanDownload(context, gameEntity.getApk().get(0).getSize());
         if (TextUtils.isEmpty(msg)) {
-            DataUtils.onGameDownloadEvent(context, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), entrance, "下载开始");
+            DataUtils.onGameDownloadEvent(context, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), entrance, "下载开始", "插件化");
 
-            ExposureEvent downloadExposureEvent = ExposureUtils.INSTANCE.logADownloadExposureEvent(gameEntity, gameEntity.getApk().get(0).getPlatform(), traceEvent, ExposureUtils.DownloadType.PLUGIN_DOWNLOAD);
+            ExposureEvent downloadExposureEvent = ExposureUtils.logADownloadExposureEvent(gameEntity, gameEntity.getApk().get(0).getPlatform(), traceEvent, ExposureUtils.DownloadType.PLUGIN_DOWNLOAD);
 
-            DownloadManager.createDownload(context, gameEntity, "插件化", entrance, location, downloadExposureEvent);
+            DownloadManager.createDownload(context, gameEntity, "插件化", entrance, location, isSubscribe, downloadExposureEvent);
             Utils.toast(context, gameEntity.getName() + "已加入下载队列");
 
             downloadBtn.setText(R.string.downloading);
@@ -473,10 +416,11 @@ public class DownloadItemUtils {
     }
 
     //更新
-    private static void update(Context context, GameEntity gameEntity, String entrance, String location, @Nullable ExposureEvent traceEvent) {
+    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.INSTANCE.logADownloadExposureEvent(gameEntity, gameEntity.getApk().get(0).getPlatform(), traceEvent, ExposureUtils.DownloadType.UPDATE);
-        DownloadManager.createDownload(context, gameEntity, "更新", entrance, location, downloadExposureEvent);
+        ExposureEvent downloadExposureEvent = ExposureUtils.logADownloadExposureEvent(gameEntity, gameEntity.getApk().get(0).getPlatform(), traceEvent, ExposureUtils.DownloadType.UPDATE);
+        DownloadManager.createDownload(context, gameEntity, "更新", entrance, location, isSubscribe, downloadExposureEvent);
     }
 
 }

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

@@ -25,22 +25,33 @@ 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_COMMUNITY_ARTICLE = "community.article";
     public static final String HOST_GAME = "game";
+    public static final String HOST_GAME_DOWNLOAD = "game_download";
     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_DOWNLOAD = "download";
+    public static final String HOST_UPDATE = "update";
+    public static final String HOST_LIBAO = "libao";
+    public static final String HOST_COMMUNITY = "community";
     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 KEY_DATA = "data";
+    public static final String KEY_MESSAGE = "message";
     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_ENTRANCE = "entrance";
     public static final String KEY_TARGET = "target";
     public static final String ENTRANCE_BROWSER = "(浏览器)";
+    public static final String ENTRANCE_WELCOME = "(启动弹窗)";
     public static final String ENTRANCE_UMENG = "(友盟推送)";
     public static final String ENTRANCE_MIPUSH = "(小米推送)";
     public static final String ENTRANCE_DOWNLOAD = "(下载跳转)";
+    public static final String ENTRANCE_RECOMMEND = "(落地页)";
+    public static final String ENTRANCE_BLOCK_RECOMMEND = "(推荐入口)";
     public static final String KEY_SUGGEST_HINT_TYPE = "suggestHintType";
     public static final String KEY_PACKAGENAME = "packageName";
     public static final String KEY_PLATFORM = "platform";
@@ -51,6 +62,7 @@ public class EntranceUtils {
     public static final String KEY_CURRENTITEM = "currentItem";
     public static final String KEY_COMMENTID = "commentId";
     public static final String KEY_PATH = "path";
+    public static final String KEY_OUTER_INFO = "outerInfo";
     public static final String KEY_OLDERUSER = "isOldUser";
     public static final String KEY_SEARCHKEY = "searchKey";
     public static final String KEY_HINT = "hint";
@@ -70,6 +82,7 @@ public class EntranceUtils {
     public static final String KEY_MESSAGE_TYPE = "messageType";
     public static final String KEY_QUESTIONS_SEARCH_KEY = "questionsSearchKey";
     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";
     public static final String KEY_CHECK_QUESTION_CONCERN = "check_question_concern";
     public static final String KEY_DRAFT_ID = "draft_id";
@@ -80,9 +93,25 @@ public class EntranceUtils {
     public static final String KEY_BLOCK_DATA = "blockData";
     public static final String KEY_ASK_TAG = "askTag";
     public static final String KEY_ASK_COLUMN_TAG = "askColumnTag";
+    public static final String KEY_COMMUNITY_ID = "community_id";
+    public static final String KEY_COMMUNITY_NAME = "community_name";
     public static final String KEY_COMMUNITY_DATA = "communityData";
     public static final String KEY_TRACE_EVENT = "trace_event";
     public static final String KEY_SUBJECT_DATA = "subjectData";
+    public static final String KEY_SHOW_SELECT_COMMUNITY = "show_select_community";
+    public static final String KEY_USER_ID = "user_id";
+    public static final String KEY_QUESTION_TAG = "question_tag";
+    public static final String KEY_COLUMN_ID = "column_id";
+    public static final String KEY_AUTO_DOWNLOAD = "auto_download";
+    public static final String KEY_HIDE_SUGGEST_HINT = "hide_suggest_hint";
+    public static final String KEY_COMMUNITY_ARTICLE_ID = "communityArticleId";
+    public static final String KEY_ARTICLE_COMMENT_ID = "articleCommentId";
+    public static final String KEY_DEVICE_NAME = "deviceName";
+    public static final String KEY_SHOW_ARTICLE_COMMENT = "showArticleComment";
+    public static final String KEY_RATING_STAR_COUNT = "ratingStarCount";
+    public static final String KEY_QUESTION_MODERATOR_PATCH = "questionModeratorPatch";
+    public static final String KEY_SKIP_GAME_COMMENT = "skipGameComment";
+    public static final String KEY_OPEN_PLATFORM_WINDOW = "openPlatformWindow";
 
     public static void jumpActivity(Context context, Bundle bundle) {
 

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

@@ -0,0 +1,103 @@
+package com.gh.common.util
+
+import android.content.Context
+import com.gh.gamecenter.R
+import com.gh.gamecenter.entity.ErrorEntity
+import com.lightgame.utils.Utils
+
+/**
+ * 这个类用来管理一些错误，像弹窗、TOAST 什么的
+ */
+object ErrorHelper {
+
+    /***
+     * 禁言错误,
+     *403050： 评论回答
+     *403051： 评论资讯文章
+     *403055： 评论社区文章
+     *403048： 发表回答
+     *403053： 发表社区文章
+     *403049： 发布问题
+     *403046： 编辑回答
+     *403045： 编辑答案
+     *403057： 游戏评论
+     *403054： 更新社区文章
+     *403047： 回答点赞
+     */
+
+    /**
+     * [important] 用来标识有同样错误码可以触发两种处理时，为 true 时选择重要的
+     */
+    fun handleError(context: Context, errorString: String?, important: Boolean = false) {
+        val errorEntity = errorString?.toObject<ErrorEntity>()
+
+        if (errorEntity == null) {
+            Utils.toast(context, R.string.post_failure_hint)
+            return
+        }
+
+        if (!errorEntity.toast.isNullOrEmpty()) {
+            Utils.toast(context, errorEntity.toast)
+            return
+        }
+
+        when (errorEntity.code) {
+            403050,
+            403051,
+            403055,
+            403048,
+            403053,
+            403049,
+            403046,
+            403045,
+            403057,
+            403054,
+            403047 -> handleErrorWithBannedDialog(context, errorEntity)
+
+            403001 -> Utils.toast(context, "标签名称太长了")
+            403002 -> Utils.toast(context, "已经被邀请了")
+            403003 -> Utils.toast(context, "每天最多可以邀请10次")
+            403004 -> Utils.toast(context, "客户端提供的ID无效（空/无效ID）")
+            403005 -> Utils.toast(context, "已经回答过了（限制频率）")
+            403006 -> Utils.toast(context, "图片数量达到限制点")
+            403007 -> Utils.toast(context, "不合法的用户")
+            403008 -> Utils.toast(context, "已投票")
+            403009 -> Utils.toast(context, "已经收藏过了")
+            403010 -> Utils.toast(context, "无效的标签栏")
+            403011 -> Utils.toast(context, "标题内容过长")
+            403012 -> Utils.toast(context, "描述内容过长")
+            403013 -> Utils.toast(context, "无效的标签")
+            403014 -> Utils.toast(context, "标签数量太多了")
+            403015 -> Utils.toast(context, "已经关注过了")
+            404001 -> Utils.toast(context, "请求的资源不存在")
+            403018 -> Utils.toast(context, R.string.comment_failed_unable)
+
+            403020 -> if (important!!) {
+                DialogUtils.showAlertDialog(context,
+                        "限制提醒",
+                        "提问过于频繁，请先休息一下哦",
+                        "知道了", null, null, null)
+            } else {
+                Utils.toast(context, R.string.comment_failed_toofrequent)
+            }
+
+            403021 -> Utils.toast(context, R.string.comment_failed_illegal)
+
+            else -> Utils.toast(context, R.string.post_failure_hint)
+        }
+    }
+
+    private fun handleErrorWithBannedDialog(context: Context, errorEntity: ErrorEntity) {
+        val bannedType = if (errorEntity.data?.alwaysBlock!!) {
+            ""
+        } else {
+            "（非永久）"
+        }
+
+        DialogUtils.showAlertDialog(context,
+                "提示",
+                "你因违反《问答版块规则》，已被禁言$bannedType，如有疑问，请联系客服（QQ：3467475980）",
+                "关闭", null, null, null)
+    }
+
+}

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

@@ -0,0 +1,101 @@
+package com.gh.common.util
+
+import android.arch.lifecycle.*
+import android.content.Context
+import android.support.v4.app.Fragment
+import android.support.v4.app.FragmentActivity
+import android.support.v4.view.ViewPager
+import android.view.View
+import com.google.gson.reflect.TypeToken
+
+/**
+ * 创建以 activity 为观察者上下文的 viewModel
+ */
+inline fun <reified VM : ViewModel> FragmentActivity.viewModelProvider(
+        provider: ViewModelProvider.Factory
+) =
+        ViewModelProviders.of(this, provider).get(VM::class.java)
+
+/**
+ * 创建以 fragment 为观察者上下文的 viewModel
+ */
+inline fun <reified VM : ViewModel> Fragment.viewModelProvider(
+        provider: ViewModelProvider.Factory
+) =
+        ViewModelProviders.of(this, provider).get(VM::class.java)
+
+/**
+ *
+ * ViewPager Extensions
+ *
+ */
+fun ViewPager.doOnPageSelected(action: (position: Int) -> Unit) = addOnPageChangeListener(onSelected = action)
+
+fun ViewPager.addOnPageChangeListener(onSelected: ((position: Int) -> Unit)? = null) {
+    val listener = object : ViewPager.OnPageChangeListener {
+        override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
+            // Do nothing.
+        }
+
+        override fun onPageSelected(position: Int) {
+            onSelected?.invoke(position)
+        }
+
+        override fun onPageScrollStateChanged(state: Int) {
+            // Do nothing.
+        }
+    }
+    addOnPageChangeListener(listener)
+}
+
+/**
+ * LiveData Extensions
+ */
+fun <T> LiveData<T?>.observeNonNull(owner: LifecycleOwner, callback: (T) -> Unit) {
+    observe(owner, Observer { value ->
+        if (value != null) {
+            callback(value)
+        }
+    })
+}
+
+/**
+ * Login related extensions
+ */
+fun Fragment.ifLogin(entrance: String, action: (() -> Unit)? = null) {
+    requireContext().ifLogin(entrance, action)
+}
+
+fun Context.ifLogin(entrance: String, action: (() -> Unit)? = null) {
+    CheckLoginUtils.checkLogin(this, entrance, action)
+}
+
+
+/**
+ * Gson related extensions.
+ */
+inline fun <reified T : Any> String.toObject(): T? {
+    return try {
+        GsonUtils.gson.fromJson(this, object : TypeToken<T>() {}.type)
+    } catch (e: Exception) {
+        e.printStackTrace()
+        null
+    }
+}
+
+inline fun <reified T : Any> T.toJson(): String {
+    return GsonUtils.toJson(this)
+}
+
+/**
+ *  快速点击两下
+ */
+fun fastDoubleClickAction(id: Int, interval: Long = 300, action: (() -> Unit)? = null) {
+    if (ClickUtils.isFastDoubleClick(id, interval)) {
+        action?.invoke()
+    }
+}
+
+fun View.fastDoubleClickAction(interval: Long, action: (() -> Unit)? = null) {
+    fastDoubleClickAction(id, interval, action)
+}

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

@@ -0,0 +1,113 @@
+package com.gh.common.util
+
+import android.content.Context
+import android.text.TextUtils
+import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.entity.SubjectEntity
+import com.gh.gamecenter.retrofit.Response
+import com.gh.gamecenter.retrofit.RetrofitManager
+import io.reactivex.schedulers.Schedulers
+
+/**
+ * 首页补充游戏库辅助类
+ */
+object GameRepositoryHelper {
+
+    private const val KEY_GAME_REPOSITORY = "game_repository"
+
+    // TODO 会有多线程操作问题（在此列表获取补充游戏数据时进行下拉刷新修改此列表）
+    var gameCollectionList: List<SubjectEntity> = arrayListOf()
+
+    init {
+        loadSavedRepository()
+    }
+
+    /**
+     * 获取游戏补充库
+     */
+    @JvmStatic
+    fun getGameRepository(context: Context) {
+
+        // Test only
+//        RetrofitManager.getInstance(context)
+//                .api
+//                .remenkapai
+//                .subscribeOn(Schedulers.io())
+//                .subscribe(object : Response<List<GameEntity>>() {
+//                    override fun onResponse(response: List<GameEntity>?) {
+//                        val subjectEntityList = arrayListOf<SubjectEntity>()
+//                        val subjectEntity = SubjectEntity(id = "5ac46cca2924bc2870438d28")
+//                        subjectEntity.data = ArrayList(response)
+//                        subjectEntityList.add(subjectEntity)
+//                        updateGameRepository(subjectEntityList)
+//                    }
+//                })
+
+
+        RetrofitManager.getInstance(context)
+                .api
+                .reserveColumns
+                .subscribeOn(Schedulers.io())
+                .subscribe(object : Response<List<SubjectEntity>>() {
+                    override fun onResponse(response: List<SubjectEntity>?) {
+                        super.onResponse(response)
+
+                        updateGameRepository(response)
+                    }
+                })
+
+    }
+
+    /**
+     * 刷新内存中的游戏库（即从 SP 中再读一次）
+     */
+    @JvmStatic
+    fun refreshGameRepository() = loadSavedRepository()
+
+    private fun loadSavedRepository() {
+        gameCollectionList = SPUtils.getString(KEY_GAME_REPOSITORY).toObject() ?: arrayListOf()
+    }
+
+    fun updateGameRepository(subjects: List<SubjectEntity>?) {
+
+        if (subjects == null) return
+
+        SPUtils.setString(KEY_GAME_REPOSITORY, subjects.toJson())
+
+        gameCollectionList = subjects
+
+    }
+
+    /**
+     * 从补充游戏库相应的专题中取出一个与其它游戏都不相同的游戏，为空时即为游戏用完或不存在该相应专题
+     * @param collectionId 补充游戏库相应专题 ID
+     * @param gameIdList 该专题里已经包含的游戏 ID 列表
+     */
+    fun getOneUniqueGame(collectionId: String?, gameIdList: List<String>): GameEntity? {
+        collectionId?.let {
+            val collection = gameCollectionList.find { it.id == collectionId }
+            // Test only
+//            val collection = gameCollectionList.find { it.id == "5ac46cca2924bc2870438d28" }
+
+            collection?.let {
+                val game = collection.data?.find { game -> findUniqueGame(game, gameIdList) }
+                game?.let {
+                    collection.data?.remove(game)
+                    return game
+                }
+            }
+        }
+        return null
+    }
+
+    private fun findUniqueGame(game: GameEntity, gameIdList: List<String>): Boolean {
+        for (apk in game.getApk()) {
+            // 检查本地是否已安装该游戏，已过滤那部分框架服务的包名
+            if (PackageHelper.validLocalPackageNameSet.contains(apk.packageName)) {
+                return false
+            }
+        }
+        return !gameIdList.contains(game.id) && !TextUtils.isEmpty(game.id)
+    }
+
+}

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

@@ -6,13 +6,15 @@ import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.widget.TextView;
 
+import com.gh.common.constant.Config;
 import com.gh.download.DownloadManager;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.entity.ApkEntity;
-import com.gh.gamecenter.entity.GameCollectionEntity;
 import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.entity.GameUpdateEntity;
-import com.gh.gamecenter.manager.PackageManager;
+import com.gh.gamecenter.entity.PluginLocation;
+import com.gh.gamecenter.entity.SettingsEntity;
+import com.gh.gamecenter.manager.PackagesManager;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.DownloadStatus;
 
@@ -46,13 +48,13 @@ public class GameUtils {
     /**
      * 设置下载按钮状态
      */
-    public static void setDownloadBtnStatus(Context context, GameEntity gameEntity, TextView downloadBtn) {
-        String status = getDownloadBtnText(context, gameEntity);
+    public static void setDownloadBtnStatus(Context context, GameEntity gameEntity, TextView downloadBtn, PluginLocation pluginLocation) {
+        String status = getDownloadBtnText(context, gameEntity, pluginLocation);
         downloadBtn.setTextColor(Color.WHITE);
         downloadBtn.setText(status);
         if ("插件化".equals(status)) {
             downloadBtn.setBackgroundResource(R.drawable.game_item_btn_plugin_style);
-        } else if ("打开".equals(status)) {
+        } else if ("打开".equals(status) || "启动".equals(status)) {
             downloadBtn.setBackgroundResource(R.drawable.detail_downloading_normal_style);
             downloadBtn.setTextColor(ContextCompat.getColor(context, R.color.theme));
         } else {
@@ -63,22 +65,25 @@ public class GameUtils {
     /**
      * 获取下载按钮文案
      */
-    public static String getDownloadBtnText(Context context, GameEntity gameEntity) {
+    public static String getDownloadBtnText(Context context, GameEntity gameEntity, PluginLocation pluginLocation) {
         int doneCount = 0;      // 下载完成数量
         int pluginCount = 0;    // 可插件化数量
         int updateCount = 0;    // 可更新数量
         int installCount = 0;   // 已安装数量
         DownloadEntity downloadEntity;
         Object gh_id;
+        apkFor:
         for (ApkEntity apkEntity : gameEntity.getApk()) {
 
-            // 去除下载合集判断
-            boolean isCollection = false;
-            for (GameCollectionEntity collectionEntity : gameEntity.getCollection()) {
-                if (collectionEntity.getPackage().contains(apkEntity.getPackageName()))
-                    isCollection = true;
+            // filter by packageName
+            SettingsEntity settings = Config.getSettings();
+            if (settings != null && gameEntity.getApk().size() > 1) {
+                for (String pkgName : settings.getGameDownloadBlackList()) {
+                    if (pkgName.equals(apkEntity.getPackageName())) {
+                        continue apkFor;
+                    }
+                }
             }
-            if (isCollection) continue;
 
             downloadEntity = DownloadManager.getInstance(context).getDownloadEntityByUrl(apkEntity.getUrl());
             if (downloadEntity != null) {
@@ -90,14 +95,15 @@ public class GameUtils {
                     updateCount++;
                 }
             }
-            if (PackageManager.INSTANCE.isCanUpdate(gameEntity.getId(), apkEntity.getPackageName())) {
+            if (PackagesManager.INSTANCE.isCanUpdate(gameEntity.getId(), apkEntity.getPackageName())) {
                 updateCount++;
             }
-            if (PackageManager.INSTANCE.isInstalled(apkEntity.getPackageName())) {
+            if (PackagesManager.INSTANCE.isInstalled(apkEntity.getPackageName())) {
                 gh_id = PackageUtils.getMetaData(context, apkEntity.getPackageName(), "gh_id");
                 if (gameEntity.getTag() != null && gameEntity.getTag().size() != 0
                         && !TextUtils.isEmpty(apkEntity.getGhVersion())
-                        && !PackageUtils.isSignature(context, apkEntity.getPackageName())) {
+                        && !PackageUtils.isSignature(context, apkEntity.getPackageName())
+                        && apkEntity.isShowPlugin(pluginLocation)) {
                     pluginCount++;
                 } else if (gh_id == null || gh_id.equals(gameEntity.getId())) {
                     installCount++;
@@ -105,15 +111,19 @@ public class GameUtils {
             }
         }
         if (doneCount != 0) {
-            return "安装";
+            return context.getString(R.string.install);
         } else if (pluginCount != 0) {
-            return "插件化";
+            return context.getString(R.string.pluggable);
         } else if (updateCount != 0) {
-            return "更新";
+            return context.getString(R.string.update);
         } else if (installCount != 0) {
-            return "打开";
+            if (gameEntity.getApk().size() == 1) {
+                return context.getString(R.string.launch);
+            } else {
+                return context.getString(R.string.open);
+            }
         } else {
-            return "下载";
+            return context.getString(R.string.download);
         }
     }
 
@@ -135,6 +145,7 @@ public class GameUtils {
         gameUpdateEntity.setPluggable(true);
         gameUpdateEntity.setTag(gameEntity.getTag());
         gameUpdateEntity.setBrief(gameEntity.getBrief());
+        gameUpdateEntity.setPlugin(apkEntity.getPlugin());
         return gameUpdateEntity;
     }
 

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

@@ -41,7 +41,7 @@ public class GameViewUtils {
                 if (i == size - 1) {
                     view = getGameTagView(context, tag.get(i), 0, tagType, tagStyle.size() > i ? tagStyle.get(i) : null);
                 } else {
-                    view = getGameTagView(context, tag.get(i), DisplayUtils.dip2px(context, 6), tagType, tagStyle.size() > i ? tagStyle.get(i) : null);
+                    view = getGameTagView(context, tag.get(i), DisplayUtils.dip2px(context, 5), tagType, tagStyle.size() > i ? tagStyle.get(i) : null);
                 }
                 if (view != null) {
                     labelLayout.addView(view);
@@ -58,7 +58,7 @@ public class GameViewUtils {
                 LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
         lparams.rightMargin = rightMargin;
         TextView tag = new TextView(context);
-        tag.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10);
+        tag.setTextSize(TypedValue.COMPLEX_UNIT_SP, 9);
         tag.setSingleLine(true);
         tag.setText(tagStr);
         if ("官方版".equals(tagStr) || "已关注".equals(tagStr)) {
@@ -80,6 +80,7 @@ public class GameViewUtils {
                     gradientDrawable.setShape(GradientDrawable.RECTANGLE);
                     tag.setTextColor(Color.WHITE);
                 }
+                gradientDrawable.setCornerRadius(DisplayUtils.dip2px(1.5F));
                 tag.setBackgroundDrawable(gradientDrawable);
             } else {
                 colorStr = TagUtils.getInstance(context).getColor(tagStr);
@@ -90,14 +91,15 @@ public class GameViewUtils {
                 GradientDrawable gradientDrawable = new GradientDrawable();
                 gradientDrawable.setColor(Color.TRANSPARENT);
                 gradientDrawable.setStroke(DisplayUtils.dip2px(context, 0.6f), color);
+                gradientDrawable.setCornerRadius(DisplayUtils.dip2px(1.5F));
                 tag.setBackgroundDrawable(gradientDrawable);
                 tag.setTextColor(color);
             }
         }
         tag.setLayoutParams(lparams);
-        tag.setPadding(DisplayUtils.dip2px(context, 3),
+        tag.setPadding(DisplayUtils.dip2px(context, 4),
                 0,
-                DisplayUtils.dip2px(context, 3),
+                DisplayUtils.dip2px(context, 4),
                 DisplayUtils.dip2px(context, 1));
         return tag;
     }

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

@@ -0,0 +1,51 @@
+package com.gh.common.util
+
+import android.app.Application
+import android.text.TextUtils
+import com.lightgame.utils.Utils
+import com.qq.gdt.action.GDTAction
+import org.json.JSONObject
+
+/**
+ * 广点通辅助类 [https://gitlab.ghzhushou.com/pm/halo-app-issues/issues/403]
+ */
+object GdtHelper {
+
+    const val NETWORK_TYPE = "NETWORK_TYPE"
+    const val PAGE_TYPE = "PAGE_TYPE"
+    const val CONTENT_TYPE = "CONTENT_TYPE"
+    const val CONTENT_ID = "CONTENT_ID"
+    const val KEYWORD = "KEYWORD"
+    const val GAME_ID = "GAME_ID"
+    const val SCORE = "SCORE"
+    const val PLATFORM = "PLATFORM"
+
+    fun init(application: Application) {
+        GDTAction.init(application, "1108222478", "0b2bb2b971c8221be45a8454f05a0b1f")
+    }
+
+    fun logAction(type: String) {
+        GDTAction.logAction(type)
+        Utils.log("GDT", type)
+    }
+
+    fun logAction(type: String, vararg kv: String?) {
+        try {
+            val actionParam = JSONObject()
+            for (i in kv.indices) {
+                if (i % 2 != 0) {
+                    val key = kv[i - 1]
+                    val value = kv[i]
+                    if (!TextUtils.isEmpty(key) && !TextUtils.isEmpty(value)) {
+                        actionParam.put(key, value)
+                    }
+                }
+            }
+            Utils.log("GDT", "$type + [${kv.joinToString(" , ")}]")
+            GDTAction.logAction(type, actionParam)
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+}

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

@@ -56,7 +56,7 @@ public class GetLoginDataUtils {
                     + "follow_app_official_microblog," + "invitation_write"; // weiboCode
 
     private GetLoginDataUtils(Context context) {
-        mContext = context.getApplicationContext();
+        mContext = context;
         mTencent = Tencent.createInstance(Config.TENCENT_APPID, mContext); //初始化QQ分享
 
         mIWXAPI = WXAPIFactory.createWXAPI(mContext, Config.WECHAT_APPID, true); //初始化微信分享
@@ -68,7 +68,7 @@ public class GetLoginDataUtils {
 
     public static GetLoginDataUtils getInstance(Context context) {
         if (instance == null) {
-            instance = new GetLoginDataUtils(context);
+            instance = new GetLoginDataUtils(context.getApplicationContext());
         }
         return instance;
     }
@@ -172,7 +172,7 @@ public class GetLoginDataUtils {
         }
     }
 
-    public void WCLofinCallBack(JSONObject content) {
+    public void WCLoginCallBack(JSONObject content) {
         if (mLoginListener != null) {
             mLoginListener.OnLoginData(content, LoginTag.wechat);
         }

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

@@ -1,35 +1,27 @@
 package com.gh.common.util
 
 import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
 
 
 /**
  * Created by khy on 11/10/17.
  */
-class GsonUtils private constructor() {
-    val mGson: Gson = Gson()
+object GsonUtils {
+    val gson: Gson = Gson()
 
-    companion object {
-        fun getInstance(): GsonUtils {
-            return Inner.anotherSingle
-        }
-
-        private object Inner {
-            val anotherSingle = GsonUtils()
-        }
+    @JvmStatic
+    fun <T> fromJson(json: String, t: Class<T>): T {
+        return gson.fromJson(json, t)
     }
 
-    fun <T> fromJsonBean(json: String, t: Class<T>): T {
-        return mGson.fromJson(json, t)
-    }
+//    @JvmStatic
+//    fun <T> fromJsonList(json: String): List<T> {
+//        val type = object : TypeToken<List<T>>() {}.type
+//        return gson.fromJson(json, type)
+//    }
 
-    fun <T> fromJsonList(json: String, t: Class<T>): T {
-        val type = object : TypeToken<List<T>>() {}.type
-        return mGson.fromJson(json, type)
-    }
-
-    fun toJson(any: Any): String {
-        return mGson.toJson(any)
+    @JvmStatic
+    fun toJson(any: Any?): String {
+        return gson.toJson(any)
     }
 }

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

@@ -7,7 +7,6 @@ import android.graphics.drawable.ColorDrawable
 import android.net.Uri
 import android.support.annotation.DrawableRes
 import android.support.v4.content.ContextCompat
-import android.text.TextUtils
 import com.facebook.common.executors.CallerThreadExecutor
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.drawee.controller.BaseControllerListener
@@ -21,32 +20,118 @@ import com.facebook.imagepipeline.request.ImageRequest
 import com.facebook.imagepipeline.request.ImageRequestBuilder
 import com.gh.common.constant.Config
 import com.gh.gamecenter.R
-import com.gh.gamecenter.manager.UserManager
-import com.gh.gamecenter.retrofit.Response
-import com.lightgame.config.CommonDebug
-import com.lightgame.download.FileUtils
-import com.lightgame.utils.Utils
-import org.json.JSONObject
-import retrofit2.HttpException
-import rx.Observable
-import rx.Observer
-import rx.Subscription
-import rx.android.schedulers.AndroidSchedulers
-import rx.schedulers.Schedulers
-import java.io.File
-import java.net.HttpURLConnection
-
-class ImageUtils private constructor() {
 
 
-    fun display(simpleDraweeView: SimpleDraweeView?, url: String?, listener: BaseControllerListener<ImageInfo>) {
+object ImageUtils {
+
+    private const val PIC_MAX_FILE_SIZE: Long = 10 * 1024 * 1024
+
+    @JvmStatic
+    fun getUploadFileMaxSize(): Long {
+        val uploadLimitSize = Config.getSettings()?.image?.uploadLimitSize
+        if (uploadLimitSize != null) {
+            return uploadLimitSize
+        }
+        return PIC_MAX_FILE_SIZE
+    }
+
+    @JvmStatic
+    fun getDefaultGifRule(): String? {
+        val gifConfig = Config.getSettings()?.image?.oss?.gif
+        if (gifConfig != null) {
+            return gifConfig
+        }
+        return ""
+    }
+
+    @JvmStatic
+    fun getWatermarkWidthGifRule(width: Int?): String? {
+        val gifConfig = Config.getSettings()?.image?.oss?.gitThumb
+        val gifWaterMark = Config.getSettings()?.image?.oss?.gifWaterMark
+        if (gifConfig != null && gifWaterMark != null) {
+            return "$gifConfig,w_$width$gifWaterMark"
+        }
+        return ""
+    }
+
+
+    @JvmStatic
+    fun getLimitWidthRule(width: Int?): String? {
+        val jpegConfig = Config.getSettings()?.image?.oss?.jpeg
+        if (jpegConfig != null) {
+            return "$jpegConfig,w_$width"
+        }
+        return ""
+    }
+
+    @JvmStatic
+    fun addLimitWidth(imageUrl: String?, width: Int?): String? {
+        val jpegConfig = Config.getSettings()?.image?.oss?.jpeg
+        if (jpegConfig != null) {
+            return "$imageUrl$jpegConfig,w_$width"
+        }
+        return imageUrl
+    }
+
+    @JvmStatic
+    fun addLimitHeight(imageUrl: String, height: Int): String {
+        val jpegConfig = Config.getSettings()?.image?.oss?.jpeg
+        if (jpegConfig != null) {
+            return "$imageUrl$jpegConfig,h_$height"
+        }
+        return imageUrl
+    }
+
+    @JvmStatic
+    fun addLimitWidthAndHeight(imageUrl: String, width: Int, height: Int): String {
+        val jpegConfig = Config.getSettings()?.image?.oss?.jpeg
+        if (jpegConfig != null) {
+            return "$imageUrl$jpegConfig,w_$width,h_$height"
+        }
+        return imageUrl
+    }
+
+    @JvmStatic
+    fun getGitStaticImage(imageUrl: String): String {
+        val gifThumb = Config.getSettings()?.image?.oss?.gitThumb
+        if (gifThumb != null) {
+            return "$imageUrl$gifThumb"
+        }
+        return imageUrl
+    }
+
+
+    @JvmStatic
+    fun addLimitWidthAndLoad(draweeView: SimpleDraweeView?, imageUrl: String, width: Int) {
+        val newUrl = addLimitWidth(imageUrl, width)
+        draweeView?.setImageURI(newUrl)
+    }
+
+    @JvmStatic
+    fun addLimitWidthAndLoad(draweeView: SimpleDraweeView?, imageUrl: String?, width: Int?, onLoadListener: OnImageloadListener?) {
+        val newUrl = getTransformLimitUrl(imageUrl, width, draweeView?.context)
+        val listener = object : BaseControllerListener<ImageInfo>() {
+            override fun onFinalImageSet(id: String?, imageInfo: ImageInfo?, animatable: Animatable?) {
+                onLoadListener?.onLoadFinal(imageInfo)
+            }
+        }
+
+        draweeView?.controller = Fresco.newDraweeControllerBuilder()
+                .setUri(newUrl)
+                .setControllerListener(listener)
+                .build()
+    }
+
+
+    fun display(simpleDraweeView: SimpleDraweeView?, url: String?, width: Int?, listener: BaseControllerListener<ImageInfo>) {
         simpleDraweeView?.controller = Fresco.newDraweeControllerBuilder()
-                .setUri(url)
+                .setUri(getTransformLimitUrl(url, width, simpleDraweeView?.context))
                 .setControllerListener(listener)
                 .build()
     }
 
     // 自适应图片宽高
+    @JvmStatic
     fun display(simpleDraweeView: SimpleDraweeView?, url: String?, width: Int) {
         val listener = object : BaseControllerListener<ImageInfo>() {
             override fun onFinalImageSet(id: String?, imageInfo: ImageInfo?, animatable: Animatable?) {
@@ -60,15 +145,17 @@ class ImageUtils private constructor() {
             }
         }
         simpleDraweeView?.controller = Fresco.newDraweeControllerBuilder()
-                .setUri(url)
                 .setControllerListener(listener)
+                .setUri(getTransformLimitUrl(url, width, simpleDraweeView?.context))
                 .build()
     }
 
     // 自适应图片宽高
+    @JvmStatic
     fun displayScale(simpleDraweeView: SimpleDraweeView?, url: String?, height: Int) {
         val listener = object : BaseControllerListener<ImageInfo>() {
             override fun onFinalImageSet(id: String?, imageInfo: ImageInfo?, animatable: Animatable?) {
+
                 if (imageInfo == null) {
                     return
                 }
@@ -85,7 +172,8 @@ class ImageUtils private constructor() {
     }
 
     // 设置缩放类型，设置按压状态下的叠加图
-    fun display(resources: Resources?, simpleDraweeView: SimpleDraweeView?,
+    @JvmStatic
+    fun display(resources: Resources?, simpleDraweeView: SimpleDraweeView?, width: Int,
                 scaleType: ScalingUtils.ScaleType?, url: String?) {
         if (simpleDraweeView == null) return
         val context = simpleDraweeView.context ?: return
@@ -96,11 +184,11 @@ class ImageUtils private constructor() {
                 .setBackground(ColorDrawable(ContextCompat.getColor(context, R.color.placeholder_bg)))
                 .setActualImageScaleType(scaleType)
                 .build()
-        //		simpleDraweeView.setImageURI(url);
-        display(simpleDraweeView, url)
+        simpleDraweeView.setImageURI(getTransformLimitUrl(url, width, context))
     }
 
     // 设置占位符
+    @JvmStatic
     fun display(resources: Resources?, simpleDraweeView: SimpleDraweeView?, url: String?, placeholderImage: Int) {
         if (simpleDraweeView == null) return
         val context = simpleDraweeView.context ?: return
@@ -110,7 +198,6 @@ class ImageUtils private constructor() {
                 .setBackground(ColorDrawable(ContextCompat.getColor(context, R.color.placeholder_bg)))
                 .setPlaceholderImage(placeholderImage)
                 .build()
-        //		simpleDraweeView.setImageURI(url);
         display(simpleDraweeView, url)
     }
 
@@ -125,6 +212,7 @@ class ImageUtils private constructor() {
     }
 
     // 获取bitmap
+    @JvmStatic
     fun display(context: Context?, url: String?, dataSubscriber: BaseBitmapDataSubscriber) {
         val imageRequest = ImageRequestBuilder
                 .newBuilderWithSource(Uri.parse(url))
@@ -136,113 +224,79 @@ class ImageUtils private constructor() {
                 .subscribe(dataSubscriber, CallerThreadExecutor.getInstance())
     }
 
-    companion object {
-        const val RESPONSE403: String = "RESPONSE403"
-
-        fun getInstance(): ImageUtils {
-            return Inner.anotherSingle
-        }
-
-        private object Inner {
-            val anotherSingle = ImageUtils()
-        }
-
-        fun display(simpleDraweeView: SimpleDraweeView, url: String?) {
-            simpleDraweeView.setImageURI(url)
-        }
-
-        fun display(draweeView: SimpleDraweeView, @DrawableRes res: Int?) {
-            draweeView.setImageURI("res:///" + res)
-        }
-
-        fun postImageArr(context: Context, imgArr: List<String>, listener: OnPostArrImageListener) {
-            val imgMap: HashMap<String, String> = HashMap()
-
-            Observable.create(Observable.OnSubscribe<JSONObject> { subscriber ->
-                var path: String
-                var index = 0
-                for (s in imgArr) {
-                    path = context.getCacheDir().path + File.separator + System.currentTimeMillis() + index + ".jpg"
-                    if (BitmapUtils.savePicture(path, s, 1024 * 1024)) {
-                        subscriber.onNext(FileUtils.uploadFile(Config.API_HOST + "images?type=community", path, s, UserManager.getInstance().token))
-                        index++
-                    } else {
-                        subscriber.onNext(FileUtils.uploadFile(Config.API_HOST + "images?type=community", s, s, UserManager.getInstance().token))
+    /**
+     *  规则 width>0 Wifi/4G:x2 traffic:x1
+     *  第一种方案:通过LayoutParams获取 可以快速(无延迟)获取宽高,但是无法获取wrap_content和match_parent的View
+     *  第二种方案(备用方案):有延迟,View的宽高需要在Measure过程后才能确定,能够在这里获取到正确的宽高
+     */
+    @JvmStatic
+    fun display(view: SimpleDraweeView?, url: String?) {
+        url?.let {
+            // 图片是以 gif 结尾的就
+            if (it.endsWith(".gif")) {
+                val controller = Fresco.newDraweeControllerBuilder()
+                        .setUri(url)
+                        .setAutoPlayAnimations(true)
+                        .build()
+                view?.controller = controller
+            } else {
+                val width = view?.layoutParams?.width
+                if (width != null && width > 0) {
+                    view.setImageURI(getTransformLimitUrl(url, width, view.context))
+                } else {
+                    view?.post {
+                        view.setImageURI(getTransformLimitUrl(url, view.width, view.context))
                     }
                 }
-                subscriber.onCompleted()
-            }).subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(object : Observer<JSONObject> {
-                        override fun onCompleted() {
-                            Utils.log("图片上传完成")
-                            listener.postSuccess(imgMap)
-                        }
-
-                        override fun onError(e: Throwable) {
-                            Utils.log("图片上传失败" + e.toString())
-                            listener.postError()
-                        }
-
-                        override fun onNext(result: JSONObject?) {
-                            if (result != null) {
-                                try {
-                                    val statusCode = result.getInt("statusCode")
-                                    if (statusCode == HttpURLConnection.HTTP_OK) {
-                                        imgMap.put(result.getString("realPath"), result.getString("icon"))
-                                    } else if (statusCode == 403) {
-                                        imgMap.put(result.getString("realPath"), RESPONSE403)
-                                    }
-                                } catch (e: Exception) {
-                                    e.printStackTrace()
-                                }
-                            }
-                        }
-                    })
+            }
         }
+    }
 
-        fun postImage(context: Context?, picturePath: String?, listener: OnPostImageListener): Subscription? {
-            if (context == null || TextUtils.isEmpty(picturePath)) return null
-            return Observable.create(Observable.OnSubscribe<JSONObject> { subscriber ->
-                val path = context.getCacheDir().path + File.separator + System.currentTimeMillis() + ".jpg"
-                if (BitmapUtils.savePicture(path, picturePath, 1024 * 1024)) {
-                    subscriber.onNext(FileUtils.uploadFile(Config.API_HOST + "images?type=community", path, UserManager.getInstance().token))
+    // Wifi/4G:x2 traffic:x1
+    private fun getTransformLimitUrl(url: String?, width: Int?, context: Context?): String? {
+        var transformUrl: String? = url
+        if (width != null && width > 0) {
+            val transformUrlX2 = addLimitWidth(url, width * 2)
+            val transformUrlX1 = addLimitWidth(url, width)
+            if (NetworkUtils.isWifiOr4GConnected(context)) {
+                transformUrl = transformUrlX2
+            } else {
+                // 检查X2大图是否被缓存
+                if (Fresco.getImagePipeline().isInBitmapMemoryCache(Uri.parse(transformUrlX2)) ||
+                        Fresco.getImagePipeline().isInDiskCacheSync(Uri.parse(transformUrlX2))) {
+                    transformUrl = transformUrlX2
                 } else {
-                    subscriber.onNext(FileUtils.uploadFile(Config.API_HOST + "images?type=community", picturePath, UserManager.getInstance().token))
+                    transformUrl = transformUrlX1
                 }
-            }).subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(object : Response<JSONObject>() {
-                        override fun onResponse(response: JSONObject?) {
-                            if (CommonDebug.IS_DEBUG) {
-                                Utils.log("postImage:onResponse=>" + response.toString())
-                            }
-                            listener.postSuccess(response)
-                        }
-
-                        override fun onFailure(e: HttpException?) {
-                            listener.postError()
-                        }
-                    })
+            }
         }
+//        Utils.log("displayPost::viewWidth->$width----transformUrl->$transformUrl")
+        return transformUrl
+    }
 
+    // 规则 width>0 Wifi/4G:x2 traffic:x2
+    @JvmStatic
+    fun displayIcon(view: SimpleDraweeView?, url: String?) {
+        val width = view?.layoutParams?.width
+        if (width != null && width > 0) {
+            view.setImageURI(addLimitWidth(url, width * 2))
+//            Utils.log("displayIcon::viewWidth->" + view.width + "---transformUrl->" + transformUrl)
+        } else {
+            view?.post {
+                view.setImageURI(addLimitWidth(url, view.width * 2))
+//                Utils.log("displayIcon::viewWidth->" + view.width + "---transformUrl->" + transformUrl)
+            }
+        }
     }
 
 
-    interface OnPostImageListener {
-        fun postSuccess(response: JSONObject?)
-
-        fun postError()
+    @JvmStatic
+    fun display(draweeView: SimpleDraweeView, @DrawableRes res: Int?) {
+        draweeView.setImageURI("res:///" + res)
     }
 
-    interface OnPostArrImageListener {
-        /**
-         * key: 图片本地路径
-         * value: 图片提交成功后的链接
-         */
-        fun postSuccess(imgMap: HashMap<String, String>)
-
-        fun postError()
+    public interface OnImageloadListener {
+        fun onLoadFinal(imageInfo: ImageInfo?)
     }
 
 }

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

@@ -0,0 +1,35 @@
+/*
+ * This file is part of Siebe Projects samples.
+ *
+ * Siebe Projects samples is free software: you can redistribute it and/or modify
+ * it under the terms of the Lesser GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Siebe Projects samples is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * Lesser GNU General Public License for more details.
+ *
+ * You should have received a copy of the Lesser GNU General Public License
+ * along with Siebe Projects samples.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.gh.common.util;
+
+/**
+ * The observer that will be notified when the height of 
+ * the keyboard has changed
+ */
+public interface KeyboardHeightObserver {
+
+    /** 
+     * Called when the keyboard height has changed, 0 means keyboard is closed,
+     * >= 1 means keyboard is opened.
+     * 
+     * @param height        The height of the keyboard in pixels
+     * @param orientation   The orientation either: Configuration.ORIENTATION_PORTRAIT or 
+     *                      Configuration.ORIENTATION_LANDSCAPE
+     */
+    void onKeyboardHeightChanged(int height, int orientation);
+}

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

@@ -0,0 +1,170 @@
+/*
+ * This file is part of Siebe Projects samples.
+ *
+ * Siebe Projects samples is free software: you can redistribute it and/or modify
+ * it under the terms of the Lesser GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Siebe Projects samples is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * Lesser GNU General Public License for more details.
+ *
+ * You should have received a copy of the Lesser GNU General Public License
+ * along with Siebe Projects samples.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.gh.common.util;
+
+import android.app.Activity;
+import android.content.res.Configuration;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.graphics.drawable.ColorDrawable;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.WindowManager.LayoutParams;
+import android.widget.PopupWindow;
+
+import com.gh.gamecenter.R;
+
+/**
+ * The keyboard height provider, this class uses a PopupWindow
+ * to calculate the window height when the floating keyboard is opened and closed. 
+ */
+public class KeyboardHeightProvider extends PopupWindow {
+
+    /** The tag for logging purposes */
+    private final static String TAG = "sample_KeyboardHeightProvider";
+
+    /** The keyboard height observer */
+    private KeyboardHeightObserver observer;
+
+    /** The cached landscape height of the keyboard */
+    private int keyboardLandscapeHeight;
+
+    /** The cached portrait height of the keyboard */
+    private int keyboardPortraitHeight;
+
+    /** The view that is used to calculate the keyboard height */
+    private View popupView;
+
+    /** The parent view */
+    private View parentView;
+
+    /** The root activity that uses this KeyboardHeightProvider */
+    private Activity activity;
+
+    /** 
+     * Construct a new KeyboardHeightProvider
+     * 
+     * @param activity The parent activity
+     */
+    public KeyboardHeightProvider(Activity activity) {
+		super(activity);
+        this.activity = activity;
+
+        LayoutInflater inflator = (LayoutInflater) activity.getSystemService(Activity.LAYOUT_INFLATER_SERVICE);
+        this.popupView = inflator.inflate(R.layout.popupwindow, null, false);
+        setContentView(popupView);
+
+        setSoftInputMode(LayoutParams.SOFT_INPUT_ADJUST_RESIZE | LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+        setInputMethodMode(PopupWindow.INPUT_METHOD_NEEDED);
+
+        parentView = activity.findViewById(android.R.id.content);
+
+        setWidth(0);
+        setHeight(LayoutParams.MATCH_PARENT);
+
+        popupView.getViewTreeObserver().addOnGlobalLayoutListener(() -> {
+            if (popupView != null) {
+                handleOnGlobalLayout();
+            }
+        });
+    }
+
+    /**
+     * Start the KeyboardHeightProvider, this must be called after the onResume of the Activity.
+     * PopupWindows are not allowed to be registered before the onResume has finished
+     * of the Activity.
+     */
+    public void start() {
+
+        if (!isShowing() && parentView.getWindowToken() != null) {
+            setBackgroundDrawable(new ColorDrawable(0));
+            showAtLocation(parentView, Gravity.NO_GRAVITY, 0, 0);
+        }
+    }
+
+    /**
+     * Close the keyboard height provider, 
+     * this provider will not be used anymore.
+     */
+    public void close() {
+        this.observer = null;
+        dismiss();
+    }
+
+    /** 
+     * Set the keyboard height observer to this provider. The 
+     * observer will be notified when the keyboard height has changed. 
+     * For example when the keyboard is opened or closed.
+     * 
+     * @param observer The observer to be added to this provider.
+     */
+    public void setKeyboardHeightObserver(KeyboardHeightObserver observer) {
+        this.observer = observer;
+    }
+   
+    /**
+     * Get the screen orientation
+     *
+     * @return the screen orientation
+     */
+    private int getScreenOrientation() {
+        return activity.getResources().getConfiguration().orientation;
+    }
+
+    /**
+     * Popup window itself is as big as the window of the Activity. 
+     * The keyboard can then be calculated by extracting the popup view bottom 
+     * from the activity window height. 
+     */
+    private void handleOnGlobalLayout() {
+
+        Point screenSize = new Point();
+        activity.getWindowManager().getDefaultDisplay().getSize(screenSize);
+
+        Rect rect = new Rect();
+        popupView.getWindowVisibleDisplayFrame(rect);
+
+        // REMIND, you may like to change this using the fullscreen size of the phone
+        // and also using the status bar and navigation bar heights of the phone to calculate
+        // the keyboard height. But this worked fine on a Nexus.
+        int orientation = getScreenOrientation();
+        int keyboardHeight = screenSize.y - rect.bottom;
+        
+        if (keyboardHeight == 0) {
+            notifyKeyboardHeightChanged(0, orientation);
+        }
+        else if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+            this.keyboardPortraitHeight = keyboardHeight; 
+            notifyKeyboardHeightChanged(keyboardPortraitHeight, orientation);
+        } 
+        else {
+            this.keyboardLandscapeHeight = keyboardHeight; 
+            notifyKeyboardHeightChanged(keyboardLandscapeHeight, orientation);
+        }
+    }
+
+    /**
+     *
+     */
+    private void notifyKeyboardHeightChanged(int height, int orientation) {
+        if (observer != null) {
+            observer.onKeyboardHeightChanged(height, orientation);
+        }
+    }
+}

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

@@ -3,7 +3,6 @@ package com.gh.common.util;
 import android.app.Dialog;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.graphics.Color;
 import android.support.v4.content.ContextCompat;
@@ -11,20 +10,18 @@ import android.text.Html;
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.View;
 import android.widget.TextView;
 
 import com.gh.gamecenter.BuildConfig;
-import com.gh.gamecenter.LibaoDetailActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.LibaoDetailAdapter;
+import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.LibaoEntity;
 import com.gh.gamecenter.entity.LibaoStatusEntity;
 import com.gh.gamecenter.entity.MeEntity;
 import com.gh.gamecenter.entity.UserDataLibaoEntity;
 import com.gh.gamecenter.eventbus.EBReuse;
 import com.gh.gamecenter.eventbus.EBUISwitch;
-import com.gh.gamecenter.geetest.GeetestListener;
 import com.gh.gamecenter.geetest.GeetestUtils;
 import com.gh.gamecenter.manager.UserManager;
 import com.gh.gamecenter.retrofit.JSONObjectResponse;
@@ -36,13 +33,14 @@ import org.greenrobot.eventbus.EventBus;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 import okhttp3.ResponseBody;
 import retrofit2.HttpException;
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
 
 /**
  * Created by khy on 2016/12/16.
@@ -216,6 +214,10 @@ public class LibaoUtils {
                 libaoBtn.setText(R.string.libao_unshelve);
                 libaoBtn.setTextColor(context.getResources().getColor(R.color.button_gray));
                 break;
+            case "check":
+                libaoBtn.setText(R.string.libao_check);
+                libaoBtn.setBackgroundResource(R.drawable.button_normal_style);
+                break;
             default:
                 libaoBtn.setBackgroundResource(R.drawable.button_border_gray);
                 libaoBtn.setText("异常");
@@ -229,77 +231,166 @@ public class LibaoUtils {
         String status = libaoEntity.getStatus();
         setLiBaoBtnStatus(libaoBtn, status, context);
 
-        libaoBtn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                CheckLoginUtils.checkLogin(context, () -> {
-                    // 领取限制
-                    if ("领取".equals(libaoBtn.getText().toString()) || "淘号".equals(libaoBtn.getText().toString())) {
-                        if (isInstallRequired && !isAppInstalled(context, libaoEntity.getPackageName())) {
-                            String platform;
-                            if (TextUtils.isEmpty(libaoEntity.getPlatform())) {
-                                platform = "";
-                            } else {
-                                platform = PlatformUtils.getInstance(context)
-                                        .getPlatformName(libaoEntity.getPlatform()) + "版";
-                            }
+        libaoBtn.setOnClickListener(v -> {
+            String btnStatus = libaoBtn.getText().toString();
+            CheckLoginUtils.checkLogin(context, "礼包详情-[" + btnStatus + "]", () -> {
+                // 领取限制
 
-                            String dialogContent = context.getString(R.string.ling_rules_dialog, libaoEntity.getGame().getName(), platform);
-                            DialogUtils.showWarningDialog(context, "条件不符",
-                                    Html.fromHtml(dialogContent), "关闭", "立即安装"
-                                    , new DialogUtils.ConfirmListener() {
-                                        @Override
-                                        public void onConfirm() {
-                                            adapter.openDownload();
-                                        }
-                                    }, null);
+                if ("领取".equals(btnStatus) || "淘号".equals(btnStatus)) {
+                    if (isInstallRequired && !isAppInstalled(context, libaoEntity.getPackageName())) {
+                        String platform;
+                        if (TextUtils.isEmpty(libaoEntity.getPlatform())) {
+                            platform = "";
+                        } else {
+                            platform = PlatformUtils.getInstance(context)
+                                    .getPlatformName(libaoEntity.getPlatform());
+                        }
+
+                        boolean isExistPlatform = false;
+                        ArrayList<ApkEntity> apk = adapter.getGameEntity().getApk();
+                        for (ApkEntity apkEntity : apk) {
+                            if (TextUtils.isEmpty(libaoEntity.getPlatform())) break;
+                            if (libaoEntity.getPlatform().equals(apkEntity.getPlatform())) {
+                                isExistPlatform = true;
+                                break;
+                            }
+                        }
+
+                        String dialogContent = context.getString(R.string.ling_rules_dialog, libaoEntity.getGame().getName(), platform);
+                        boolean finalIsExistPlatform = isExistPlatform;
+                        DialogUtils.showWarningDialog(context, "条件不符",
+                                Html.fromHtml(dialogContent), isExistPlatform ? "关闭" : null,
+                                isExistPlatform ? "立即安装" : "关闭",
+                                () -> {
+                                    if (finalIsExistPlatform) {
+                                        adapter.openDownload(libaoEntity.getPlatform());
+                                    }
+                                }, null);
+                        return;
+                    }
+                }
+
+                switch (btnStatus) {
+                    case "未开始":
+                        Utils.toast(context, "还没到开始领取时间");
+                        break;
+                    case "查看":
+                        if (!TextUtils.isEmpty(libaoEntity.getDes())) {
+                            DialogUtils.showAlertDialog(v.getContext(), "使用说明",
+                                    Html.fromHtml(libaoEntity.getDes()), "关闭", null, null, null);
+                        }
+                        break;
+                    case "再领一个":
+                    case "领取":
+                        if ("repeatLing".equals(status)) {
+                            DialogUtils.showWarningDialog(context, "礼包刷新提醒"
+                                    , "礼包每天0点刷新，换新区或者换新角色需要继续领取礼包的童鞋，请于明天0点之后回来即可[再领一个]"
+                                    , null, "知道了", null, null);
+                        } else {
+                            libaoLing(context, libaoBtn, libaoEntity, adapter, isInstallRequired, null, entrance);
+                        }
+                        break;
+                    case "再淘一个":
+                    case "淘号":
+                        if ("repeatTao".equals(status)) {
+                            Utils.toast(context, "没到重复淘号时间, 礼包每天0点刷新");
                             return;
                         }
-                    }
+                        final Dialog loadingDialog = DialogUtils.showWaitDialog(context, "淘号中...");
+                        postLibaoTao(context, libaoEntity.getId(), new PostLibaoListener() {
+                            @Override
+                            public void postSucced(Object response) {
 
-                    switch (libaoBtn.getText().toString()) {
-                        case "未开始":
-                            Utils.toast(context, "还没到开始领取时间");
-                            break;
-                        case "查看":
-                            Intent intent = LibaoDetailActivity.getIntent(context, libaoEntity, entrance);
-                            context.startActivity(intent);
-                            break;
-                        case "再领一个":
-                        case "领取":
-                            if ("repeatLing".equals(status)) {
-                                DialogUtils.showWarningDialog(context, "礼包刷新提醒"
-                                        , "礼包每天0点刷新，换新区或者换新角色需要继续领取礼包的童鞋，请于明天0点之后回来即可[再领一个]"
-                                        , null, "知道了", null, null);
-                            } else {
-                                libaoLing(context, libaoBtn, libaoEntity, adapter, isInstallRequired, null, entrance);
-                            }
-                            break;
-                        case "再淘一个":
-                        case "淘号":
-                            if ("repeatTao".equals(status)) {
-                                Utils.toast(context, "没到重复淘号时间, 礼包每天0点刷新");
-                                return;
-                            }
-                            final Dialog loadingDialog = DialogUtils.showWaitDialog(context, "淘号中...");
-                            postLibaoTao(context, libaoEntity.getId(), new PostLibaoListener() {
-                                @Override
-                                public void postSucced(Object response) {
+                                if (loadingDialog != null) loadingDialog.dismiss();
 
-                                    if (loadingDialog != null) loadingDialog.dismiss();
+                                JSONObject responseBody = (JSONObject) response;
+                                String libaoCode = null;
+                                try {
+                                    libaoCode = responseBody.getString("code");
+                                } catch (JSONException e) {
+                                    e.printStackTrace();
+                                }
 
-                                    JSONObject responseBody = (JSONObject) response;
-                                    String libaoCode = null;
+                                if (TextUtils.isEmpty(libaoCode)) {
                                     try {
-                                        libaoCode = responseBody.getString("code");
+                                        String detail = responseBody.getString("detail");
+                                        switch (detail) {
+                                            case "maintaining":
+                                                Utils.toast(context, "网络状态异常，请稍后再试");
+                                                break;
+                                            case "fail to compete":
+                                                Utils.toast(context, "淘号失败，稍后重试");
+                                                break;
+                                            default:
+                                                Utils.toast(context, "淘号异常");
+                                                break;
+                                        }
                                     } catch (JSONException e) {
                                         e.printStackTrace();
                                     }
+                                    return;
+                                }
 
-                                    if (TextUtils.isEmpty(libaoCode)) {
+                                Utils.toast(context, "淘号成功");
+
+                                libaoEntity.setStatus("taoed");
+
+                                EventBus.getDefault().post(new EBReuse("libaoChanged"));
+
+                                adapter.initLibaoCode(new UserDataLibaoEntity(libaoCode, "tao", Utils.getTime(context)));
+
+                                final String finalLibaoCode = libaoCode;
+
+                                DialogUtils.showWarningDialog(context, "淘号成功"
+                                        , Html.fromHtml(context.getString(R.string.taoed_dialog, libaoCode))
+                                        , "关闭", " 复制礼包码"
+                                        , () -> {
+                                            copyLink(finalLibaoCode, context);
+                                            if (isInstallRequired) {
+                                                libaoBtn.postDelayed(() -> {
+                                                    Spanned msg = Html.fromHtml(
+                                                            context.getString(R.string.taoed_copy_dialog
+                                                                    , finalLibaoCode));
+                                                    lunningAppDialog(context
+                                                            , msg, libaoEntity);
+                                                }, 300);
+                                            }
+                                        }, null);
+                            }
+
+                            @Override
+                            public void postFailed(Throwable error) {
+                                Utils.log("---" + error.toString());
+
+                                if (loadingDialog != null) loadingDialog.dismiss();
+
+                                if (error instanceof HttpException) {
+                                    HttpException exception = (HttpException) error;
+                                    if (exception.code() == 403) {
                                         try {
-                                            String detail = responseBody.getString("detail");
+                                            JSONObject errorJson = new JSONObject(exception.response().errorBody().string());
+                                            String detail = errorJson.getString("detail");
+//                                                    Utils.toast(context, "返回::" + detail);
                                             switch (detail) {
+                                                case "coming":
+                                                    Utils.toast(context, "礼包领取时间未开始");
+                                                    break;
+                                                case "finish":
+                                                    Utils.toast(context, "礼包领取时间已结束");
+                                                    break;
+                                                case "fetched":
+                                                    Utils.toast(context, "你今天已领过这个礼包了, 不能再淘号");
+
+                                                    libaoBtn.setText("已淘号");
+                                                    libaoBtn.setBackgroundResource(R.drawable.libao_taoed_style);
+                                                    libaoBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.libao_taoed_selector));
+                                                    libaoEntity.setStatus("taoed");
+                                                    break;
+                                                case "try tao":
+                                                case "used up":
+                                                    DialogUtils.showHintDialog(context, "礼包已领光"
+                                                            , "手速不够快，礼包已经被抢光了，十分抱歉", "知道了");
+                                                    break;
                                                 case "maintaining":
                                                     Utils.toast(context, "网络状态异常，请稍后再试");
                                                     break;
@@ -307,106 +398,25 @@ public class LibaoUtils {
                                                     Utils.toast(context, "淘号失败，稍后重试");
                                                     break;
                                                 default:
-                                                    Utils.toast(context, "淘号异常");
+                                                    Utils.toast(context, "操作失败");
                                                     break;
+
                                             }
-                                        } catch (JSONException e) {
-                                            e.printStackTrace();
+                                        } catch (Exception ex) {
+                                            ex.printStackTrace();
+                                            Utils.toast(context, "礼包处理异常" + ex.toString());
                                         }
                                         return;
+                                    } else if (exception.code() == 401) {
+                                        return;
                                     }
-
-                                    Utils.toast(context, "淘号成功");
-
-                                    libaoEntity.setStatus("taoed");
-
-                                    EventBus.getDefault().post(new EBReuse("libaoChanged"));
-
-                                    adapter.initLibaoCode(new UserDataLibaoEntity(libaoCode, "tao", Utils.getTime(context)));
-
-                                    final String finalLibaoCode = libaoCode;
-
-                                    DialogUtils.showWarningDialog(context, "淘号成功"
-                                            , Html.fromHtml(context.getString(R.string.taoed_dialog, libaoCode))
-                                            , "关闭", " 复制礼包码"
-                                            , new DialogUtils.ConfirmListener() {
-                                                @Override
-                                                public void onConfirm() {
-                                                    copyLink(finalLibaoCode, context);
-                                                    if (isInstallRequired) {
-                                                        libaoBtn.postDelayed(new Runnable() {
-                                                            @Override
-                                                            public void run() {
-                                                                Spanned msg = Html.fromHtml(
-                                                                        context.getString(R.string.taoed_copy_dialog
-                                                                                , finalLibaoCode));
-                                                                lunningAppDialog(context
-                                                                        , msg, libaoEntity);
-                                                            }
-                                                        }, 300);
-                                                    }
-                                                }
-                                            }, null);
                                 }
-
-                                @Override
-                                public void postFailed(Throwable error) {
-                                    Utils.log("---" + error.toString());
-
-                                    if (loadingDialog != null) loadingDialog.dismiss();
-
-                                    if (error instanceof HttpException) {
-                                        HttpException exception = (HttpException) error;
-                                        if (exception.code() == 403) {
-                                            try {
-                                                JSONObject errorJson = new JSONObject(exception.response().errorBody().string());
-                                                String detail = errorJson.getString("detail");
-//                                                    Utils.toast(context, "返回::" + detail);
-                                                switch (detail) {
-                                                    case "coming":
-                                                        Utils.toast(context, "礼包领取时间未开始");
-                                                        break;
-                                                    case "finish":
-                                                        Utils.toast(context, "礼包领取时间已结束");
-                                                        break;
-                                                    case "fetched":
-                                                        Utils.toast(context, "你今天已领过这个礼包了, 不能再淘号");
-
-                                                        libaoBtn.setText("已淘号");
-                                                        libaoBtn.setBackgroundResource(R.drawable.libao_taoed_style);
-                                                        libaoBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.libao_taoed_selector));
-                                                        libaoEntity.setStatus("taoed");
-                                                        break;
-                                                    case "try tao":
-                                                    case "used up":
-                                                        DialogUtils.showHintDialog(context, "礼包已领光"
-                                                                , "手速不够快，礼包已经被抢光了，十分抱歉", "知道了");
-                                                        break;
-                                                    case "maintaining":
-                                                        Utils.toast(context, "网络状态异常，请稍后再试");
-                                                        break;
-                                                    case "fail to compete":
-                                                        Utils.toast(context, "淘号失败，稍后重试");
-                                                        break;
-                                                    default:
-                                                        Utils.toast(context, "操作失败");
-                                                        break;
-
-                                                }
-                                            } catch (Exception ex) {
-                                                ex.printStackTrace();
-                                                Utils.toast(context, "礼包处理异常" + ex.toString());
-                                            }
-                                            return;
-                                        }
-                                    }
-                                    Utils.toast(context, "发生异常");
-                                }
-                            });
-                            break;
-                    }
-                });
-            }
+                                Utils.toast(context, "发生异常");
+                            }
+                        });
+                        break;
+                }
+            });
         });
     }
 
@@ -448,20 +458,14 @@ public class LibaoUtils {
                 final String finalLibaoCode = libaoCode;
                 DialogUtils.showWarningDialog(context, "领取成功", Html.fromHtml(context.getString(R.string.linged_dialog, libaoCode))
                         , "关闭", " 复制礼包码"
-                        , new DialogUtils.ConfirmListener() {
-                            @Override
-                            public void onConfirm() {
-                                copyLink(finalLibaoCode, context);
-                                if (isInstallRequired) {
-                                    libaoBtn.postDelayed(new Runnable() {
-                                        @Override
-                                        public void run() {
-                                            Spanned msg = Html.fromHtml(context.getString(R.string.linged_copy_dialog, finalLibaoCode));
-                                            lunningAppDialog(context
-                                                    , msg, libaoEntity);
-                                        }
-                                    }, 300);
-                                }
+                        , () -> {
+                            copyLink(finalLibaoCode, context);
+                            if (isInstallRequired) {
+                                libaoBtn.postDelayed(() -> {
+                                    Spanned msg = Html.fromHtml(context.getString(R.string.linged_copy_dialog, finalLibaoCode));
+                                    lunningAppDialog(context
+                                            , msg, libaoEntity);
+                                }, 300);
                             }
                         }, null);
             }
@@ -522,12 +526,10 @@ public class LibaoUtils {
                         return;
                     } else if (exception.code() == 412) {
                         // 需要验证
-                        GeetestUtils.getInstance().showDialog(context, new GeetestListener() {
-                            @Override
-                            public void onVerified(String captcha) {
-                                libaoLing(context, libaoBtn, libaoEntity, adapter, isInstallRequired, captcha, entrance);
-                            }
-                        });
+                        GeetestUtils.getInstance().showDialog(context, captcha ->
+                                libaoLing(context, libaoBtn, libaoEntity, adapter, isInstallRequired, captcha, entrance));
+                        return;
+                    } else if (exception.code() == 401) {
                         return;
                     }
                 }
@@ -553,17 +555,14 @@ public class LibaoUtils {
     public static void lunningAppDialog(final Context context, Spanned msg, final LibaoEntity libaoEntity) {
         DialogUtils.showWarningDialog(context, "复制成功", msg
                 , "关闭", "启动游戏"
-                , new DialogUtils.ConfirmListener() {
-                    @Override
-                    public void onConfirm() {
-                        if (LibaoUtils.isAppInstalled(context, libaoEntity.getPackageName())) {
-                            PackageUtils.launchApplicationByPackageName(context, libaoEntity.getPackageName());
-                        } else {
-                            Utils.toast(context, "请安装游戏：" + libaoEntity.getGame().getName()
-                                    + PlatformUtils.getInstance(context).getPlatformName(libaoEntity.getPlatform()) + "版");
-                        }
-
+                , () -> {
+                    if (LibaoUtils.isAppInstalled(context, libaoEntity.getPackageName())) {
+                        PackageUtils.launchApplicationByPackageName(context, libaoEntity.getPackageName());
+                    } else {
+                        Utils.toast(context, "请安装游戏：" + libaoEntity.getGame().getName()
+                                + PlatformUtils.getInstance(context).getPlatformName(libaoEntity.getPlatform()) + "版");
                     }
+
                 }, null);
     }
 

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

@@ -0,0 +1,213 @@
+package com.gh.common.util;
+
+import android.app.Application;
+import android.content.Context;
+import android.os.Build;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import com.gh.gamecenter.BuildConfig;
+import com.gh.gamecenter.entity.CommunityEntity;
+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.utils.Util_System_Phone_State;
+import com.lightgame.utils.Utils;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * 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) {
+        JSONObject object = new JSONObject();
+        try {
+            object.put("subject", "community_article");
+            object.put("community_id", community.getId());
+            object.put("community_name", community.getName());
+            object.put("article_id", articleId);
+            object.put("article_name", articleTitle);
+            object.put("tracers", tracers);
+            object.put("read", readTime);
+            JSONObject columnObject = new JSONObject();
+            if (specialColumn != null) {
+                columnObject.put("type", specialColumn.getType());
+                columnObject.put("name", specialColumn.getName());
+                columnObject.put("tab", specialColumn.getTab());
+            } else {
+                columnObject.put("type", "");
+                columnObject.put("name", "");
+                columnObject.put("tab", "");
+            }
+            object.put("special_column", columnObject);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        upload(object);
+    }
+
+    public static void uploadDevice(LunchType launchType) {
+        JSONObject object = new JSONObject();
+        Application application = HaloApp.getInstance().getApplication();
+        try {
+            object.put("subject", "halo_device");
+            object.put("launch_time", Utils.getTime(application));
+            object.put("launch_type", launchType.name());
+            object.put("manufacture", Build.MANUFACTURER);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        upload(object);
+    }
+
+    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");
+            object.put("community_id", communityId);
+            object.put("community_name", CommunityName);
+            object.put("question_id", questions.getId());
+            object.put("question_name", questions.getTitle());
+            object.put("tracers", tracers);
+            object.put("answer_id", answerId);
+            object.put("read", readTime);
+            JSONObject columnObject = new JSONObject();
+            if (specialColumn != null) {
+                columnObject.put("type", specialColumn.getType());
+                columnObject.put("name", specialColumn.getName());
+                columnObject.put("tab", specialColumn.getTab());
+            } else {
+                columnObject.put("type", "");
+                columnObject.put("name", "");
+                columnObject.put("tab", "");
+            }
+            object.put("special_column", columnObject);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        upload(object);
+    }
+
+    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");
+            object.put("community_id", communityId);
+            object.put("community_name", communityName);
+            object.put("question_id", questions.getId());
+            object.put("question_name", questions.getTitle());
+            object.put("tracers", tracers);
+            object.put("read", readTime);
+            JSONObject columnObject = new JSONObject();
+            if (specialColumn != null) {
+                columnObject.put("type", specialColumn.getType());
+                columnObject.put("name", specialColumn.getName());
+                columnObject.put("tab", specialColumn.getTab());
+            } else {
+                columnObject.put("type", "");
+                columnObject.put("name", "");
+                columnObject.put("tab", "");
+            }
+            object.put("special_column", columnObject);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        upload(object);
+    }
+
+    public static void uploadSearch(String searchKey) {
+        if (TextUtils.isEmpty(searchKey)) return;
+
+        JSONObject object = new JSONObject();
+        try {
+            object.put("community_id", UserManager.getInstance().getCommunity().getId());
+            object.put("community_name", UserManager.getInstance().getCommunity().getName());
+            object.put("keyword", searchKey);
+            object.put("subject", "search");
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        upload(object);
+    }
+
+
+    public static void communityRefresh(int dataCount, boolean manualRefresh) {
+        JSONObject object = new JSONObject();
+        try {
+            object.put("subject", "community_refresh");
+            object.put("community_id", UserManager.getInstance().getCommunity().getId());
+            object.put("refresh_type", "recommend");
+            object.put("refresh_way", manualRefresh ? "manual" : "auto");
+            object.put("data_count", dataCount);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        upload(object);
+    }
+
+    public static void login(String loginStep, String loginType, String entrance) {
+        JSONObject object = new JSONObject();
+        try {
+            object.put("entrance", entrance);
+            object.put("subject", "login");
+            object.put("step", loginStep);
+            object.put("login_type", loginType);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        upload(object);
+    }
+
+    private static void upload(JSONObject object) {
+        if (BuildConfig.DEBUG) {
+            Utils.log("LogUtils->" + object.toString());
+        }
+
+        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();
+        }
+
+        // 暂时除了曝光外的数据都是扔到 community 这个库的，要是不是这个这个库的话这里要改一下
+        LogHubUtils.uploadLog(DeviceUtils.getIPAddress(context), object, "community");
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.gh.common.util;
 
 import android.content.Context;
+import android.text.TextUtils;
 
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.retrofit.JSONObjectResponse;
@@ -11,12 +12,14 @@ import com.lightgame.utils.Utils;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.Iterator;
+
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
 import okhttp3.ResponseBody;
 import retrofit2.HttpException;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
 
 /**
  * Created by khy on 7/07/17.
@@ -25,50 +28,6 @@ import rx.schedulers.Schedulers;
 // TODO: 1/12/17 逐步整理 删除 
 public class LoginUtils {
 
-//    public static void checkPhoneNum(final Context context, final String phoneName, final onCaptchaCallBackListener listener) { // 老用户登录检查手机是否登录过
-//        RetrofitManager.getInstance(context).getApi()
-//                .checkPhoneNum(phoneName)
-//                .subscribeOn(Schedulers.io())
-//                .observeOn(AndroidSchedulers.mainThread())
-//                .subscribe(new Response<ResponseBody>() {
-//                    @Override
-//                    public void onResponse(ResponseBody response) {
-//                        super.onResponse(response);
-//                        try {
-//                            JSONObject content = new JSONObject(response.string());
-//                            String status = content.getString("status");
-//                            if ("ok".equals(status)) {
-//                                getPhoneCaptcha(context, phoneName, listener);
-//                            } else {
-//                                DialogUtils.showWarningDialog(context, null, "手机号已存在，请使用未登录过的手机号，以保证数据正常同步到新账号上"
-//                                        , null, "我知道了", null, null);
-//                            }
-//                        } catch (Exception e) {
-//                            e.printStackTrace();
-//                        }
-//                    }
-//
-//                    @Override
-//                    public void onFailure(HttpException e) {
-//                        super.onFailure(e);
-//                        if (e == null) {
-//                            Utils.toast(context, "请检查网络是否可用");
-//                            return;
-//                        }
-//                        try {
-//                            ResponseBody responseBody = e.response().errorBody();
-//                            String string = responseBody.string();
-//                            JSONObject content = new JSONObject(string);
-//                            int code = content.getInt("code");
-//                            outputErrorHint(context, code);
-//                        } catch (Exception e1) {
-//                            e1.printStackTrace();
-//                        }
-//                    }
-//                });
-//
-//    }
-
     // 获取验证码
     public static void getPhoneCaptcha(final Context context, String phoneNum, final onCaptchaCallBackListener listener) {
         JSONObject content = new JSONObject();
@@ -147,39 +106,67 @@ public class LoginUtils {
                 });
     }
 
-    public static boolean userPostErrorToast(Throwable throwable, Context context, boolean isComment) {
-        if (throwable instanceof HttpException) {
-            HttpException exception = (HttpException) throwable;
-            if (exception.code() == 403) {
-                try {
-                    JSONObject errorJson = new JSONObject(exception.response().errorBody().string());
-                    int errorCode = errorJson.getInt("code");
-                    switch (errorCode) {
-                        case 403019:
-                            if (isComment) {
-                                Utils.toast(context, R.string.comment_failed_userblocked);
-                            } else {
-                                Utils.toast(context, R.string.comment_failed_userbanned);
-                            }
-                            break;
-                        case 403020:
-                            Utils.toast(context, R.string.comment_failed_toofrequent);
-                            break;
-                        case 403021:
-                            Utils.toast(context, R.string.comment_failed_illegal);
-                            break;
-                        default:
-                            Utils.toast(context, R.string.comment_failed_unknown);
-                            break;
-                    }
-                } catch (Exception ex) {
-                    ex.printStackTrace();
-                    Utils.toast(context, "无法识别错误类型");
-                }
-                return true;
-            }
+    /**
+     * 请用 ErrorHelper.handleError 替代本方法
+     */
+    @Deprecated
+    public static void userPostErrorToast(String errorString, Context context, boolean isQuestion) {
+        if (TextUtils.isEmpty(errorString)) {
+            Utils.toast(context, R.string.post_failure_hint);
+            return;
+        }
+
+        try {
+            JSONObject errorJson = new JSONObject(errorString);
+            Iterator<String> iterator = errorJson.keys();
+            while (iterator.hasNext()) {
+                String key = iterator.next();
+                if ("toast".equals(key)) {
+                    Utils.toast(context, errorJson.get(key).toString());
+                    return;
+                }
+            }
+
+            int errorCode = errorJson.getInt("code");
+            switch (errorCode) {
+                case 403018:
+                    Utils.toast(context, R.string.comment_failed_unable);
+                case 403050:
+                case 403053:
+                case 403048:
+                case 403049:
+                case 403057:
+                case 403045:
+                case 403046:
+                case 403054:
+                    Utils.toast(context, R.string.comment_failed_userbanned);
+                    break;
+                case 403051:
+                    Utils.toast(context, R.string.comment_failed_userblocked);
+                    break;
+                case 403020:
+                    if (isQuestion) {
+                        DialogUtils.showAlertDialog(context, "限制提醒"
+                                , "提问过于频繁，请先休息一下哦", "知道了"
+                                , null, null, null);
+                    } else {
+                        Utils.toast(context, R.string.comment_failed_toofrequent);
+                    }
+                    break;
+                case 403021:
+                    Utils.toast(context, R.string.comment_failed_illegal);
+                    break;
+                case 403047:
+                    Utils.toast(context, R.string.deny_vote_answer);
+                    break;
+                default:
+                    Utils.toast(context, R.string.post_failure_hint);
+                    break;
+            }
+        } catch (Exception e) {
+            Utils.toast(context, R.string.post_failure_hint);
+            e.printStackTrace();
         }
-        return false;
     }
 
     public static void captchaErrorHint(Context context, JSONObject content) {
@@ -328,7 +315,8 @@ public class LoginUtils {
                 Utils.toast(context, "403202");
                 break;
             case 400213:
-                Utils.toast(context, "昵称违规");
+            case 403016:
+                Utils.toast(context, "内容违规，请修改后再保存");
                 break;
             case 403801:
                 Utils.toast(context, "获取验证码太频繁，请稍后再试");

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

@@ -255,6 +255,11 @@ public class MessageShareUtils {
     private void wechatSahre() {
         Utils.toast(mContext, "分享跳转中...");
 
+        if (!PackageHelper.INSTANCE.getLocalPackageNameSet().contains("com.tencent.mm")) {
+            Utils.toast(mContext, "没安装微信，分享失败");
+            return;
+        }
+
         //官方分享
 //        WXImageObject imgObj = new WXImageObject();
 //        imgObj.setImagePath(mContext.getExternalCacheDir().getPath() + "/ShareImg/"  + picName);
@@ -286,6 +291,11 @@ public class MessageShareUtils {
     private void wechatMomentsSahre() {
         Utils.toast(mContext, "分享跳转中...");
 
+        if (!PackageHelper.INSTANCE.getLocalPackageNameSet().contains("com.tencent.mm")) {
+            Utils.toast(mContext, "没安装微信，分享失败");
+            return;
+        }
+
         WXImageObject imgObj = new WXImageObject();
         imgObj.setImagePath(mContext.getExternalCacheDir().getPath() + "/ShareImg/" + picName);
         WXMediaMessage msg = new WXMediaMessage();

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

@@ -0,0 +1,85 @@
+package com.gh.common.util
+
+import android.os.Build
+import android.text.TextUtils
+import com.gh.gamecenter.BuildConfig
+import com.halo.assistant.HaloApp
+import com.lightgame.utils.Util_System_Phone_State
+import com.lightgame.utils.Utils
+import com.tencent.stat.StatService
+import java.util.*
+
+object MtaHelper {
+
+    @JvmStatic
+    fun onEvent(eventId: String, vararg kv: String?) {
+        val prop = Properties()
+
+        if (kv.size == 1) {
+            prop.setProperty(kv[0], "")
+            StatService.trackCustomKVEvent(HaloApp.getInstance().application, eventId, prop)
+        }
+
+        for (i in kv.indices) {
+            if (i % 2 != 0) {
+                val key = kv[i - 1]
+                val value = kv[i]
+                if (!TextUtils.isEmpty(key) && !TextUtils.isEmpty(value)) {
+                    prop.setProperty(key, value)
+                }
+            }
+        }
+
+        Utils.log("MTA","$eventId + [${kv.joinToString(" , ")}]")
+        StatService.trackCustomKVEvent(HaloApp.getInstance().application, eventId, prop)
+    }
+
+    @JvmStatic
+    fun onEventWithTime(eventId: String, time: Int, vararg kv: String?) {
+        val prop = Properties()
+        for (i in kv.indices) {
+            if (i % 2 != 0 || i != 0) {
+                val key = kv[i - 1]
+                val value = kv[i]
+                if (!TextUtils.isEmpty(key) && !TextUtils.isEmpty(value)) {
+                    prop.setProperty(key, value)
+                }
+            }
+        }
+
+        if (prop.size == 0) return
+        Utils.log("MTA","$eventId + [${kv.joinToString(" , ")}] + last $time seconds")
+        StatService.trackCustomKVTimeIntervalEvent(HaloApp.getInstance().application, time, eventId, prop)
+    }
+
+    /**
+     * 这个方法除了记录传进来的入参还会附带一些基本的设备信息
+     */
+    @JvmStatic
+    fun onEventWithBasicDeviceInfo(eventId: String, vararg kv: String) {
+        val prop = Properties()
+        for (i in kv.indices) {
+            if (i % 2 != 0) {
+                val key = kv[i - 1]
+                val value = kv[i]
+                if (!TextUtils.isEmpty(key) && !TextUtils.isEmpty(value)) {
+                    prop.setProperty(key, value)
+                }
+            }
+        }
+
+        prop.setProperty("光环版本", BuildConfig.VERSION_NAME)
+        prop.setProperty("网络状态", DeviceUtils.getNetwork(HaloApp.getInstance().application))
+        prop.setProperty("IMEI", Util_System_Phone_State.getDeviceId(HaloApp.getInstance().application))
+        prop.setProperty("机型", Build.MODEL)
+        prop.setProperty("厂商", Build.MANUFACTURER)
+        prop.setProperty("Android版本", Build.VERSION.RELEASE)
+        if (!TextUtils.isEmpty(HaloApp.getInstance().gid)) {
+            prop.setProperty("GID", HaloApp.getInstance().gid)
+        }
+
+        Utils.log("MTA","$eventId + [${kv.joinToString(" , ")}]")
+        StatService.trackCustomKVEvent(HaloApp.getInstance().application, eventId, prop)
+    }
+
+}

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

@@ -44,6 +44,20 @@ public class NetworkUtils {
         return false;
     }
 
+    public static boolean isWifiOr4GConnected(Context context) {
+        String network = DeviceUtils.getNetwork(context);
+        if ("WIFI".equals(network) || "4G".equals(network)) {
+            return true;
+        }
+        return false;
+    }
+
+    public static boolean isWifiOr4GOr3GConnected(Context context) {
+        String network = DeviceUtils.getNetwork(context);
+        return "WIFI".equals(network) || "4G".equals(network) || "3G".equals(network);
+    }
+
+
     /**
      * 判断MOBILE网络是否可用
      *

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

@@ -15,9 +15,9 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 import okhttp3.ResponseBody;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
 
 public class NewsUtils {
 
@@ -156,7 +156,7 @@ public class NewsUtils {
                 } else {
                     textView.setText(String.format(Locale.getDefault(), "%d小时前", hour));
                 }
-            } else if (day >= today - 86400 * 1000 && day < today) {
+            } else if (day >= today - 86400 * 1000 * 100 && day < today) {
                 format.applyPattern("HH:mm");
                 textView.setText("昨天 ");
             } else {