3.6.5 tinker-base

该版本为过度版本(修复3.6.4的bug)

.gitignore

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

.gitmodules

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

CHANGELOG.md

@@ -1,4 +1,10 @@
-### Ver 3.1
+# 版本升级备忘
+
+### Ver 2.5
+* 此处写本次更新所做的业务和代码修改
+
+### Ver 2.6
+* xx
 
 ### Ver 3.0
 * 升级账号系统(登录流程/用户信息相关/用户账号相关操作(评论,礼包...))
@@ -10,8 +16,51 @@
 * 游戏下载平台面板修改(加快弹出速度,不再读取本地平台图片)
 * 接入bugly(tinker)
 
-### Ver 2.6
-* xx
+### VER 3.1
+### VER 3.2
+### VER 3.3
+### VER 3.4
+### VER 3.5
 
-### Ver 2.5
-* 此处写本次更新所做的业务和代码修改
+### Ver 3.6
+* 首页游戏增加预览骨架,游戏ITEM样式微调和开服标签
+* 首页问答增加关注页面
+* 重构游戏更新管理(游戏更新/插件化/已安装的游戏),具体细节参考PackageRepository & PackageViewModel
+* 重构APP更新管理(已VersionVode为更新基准,小版本更新改为光环后台控制)
+  - 删除TINKER_VERISON_NAME
+  - tinker打包方式变更(以小版本作为Base包,防止与数据后台小版本更新发生冲突)
+* 社区增加版主功能(版主可以对存在的相关内容进行修改/隐藏操作,内容包括问题/回答/回答评论)
+* 社区互动引导优化(问答推荐增加`推荐关注`,回答详情增加一些交互动效)
+
+### Ver 3.6.1
+* 可以后台控制关闭资讯功能
+* 版块、分类、专题详情、游戏详情、礼包详情增加预览骨架
+* 下载按钮状态可以通过接口屏蔽相应的包
+
+### Ver 3.6.2
+* 资讯/问答入口和插件功能线上控制(不可逆)
+* 首页不显示已安装的游戏
+* 插件求版本功能增加内部跳转
+* 下载面板增加公告和版本说明功能
+* 接入腾讯`广点通`(广告)
+
+### ver 3.6.3
+* 社区搜索修改
+  - 增加 `文章/用户` 模块
+  - 增加 `搜索置顶` 功能
+* 回答详情/社区文章详情修改
+  - 支持文案样式(加粗/斜体/删除线)和段落样式(引用/标题)
+  - 支持关闭评论功能
+  - 回答详情新增上下切换回答
+* 社区编辑框(回答/文章)修改
+  - 支持批量插入图片(使用知乎Matisse实现)
+  - 新增插入特殊样式,文案样式(加粗/斜体/删除线)和段落样式(引用/标题)
+* 编辑框部分 JS/CSS 使用远程文件
+
+### ver 3.6.4
+* 增加浏览记录(回答/文章/资讯/游戏)
+* 回答/社区文章 增加反对功能
+* 社区编辑框增加插入文章/回答/游戏
+  - 低版本兼容方案: 插入的样式默认隐藏,只有在3.6.4及以上才会显示
+* 游戏详情评分模块增加`小编评论`区域以及样式修改
+* 游戏评分增加回复功能

app/build.gradle

@@ -68,7 +68,11 @@ android {
         buildConfigField "String", "WEIBO_APPKEY", "\"${WEIBO_APPKEY}\""
         buildConfigField "String", "MTA_APPKEY", "\"${MTA_APPKEY}\""
         buildConfigField "String", "TD_APPID", "\"${TD_APPID}\""
-        buildConfigField "String", "PATCH_VERSION_NAME", "\"${PATCH_VERSION_NAME}\""
+
+        /**
+         * Build Time 供区分 jenkins 打包时间用
+         */
+        buildConfigField "long", "BUILD_TIME", "0"
 
     }
 
@@ -92,7 +96,7 @@ android {
             signingConfig signingConfigs.debug
 
             buildConfigField "String", "EXPOSURE_REPO", "\"test\""
-            buildConfigField "String", "EXPOSURE_VERSION", "\"E1\""
+            buildConfigField "String", "EXPOSURE_VERSION", "\"E3\""
         }
         release {
             debuggable false
@@ -102,7 +106,7 @@ android {
             signingConfig signingConfigs.release
 
             buildConfigField "String", "EXPOSURE_REPO", "\"exposure\""
-            buildConfigField "String", "EXPOSURE_VERSION", "\"E1\""
+            buildConfigField "String", "EXPOSURE_VERSION", "\"E3\""
         }
     }
 
@@ -188,6 +192,8 @@ dependencies {
 
     implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
 
+    testImplementation 'junit:junit:4.12'
+
     debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakcanary}"
     debugImplementation "com.facebook.stetho:stetho:${stetho}"
     debugImplementation "com.facebook.stetho:stetho-okhttp3:${stetho}"
@@ -218,12 +224,11 @@ dependencies {
     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.rxjava2:rxjava:${rxJava2}"
     implementation "io.reactivex.rxjava2:rxandroid:${rxAndroid2}"
@@ -249,6 +254,7 @@ dependencies {
     implementation "android.arch.lifecycle:extensions:${archLifecycleVersion}"
     implementation "android.arch.persistence.room:runtime:${archRoomVersion}"
     kapt "android.arch.persistence.room:compiler:${archRoomVersion}"
+    implementation "android.arch.persistence.room:rxjava2:${archRoomVersion}"
 
     implementation 'com.google.android:flexbox:0.2.2'
 
@@ -269,16 +275,23 @@ dependencies {
     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 "com.tencent.mm.opensdk:wechat-sdk-android-without-mta:5.3.1"
+    implementation 'com.walkud.rom.checker:RomChecker:1.0.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:WechatShare')
     implementation project(':libraries:LogHub')
     implementation project(':libraries:im')
+    implementation project(':libraries:Matisse')
 }
 File propFile = file('sign.properties')
 if (propFile.exists()) {

app/proguard-rules.txt

@@ -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

@@ -41,12 +41,7 @@
     <uses-permission android:name = "android.permission.WRITE_SETTINGS" />
 
     <!-- bugly with tinker -->
-    <uses-permission android:name = "android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name = "android.permission.INTERNET" />
-    <uses-permission android:name = "android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name = "android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name = "android.permission.READ_LOGS" />
-    <uses-permission android:name = "android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name = "android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <supports-screens
@@ -60,7 +55,7 @@
     <application
         android:name = "com.halo.assistant.TinkerApp"
         android:allowBackup = "true"
-        android:icon = "@drawable/logo"
+        android:icon = "@mipmap/logo"
         android:label = "@string/app_name"
         android:resizeableActivity = "true"
         android:theme = "@style/AppCompatTheme.APP"
@@ -107,10 +102,7 @@
             android:name = "com.gh.gamecenter.ConcernActivity"
             android:screenOrientation = "portrait" />
         <activity
-            android:name = "com.gh.gamecenter.subject.refactor.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"
@@ -329,7 +321,7 @@
             android:screenOrientation = "portrait" />
 
         <activity
-            android:name = "com.gh.gamecenter.personalhome.fans.FollowersActivity"
+            android:name = "com.gh.gamecenter.personalhome.followers.FollowersActivity"
             android:screenOrientation = "portrait" />
 
         <activity
@@ -363,8 +355,38 @@
         <activity
             android:name = "com.gh.gamecenter.qa.draft.CommunityDraftWrapperActivity"
             android:screenOrientation = "portrait" />
+
         <activity
             android:name = "com.gh.gamecenter.gamedetail.rating.edit.RatingEditActivity"
+            android:screenOrientation = "portrait"
+            android:windowSoftInputMode = "stateVisible" />
+
+        <activity
+            android:name = "com.gh.gamecenter.qa.questions.edit.manager.HistoryDetailActivity"
+            android:screenOrientation = "portrait" />
+
+        <activity
+            android:name = "com.gh.gamecenter.qa.questions.edit.manager.HistoryActivity"
+            android:screenOrientation = "portrait" />
+
+        <activity
+            android:name = "com.gh.gamecenter.qa.editor.InsertAnswerWrapperActivity"
+            android:screenOrientation = "portrait" />
+
+        <activity
+            android:name = "com.gh.gamecenter.qa.editor.GameActivity"
+            android:screenOrientation = "portrait" />
+
+        <activity
+            android:name = "com.gh.gamecenter.qa.editor.InsertArticleWrapperActivity"
+            android:screenOrientation = "portrait" />
+
+        <activity
+            android:name = "com.gh.gamecenter.gamedetail.rating.RatingReplyActivity"
+            android:screenOrientation = "portrait" />
+
+        <activity
+            android:name = ".history.HistoryActivity"
             android:screenOrientation = "portrait" />
 
         <activity
@@ -392,8 +414,12 @@
         </activity >
 
         <activity
-            android:name = ".CommonActivity"
-            android:screenOrientation = "portrait" />
+            android:name = "${applicationId}.wxapi.WXEntryActivity"
+            android:exported = "true"
+            android:label = "@string/app_name"
+            android:launchMode = "singleTop"
+            android:screenOrientation = "portrait"
+            android:theme = "@android:style/Theme.Translucent.NoTitleBar" ></activity >
 
         <provider
             android:name = "android.support.v4.content.FileProvider"

app/src/main/assets/content.js

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

app/src/main/assets/editor.html

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

app/src/main/assets/rich_editor.js

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+// alert("")
+
 var RE = {};
 
 RE.currentSelection = {
@@ -22,6 +24,17 @@ RE.currentSelection = {
     "endContainer": 0,
     "endOffset": 0};
 
+// 引用远端的JS 和 CSS
+var script = document.createElement("script")
+script.src = "https://resource.ghzs.com/js/halo.js" + "?timestamp=" + Math.round(new Date().getTime() / 1000 / 1000)
+document.body.appendChild(script)
+
+var style = document.createElement("link")
+style.rel = "stylesheet"
+style.type = "text/css"
+style.href = "https://resource.ghzs.com/css/halo.css" + "?timestamp=" + Math.round(new Date().getTime() / 1000 / 1000)
+document.head.appendChild(style)
+
 RE.editor = document.getElementById('editor');
 
 document.addEventListener("selectionchange", function() { RE.backuprange(); });
@@ -94,16 +107,8 @@ RE.setInputEnabled = function(inputEnabled) {
     RE.editor.contentEditable = String(inputEnabled);
 }
 
-RE.setFocusByEnd = function() {
-//alert("111111")
-//    var txt =RE.editor.createTextRange();
-//    ("22222")
-//    txt.moveStart('character',-1);
-//    ("333333")
-//    txt.collapse(true);
-//    ("444444")
-//    txt.select();
-//    alert("ddddddd")
+RE.formatBlock = function() {
+    document.execCommand('formatBlock', false, 'p');
 }
 
 RE.undo = function() {
@@ -166,6 +171,7 @@ RE.setFontSize = function(fontSize){
 
 RE.setHeading = function(heading) {
     document.execCommand('formatBlock', false, '<h'+heading+'>');
+    RE.sendElementNameToNative()
 }
 
 RE.setIndent = function() {
@@ -190,6 +196,9 @@ RE.setJustifyRight = function() {
 
 RE.setBlockquote = function() {
     document.execCommand('formatBlock', false, '<blockquote>');
+//    var blockId = window.getSelection().focusNode.parentNode;
+//    $(blockId).addClass("haloBlock")
+    RE.sendElementNameToNative()
 }
 
 RE.insertImage = function(url) {
@@ -197,19 +206,17 @@ RE.insertImage = function(url) {
     RE.insertHTML(html);
 }
 
-//RE.lazyLoad = function() {
-//   var myLazyLoad = new LazyLoad({
-//    elements_selector: ".lazy"
-//   })
-//}
-
 // 替换成缩略图
 RE.replaceTbImage = function(imgRuleFlag, gifRuleFlag) {
     var imgs = document.getElementsByTagName("img");
+    var index = 0
     for (var i = 0; i < imgs.length; i++) {
          var img = imgs[i];
+         var imageClassName = img.className;
+//         console.log(imageClassName)
+         if (imageClassName == "image-link") continue;
          if(img.src.indexOf("?") > 0) continue;
-
+//         console.log(i)
          var tbImg
          if(img.src.indexOf(".gif") > 0) {
            tbImg = img.src + gifRuleFlag
@@ -220,7 +227,7 @@ RE.replaceTbImage = function(imgRuleFlag, gifRuleFlag) {
          img.style.cssText = "max-width: 60%; display:block; margin:15px auto; height: auto;"
          img.src = tbImg;
 
-         if (i == 0) {
+         if (index == 0) {
              var bigImg = document.createElement('img');
              bigImg.src = "file:///android_asset/web_load_dfimg_icon.png";
              bigImg.style.cssText = "max-width: 20%; margin:15px 0 0 0; height: auto;"
@@ -236,6 +243,7 @@ RE.replaceTbImage = function(imgRuleFlag, gifRuleFlag) {
              }
 
          }
+         index ++;
     }
 }
 
@@ -244,6 +252,8 @@ RE.replaceAllDfImage = function(imgRuleFlag, gifRuleFlag) {
     var imgs = document.getElementsByTagName("img");
     for (var i = 0; i < imgs.length; i++) {
          var img = imgs[i];
+         var imageClassName = img.className;
+         if (imageClassName == "image-link") continue;
          if(img.src.indexOf("web_load_dfimg_icon") > 0) {
             img.parentNode.removeChild(img.parentNode.childNodes[0]);
             i--;
@@ -268,6 +278,8 @@ RE.hideShowBigPic = function() {
     var j = 0;
     for (var i = 0; i < imgs.length; i++) {
          var img = imgs[i];
+         var imageClassName = img.className;
+         if (imageClassName == "image-link") continue;
          if(img.src.indexOf(",thumbnail") > 0 && img.src.indexOf(".gif") == -1) {
             j++;
          }
@@ -277,6 +289,8 @@ RE.hideShowBigPic = function() {
        var imgs = document.getElementsByTagName("img");
        for (var i = 0; i < imgs.length; i++) {
            var img = imgs[i];
+           var imageClassName = img.className;
+           if (imageClassName == "image-link") continue;
            if(img.src.indexOf("web_load_dfimg_icon") > 0) {
              img.parentNode.removeChild(img.parentNode.childNodes[0]);
              break;
@@ -289,6 +303,8 @@ RE.replaceDfImageByUrl = function(imgUrl, imgRuleFlag, gifRuleFlag) {
     var imgs = document.getElementsByTagName("img");
     for (var i = 0; i < imgs.length; i++) {
          var img = imgs[i];
+         var imageClassName = img.className;
+         if (imageClassName == "image-link") continue;
          if (img.src.indexOf(imgUrl) != -1) {
              img.style.cssText = "max-width: 100%; display:block; margin:8px auto; height: auto;"
              if(img.src.indexOf(".gif") > 0) {
@@ -305,6 +321,8 @@ RE.ImageClickListener = function() {
     var imgs = document.getElementsByTagName("img");
     for (var i = 0; i < imgs.length; i++) {
          var img = imgs[i];
+         var imageClassName = img.className;
+         if (imageClassName == "image-link") continue;
          window.imagelistener.imageArr(img.src);
          img.onclick = function() {
              window.imagelistener.imageClick(this.src);
@@ -357,12 +375,16 @@ RE.backuprange = function(){
 }
 
 RE.restorerange = function(){
-    var selection = window.getSelection();
-    selection.removeAllRanges();
-    var range = document.createRange();
-    range.setStart(RE.currentSelection.startContainer, RE.currentSelection.startOffset);
-    range.setEnd(RE.currentSelection.endContainer, RE.currentSelection.endOffset);
-    selection.addRange(range);
+    try {
+        var selection = window.getSelection();
+        selection.removeAllRanges();
+        var range = document.createRange();
+        range.setStart(RE.currentSelection.startContainer, RE.currentSelection.startOffset);
+        range.setEnd(RE.currentSelection.endContainer, RE.currentSelection.endOffset);
+        selection.addRange(range);
+    } catch(error) {
+
+    }
 }
 
 RE.enabledEditingItems = function(e) {
@@ -432,12 +454,145 @@ RE.removeFormat = function() {
     document.execCommand('removeFormat', false, null);
 }
 
+RE.insertCustomStyleLink = function(data) {
+  var entity = JSON.parse(data)
+  var html =  "<br/><div class='"+ entity.type +"-container'>\n" +
+              "     <a class='"+ entity.type +"' href=\"javascript:void(0);\" contenteditable=\"false\" onclick=\"customLinkgo(this)\" data-datas='"+ data +"'>\n" +
+              "        <div class='flex-container'>\n" +
+              "        <div class='gh-internal-content img-left'>\n" +
+              "            <img class = \"image-link\" src='"+ entity.icon +"' />\n" +
+              "        </div>\n" +
+              "        <div class='gh-internal-content content-right'>\n" +
+              "            <p class='content-title'>"+ entity.title +"</p>\n" +
+              "            <p class='contents'>"+ entity.brief +"</p>\n" +
+              "        </div>\n" +
+              "        </div>\n" +
+              "        </a>\n" +
+              "    </div><br/>"
+  var tags = "", gameHtml = ""
+  if (entity.tags != null) {
+    for (var i = 0; i < entity.tags.length; i++) {
+        tags += "<label>"+ entity.tags[i]+"</label>"
+    }
+
+    gameHtml = "<br/><div class='"+ entity.type +"-container'>\n" +
+               "        <a class='"+ entity.type +"' href=\"javascript:void(0);\" contenteditable=\"false\" onclick=\"customLinkgo(this)\" data-datas='"+ data +"'>\n" +
+               "        <div class='flex-container'>\n" +
+               "            <div class='gh-internal-content img-left'>\n" +
+               "                <img class='image-link' src='"+ entity.icon +"' />\n" +
+               "            </div>\n" +
+               "            <div class='gh-internal-content content-right'>\n" +
+               "                <p class='content-title'>"+ entity.title +"</p>\n" +
+               "                <p class='tags'>"+ tags +"</p>\n" +
+               "            </div>\n" +
+               "        </div>\n" +
+               "        </a></div><br/>"
+  }
+
+  switch(entity.type) {
+    case "answer":
+      document.execCommand("insertHTML",false, html);
+      break
+    case "community_article":
+      document.execCommand("insertHTML",false, html);
+      break
+    case "game":
+      document.execCommand("insertHTML",false, gameHtml);
+      break
+  }
+  RE.callback();
+}
+
+RE.showLinkStyle = function() {
+  var answerElement = document.getElementsByClassName("answer-container");
+  for (var i=0;i<answerElement.length;i+=1){
+    answerElement[i].style.display = 'inline';
+  }
+  var articleElement = document.getElementsByClassName("community_article-container");
+  for (var i=0;i<articleElement.length;i+=1){
+    articleElement[i].style.display = 'inline';
+  }
+  var gameElement = document.getElementsByClassName("game-container");
+  for (var i=0;i<gameElement.length;i+=1){
+    gameElement[i].style.display = 'inline';
+  }
+}
+
+RE.hideLinkStyle = function() {
+  var answerElement = document.getElementsByClassName("answer-container");
+  for (var i=0;i<answerElement.length;i+=1){
+    answerElement[i].style.display = 'none';
+  }
+  var articleElement = document.getElementsByClassName("community_article-container");
+  for (var i=0;i<articleElement.length;i+=1){
+    articleElement[i].style.display = 'none';
+  }
+  var gameElement = document.getElementsByClassName("game-container");
+  for (var i=0;i<gameElement.length;i+=1){
+    gameElement[i].style.display = 'none';
+  }
+}
+
 // Event Listeners
 RE.editor.addEventListener("input", RE.callback);
+
 RE.editor.addEventListener("keyup", function(e) {
     var KEY_LEFT = 37, KEY_RIGHT = 39;
     if (e.which == KEY_LEFT || e.which == KEY_RIGHT) {
         RE.enabledEditingItems(e);
     }
+    RE.sendElementNameToNative()
 });
-RE.editor.addEventListener("click", RE.enabledEditingItems);
+
+RE.editor.addEventListener("click", function(e) {
+    RE.enabledEditingItems
+    RE.sendElementNameToNative()
+    var s = document.getSelection()
+    var isNeedRemoveR = RE.recursion(e.target)
+    if (isNeedRemoveR && s.rangeCount) {
+       s.removeAllRanges()
+    }
+});
+
+document.addEventListener("selectionchange", function(e) {
+   RE.sendElementNameToNative()
+});
+
+RE.recursion = function(dom) {
+    var parenDom = dom.parentElement
+    if (parenDom && parenDom instanceof Element &&
+    typeClassList.indexOf(parenDom.className) > -1) {
+      return parenDom
+    } else if(parenDom && parenDom instanceof Element &&
+    typeClassList.indexOf(parenDom.className) === -1 && parenDom.nodeName !== 'BODY') {
+      return RE.recursion(parenDom)
+    } else {
+      return null
+    }
+}
+
+// 返回组件标签 多个标签以"空格"划分
+RE.sendElementNameToNative = function() {
+    if (window.getSelection) {
+        var selection = window.getSelection()
+        if (selection.rangeCount > 0) {
+            var range = selection.getRangeAt(0);
+            var container = range.startContainer;
+            var elements = " " + container.localName + " ";
+            var parentElement;
+            while(true) {
+                if(parentElement != null) {
+                    parentElement = parentElement.parentElement
+                } else {
+                    parentElement = container.parentElement
+                }
+                if (parentElement == null || parentElement.localName == null) {
+                    break;
+                }
+                elements = elements + " " + parentElement.localName + " "
+            }
+//            console.log(elements)
+            window.OnCursorChangeListener.onElements(elements);
+        }
+    }
+}

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

@@ -165,7 +165,8 @@ 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) {

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

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

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

@@ -101,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/GHUmengNotificationClickHandler.java

@@ -7,7 +7,7 @@ import com.gh.common.util.EntranceUtils;
 import com.gh.gamecenter.GameDetailActivity;
 import com.gh.gamecenter.NewsDetailActivity;
 import com.gh.gamecenter.WebActivity;
-import com.gh.gamecenter.subject.refactor.SubjectActivity;
+import com.gh.gamecenter.subject.SubjectActivity;
 import com.umeng.message.UmengNotificationClickHandler;
 import com.umeng.message.entity.UMessage;
 

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

@@ -15,45 +15,47 @@ 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.PackageUtils
 import com.gh.common.util.StringUtils
-import com.gh.gamecenter.BuildConfig
+import com.gh.common.util.toObject
 import com.gh.gamecenter.R
 import com.gh.gamecenter.entity.PushEntity
 import com.gh.gamecenter.entity.PushMessageEntity
 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.halo.assistant.HaloApp
 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")
@@ -64,7 +66,7 @@ class GHUmengNotificationService : UmengMessageService() {
         val isMessageFromSystem = intent.getBooleanExtra(MESSAGE_FROM_SYSTEM, false)
 
         try {
-            val pushData = gson.fromJson(message, PushEntity::class.java)
+            val pushData = message.toObject<PushEntity>()
             pushData?.let { handlePushData(context, it, message, isMessageFromSystem) }
         } catch (e: Exception) {
             e.printStackTrace()
@@ -77,10 +79,10 @@ class GHUmengNotificationService : UmengMessageService() {
         if (pushData.displayType == DISPLAY_TYPE_NOTIFICATION) {
             // 其它类型的透传信息
             // 显示到通知栏
-            val msg = gson.fromJson(message, PushNotificationEntity::class.java)
+            val msg = message.toObject<PushNotificationEntity>()
             val data = msg?.extra?.data
 
-            // 系统推送，直接处理跳转
+            // 系统推送(非自定义信息)，直接处理跳转
             if (isMessageFromSystem) {
                 val intent = Intent()
                 intent.setClass(context, UmengMessageReceiver::class.java)
@@ -91,45 +93,52 @@ class GHUmengNotificationService : UmengMessageService() {
                 return
             }
 
-            // 判断是否过滤该消息
-            if (validatePush(data?.condition)) {
-                val clickIntent = Intent()
-                val removeIntent = Intent()
-
-                clickIntent.setClass(context, UmengMessageReceiver::class.java)
-                clickIntent.putExtra(EntranceUtils.KEY_DATA, data?.link)
-                clickIntent.putExtra(EntranceUtils.KEY_MESSAGE, message)
-                clickIntent.putExtra(EntranceUtils.KEY_TYPE, TYPE_CLICK)
-
-                removeIntent.setClass(context, UmengMessageReceiver::class.java)
-                removeIntent.putExtra(EntranceUtils.KEY_TYPE, TYPE_REMOVE)
-                removeIntent.putExtra(EntranceUtils.KEY_MESSAGE, message)
-
-                val clickPendingIntent = PendingIntent.getBroadcast(context, System.currentTimeMillis().toInt(),
-                        clickIntent, PendingIntent.FLAG_UPDATE_CURRENT)
-
-                val deletePendingIntent = PendingIntent.getBroadcast(context, System.currentTimeMillis().toInt() + 1,
-                        removeIntent, PendingIntent.FLAG_UPDATE_CURRENT)
-
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    val channel = NotificationChannel("Halo_Push", "Halo_Push", NotificationManager.IMPORTANCE_DEFAULT)
-                    notificationManager.createNotificationChannel(channel)
-                }
-
-                val notification = NotificationCompat.Builder(context, "Halo_Push")
-                        .setSmallIcon(R.drawable.ic_notification)
-                        .setTicker(pushData.body?.ticker)
-                        .setContentTitle(pushData.body?.title)
-                        .setContentText(pushData.body?.text)
-                        .setContentIntent(clickPendingIntent)
-                        .setDeleteIntent(deletePendingIntent)
-                        .build()
-                notification.flags = notification.flags or Notification.FLAG_AUTO_CANCEL
-
-                notificationManager.notify(getNotificationTag(context), NOTIFICATION_ID, notification)
+            // 用户未登录的情况下不生成消息中心通知，避免用户掉登录了还收到跳转至消息中心的通知
+            if (data != null
+                    && data.link?.target == "system"
+                    && !UserManager.getInstance().isLoggedIn) {
+                return
             }
+
+            val clickIntent = Intent()
+            val removeIntent = Intent()
+
+            clickIntent.setClass(context, UmengMessageReceiver::class.java)
+            clickIntent.putExtra(EntranceUtils.KEY_DATA, data?.link)
+            clickIntent.putExtra(EntranceUtils.KEY_MESSAGE, message)
+            clickIntent.putExtra(MESSAGE_ID, msg?.msgId)
+            clickIntent.putExtra(PUSH_ID, data?.pushId)
+            clickIntent.putExtra(EntranceUtils.KEY_TYPE, TYPE_CLICK)
+
+            removeIntent.setClass(context, UmengMessageReceiver::class.java)
+            removeIntent.putExtra(EntranceUtils.KEY_TYPE, TYPE_REMOVE)
+            removeIntent.putExtra(EntranceUtils.KEY_MESSAGE, message)
+
+            val clickPendingIntent = PendingIntent.getBroadcast(context, System.currentTimeMillis().toInt(),
+                    clickIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+
+            val deletePendingIntent = PendingIntent.getBroadcast(context, System.currentTimeMillis().toInt() + 1,
+                    removeIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                val channel = NotificationChannel("Halo_Push", "Halo_Push", NotificationManager.IMPORTANCE_DEFAULT)
+                notificationManager.createNotificationChannel(channel)
+            }
+
+            val notification = NotificationCompat.Builder(context, "Halo_Push")
+                    .setSmallIcon(R.drawable.ic_notification)
+                    .setTicker(pushData.body?.ticker)
+                    .setContentTitle(pushData.body?.title)
+                    .setContentText(pushData.body?.text)
+                    .setContentIntent(clickPendingIntent)
+                    .setDeleteIntent(deletePendingIntent)
+                    .build()
+            notification.flags = notification.flags or Notification.FLAG_AUTO_CANCEL
+
+            notificationManager.notify(getNotificationTag(context), NOTIFICATION_ID, notification)
         } else {
-            if (HALO_MESSAGE_DIALOG == pushData.body?.custom) {
+            if (UserManager.getInstance().isLoggedIn
+                    && HALO_MESSAGE_DIALOG == pushData.body?.custom) {
                 // 回答了问题或者关注了问题的消息
                 val msg = gson.fromJson(message, PushMessageEntity::class.java)
                 val data = msg?.extra?.data
@@ -156,8 +165,25 @@ class GHUmengNotificationService : UmengMessageService() {
                                 bundle.putString(EntranceUtils.KEY_TO, AnswerDetailActivity::class.java.name)
                                 EntranceUtils.jumpActivity(context, bundle)
 
-                                DataUtils.onMtaEvent(context, "消息弹窗",
-                                        type, "Does not contains any parameter.")
+                                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()
                             })
@@ -173,37 +199,6 @@ class GHUmengNotificationService : UmengMessageService() {
         }
     }
 
-    private fun validatePush(condition: PushNotificationEntity.Data.Condition?): Boolean {
-        if (condition == null) return true
-
-        // 校验渠道是否匹配
-        condition.ghzs?.channel?.let {
-            if (it.isNotEmpty() && it != HaloApp.getInstance().channel) {
-                return false
-            }
-        }
-
-        // 校验光环版本版本是否匹配
-        condition.ghzs?.version?.let {
-            if (it.isNotEmpty() && !BuildConfig.VERSION_NAME.contains(it)) {
-                return false
-            }
-        }
-
-        // 校验已安装的应用里是否存在条件的包名
-        if (condition.packageName.isNotEmpty()) {
-            val installedPackageList = PackageUtils.getAllPackageName(HaloApp.getInstance().application)
-            for (packageName in installedPackageList) {
-                if (condition.packageName == packageName) {
-                    return true
-                }
-            }
-            return false
-        }
-
-        return true
-    }
-
     /**
      * 规则:最多三条消息,以旧换新
      *

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

@@ -43,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;
@@ -130,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/common/AppExecutor.kt

@@ -17,5 +17,17 @@ object AppExecutor {
         override fun execute(command: Runnable) {
             mainThreadHandler.post(command)
         }
+
+        fun executeWithDelay(command: Runnable, delay: Long) {
+            mainThreadHandler.postDelayed(command, delay)
+        }
     }
+}
+
+fun runOnIoThread(f: () -> Unit) {
+    AppExecutor.ioExecutor.execute(f)
+}
+
+fun runOnUiThread(f: () -> Unit) {
+    AppExecutor.uiExecutor.execute(f)
 }

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

@@ -1,14 +1,16 @@
 package com.gh.common
 
+import android.annotation.SuppressLint
 import android.preference.PreferenceManager
 import com.gh.base.GHUmengNotificationService
 import com.gh.common.constant.Config
 import com.gh.common.exposure.meta.MetaUtil
 import com.gh.common.util.edit
+import com.gh.common.util.toJson
+import com.gh.common.util.toObject
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.entity.AliasEntity
 import com.gh.gamecenter.retrofit.RetrofitManager
-import com.google.gson.Gson
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
 import com.umeng.commonsdk.UMConfigure
@@ -24,7 +26,6 @@ import org.json.JSONObject
 
 object PushManager {
 
-    var gson = Gson()
     var deviceToken: String? = ""
     var previousAlias: AliasEntity? = null
     var application = HaloApp.getInstance().application
@@ -52,7 +53,7 @@ object PushManager {
         registerDevice()
 
         val aliasInSp = PreferenceManager.getDefaultSharedPreferences(application).getString(SP_PUSH_ALIAS, "")
-        previousAlias = gson.fromJson(aliasInSp, AliasEntity::class.java)
+        previousAlias = aliasInSp.toObject()
 
         if (previousAlias == null) {
             getAndSetAlias()
@@ -77,6 +78,7 @@ object PushManager {
         })
     }
 
+    @SuppressLint("CheckResult")
     @JvmStatic
     fun getAndSetAlias() {
         if (deviceToken.isNullOrEmpty()) {
@@ -112,7 +114,7 @@ object PushManager {
 
         previousAlias = alias
         PreferenceManager.getDefaultSharedPreferences(application).edit {
-            putString(SP_PUSH_ALIAS, gson.toJson(previousAlias))
+            putString(SP_PUSH_ALIAS, previousAlias?.toJson())
         }
 
         pushAgent.setAlias(alias.alias, alias.aliasType) { b, s ->

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

@@ -13,6 +13,8 @@ import java.util.concurrent.Executors
  */
 class TimeElapsedHelper(val fragment: Fragment?, val activity: Activity?) {
 
+    constructor() : this(null, null)
+
     constructor(fragment: Fragment) : this(fragment, null)
 
     constructor(activity: Activity) : this(null, activity)
@@ -21,6 +23,9 @@ class TimeElapsedHelper(val fragment: Fragment?, val activity: Activity?) {
 
     var elapsedTime: Int = 0
 
+    var timeout: Int = 0
+    var timeoutCallback: TimeoutCallback? = null
+
     init {
         activity?.application?.registerActivityLifecycleCallbacks(object : Application.ActivityLifecycleCallbacks {
             override fun onActivityStarted(a: Activity?) {
@@ -76,12 +81,19 @@ class TimeElapsedHelper(val fragment: Fragment?, val activity: Activity?) {
                 }, false)
     }
 
-    private fun resumeCounting() {
+    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()
@@ -90,7 +102,11 @@ class TimeElapsedHelper(val fragment: Fragment?, val activity: Activity?) {
         }
     }
 
-    private fun pauseCounting() {
+    fun resetCounting() {
+        elapsedTime = 0
+    }
+
+    fun pauseCounting() {
         isWorking = false
     }
 
@@ -98,4 +114,8 @@ class TimeElapsedHelper(val fragment: Fragment?, val activity: Activity?) {
 
 object TimeElapsedThreadHolder {
     val threadService = Executors.newSingleThreadExecutor()
+}
+
+interface TimeoutCallback {
+    fun onTimeout()
 }

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

@@ -1,12 +1,14 @@
 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.common.util.SPUtils;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.entity.NewsEntity;
 import com.gh.gamecenter.entity.SettingsEntity;
@@ -42,45 +44,46 @@ 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; // 补丁包版本 对应关于->版本号 使用：PackageUtils.getPatchVersionName()
     // 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 : getSettings().getDownload()) {
             if ("all".equals(entity.getGame())) {
-                if (entity.isPluginfy() && "normal".equals(entity.getPolicy()) && filterTime(entity.getTime())) {
+                if (entity.getPluginfy() && "normal".equals(entity.getPolicy()) && filterTime(entity.getTime())) {
                     return true;
                 }
             }
         }
-
         return false;
     }
 
-    public static String getExceptionMsg(Context context) {
-        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
-        return sp.getString("errMsg", null);
+    public static String getExceptionMsg() {
+        return getPreferences().getString("errMsg", null);
     }
 
-    public static void setExceptionMsg(Context context, String errMsg) {
-        PreferenceManager.getDefaultSharedPreferences(context).edit().putString("errMsg", errMsg).apply();
+    public static void setExceptionMsg(String errMsg) {
+        SPUtils.setString(getPreferences(), "errMsg", errMsg);  //先用apply(),保存不了再用commit() 9.0机型保存不了信息
     }
 
     public static boolean isShowDownload(String gameId) {
 
-        if (PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication())
-                .getBoolean("isFixDownload", false)) return true;
+        if (getPreferences().getBoolean(FIX_DOWNLOAD_KEY, false)) return true;
 
         if (TextUtils.isEmpty(gameId) || !isExistDownloadFilter())
             return false;
@@ -104,18 +107,25 @@ public class Config {
 
 
     public static boolean isShowPlugin(String gameId) {
+        SharedPreferences preferences = getPreferences();
+        boolean isFixPlugin = preferences.getBoolean(FIX_PLUGIN_KEY, false);
+        if (isFixPlugin) return true;
+
         if (TextUtils.isEmpty(gameId) || !isExistDownloadFilter())
             return false;
 
         for (SettingsEntity.Download entity : getSettings().getDownload()) {
             if (gameId.equals(entity.getGame())) {
-                if (entity.isPluginfy() && filterTime(entity.getTime())) {
+                if (entity.getPluginfy() && filterTime(entity.getTime())) {
                     return true;
                 } else {
                     return false;
                 }
-            } else if ("all".equals(entity.getGame())) {
-                if (entity.isPluginfy() && filterTime(entity.getTime())) {
+            }
+
+            if ("all".equals(entity.getGame())) {
+                if (entity.getPluginfy() && filterTime(entity.getTime())) {
+                    preferences.edit().putBoolean(FIX_PLUGIN_KEY, true).apply();
                     return true;
                 }
             }
@@ -125,12 +135,17 @@ public class Config {
     }
 
     public static boolean isShowPlugin() {
+        SharedPreferences preferences = getPreferences();
+        boolean isFixPlugin = preferences.getBoolean(FIX_PLUGIN_KEY, false);
+        if (isFixPlugin) return true;
+
         if (!isExistDownloadFilter())
             return false;
 
         for (SettingsEntity.Download entity : getSettings().getDownload()) {
             if ("all".equals(entity.getGame())) {
-                if (entity.isPluginfy() && filterTime(entity.getTime())) {
+                if (entity.getPluginfy() && filterTime(entity.getTime())) {
+                    preferences.edit().putBoolean(FIX_PLUGIN_KEY, true).apply();
                     return true;
                 }
             }
@@ -152,19 +167,20 @@ public class Config {
     }
 
     public static void setSettings(SettingsEntity settingsEntity) {
-        SharedPreferences.Editor edit = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication()).edit();
-        edit.putString(SETTINGS_KEY, GsonUtils.getInstance().toJson(settingsEntity)).apply();
-
+        getPreferences().edit().putString(SETTINGS_KEY, GsonUtils.toJson(settingsEntity)).apply();
         mSettingsEntity = settingsEntity;
+
+        // 加载完设置后刷新下
+        PackageHelper.initList();
     }
 
+    @Nullable
     public static SettingsEntity getSettings() {
         if (mSettingsEntity == null) {
             try {
-                SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication());
-                String json = sp.getString(SETTINGS_KEY, null);
+                String json = getPreferences().getString(SETTINGS_KEY, null);
                 if (!TextUtils.isEmpty(json)) {
-                    mSettingsEntity = GsonUtils.getInstance().fromJsonBean(json, SettingsEntity.class);
+                    mSettingsEntity = GsonUtils.fromJson(json, SettingsEntity.class);
                 }
             } catch (Exception e) {
                 e.printStackTrace();
@@ -194,4 +210,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

@@ -47,4 +47,5 @@ public class Constants {
     //评论 cd间隔
     public static final int COMMENT_CD = 60 * 1000;
 
+    public static final String[] REPORT_LIST = new String[]{"垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息", "违法有害信息", "其它"};
 }

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

@@ -26,13 +26,13 @@ public class ItemViewType {
     public static final int GAME_PLUGIN = 18;     // 游戏插件模块
     public static final int ASK_REFRESH = 19;     // 问答精选 刷新
     public static final int ITEM_EMPTY = 20;
+    public static final int ASK_CONCERN = 21;     // 问答精选 关注
 
     /**
      * 普通列表
      */
     public static final int ITEM_BODY = 100;
     public static final int ITEM_FOOTER = 101;
-    public static final int ITEM_TOP = 102;
-
+    public static final int ITEM_HEADER = 102;
 
 }

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

@@ -23,10 +23,10 @@ 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.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;
@@ -41,7 +41,7 @@ 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;
@@ -63,12 +63,16 @@ public class BindingAdapters {
         ImageUtils.displayIcon(view, imageUrl);
     }
 
-
     @BindingAdapter("imageUrl")
     public static void loadImage(SimpleDraweeView view, String imageUrl) {
         ImageUtils.display(view, imageUrl);
     }
 
+    @BindingAdapter("setTextSize")
+    public static void setTextSize(TextView view, int number) {
+        view.setTextSize(number);
+    }
+
     @BindingAdapter({"addDetailKaiFuView", "addDetailKaiFuViewListener", "isReadyPatch"})
     public static void addDetailKaiFuView(LinearLayout view, List<KaiFuCalendarEntity> list
             , OnViewClickListener listener, Boolean isReadyPatch) {
@@ -344,7 +348,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);
@@ -353,7 +357,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);
@@ -456,8 +460,8 @@ public class BindingAdapters {
             View testView = LayoutInflater.from(layout.getContext()).inflate(R.layout.game_test_label, null);
             TextView testType = testView.findViewById(R.id.test_type);
             TextView testTime = testView.findViewById(R.id.test_time);
-            String type = gameEntity.getTest().getType();
-            KaiFuUtils.setKaiFuType(testType, type);
+            testType.setText(gameEntity.getTest().getType());
+            testType.setBackgroundColor(ContextCompat.getColor(layout.getContext(), R.color.tag_yellow));
 
             if (gameEntity.getTest().getStart() == 0) {
                 testTime.setVisibility(View.GONE);
@@ -479,4 +483,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,7 +2,7 @@ package com.gh.common.exposure
 
 import android.arch.persistence.room.TypeConverter
 import com.gh.common.exposure.meta.Meta
-import com.google.gson.Gson
+import com.gh.common.util.GsonUtils
 import java.util.*
 import kotlin.collections.ArrayList
 
@@ -10,32 +10,32 @@ class ExposureConverters {
 
     @TypeConverter
     fun convertPayload2String(any: ExposureEntity): String {
-        return Gson().toJson(any)
+        return GsonUtils.toJson(any)
     }
 
     @TypeConverter
     fun convertString2Payload(string: String): ExposureEntity {
-        return Gson().fromJson(string, ExposureEntity::class.java)
+        return GsonUtils.fromJson(string, ExposureEntity::class.java)
     }
 
     @TypeConverter
     fun convertSource2String(sourceList: List<ExposureSource>): String {
-        return Gson().toJson(sourceList)
+        return GsonUtils.toJson(sourceList)
     }
 
     @TypeConverter
     fun convertString2Source(sourceList: String): List<ExposureSource> {
-        return ArrayList(Arrays.asList(Gson().fromJson(sourceList, Array<ExposureSource>::class.java))) as List<ExposureSource>
+        return ArrayList(Arrays.asList(GsonUtils.fromJson(sourceList, Array<ExposureSource>::class.java))) as List<ExposureSource>
     }
 
     @TypeConverter
     fun convertETrace2String(sourceList: List<ExposureEvent>?): String {
-        return Gson().toJson(sourceList)
+        return GsonUtils.toJson(sourceList)
     }
 
     @TypeConverter
     fun convertStringToETrace(sourceList: String): List<ExposureEvent> {
-        return ArrayList(Arrays.asList(Gson().fromJson(sourceList, Array<ExposureEvent>::class.java))) as List<ExposureEvent>
+        return ArrayList(Arrays.asList(GsonUtils.fromJson(sourceList, Array<ExposureEvent>::class.java))) as List<ExposureEvent>
     }
 
     @TypeConverter
@@ -50,12 +50,12 @@ class ExposureConverters {
 
     @TypeConverter
     fun convertMeta2String(any: Meta): String {
-        return Gson().toJson(any)
+        return GsonUtils.toJson(any)
     }
 
     @TypeConverter
     fun convertString2Meta(string: String): Meta {
-        return Gson().fromJson(string, Meta::class.java)
+        return GsonUtils.fromJson(string, Meta::class.java)
     }
 
 }

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

@@ -8,9 +8,6 @@ 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() {
 
@@ -58,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,20 +1,24 @@
 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.meta.MetaUtil
 import com.gh.common.exposure.time.TimeUtil
+import com.gh.common.util.toJson
 import com.gh.gamecenter.BuildConfig
 import com.gh.loghub.LgLOG
 import com.gh.loghub.LoghubHelper
-import com.google.gson.Gson
+import com.halo.assistant.HaloApp
+import com.lightgame.utils.Utils
 import java.util.concurrent.Executors
 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 {
 
@@ -22,160 +26,115 @@ object ExposureManager {
     private const val PROJECT = "ghzs"
     private const val STORE_SIZE = 100
     private const val STORE_FORCE_UPLOAD_PERIOD = 300 * 1000L
+    private const val LOG_STORE = BuildConfig.EXPOSURE_REPO
 
-    private var LOG_STORE = BuildConfig.EXPOSURE_REPO
+    private val loghubHelper = LoghubHelper.getInstance()
 
-    private var loghubHelper = LoghubHelper.getInstance()
-    private lateinit var db: ExposureEventDao
-    private val storeSet = hashSetOf<ExposureEvent>()
-    private val storeOpThread = Executors.newSingleThreadExecutor()
-    private val gson = Gson()
+    // exposureCache 用来过滤掉具有相同 id 的曝光事件，避免重复发送事件
+    private val exposureCache = FixedSizeLinkedHashSet<String>(100)
+    private val exposureSet = hashSetOf<ExposureEvent>()
+    private val exposureDao by lazy { ExposureDatabase.buildDatabase(HaloApp.getInstance().application).logHubEventDao() }
+    private val exposureExecutor = Executors.newSingleThreadExecutor()
 
-    private val exposureCache = FixedSizeLinkedHashSet<String>(20)
-
-    /**
-     * Must be called early to init object then real use (for example in Application)
-     */
     @JvmStatic
-    fun init(application: Application) {
-
-        MetaUtil.init(application)
+    fun init() {
         TimeUtil.init()
 
-        loghubHelper.init(ENDPOINT, PROJECT, LOG_STORE) { TimeUtil.currentTimeMillis() }
-        db = ExposureDatabase.buildDatabase(application).logHubEventDao()
+        loghubHelper.init(HaloApp.getInstance().application, ENDPOINT, PROJECT, LOG_STORE) { TimeUtil.currentTimeMillis() }
 
-        storeOpThread.execute {
-            val eventList = db.getAll()
-            storeSet.addAll(eventList)
+        exposureExecutor.execute {
+            val eventList = exposureDao.getAll()
+            exposureSet.addAll(eventList)
         }
 
         fixedRateTimer(name = "ExposureManager-Store-Checker", initialDelay = 500, period = STORE_FORCE_UPLOAD_PERIOD) {
-            checkAndUploadFromDatabase(true)
+            commitSavedExposureEvent(true)
         }
     }
 
     /**
-     * Log an Event
+     * Log a single exposure event.
      */
-    fun log(event: ExposureEvent, uploadImmediately: Boolean = false) {
-        when (uploadImmediately) {
-            false -> store(event)
-            true -> upload(event)
-        }
-    }
-
-    /**
-     * Log Many Events
-     */
-    fun log(eventList: List<ExposureEvent>, uploadImmediately: Boolean = false) {
-        when (uploadImmediately) {
-            false -> store(eventList)
-            true -> upload(eventList)
-        }
-    }
-
-    /**
-     * Store an Event to storeSet, upload when storeSet size exceeds STORE_SIZE
-     */
-    private fun store(event: ExposureEvent) {
-        storeOpThread.execute {
+    fun log(event: ExposureEvent) {
+        exposureExecutor.execute {
             if (!exposureCache.contains(event.id)) {
-                storeSet.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}）")
             }
-            checkAndUploadFromDatabase()
         }
     }
 
     /**
-     * Store Many Events to storeSet, upload when storeSet 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)) {
-                    storeSet.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}）")
                 }
             }
+            commitSavedExposureEvent()
         }
     }
 
-    /**
-     * Upload an Event
-     */
-    private fun upload(event: ExposureEvent) {
-        storeOpThread.execute {
-            loghubHelper.uploadLogGroup(buildLogGroup(event))
+    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 {
-            loghubHelper.uploadLogGroup(buildLogGroup(eventList))
-        }
-    }
-
-    /**
-     * Upload Events From Store, and removed them
-     */
-    private fun checkAndUploadFromDatabase(isForceUpload: Boolean = false) {
-        storeOpThread.execute {
-            if (storeSet.size < STORE_SIZE && !isForceUpload || storeSet.size == 0) return@execute
-            val uploaded = storeSet.toList()
-            try {
-                loghubHelper.uploadLogGroup(buildLogGroup(uploaded))
-            } catch (exception: LogException) {
-                // Return to insure no logs lost because of online commit failure
-                return@execute
-            }
-            storeSet.removeAll(uploaded)
-            db.deleteMany(uploaded)
-        }
-    }
-
-    private fun buildLog(event: ExposureEvent): LgLOG {
-        val log = LgLOG(TimeUtil.currentTime())
-
-        log.PutContent("id", event.id)
-        log.PutContent("payload", gson.toJson(event.payload))
-        log.PutContent("event", event.event.toString())
-        log.PutContent("source", eliminateMultipleBrackets(gson.toJson(event.source)))
-        log.PutContent("meta", gson.toJson(event.meta))
-        log.PutContent("e-traces", if (event.eTrace != null) eliminateMultipleBrackets(gson.toJson(event.eTrace)) else "")
-        log.PutTime(event.time)
-
-        return log
-    }
-
     private fun eliminateMultipleBrackets(jsonWithMultipleBracket: String): String {
         return jsonWithMultipleBracket.replace("[[", "[").replace("]]", "]")
     }
 
-    private fun buildLogGroup(event: ExposureEvent): LogGroup {
-
+    private fun buildLogGroup(eventList: List<ExposureEvent>): LogGroup {
         val logGroup = LogGroup("sls android", "no ip")
 
-        logGroup.PutLog(buildLog(event))
+        eventList.forEach { logGroup.PutLog(buildLog(it)) }
 
         return logGroup
     }
 
-    private fun buildLogGroup(eventList: List<ExposureEvent>): LogGroup {
+    private fun buildLog(event: ExposureEvent): LgLOG {
+        val log = LgLOG(TimeUtil.currentTime())
 
-        val logGroup = LogGroup("sls android", "no ip")
+        log.PutContent("id", event.id)
+        log.PutContent("payload", event.payload.toJson())
+        log.PutContent("event", event.event.toString())
+        log.PutContent("source", eliminateMultipleBrackets(event.source.toJson()))
+        log.PutContent("meta", event.meta.toJson())
+        log.PutContent("e-traces", if (event.eTrace != null) {
+            eliminateMultipleBrackets(event.eTrace?.toJson() ?: "")
+        } else "")
+        log.PutTime(event.time)
 
-        eventList.forEach { event ->
-            logGroup.PutLog(buildLog(event))
-        }
-
-        return logGroup
+        return log
     }
 
     internal class FixedSizeLinkedHashSet<T>(var maxSize: Int) : LinkedHashSet<T>() {

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

@@ -1,15 +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 {
 
-    val gson = Gson()
-
     @JvmStatic
-    fun logADownloadExposureEvent(entity: GameEntity, platform: String?, traceEvent: ExposureEvent?, downloadType: DownloadType): ExposureEvent {
+    fun logADownloadExposureEvent(entity: GameEntity,
+                                  platform: String?,
+                                  traceEvent: ExposureEvent?,
+                                  downloadType: DownloadType): ExposureEvent {
         val gameEntity = entity.clone()
         gameEntity.platform = platform
         gameEntity.downloadType = downloadType.toString()
@@ -17,21 +18,24 @@ object ExposureUtils {
                 source = traceEvent?.source ?: ArrayList(),
                 eTrace = ExposureTraceUtils.appendTrace(traceEvent),
                 event = ExposureType.DOWNLOAD)
-        ExposureManager.log(exposureEvent, false)
+        ExposureManager.log(exposureEvent)
         return exposureEvent
     }
 
     @JvmStatic
-    fun logADownloadCompleteExposureEvent(entity: GameEntity, platform: String?, trace: String?, downloadType: DownloadType) {
+    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/meta/Meta.kt

@@ -15,11 +15,11 @@ 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 exposureVersion: String? = ""
+        val exposureVersion: String? = "",
+        val rom: String? = ""
 ) : Parcelable

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

@@ -14,22 +14,32 @@ import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.manager.UserManager
 import com.halo.assistant.HaloApp
 import com.leon.channel.helper.ChannelReaderUtil
+import com.walkud.rom.checker.RomIdentifier
 import java.io.File
 
 object MetaUtil {
 
-    private lateinit var application: Application
+    private val application: Application = HaloApp.getInstance().application
     private var channel = ""
 
     private var m: Meta? = null
 
-    fun init(application: Application) {
-        MetaUtil.application = application
-    }
-
     fun refreshMeta() {
-        m = Meta(getMac(), getIMEI(), getModel(), getManufacturer(), getAndroidId(), getAndroidSDK(),
-                getAndroidVersion(), getNetwork(), getIP(), getOS(), HaloApp.getInstance().gid, getChannel(), BuildConfig.VERSION_NAME, UserManager.getInstance().userId, BuildConfig.EXPOSURE_VERSION)
+        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,
+                rom = RomIdentifier.getRom().name + "" + RomIdentifier.getRom().versionName)
     }
 
     fun getMeta(): Meta {
@@ -141,16 +151,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"
                 }
@@ -161,10 +171,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,5 +1,7 @@
 package com.gh.common.exposure.time
 
+import com.gh.gamecenter.entity.TimeEntity
+import com.gh.gamecenter.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import io.reactivex.schedulers.Schedulers
@@ -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,6 +4,10 @@ object TimeUtil {
 
     private lateinit var corrector: Corrector
 
+    fun init() {
+        corrector = Corrector()
+    }
+
     fun currentTimeMillis(): Long {
         return corrector.delta + System.currentTimeMillis()
     }
@@ -16,11 +20,4 @@ object TimeUtil {
         }
     }
 
-    /**
-     * Must be called early then real use (for example in Application)
-     */
-    fun init() {
-        corrector = Corrector()
-    }
-
 }

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

@@ -0,0 +1,43 @@
+package com.gh.common.history
+
+import android.arch.persistence.room.Database
+import android.arch.persistence.room.Room
+import android.arch.persistence.room.RoomDatabase
+import android.arch.persistence.room.TypeConverters
+import com.gh.gamecenter.entity.HistoryGameEntity
+import com.gh.gamecenter.entity.NewsEntity
+import com.gh.gamecenter.qa.entity.AnswerEntity
+import com.gh.gamecenter.qa.entity.ArticleEntity
+import com.gh.gamecenter.room.converter.*
+import com.gh.gamecenter.room.dao.AnswerHistoryDao
+import com.gh.gamecenter.room.dao.ArticleHistoryDao
+import com.gh.gamecenter.room.dao.GameDao
+import com.gh.gamecenter.room.dao.NewsHistoryDao
+import com.halo.assistant.HaloApp
+
+@Database(entities = [AnswerEntity::class, ArticleEntity::class, NewsEntity::class, HistoryGameEntity::class], version = 2, exportSchema = false)
+@TypeConverters(*[
+    CountConverter::class,
+    CommunityConverter::class,
+    TimeConverter::class,
+    AnswerUserConverter::class,
+    ThumbnailConverter::class,
+    TagStyleListConverter::class,
+    StringArrayListConverter::class])
+
+abstract class HistoryDatabase : RoomDatabase() {
+
+    abstract fun answerDao(): AnswerHistoryDao
+    abstract fun articleDao(): ArticleHistoryDao
+    abstract fun newsDao(): NewsHistoryDao
+    abstract fun gameDao(): GameDao
+
+    companion object {
+        val instance by lazy {
+            Room.databaseBuilder(HaloApp.getInstance().application, HistoryDatabase::class.java, "USER_TRACK_HISTORY_DATABASE")
+                    .fallbackToDestructiveMigration()
+                    .build()
+        }
+    }
+
+}

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

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

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

@@ -5,16 +5,19 @@ 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 {
 
@@ -25,10 +28,17 @@ object ImManager {
     var shouldShowFloatingWindow = false
     var shouldShowFloatingWindowDot = false
 
+    // 记录当前用户 ID 避免重复初始化
+    var currentUserId = ""
+
     @JvmStatic
     fun attachIm() {
         try {
-            if (UserManager.getInstance().userInfoEntity != null) {
+            if (UserManager.getInstance().userInfoEntity != null &&
+                    currentUserId != UserManager.getInstance().userId) {
+                currentUserId = UserManager.getInstance().userId
+                MoorUtils.init(HaloApp.getInstance().application)
+                Utils.init(HaloApp.getInstance().application)
                 IMChatManager.getInstance().init(
                         HaloApp.getInstance().application,
                         ImReceiver.UNIQUE_BROADCAST_ACTION,
@@ -67,7 +77,8 @@ object ImManager {
                 chatHelper.initSdkChat(
                         ImReceiver.UNIQUE_BROADCAST_ACTION,
                         IM_KEY,
-                        UserManager.getInstance().userInfoEntity.name + "(" + UserManager.getInstance().userId + ")",
+                        UserManager.getInstance().userInfoEntity.name + "(" + UserManager.getInstance().userId + ")"
+                                + "[" + BuildConfig.VERSION_NAME + "]",
                         UserManager.getInstance().userId)
             } catch (e: Exception) {
                 e.printStackTrace()

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

@@ -12,8 +12,8 @@ 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
-import com.moor.imkf.utils.Utils
 
 class ImReceiver : BroadcastReceiver() {
 

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

@@ -32,7 +32,7 @@ class Notifier private constructor() {
         @JvmStatic
         fun tagNotifierAsShowed(content: String) {
             val viewedNotifierCollection = SPUtils.getString(SP_VIEWED_NOTIFIER)
-            if (viewedNotifierCollection.length > 1000) {
+            if (viewedNotifierCollection.length > 3000) {
                 SPUtils.setString(SP_VIEWED_NOTIFIER, content)
             } else {
                 SPUtils.setString(SP_VIEWED_NOTIFIER, viewedNotifierCollection + content)

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

@@ -201,12 +201,16 @@ class NotifierView @JvmOverloads constructor(context: Context, attrs: AttributeS
         showAnimatorSet.cancel()
         hideAnimatorSet.cancel()
 
-        removeAllListeners(expandAnimator,
-                shrinkAnimator,
-                translateUpAnimator,
-                translateDownAnimator,
-                translateToLeftAnimator,
-                translateToRightAnimator)
+        try {
+            removeAllListeners(expandAnimator,
+                    shrinkAnimator,
+                    translateUpAnimator,
+                    translateDownAnimator,
+                    translateToLeftAnimator,
+                    translateToRightAnimator)
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
     }
 
     private fun removeAllListeners(vararg ts: Animator) {
@@ -227,7 +231,7 @@ class NotifierView @JvmOverloads constructor(context: Context, attrs: AttributeS
         postDelayed({ shrink() }, duration)
     }
 
-    fun shrink() {
+    private fun shrink() {
         shrinkAnimator.doOnEnd { hide() }
         shrinkAnimator.start()
     }

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

@@ -1,5 +1,6 @@
 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
@@ -17,6 +18,7 @@ object RemenkapaiRepository {
             RetrofitManager.getInstance(getApplication()).api.remenkapai
                     .map { gameList -> filterEntityWithoutApk(gameList) }
                     .map { pickRandomSizeEntity(size) }
+                    .map(ApkActiveUtils.filterMapperList)
         } else {
             Observable.create { emitter -> emitter.onNext(pickRandomSizeEntity(size)) }
         }
@@ -26,6 +28,8 @@ object RemenkapaiRepository {
      * 选择随机数量的热门卡牌
      */
     private fun pickRandomSizeEntity(size: Int): List<GameEntity> {
+        if (size > remenkapaiList.size) return remenkapaiList
+
         val randomGameList = arrayListOf<GameEntity>()
         val randomArray = RandomUtils.getRandomArray(size, remenkapaiList.size)
         for (i in randomArray) {

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

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

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

@@ -1,90 +0,0 @@
-package com.gh.common.util;
-
-import android.content.Context;
-
-import com.lightgame.utils.Utils;
-
-import org.json.JSONObject;
-
-import retrofit2.HttpException;
-
-/**
- * Created by khy on 28/12/17.
- */
-
-public class AskErrorResponseUtils {
-
-    public static void errorResponseControl(Context context, HttpException e) {
-        if (e == null) return;
-        int code = e.code();
-        try {
-            if (code == 403) {
-                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, "请求的资源不存在");
-                }
-            } else {
-                Utils.toast(context, "网络错误");
-            }
-
-        } catch (Exception e1) {
-            e1.printStackTrace();
-        }
-
-
-    }
-}

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

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

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

@@ -14,15 +14,17 @@ import com.lightgame.utils.Utils;
 
 public class CheckLoginUtils {
 
-    public static void checkLogin(final Context context, OnLoginListener listener) {
-        if (TextUtils.isEmpty(UserManager.getInstance().getToken())) {
-            Utils.toast(context, "需要登录");
-            LogUtils.login(context, "dialog", null);
-            LogUtils.login(context, "activity", null);
-            Intent intent = LoginActivity.getIntent(context);
+    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/CollectionUtils.kt

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

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

@@ -1,101 +1,62 @@
 package com.gh.common.util
 
-import android.app.Dialog
 import android.content.Context
-import android.graphics.Color
-import android.support.v4.content.ContextCompat
 import android.text.TextUtils
-import android.view.Window
-import android.widget.LinearLayout
-import android.widget.TextView
 import com.gh.common.util.CommentUtils.copyText
 import com.gh.gamecenter.CommentDetailActivity
 import com.gh.gamecenter.MessageDetailActivity
-import com.gh.gamecenter.R
 import com.gh.gamecenter.adapter.OnCommentCallBackListener
 import com.gh.gamecenter.entity.CommentEntity
+import com.gh.gamecenter.entity.MeEntity
+import com.gh.gamecenter.entity.Permissions
+import com.gh.gamecenter.retrofit.Response
+import com.gh.gamecenter.retrofit.RetrofitManager
 import com.lightgame.utils.Utils
+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("查看对话")
-        }
-
-        val dialog: Dialog
-
-        dialog = createOptionsSelectDialog(context, dialogOptions) {
-            when (it) {
-                "回复" -> {
-                    CheckLoginUtils.checkLogin(context) {
-                        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)
-
-                "举报" -> CheckLoginUtils.checkLogin(context) {
-                    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))
-                }
-            }
-        }
-
-        dialog.show();
+    fun showCommunityArticleCommentOptions(context: Context,
+                                           commentEntity: CommentEntity,
+                                           showConversation: Boolean,
+                                           articleId: String,
+                                           communityId: String,
+                                           listener: OnCommentCallBackListener?) {
+        showCommentOptions(context = context,
+                commentEntity = commentEntity,
+                showConversation = showConversation,
+                articleId = articleId,
+                communityId = communityId,
+                listener = listener)
     }
 
     @JvmStatic
-    fun showAnswerCommentOptions(
-            context: Context,
-            commentEntity: CommentEntity,
-            showConversation: Boolean,
-            answerId: String,
-            listener: OnCommentCallBackListener?) {
+    fun showAnswerCommentOptions(context: Context,
+                                 commentEntity: CommentEntity,
+                                 showConversation: Boolean,
+                                 answerId: String,
+                                 listener: OnCommentCallBackListener?) {
+        showCommentOptions(context = context,
+                commentEntity = commentEntity,
+                showConversation = showConversation,
+                answerId = answerId,
+                listener = listener)
+    }
+
+    private fun showCommentOptions(context: Context,
+                                   commentEntity: CommentEntity,
+                                   showConversation: Boolean,
+                                   articleId: String? = null,
+                                   communityId: String? = null,
+                                   answerId: String? = null,
+                                   listener: OnCommentCallBackListener? = null) {
         val dialogOptions = ArrayList<String>()
 
         if (commentEntity.me == null || !commentEntity.me?.isAnswerCommented!!) {
@@ -105,16 +66,25 @@ object CommentHelper {
         dialogOptions.add("复制")
         dialogOptions.add("举报")
 
+        commentEntity.me?.let {
+            if (it.isModerator || (it.moderatorPermissions.hideAnswerComment > Permissions.GUEST
+                            || it.moderatorPermissions.topAnswerComment > Permissions.GUEST
+                            || it.moderatorPermissions.hideCommunityArticleComment > Permissions.GUEST
+                            || it.moderatorPermissions.topCommunityArticleComment > Permissions.GUEST)) {
+                dialogOptions.add("管理")
+            }
+        }
+
         if (commentEntity.parentUser != null && showConversation) {
             dialogOptions.add("查看对话")
         }
 
-        val dialog: Dialog
-
-        dialog = createOptionsSelectDialog(context, dialogOptions) {
+        DialogUtils.showListDialog(context, dialogOptions, null) {
             when (it) {
+                "管理" -> showControlDialog(context, answerId, articleId, communityId, commentEntity, commentEntity.me!!)
+
                 "回复" -> {
-                    CheckLoginUtils.checkLogin(context) {
+                    context.ifLogin("回答详情-评论-回复") {
                         if (listener != null) {
                             listener.onCommentCallback(commentEntity)
                         } else if (!TextUtils.isEmpty(commentEntity.id)) {
@@ -127,83 +97,228 @@ object CommentHelper {
 
                 "复制" -> copyText(commentEntity.content, context)
 
-                "举报" -> CheckLoginUtils.checkLogin(context) {
-                    showReportTypeDialog(context) { reportType ->
-                        PostCommentUtils.postAnswerReportData(context, commentEntity.id, answerId, reportType,
-                                object : PostCommentUtils.PostCommentListener {
-                                    override fun postSuccess(response: JSONObject?) {
-                                        Utils.toast(context, "感谢您的举报")
-                                    }
+                "举报" -> {
+                    context.ifLogin("回答详情-评论-举报") {
+                        showReportTypeDialog(context) { reportType ->
 
-                                    override fun postFailed(error: Throwable?) {
-                                        if (error == null) {
-                                            Utils.toast(context, "举报失败，请稍后重试")
-                                        } else {
-                                            Utils.toast(context, "举报失败，${error.message}")
-                                        }
+                            val commentListener = object : PostCommentUtils.PostCommentListener {
+                                override fun postSuccess(response: JSONObject?) {
+                                    Utils.toast(context, "感谢您的举报")
+                                }
+
+                                override fun postFailed(error: Throwable?) {
+                                    if (error == null) {
+                                        Utils.toast(context, "举报失败，请稍后重试")
+                                    } else {
+                                        Utils.toast(context, "举报失败，${error.message}")
                                     }
-                                })
+                                }
+                            }
+
+                            if (answerId != null) {
+                                PostCommentUtils.postAnswerReportData(context, commentEntity.id, answerId, reportType, commentListener)
+                            } else {
+                                PostCommentUtils.reportCommunityArticleComment(context, communityId, articleId, commentEntity.id, reportType, commentListener)
+                            }
+                        }
                     }
                 }
 
                 "查看对话" -> {
-                    context.startActivity(CommentDetailActivity
-                            .getAnswerCommentIntent(context, commentEntity.id, answerId, null))
+                    if (answerId != null) {
+                        context.startActivity(CommentDetailActivity
+                                .getAnswerCommentIntent(context, commentEntity.id, answerId, null))
+                    } else {
+                        context.startActivity(CommentDetailActivity
+                                .getCommunityArticleCommentIntent(context, articleId, commentEntity.id, communityId, null))
+                    }
                 }
             }
         }
+    }
 
-        dialog.show();
+    private fun showControlDialog(context: Context,
+                                  answerId: String? = null,
+                                  articleId: String? = null,
+                                  communityId: String? = null,
+                                  comment: CommentEntity,
+                                  me: MeEntity) {
+        val dialogOptions = arrayListOf<String>()
+        val highlight = "置顶评论"
+        val hide = "隐藏评论"
+
+        var canHighlightCommentDirectly = false
+        var canHideCommentDirectly = false
+
+        if (me.moderatorPermissions.topAnswerComment > Permissions.GUEST
+                || me.moderatorPermissions.topCommunityArticleComment > Permissions.GUEST) {
+            dialogOptions.add(highlight)
+            if (me.moderatorPermissions.topAnswerComment > Permissions.REPORTER
+                    || me.moderatorPermissions.topCommunityArticleComment > Permissions.REPORTER ) {
+                canHighlightCommentDirectly = true
+            }
+        }
+
+        if (me.moderatorPermissions.hideAnswerComment > Permissions.GUEST
+                || me.moderatorPermissions.hideCommunityArticleComment > Permissions.GUEST) {
+            dialogOptions.add(hide)
+            if (me.moderatorPermissions.hideAnswerComment > Permissions.REPORTER
+                    || me.moderatorPermissions.hideCommunityArticleComment > Permissions.REPORTER ) {
+                canHideCommentDirectly = true
+            }
+        }
+
+        val highlightDialogHintContent = if (canHighlightCommentDirectly) {
+            "你的操作将立即生效，确定提交吗？（你的管理权限为：高级）"
+        } else {
+            "你的操作将提交给小编审核，确定提交吗？"
+        }
+
+        val hideDialogHintContent = if (canHideCommentDirectly) {
+            "你的操作将立即生效，确定提交吗？（你的管理权限为：高级）"
+        } else {
+            "你的操作将提交给小编审核，确定提交吗？"
+        }
+
+        val disabledOptions = arrayListOf<String>()
+
+        if (comment.priority != 0) {
+            disabledOptions.add(highlight)
+        }
+
+        comment.me?.let {
+            if (it.isAnswerCommented) {
+                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
+                        }
+                    }
+
+                    val highlightObserver = object : Response<ResponseBody>() {
+                        override fun onResponse(response: ResponseBody?) {
+                            if (canHighlightCommentDirectly) {
+                                Utils.toast(context, "置顶成功，请刷新列表")
+                            } else {
+                                Utils.toast(context, "提交成功")
+                            }
+                        }
+
+                        override fun onFailure(e: HttpException?) {
+                            super.onFailure(e)
+                            e?.let { httpException ->
+                                if (httpException.code() == 403) {
+                                    val string = e.response().errorBody()?.string()
+                                    val errorJson = JSONObject(string)
+                                    val errorCode = errorJson.getInt("code")
+                                    if (errorCode == 403059) {
+                                        Utils.toast(getApplication(), "权限错误，请刷新后重试")
+                                        return
+                                    } else {
+                                        Utils.toast(getApplication(), e.message())
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    if (answerId != null) {
+                        DialogUtils.showAlertDialog(context, highlight, highlightDialogHintContent,
+                                "确定", "取消", {
+                            RetrofitManager.getInstance(context).api
+                                    .highlightAnswerComment(answerId, comment.id)
+                                    .observeOn(AndroidSchedulers.mainThread())
+                                    .subscribeOn(Schedulers.io())
+                                    .subscribe(highlightObserver)
+                        }, null)
+                    } else {
+                        DialogUtils.showAlertDialog(context, highlight, highlightDialogHintContent,
+                                "确定", "取消", {
+                            RetrofitManager.getInstance(context).api
+                                    .highlightCommunityArticleComment(communityId, articleId, comment.id)
+                                    .observeOn(AndroidSchedulers.mainThread())
+                                    .subscribeOn(Schedulers.io())
+                                    .subscribe(highlightObserver)
+                        }, null)
+                    }
+                }
+
+                hide -> {
+                    val hideObserver = object : Response<ResponseBody>() {
+                        override fun onResponse(response: ResponseBody?) {
+                            if (canHideCommentDirectly) {
+                                Utils.toast(context, "隐藏成功，请刷新列表")
+                            } else {
+                                Utils.toast(context, "提交成功")
+                            }
+                        }
+
+                        override fun onFailure(e: HttpException?) {
+                            super.onFailure(e)
+                            e?.let { httpException ->
+                                if (httpException.code() == 403) {
+                                    val string = e.response().errorBody()?.string()
+                                    val errorJson = JSONObject(string)
+                                    val errorCode = errorJson.getInt("code")
+                                    if (errorCode == 403059) {
+                                        Utils.toast(getApplication(), "权限错误，请刷新后重试")
+                                        return
+                                    } else {
+                                        Utils.toast(getApplication(), e.message())
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    if (answerId != null) {
+                        DialogUtils.showAlertDialog(context, hide, hideDialogHintContent,
+                                "确定", "取消", {
+                            RetrofitManager.getInstance(context).api
+                                    .hideAnswerComment(answerId, comment.id)
+                                    .observeOn(AndroidSchedulers.mainThread())
+                                    .subscribeOn(Schedulers.io())
+                                    .subscribe(hideObserver)
+                        }, null)
+                    } else {
+                        DialogUtils.showAlertDialog(context, hide, hideDialogHintContent,
+                                "确定", "取消", {
+                            RetrofitManager.getInstance(context).api
+                                    .hideCommunityArticleComment(communityId, articleId, comment.id)
+                                    .observeOn(AndroidSchedulers.mainThread())
+                                    .subscribeOn(Schedulers.io())
+                                    .subscribe(hideObserver)
+                        }, null)
+                    }
+                }
+            }
+        }
     }
 
     private fun showReportTypeDialog(context: Context, reportCallback: (reportType: String) -> Unit) {
         val reportTypes = arrayListOf("垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息", "违法有害信息", "其它")
 
-        val dialog = createOptionsSelectDialog(context, reportTypes) {
+        DialogUtils.showListDialog(context, reportTypes, null) { text ->
             val jsonObject = JSONObject()
             try {
-                jsonObject.put("reason", it)
+                jsonObject.put("reason", text)
                 reportCallback.invoke(jsonObject.toString())
             } catch (e: JSONException) {
                 e.printStackTrace()
             }
         }
-        dialog.show()
     }
 
-    private fun createOptionsSelectDialog(
-            context: Context,
-            dialogOptions: ArrayList<String>,
-            clickCallback: (text: String) -> Unit): Dialog {
-        val dialog = Dialog(context)
-
-        val container = LinearLayout(context)
-        container.orientation = LinearLayout.VERTICAL
-        container.setBackgroundColor(Color.WHITE)
-        container.setPadding(0, DisplayUtils.dip2px(context, 12f), 0, DisplayUtils.dip2px(context, 12f))
-
-        for (s in dialogOptions) {
-            val reportTv = TextView(context)
-            reportTv.text = s
-            reportTv.textSize = 17f
-            reportTv.setTextColor(ContextCompat.getColor(context, R.color.title))
-            reportTv.setBackgroundResource(R.drawable.textview_white_style)
-            val widthPixels = context.resources.displayMetrics.widthPixels
-            reportTv.layoutParams = 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 {
-                dialog.cancel()
-                clickCallback.invoke(reportTv.text.toString())
-            }
-        }
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
-        dialog.setContentView(container)
-
-        return dialog
-    }
 }

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

@@ -4,7 +4,6 @@ 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;
@@ -20,11 +19,8 @@ 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;
@@ -37,11 +33,6 @@ 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;
 
 /**
@@ -80,112 +71,13 @@ public class CommentUtils {
         }
     }
 
-    public static void showGameCommentOptions(final Context context, final RatingComment comment, final String gameId) {
-
-        final Dialog dialog = new Dialog(context);
-
-        LinearLayout container = new LinearLayout(context);
-        container.setOrientation(LinearLayout.VERTICAL);
-        container.setBackgroundColor(Color.WHITE);
-        container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
-
-        List<String> dialogType = new ArrayList<>();
-
-        dialogType.add("复制");
-        dialogType.add("举报");
-
-
-        for (String s : dialogType) {
-            final TextView reportTv = new TextView(context);
-            reportTv.setText(s);
-            reportTv.setTextSize(17);
-            reportTv.setTextColor(ContextCompat.getColor(context, R.color.title));
-            reportTv.setBackgroundResource(R.drawable.textview_white_style);
-            int widthPixels = context.getResources().getDisplayMetrics().widthPixels;
-            reportTv.setLayoutParams(new LinearLayout.LayoutParams((widthPixels * 9) / 10,
-                    LinearLayout.LayoutParams.WRAP_CONTENT));
-            reportTv.setPadding(DisplayUtils.dip2px(context, 20), DisplayUtils.dip2px(context, 12),
-                    0, DisplayUtils.dip2px(context, 12));
-            container.addView(reportTv);
-
-            reportTv.setOnClickListener(v -> {
-                dialog.cancel();
-                switch (reportTv.getText().toString()) {
-                    case "复制":
-                        copyText(comment.getContent(), context);
-                        break;
-                    case "举报":
-                        CheckLoginUtils.checkLogin(context, () -> 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) {
 
+    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);
@@ -225,7 +117,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)) {
@@ -239,7 +131,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 "查看对话":
@@ -256,135 +149,6 @@ public class CommentUtils {
 
     }
 
-//    public static void showAnswerCommentOptions(final CommentEntity commentEntity, final Context context,
-//                                                final OnCommentCallBackListener listener, final String id,
-//                                                boolean showConversation, String answerId, String articleId, String articleCommunityId) {
-//
-//        final Dialog dialog = new Dialog(context);
-//
-//        LinearLayout container = new LinearLayout(context);
-//        container.setOrientation(LinearLayout.VERTICAL);
-//        container.setBackgroundColor(Color.WHITE);
-//        container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
-//
-//        List<String> dialogType = new ArrayList<>();
-//
-//        if (commentEntity.getMe() == null || !commentEntity.getMe().isAnswerCommented()) {
-//            dialogType.add("回复");
-//        }
-//
-//        dialogType.add("复制");
-//        dialogType.add("举报");
-//
-//        if (commentEntity.getParentUser() != null && showConversation) {
-//            dialogType.add("查看对话");
-//        }
-//
-//        for (String s : dialogType) {
-//            final TextView reportTv = new TextView(context);
-//            reportTv.setText(s);
-//            reportTv.setTextSize(17);
-//            reportTv.setTextColor(ContextCompat.getColor(context, R.color.title));
-//            reportTv.setBackgroundResource(R.drawable.textview_white_style);
-//            int widthPixels = context.getResources().getDisplayMetrics().widthPixels;
-//            reportTv.setLayoutParams(new LinearLayout.LayoutParams((widthPixels * 9) / 10,
-//                    LinearLayout.LayoutParams.WRAP_CONTENT));
-//            reportTv.setPadding(DisplayUtils.dip2px(context, 20), DisplayUtils.dip2px(context, 12),
-//                    0, DisplayUtils.dip2px(context, 12));
-//            container.addView(reportTv);
-//
-//            reportTv.setOnClickListener(v -> {
-//                dialog.cancel();
-//                switch (reportTv.getText().toString()) {
-//                    case "回复":
-//                        CheckLoginUtils.checkLogin(context, () -> {
-//                            if (listener != null) {
-//                                listener.onCommentCallback(commentEntity);
-//                            } else if (!TextUtils.isEmpty(id)) {
-//                                context.startActivity(MessageDetailActivity.getMessageDetailIntent(context, commentEntity, id));
-//                            } else {
-//                                Utils.toast(context, "缺少关键属性");
-//                            }
-//                        });
-//                        break;
-//                    case "复制":
-//                        copyText(commentEntity.getContent(), context);
-//                        break;
-//                    case "举报":
-//                        CheckLoginUtils.checkLogin(context, () -> showAnswerReportDialog(answerId, commentEntity, context));
-//                        break;
-//                    case "查看对话":
-//                        if (TextUtils.isEmpty(articleId)) {
-//                            context.startActivity(CommentDetailActivity.getAnswerCommentIntent(context, commentEntity.getId(), answerId, null));
-//                        } else {
-//                            context.startActivity(CommentDetailActivity.getCommunityArticleCommentIntent(context, articleId, commentEntity.getId(), articleCommunityId, null));
-//                        }
-//                        break;
-//                }
-//            });
-//        }
-//
-//        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-//        dialog.setContentView(container);
-//        dialog.show();
-//    }
-
-//    private static void showAnswerReportDialog(final String answerId, final CommentEntity commentEntity, final Context context) {
-//        final String[] arrReportType = new String[]{"垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息",
-//                "违法有害信息", "其它"};
-//        int widthPixels = context.getResources().getDisplayMetrics().widthPixels;
-//
-//        final Dialog reportTypeDialog = new Dialog(context);
-//        LinearLayout container = new LinearLayout(context);
-//        container.setOrientation(LinearLayout.VERTICAL);
-//        container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
-//        container.setBackgroundColor(Color.WHITE);
-//
-//        for (final String s : arrReportType) {
-//            TextView reportTypeTv = new TextView(context);
-//            reportTypeTv.setText(s);
-//            reportTypeTv.setTextSize(17);
-//            reportTypeTv.setTextColor(ContextCompat.getColor(context, R.color.title));
-//            reportTypeTv.setBackgroundResource(R.drawable.textview_white_style);
-//            reportTypeTv.setLayoutParams(new LinearLayout.LayoutParams((widthPixels * 9) / 10,
-//                    LinearLayout.LayoutParams.WRAP_CONTENT));
-//            reportTypeTv.setPadding(DisplayUtils.dip2px(context, 20), DisplayUtils.dip2px(context, 12),
-//                    0, DisplayUtils.dip2px(context, 12));
-//            container.addView(reportTypeTv);
-//
-//            reportTypeTv.setOnClickListener(v -> {
-//                JSONObject jsonObject = new JSONObject();
-//                try {
-//                    jsonObject.put("reason", s);
-//                } catch (JSONException e) {
-//                    e.printStackTrace();
-//                }
-//
-//                PostCommentUtils.postAnswerReportData(context, commentEntity.getId(), answerId, jsonObject.toString(),
-//                        new PostCommentUtils.PostCommentListener() {
-//                            @Override
-//                            public void postSuccess(JSONObject response) {
-//                                Utils.toast(context, "感谢您的举报");
-//                            }
-//
-//                            @Override
-//                            public void postFailed(Throwable error) {
-//                                if (error != null) {
-//                                    Utils.toast(context, "举报失败" + error.getMessage());
-//                                } else {
-//                                    Utils.toast(context, "举报失败，请稍候重试");
-//                                }
-//                            }
-//                        });
-//                reportTypeDialog.cancel();
-//            });
-//        }
-//
-//        reportTypeDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-//        reportTypeDialog.setContentView(container);
-//        reportTypeDialog.show();
-//    }
-
     private static void showReportTypeDialog(final CommentEntity commentEntity, final Context context) {
         final String[] arrReportType = new String[]{"垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息",
                 "违法有害信息", "其它"};
@@ -442,64 +206,68 @@ 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.vote_icon_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(NumberUtils.transSimpleCount(commentEntity.getVote()));
+        commentLikeCountTv.setVisibility(View.VISIBLE);
 
-            PostCommentUtils.addCommentVote(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(NumberUtils.transSimpleCount(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.vote_icon_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, 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;
@@ -507,7 +275,7 @@ public class CommentUtils {
             commentEntity.setVote(commentEntity.getVote() + 1);
             commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme));
             commentLikeIv.setImageResource(R.drawable.vote_icon_select);
-            commentLikeCountTv.setText(String.valueOf(commentEntity.getVote()));
+            commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
             commentLikeCountTv.setVisibility(View.VISIBLE);
 
             PostCommentUtils.voteAnswerComment(context, answerId, articleId, articleCommunityId, commentEntity.getId(),
@@ -525,7 +293,7 @@ public class CommentUtils {
                             commentEntity.setVote(commentEntity.getVote() - 1);
                             commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
                             commentLikeIv.setImageResource(R.drawable.vote_icon_unselect);
-                            commentLikeCountTv.setText(String.valueOf(commentEntity.getVote()));
+                            commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
                             if (commentEntity.getVote() == 0) {
                                 commentLikeCountTv.setVisibility(View.GONE);
                             } else {

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

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

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

@@ -142,12 +142,11 @@ object CompressImageUtils {
     }
 
     fun getImageSetting(): SettingsEntity.Image {
-        var settings = Config.getSettings()
+        val settings = Config.getSettings()
         if (settings == null && settings?.image != null) {
-            return settings.image
+            return settings.image!!
         }
-        settings = SettingsEntity()
-        val image = settings.Image()
+        val image = SettingsEntity.Image()
         image.processLimitSize = compressLimitSize
         image.size = defaultCompressBorder
         image.ratio = defaultRatio

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

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

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

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

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

@@ -38,7 +38,7 @@ 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);

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);
 

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

@@ -9,7 +9,7 @@ import com.gh.download.DownloadManager;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.DetailViewHolder;
 import com.gh.gamecenter.entity.PluginLocation;
-import com.gh.gamecenter.manager.PackageManager;
+import com.gh.gamecenter.manager.PackagesManager;
 import com.lightgame.download.DownloadEntity;
 
 /**
@@ -72,8 +72,9 @@ public class DetailDownloadUtils {
         switch (downloadEntity.getStatus()) {
             case downloading:
             case pause:
+            case overflow:
                 viewHolder.mDownloadPb.setText(R.string.downloading);
-                if (downloadEntity.isPluggable() && PackageManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
+                if (downloadEntity.isPluggable() && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
                     viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_PLUGIN);
                 } else {
                     viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_NORMAL);
@@ -84,7 +85,7 @@ public class DetailDownloadUtils {
             case waiting:
             case subscribe:
                 viewHolder.mDownloadPb.setText(R.string.waiting);
-                if (downloadEntity.isPluggable() && PackageManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
+                if (downloadEntity.isPluggable() && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
                     viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_PLUGIN);
                 } else {
                     viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_NORMAL);
@@ -93,7 +94,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

@@ -4,8 +4,9 @@ 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.gh.gamecenter.retrofit.StringResponse
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Util_System_Phone_State
 import com.lightgame.utils.Utils
@@ -13,7 +14,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import java.io.File
 
-
 object DeviceTokenUtils {
 
     const val DEVICE_ID = "uuid"
@@ -26,18 +26,13 @@ object DeviceTokenUtils {
         RetrofitManager.getInstance(context).api.time
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(object : StringResponse() {
-                    override fun onResponse(response: String) {
-                        if (response.matches("^[0-9]{10}$".toRegex())) {
-                            try {
-                                val editor = sp.edit()
-                                editor.putLong("server_time", java.lang.Long.parseLong(response))
-                                editor.putLong("client_time", System.currentTimeMillis() / 1000)
-                                editor.apply()
-                            } catch (e: NumberFormatException) {
-                                e.printStackTrace()
-                            }
-
+                .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()
                         }
                     }
                 })
@@ -51,18 +46,18 @@ object DeviceTokenUtils {
         if (values.isNotEmpty()) {
             for (value in values) {
                 if (value.key.contains("isNewFirstLaunchV")) {
-                    lunchType = LunchType.update
+                    lunchType = LunchType.UPDATE
                     break
                 }
             }
         }
         // 再次重装
         if (lunchType == null && !getDeviceId().isNullOrEmpty()) {
-            lunchType = LunchType.again
+            lunchType = LunchType.AGAIN
         }
         // 首次安装
         if (lunchType == null) {
-            lunchType = LunchType.first
+            lunchType = LunchType.FIRST
         }
         // 保存deviceId
         var deviceId = Util_System_Phone_State.getDeviceId(HaloApp.getInstance().application)
@@ -133,7 +128,7 @@ object DeviceTokenUtils {
 }
 
 enum class LunchType {
-    first,
-    update,
-    again
+    FIRST,
+    UPDATE,
+    AGAIN
 }

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

@@ -1,5 +1,6 @@
 package com.gh.common.util;
 
+import android.app.ActivityManager;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
@@ -128,6 +129,20 @@ public class DeviceUtils {
         return builder.toString();
     }
 
+    public static String getUserAgent() {
+        String userAgent = "";
+        userAgent = System.getProperty("http.agent");
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0, length = userAgent.length(); i < length; i++) {
+            char c = userAgent.charAt(i);
+            if (c <= '\u001f' || c >= '\u007f') {
+                sb.append(String.format("\\u%04x", (int) c));
+            } else {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
 
     public static String getIPAddress(Context context) {
         NetworkInfo info = ((ConnectivityManager) context
@@ -224,7 +239,6 @@ public class DeviceUtils {
         return "";
     }
 
-
     // ping domain
     public static String ping(String domain) {
         try {
@@ -243,5 +257,13 @@ public class DeviceUtils {
         }
     }
 
+    public static long getTotalRamSizeOfDevice(Context context) {
+        ActivityManager actManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+        ActivityManager.MemoryInfo memInfo = new ActivityManager.MemoryInfo();
+        if (actManager != null) {
+            actManager.getMemoryInfo(memInfo);
+        }
+        return memInfo.totalMem / (1024 * 1024);
+    }
 
 }

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

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

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

@@ -7,6 +7,7 @@ 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;
@@ -129,7 +130,7 @@ public class DialogUtils {
                 ApplicationInfo appInfo = info.applicationInfo;
                 appInfo.sourceDir = apkPath;
                 appInfo.publicSourceDir = apkPath;
-                Bitmap bitmap = BitmapUtils.drawableToBitmap(appInfo.loadIcon(pm));
+                Bitmap bitmap = BitmapUtils.drawableToBitmap(appInfo.loadIcon(pm), true);
 
                 ImageView imageView = new ImageView(activity);
                 imageView.setLayoutParams(new LinearLayout.LayoutParams(DisplayUtils.dip2px(activity, 25)
@@ -328,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;
         }
@@ -360,9 +360,16 @@ public class DialogUtils {
         } else if (NetworkUtils.isWifiConnected(context) || filter4GorSize(context, size)) {
             callBack.onResponse(false);
         } else {
+            MtaHelper.onEvent("移动网络下载", NetworkUtils.getMobileNetworkType(context), "出现弹窗提示");
             showDownloadDialog(context,
-                    () -> callBack.onResponse(false),
-                    () -> callBack.onResponse(true));
+                    () -> {
+                        callBack.onResponse(false);
+                        MtaHelper.onEvent("移动网络下载", NetworkUtils.getMobileNetworkType(context), "立即下载");
+                    },
+                    () -> {
+                        callBack.onResponse(true);
+                        MtaHelper.onEvent("移动网络下载", NetworkUtils.getMobileNetworkType(context), "连上WiFi后自动下载");
+                    });
         }
     }
 
@@ -445,7 +452,53 @@ public class DialogUtils {
         TextView titleTv = contentView.findViewById(R.id.dialog_title);
         TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
         TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
+        if (message.toString().contains("红包奖励")) {//将红包奖励四个字标红
+            String str = message.toString().substring(0, message.toString().indexOf("红包奖励")) + "<font color='#FF0000'>红包奖励</font>";
+            contentTv.setText(Html.fromHtml(str));
+        } else {
+            contentTv.setText(message);
+        }
+        titleTv.setText(title);
+        negativeTv.setText(negative);
+        positiveTv.setText(positive);
 
+        negativeTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (clListener != null) {
+                    clListener.onCancel();
+                }
+                dialog.dismiss();
+            }
+        });
+
+        positiveTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (cmListener != null) {
+                    cmListener.onConfirm();
+                }
+                dialog.dismiss();
+            }
+        });
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(contentView);
+        dialog.show();
+        return dialog;
+    }
+
+
+    public static Dialog showAlertDialog(Context context, String title, Spanned message
+            , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) {
+
+        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(message);
         titleTv.setText(title);
         negativeTv.setText(negative);
@@ -781,6 +834,62 @@ public class DialogUtils {
         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();
     }
@@ -789,6 +898,9 @@ 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

@@ -22,7 +22,7 @@ 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.refactor.SubjectActivity
+import com.gh.gamecenter.subject.SubjectActivity
 import com.gh.gamecenter.suggest.SuggestType
 import com.lightgame.utils.Util_System_ClipboardManager
 import com.lightgame.utils.Utils
@@ -86,18 +86,20 @@ object DirectUtils {
 
             "community_article" -> context.startActivity(ArticleDetailActivity.getIntent(context, linkEntity.community!!, linkEntity.link!!, entrance, path))
 
-            "community_column" -> context.startActivity(CommunitySubjectActivity.getIntent(context, linkEntity.community!!, linkEntity.link, entrance))
+            "community_column" -> context.startActivity(CommunitySubjectActivity.getIntent(context, linkEntity.community!!, linkEntity.link, entrance, path))
 
             "community_special_column" -> context.startActivity(AskColumnDetailActivity.getIntentByColumnId(context, linkEntity.link, linkEntity.community!!, entrance, path))
 
             "web" -> directToWebView(context, url = linkEntity.link!!, entrance = entrance)
 
+            "qq" -> directToQqConversation(context, linkEntity.link)
+
             else -> DialogUtils.showLowVersionDialog(context)
         }
     }
 
     /**
-     * 跳转到文章详情
+     * 跳转到新闻详情
      */
     @JvmStatic
     fun directToArticle(context: Context, id: String, entrance: String? = null) {
@@ -175,7 +177,6 @@ object DirectUtils {
         bundle.putString(KEY_GAMEID, gameId)
         bundle.putString(KEY_PACKAGENAME, packageName)
         bundle.putInt(BaseFragment_TabLayout.PAGE_INDEX, INDEX_UPDATE)
-        bundle.putBoolean(KEY_AUTO_UPDATE, true)
         EntranceUtils.jumpActivity(context, bundle)
     }
 

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

@@ -21,6 +21,7 @@ object DownloadHelper {
         RetrofitManager.getInstance(HaloApp.getInstance().application)
                 .api
                 .getGameDigest(gameId)
+                .map(ApkActiveUtils.filterMapper)
                 .subscribeOn(Schedulers.io())
                 .subscribe(object : Response<GameEntity>() {
                     override fun onResponse(response: GameEntity?) {

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

@@ -22,7 +22,7 @@ import com.gh.gamecenter.adapter.viewholder.GameViewHolder;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.entity.PluginLocation;
-import com.gh.gamecenter.manager.PackageManager;
+import com.gh.gamecenter.manager.PackagesManager;
 import com.lightgame.download.DownloadConfig;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.DownloadStatus;
@@ -69,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);
@@ -83,7 +83,7 @@ public class DownloadItemUtils {
                     DownloadManager.getInstance(context).sendMessageDelayed(msg, 3000);
                 }
             }
-            if (platform.equals(queue.peek())) {
+            if (platform != null && platform.equals(queue.peek())) {
                 if (entryMap == null) {
                     entryMap = new ArrayMap<>();
                     gameEntity.setEntryMap(entryMap);
@@ -96,6 +96,13 @@ public class DownloadItemUtils {
         }
     }
 
+    // 下载按钮显示为查看，并且不提供下载功能
+    public static void updateItemWithViewOnlyStyle(GameViewHolder holder) {
+        holder.gameDownloadBtn.setVisibility(View.VISIBLE);
+        holder.gameDownloadBtn.setText("查看");
+        holder.gameDownloadBtn.setClickable(false);
+    }
+
     public static void updateItem(Context context, GameEntity gameEntity, GameViewHolder holder,
                                   boolean isShowPlatform) {
         updateItem(context, gameEntity, holder, isShowPlatform, PluginLocation.only_game);
@@ -159,6 +166,7 @@ public class DownloadItemUtils {
     // 更新插件的条目，有多个apk包
     private static void updatePluginItem(Context context, GameViewHolder holder, GameEntity gameEntity,
                                          boolean isShowPlatform, PluginLocation pluginLocation) {
+        GameUtils.setDownloadBtnStatus(context, gameEntity, holder.gameDownloadBtn, pluginLocation);
 
         ArrayMap<String, DownloadEntity> entryMap = gameEntity.getEntryMap();
         if (entryMap != null && !entryMap.isEmpty()) {
@@ -177,8 +185,6 @@ public class DownloadItemUtils {
             }
         }
 
-        GameUtils.setDownloadBtnStatus(context, gameEntity, holder.gameDownloadBtn, pluginLocation);
-
         holder.gameDes.setVisibility(View.VISIBLE);
         holder.gameProgressbar.setVisibility(View.GONE);
         holder.gameInfo.setVisibility(View.GONE);
@@ -230,7 +236,8 @@ public class DownloadItemUtils {
         } else if (status.equals(DownloadStatus.pause)
                 || status.equals(DownloadStatus.timeout)
                 || status.equals(DownloadStatus.neterror)
-                || status.equals(DownloadStatus.subscribe)) {
+                || status.equals(DownloadStatus.subscribe)
+                || status.equals(DownloadStatus.overflow)) {
             holder.gameProgressbar.setProgress((int) (downloadEntity.getPercent() * 10));
             if (isShowPlatform && platform != null) {
                 holder.gameDownloadSpeed.setText(String.format("%s - 暂停", platform));
@@ -240,10 +247,10 @@ public class DownloadItemUtils {
             holder.gameDownloadPercentage.setText(downloadEntity.getPercent() + "%");
 
             if (isNormal) {
-                if (status.equals(DownloadStatus.pause)) {
-                    holder.gameDownloadBtn.setText(R.string.downloading);
-                } else {
+                if (status.equals(DownloadStatus.waiting)) {
                     holder.gameDownloadBtn.setText(R.string.waiting);
+                } else {
+                    holder.gameDownloadBtn.setText(R.string.downloading);
                 }
                 holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style);
                 holder.gameDownloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style));
@@ -258,10 +265,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);
@@ -316,43 +323,34 @@ public class DownloadItemUtils {
                                      final String entrance,
                                      final String location,
                                      @Nullable final ExposureEvent traceEvent) {
-
         String str = downloadBtn.getText().toString();
-        switch (str) {
-            case "下载":
-                DialogUtils.checkDownload(context, gameEntity.getApk().get(0).getSize(),
-                        isSubscribe -> download(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent));
-                break;
-            case "插件化":
-                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));
-                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 "等待中":
-            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());
-                }
-                DialogUtils.checkDownload(context, gameEntity.getApk().get(0).getSize(),
-                        isSubscribe -> update(context, gameEntity, entrance, location, isSubscribe, 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));
         }
     }
 

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

@@ -25,7 +25,7 @@ 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_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";
@@ -82,7 +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_ANSWER = "isRecommendsAnswer";
+    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";
@@ -98,18 +98,20 @@ public class EntranceUtils {
     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_AUTO_UPDATE = "auto_update";
     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 final String KEY_OPEN_KEYBOARD = "openKeyboard";
 
     public static void jumpActivity(Context context, Bundle bundle) {
 

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

@@ -0,0 +1,138 @@
+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 {
+
+    /**
+     * 手动匹配处理特定错误码
+     * [showHighPriorityHint] 用来标识有同样错误码可以触发两种处理时，为 true 时选择重要的
+     * [customizedHandler] 返回 true 为已处理该错误码，false 则交由 [handleError] 处理
+     */
+    fun handleErrorWithCustomizedHandler(context: Context,
+                                         errorString: String?,
+                                         showHighPriorityHint: Boolean = false,
+                                         customizedHandler: (code: Int) -> Boolean) {
+        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
+        }
+
+        if (customizedHandler(errorEntity.code ?: 0)) {
+            return
+        } else {
+            handleError(context, showHighPriorityHint, errorEntity)
+        }
+    }
+
+    /**
+     * [showHighPriorityHint] 用来标识有同样错误码可以触发两种处理时，为 true 时选择重要的
+     */
+    @JvmStatic
+    fun handleError(context: Context, errorString: String?, showHighPriorityHint: 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
+        }
+
+        handleError(context, showHighPriorityHint, errorEntity)
+    }
+
+    /***
+     * 禁言错误,
+     *403050： 评论回答
+     *403051： 评论资讯文章
+     *403055： 评论社区文章
+     *403048： 发表回答
+     *403053： 发表社区文章
+     *403049： 发布问题
+     *403046： 编辑回答
+     *403045： 编辑答案
+     *403057： 游戏评论
+     *403054： 更新社区文章
+     *403047： 回答点赞
+     */
+    private fun handleError(context: Context, showHighPriorityHint: Boolean = false, errorEntity: ErrorEntity) {
+        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, "请求的资源不存在")
+            403016 -> Utils.toast(context, "标签内容可能包含敏感信息，请修改后再提交")
+            403018 -> Utils.toast(context, R.string.comment_failed_unable)
+
+            403020 -> if (showHighPriorityHint) {
+                DialogUtils.showAlertDialog(context,
+                        "限制提醒",
+                        "提问过于频繁，请先休息一下哦",
+                        "知道了", null, null, null)
+            } else {
+                Utils.toast(context, R.string.comment_failed_toofrequent)
+            }
+
+            403021 -> Utils.toast(context, R.string.comment_failed_illegal)
+
+            403059 -> Utils.toast(context, "权限错误，请刷新后重试")
+
+            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

@@ -1,28 +1,42 @@
 package com.gh.common.util
 
-import android.app.Activity
-import android.app.Application
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
-import android.arch.lifecycle.ViewModelProviders
-import android.os.Bundle
+import android.arch.lifecycle.*
+import android.content.ClipboardManager
+import android.content.Context
 import android.support.v4.app.Fragment
 import android.support.v4.app.FragmentActivity
 import android.support.v4.view.ViewPager
+import android.text.Html
+import android.text.Spanned
+import android.view.View
+import com.google.gson.reflect.TypeToken
+import com.halo.assistant.HaloApp
+import com.lightgame.utils.Utils
+import okhttp3.MediaType
+import okhttp3.RequestBody
+import java.net.URI
 
 /**
  * 创建以 activity 为观察者上下文的 viewModel
  */
 inline fun <reified VM : ViewModel> FragmentActivity.viewModelProvider(
-        provider: ViewModelProvider.Factory
+        provider: ViewModelProvider.Factory? = null
 ) =
         ViewModelProviders.of(this, provider).get(VM::class.java)
 
+/**
+ * 创建以 activity 为观察者上下文的 viewModel
+ */
+inline fun <reified VM : ViewModel> Fragment.viewModelProviderFromParent(
+        provider: ViewModelProvider.Factory? = null
+) =
+        ViewModelProviders.of(requireActivity(), provider).get(VM::class.java)
+
 /**
  * 创建以 fragment 为观察者上下文的 viewModel
  */
 inline fun <reified VM : ViewModel> Fragment.viewModelProvider(
-        provider: ViewModelProvider.Factory
+        provider: ViewModelProvider.Factory? = null
 ) =
         ViewModelProviders.of(this, provider).get(VM::class.java)
 
@@ -50,31 +64,108 @@ fun ViewPager.addOnPageChangeListener(onSelected: ((position: Int) -> Unit)? = n
     addOnPageChangeListener(listener)
 }
 
-fun Application.ActivityLifecycleCallbacks(callBack: () -> Unit) {
-    val listener = object : Application.ActivityLifecycleCallbacks {
-        override fun onActivityStarted(activity: Activity?) {
+/**
+ * LiveData Extensions
+ */
+fun <T> LiveData<T?>.observeNonNull(owner: LifecycleOwner, callback: (T) -> Unit) {
+    observe(owner, Observer { value ->
+        if (value != null) {
+            callback(value)
         }
+    })
+}
 
-        override fun onActivitySaveInstanceState(activity: Activity?, outState: Bundle?) {
-        }
+/**
+ * Login related extensions
+ */
+fun Fragment.ifLogin(entrance: String, action: (() -> Unit)? = null) {
+    requireContext().ifLogin(entrance, action)
+}
 
-        override fun onActivityStopped(activity: Activity?) {
-        }
+fun Context.ifLogin(entrance: String, action: (() -> Unit)? = null) {
+    CheckLoginUtils.checkLogin(this, entrance, action)
+}
 
-        override fun onActivityCreated(activity: Activity?, savedInstanceState: Bundle?) {
-        }
 
-        override fun onActivityPaused(activity: Activity?) {
-
-        }
-
-        override fun onActivityResumed(activity: Activity?) {
-
-        }
-
-        override fun onActivityDestroyed(activity: Activity?) {
-
-        }
+/**
+ * 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
     }
-    registerActivityLifecycleCallbacks(listener)
+}
+
+inline fun <reified T : Any> T.toJson(): String {
+    return GsonUtils.toJson(this)
+}
+
+/**
+ * 在限定 interval 里只触发一次 action
+ */
+fun debounceActionWithInterval(id: Int, interval: Long = 300, action: (() -> Unit)? = null) {
+    if (!ClickUtils.isFastDoubleClick(id, interval)) {
+        action?.invoke()
+    }
+}
+
+fun View.debounceActionWithInterval(interval: Long = 300, action: (() -> Unit)? = null) {
+    debounceActionWithInterval(this.id, interval, action)
+}
+
+/**
+ * 告诉需要返回 true or false 的外层这个事件已经被消费（即返回 true）
+ */
+inline fun consume(f: () -> Unit): Boolean {
+    f()
+    return true
+}
+
+/**
+ * String related
+ */
+fun String.fromHtml(): Spanned {
+    return Html.fromHtml(this)
+}
+
+// 去掉文章/答案的插入内容
+fun String.removeInsertedContent(): String {
+    val textRegex = "(?s)<div class=\"gh-internal-content content-right\".*?</div>"
+
+    return this.replace(textRegex.toRegex(), "")
+}
+
+// 完全地清除所有 Html 格式
+fun String.clearHtmlFormatCompletely(): String {
+    return Html.fromHtml(this).toString().replace('\n', 32.toChar())
+            .replace(160.toChar(), 32.toChar()).replace(65532.toChar(), 32.toChar()).trim { it <= ' ' }
+}
+
+// 如果该字符串长度超过固定长度的话，从头开始截取固定长度并返回
+fun String.subStringIfPossible(length: Int): String {
+    return if (this.length > length) {
+        this.substring(0, length)
+    } else {
+        this
+    }
+}
+
+fun String.copyTextAndToast(toastText: String = "复制成功") {
+    val application = HaloApp.getInstance().application
+    val cmb = application.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+    cmb.text = this
+    Utils.toast(application, toastText)
+}
+
+fun Map<String, String>.createRequestBody(): RequestBody {
+    val json = GsonUtils.toJson(this)
+    return RequestBody.create(MediaType.parse("application/json"), json)
+}
+
+// 对在浏览器(WebView)显示的路径进行转码
+fun String.decodeURI(): String {
+    return URI(null, null, this, null).rawPath
 }

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

@@ -0,0 +1,100 @@
+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"
+
+    var gameCollectionList: List<SubjectEntity> = arrayListOf()
+
+    init {
+        loadSavedRepository()
+    }
+
+    /**
+     * 获取游戏补充库
+     */
+    @JvmStatic
+    fun getGameRepository(context: Context) {
+
+        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: HashSet<String>): GameEntity? {
+        collectionId?.let {
+            val collection = gameCollectionList.find { it.id == collectionId }
+            collection?.let {
+                val game = collection.data?.find { game -> isThisGameUnique(game, gameIdList) }
+                game?.let {
+                    collection.data?.remove(game)
+                    // 产品说要记录补充专题的曝光数，所以这个游戏附带了所在专题的名字
+                    game.subjectName = collection.name
+                    return game
+                }
+            }
+        }
+        return null
+    }
+
+    private fun isThisGameUnique(game: GameEntity, gameIdList: HashSet<String>): Boolean {
+        // 若该补充游戏已经存在关联关系，判定为非唯一
+        for (relatedId in game.relatedGameIds!!) {
+            gameIdList.contains(relatedId)
+            return false
+        }
+        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,14 +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.entity.PluginLocation;
-import com.gh.gamecenter.manager.PackageManager;
+import com.gh.gamecenter.entity.SettingsEntity;
+import com.gh.gamecenter.manager.PackagesManager;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.DownloadStatus;
 
@@ -71,15 +72,18 @@ public class GameUtils {
         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) {
@@ -91,10 +95,10 @@ 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())
@@ -107,19 +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) {
             if (gameEntity.getApk().size() == 1) {
-                return "启动";
+                return context.getString(R.string.launch);
             } else {
-                return "打开";
+                return context.getString(R.string.open);
             }
         } else {
-            return "下载";
+            return context.getString(R.string.download);
         }
     }
 

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

@@ -16,9 +16,9 @@ import com.sina.weibo.sdk.auth.Oauth2AccessToken;
 import com.sina.weibo.sdk.auth.WbAuthListener;
 import com.sina.weibo.sdk.auth.WbConnectErrorMessage;
 import com.sina.weibo.sdk.auth.sso.SsoHandler;
-import com.tencent.mm.sdk.openapi.IWXAPI;
-import com.tencent.mm.sdk.openapi.SendAuth;
-import com.tencent.mm.sdk.openapi.WXAPIFactory;
+import com.tencent.mm.opensdk.modelmsg.SendAuth;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 import com.tencent.tauth.IUiListener;
 import com.tencent.tauth.Tencent;
 import com.tencent.tauth.UiError;
@@ -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/GhMatisseFilter.kt

@@ -0,0 +1,20 @@
+package com.gh.common.util
+
+import android.content.Context
+import com.zhihu.matisse.MimeType
+import com.zhihu.matisse.filter.Filter
+import com.zhihu.matisse.internal.entity.IncapableCause
+import com.zhihu.matisse.internal.entity.Item
+
+class GhMatisseFilter : Filter() {
+
+    override fun constraintTypes(): MutableSet<MimeType> {
+        return MimeType.ofVideo()
+    }
+
+    override fun filter(context: Context?, item: Item?): IncapableCause? {
+        if (!needFiltering(context, item)) return null
+        return IncapableCause(IncapableCause.TOAST, "暂不支持视频")
+    }
+
+}

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

@@ -1,45 +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 {
-        @JvmStatic
-        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)
+//    }
+
+    @JvmStatic
+    fun toJson(any: Any?): String {
+        return gson.toJson(any)
     }
-
-    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)
-    }
-}
-
-// Use Kotlin Extension to do the same trick.
-inline fun <reified T : Any> String.fromObject(): T {
-    return GsonUtils.getInstance().mGson.fromJson(this, T::class.java)
-}
-
-inline fun <reified T : Any> T.toJson(): String {
-    return GsonUtils.getInstance().mGson.toJson(this)
 }

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

@@ -1,36 +0,0 @@
-package com.gh.common.util;
-
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-
-public class HMACUtils {
-
-    public static String encrypt(String data, String key) {
-        try {
-            SecretKeySpec signingKey = new SecretKeySpec(key.getBytes(), "HmacSHA256");
-            Mac mac = Mac.getInstance("HmacSHA256");
-            mac.init(signingKey);
-            return byte2hex(mac.doFinal(data.getBytes()));
-        } catch (NoSuchAlgorithmException | InvalidKeyException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    private static String byte2hex(byte[] ciphertext) {
-        StringBuilder builder = new StringBuilder();
-        String stmp;
-        for (int i = 0; ciphertext != null && i < ciphertext.length; i++) {
-            stmp = Integer.toHexString(ciphertext[i] & 0XFF);
-            if (stmp.length() == 1) {
-                builder.append('0');
-            }
-            builder.append(stmp);
-        }
-        return builder.toString().toLowerCase();
-    }
-
-}

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

@@ -1,158 +0,0 @@
-/*
- * Copyright (C) 2015 Baidu, Inc. All Rights Reserved.
- */
-package com.gh.common.util;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-
-import java.io.File;
-import java.lang.reflect.Array;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-
-import dalvik.system.DexClassLoader;
-import dalvik.system.PathClassLoader;
-
-/* compiled from: ProGuard */
-public final class HotFix {
-
-    public static void patch(Context context, String patchDexFile, String patchClassName) {
-        if (patchDexFile != null && new File(patchDexFile).exists()) {
-            try {
-                if (hasLexClassLoader()) {
-                    injectInAliyunOs(context, patchDexFile, patchClassName);
-                } else if (hasDexClassLoader()) {
-                    injectAboveEqualApiLevel14(context, patchDexFile, patchClassName);
-                } else {
-                    injectBelowApiLevel14(context, patchDexFile, patchClassName);
-                }
-            } catch (Throwable th) {
-            }
-        }
-    }
-
-    private static boolean hasLexClassLoader() {
-        try {
-            Class.forName("dalvik.system.LexClassLoader");
-            return true;
-        } catch (ClassNotFoundException e) {
-            return false;
-        }
-    }
-
-    private static void injectInAliyunOs(Context context, String patchDexFile, String patchClassName)
-            throws ClassNotFoundException, NoSuchMethodException, IllegalAccessException, InvocationTargetException,
-            InstantiationException, NoSuchFieldException {
-        PathClassLoader obj = (PathClassLoader) context.getClassLoader();
-        String replaceAll = new File(patchDexFile).getName().replaceAll("\\.[a-zA-Z0-9]+", ".lex");
-        Class cls = Class.forName("dalvik.system.LexClassLoader");
-        Object newInstance =
-                cls.getConstructor(new Class[]{String.class, String.class, String.class, ClassLoader.class}).newInstance(
-                        new Object[]{context.getDir("dex", 0).getAbsolutePath() + File.separator + replaceAll,
-                                context.getDir("dex", 0).getAbsolutePath(), patchDexFile, obj});
-        cls.getMethod("loadClass", new Class[]{String.class}).invoke(newInstance, new Object[]{patchClassName});
-        setField(obj, PathClassLoader.class, "mPaths",
-                appendArray(getField(obj, PathClassLoader.class, "mPaths"), getField(newInstance, cls, "mRawDexPath")));
-        setField(obj, PathClassLoader.class, "mFiles",
-                combineArray(getField(obj, PathClassLoader.class, "mFiles"), getField(newInstance, cls, "mFiles")));
-        setField(obj, PathClassLoader.class, "mZips",
-                combineArray(getField(obj, PathClassLoader.class, "mZips"), getField(newInstance, cls, "mZips")));
-        setField(obj, PathClassLoader.class, "mLexs",
-                combineArray(getField(obj, PathClassLoader.class, "mLexs"), getField(newInstance, cls, "mDexs")));
-    }
-
-    private static boolean hasDexClassLoader() {
-        try {
-            Class.forName("dalvik.system.BaseDexClassLoader");
-            return true;
-        } catch (ClassNotFoundException e) {
-            return false;
-        }
-    }
-
-    private static void injectAboveEqualApiLevel14(Context context, String str, String str2)
-            throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException {
-        PathClassLoader pathClassLoader = (PathClassLoader) context.getClassLoader();
-        Object a = combineArray(getDexElements(getPathList(pathClassLoader)),
-                getDexElements(getPathList(
-                        new DexClassLoader(str, context.getDir("dex", 0).getAbsolutePath(), str, context.getClassLoader()))));
-        Object a2 = getPathList(pathClassLoader);
-        setField(a2, a2.getClass(), "dexElements", a);
-        pathClassLoader.loadClass(str2);
-    }
-
-    @TargetApi(14)
-    private static void injectBelowApiLevel14(Context context, String str, String str2)
-            throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException {
-        PathClassLoader obj = (PathClassLoader) context.getClassLoader();
-        DexClassLoader dexClassLoader =
-                new DexClassLoader(str, context.getDir("dex", 0).getAbsolutePath(), str, context.getClassLoader());
-        dexClassLoader.loadClass(str2);
-        setField(obj, PathClassLoader.class, "mPaths",
-                appendArray(getField(obj, PathClassLoader.class, "mPaths"), getField(dexClassLoader, DexClassLoader.class,
-                        "mRawDexPath")
-                ));
-        setField(obj, PathClassLoader.class, "mFiles",
-                combineArray(getField(obj, PathClassLoader.class, "mFiles"), getField(dexClassLoader, DexClassLoader.class,
-                        "mFiles")
-                ));
-        setField(obj, PathClassLoader.class, "mZips",
-                combineArray(getField(obj, PathClassLoader.class, "mZips"), getField(dexClassLoader, DexClassLoader.class,
-                        "mZips")));
-        setField(obj, PathClassLoader.class, "mDexs",
-                combineArray(getField(obj, PathClassLoader.class, "mDexs"), getField(dexClassLoader, DexClassLoader.class,
-                        "mDexs")));
-        obj.loadClass(str2);
-    }
-
-    private static void setField(Object obj, Class cls, String str, Object obj2)
-            throws NoSuchFieldException, IllegalAccessException {
-        Field declaredField = cls.getDeclaredField(str);
-        declaredField.setAccessible(true);
-        declaredField.set(obj, obj2);
-    }
-
-    private static Object appendArray(Object obj, Object obj2) {
-        Class componentType = obj.getClass().getComponentType();
-        int length = Array.getLength(obj);
-        Object newInstance = Array.newInstance(componentType, length + 1);
-        Array.set(newInstance, 0, obj2);
-        for (int i = 1; i < length + 1; i++) {
-            Array.set(newInstance, i, Array.get(obj, i - 1));
-        }
-        return newInstance;
-    }
-
-    private static Object getField(Object obj, Class cls, String str)
-            throws NoSuchFieldException, IllegalAccessException {
-        Field declaredField = cls.getDeclaredField(str);
-        declaredField.setAccessible(true);
-        return declaredField.get(obj);
-    }
-
-    private static Object combineArray(Object obj, Object obj2) {
-        Class componentType = obj2.getClass().getComponentType();
-        int length = Array.getLength(obj2);
-        int length2 = Array.getLength(obj) + length;
-        Object newInstance = Array.newInstance(componentType, length2);
-        for (int i = 0; i < length2; i++) {
-            if (i < length) {
-                Array.set(newInstance, i, Array.get(obj2, i));
-            } else {
-                Array.set(newInstance, i, Array.get(obj, i - length));
-            }
-        }
-        return newInstance;
-    }
-
-    private static Object getDexElements(Object obj) throws NoSuchFieldException, IllegalAccessException {
-        return getField(obj, obj.getClass(), "dexElements");
-    }
-
-    private static Object getPathList(Object obj) throws ClassNotFoundException, NoSuchFieldException,
-            IllegalAccessException {
-        return getField(obj, Class.forName("dalvik.system.BaseDexClassLoader"), "pathList");
-    }
-
-}

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

@@ -9,22 +9,9 @@ import java.util.regex.Pattern;
  * Created by khy on 27/12/17.
  */
 
-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 class HtmlUtils {
 
     public static String stripHtml(String htmlStr) {
-
-
         if (TextUtils.isEmpty(htmlStr)) return "";
 
         String regEx_script = "<script[^>]*?>[\\s\\S]*?<\\/script>"; //定义script的正则表达式
@@ -45,5 +32,4 @@ public class AskUtils {
 
         return htmlStr.trim(); //返回文本字符串
     }
-
 }

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

@@ -2,9 +2,11 @@ package com.gh.common.util
 
 import android.content.Context
 import android.content.res.Resources
+import android.graphics.Bitmap
 import android.graphics.drawable.Animatable
 import android.graphics.drawable.ColorDrawable
 import android.net.Uri
+import android.os.Build
 import android.support.annotation.DrawableRes
 import android.support.v4.content.ContextCompat
 import com.facebook.common.executors.CallerThreadExecutor
@@ -20,6 +22,7 @@ import com.facebook.imagepipeline.request.ImageRequest
 import com.facebook.imagepipeline.request.ImageRequestBuilder
 import com.gh.common.constant.Config
 import com.gh.gamecenter.R
+import java.io.ByteArrayOutputStream
 
 
 object ImageUtils {
@@ -231,12 +234,23 @@ object ImageUtils {
      */
     @JvmStatic
     fun display(view: SimpleDraweeView?, url: String?) {
-        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))
+        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))
+                    }
+                }
             }
         }
     }
@@ -247,7 +261,10 @@ object ImageUtils {
         if (width != null && width > 0) {
             val transformUrlX2 = addLimitWidth(url, width * 2)
             val transformUrlX1 = addLimitWidth(url, width)
-            if (NetworkUtils.isWifiOr4GConnected(context)) {
+            // 当网络为 WIFI 或 4G， 且系统版本大于 5.0 && 手机内存大于 1G 才用高清图片
+            if (NetworkUtils.isWifiOr4GConnected(context)
+                    && Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP
+                    && DeviceUtils.getTotalRamSizeOfDevice(context) > 1000) {
                 transformUrl = transformUrlX2
             } else {
                 // 检查X2大图是否被缓存
@@ -278,6 +295,24 @@ object ImageUtils {
         }
     }
 
+    @JvmStatic
+    fun bmpToByteArray(bmp: Bitmap, needRecycle: Boolean): ByteArray {
+        val output = ByteArrayOutputStream()
+        bmp.compress(Bitmap.CompressFormat.PNG, 100, output)
+        if (needRecycle) {
+            bmp.recycle()
+        }
+
+        val result = output.toByteArray()
+        try {
+            output.close()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+
+        return result
+    }
+
 
     @JvmStatic
     fun display(draweeView: SimpleDraweeView, @DrawableRes res: Int?) {

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

@@ -64,15 +64,13 @@ public class InstallUtils {
                                 keys.add(packageName);
 
                                 DownloadEntity downloadEntity = DownloadManager.getInstance(context).getDownloadEntityByPackageName(packageName);
-                                String installVersion = PackageUtils.getVersionByPackage(context, packageName);
+                                String installVersion = PackageUtils.getVersionByPackage(packageName);
                                 if (!TextUtils.isEmpty(installVersion) && downloadEntity != null &&
                                         installVersion.equals(downloadEntity.getVersionName())) {
                                     if (!downloadEntity.isPluggable() || PackageUtils.isSignature(context, packageName)) {
                                         EventBus.getDefault().post(new EBPackage("安装", packageName));
                                     }
-
                                 }
-
                             }
                         }
                         for (String key : keys) {
@@ -109,7 +107,7 @@ public class InstallUtils {
         if (mInstance == null) {
             synchronized (InstallUtils.class) {
                 if (mInstance == null) {
-                    mInstance = new InstallUtils(context);
+                    mInstance = new InstallUtils(context.getApplicationContext());
                 }
             }
         }

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

@@ -1,32 +0,0 @@
-package com.gh.common.util;
-
-import android.support.v4.content.ContextCompat;
-import android.widget.TextView;
-
-import com.gh.gamecenter.R;
-
-/**
- * Created by khy on 2017/3/19.
- */
-public class KaiFuUtils {
-
-    public static void setKaiFuType(TextView textView, String type) {
-        if (type == null) return;
-        textView.setText(type);
-        textView.setBackgroundColor(ContextCompat.getColor(textView.getContext(), R.color.tag_yellow));
-//        switch (type) {
-//            case "不删档内测":
-//                textView.setBackgroundColor(ContextCompat.getColor(textView.getContext(), R.color.content));
-//                break;
-//            case "删档内测":
-//                textView.setBackgroundColor(ContextCompat.getColor(textView.getContext(), R.color.content));
-//                break;
-//            case "公测":
-//                textView.setBackgroundColor(ContextCompat.getColor(textView.getContext(), R.color.tag_yellow));
-//                break;
-//            default:
-//                textView.setBackgroundColor(ContextCompat.getColor(textView.getContext(), R.color.tag_yellow));
-//                break;
-//        }
-    }
-}

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,6 +33,7 @@ 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;
@@ -86,7 +84,7 @@ public class LibaoUtils {
                 .subscribe(new JSONObjectResponse() {
                     @Override
                     public void onResponse(JSONObject response) {
-                        listener.postSucced(response);
+                        listener.postSucceed(response);
                     }
 
                     @Override
@@ -107,7 +105,7 @@ public class LibaoUtils {
                 .subscribe(new JSONObjectResponse() {
                     @Override
                     public void onResponse(JSONObject response) {
-                        listener.postSucced(response);
+                        listener.postSucceed(response);
                     }
 
                     @Override
@@ -125,7 +123,7 @@ public class LibaoUtils {
                 .subscribe(new Response<ResponseBody>() {
                     @Override
                     public void onResponse(ResponseBody response) {
-                        listener.postSucced(response);
+                        listener.postSucceed(response);
                     }
 
                     @Override
@@ -142,7 +140,7 @@ public class LibaoUtils {
                 .subscribe(new Response<List<LibaoStatusEntity>>() {
                     @Override
                     public void onResponse(List<LibaoStatusEntity> response) {
-                        listener.postSucced(response);
+                        listener.postSucceed(response);
                     }
 
                     @Override
@@ -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 postSucceed(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,108 +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;
-                                        } else if (exception.code() == 401) {
-                                            return;
-                                        }
-                                    }
-                                    Utils.toast(context, "发生异常");
-                                }
-                            });
-                            break;
-                    }
-                });
-            }
+                                Utils.toast(context, "发生异常");
+                            }
+                        });
+                        break;
+                }
+            });
         });
     }
 
@@ -423,7 +431,7 @@ public class LibaoUtils {
 
         postLibaoLing(context, libaoEntity.getId(), new PostLibaoListener() {
             @Override
-            public void postSucced(Object response) {
+            public void postSucceed(Object response) {
                 if (loadingDialog != null) loadingDialog.dismiss();
 
                 JSONObject responseBody = (JSONObject) response;
@@ -450,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);
             }
@@ -524,12 +526,8 @@ 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;
@@ -557,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);
     }
 
@@ -634,7 +629,7 @@ public class LibaoUtils {
 
 
     public interface PostLibaoListener {
-        void postSucced(Object response);
+        void postSucceed(Object response);
 
         void postFailed(Throwable error);
     }

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

@@ -6,7 +6,9 @@ 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;
@@ -22,8 +24,12 @@ import org.json.JSONObject;
  */
 public class LogUtils {
 
-    public static void uploadCommunityArticle(String tracers, String articleId, String articleTitle,
-                                              int readTime, CommunityEntity community) {
+    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");
@@ -33,11 +39,22 @@ public class LogUtils {
             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(HaloApp.getInstance().getApplication(), object);
+        upload(object);
     }
 
     public static void uploadDevice(LunchType launchType) {
@@ -47,54 +64,84 @@ public class LogUtils {
             object.put("subject", "halo_device");
             object.put("launch_time", Utils.getTime(application));
             object.put("launch_type", launchType.name());
-            object.put("network", DeviceUtils.getNetwork(application));
-            object.put("device_model", android.os.Build.MODEL);
             object.put("manufacture", Build.MANUFACTURER);
-            object.put("device_system", android.os.Build.VERSION.RELEASE);
         } catch (JSONException e) {
             e.printStackTrace();
         }
 
-        upload(application, object);
+        upload(object);
     }
 
-    public static void uploadAnswerReadTime(String tracers, int readTime, String answerId, Questions questions) {
+    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", UserManager.getInstance().getCommunity().getId());
-            object.put("community_name", UserManager.getInstance().getCommunity().getName());
+            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(HaloApp.getInstance().getApplication(), object);
+        upload(object);
     }
 
-    public static void uploadQuestionReadTime(String tracers, int readTime, Questions questions) {
+    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", UserManager.getInstance().getCommunity().getId());
-            object.put("community_name", UserManager.getInstance().getCommunity().getName());
+            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(HaloApp.getInstance().getApplication(), object);
+        upload(object);
     }
 
-    public static void uploadSearch(Context context, String searchKey) {
-        if (TextUtils.isEmpty(searchKey) || context == null) return;
+    public static void uploadSearch(String searchKey) {
+        if (TextUtils.isEmpty(searchKey)) return;
 
         JSONObject object = new JSONObject();
         try {
@@ -106,12 +153,11 @@ public class LogUtils {
             e.printStackTrace();
         }
 
-        upload(context, object);
+        upload(object);
     }
 
 
-    public static void communityRefresh(Context context, int dataCount, boolean manualRefresh) {
-        if (context == null) return;
+    public static void communityRefresh(int dataCount, boolean manualRefresh) {
         JSONObject object = new JSONObject();
         try {
             object.put("subject", "community_refresh");
@@ -119,46 +165,44 @@ public class LogUtils {
             object.put("refresh_type", "recommend");
             object.put("refresh_way", manualRefresh ? "manual" : "auto");
             object.put("data_count", dataCount);
-            object.put("user_id", UserManager.getInstance().getUserId());
-            object.put("network", DeviceUtils.getNetwork(context));
-            object.put("version", PackageUtils.getPatchVersionName());
-            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("device_system", android.os.Build.VERSION.RELEASE);
-            object.put("device_model", android.os.Build.MODEL);
-            object.put("time", Utils.getTime(context));
-
         } catch (JSONException e) {
             e.printStackTrace();
         }
 
-        upload(context, object);
+        upload(object);
     }
 
-    public static void login(Context context, String loginStep, String loginType) {
-        if (context == null) return;
+    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);
-            object.put("network", DeviceUtils.getNetwork(context));
         } catch (JSONException e) {
             e.printStackTrace();
         }
 
-        upload(context, object);
+        upload(object);
     }
 
-    private static void upload(Context context, JSONObject object) {
-        if (context == null) return;
+    private static void upload(JSONObject object) {
+        if (BuildConfig.DEBUG) {
+            Utils.log("LogUtils->" + object.toString());
+        }
+
+        Context context = HaloApp.getInstance().getApplication();
         try {
-            object.put("version", PackageUtils.getPatchVersionName());
+            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("imei", Util_System_Phone_State.getDeviceId(context));
             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();
         }

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

@@ -1,9 +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;
 import com.gh.gamecenter.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
@@ -12,8 +10,6 @@ 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;
@@ -106,64 +102,6 @@ public class LoginUtils {
                 });
     }
 
-    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 (JSONException e) {
-            Utils.toast(context, R.string.post_failure_hint);
-            e.printStackTrace();
-        }
-    }
 
     public static void captchaErrorHint(Context context, JSONObject content) {
         try {
@@ -314,12 +252,18 @@ public class LoginUtils {
             case 403016:
                 Utils.toast(context, "内容违规，请修改后再保存");
                 break;
+            case 403021:
+                Utils.toast(context, "内容可能包含敏感信息，请修改后再提交");
+                break;
             case 403801:
                 Utils.toast(context, "获取验证码太频繁，请稍后再试");
                 break;
             case 403204:
                 Utils.toast(context, "获取验证码太频繁，请稍后再试");
                 break;
+            case 400212:
+                Utils.toast(context, "请输入正确的手机号");
+                break;
             default:
                 Utils.toast(context, code + "");
                 break;

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

@@ -11,11 +11,11 @@ import android.graphics.Matrix;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.Gravity;
 import android.view.KeyEvent;
-import android.support.v4.content.*;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -28,19 +28,17 @@ import com.gh.common.constant.Config;
 import com.gh.gamecenter.R;
 import com.lightgame.utils.Utils;
 import com.tencent.connect.share.QQShare;
-import com.tencent.mm.sdk.openapi.IWXAPI;
-import com.tencent.mm.sdk.openapi.SendMessageToWX;
-import com.tencent.mm.sdk.openapi.WXAPIFactory;
-import com.tencent.mm.sdk.openapi.WXImageObject;
-import com.tencent.mm.sdk.openapi.WXMediaMessage;
-import com.tencent.mm.sdk.platformtools.Util;
+import com.tencent.mm.opensdk.modelmsg.SendMessageToWX;
+import com.tencent.mm.opensdk.modelmsg.WXImageObject;
+import com.tencent.mm.opensdk.modelmsg.WXMediaMessage;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 import com.tencent.tauth.IUiListener;
 import com.tencent.tauth.Tencent;
 import com.tencent.tauth.UiError;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Date;
@@ -255,6 +253,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 +289,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();
@@ -298,7 +306,7 @@ public class MessageShareUtils {
         req.scene = SendMessageToWX.Req.WXSceneTimeline;
 
         Bitmap compressBp = compressBitmap(shareBm);
-        msg.thumbData = Util.bmpToByteArray(compressBp, true);
+        msg.thumbData = ImageUtils.bmpToByteArray(compressBp, true);
         mIWXAPI.sendReq(req);
 
         if (mPopupWindow == null) return;
@@ -366,7 +374,7 @@ public class MessageShareUtils {
                     }
                 }
             }
-        } catch (FileNotFoundException e) {
+        } catch (Exception e) {
             Utils.log("消息分享异常" + e.toString());
             e.printStackTrace();
         } finally {

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

@@ -5,6 +5,7 @@ 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.*
 
@@ -13,6 +14,12 @@ 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]
@@ -22,9 +29,29 @@ object MtaHelper {
                 }
             }
         }
+
+        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)
+    }
+
     /**
      * 这个方法除了记录传进来的入参还会附带一些基本的设备信息
      */
@@ -47,8 +74,11 @@ object MtaHelper {
         prop.setProperty("机型", Build.MODEL)
         prop.setProperty("厂商", Build.MANUFACTURER)
         prop.setProperty("Android版本", Build.VERSION.RELEASE)
-        prop.setProperty("GID", HaloApp.getInstance().gid)
+        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

@@ -3,6 +3,7 @@ package com.gh.common.util;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import android.telephony.TelephonyManager;
 
 public class NetworkUtils {
 
@@ -52,6 +53,12 @@ public class NetworkUtils {
         return false;
     }
 
+    public static boolean isWifiOr4GOr3GConnected(Context context) {
+        String network = DeviceUtils.getNetwork(context);
+        return "WIFI".equals(network) || "4G".equals(network) || "3G".equals(network);
+    }
+
+
     /**
      * 判断MOBILE网络是否可用
      *
@@ -113,4 +120,48 @@ public class NetworkUtils {
         return "NONE";
     }
 
+    /**
+     * 获取当前移动网络连接的类型信息（当连接的网络是移动网络时使用）
+     *
+     * @param context 上下文
+     * @return 当前移动网络连接的类型信息
+     */
+    public static String getMobileNetworkType(Context context) {
+        TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        NetworkInfo info = connectivityManager.getActiveNetworkInfo();
+
+        if (info == null) return "unknown";
+
+        switch (info.getType()) {
+            // Unknown
+            case TelephonyManager.NETWORK_TYPE_UNKNOWN:
+                return "unknown";
+            // Cellular Data–2G
+            case TelephonyManager.NETWORK_TYPE_EDGE:
+            case TelephonyManager.NETWORK_TYPE_GPRS:
+            case TelephonyManager.NETWORK_TYPE_CDMA:
+            case TelephonyManager.NETWORK_TYPE_IDEN:
+            case TelephonyManager.NETWORK_TYPE_1xRTT:
+                return "2G";
+            // Cellular Data–3G
+            case TelephonyManager.NETWORK_TYPE_UMTS:
+            case TelephonyManager.NETWORK_TYPE_HSDPA:
+            case TelephonyManager.NETWORK_TYPE_HSPA:
+            case TelephonyManager.NETWORK_TYPE_HSPAP:
+            case TelephonyManager.NETWORK_TYPE_HSUPA:
+            case TelephonyManager.NETWORK_TYPE_EVDO_0:
+            case TelephonyManager.NETWORK_TYPE_EVDO_A:
+            case TelephonyManager.NETWORK_TYPE_EVDO_B:
+                return "3G";
+            // Cellular Data–4G
+            case TelephonyManager.NETWORK_TYPE_LTE:
+                return "4G";
+
+            default:
+                return "unknown";
+        }
+
+    }
+
 }

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

@@ -1,18 +1,18 @@
 package com.gh.common.util
 
-import java.math.BigDecimal
+import java.text.DecimalFormat
 
 object NumberUtils {
 
     @JvmStatic
     fun transSimpleCount(count: Int): String {
         val s: String
-        if (count > 10000) {
+        s = if (count > 100000) {
             val number = count / 10000f
-            val bd = BigDecimal(number.toDouble())
-            s = bd.setScale(1, BigDecimal.ROUND_DOWN).toString() + "W"
+            val fmt = DecimalFormat("#")
+            fmt.format(number) + "万"
         } else {
-            s = count.toString()
+            count.toString()
         }
         return s
     }

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

@@ -0,0 +1,44 @@
+package com.gh.common.util
+
+import android.app.Dialog
+import android.content.Context
+import android.graphics.Color
+import android.support.v4.content.ContextCompat
+import android.view.Window
+import android.widget.LinearLayout
+import android.widget.TextView
+import com.gh.gamecenter.R
+
+object OptionDialogHelper {
+
+    fun showOptionDialog(context: Context, typeList: List<String>, callback: (String) -> Unit) {
+        val dialog = Dialog(context)
+        val container = LinearLayout(context)
+        container.orientation = LinearLayout.VERTICAL
+        container.setBackgroundColor(Color.WHITE)
+        container.setPadding(0, DisplayUtils.dip2px(context, 12f), 0, DisplayUtils.dip2px(context, 12f))
+
+        for (type in typeList) {
+            val reportTv = TextView(context)
+            reportTv.text = type
+            reportTv.textSize = 17f
+            reportTv.setTextColor(ContextCompat.getColor(context, R.color.title))
+            reportTv.setBackgroundResource(R.drawable.textview_white_style)
+            val widthPixels = context.resources.displayMetrics.widthPixels
+            reportTv.layoutParams = 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 {
+                callback.invoke(reportTv.text.toString())
+                dialog.cancel()
+            }
+        }
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
+        dialog.setContentView(container)
+        dialog.show()
+    }
+}

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

@@ -2,45 +2,80 @@ package com.gh.common.util
 
 import android.content.Context
 import android.content.pm.ApplicationInfo
-import com.gh.common.AppExecutor
 import com.gh.common.constant.Config
+import com.gh.gamecenter.entity.SettingsEntity
 import com.halo.assistant.HaloApp
 
 object PackageHelper {
 
-    //  黑名单包名，用于区分像 Xposed Installer 那些工具的包名
-    var excludePackageNameList = arrayListOf<String>()
+    // 评论黑名单包名列表，避免用户安装了 Xposed Installer 这样的工具，也能在包含该安装包的游戏详情页评论
+    var commentPackageNameBlackList = arrayListOf<String>()
 
+    // 关闭下载的包列表
+    var downloadPackageNameBlackList = arrayListOf<String>()
+
+    // 本地已安装的包去掉关闭下载的包后的列表
+    var validLocalPackageNameSet = hashSetOf<String>()
+
+    // 游戏包名匹配列表
+    var relatedPackageList = arrayListOf<SettingsEntity.GameWithPackages>()
+
+    // 本地已安装包的列表
     var localPackageNameSet = hashSetOf<String>()
+        get() {
+            return if (field.isEmpty()) {
+                field = getAllPackageName(HaloApp.getInstance().application)
+                field
+            } else {
+                field
+            }
+        }
 
     @JvmStatic
     fun refreshLocalPackageList() {
-        AppExecutor.ioExecutor.execute {
-            localPackageNameSet = getAllPackageName(HaloApp.getInstance().application)
-        }
+        localPackageNameSet = getAllPackageName(HaloApp.getInstance().application)
+        updateValidPackageNameList()
     }
 
     @JvmStatic
-    fun initExcludePackageName() {
+    fun initList() {
         Config.getSettings()?.gameCommentBlackList?.let {
-            excludePackageNameList = ArrayList(it)
+            commentPackageNameBlackList = ArrayList(it)
         }
+        Config.getSettings()?.gameDownloadBlackList?.let {
+            downloadPackageNameBlackList = ArrayList(it)
+        }
+        Config.getSettings()?.gamePackageMatch?.let {
+            relatedPackageList = ArrayList(it)
+        }
+
+        Config.getSettings()?.gameDownloadBlackList
+        updateValidPackageNameList()
+    }
+
+    private fun updateValidPackageNameList() {
+        validLocalPackageNameSet = localPackageNameSet.filterNot { p -> downloadPackageNameBlackList.contains(p) }.toHashSet()
     }
 
     /*
      * 获取所有已安装的软件的包名、版本(非系统应用)
      */
     private fun getAllPackageName(context: Context): HashSet<String> {
-        val list = HashSet<String>()
-        val packageInfos = context.applicationContext.packageManager.getInstalledPackages(0)
-        for (packageInfo in packageInfos) {
-            if (packageInfo.applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM == 0) {
-                if (context.packageName != packageInfo.packageName) {
-                    list.add(packageInfo.packageName)
+        val set = HashSet<String>()
+        return try {
+            val packageInfos = context.applicationContext.packageManager.getInstalledPackages(0)
+            for (packageInfo in packageInfos) {
+                if (packageInfo.applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM == 0) {
+                    if (context.packageName != packageInfo.packageName) {
+                        set.add(packageInfo.packageName)
+                    }
                 }
             }
+            set
+        } catch (e: Exception) {
+            e.printStackTrace()
+            set
         }
-        return list
     }
 
 }

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

@@ -15,11 +15,11 @@ import android.support.v4.content.FileProvider;
 import android.text.TextUtils;
 
 import com.g00fy2.versioncompare.Version;
-import com.gh.common.constant.Config;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.entity.GameUpdateEntity;
+import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
 
 import org.json.JSONArray;
@@ -49,12 +49,14 @@ public class PackageUtils {
         for (ApkEntity apkEntity : gameEntity.getApk()) {
             // 判断是否gh_version是否存在
             String gh_version = (String) PackageUtils.getMetaData(context, apkEntity.getPackageName(), "gh_version");
-            if (gh_version != null && apkEntity.getGhVersion() != null) {
+            Object gh_id = PackageUtils.getMetaData(context, apkEntity.getPackageName(), "gh_id");
+            if (gh_version != null && apkEntity.getGhVersion() != null && gh_id != null) {
 
                 // 确定这是一个插件游戏
                 if (!isAPluginGame) isAPluginGame = true;
                 gh_version = gh_version.substring(2);
-                if (Long.parseLong(gh_version) < Long.parseLong(apkEntity.getGhVersion()) && apkEntity.getForce()) {
+                if (Long.parseLong(gh_version) < Long.parseLong(apkEntity.getGhVersion()) && apkEntity.getForce()
+                        && gh_id.equals(gameEntity.getId())) {
                     GameUpdateEntity updateEntity = new GameUpdateEntity();
                     updateEntity.setId(gameEntity.getId());
                     updateEntity.setName(gameEntity.getName());
@@ -78,7 +80,7 @@ public class PackageUtils {
             for (ApkEntity apkEntity : gameEntity.getApkNormal()) {
 
                 String versionFromRequest = apkEntity.getVersion();
-                String versionFromInstalledApp = getVersionByPackage(context, apkEntity.getPackageName());
+                String versionFromInstalledApp = getVersionByPackage(apkEntity.getPackageName());
 
                 // 是否需要显示更新
                 boolean shouldShouldUpdate = apkEntity.getForce();
@@ -181,15 +183,15 @@ public class PackageUtils {
      * 启动安装应用程序
      */
     public static void launchSetup(final Context context, final String path) {
-        if (isCanLaunchSetup(context, path)) {
-            context.startActivity(PackageUtils.getInstallIntent(context, path));
-        } else {
-            DialogUtils.showPluginDialog(context, new DialogUtils.ConfirmListener() {
-                @Override
-                public void onConfirm() {
-                    context.startActivity(PackageUtils.getUninstallIntent(context, path));
-                }
-            });
+        try {
+            if (isCanLaunchSetup(context, path)) {
+                context.startActivity(PackageUtils.getInstallIntent(context, path));
+            } else {
+                DialogUtils.showPluginDialog(context,
+                        () -> context.startActivity(PackageUtils.getUninstallIntent(context, path)));
+            }
+        } catch (Exception e) {
+            Utils.toast(context, e.getMessage());
         }
     }
 
@@ -202,7 +204,7 @@ public class PackageUtils {
         if (TextUtils.isEmpty(packageName)) {
             return true;
         }
-        boolean isContain = com.gh.gamecenter.manager.PackageManager.INSTANCE.isInstalled(packageName);
+        boolean isContain = com.gh.gamecenter.manager.PackagesManager.INSTANCE.isInstalled(packageName);
         if (!isContain) {
             return true;
         }
@@ -292,16 +294,6 @@ public class PackageUtils {
         return 0;
     }
 
-    /**
-     * 数据统计或反馈用PatchVersionName
-     * 判断助手是否是第一次启动或版本更新提交的版本号用AppVersionName{@link PackageUtils#getVersionName()}
-     *
-     * @return 补丁包版本号
-     */
-    public static String getPatchVersionName() {
-        return Config.PATCH_VERSION_NAME;
-    }
-
     /*
      * 返回光环助手的版本信息
      */
@@ -312,23 +304,16 @@ public class PackageUtils {
     /*
      * 返回光环助手的版本code
      */
-    public static String getVersionCode(Context context) {
-        try {
-            PackageInfo pkgInfo = context.getApplicationContext().getPackageManager().getPackageInfo(
-                    context.getPackageName(), 0);
-            return String.valueOf(pkgInfo.versionCode);
-        } catch (NameNotFoundException e) {
-            e.printStackTrace();
-        }
-        return null;
+    public static int getVersionCode() {
+        return BuildConfig.VERSION_CODE;
     }
 
     /*
      * 获取apk的版本
      */
-    public static String getVersionByPackage(Context context, String packageName) {
+    public static String getVersionByPackage(String packageName) {
         try {
-            return context.getApplicationContext().getPackageManager().getPackageInfo(packageName,
+            return HaloApp.getInstance().getApplication().getPackageManager().getPackageInfo(packageName,
                     PackageManager.COMPONENT_ENABLED_STATE_DEFAULT).versionName;
         } catch (NameNotFoundException e) {
             e.printStackTrace();
@@ -386,6 +371,25 @@ public class PackageUtils {
         return jsonArray;
     }
 
+    public static JSONObject getAppBasicInfoByPackageName(String packageName) {
+        JSONObject jsonObject = new JSONObject();
+        PackageManager pm = HaloApp.getInstance().getApplication().getPackageManager();
+        try {
+            PackageInfo packageInfo = HaloApp.getInstance().getApplication().getPackageManager().getPackageInfo(packageName,
+                    PackageManager.COMPONENT_ENABLED_STATE_DEFAULT);
+            if ((packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
+                jsonObject.put("name", pm.getApplicationLabel(packageInfo.applicationInfo).toString());
+                jsonObject.put("package", packageName);
+                jsonObject.put("version", packageInfo.versionName);
+            }
+            return jsonObject;
+        } catch (JSONException | NameNotFoundException e) {
+            e.printStackTrace();
+            return jsonObject;
+        }
+    }
+
+
     /*
      * 启动应用
      */

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

@@ -133,7 +133,7 @@ public class PlatformUtils {
             }
         }
 
-        updataPlatform(platformMap, platformPicMap, platformPicUrlMap,
+        updatePlatform(platformMap, platformPicMap, platformPicUrlMap,
                 platformColorMap);
     }
 
@@ -184,7 +184,7 @@ public class PlatformUtils {
         }
     }
 
-    private void updataPlatform(ArrayMap<String, String> pMap,
+    private void updatePlatform(ArrayMap<String, String> pMap,
                                 ArrayMap<String, Integer> pPMap, ArrayMap<String, String> pUMap,
                                 ArrayMap<String, String> pCMap) {
         platformMap = pMap;
@@ -236,7 +236,10 @@ public class PlatformUtils {
         if (TextUtils.isEmpty(platformName)) {
             getPlatform();
         }
-        return platformName;
+        if (!TextUtils.isEmpty(platformName)) {
+            return platformName;
+        }
+        return platform;
     }
 
     public void getPlatform() {

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

@@ -0,0 +1,47 @@
+package com.gh.common.util
+
+import android.content.Context
+import com.gh.gamecenter.receiver.UmengMessageReceiver
+import com.gh.gamecenter.retrofit.BiResponse
+import com.gh.gamecenter.retrofit.RetrofitManager
+import io.reactivex.schedulers.Schedulers
+import okhttp3.MediaType
+import okhttp3.RequestBody
+import okhttp3.ResponseBody
+
+object PushHelper {
+
+    /**
+     * 提交推送点击事件，会尝试从 SP 读取之前失败的一并提交
+     */
+    @JvmStatic
+    fun postPushClickAction(context: Context, clickEvent: UmengMessageReceiver.ClickEvent? = null) {
+        val clickEventList = arrayListOf<UmengMessageReceiver.ClickEvent>()
+
+        clickEvent?.let { clickEventList.add(it) }
+
+        val failedClickEventList = SPUtils.getString(UmengMessageReceiver.SP_CLICK_EVENT)
+                .toObject<ArrayList<UmengMessageReceiver.ClickEvent>>()
+
+        failedClickEventList?.let { clickEventList.addAll(it) }
+
+        // 没有要提交的事件
+        if (clickEventList.size == 0) return
+
+        val body = RequestBody.create(MediaType.parse("application/json"), clickEventList.toJson())
+
+        RetrofitManager.getInstance(context)
+                .api
+                .postUmengReceiveInfo(body)
+                .subscribeOn(Schedulers.io())
+                .subscribe(object : BiResponse<ResponseBody>() {
+                    override fun onSuccess(data: ResponseBody) {
+                        SPUtils.setString(UmengMessageReceiver.SP_CLICK_EVENT, "")
+                    }
+
+                    override fun onFailure(exception: Exception) {
+                        SPUtils.setString(UmengMessageReceiver.SP_CLICK_EVENT, clickEventList.toJson())
+                    }
+                })
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.gh.common.util
+
+import android.app.ActivityManager
+import android.content.Context
+
+object ServiceUtils {
+
+    fun isServiceRunningInForeground(context: Context, serviceClass: Class<*>): Boolean {
+        val manager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+        for (service in manager.getRunningServices(Integer.MAX_VALUE)) {
+            if (serviceClass.name == service.service.className) {
+                if (service.foreground) {
+                    return true
+                }
+            }
+        }
+        return false
+    }
+
+}

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

@@ -37,12 +37,11 @@ import com.sina.weibo.sdk.WbSdk;
 import com.sina.weibo.sdk.auth.AuthInfo;
 import com.tencent.connect.share.QQShare;
 import com.tencent.connect.share.QzoneShare;
-import com.tencent.mm.sdk.openapi.IWXAPI;
-import com.tencent.mm.sdk.openapi.SendMessageToWX;
-import com.tencent.mm.sdk.openapi.WXAPIFactory;
-import com.tencent.mm.sdk.openapi.WXMediaMessage;
-import com.tencent.mm.sdk.openapi.WXWebpageObject;
-import com.tencent.mm.sdk.platformtools.Util;
+import com.tencent.mm.opensdk.modelmsg.SendMessageToWX;
+import com.tencent.mm.opensdk.modelmsg.WXMediaMessage;
+import com.tencent.mm.opensdk.modelmsg.WXWebpageObject;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 import com.tencent.tauth.IUiListener;
 import com.tencent.tauth.Tencent;
 import com.tencent.tauth.UiError;
@@ -251,6 +250,12 @@ public class ShareUtils {
     //微信好友分享
     private void wechatShare() {
         Utils.toast(mContext, R.string.share_skip);
+
+        if (!PackageHelper.INSTANCE.getLocalPackageNameSet().contains("com.tencent.mm")) {
+            Utils.toast(mContext, "没安装微信，分享失败");
+            return;
+        }
+
         WXWebpageObject webpage = new WXWebpageObject();
         WXMediaMessage msg = new WXMediaMessage(webpage);
         webpage.webpageUrl = shareUrl;
@@ -290,10 +295,10 @@ public class ShareUtils {
             protected void onNewResultImpl(Bitmap bitmap) {
                 Bitmap compressBp = compressBitmap(bitmap);
                 if (mShareType == ShareType.askNormal || mShareType == ShareType.askInvite) {
-                    msg.thumbData = Util.bmpToByteArray(compressBp, true);
+                    msg.thumbData = ImageUtils.bmpToByteArray(compressBp, true);
                 } else {
                     Bitmap resultBp = addBackGround(compressBp);
-                    msg.thumbData = Util.bmpToByteArray(resultBp, true);
+                    msg.thumbData = ImageUtils.bmpToByteArray(resultBp, true);
                 }
                 mIWXAPI.sendReq(req);
             }
@@ -387,6 +392,12 @@ public class ShareUtils {
     //微信朋友圈分享
     private void wechatMomentsShare() {
         Utils.toast(mContext, R.string.share_skip);
+
+        if (!PackageHelper.INSTANCE.getLocalPackageNameSet().contains("com.tencent.mm")) {
+            Utils.toast(mContext, "没安装微信，分享失败");
+            return;
+        }
+
         WXWebpageObject webpage = new WXWebpageObject();
         WXMediaMessage msg = new WXMediaMessage(webpage);
 

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

@@ -0,0 +1,54 @@
+package com.gh.common.util
+
+import com.gh.gamecenter.retrofit.Response
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.halo.assistant.HaloApp
+import com.lightgame.utils.Utils
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import okhttp3.ResponseBody
+import retrofit2.HttpException
+
+/**
+ * 可以在此类发送一些无关页面操作的请求
+ */
+object SimpleRequestHelper {
+    private val mApi = RetrofitManager.getInstance(HaloApp.getInstance().application).api
+
+    fun reportGameComment(gameId: String, commentId: String, type: String) {
+        val map = HashMap<String, String>()
+        map["reason"] = type
+        mApi.reportGameComment(gameId, commentId, map.createRequestBody())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(object : Response<ResponseBody>() {
+                    override fun onResponse(response: ResponseBody?) {
+                        Utils.toast(HaloApp.getInstance().application, "感谢您的举报")
+                    }
+
+                    override fun onFailure(e: HttpException?) {
+                        ErrorHelper.handleError(HaloApp.getInstance().application, e?.response()?.errorBody()?.string())
+                    }
+                })
+
+    }
+
+    fun reportGameCommentReply(gameId: String, commentId: String, replyId: String, type: String) {
+        val map = HashMap<String, String>()
+        map["reason"] = type
+        mApi.reportGameCommentReply(gameId, commentId, replyId, map.createRequestBody())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(object : Response<ResponseBody>() {
+                    override fun onResponse(response: ResponseBody?) {
+                        Utils.toast(HaloApp.getInstance().application, "感谢您的举报")
+                    }
+
+                    override fun onFailure(e: HttpException?) {
+                        ErrorHelper.handleError(HaloApp.getInstance().application, e?.response()?.errorBody()?.string())
+                    }
+                })
+
+    }
+
+}

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

@@ -1,84 +0,0 @@
-package com.gh.common.util;
-
-import android.app.Activity;
-import android.graphics.Rect;
-import android.os.Build;
-import android.view.View;
-import android.view.ViewTreeObserver;
-import android.widget.FrameLayout;
-
-/**
- * 用于解决因为沉浸式状态栏(自定义)时键盘不遮挡输入框
- */
-public class SoftInputHidWidgetUtils {
-    private View mChildOfContent;
-    private int usableHeightPrevious;
-    private FrameLayout.LayoutParams frameLayoutParams;
-    private int contentHeight;
-    private boolean isfirst = true;
-    private  int statusBarHeight;
-
-    public static void assistActivity(Activity activity) {
-        if (Build.VERSION.SDK_INT >= 19) {
-            new SoftInputHidWidgetUtils(activity);
-        }
-    }
-
-    private SoftInputHidWidgetUtils(Activity activity) {
-        statusBarHeight = getStatusBarHeight(activity);
-        FrameLayout content = (FrameLayout)activity.findViewById(android.R.id.content);
-        mChildOfContent = content.getChildAt(0);
-
-        //界面出现变动都会调用这个监听事件
-        mChildOfContent.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-            public void onGlobalLayout() {
-                if (isfirst) {
-                    contentHeight = mChildOfContent.getHeight();//兼容华为等机型
-                    isfirst = false;
-                }
-                possiblyResizeChildOfContent();
-            }
-        });
-
-        frameLayoutParams = (FrameLayout.LayoutParams) mChildOfContent.getLayoutParams();
-    }
-
-    //重新调整跟布局的高度
-    private void possiblyResizeChildOfContent() {
-
-        int usableHeightNow = computeUsableHeight();
-        //当前可见高度和上一次可见高度不一致 布局变动
-        if (usableHeightNow != usableHeightPrevious) {
-            int usableHeightSansKeyboard = mChildOfContent.getRootView().getHeight();
-            int heightDifference = usableHeightSansKeyboard - usableHeightNow;
-            if (heightDifference > (usableHeightSansKeyboard / 4)) {
-                // keyboard probably just became visible
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT){
-                    frameLayoutParams.height = usableHeightSansKeyboard - heightDifference + statusBarHeight;
-                } else {
-                    frameLayoutParams.height = usableHeightSansKeyboard - heightDifference;
-                }
-            } else {
-                frameLayoutParams.height = contentHeight;
-            }
-            mChildOfContent.requestLayout();
-            usableHeightPrevious = usableHeightNow;
-        }
-    }
-
-    /**
-     * 获取改变之后界面的可用高度（可以为开发者显示内容的高度）
-     * @return
-     */
-    private int computeUsableHeight() {
-        Rect r = new Rect();
-        mChildOfContent.getWindowVisibleDisplayFrame(r);//获取到的rect就是界面除去标题栏、除去软键盘挡住部分，所剩下的域
-        return (r.bottom - r.top);
-    }
-
-    public static int getStatusBarHeight(Activity activity) {
-        //获取状态栏的高度
-        int resourceId = activity.getResources().getIdentifier("status_bar_height", "dimen", "android");
-        return activity.getResources().getDimensionPixelSize(resourceId);
-    }
-}

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

@@ -45,6 +45,16 @@ object SPUtils {
         return sp.getInt(key, defaultValue)
     }
 
+    @JvmStatic
+    fun getLong(key: String, defaultValue: Long): Long {
+        return sp.getLong(key, defaultValue)
+    }
+
+    @JvmStatic
+    fun setLong(key: String, value: Long) {
+        return sp.edit().putLong(key, value).apply()
+    }
+
     @JvmStatic
     fun setBoolean(key: String, value: Boolean) {
         sp.edit().putBoolean(key, value).apply()
@@ -54,4 +64,22 @@ object SPUtils {
     fun getBoolean(key: String): Boolean {
         return sp.getBoolean(key, false)
     }
+
+    @JvmStatic
+    fun getBoolean(key: String, defaultValue: Boolean): Boolean {
+        return sp.getBoolean(key, defaultValue)
+    }
+
+    @JvmStatic
+    fun setString(sp: SharedPreferences, key: String, value: String? = null) {
+        try {
+            val commitStatus = sp.edit().putString(key, value).commit()
+            if (!commitStatus) {
+                sp.edit().putString(key, value).apply()
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            sp.edit().putString(key, value).apply()
+        }
+    }
 }