消息中心标黄内容复制后去除前后空格

1月25补充优化

.gitignore

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

CHANGELOG.md

@@ -1,4 +1,10 @@
-### Ver 3.1
+# 版本升级备忘
+
+### Ver 2.5
+* 此处写本次更新所做的业务和代码修改
+
+### Ver 2.6
+* xx
 
 ### Ver 3.0
 * 升级账号系统(登录流程/用户信息相关/用户账号相关操作(评论,礼包...))
@@ -10,8 +16,18 @@
 * 游戏下载平台面板修改(加快弹出速度,不再读取本地平台图片)
 * 接入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包,防止与数据后台小版本更新发生冲突)
+* 社区增加版主功能(版主可以对存在的相关内容进行修改/隐藏操作,内容包括问题/回答/回答评论)
+* 社区互动引导优化(问答推荐增加`推荐关注`,回答详情增加一些交互动效)

app/build.gradle

@@ -68,7 +68,6 @@ android {
         buildConfigField "String", "WEIBO_APPKEY", "\"${WEIBO_APPKEY}\""
         buildConfigField "String", "MTA_APPKEY", "\"${MTA_APPKEY}\""
         buildConfigField "String", "TD_APPID", "\"${TD_APPID}\""
-        buildConfigField "String", "PATCH_VERSION_NAME", "\"${PATCH_VERSION_NAME}\""
 
     }
 
@@ -92,7 +91,7 @@ android {
             signingConfig signingConfigs.debug
 
             buildConfigField "String", "EXPOSURE_REPO", "\"test\""
-            buildConfigField "String", "EXPOSURE_VERSION", "\"E1\""
+            buildConfigField "String", "EXPOSURE_VERSION", "\"E2\""
         }
         release {
             debuggable false
@@ -102,7 +101,7 @@ android {
             signingConfig signingConfigs.release
 
             buildConfigField "String", "EXPOSURE_REPO", "\"exposure\""
-            buildConfigField "String", "EXPOSURE_VERSION", "\"E1\""
+            buildConfigField "String", "EXPOSURE_VERSION", "\"E2\""
         }
     }
 
@@ -188,6 +187,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 +219,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}"
@@ -269,6 +269,11 @@ 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 project(':libraries:gid')
     implementation project(':libraries:LGLibrary')
     implementation project(':libraries:MTA')
@@ -276,7 +281,6 @@ dependencies {
     implementation project(':libraries:TalkingData')
     implementation project(':libraries:UmengPush')
     implementation project(':libraries:WechatShare')
-    implementation project(':libraries:iosched')
     implementation project(':libraries:LogHub')
     implementation project(':libraries:im')
 }

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

@@ -107,10 +107,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 +326,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 +360,18 @@
         <activity
             android:name = "com.gh.gamecenter.qa.draft.CommunityDraftWrapperActivity"
             android:screenOrientation = "portrait" />
+
         <activity
             android:name = "com.gh.gamecenter.gamedetail.rating.edit.RatingEditActivity"
+            android:windowSoftInputMode = "stateVisible"
+            android:screenOrientation = "portrait" />
+
+        <activity
+            android:name = "com.gh.gamecenter.qa.questions.edit.manager.HistoryDetailActivity"
+            android:screenOrientation = "portrait" />
+
+        <activity
+            android:name = "com.gh.gamecenter.qa.questions.edit.manager.HistoryActivity"
             android:screenOrientation = "portrait" />
 
         <activity
@@ -391,10 +398,6 @@
             </intent-filter >
         </activity >
 
-        <activity
-            android:name = ".CommonActivity"
-            android:screenOrientation = "portrait" />
-
         <provider
             android:name = "android.support.v4.content.FileProvider"
             android:authorities = "${applicationId}"

app/src/main/assets/editor.html

@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta name="viewport" content="user-scalable=no">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <link rel="stylesheet" type="text/css" href="normalize.css">
     <link rel="stylesheet" type="text/css" href="style.css">

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

@@ -23,15 +23,25 @@ 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() {
@@ -159,6 +169,24 @@ class GHUmengNotificationService : UmengMessageService() {
                                 DataUtils.onMtaEvent(context, "消息弹窗",
                                         type, "Does not contains any parameter.")
 
+                                // 标记已读
+                                val jsonObject = JSONObject()
+                                jsonObject.put("type", type)
+                                val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString())
+                                RetrofitManager.getInstance(application).api.postMessageRead(UserManager.getInstance().userId, data?.id, body)
+                                        .subscribeOn(Schedulers.io())
+                                        .observeOn(AndroidSchedulers.mainThread())
+                                        .subscribe(object : Response<ResponseBody>() {
+                                            override fun onResponse(response: ResponseBody?) {
+                                                super.onResponse(response)
+                                                MessageUnreadRepository.loadMessageUnreadData()
+                                            }
+
+                                            override fun onFailure(e: HttpException?) {
+                                                e?.printStackTrace()
+                                            }
+                                        })
+
                                 Notifier.hide()
                             })
                             .show(false)

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,9 @@ object AppExecutor {
         override fun execute(command: Runnable) {
             mainThreadHandler.post(command)
         }
+
+        fun executeWithDelay(command: Runnable, delay: Long) {
+            mainThreadHandler.postDelayed(command, delay)
+        }
     }
 }

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

@@ -21,6 +21,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?) {
@@ -82,6 +85,13 @@ class TimeElapsedHelper(val fragment: Fragment?, val activity: Activity?) {
             while (isWorking) {
                 try {
                     elapsedTime++
+                    if (timeout != 0 && timeout == elapsedTime) {
+                        timeoutCallback?.run {
+                            AppExecutor.uiExecutor.execute {
+                                onTimeout()
+                            }
+                        }
+                    }
                     Thread.sleep(1000)
                 } catch (e: Exception) {
                     e.printStackTrace()
@@ -98,4 +108,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

@@ -4,6 +4,7 @@ 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;
@@ -42,9 +43,8 @@ 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";
@@ -59,7 +59,7 @@ public class Config {
 
         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;
                 }
             }
@@ -109,13 +109,13 @@ public class Config {
 
         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 (entity.getPluginfy() && filterTime(entity.getTime())) {
                     return true;
                 }
             }
@@ -130,7 +130,7 @@ public class Config {
 
         for (SettingsEntity.Download entity : getSettings().getDownload()) {
             if ("all".equals(entity.getGame())) {
-                if (entity.isPluginfy() && filterTime(entity.getTime())) {
+                if (entity.getPluginfy() && filterTime(entity.getTime())) {
                     return true;
                 }
             }
@@ -158,6 +158,7 @@ public class Config {
         mSettingsEntity = settingsEntity;
     }
 
+    @Nullable
     public static SettingsEntity getSettings() {
         if (mSettingsEntity == null) {
             try {

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

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

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

@@ -27,6 +27,7 @@ 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 +42,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;
@@ -344,7 +345,7 @@ public class BindingAdapters {
                     case neterror:
                     case waiting:
                         progressBar.setText(R.string.downloading);
-                        if (downloadEntity.isPluggable() && PackageManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
+                        if (downloadEntity.isPluggable() && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
                             progressBar.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_PLUGIN);
                         } else {
                             progressBar.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_NORMAL);
@@ -353,7 +354,7 @@ public class BindingAdapters {
                     case done:
                         progressBar.setText(R.string.install);
                         if (downloadEntity.isPluggable()
-                                && PackageManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
+                                && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
                             progressBar.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_PLUGIN);
                         } else {
                             progressBar.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_NORMAL);
@@ -479,4 +480,16 @@ public class BindingAdapters {
             layout.setRefreshing(false);
         }
     }
+
+    @BindingAdapter({"setGameName", "isShowPlatform"})
+    public static void setGameName(TextView view, GameEntity game, boolean isShowPlatform) {
+        if (isShowPlatform && game.getApk().size() > 0) {
+            view.setText(String.format("%s - %s", game.getName(),
+                    PlatformUtils.getInstance(view.getContext()).getPlatformName(
+                            game.getApk().get(0).getPlatform())));
+        } else {
+            view.setText(game.getName());
+        }
+
+    }
 }

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

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

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.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,122 +26,101 @@ 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()
 
-    private val exposureCache = FixedSizeLinkedHashSet<String>(20)
+    // exposureCache 用来过滤掉具有相同 id 的曝光事件，避免重复发送事件
+    private val exposureCache = FixedSizeLinkedHashSet<String>(100)
+    private val exposureSet = hashSetOf<ExposureEvent>()
+    private val exposureDao by lazy { ExposureDatabase.buildDatabase(HaloApp.getInstance().application).logHubEventDao() }
+    private val exposureExecutor = Executors.newSingleThreadExecutor()
 
-    /**
-     * Must be called early to init object then real use (for example in Application)
-     */
     @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))
-        }
+    private fun eliminateMultipleBrackets(jsonWithMultipleBracket: String): String {
+        return jsonWithMultipleBracket.replace("[[", "[").replace("]]", "]")
     }
 
-    /**
-     * 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 buildLogGroup(eventList: List<ExposureEvent>): LogGroup {
+        val logGroup = LogGroup("sls android", "no ip")
+
+        eventList.forEach { logGroup.PutLog(buildLog(it)) }
+
+        return logGroup
     }
 
     private fun buildLog(event: ExposureEvent): LgLOG {
@@ -154,30 +137,6 @@ object ExposureManager {
         return log
     }
 
-    private fun eliminateMultipleBrackets(jsonWithMultipleBracket: String): String {
-        return jsonWithMultipleBracket.replace("[[", "[").replace("]]", "]")
-    }
-
-    private fun buildLogGroup(event: ExposureEvent): LogGroup {
-
-        val logGroup = LogGroup("sls android", "no ip")
-
-        logGroup.PutLog(buildLog(event))
-
-        return logGroup
-    }
-
-    private fun buildLogGroup(eventList: List<ExposureEvent>): LogGroup {
-
-        val logGroup = LogGroup("sls android", "no ip")
-
-        eventList.forEach { event ->
-            logGroup.PutLog(buildLog(event))
-        }
-
-        return logGroup
-    }
-
     internal class FixedSizeLinkedHashSet<T>(var maxSize: Int) : LinkedHashSet<T>() {
         override fun add(element: T): Boolean {
             if (size == maxSize) {

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

@@ -1,15 +1,16 @@
 package com.gh.common.exposure
 
+import com.gh.common.util.fromObject
 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?.fromObject<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,7 +15,6 @@ 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? = "",

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

@@ -18,18 +18,26 @@ 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)
     }
 
     fun getMeta(): Meta {
@@ -141,16 +149,16 @@ object MetaUtil {
                 val telephonyManager = application.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
                 if (telephonyManager.simState != TelephonyManager.SIM_STATE_READY) return "unknown"
                 when (telephonyManager.networkType) {
-                // Unknown
+                    // Unknown
                     TelephonyManager.NETWORK_TYPE_UNKNOWN -> "Cellular - Unknown"
-                // Cellular Data–2G
+                    // Cellular Data–2G
                     TelephonyManager.NETWORK_TYPE_EDGE, TelephonyManager.NETWORK_TYPE_GPRS, TelephonyManager.NETWORK_TYPE_CDMA,
                     TelephonyManager.NETWORK_TYPE_IDEN, TelephonyManager.NETWORK_TYPE_1xRTT -> "Cellular - 2G"
-                // Cellular Data–3G
+                    // Cellular Data–3G
                     TelephonyManager.NETWORK_TYPE_UMTS, TelephonyManager.NETWORK_TYPE_HSDPA, TelephonyManager.NETWORK_TYPE_HSPA,
                     TelephonyManager.NETWORK_TYPE_HSPAP, TelephonyManager.NETWORK_TYPE_HSUPA, TelephonyManager.NETWORK_TYPE_EVDO_0,
                     TelephonyManager.NETWORK_TYPE_EVDO_A, TelephonyManager.NETWORK_TYPE_EVDO_B -> "Cellular - 3G"
-                // Cellular Data–4G
+                    // Cellular Data–4G
                     TelephonyManager.NETWORK_TYPE_LTE -> "Cellular - 4G"
                     else -> "Cellular - Unknown Generation"
                 }
@@ -161,10 +169,6 @@ object MetaUtil {
 
     }
 
-    fun getIP(): String {
-        return "unknown"
-    }
-
     fun getOS(): String {
         return "android"
     }

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

@@ -1,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/im/ImManager.kt

@@ -11,10 +11,12 @@ 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 {
 
@@ -29,6 +31,8 @@ object ImManager {
     fun attachIm() {
         try {
             if (UserManager.getInstance().userInfoEntity != null) {
+                MoorUtils.init(HaloApp.getInstance().application)
+                Utils.init(HaloApp.getInstance().application)
                 IMChatManager.getInstance().init(
                         HaloApp.getInstance().application,
                         ImReceiver.UNIQUE_BROADCAST_ACTION,

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

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

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

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

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

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

@@ -1,22 +1,23 @@
 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.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 {
 
@@ -42,12 +43,10 @@ object CommentHelper {
             dialogOptions.add("查看对话")
         }
 
-        val dialog: Dialog
-
-        dialog = createOptionsSelectDialog(context, dialogOptions) {
+        DialogUtils.showListDialog(context, dialogOptions, null) {
             when (it) {
                 "回复" -> {
-                    CheckLoginUtils.checkLogin(context) {
+                    context.ifLogin("社区文章详情-评论-回复") {
                         if (listener != null) {
                             listener.onCommentCallback(commentEntity)
                         } else if (!TextUtils.isEmpty(commentEntity.id)) {
@@ -60,7 +59,7 @@ object CommentHelper {
 
                 "复制" -> copyText(commentEntity.content, context)
 
-                "举报" -> CheckLoginUtils.checkLogin(context) {
+                "举报" -> context.ifLogin("社区文章详情-评论-举报") {
                     showReportTypeDialog(context) { reportType ->
                         PostCommentUtils.reportCommunityArticleComment(context, communityId, articleId, commentEntity.id, reportType,
                                 object : PostCommentUtils.PostCommentListener {
@@ -85,8 +84,6 @@ object CommentHelper {
                 }
             }
         }
-
-        dialog.show();
     }
 
     @JvmStatic
@@ -105,16 +102,24 @@ object CommentHelper {
         dialogOptions.add("复制")
         dialogOptions.add("举报")
 
+        commentEntity.me?.let {
+            if (it.isModerator && (
+                            it.moderatorPermissions.contains(MeEntity.HIDE_ANSWER_COMMENT)
+                                    || it.moderatorPermissions.contains(MeEntity.TOP_ANSWER_COMMENT))) {
+                dialogOptions.add("管理")
+            }
+        }
+
         if (commentEntity.parentUser != null && showConversation) {
             dialogOptions.add("查看对话")
         }
 
-        val dialog: Dialog
-
-        dialog = createOptionsSelectDialog(context, dialogOptions) {
+        DialogUtils.showListDialog(context, dialogOptions, null) {
             when (it) {
+                "管理" -> showControlDialog(context, answerId, commentEntity, commentEntity.me!!)
+
                 "回复" -> {
-                    CheckLoginUtils.checkLogin(context) {
+                    context.ifLogin("回答详情-评论-回复") {
                         if (listener != null) {
                             listener.onCommentCallback(commentEntity)
                         } else if (!TextUtils.isEmpty(commentEntity.id)) {
@@ -127,7 +132,7 @@ object CommentHelper {
 
                 "复制" -> copyText(commentEntity.content, context)
 
-                "举报" -> CheckLoginUtils.checkLogin(context) {
+                "举报" -> context.ifLogin("回答详情-评论-举报") {
                     showReportTypeDialog(context) { reportType ->
                         PostCommentUtils.postAnswerReportData(context, commentEntity.id, answerId, reportType,
                                 object : PostCommentUtils.PostCommentListener {
@@ -152,58 +157,141 @@ object CommentHelper {
                 }
             }
         }
+    }
 
-        dialog.show();
+    private fun showControlDialog(context: Context, answerId: String, comment: CommentEntity, me: MeEntity) {
+        val dialogOptions = arrayListOf<String>()
+        val highlight = "置顶评论"
+        val hide = "隐藏评论"
+
+        if (me.moderatorPermissions.contains(MeEntity.TOP_ANSWER_COMMENT)) {
+            dialogOptions.add(highlight)
+        }
+
+        if (me.moderatorPermissions.contains(MeEntity.HIDE_ANSWER_COMMENT)) {
+            dialogOptions.add(hide)
+        }
+
+        val content = if (me.moderatorLevel == MeEntity.MODERATOR_LEVEL_PRIMARY) {
+            "你的操作将提交给小编审核，确定提交吗？"
+        } else {
+            "你的操作将立即生效，确定提交吗？（你的管理权限为：高级）"
+        }
+
+        val disabledOptions = arrayListOf<String>()
+        if (comment.priority != 0) {
+            disabledOptions.add(highlight)
+        }
+        comment.me?.let {
+            if (it.isAnswerCommented) {
+                disabledOptions.add(highlight)
+            }
+        }
+
+        DialogUtils.showListDialog(context, dialogOptions, disabledOptions) {
+            when (it) {
+                highlight -> {
+
+                    if (comment.priority != 0) {
+                        Utils.toast(context, "评论已经置顶")
+                        return@showListDialog
+                    }
+
+                    comment.me?.let { me ->
+                        if (me.isAnswerCommented) {
+                            Utils.toast(context, "不能置顶自己的评论")
+                            return@showListDialog
+                        }
+                    }
+
+                    DialogUtils.showAlertDialog(context, highlight, content,
+                            "确定", "取消",
+                            {
+                                RetrofitManager.getInstance(context).api
+                                        .highlightAnswerComment(answerId, comment.id)
+                                        .observeOn(AndroidSchedulers.mainThread())
+                                        .subscribeOn(Schedulers.io())
+                                        .subscribe(object : Response<ResponseBody>() {
+                                            override fun onResponse(response: ResponseBody?) {
+                                                if (me.moderatorLevel == MeEntity.MODERATOR_LEVEL_PRIMARY) {
+                                                    Utils.toast(context, "提交成功")
+                                                } else {
+                                                    Utils.toast(context, "置顶成功，请刷新列表")
+                                                }
+                                            }
+
+                                            override fun onFailure(e: HttpException?) {
+                                                super.onFailure(e)
+                                                e?.let { httpException ->
+                                                    if (httpException.code() == 403) {
+                                                        val string = e.response().errorBody()?.string()
+                                                        val errorJson = JSONObject(string)
+                                                        val errorCode = errorJson.getInt("code")
+                                                        if (errorCode == 403059) {
+                                                            Utils.toast(getApplication(), "权限错误，请刷新后重试")
+                                                            return
+                                                        } else {
+                                                            Utils.toast(getApplication(), e.message())
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        })
+                            }, null)
+                }
+
+                hide -> {
+                    DialogUtils.showAlertDialog(context, hide, content,
+                            "确定", "取消",
+                            {
+                                RetrofitManager.getInstance(context).api
+                                        .hideAnswerComment(answerId, comment.id)
+                                        .observeOn(AndroidSchedulers.mainThread())
+                                        .subscribeOn(Schedulers.io())
+                                        .subscribe(object : Response<ResponseBody>() {
+                                            override fun onResponse(response: ResponseBody?) {
+                                                if (me.moderatorLevel == MeEntity.MODERATOR_LEVEL_PRIMARY) {
+                                                    Utils.toast(context, "提交成功")
+                                                } else {
+                                                    Utils.toast(context, "隐藏成功，请刷新列表")
+                                                }
+                                            }
+
+                                            override fun onFailure(e: HttpException?) {
+                                                super.onFailure(e)
+                                                e?.let { httpException ->
+                                                    if (httpException.code() == 403) {
+                                                        val string = e.response().errorBody()?.string()
+                                                        val errorJson = JSONObject(string)
+                                                        val errorCode = errorJson.getInt("code")
+                                                        if (errorCode == 403059) {
+                                                            Utils.toast(getApplication(), "权限错误，请刷新后重试")
+                                                            return
+                                                        } else {
+                                                            Utils.toast(getApplication(), e.message())
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        })
+                            }, null)
+                }
+            }
+        }
     }
 
     private fun showReportTypeDialog(context: Context, reportCallback: (reportType: String) -> Unit) {
         val reportTypes = arrayListOf("垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息", "违法有害信息", "其它")
 
-        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

@@ -80,7 +80,10 @@ public class CommentUtils {
         }
     }
 
-    public static void showGameCommentOptions(final Context context, final RatingComment comment, final String gameId) {
+    public static void showGameCommentOptions(final Context context,
+                                              final RatingComment comment,
+                                              final String gameId,
+                                              final String entrance) {
 
         final Dialog dialog = new Dialog(context);
 
@@ -115,7 +118,7 @@ public class CommentUtils {
                         copyText(comment.getContent(), context);
                         break;
                     case "举报":
-                        CheckLoginUtils.checkLogin(context, () -> showGameCommentReportDialog(gameId, comment, context));
+                        CheckLoginUtils.checkLogin(context, entrance, () -> showGameCommentReportDialog(gameId, comment, context));
                         break;
                 }
             });
@@ -183,9 +186,12 @@ public class CommentUtils {
     }
 
 
-    public static void showReportDialog(final CommentEntity commentEntity, final Context context, final boolean showConversation,
-                                        final OnCommentCallBackListener listener, final String newsId) {
-
+    public static void 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 +231,7 @@ public class CommentUtils {
                     dialog.cancel();
                     switch (reportTv.getText().toString()) {
                         case "回复":
-                            CheckLoginUtils.checkLogin(context, () -> {
+                            CheckLoginUtils.checkLogin(context, patch + "-回复", () -> {
                                 if (listener != null) {
                                     listener.onCommentCallback(commentEntity);
                                 } else if (!TextUtils.isEmpty(newsId)) {
@@ -239,7 +245,8 @@ public class CommentUtils {
                             copyText(commentEntity.getContent(), context);
                             break;
                         case "举报":
-                            CheckLoginUtils.checkLogin(context, () -> showReportTypeDialog(commentEntity, context));
+                            CheckLoginUtils.checkLogin(context, patch + "-举报",
+                                    () -> showReportTypeDialog(commentEntity, context));
 
                             break;
                         case "查看对话":
@@ -442,64 +449,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(String.valueOf(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(String.valueOf(commentEntity.getVote()));
+                        if (commentEntity.getVote() == 0) {
+                            commentLikeCountTv.setVisibility(View.GONE);
+                        } else {
+                            commentLikeCountTv.setVisibility(View.VISIBLE);
                         }
 
-                        @Override
-                        public void postFailed(Throwable e) {
-
-                            commentEntity.setVote(commentEntity.getVote() - 1);
-                            commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
-                            commentLikeIv.setImageResource(R.drawable.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;

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/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,14 @@ import retrofit2.HttpException
  */
 object ConcernUtils {
 
-    fun postConcernGameId(context: Context, gameId: String, listener: onConcernListener?) {
-        RetrofitManager.getInstance(context).getApi()
-                .postConcern(UserManager.getInstance().userId, gameId)
+    fun postConcernGameId(context: Context, gameId: String, listener: onConcernListener?, autoConcern: Boolean = false) {
+        val mode = if (autoConcern) "auto" else "manual"
+
+        val userId = UserManager.getInstance().userId
+        if (TextUtils.isEmpty(userId)) return
+
+        RetrofitManager.getInstance(context).api
+                .postConcern(UserManager.getInstance().userId, gameId, mode)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(object : Response<ResponseBody>() {
@@ -40,7 +46,7 @@ object ConcernUtils {
     }
 
     fun deleteConcernData(context: Context, gameId: String, listener: onConcernListener?) {
-        RetrofitManager.getInstance(context).getApi()
+        RetrofitManager.getInstance(context).api
                 .deleteConcern(UserManager.getInstance().userId, gameId)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -61,7 +67,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 +79,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())
@@ -92,7 +98,7 @@ object ConcernUtils {
     }
 
     fun postConcernQuestions(context: Context, questionsId: String, listener: onConcernListener?) {
-        RetrofitManager.getInstance(context).getApi()
+        RetrofitManager.getInstance(context).api
                 .postConcernQuestions(UserManager.getInstance().userId, questionsId)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())

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

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

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

@@ -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;
 
 /**
@@ -73,7 +73,7 @@ public class DetailDownloadUtils {
             case downloading:
             case pause:
                 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 +84,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 +93,7 @@ public class DetailDownloadUtils {
             case done:
                 viewHolder.mDownloadPb.setText(R.string.install);
                 if (downloadEntity.isPluggable()
-                        && PackageManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
+                        && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
                     viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_PLUGIN);
                 } else {
                     viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_NORMAL);

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

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

@@ -128,6 +128,20 @@ public class DeviceUtils {
         return builder.toString();
     }
 
+    public static String getUserAgent() {
+        String userAgent = "";
+        userAgent = System.getProperty("http.agent");
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0, length = userAgent.length(); i < length; i++) {
+            char c = userAgent.charAt(i);
+            if (c <= '\u001f' || c >= '\u007f') {
+                sb.append(String.format("\\u%04x", (int) c));
+            } else {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
 
     public static String getIPAddress(Context context) {
         NetworkInfo info = ((ConnectivityManager) context

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;
@@ -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;
         }
@@ -781,6 +781,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 +845,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
@@ -92,6 +92,8 @@ object DirectUtils {
 
             "web" -> directToWebView(context, url = linkEntity.link!!, entrance = entrance)
 
+            "qq" -> directToQqConversation(context, linkEntity.link)
+
             else -> DialogUtils.showLowVersionDialog(context)
         }
     }
@@ -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);
@@ -159,6 +159,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 +178,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);
@@ -258,10 +257,10 @@ public class DownloadItemUtils {
             holder.gameDownloadPercentage.setText(R.string.hundred_percent);
 
             if (isNormal) {
-                holder.gameDownloadBtn.setText("安装");
+                holder.gameDownloadBtn.setText(R.string.install);
                 holder.gameDownloadBtn.setTextColor(Color.WHITE);
                 if (downloadEntity.isPluggable()
-                        && PackageManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
+                        && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
                     holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_plugin_style);
                 } else {
                     holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style);
@@ -316,43 +315,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

@@ -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";
@@ -103,13 +103,14 @@ public class EntranceUtils {
     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 void jumpActivity(Context context, Bundle bundle) {
 

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

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

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

@@ -1,14 +1,11 @@
 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.Context
 import android.support.v4.app.Fragment
 import android.support.v4.app.FragmentActivity
 import android.support.v4.view.ViewPager
+import android.view.View
 
 /**
  * 创建以 activity 为观察者上下文的 viewModel
@@ -50,31 +47,54 @@ 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.fromObject(): T? {
+    return try {
+        GsonUtils.getInstance().mGson.fromJson(this, T::class.java)
+    } catch (e: Exception) {
+        e.printStackTrace()
+        null
     }
-    registerActivityLifecycleCallbacks(listener)
+}
+
+inline fun <reified T : Any> T.toJson(): String {
+    return GsonUtils.getInstance().mGson.toJson(this)
+}
+
+/**
+ *  快速点击两下
+ */
+fun fastDoubleClickAction(id: Int, interval: Long = 300, action: (() -> Unit)? = null) {
+    if (ClickUtils.isFastDoubleClick(id, interval)) {
+        action?.invoke()
+    }
+}
+
+fun View.fastDoubleClickAction(interval: Long, action: (() -> Unit)? = null) {
+    fastDoubleClickAction(id, interval, action)
 }

app/src/main/java/com/gh/common/util/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, "1107958753", "dff25cc0dcb4a3b9f881a5fd7eec7e8a")
+    }
+
+    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/GsonUtils.kt

@@ -33,13 +33,4 @@ class GsonUtils private constructor() {
     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/ImageUtils.kt

@@ -231,12 +231,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))
+                    }
+                }
             }
         }
     }

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;
@@ -216,6 +214,10 @@ public class LibaoUtils {
                 libaoBtn.setText(R.string.libao_unshelve);
                 libaoBtn.setTextColor(context.getResources().getColor(R.color.button_gray));
                 break;
+            case "check":
+                libaoBtn.setText(R.string.libao_check);
+                libaoBtn.setBackgroundResource(R.drawable.button_normal_style);
+                break;
             default:
                 libaoBtn.setBackgroundResource(R.drawable.button_border_gray);
                 libaoBtn.setText("异常");
@@ -229,77 +231,166 @@ public class LibaoUtils {
         String status = libaoEntity.getStatus();
         setLiBaoBtnStatus(libaoBtn, status, context);
 
-        libaoBtn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                CheckLoginUtils.checkLogin(context, () -> {
-                    // 领取限制
-                    if ("领取".equals(libaoBtn.getText().toString()) || "淘号".equals(libaoBtn.getText().toString())) {
-                        if (isInstallRequired && !isAppInstalled(context, libaoEntity.getPackageName())) {
-                            String platform;
-                            if (TextUtils.isEmpty(libaoEntity.getPlatform())) {
-                                platform = "";
-                            } else {
-                                platform = PlatformUtils.getInstance(context)
-                                        .getPlatformName(libaoEntity.getPlatform()) + "版";
-                            }
+        libaoBtn.setOnClickListener(v -> {
+            String btnStatus = libaoBtn.getText().toString();
+            CheckLoginUtils.checkLogin(context, "礼包详情-[" + btnStatus + "]", () -> {
+                // 领取限制
 
-                            String dialogContent = context.getString(R.string.ling_rules_dialog, libaoEntity.getGame().getName(), platform);
-                            DialogUtils.showWarningDialog(context, "条件不符",
-                                    Html.fromHtml(dialogContent), "关闭", "立即安装"
-                                    , new DialogUtils.ConfirmListener() {
-                                        @Override
-                                        public void onConfirm() {
-                                            adapter.openDownload();
-                                        }
-                                    }, null);
+                if ("领取".equals(btnStatus) || "淘号".equals(btnStatus)) {
+                    if (isInstallRequired && !isAppInstalled(context, libaoEntity.getPackageName())) {
+                        String platform;
+                        if (TextUtils.isEmpty(libaoEntity.getPlatform())) {
+                            platform = "";
+                        } else {
+                            platform = PlatformUtils.getInstance(context)
+                                    .getPlatformName(libaoEntity.getPlatform());
+                        }
+
+                        boolean isExistPlatform = false;
+                        ArrayList<ApkEntity> apk = adapter.getGameEntity().getApk();
+                        for (ApkEntity apkEntity : apk) {
+                            if (TextUtils.isEmpty(libaoEntity.getPlatform())) break;
+                            if (libaoEntity.getPlatform().equals(apkEntity.getPlatform())) {
+                                isExistPlatform = true;
+                                break;
+                            }
+                        }
+
+                        String dialogContent = context.getString(R.string.ling_rules_dialog, libaoEntity.getGame().getName(), platform);
+                        boolean finalIsExistPlatform = isExistPlatform;
+                        DialogUtils.showWarningDialog(context, "条件不符",
+                                Html.fromHtml(dialogContent), isExistPlatform ? "关闭" : null,
+                                isExistPlatform ? "立即安装" : "关闭",
+                                () -> {
+                                    if (finalIsExistPlatform) {
+                                        adapter.openDownload(libaoEntity.getPlatform());
+                                    }
+                                }, null);
+                        return;
+                    }
+                }
+
+                switch (btnStatus) {
+                    case "未开始":
+                        Utils.toast(context, "还没到开始领取时间");
+                        break;
+                    case "查看":
+                        if (!TextUtils.isEmpty(libaoEntity.getDes())) {
+                            DialogUtils.showAlertDialog(v.getContext(), "使用说明",
+                                    Html.fromHtml(libaoEntity.getDes()), "关闭", null, null, null);
+                        }
+                        break;
+                    case "再领一个":
+                    case "领取":
+                        if ("repeatLing".equals(status)) {
+                            DialogUtils.showWarningDialog(context, "礼包刷新提醒"
+                                    , "礼包每天0点刷新，换新区或者换新角色需要继续领取礼包的童鞋，请于明天0点之后回来即可[再领一个]"
+                                    , null, "知道了", null, null);
+                        } else {
+                            libaoLing(context, libaoBtn, libaoEntity, adapter, isInstallRequired, null, entrance);
+                        }
+                        break;
+                    case "再淘一个":
+                    case "淘号":
+                        if ("repeatTao".equals(status)) {
+                            Utils.toast(context, "没到重复淘号时间, 礼包每天0点刷新");
                             return;
                         }
-                    }
+                        final Dialog loadingDialog = DialogUtils.showWaitDialog(context, "淘号中...");
+                        postLibaoTao(context, libaoEntity.getId(), new PostLibaoListener() {
+                            @Override
+                            public void postSucced(Object response) {
 
-                    switch (libaoBtn.getText().toString()) {
-                        case "未开始":
-                            Utils.toast(context, "还没到开始领取时间");
-                            break;
-                        case "查看":
-                            Intent intent = LibaoDetailActivity.getIntent(context, libaoEntity, entrance);
-                            context.startActivity(intent);
-                            break;
-                        case "再领一个":
-                        case "领取":
-                            if ("repeatLing".equals(status)) {
-                                DialogUtils.showWarningDialog(context, "礼包刷新提醒"
-                                        , "礼包每天0点刷新，换新区或者换新角色需要继续领取礼包的童鞋，请于明天0点之后回来即可[再领一个]"
-                                        , null, "知道了", null, null);
-                            } else {
-                                libaoLing(context, libaoBtn, libaoEntity, adapter, isInstallRequired, null, entrance);
-                            }
-                            break;
-                        case "再淘一个":
-                        case "淘号":
-                            if ("repeatTao".equals(status)) {
-                                Utils.toast(context, "没到重复淘号时间, 礼包每天0点刷新");
-                                return;
-                            }
-                            final Dialog loadingDialog = DialogUtils.showWaitDialog(context, "淘号中...");
-                            postLibaoTao(context, libaoEntity.getId(), new PostLibaoListener() {
-                                @Override
-                                public void postSucced(Object response) {
+                                if (loadingDialog != null) loadingDialog.dismiss();
 
-                                    if (loadingDialog != null) loadingDialog.dismiss();
+                                JSONObject responseBody = (JSONObject) response;
+                                String libaoCode = null;
+                                try {
+                                    libaoCode = responseBody.getString("code");
+                                } catch (JSONException e) {
+                                    e.printStackTrace();
+                                }
 
-                                    JSONObject responseBody = (JSONObject) response;
-                                    String libaoCode = null;
+                                if (TextUtils.isEmpty(libaoCode)) {
                                     try {
-                                        libaoCode = responseBody.getString("code");
+                                        String detail = responseBody.getString("detail");
+                                        switch (detail) {
+                                            case "maintaining":
+                                                Utils.toast(context, "网络状态异常，请稍后再试");
+                                                break;
+                                            case "fail to compete":
+                                                Utils.toast(context, "淘号失败，稍后重试");
+                                                break;
+                                            default:
+                                                Utils.toast(context, "淘号异常");
+                                                break;
+                                        }
                                     } catch (JSONException e) {
                                         e.printStackTrace();
                                     }
+                                    return;
+                                }
 
-                                    if (TextUtils.isEmpty(libaoCode)) {
+                                Utils.toast(context, "淘号成功");
+
+                                libaoEntity.setStatus("taoed");
+
+                                EventBus.getDefault().post(new EBReuse("libaoChanged"));
+
+                                adapter.initLibaoCode(new UserDataLibaoEntity(libaoCode, "tao", Utils.getTime(context)));
+
+                                final String finalLibaoCode = libaoCode;
+
+                                DialogUtils.showWarningDialog(context, "淘号成功"
+                                        , Html.fromHtml(context.getString(R.string.taoed_dialog, libaoCode))
+                                        , "关闭", " 复制礼包码"
+                                        , () -> {
+                                            copyLink(finalLibaoCode, context);
+                                            if (isInstallRequired) {
+                                                libaoBtn.postDelayed(() -> {
+                                                    Spanned msg = Html.fromHtml(
+                                                            context.getString(R.string.taoed_copy_dialog
+                                                                    , finalLibaoCode));
+                                                    lunningAppDialog(context
+                                                            , msg, libaoEntity);
+                                                }, 300);
+                                            }
+                                        }, null);
+                            }
+
+                            @Override
+                            public void postFailed(Throwable error) {
+                                Utils.log("---" + error.toString());
+
+                                if (loadingDialog != null) loadingDialog.dismiss();
+
+                                if (error instanceof HttpException) {
+                                    HttpException exception = (HttpException) error;
+                                    if (exception.code() == 403) {
                                         try {
-                                            String detail = responseBody.getString("detail");
+                                            JSONObject errorJson = new JSONObject(exception.response().errorBody().string());
+                                            String detail = errorJson.getString("detail");
+//                                                    Utils.toast(context, "返回::" + detail);
                                             switch (detail) {
+                                                case "coming":
+                                                    Utils.toast(context, "礼包领取时间未开始");
+                                                    break;
+                                                case "finish":
+                                                    Utils.toast(context, "礼包领取时间已结束");
+                                                    break;
+                                                case "fetched":
+                                                    Utils.toast(context, "你今天已领过这个礼包了, 不能再淘号");
+
+                                                    libaoBtn.setText("已淘号");
+                                                    libaoBtn.setBackgroundResource(R.drawable.libao_taoed_style);
+                                                    libaoBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.libao_taoed_selector));
+                                                    libaoEntity.setStatus("taoed");
+                                                    break;
+                                                case "try tao":
+                                                case "used up":
+                                                    DialogUtils.showHintDialog(context, "礼包已领光"
+                                                            , "手速不够快，礼包已经被抢光了，十分抱歉", "知道了");
+                                                    break;
                                                 case "maintaining":
                                                     Utils.toast(context, "网络状态异常，请稍后再试");
                                                     break;
@@ -307,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;
+                }
+            });
         });
     }
 
@@ -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);
     }
 

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

@@ -6,6 +6,7 @@ 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.manager.UserManager;
 import com.gh.gamecenter.qa.entity.Questions;
@@ -37,7 +38,7 @@ public class LogUtils {
             e.printStackTrace();
         }
 
-        upload(HaloApp.getInstance().getApplication(), object);
+        upload(object);
     }
 
     public static void uploadDevice(LunchType launchType) {
@@ -47,15 +48,12 @@ 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) {
@@ -73,7 +71,7 @@ public class LogUtils {
             e.printStackTrace();
         }
 
-        upload(HaloApp.getInstance().getApplication(), object);
+        upload(object);
     }
 
     public static void uploadQuestionReadTime(String tracers, int readTime, Questions questions) {
@@ -90,11 +88,11 @@ public class LogUtils {
             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 +104,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 +116,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

@@ -106,6 +106,10 @@ public class LoginUtils {
                 });
     }
 
+    /**
+     * 请用 ErrorHelper.handleError 替代本方法
+     */
+    @Deprecated
     public static void userPostErrorToast(String errorString, Context context, boolean isQuestion) {
         if (TextUtils.isEmpty(errorString)) {
             Utils.toast(context, R.string.post_failure_hint);
@@ -159,7 +163,7 @@ public class LoginUtils {
                     Utils.toast(context, R.string.post_failure_hint);
                     break;
             }
-        } catch (JSONException e) {
+        } catch (Exception e) {
             Utils.toast(context, R.string.post_failure_hint);
             e.printStackTrace();
         }

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

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

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

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

@@ -52,6 +52,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网络是否可用
      *

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

@@ -2,7 +2,6 @@ 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.halo.assistant.HaloApp
 
@@ -12,12 +11,18 @@ object PackageHelper {
     var excludePackageNameList = arrayListOf<String>()
 
     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)
     }
 
     @JvmStatic
@@ -31,16 +36,21 @@ object PackageHelper {
      * 获取所有已安装的软件的包名、版本(非系统应用)
      */
     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,7 +15,6 @@ 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;
@@ -49,12 +48,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());
@@ -181,15 +182,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 +203,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 +293,6 @@ public class PackageUtils {
         return 0;
     }
 
-    /**
-     * 数据统计或反馈用PatchVersionName
-     * 判断助手是否是第一次启动或版本更新提交的版本号用AppVersionName{@link PackageUtils#getVersionName()}
-     *
-     * @return 补丁包版本号
-     */
-    public static String getPatchVersionName() {
-        return Config.PATCH_VERSION_NAME;
-    }
-
     /*
      * 返回光环助手的版本信息
      */
@@ -312,15 +303,8 @@ 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;
     }
 
     /*

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

@@ -251,6 +251,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;
@@ -387,6 +393,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/SpUtils.kt

@@ -54,4 +54,17 @@ object SPUtils {
     fun getBoolean(key: String): Boolean {
         return sp.getBoolean(key, false)
     }
+
+    @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()
+        }
+    }
 }

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

@@ -0,0 +1,39 @@
+package com.gh.common.util
+
+import android.text.Editable
+import android.text.TextWatcher
+import android.widget.EditText
+import com.gh.gamecenter.R
+
+object TextHelper {
+
+    @JvmStatic
+    fun limitTheLengthOfEditText(editText: EditText, length: Int, exceedCallback: ExceedTextLengthLimitCallback? = null) {
+        editText.addTextChangedListener(object :TextWatcher {
+            override fun afterTextChanged(s: Editable?) {
+
+            }
+
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+
+            }
+
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                val tvCount = editText.text.toString().length
+                if (tvCount > length) {
+                    val str = editText.text.toString().substring(0, length)
+                    editText.setText(str)
+                    editText.setSelection(str.length)
+                    if (!ClickUtils.isFastDoubleClick(R.id.userinfo_nickname_et, 2000)) {
+                        exceedCallback?.onExceed()
+                    }
+                }
+            }
+        })
+    }
+
+    interface ExceedTextLengthLimitCallback {
+        fun onExceed()
+    }
+
+}

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

@@ -0,0 +1,20 @@
+package com.gh.common.util
+
+/**
+ *  第三方安装包（即安装包里没有 gh-id）的辅助类
+ */
+object ThirdPartyPackageHelper {
+
+    private const val PREFIX = "third_party_package"
+
+    @JvmStatic
+    fun saveGameId(packageName: String, gameId: String) {
+        SPUtils.setString(PREFIX + packageName, gameId)
+    }
+
+    @JvmStatic
+    fun getGameId(packageName: String): String {
+        return SPUtils.getString(PREFIX + packageName, "")!!
+    }
+
+}

app/src/main/java/com/gh/common/view/DownloadDialog.java

@@ -8,7 +8,6 @@ import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -31,7 +30,7 @@ import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.eventbus.EBDownloadStatus;
 import com.gh.gamecenter.eventbus.EBPackage;
 import com.gh.gamecenter.eventbus.EBReuse;
-import com.gh.gamecenter.manager.PackageManager;
+import com.gh.gamecenter.manager.PackagesManager;
 import com.lightgame.download.DataWatcher;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.DownloadStatus;
@@ -89,6 +88,7 @@ public class DownloadDialog implements OnCollectionCallBackListener {
     private String entrance;
     private String location;
     private ExposureEvent traceEvent;
+    private String mAutoDownloadPlatform;
     private final int row = 3;
     private final int column = 3;
     private boolean isLoadPlatform;
@@ -105,12 +105,19 @@ public class DownloadDialog implements OnCollectionCallBackListener {
         return instance;
     }
 
+    // 自动下载并翻到相应页面
+    public void showPopupWindowAutoDownload(View view, GameEntity gameEntity, String autoDownloadPlatform,
+                                            String entrance, String location, ExposureEvent traceEvent) {
+        mAutoDownloadPlatform = autoDownloadPlatform;
+        showPopupWindow(view, gameEntity, entrance, location, traceEvent);
+    }
+
     public void showPopupWindow(View view, GameEntity gameEntity, String entrance, String location) {
         showPopupWindow(view, gameEntity, entrance, location, null);
     }
 
-    public void showPopupWindow(View view, GameEntity gameEntity, String entrance, String location, @Nullable ExposureEvent traceEvent) {
-
+    public void showPopupWindow(View view, GameEntity gameEntity, String entrance, String location,
+                                @Nullable ExposureEvent traceEvent) {
         if (isShow && (popupWindow == null || !popupWindow.isShowing())) {
             isShow = false;
         }
@@ -138,14 +145,14 @@ public class DownloadDialog implements OnCollectionCallBackListener {
         // 一个自定义的布局，作为显示的内容
         View contentView = View.inflate(mContext, R.layout.game_download_dialog, null);
 
-        TextView title = (TextView) contentView.findViewById(R.id.dialog_title);
+        TextView title = contentView.findViewById(R.id.dialog_title);
         title.setText(gameEntity.getName());
 
-        viewPager = (ViewPager) contentView.findViewById(R.id.dialog_viewPager);
-        dialog_ll_hint = (LinearLayout) contentView.findViewById(R.id.dialog_ll_hint);
-        dialog_ll_collection = (LinearLayout) contentView.findViewById(R.id.dialog_ll_collection);
-        dialog_ll_collection_hint = (LinearLayout) contentView.findViewById(R.id.dialog_ll_collection_hint);
-        collectionViewPager = (ViewPager) contentView.findViewById(R.id.dialog_collection_viewPager);
+        viewPager = contentView.findViewById(R.id.dialog_viewPager);
+        dialog_ll_hint = contentView.findViewById(R.id.dialog_ll_hint);
+        dialog_ll_collection = contentView.findViewById(R.id.dialog_ll_collection);
+        dialog_ll_collection_hint = contentView.findViewById(R.id.dialog_ll_collection_hint);
+        collectionViewPager = contentView.findViewById(R.id.dialog_collection_viewPager);
 
         isLoadPlatform = false;
 
@@ -156,32 +163,21 @@ public class DownloadDialog implements OnCollectionCallBackListener {
         popupWindow = new PopupWindow(contentView, LayoutParams.MATCH_PARENT,
                 LayoutParams.MATCH_PARENT, true);
 
-        contentView.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                popupWindow.dismiss();
-            }
-        });
+        contentView.setOnClickListener(v -> popupWindow.dismiss());
         contentView.setFocusable(true);
         contentView.setFocusableInTouchMode(true);
-        contentView.setOnKeyListener(new View.OnKeyListener() {
-            @Override
-            public boolean onKey(View v, int keyCode, KeyEvent event) {
-                if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0
-                        && popupWindow != null && popupWindow.isShowing()) {
-                    popupWindow.dismiss();
-                }
-                return false;
+        contentView.setOnKeyListener((v, keyCode, event) -> {
+            if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0
+                    && popupWindow != null && popupWindow.isShowing()) {
+                popupWindow.dismiss();
             }
+            return false;
         });
 
-        popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
-            @Override
-            public void onDismiss() {
-                isShow = false;
-                EventBus.getDefault().unregister(DownloadDialog.this);
-                DownloadManager.getInstance(mContext).removeObserver(dataWatcher);
-            }
+        popupWindow.setOnDismissListener(() -> {
+            isShow = false;
+            EventBus.getDefault().unregister(DownloadDialog.this);
+            DownloadManager.getInstance(mContext).removeObserver(dataWatcher);
         });
 
         popupWindow.setTouchable(true);
@@ -241,12 +237,12 @@ public class DownloadDialog implements OnCollectionCallBackListener {
         String packageName = apkEntity.getPackageName();
         DownloadEntity downloadEntity = DownloadManager.getInstance(mContext).getDownloadEntityByUrl(apkEntity.getUrl());
         if (downloadEntity == null) {
-            if (!TextUtils.isEmpty(packageName) && PackageManager.INSTANCE.isInstalled(packageName)) {
+            if (!TextUtils.isEmpty(packageName) && PackagesManager.INSTANCE.isInstalled(packageName)) {
                 gh_id = PackageUtils.getMetaData(mContext, packageName, "gh_id");
                 if (gh_id == null || gh_id.equals(gameEntity.getId())) {
                     if (!PackageUtils.isSignature(mContext, packageName)) {
                         return 8;
-                    } else if (PackageManager.INSTANCE.isCanUpdate(gameEntity.getId(), packageName)) {
+                    } else if (PackagesManager.INSTANCE.isCanUpdate(gameEntity.getId(), packageName)) {
                         return 5;
                     } else {
                         return 2;
@@ -397,10 +393,34 @@ public class DownloadDialog implements OnCollectionCallBackListener {
         if (viewPager != null) {
             currentItem = viewPager.getCurrentItem();
         }
+        if (!TextUtils.isEmpty(mAutoDownloadPlatform)) {
+            for (int i = 0; i < apkList.size(); i++) {
+                ApkEntity apkEntity = apkList.get(i);
+                if (mAutoDownloadPlatform.equals(apkEntity.getPlatform())) {
+                    currentItem = (i / 9);
+                    break;
+                }
+                GameCollectionEntity apkCollection = apkEntity.getApkCollection();
+                if (apkCollection != null) {
+                    List<ApkEntity> saveApkEntity = apkCollection.getSaveApkEntity();
+                    if (saveApkEntity != null) {
+                        for (ApkEntity entity : saveApkEntity) {
+                            if (mAutoDownloadPlatform.equals(entity.getPlatform())) {
+                                currentItem = (i / 9);
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
         Utils.log("currentItem = " + currentItem);
-        adapter = new PlatformPagerAdapter(mContext, this, gameEntity, apkList, entrance, location, traceEvent);
+        adapter = new PlatformPagerAdapter(mContext, this,
+                gameEntity, apkList, mAutoDownloadPlatform, entrance, location, traceEvent);
         viewPager.setAdapter(adapter);
         viewPager.setCurrentItem(currentItem);
+        if (currentItem != 0) setDownloadOvalHint(dialog_ll_hint, currentItem);
     }
 
     private void addHintPoint(LinearLayout linearLayout, int size) {
@@ -467,7 +487,8 @@ public class DownloadDialog implements OnCollectionCallBackListener {
     public void showCollection(GameCollectionEntity gameCollectionEntity) {
         dialog_ll_collection.setVisibility(View.VISIBLE);
 
-        int count = gameCollectionEntity.getSaveApkEntity().size();
+        List<ApkEntity> saveApkList = gameCollectionEntity.getSaveApkEntity();
+        int count = saveApkList.size();
         int vpHeight;
         if (count <= 3) {
             vpHeight = 82;
@@ -482,14 +503,31 @@ public class DownloadDialog implements OnCollectionCallBackListener {
         collectionViewPager.setLayoutParams(layoutParams);
 
         dialog_ll_collection_hint.removeAllViews();
-        int size = (int) Math.ceil(gameCollectionEntity.getSaveApkEntity().size() / (double) (row * column));
+        int size = (int) Math.ceil(count / (double) (row * column));
         addHintPoint(dialog_ll_collection_hint, size);
 
         collectionAdapter = new PlatformPagerAdapter(
-                mContext, null, gameEntity, gameCollectionEntity.getSaveApkEntity(), entrance, location, traceEvent);
+                mContext, null, gameEntity, saveApkList,
+                mAutoDownloadPlatform, entrance, location, traceEvent);
         collectionViewPager.setAdapter(collectionAdapter);
 
         collectionViewPager.addOnPageChangeListener(new MyPageChangeListener(dialog_ll_collection_hint));
+
+        int currentItem = 0;
+        if (!TextUtils.isEmpty(mAutoDownloadPlatform)) {
+            for (int i = 0; i < saveApkList.size(); i++) {
+                ApkEntity apkEntity = saveApkList.get(i);
+                if (mAutoDownloadPlatform.equals(apkEntity.getPlatform())) {
+                    currentItem = (i / 9);
+                    break;
+                }
+            }
+        }
+        if (currentItem != 0) {
+            collectionViewPager.setCurrentItem(currentItem);
+            setDownloadOvalHint(dialog_ll_collection_hint, currentItem);
+        }
+        mAutoDownloadPlatform = null;
     }
 
     // 隐藏合集
@@ -514,15 +552,7 @@ public class DownloadDialog implements OnCollectionCallBackListener {
 
         @Override
         public void onPageSelected(int position) {
-            for (int i = 0, size = linearLayout.getChildCount(); i < size; i++) {
-                if (i == position % size) {
-                    ((ImageView) linearLayout.getChildAt(i))
-                            .setImageResource(R.drawable.download_oval_hint_up);
-                } else {
-                    ((ImageView) linearLayout.getChildAt(i))
-                            .setImageResource(R.drawable.oval_hint_gray_bg);
-                }
-            }
+            setDownloadOvalHint(linearLayout, position);
         }
 
         @Override
@@ -531,4 +561,16 @@ public class DownloadDialog implements OnCollectionCallBackListener {
         }
     }
 
+    private void setDownloadOvalHint(LinearLayout linearLayout, int position) {
+        for (int i = 0, size = linearLayout.getChildCount(); i < size; i++) {
+            if (i == position % size) {
+                ((ImageView) linearLayout.getChildAt(i))
+                        .setImageResource(R.drawable.download_oval_hint_up);
+            } else {
+                ((ImageView) linearLayout.getChildAt(i))
+                        .setImageResource(R.drawable.oval_hint_gray_bg);
+            }
+        }
+    }
+
 }

app/src/main/java/com/gh/common/view/DrawableView.kt

@@ -0,0 +1,23 @@
+package com.gh.common.view
+
+import android.graphics.Color
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.GradientDrawable
+import com.gh.common.util.DisplayUtils
+
+
+object DrawableView {
+
+    @JvmStatic
+    fun getServerDrawable(colorCode: String): Drawable {
+        return getServerDrawable(Color.parseColor(colorCode))
+    }
+
+    @JvmStatic
+    fun getServerDrawable(colorCode: Int): Drawable {
+        val drawable = GradientDrawable()
+        drawable.setColor(colorCode)
+        drawable.cornerRadius = DisplayUtils.dip2px(2F).toFloat()
+        return drawable
+    }
+}

app/src/main/java/com/gh/common/view/MessageSpannableTextView.java

@@ -0,0 +1,136 @@
+package com.gh.common.view;
+
+import android.content.Context;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.TextPaint;
+import android.text.TextUtils;
+import android.text.style.ClickableSpan;
+import android.util.AttributeSet;
+import android.view.View;
+
+import com.gh.gamecenter.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class MessageSpannableTextView extends android.support.v7.widget.AppCompatTextView {
+
+    private OnSpannableClickListener mSpannableClickListener;
+
+    private final String mStartMarkKey = "{{";
+    private final String mEndMarkKey = "}}";
+
+    private List<MarkData> mMarkList;
+
+    public MessageSpannableTextView(Context context) {
+        super(context);
+    }
+
+    public MessageSpannableTextView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mMarkList = new ArrayList<>();
+    }
+
+    @Override
+    public void setText(CharSequence text, BufferType type) {
+        if (TextUtils.isEmpty(text) ||
+                !text.toString().contains(mStartMarkKey) && !text.toString().contains(mEndMarkKey)) {
+            super.setText(text, type);
+            return;
+        }
+
+        mMarkList.clear();
+        String sText = text.toString();
+        String[] split = sText.split("\\}\\}");
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < split.length; i++) {
+            String s = split[i];
+            int p = s.lastIndexOf(mStartMarkKey);
+            if (p != -1) {
+                MarkData markData = new MarkData();
+                String substring = s.substring(p);
+                String content = s.replace(substring, "");
+                builder.append(content);
+                markData.setStart(builder.length() + 1);
+
+                String key = substring.replace(mStartMarkKey, " ") + " ";
+                builder.append(key);
+                markData.setEnd(builder.length() - 1);
+                markData.setKey(key);
+
+                mMarkList.add(markData);
+                System.out.println(substring);
+                System.out.println(s);
+            } else {
+                builder.append(s);
+                if (i != split.length - 1 || sText.substring(sText.length() - 2, sText.length()).equals("}}")) {
+                    builder.append("}}");
+                }
+            }
+        }
+
+        SpannableStringBuilder msp = new SpannableStringBuilder(builder);
+        for (MarkData markData : mMarkList) {
+            msp.setSpan(new ClickableSpan() {
+                @Override
+                public void updateDrawState(TextPaint ds) {
+                    super.updateDrawState(ds);
+                    ds.setColor(getContext().getResources().getColor(R.color.tag_orange));
+                    ds.setUnderlineText(true);
+                }
+
+                @Override
+                public void onClick(View widget) {
+                    if (mSpannableClickListener != null) {
+                        mSpannableClickListener.onClick(markData.getKey().trim());
+                    }
+                }
+            }, markData.getStart(), markData.getEnd(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+        }
+
+        setMovementMethod(CustomLinkMovementMethod.getInstance());
+        super.setText(msp, type);
+    }
+
+    public void setOnSpannableClickListener(OnSpannableClickListener spannableClickListener) {
+        this.mSpannableClickListener = spannableClickListener;
+    }
+
+
+    public interface OnSpannableClickListener {
+        void onClick(String spannableText);
+    }
+
+    class MarkData {
+        private int start;
+        private int end;
+        private String key;
+
+        public int getStart() {
+            return start;
+        }
+
+        public void setStart(int start) {
+            this.start = start;
+        }
+
+        public int getEnd() {
+            return end;
+        }
+
+        public void setEnd(int end) {
+            this.end = end;
+        }
+
+        public String getKey() {
+            return key;
+        }
+
+        public void setKey(String key) {
+            this.key = key;
+        }
+    }
+}

app/src/main/java/com/gh/common/view/PlayerView.kt

@@ -60,12 +60,12 @@ class PlayerView @JvmOverloads constructor(context: Context, attrs: AttributeSet
         if (v.id == R.id.start || v.id == R.id.thumb) {
             if (Jzvd.CURRENT_STATE_PLAYING != currentState) {
                 if ((currentScreen == SCREEN_WINDOW_NORMAL || currentScreen == SCREEN_WINDOW_LIST)) {
-                    MtaHelper.onEvent("游戏详情", "视频_点击播放", gameName)
+                    MtaHelper.onEvent("游戏详情_新", "视频_点击播放", gameName)
                 } else {
-                    MtaHelper.onEvent("游戏详情", "视频全屏_点击播放", gameName)
+                    MtaHelper.onEvent("游戏详情_新", "视频全屏_点击播放", gameName)
                 }
             } else {
-                MtaHelper.onEvent("游戏详情", "视频_点击暂停", gameName)
+                MtaHelper.onEvent("游戏详情_新", "视频_点击暂停", gameName)
             }
 
             if (showAlertDialogForTheFistTime
@@ -86,7 +86,7 @@ class PlayerView @JvmOverloads constructor(context: Context, attrs: AttributeSet
                         Jzvd.FULLSCREEN_ORIENTATION = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
                         JZUtils.setRequestedOrientation(context, Jzvd.FULLSCREEN_ORIENTATION)
                     }
-                    MtaHelper.onEvent("游戏详情", "视频全屏_点击旋转", gameName)
+                    MtaHelper.onEvent("游戏详情_新", "视频全屏_点击旋转", gameName)
                 }
                 R.id.mute -> {
                     toggleMute()
@@ -130,7 +130,7 @@ class PlayerView @JvmOverloads constructor(context: Context, attrs: AttributeSet
         } else {
             mAudioManager.setStreamVolume(AudioManager.STREAM_MUSIC, 0, 0)
         }
-        MtaHelper.onEvent("游戏详情", "视频_点击静音", gameName)
+        MtaHelper.onEvent("游戏详情_新", "视频_点击静音", gameName)
     }
 
     private fun unmute() {
@@ -143,7 +143,7 @@ class PlayerView @JvmOverloads constructor(context: Context, attrs: AttributeSet
                     60 * mAudioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC),
                     0)
         }
-        MtaHelper.onEvent("游戏详情", "视频_解除静音", gameName)
+        MtaHelper.onEvent("游戏详情_新", "视频_解除静音", gameName)
     }
 
     override fun onStatePlaying() {
@@ -257,7 +257,7 @@ class PlayerView @JvmOverloads constructor(context: Context, attrs: AttributeSet
         if (currentScreen == SCREEN_WINDOW_NORMAL || currentScreen == SCREEN_WINDOW_LIST) {
             progressBar.visibility = View.INVISIBLE
             totalTimeTextView.visibility = View.INVISIBLE
-            MtaHelper.onEvent("游戏详情", "视频全屏_点击后退", gameName)
+            MtaHelper.onEvent("游戏详情_新", "视频全屏_点击后退", gameName)
         } else {
             progressBar.visibility = View.VISIBLE
             totalTimeTextView.visibility = View.VISIBLE
@@ -267,7 +267,7 @@ class PlayerView @JvmOverloads constructor(context: Context, attrs: AttributeSet
     override fun startWindowFullscreen() {
         super.startWindowFullscreen()
         unmute()
-        MtaHelper.onEvent("游戏详情", "视频_点击进入全屏", gameName)
+        MtaHelper.onEvent("游戏详情_新", "视频_点击进入全屏", gameName)
     }
 
     override fun startDismissControlViewTimer() {

app/src/main/java/com/gh/common/view/RichEditor.java

@@ -398,7 +398,11 @@ public class RichEditor extends WebView {
 
     private void load(String trigger) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            evaluateJavascript(trigger, null);
+            try {
+                evaluateJavascript(trigger, null);
+            } catch (IllegalStateException ignore) {
+                loadUrl(trigger);
+            }
         } else {
             loadUrl(trigger);
         }

app/src/main/java/com/gh/common/view/SwipeLayout.java

@@ -1277,7 +1277,7 @@ public class SwipeLayout extends FrameLayout {
         }
 
         if (currentDragEdge == DragEdge.Left) {
-//            if (xvel > minVelocity) open(); //TODO 打开侧滑不受侧滑速度限制
+//            if (xvel > minVelocity) open(); // 打开侧滑不受侧滑速度限制
 //            else
             if (xvel < -minVelocity) close();
             else {

app/src/main/java/com/gh/common/view/VerticalItemDecoration.java

@@ -18,7 +18,7 @@ public class VerticalItemDecoration extends RecyclerView.ItemDecoration {
     private int mIntervalLR;
     private boolean mIsShowIntervalTop;
 
-    public VerticalItemDecoration(Context context, int interval, boolean isShowIntervalTop) {
+    public VerticalItemDecoration(Context context, float interval, boolean isShowIntervalTop) {
         paint = new Paint();
         paint.setColor(ContextCompat.getColor(context, R.color.background));
         mInterval = DisplayUtils.dip2px(context, interval);
@@ -33,6 +33,14 @@ public class VerticalItemDecoration extends RecyclerView.ItemDecoration {
         mIntervalLR = DisplayUtils.dip2px(context, intervalLR);
     }
 
+    // cutting
+    public VerticalItemDecoration(Context context, boolean isShowIntervalTop) {
+        paint = new Paint();
+        paint.setColor(ContextCompat.getColor(context, R.color.bg_ededed));
+        mInterval = (int) context.getResources().getDimension(R.dimen.cutting_line);
+        mIsShowIntervalTop = isShowIntervalTop;
+    }
+
     @Override
     public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {
         int left = parent.getPaddingLeft();
@@ -45,7 +53,7 @@ public class VerticalItemDecoration extends RecyclerView.ItemDecoration {
             int bottom = top + mInterval;
 
             if (i == 0 && mIsShowIntervalTop) {
-                c.drawRect(left + mIntervalLR, 0, right - mIntervalLR, bottom, paint);
+                c.drawRect(left + mIntervalLR, 0, right - mIntervalLR, mInterval, paint);
             } else {
                 c.drawRect(left + mIntervalLR, top, right - mIntervalLR, bottom, paint);
             }

app/src/main/java/com/gh/download/DownloadManager.java

@@ -3,6 +3,7 @@ package com.gh.download;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
@@ -15,13 +16,15 @@ import com.gh.common.exposure.ExposureEvent;
 import com.gh.common.util.AppDebugConfig;
 import com.gh.common.util.DataCollectionUtils;
 import com.gh.common.util.DialogUtils;
+import com.gh.common.util.GdtHelper;
 import com.gh.common.util.MD5Utils;
 import com.gh.common.util.PackageUtils;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.eventbus.EBDownloadStatus;
-import com.gh.gamecenter.manager.PackageManager;
+import com.gh.gamecenter.manager.PackagesManager;
 import com.google.gson.Gson;
+import com.halo.assistant.HaloApp;
 import com.lightgame.config.CommonDebug;
 import com.lightgame.download.ConnectionUtils;
 import com.lightgame.download.DataChanger;
@@ -35,6 +38,7 @@ import com.lightgame.download.DownloadStatusListener;
 import com.lightgame.download.DownloadStatusManager;
 import com.lightgame.download.FileUtils;
 import com.lightgame.utils.Utils;
+import com.qq.gdt.action.ActionType;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -232,7 +236,7 @@ public class DownloadManager implements DownloadStatusListener {
         downloadEntity.setVersionName(apkEntity.getVersion());
         int installed = 0;
         for (ApkEntity apk : gameEntity.getApk()) {
-            if (PackageManager.INSTANCE.isInstalled(apk.getPackageName())) {
+            if (PackagesManager.INSTANCE.isInstalled(apk.getPackageName())) {
                 installed++;
             }
         }
@@ -259,6 +263,9 @@ public class DownloadManager implements DownloadStatusListener {
 
         // 收集下载数据
         DataCollectionUtils.uploadDownload(context, downloadEntity, "开始");
+        GdtHelper.INSTANCE.logAction(ActionType.DOWNLOAD_APP,
+                GdtHelper.GAME_ID, downloadEntity.getGameId(),
+                GdtHelper.PLATFORM, downloadEntity.getPlatform());
     }
 
     /**
@@ -274,7 +281,7 @@ public class DownloadManager implements DownloadStatusListener {
                 downloadEntity.setStatus(DownloadStatus.done);
                 DataChanger.INSTANCE.notifyDataChanged(downloadEntity);
             } else if (!isTaskDownloading(url)) {
-                mContext.startService(getIntent(downloadEntity, DownloadStatus.add));
+                startDownloadService(downloadEntity, DownloadStatus.add);
             }
             put(url, System.currentTimeMillis());
             putStatus(url, DownloadStatus.downloading);
@@ -295,7 +302,7 @@ public class DownloadManager implements DownloadStatusListener {
                 downloadEntity.setStatus(DownloadStatus.done);
                 DataChanger.INSTANCE.notifyDataChanged(downloadEntity);
             } else if (!isTaskDownloading(url)) {
-                mContext.startService(getIntent(downloadEntity, DownloadStatus.subscribe));
+                startDownloadService(downloadEntity, DownloadStatus.subscribe);
             }
             put(url, System.currentTimeMillis());
             putStatus(url, DownloadStatus.subscribe);
@@ -469,7 +476,7 @@ public class DownloadManager implements DownloadStatusListener {
         }
         if (entry != null) {
             entry.setStatus(DownloadStatus.cancel);
-            mContext.startService(getIntent(entry, DownloadStatus.cancel));
+            startDownloadService(entry, DownloadStatus.cancel);
             Utils.log(DownloadManager.class.getSimpleName(), "cancel");
         }
     }
@@ -513,7 +520,7 @@ public class DownloadManager implements DownloadStatusListener {
         checkDownloadEntryRecordValidate(url);
         DownloadEntity entry = DataChanger.INSTANCE.getDownloadEntries().get(url);
         if (entry != null) {
-            mContext.startService(getIntent(entry, DownloadStatus.pause));
+            startDownloadService(entry, DownloadStatus.pause);
             put(url, System.currentTimeMillis());
             statusMap.put(url, DownloadStatus.pause);
         }
@@ -541,10 +548,8 @@ public class DownloadManager implements DownloadStatusListener {
         }
 
         // 开启下载服务
-        mContext.startService(new Intent(mContext, DownloadService.class));
-
+        startDownloadServiceInBackground();
         DownloadNotification.showDownloadingNotification(mContext);
-
     }
 
     public void addObserver(DataWatcher dataWatcher) {
@@ -556,6 +561,22 @@ public class DownloadManager implements DownloadStatusListener {
         Utils.log(DownloadManager.class.getSimpleName(), "removeObserver");
         DataChanger.INSTANCE.deleteObserver(dataWatcher);
     }
+
+    public void startDownloadServiceInBackground() {
+        mContext.startService(new Intent(mContext, DownloadService.class));
+    }
+
+    public void startDownloadService(DownloadEntity downloadEntity, DownloadStatus status) {
+        Intent serviceIntent = getIntent(downloadEntity, status);
+        // 当满足系统版本大于 8.0 、应用在后台运行时以前台服务开启
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
+                && !HaloApp.getInstance().isRunningForeground) {
+            serviceIntent.putExtra(DownloadService.KEY_SERVICE_ACTION, DownloadService.START_FOREGROUND);
+            mContext.startForegroundService(serviceIntent);
+        } else {
+            mContext.startService(serviceIntent);
+        }
+    }
 //
 //    public void removeObservers() {
 //        Utils.log(DownloadManager.class.getSimpleName(), "removeObserver");

app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java

@@ -1,5 +1,6 @@
 package com.gh.gamecenter;
 
+import android.Manifest;
 import android.animation.Animator;
 import android.app.Activity;
 import android.content.Context;
@@ -52,6 +53,7 @@ import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.OnClick;
+import pub.devrel.easypermissions.EasyPermissions;
 
 import static com.gh.gamecenter.KcSelectGameActivity.SEND_OVER_REQUEST;
 
@@ -127,6 +129,8 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
 
     private Handler handler = new MyHandler(this);
 
+    private String[] mPermissions = {Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION};
+
     @NonNull
     public static Intent getIntent(Context context, boolean showConnHintDialog) {
         Intent intent = new Intent(context, ChooseReceiverActivity.class);
@@ -148,6 +152,15 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
         mToolbarContainer = findViewById(R.id.normal_toolbar_container);
 
         sp = PreferenceManager.getDefaultSharedPreferences(this);
+
+        // 检查权限
+        EasyPermissions.requestPermissions(this, "传输文件需要定位权限", 0x9527, mPermissions);
+    }
+
+    @Override
+    public void onPermissionsGranted(int requestCode, List<String> perms) {
+        super.onPermissionsGranted(requestCode, perms);
+
         conUserIconTag = 1;
         mRadarView.setSearching(true);
 
@@ -177,6 +190,13 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
         }
     }
 
+    @Override
+    public void onPermissionsDenied(int requestCode, List<String> perms) {
+        super.onPermissionsDenied(requestCode, perms);
+        toast("请授予定位权限");
+        finish();
+    }
+
     @Override
     public int provideNavigationIcon() {
         return R.drawable.ic_filereceive_back;
@@ -292,7 +312,7 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
 //                "\n2.点击首页左上角，进入下载管理 \n3.点击“零流量传送”，再点击“我要接收”",
 //                "确定");
 
-        // TODO 是否需要关闭扫描？？
+        //  是否需要关闭扫描？？
 
         startActivity(ShareGhActivity.getIntent(this));
     }    //1.连接网络

app/src/main/java/com/gh/gamecenter/CleanApkActivity.java

@@ -13,11 +13,6 @@ public class CleanApkActivity extends NormalActivity {
 
     @NonNull
     public static Intent getIntent(Context context) {
-//        Intent intent = new Intent(context, CleanApkActivity.class);
-//        return new IntentFactory.Builder(context)
-//                .setActivity(CleanApkActivity.class)
-//                .setFragment(ApkCleanerFragment.class).build();
-
         return getTargetIntent(context, CleanApkActivity.class, ApkCleanerFragment.class);
     }
 

app/src/main/java/com/gh/gamecenter/CommonActivity.java

@@ -1,38 +0,0 @@
-package com.gh.gamecenter;
-
-import android.view.MenuItem;
-
-import com.gh.base.BaseToolBarActivity;
-import com.gh.gamecenter.normal.ToolbarController;
-
-public class CommonActivity extends BaseToolBarActivity implements ToolbarController {
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.layout_wrapper_activity_toolbar;
-    }
-
-    @Override
-    protected boolean onNavigationIconClicked() {
-        onBackPressed();
-        return true;
-    }
-
-    @Override
-    public void setNavigationTitle(int res) {
-
-    }
-
-    @Override
-    public void setToolbarMenu(int res) {
-
-    }
-
-
-    @Deprecated
-    @Override
-    public MenuItem getMenuItem(int res) {
-        return null;
-    }
-
-}

app/src/main/java/com/gh/gamecenter/ConcernActivity.java

@@ -17,9 +17,6 @@ public class ConcernActivity extends NormalActivity {
     public static Intent getIntent(Context context, String entrance) {
         Bundle args = new Bundle();
         args.putString(EntranceUtils.KEY_ENTRANCE, entrance);
-//        return new IntentFactory.Builder(context)
-//                .setActivity(ConcernActivity.class)
-//                .setFragment(MyConcernFragment.class).setArgs(args).build();
         return getTargetIntent(context, ConcernActivity.class, MyConcernFragment.class, args);
     }
 

app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java

@@ -27,9 +27,6 @@ public class DownloadManagerActivity extends NormalActivity {
     }
 
     public static Intent getDownloadMangerIntent(Context context, String url, String entrance) {
-//        Intent intent = new Intent(context, DownloadManagerActivity.class);
-//        intent.putExtra(EntranceUtils.KEY_URL, url);
-//        intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
         Bundle bundle = new Bundle();
         bundle.putString(EntranceUtils.KEY_URL, url);
         bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance);
@@ -37,53 +34,20 @@ public class DownloadManagerActivity extends NormalActivity {
     }
 
     public static Intent getDownloadMangerIntent(Context context, int position, String entrance) {
-//        Intent intent = new Intent(context, DownloadManagerActivity.class);
-//        intent.putExtra(EntranceUtils.KEY_URL, url);
-//        intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
         Bundle bundle = new Bundle();
         bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance);
         bundle.putInt(BaseFragment_TabLayout.PAGE_INDEX, position);
         return getTargetIntent(context, DownloadManagerActivity.class, DownloadFragment.class, bundle);
     }
 
-
-//    public static void startDownloadManagerActivity(Context context, String url, String entrance) {
-//        Intent intent = new Intent(context, DownloadManagerActivity.class);
-//        intent.putExtra(EntranceUtils.KEY_URL, url);
-//        intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
-//        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-//        context.startActivity(intent);
-//    }
-//
-//    @Override
-//    protected int getLayoutId() {
-//        return R.layout.activity_downloadmanager;
-//    }
-
-//    @Override
-//    protected void onCreate(Bundle savedInstanceState) {
-//        super.onCreate(savedInstanceState);
-//
-//        setNavigationTitle(getString(R.string.title_downloadmanager));
-//
-//        startDownloadFragment();
-//    }
-//
-//    private void startDownloadFragment() {
-//        int currentItem = getIntent().getIntExtra(EntranceUtils.KEY_CURRENTITEM, 0);
-//        Bundle data = getIntent().getBundleExtra(EntranceUtils.KEY_DATA);
-//        if (data != null) {
-//            currentItem = data.getInt(EntranceUtils.KEY_CURRENTITEM, 0);
-//        }
-//
-//        getSupportFragmentManager().beginTransaction().replace(
-//                R.id.layout_fragment_content, DownloadFragment.newInstance(currentItem)).commitAllowingStateLoss();
-//    }
-//
-//    @Override
-//    protected void onNewIntent(Intent intent) {
-//        super.onNewIntent(intent);
-//        startDownloadFragment();
-//        setIntent(intent);
-//    }
+    /**
+     * 根据packageName检查是否可以更新/插件化 如果可以则自动下载
+     */
+    public static Intent getDownloadMangerIntent(Context context, String packageName, int position, String entrance) {
+        Bundle bundle = new Bundle();
+        bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance);
+        bundle.putInt(BaseFragment_TabLayout.PAGE_INDEX, position);
+        bundle.putString(EntranceUtils.KEY_PACKAGENAME, packageName);
+        return getTargetIntent(context, DownloadManagerActivity.class, DownloadFragment.class, bundle);
+    }
 }

app/src/main/java/com/gh/gamecenter/GameDetailActivity.java

@@ -34,8 +34,6 @@ public class GameDetailActivity extends NormalActivity {
         Bundle bundle = new Bundle();
         bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance);
         bundle.putParcelable(GameEntity.TAG, gameEntity);
-//        context.startActivity(new IntentFactory.Builder(context).setActivity(GameDetailActivity.class)
-//                .setFragment(GameDetailFragment.class).setArgs(bundle).build());
         context.startActivity(getTargetIntent(context, GameDetailActivity.class, GameDetailFragment.class, bundle));
     }
 
@@ -46,8 +44,6 @@ public class GameDetailActivity extends NormalActivity {
         Bundle bundle = new Bundle();
         bundle.putString(EntranceUtils.KEY_GAMEID, gameId);
         bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance);
-//        context.startActivity(new IntentFactory.Builder(context).setActivity(GameDetailActivity.class)
-//                .setFragment(GameDetailFragment.class).setArgs(bundle).build());
         context.startActivity(getTargetIntent(context, GameDetailActivity.class, GameDetailFragment.class, bundle));
     }
 
@@ -58,7 +54,7 @@ public class GameDetailActivity extends NormalActivity {
         DataUtils.onMtaEvent(context, "详情页面", "游戏详情", gameEntity != null ? gameEntity.getName() : "");
 
         ExposureEvent clickEvent = ExposureEvent.Companion.createEvent(gameEntity, traceEvent.getSource(), ExposureTraceUtils.INSTANCE.appendTrace(traceEvent), ExposureType.CLICK);
-        ExposureManager.INSTANCE.log(clickEvent, false);
+        ExposureManager.INSTANCE.log(clickEvent);
         Bundle bundle = new Bundle();
         bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance);
         bundle.putParcelable(GameEntity.TAG, gameEntity);
@@ -72,7 +68,7 @@ public class GameDetailActivity extends NormalActivity {
     public static void startGameDetailActivity(Context context, String gameId, String entrance, ExposureEvent traceEvent) {
 
         ExposureEvent clickEvent = ExposureEvent.Companion.createEvent(new GameEntity(gameId), traceEvent.getSource(), ExposureTraceUtils.INSTANCE.appendTrace(traceEvent), ExposureType.CLICK);
-        ExposureManager.INSTANCE.log(clickEvent, false);
+        ExposureManager.INSTANCE.log(clickEvent);
 
         Bundle bundle = new Bundle();
         bundle.putString(EntranceUtils.KEY_GAMEID, gameId);
@@ -81,6 +77,17 @@ public class GameDetailActivity extends NormalActivity {
         context.startActivity(getTargetIntent(context, GameDetailActivity.class, GameDetailFragment.class, bundle));
     }
 
+    /**
+     * 启动游戏详情页面
+     */
+    public static void startGameDetailCommentActivity(Context context, String gameId, String entrance) {
+        Bundle bundle = new Bundle();
+        bundle.putString(EntranceUtils.KEY_GAMEID, gameId);
+        bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance);
+        bundle.putBoolean(EntranceUtils.KEY_SKIP_GAME_COMMENT, true);
+        context.startActivity(getTargetIntent(context, GameDetailActivity.class, GameDetailFragment.class, bundle));
+    }
+
     @Override
     public void onBackPressed() {
         if (Jzvd.backPress()) {

app/src/main/java/com/gh/gamecenter/GameNewsActivity.java

@@ -17,19 +17,11 @@ public class GameNewsActivity extends NormalActivity {
 
     @NonNull
     public static Intent getIntent(Context context, String gameName, String gameId, String entrance) {
-//        Intent intent = new Intent(context, GameNewsActivity.class);
-//        intent.putExtra(EntranceUtils.KEY_GAMENAME, gameName);
-//        intent.putExtra(EntranceUtils.KEY_GAMEID, gameId);
-//        intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
-//        return intent;
 
         final Bundle args = new Bundle();
         args.putString(EntranceUtils.KEY_GAMENAME, gameName);
         args.putString(EntranceUtils.KEY_GAMEID, gameId);
         args.putString(EntranceUtils.KEY_ENTRANCE, entrance);
-//        return new IntentFactory.Builder(context)
-//                .setActivity(GameNewsActivity.class)
-//                .setFragment(GameNewsSearchFragment.class).setArgs(args).build();
         return getTargetIntent(context, GameNewsActivity.class, GameNewsSearchFragment.class, args);
     }
 

app/src/main/java/com/gh/gamecenter/InstallActivity.java

@@ -1,5 +1,6 @@
 package com.gh.gamecenter;
 
+import android.arch.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -22,9 +23,10 @@ import com.gh.download.DownloadManager;
 import com.gh.gamecenter.adapter.InstallFragmentAdapter;
 import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.eventbus.EBDownloadStatus;
-import com.gh.gamecenter.eventbus.EBPackage;
 import com.gh.gamecenter.eventbus.EBReuse;
 import com.gh.gamecenter.eventbus.EBSkip;
+import com.gh.gamecenter.manager.PackagesManager;
+import com.gh.gamecenter.packagehelper.PackageViewModel;
 import com.lightgame.download.DataWatcher;
 import com.lightgame.download.DownloadEntity;
 
@@ -55,7 +57,8 @@ public class InstallActivity extends BaseActivity implements InstallFragmentAdap
     TextView mNoDataSkipHint;
     @BindView(reuse_nodata_skip_tv_btn)
     TextView mNoDataSkipBtn;
-    
+
+    private PackageViewModel mPackageViewModel;
     private InstallFragmentAdapter mAdapter;
 
     private boolean isEverpause = false;
@@ -67,10 +70,12 @@ public class InstallActivity extends BaseActivity implements InstallFragmentAdap
             if (locationList != null && locationList.size() != 0) {
                 GameEntity gameEntity;
                 for (int location : locationList) {
-                    gameEntity = mAdapter.getGameList().get(location);
-                    if (gameEntity != null) {
-                        DownloadItemUtils.processDate(InstallActivity.this, gameEntity,
-                                downloadEntity, mAdapter, location);
+                    if (location < mAdapter.getGameList().size()) {
+                        gameEntity = mAdapter.getGameList().get(location);
+                        if (gameEntity != null) {
+                            DownloadItemUtils.processDate(InstallActivity.this, gameEntity,
+                                    downloadEntity, mAdapter, location);
+                        }
                     }
                 }
             }
@@ -100,19 +105,20 @@ public class InstallActivity extends BaseActivity implements InstallFragmentAdap
         mNoDataSkip.setVisibility(View.GONE);
         mNoDataSkipHint.setText("暂无游戏");
         mNoDataSkipBtn.setText("查看精品推荐");
-        mNoDataSkipBtn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                EventBus.getDefault().post(new EBSkip(MainActivity.EB_SKIP_GAMEFRAGMENT, 0));
-                finish();
-            }
+        mNoDataSkipBtn.setOnClickListener(v -> {
+            EventBus.getDefault().post(new EBSkip(MainActivity.EB_SKIP_GAMEFRAGMENT, 0));
+            finish();
         });
 
         mInstallRv.setLayoutManager(new LinearLayoutManager(this));
         ((DefaultItemAnimator) mInstallRv.getItemAnimator()).setSupportsChangeAnimations(false);
         mAdapter = new InstallFragmentAdapter(this);
-        mInstallRv.addItemDecoration(new VerticalItemDecoration(this, 1, true));
+        mInstallRv.addItemDecoration(new VerticalItemDecoration(this, true));
         mInstallRv.setAdapter(mAdapter);
+
+        mPackageViewModel = ViewModelProviders.of(this, new PackageViewModel.Factory()).get(PackageViewModel.class);
+        mPackageViewModel.getGameInstalledLiveData().observe(this,
+                gameInstalls -> mAdapter.initData(PackagesManager.filterSameApk(gameInstalls)));
     }
 
     @Override
@@ -170,17 +176,6 @@ public class InstallActivity extends BaseActivity implements InstallFragmentAdap
         }
     }
 
-    //安装、卸载事件
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEventMainThread(EBPackage busFour) {
-        if ("安装".equals(busFour.getType()) || "卸载".equals(busFour.getType())) {
-            mInstallRv.setVisibility(View.VISIBLE);
-            mNoDataSkip.setVisibility(View.GONE);
-            mAdapter = new InstallFragmentAdapter(this);
-            mInstallRv.setAdapter(mAdapter);
-        }
-    }
-
     //下载被删除事件
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(EBDownloadStatus status) {

app/src/main/java/com/gh/gamecenter/KaiFuActivity.java

@@ -18,9 +18,6 @@ public class KaiFuActivity extends NormalActivity {
     public static Intent getIntent(Context context, String entrance) {
         Bundle args = new Bundle();
         args.putString(EntranceUtils.KEY_ENTRANCE, entrance);
-//        return new IntentFactory.Builder(context)
-//                .setActivity(KaiFuActivity.class)
-//                .setFragment(KaiFuWrapperFragment.class).setArgs(args).build();
         return getTargetIntent(context, KaiFuActivity.class, KaiFuWrapperFragment.class, args);
     }
 

app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java

@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Handler;
 import android.os.Message;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.LinearLayoutManager;
@@ -14,13 +13,15 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.ethanhua.skeleton.Skeleton;
+import com.ethanhua.skeleton.ViewSkeletonScreen;
 import com.gh.base.BaseActivity;
 import com.gh.base.OnRequestCallBackListener;
 import com.gh.common.util.ApkActiveUtils;
 import com.gh.common.util.DetailDownloadUtils;
+import com.gh.common.util.DeviceTokenUtils;
 import com.gh.common.util.EntranceUtils;
 import com.gh.common.util.LibaoUtils;
-import com.gh.common.util.DeviceTokenUtils;
 import com.gh.common.view.DownloadProgressBar;
 import com.gh.common.view.VerticalItemDecoration;
 import com.gh.download.DownloadManager;
@@ -76,6 +77,10 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap
     LinearLayout mNoneData;
     @BindView(R.id.detail_progressbar)
     DownloadProgressBar mDownloadPb;
+    @BindView(R.id.list_skeleton)
+    View mListSkeleton;
+
+    private ViewSkeletonScreen mSkeleton;
 
     private LibaoDetailAdapter mAdapter;
 
@@ -91,38 +96,35 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap
     protected String mDownloadAddWord;
     protected String mDownloadOffText;
 
-    private Handler handler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            super.handleMessage(msg);
-            if (msg.what == 0) {
-                long time = Utils.getTime(LibaoDetailActivity.this) - 5; // -5 防止获取服务器时间延迟发生的计算错误（）
-                Calendar calendar = Calendar.getInstance();
-                Date date = new Date(time * 1000);
-                calendar.setTime(date);
-                calendar.set(Calendar.HOUR_OF_DAY, 24);
-                calendar.set(Calendar.SECOND, 0);
-                calendar.set(Calendar.MINUTE, 0);
-                calendar.set(Calendar.MILLISECOND, 0);
+    @Override
+    protected void handleMessage(Message msg) {
+        super.handleMessage(msg);
+        if (msg.what == 0) {
+            long time = Utils.getTime(LibaoDetailActivity.this) - 5; // -5 防止获取服务器时间延迟发生的计算错误（）
+            Calendar calendar = Calendar.getInstance();
+            Date date = new Date(time * 1000);
+            calendar.setTime(date);
+            calendar.set(Calendar.HOUR_OF_DAY, 24);
+            calendar.set(Calendar.SECOND, 0);
+            calendar.set(Calendar.MINUTE, 0);
+            calendar.set(Calendar.MILLISECOND, 0);
 
-                long targetTime = calendar.getTimeInMillis();
-                long delayedTime = targetTime - time * 1000;
-                Utils.log("=========delayedTime::" + delayedTime);
-                if (BuildConfig.DEBUG) {
-                    toast("领取时间剩余： " + (delayedTime / 1000) + " 秒");
-                }
-                handler.sendEmptyMessageDelayed(1, delayedTime);
-            } else if (msg.what == 1) {
-                String beforeStatus = mLibaoEntity.getBeforeStatus();
-                if ("ling".equals(beforeStatus)) {
-                    mLibaoEntity.setStatus("repeatLinged"); // 可以重复领取
-                } else {
-                    mLibaoEntity.setStatus("repeatTaoed"); // 可以重复领取
-                }
-                mAdapter.notifyItemChanged(0);
+            long targetTime = calendar.getTimeInMillis();
+            long delayedTime = targetTime - time * 1000;
+            if (BuildConfig.DEBUG) {
+                toast("领取时间剩余： " + (delayedTime / 1000) + " 秒");
             }
+            mBaseHandler.sendEmptyMessageDelayed(1, delayedTime);
+        } else if (msg.what == 1) {
+            String beforeStatus = mLibaoEntity.getBeforeStatus();
+            if ("ling".equals(beforeStatus)) {
+                mLibaoEntity.setStatus("repeatLinged"); // 可以重复领取
+            } else {
+                mLibaoEntity.setStatus("repeatTaoed"); // 可以重复领取
+            }
+            mAdapter.notifyItemChanged(0);
         }
-    };
+    }
 
     private DataWatcher dataWatcher = new DataWatcher() {
         @Override
@@ -150,7 +152,6 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap
     @NonNull
     public static Intent getIntent(Context context, LibaoEntity libaoEntity, String entrance) {
         Intent intent = new Intent(context, LibaoDetailActivity.class);
-//        intent.putExtra(LibaoEntity.TAG, libaoEntity);
         HaloApp.put(LibaoEntity.TAG, libaoEntity);
         intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
         return intent;
@@ -167,7 +168,6 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-//        outState.putParcelable(LibaoEntity.TAG, mAdapter.getLibaoEntity());
         HaloApp.put(LibaoEntity.TAG, mAdapter.getLibaoEntity());
     }
 
@@ -176,11 +176,11 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap
         super.onCreate(savedInstanceState);
         mName = getString(R.string.libao_detail);
         setNavigationTitle(mName);
-//        mLibaoEntity = getIntent().getParcelableExtra(LibaoEntity.TAG);
         mLibaoEntity = (LibaoEntity) HaloApp.get(LibaoEntity.TAG, false);
 
         mIsScroll = true;
 
+        mSkeleton = Skeleton.bind(mListSkeleton).shimmer(false).load(R.layout.activity_libaodetail_skeleton).show();
         mAdapter = new LibaoDetailAdapter(this, this, this, mLibaoEntity, mDownloadPb, mEntrance);
         mLibaoDetailRv.setLayoutManager(new LinearLayoutManager(this) {
             @Override
@@ -191,18 +191,11 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap
         mLibaoDetailRv.addItemDecoration(new VerticalItemDecoration(this, 8, true));
         mLibaoDetailRv.setAdapter(mAdapter);
 
-        mNoConnection.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mNoConnection.setVisibility(View.GONE);
-                mLlLoading.setVisibility(View.VISIBLE);
-                handler.postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        getGameDigest();
-                    }
-                }, 1000);
-            }
+        mNoConnection.setOnClickListener(v -> {
+            mSkeleton.show();
+            mNoConnection.setVisibility(View.GONE);
+            mLlLoading.setVisibility(View.VISIBLE);
+            mBaseHandler.postDelayed(() -> getGameDigest(), 1000);
         });
 
         if (mLibaoEntity == null) {
@@ -277,7 +270,7 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap
                     ("ling".equals(beforeStatus) || "tao".equals(beforeStatus))) { //检查是否到了重复领取时间
                 mListStatus = mLibaoEntity.getStatus();
                 if (isCanLing()) {
-                    handler.sendEmptyMessage(1);
+                    mBaseHandler.sendEmptyMessage(1);
                 } else {
                     if ("ling".equals(beforeStatus)) {
                         mLibaoEntity.setStatus("repeatLing"); // 预备重复领取
@@ -287,7 +280,7 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap
                     mAdapter.notifyItemChanged(0);
 
                     DeviceTokenUtils.syncServerTime(LibaoDetailActivity.this);
-                    handler.sendEmptyMessageDelayed(0, 5000);
+                    mBaseHandler.sendEmptyMessageDelayed(0, 5000);
                 }
             }
         }
@@ -353,6 +346,7 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap
         if (mLibaoEntity.getGame() == null) return;
         String gameId = mLibaoEntity.getGame().getId();
         RetrofitManager.getInstance(this).getApi().getGameNewsDigest(gameId)
+                .map(ApkActiveUtils.filterMapper)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Response<GameEntity>() {
@@ -385,12 +379,6 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap
         mIsScroll = isScroll;
     }
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        handler.removeCallbacksAndMessages(null);
-    }
-
     @Override
     public boolean handleBackPressed() {
         // 重置领取状态
@@ -428,6 +416,8 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap
 
             checkLibaoStatus();
         }
+
+        mSkeleton.hide();
     }
 
     @Override
@@ -445,6 +435,8 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap
         mLlLoading.setVisibility(View.GONE);
         mLibaoDetailRv.setPadding(0, 0, 0, 0);
         mNoConnection.setVisibility(View.VISIBLE);
+
+        mSkeleton.hide();
     }
 
     @Override
@@ -459,13 +451,15 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap
         } else {
             mNoneDataTv.setText("天了噜~页面不见了");
         }
+
+        mSkeleton.hide();
     }
 
     // 领取/淘号失败，根据返回的时间重新倒数
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(EBUISwitch swith) {
         if (LibaoUtils.REFRESH_LIBAO_TIME.equals(swith.getFrom())) {
-            handler.sendEmptyMessageDelayed(1, swith.getPosition());
+            mBaseHandler.sendEmptyMessageDelayed(1, swith.getPosition());
         }
     }
 

app/src/main/java/com/gh/gamecenter/LoginActivity.java

@@ -2,8 +2,10 @@ package com.gh.gamecenter;
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.Bundle;
 import android.support.annotation.NonNull;
 
+import com.gh.common.util.EntranceUtils;
 import com.gh.gamecenter.fragment.LoginFragment;
 
 /**
@@ -13,7 +15,9 @@ import com.gh.gamecenter.fragment.LoginFragment;
 public class LoginActivity extends NormalActivity {
 
     @NonNull
-    public static Intent getIntent(Context context) {
-        return getTargetIntent(context, LoginActivity.class, LoginFragment.class);
+    public static Intent getIntent(Context context, String entrance) {
+        Bundle bundle = new Bundle();
+        bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance);
+        return getTargetIntent(context, LoginActivity.class, LoginFragment.class, bundle);
     }
 }

app/src/main/java/com/gh/gamecenter/MainActivity.java

@@ -2,23 +2,20 @@ package com.gh.gamecenter;
 
 import android.app.Dialog;
 import android.app.NotificationManager;
+import android.arch.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
-import android.net.Uri;
+import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.SystemClock;
 import android.preference.PreferenceManager;
-import android.provider.Settings;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.text.Html;
-import android.text.Spanned;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -31,7 +28,6 @@ import com.gh.base.AppUncaughtHandler;
 import com.gh.base.BaseActivity;
 import com.gh.base.fragment.BaseFragment_ViewPager;
 import com.gh.common.constant.Config;
-import com.gh.common.constant.Constants;
 import com.gh.common.exposure.ExposureUtils;
 import com.gh.common.exposure.meta.MetaUtil;
 import com.gh.common.im.ImManager;
@@ -46,24 +42,20 @@ import com.gh.common.util.DeviceUtils;
 import com.gh.common.util.DialogUtils;
 import com.gh.common.util.DirectUtils;
 import com.gh.common.util.EntranceUtils;
-import com.gh.common.util.GameUtils;
 import com.gh.common.util.GsonUtils;
 import com.gh.common.util.LogUtils;
 import com.gh.common.util.MtaHelper;
 import com.gh.common.util.NetworkUtils;
 import com.gh.common.util.PackageUtils;
 import com.gh.common.util.PlatformUtils;
-import com.gh.common.util.TrafficUtils;
+import com.gh.common.util.ThirdPartyPackageHelper;
 import com.gh.common.util.UrlFilterUtils;
 import com.gh.download.DownloadManager;
 import com.gh.download.DownloadNotification;
-import com.gh.gamecenter.db.info.GameInfo;
-import com.gh.gamecenter.db.info.InstallInfo;
-import com.gh.gamecenter.entity.ApkEntity;
+import com.gh.gamecenter.download.DownloadFragment;
 import com.gh.gamecenter.entity.CommunityEntity;
 import com.gh.gamecenter.entity.GameDigestEntity;
 import com.gh.gamecenter.entity.GameEntity;
-import com.gh.gamecenter.entity.GameUpdateEntity;
 import com.gh.gamecenter.entity.InnerMetaInfoEntity;
 import com.gh.gamecenter.entity.SettingsEntity;
 import com.gh.gamecenter.eventbus.EBNetworkState;
@@ -73,15 +65,11 @@ import com.gh.gamecenter.eventbus.EBShowDialog;
 import com.gh.gamecenter.eventbus.EBSkip;
 import com.gh.gamecenter.fragment.MainWrapperFragment;
 import com.gh.gamecenter.manager.DataCollectionManager;
-import com.gh.gamecenter.manager.FilterManager;
-import com.gh.gamecenter.manager.GameManager;
-import com.gh.gamecenter.manager.InstallManager;
-import com.gh.gamecenter.manager.PackageManager;
 import com.gh.gamecenter.manager.UpdateManager;
 import com.gh.gamecenter.manager.UserManager;
 import com.gh.gamecenter.normal.NormalFragment;
+import com.gh.gamecenter.packagehelper.PackageViewModel;
 import com.gh.gamecenter.qa.AskFragment;
-import com.gh.gamecenter.retrofit.ObservableUtil;
 import com.gh.gamecenter.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.gh.gamecenter.suggest.SuggestType;
@@ -102,7 +90,6 @@ import com.tencent.bugly.crashreport.CrashReport;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.io.BufferedReader;
@@ -110,85 +97,47 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.lang.reflect.Type;
-import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.CountDownLatch;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
 import okhttp3.ResponseBody;
-import retrofit2.HttpException;
 
 import static com.gh.common.util.EntranceUtils.KEY_TO;
 import static com.gh.gamecenter.fragment.MainWrapperFragment.INDEX_PERSONAL;
 import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG;
 import static com.gh.gamecenter.personal.PersonalFragment.LOGOUT_TAG;
 
-/**
- * 项目的主Activity，3个Fragment都嵌入在这里。
- */
 public class MainActivity extends BaseActivity {
 
     public final static String EB_MAINACTIVITY_TAG = "MainActivity";
     public final static String EB_SKIP_GAMEFRAGMENT = "GameFragment";
-
     public final static String SHOULD_INIT_IM = "should_init_im";
     public final static String SWITCH_TO_COMMUNITY = "switch_to_community";
 
+    private final static String IS_SKIPPED = "is_skipped";
+
+    private PackageViewModel mPackageViewModel;
+
     private MainWrapperFragment mMainWrapperFragment;
 
-    private SharedPreferences sp;
-    private InstallManager mInstallManager;
+    private SharedPreferences mSp;
+    // 黄壮华 按连续按返回键两次才退出应用
+    private long[] mHits = new long[2];
 
-    private static final int SKIP_SETTING_REQUEST = 14;
-    private boolean isSkipped;
+    private boolean isSkipped = false;
     public static boolean isNewFirstLaunch;
     public static boolean openCommunityWithDefaultIdForTheFirsTime;  // 是否根据 META-INFO 里的 JSON 自动选择默认的社区 ID
 
-    Runnable skipRun = new Runnable() {
-        @Override
-        public void run() {
-            if (getIntent() != null && getIntent().getExtras() != null && !isSkipped) {
-                isSkipped = true;
-                Bundle bundle = getIntent().getExtras();
-                if (bundle != null) {
-                    String to = bundle.getString(KEY_TO);
-                    if (!TextUtils.isEmpty(to)) {
-                        Class<?> clazz = ClassUtils.forName(to);
-                        if (clazz != null) {
-                            String entrance = bundle.getString(EntranceUtils.KEY_ENTRANCE);
-                            if (TextUtils.isEmpty(entrance) || !entrance.startsWith("(") || !entrance.endsWith(")")) {
-                                bundle.putString(EntranceUtils.KEY_ENTRANCE, "(插件跳转)");
-                            }
-
-                            String packageName = bundle.getString("packageName");
-                            if (packageName != null) {
-                                bundle.putInt(BaseFragment_ViewPager.ARGS_INDEX, 1);
-                            }
-
-                            if (NormalFragment.class.isAssignableFrom(clazz)) {
-                                NormalActivity.startFragment(MainActivity.this, (Class<? extends NormalFragment>) clazz, bundle);
-                            } else {
-                                Intent skipIntent = new Intent(MainActivity.this, clazz);
-                                skipIntent.putExtras(bundle);
-                                startActivity(skipIntent);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    };
     private Handler handler = new Handler();
     // 黄壮华 添加观察者 修改2015/8/15
     private DataWatcher dataWatcher = new DataWatcher() {
@@ -249,7 +198,7 @@ public class MainActivity extends BaseActivity {
                     }
                     if (!downloadEntity.isPluggable()) {
                         // 是否是自动安装
-                        if (sp.getBoolean("autoinstall", true)) {
+                        if (mSp.getBoolean("autoinstall", true)) {
                             if (FileUtils.isEmptyFile(downloadEntity.getPath())) {
                                 toast(R.string.install_failure_hint);
                                 DownloadManager.getInstance(MainActivity.this).cancel(downloadEntity.getUrl());
@@ -269,8 +218,8 @@ public class MainActivity extends BaseActivity {
                 }
 
                 // 下载过程分析统计
-                android.content.pm.PackageManager pm = getApplicationContext().getPackageManager();
-                PackageInfo packageInfo = pm.getPackageArchiveInfo(downloadEntity.getPath(), android.content.pm.PackageManager.GET_ACTIVITIES);
+                PackageManager pm = getApplicationContext().getPackageManager();
+                PackageInfo packageInfo = pm.getPackageArchiveInfo(downloadEntity.getPath(), PackageManager.GET_ACTIVITIES);
                 if (packageInfo == null) {
                     MtaHelper.onEventWithBasicDeviceInfo("解析包错误分析"
                             , "游戏名字", downloadEntity.getName() + ":"
@@ -283,10 +232,100 @@ public class MainActivity extends BaseActivity {
             }
         }
     };
-    /*
-     * 黄壮华 按连续按返回键两次才退出应用
-     */
-    private long[] mHits = new long[2];
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // 上传数据
+        DataCollectionManager.getInstance(getApplicationContext()).upload();
+
+        mSp = PreferenceManager.getDefaultSharedPreferences(this);
+
+        if (savedInstanceState != null) {
+            isSkipped = savedInstanceState.getBoolean(IS_SKIPPED);
+        }
+
+        mMainWrapperFragment = new MainWrapperFragment();
+        if (savedInstanceState != null) {
+            mMainWrapperFragment.setArguments(savedInstanceState);
+        } else if (getIntent() != null) {
+            Bundle extras = getIntent().getExtras();
+            mMainWrapperFragment.setArguments(extras);
+        }
+        replaceFragment(mMainWrapperFragment);
+
+        // 检查助手更新
+        UpdateManager.getInstance(this).checkUpdate(true, null);
+
+        isNewFirstLaunch = mSp.getBoolean("isNewFirstLaunchV" + PackageUtils.getVersionName(), true);
+        if (isNewFirstLaunch) {
+            LogUtils.uploadDevice(DeviceTokenUtils.getLaunchType());
+            getPluginUpdate();
+            sendActivationInfo();
+            mSp.edit().putBoolean("isNewFirstLaunchV" + PackageUtils.getVersionName(), false).apply();
+
+            checkDevice();  // 根据设备信息判断用户是否是新用户
+        }
+
+        // 获取默认配置
+        getGhzsSettings();
+
+        // 初始化PlatformUtils
+        PlatformUtils.getInstance(getApplicationContext());
+
+        // 添加观察者
+        DownloadManager.getInstance(this).addObserver(dataWatcher);
+
+        mPackageViewModel = ViewModelProviders.of(this, new PackageViewModel.Factory()).get(PackageViewModel.class);
+
+        final String message = Config.getExceptionMsg(this);
+        if (!TextUtils.isEmpty(message)) {
+            Config.setExceptionMsg(this, null);
+            AppUncaughtHandler.reportException(this, new Throwable(message));
+            DialogUtils.showWarningDialog(this, "发生闪退", "光环助手刚刚发生了闪退，马上反馈以帮助我们更好地修复问题？（只需简单描述你刚才的操作）"
+                    , "暂不", "马上反馈",
+                    () -> {
+                        SuggestionActivity.startSuggestionActivity(MainActivity.this, SuggestType.crash, "APP闪退：");
+                        MtaHelper.onEventWithBasicDeviceInfo(
+                                "闪退弹窗",
+                                "玩家操作", "点击反馈");
+                    },
+                    () -> MtaHelper.onEventWithBasicDeviceInfo(
+                            "闪退弹窗",
+                            "玩家操作", "点击关闭"));
+        }
+
+        checkTinkerPath();
+
+        checkRetryDownload();
+
+        // 初始化 IM，只有在 APP 刚启动时执行
+        if (HaloApp.get(SHOULD_INIT_IM, false) != null) {
+            HaloApp.put(SHOULD_INIT_IM, false);
+            handler.postDelayed(ImManager::attachIm, 1000);
+        }
+
+        // 获取可用（没有被隐藏的）的社区列表
+        CommunityHelper.getAvailableCommunityList();
+
+        if (getIntent().getBooleanExtra(SWITCH_TO_COMMUNITY, false)) {
+            handler.postDelayed(this::switchToCommunityTabAndRefresh, 800);
+        }
+
+        // 跳转至其它页面
+        if (getIntent() != null && getIntent().getExtras() != null && !isSkipped) {
+            doSkip();
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        DownloadManager.getInstance(this).removeObserver(dataWatcher);
+
+        handler.removeCallbacksAndMessages(null);
+    }
 
     @NonNull
     public static Intent getMainIntent(Context context) {
@@ -295,6 +334,45 @@ public class MainActivity extends BaseActivity {
         return intent;
     }
 
+    private void sendActivationInfo() {
+        RetrofitManager.getInstance(this)
+                .getApi().postBaiduActivationInfo()
+                .subscribeOn(Schedulers.io())
+                .subscribe(new Response<>());
+    }
+
+    private void doSkip() {
+        handler.postDelayed(() -> {
+            isSkipped = true;
+            Bundle bundle = getIntent().getExtras();
+            if (bundle != null) {
+                String to = bundle.getString(KEY_TO);
+                if (!TextUtils.isEmpty(to)) {
+                    Class<?> clazz = ClassUtils.forName(to);
+                    if (clazz != null) {
+                        String entrance = bundle.getString(EntranceUtils.KEY_ENTRANCE);
+                        if (TextUtils.isEmpty(entrance) || !entrance.startsWith("(") || !entrance.endsWith(")")) {
+                            bundle.putString(EntranceUtils.KEY_ENTRANCE, "(插件跳转)");
+                        }
+
+                        String packageName = bundle.getString("packageName");
+                        if (packageName != null) {
+                            bundle.putInt(BaseFragment_ViewPager.ARGS_INDEX, 1);
+                        }
+
+                        if (NormalFragment.class.isAssignableFrom(clazz)) {
+                            NormalActivity.startFragment(MainActivity.this, (Class<? extends NormalFragment>) clazz, bundle);
+                        } else {
+                            Intent skipIntent = new Intent(MainActivity.this, clazz);
+                            skipIntent.putExtras(bundle);
+                            startActivity(skipIntent);
+                        }
+                    }
+                }
+            }
+        }, 500);
+    }
+
     // 统计下载
     private void uploadData(String id, String platform) {
         Map<String, String> params = new HashMap<>();
@@ -305,7 +383,7 @@ public class MainActivity extends BaseActivity {
         RetrofitManager.getInstance(this).getApi().postDownload(body)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Response<ResponseBody>());
+                .subscribe(new Response<>());
     }
 
     // 统计下载完成事件
@@ -351,7 +429,11 @@ public class MainActivity extends BaseActivity {
                     "网络状态", DeviceUtils.getNetwork(HaloApp.getInstance().getApplication()));
         }
 
-        ExposureUtils.logADownloadCompleteExposureEvent(new GameEntity(downloadEntity.getGameId()), downloadEntity.getPlatform(), downloadEntity.getExposureTrace(), type);
+        ExposureUtils.logADownloadCompleteExposureEvent(
+                new GameEntity(downloadEntity.getGameId(), downloadEntity.getName()),
+                downloadEntity.getPlatform(),
+                downloadEntity.getExposureTrace(),
+                type);
 
         DataCollectionUtils.uploadDownload(this, downloadEntity, "完成");
     }
@@ -426,7 +508,7 @@ public class MainActivity extends BaseActivity {
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putBoolean("isSkipped", isSkipped);
+        outState.putBoolean(IS_SKIPPED, isSkipped);
         if (mMainWrapperFragment != null) {
             outState.putInt(BaseFragment_ViewPager.ARGS_INDEX, mMainWrapperFragment.getCurrentItem());
         }
@@ -437,372 +519,21 @@ public class MainActivity extends BaseActivity {
         return R.layout.layout_wrapper_activity;
     }
 
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == SKIP_SETTING_REQUEST) {
-            List<PackageInfo> installedList = getPackageManager().getInstalledPackages(0);
-            if (installedList.isEmpty()) {
-                toast("读取应用列表失败");
-            } else {
-                getInstalledListFromServer();
-            }
-        }
-    }
-
-    // 获取已安装游戏
-    private void getInstalledListFromServer() {
-        ArrayList<String> list = PackageUtils.getAllPackageName(getApplicationContext());
-
-        PackageManager.INSTANCE.initData(list);
-
-        // 忽略 xposed 安装器
-        list.remove(Constants.XPOSED_INSTALLER_PACKAGE_NAME);
-
-        //应用上报
-        uploadAppList();
-
-        // 过滤助手收录的包
-        ArrayList<String> localList = new ArrayList<>();
-        FilterManager filterManager = new FilterManager(this);
-        for (int i = 0, size = list.size(); i < size; i++) {
-            if (filterManager.isFilter(list.get(i))) {
-                localList.add(list.get(i));
-            }
-        }
-
-        final CountDownLatch latch = ObservableUtil.latch(localList.size(), o -> updateInstall(), new Object());
-
-        for (int i = 0, size = localList.size(); i < size; i++) {
-            final String packageName = localList.get(i);
-            RetrofitManager.getInstance(this).getApi().getGameDigestByPackageName(UrlFilterUtils.getFilterQuery("package", packageName))
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new Response<List<GameDigestEntity>>() {
-                        @Override
-                        public void onResponse(List<GameDigestEntity> response) {
-                            for (GameDigestEntity gameDigestEntity : response) {
-                                GameInfo gameInfo = new GameInfo();
-                                gameInfo.setId(gameDigestEntity.getId());
-                                gameInfo.setGameIcon(gameDigestEntity.getIcon());
-                                gameInfo.setPackageName(packageName);
-                                gameInfo.setGameName(gameDigestEntity.getName());
-                                mInstallManager.updateByEntity(gameInfo);
-                            }
-
-                            latch.countDown();
-                        }
-
-                        @Override
-                        public void onFailure(HttpException e) {
-                            latch.countDown();
-                        }
-                    });
-        }
-    }
-
-    private void uploadAppList() {
-        //检查是否符合应用上报周期
-        long time = sp.getLong("last_upload_applist_time", 0);
-        if (Utils.getTime(this) - time >= 604800L) {//一周为一个周期
-            DataCollectionUtils.uploadAppList(this, PackageUtils.getAppList(this));
-        }
-    }
-
-    /**
-     * 为已安装的游戏添加助手后台存在的包
-     */
-    private void updateInstall() {
-        ArrayList<String> concernIdList = new ArrayList<>();
-        for (InstallInfo entity : mInstallManager.getAllInstall()) {
-            concernIdList.add(entity.getId());
-        }
-        if (concernIdList.isEmpty()) {
-            update();
-        } else {
-            List<Observable<GameEntity>> sequences = new ArrayList<>();
-            for (String id : concernIdList) {
-                sequences.add(RetrofitManager.getInstance(this).getApi().getGameDigest(id));
-            }
-            Observable.mergeDelayError(sequences)
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new Response<GameEntity>() {
-                        @Override
-                        public void onNext(GameEntity response) {
-                            InstallInfo installInfo = mInstallManager.findInstallById(response.getId());
-                            if (installInfo != null && response.getApk().size() != 0) {
-                                HashMap<String, Boolean> packageNames = new HashMap<>();
-                                for (ApkEntity apkEntity : response.getApk()) {
-                                    if (PackageManager.INSTANCE.isInstalled(apkEntity.getPackageName())) {
-                                        packageNames.put(apkEntity.getPackageName(), true);
-                                    } else {
-                                        packageNames.put(apkEntity.getPackageName(), false);
-                                    }
-                                }
-                                installInfo.setTime(System.currentTimeMillis());
-                                installInfo.setPackageNames(packageNames);
-                                mInstallManager.updateInstall(installInfo);
-                            }
-                        }
-
-                        @Override
-                        public void onFailure(@Nullable HttpException e) {
-                            update();
-                        }
-
-                        @Override
-                        public void onComplete() {
-                            update();
-                        }
-                    });
-        }
-    }
-
-    /**
-     * 更新安装列表数据
-     */
-    private void update() {
-        HaloApp.getInstance().getMainExecutor().execute(() -> {
-            final List<String> installed = new ArrayList<>();
-            TrafficUtils spy = TrafficUtils.getInstance(getApplicationContext(), true);
-            List<InstallInfo> concernList = mInstallManager.getAllInstall();
-            for (InstallInfo concernEntity : concernList) {
-                concernEntity.setTime(System.currentTimeMillis());
-                int quantity = 0;
-                HashMap<String, Boolean> packageNames = new HashMap<>();
-                for (String packageName : concernEntity.getPackageNames().keySet()) {
-                    if (PackageManager.INSTANCE.isInstalled(packageName)) {
-                        quantity++;
-                        packageNames.put(packageName, true);
-                        installed.add(packageName);
-                    } else {
-                        packageNames.put(packageName, false);
-                    }
-                }
-                concernEntity.setPackageNames(packageNames);
-                concernEntity.setInstalledQuantity(quantity);
-                int weight = 0;
-                long traffic = spy.getTraffic(new ArrayList<>(concernEntity.getPackageNames().keySet()));
-                concernEntity.setTraffic(traffic);
-                if (traffic > 0) {
-                    weight++;
-                }
-                concernEntity.setWeight(weight);
-                mInstallManager.updateInstall(concernEntity);
-            }
-
-            // 更新用户已安装游戏
-            RequestBody body = RequestBody.create(MediaType.parse("application/json"),
-                    new JSONArray(installed).toString());
-            RetrofitManager.getInstance(MainActivity.this).getApi().putPackage(UserManager.getInstance().getUserId(), body)
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(Schedulers.io())
-                    .subscribe(new Response<ResponseBody>());
-
-            handler.postDelayed(() -> DataCollectionUtils.uploadUser(MainActivity.this), 1000);
-
-            // 检查游戏更新
-            checkGameUpdate();
-
-            // 检查可插件化游戏
-            checkGamePlugin();
-        });
-    }
-
-    private void checkGameUpdate() {
-        List<InstallInfo> infos = mInstallManager.getAllInstall();
-        ArrayList<String> packageList = PackageUtils.getAllPackageName(this);
-        for (InstallInfo info : infos) {
-            for (String packageName : info.getPackageNames().keySet()) {
-                if (info.getPackageNames().get(packageName)
-                        && packageList.contains(packageName)) {
-                    checkGameUpdate(packageName);
-                }
-            }
-        }
-    }
-
-    private void checkGamePlugin() {
-        final List<GameEntity> list = new ArrayList<>();
-        List<Observable<GameEntity>> sequences = new ArrayList<>();
-        for (InstallInfo info : mInstallManager.getAllInstall()) {
-            sequences.add(RetrofitManager.getInstance(this).getApi().getGameDigest(info.getId()));
-        }
-        Observable.mergeDelayError(sequences)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Response<GameEntity>() {
-                    @Override
-                    public void onNext(GameEntity response) {
-                        list.add(response);
-                    }
-
-                    @Override
-                    public void onFailure(@Nullable HttpException e) {
-                        processPluginData(list);
-                    }
-
-                    @Override
-                    public void onComplete() {
-                        processPluginData(list);
-                    }
-                });
-    }
-
-    private void checkGameUpdate(String packageName) {
-        Object gh_id = PackageUtils.getMetaData(this, packageName, "gh_id");
-        Observable<GameEntity> observable;
-        if (gh_id == null) {
-            observable = RetrofitManager.getInstance(this).getApi().getGameUpdate(UrlFilterUtils.getFilterQuery("packages", packageName));
-        } else {
-            observable = RetrofitManager.getInstance(this).getApi().getGameUpdateById((String) gh_id);
-        }
-        observable.subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Response<GameEntity>() {
-                    @Override
-                    public void onResponse(GameEntity response) {
-                        List<GameUpdateEntity> updateList = PackageUtils.isCanUpdate(getApplication(), response);
-                        if (updateList.size() > 0) {
-                            PackageManager.INSTANCE.addUpdateList(updateList);
-                        }
-                    }
-                });
-    }
-
-    private void processPluginData(List<GameEntity> list) {
-        if (list == null || list.isEmpty()) {
-            return;
-        }
-        List<InstallInfo> infos = mInstallManager.getAllInstall();
-        HashMap<String, Boolean> map;
-        for (InstallInfo info : infos) {
-            for (GameEntity gameEntity : list) {
-                if (gameEntity.getId().equals(info.getId())
-                        && gameEntity.getTag() != null && gameEntity.getTag().size() != 0
-                        && gameEntity.getApk() != null) {
-                    map = info.getPackageNames();
-                    for (String key : map.keySet()) {
-                        if (map.get(key)) {
-                            for (ApkEntity apkEntity : gameEntity.getApk()) {
-                                if (apkEntity.getPackageName().equals(key)
-                                        && !TextUtils.isEmpty(apkEntity.getGhVersion())
-                                        && !PackageUtils.isSignature(this, apkEntity.getPackageName())) {
-                                    PackageManager.INSTANCE.addUpdate(GameUtils.getGameUpdateEntity(gameEntity, apkEntity));
-                                    break;
-                                }
-                            }
-                            GameManager manager = new GameManager(this);
-                            manager.addOrUpdate(gameEntity);
-                        }
-                    }
-                    break;
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // 上传数据
-        DataCollectionManager.getInstance(getApplicationContext()).upload();
-
-        sp = PreferenceManager.getDefaultSharedPreferences(this);
-        isNewFirstLaunch = sp.getBoolean("isNewFirstLaunchV" + PackageUtils.getVersionName(), true);
-
-        isSkipped = false;
-
-        if (savedInstanceState != null) {
-            isSkipped = savedInstanceState.getBoolean("isSkipped");
-        }
-
-        mMainWrapperFragment = new MainWrapperFragment();
-        if (savedInstanceState != null) {
-            mMainWrapperFragment.setArguments(savedInstanceState);
-        } else if (getIntent() != null) {
-            Bundle extras = getIntent().getExtras();
-            mMainWrapperFragment.setArguments(extras);
-        }
-        replaceFragment(mMainWrapperFragment);
-
-        mInstallManager = new InstallManager(getApplicationContext());
-
-        // 检查助手更新
-        UpdateManager.getInstance(this).checkUpdate(true, null);
-
-        if (isNewFirstLaunch) {
-            LogUtils.uploadDevice(DeviceTokenUtils.getLaunchType());
-            getPluginUpdate();
-            sp.edit().putBoolean("isNewFirstLaunchV" + PackageUtils.getVersionName(), false).apply();
-
-            checkDevice();  // 根据设备信息判断用户是否是新用户
-        }
-
-        // 获取默认配置
-        getGhzsSettings();
-
-        // 初始化PlatformUtils
-        PlatformUtils.getInstance(getApplicationContext());
-
-        // 添加观察者
-        DownloadManager.getInstance(this).addObserver(dataWatcher);
-
-        // 检查是否有权限读取应用列表
-        checkPermission();
-
-        final String message = Config.getExceptionMsg(this);
-        if (!TextUtils.isEmpty(message)) {
-            Config.setExceptionMsg(this, null);
-            AppUncaughtHandler.reportException(this, new Throwable(message));
-            DialogUtils.showWarningDialog(this, "发生闪退", "光环助手刚刚发生了闪退，马上反馈以帮助我们更好地修复问题？（只需简单描述你刚才的操作）"
-                    , "暂不", "马上反馈",
-                    () -> {
-                        SuggestionActivity.startSuggestionActivity(MainActivity.this, SuggestType.crash, "APP闪退：");
-                        MtaHelper.onEventWithBasicDeviceInfo(
-                                "闪退弹窗",
-                                "玩家操作", "点击反馈");
-                    },
-                    () -> MtaHelper.onEventWithBasicDeviceInfo(
-                            "闪退弹窗",
-                            "玩家操作", "点击关闭"));
-        }
-
-        checkTinkerPath();
-
-        checkRetryDownload();
-
-        // 初始化 IM，只有在 APP 刚启动时执行
-        if (HaloApp.get(SHOULD_INIT_IM, false) != null) {
-            HaloApp.put(SHOULD_INIT_IM, false);
-            handler.postDelayed(ImManager::attachIm, 1000);
-        }
-
-        // 获取可用（没有被隐藏的）的社区列表
-        CommunityHelper.getAvailableCommunityList();
-
-        handler.postDelayed(this::switchToCommunityTabAndRefresh, 800);
-
-        // 执行跳转事件
-        handler.postDelayed(skipRun, 500);
-    }
-
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        switchToCommunityTabAndRefresh();
+
+        // 跳转到问答社区并刷新
+        if (getIntent().getBooleanExtra(SWITCH_TO_COMMUNITY, false)) {
+            switchToCommunityTabAndRefresh();
+        }
     }
 
     private void switchToCommunityTabAndRefresh() {
-        // 跳转到问答社区并刷新
-        if (getIntent().getBooleanExtra(SWITCH_TO_COMMUNITY, false)) {
-            getIntent().putExtra(SWITCH_TO_COMMUNITY, false);
-            Log.e("Switch", "true");
-            EventBus.getDefault().post(new EBSkip(MainActivity.EB_SKIP_GAMEFRAGMENT, 1));
-            EventBus.getDefault().post(new EBReuse(AskFragment.EB_RETRY_PAGE));
-        }
+        getIntent().putExtra(SWITCH_TO_COMMUNITY, false);
+        Log.e("Switch", "true");
+        EventBus.getDefault().post(new EBSkip(MainActivity.EB_SKIP_GAMEFRAGMENT, 1));
+        EventBus.getDefault().post(new EBReuse(AskFragment.EB_RETRY_PAGE));
     }
 
     private void getGhzsSettings() {
@@ -817,13 +548,13 @@ public class MainActivity extends BaseActivity {
                         Config.setSettings(response);
 
                         // 意见反馈
-                        SharedPreferences.Editor edit = sp.edit();
+                        SharedPreferences.Editor edit = mSp.edit();
                         edit.putString(SuggestionActivity.SUGGESTION_HINT_TYPE,
                                 GsonUtils.Companion.getInstance().toJson(response.getSuggestion()));
                         edit.apply();
 
-                        if (!sp.getBoolean("isFixDownload", false) && Config.isShow()) {
-                            sp.edit().putBoolean("isFixDownload", true).apply();
+                        if (!mSp.getBoolean("isFixDownload", false) && Config.isShow()) {
+                            mSp.edit().putBoolean("isFixDownload", true).apply();
                         }
 
                         EventBus.getDefault().post(new EBReuse("Refresh"));
@@ -871,7 +602,7 @@ public class MainActivity extends BaseActivity {
         }.getType();
 
         final Map<String, Set<String>> tinkerIdMap;
-        final String tinkerMapJson = sp.getString(Config.PATCHES, "");
+        final String tinkerMapJson = mSp.getString(Config.PATCHES, "");
         if (!TextUtils.isEmpty(tinkerMapJson)) {
             tinkerIdMap = gson.fromJson(tinkerMapJson, type);
         } else {
@@ -897,28 +628,19 @@ public class MainActivity extends BaseActivity {
             TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
 
             titleTv.setText("补丁更新成功");
-            contentTv.setText("光环助手已成功更新到V" + PackageUtils.getPatchVersionName());
+            contentTv.setText(("光环助手已成功更新到V" + PackageUtils.getVersionName() + "-" + newTinkerId));
             positiveTv.setText("知道了");
             negativeTv.setText(null);
 
             negativeTv.setOnClickListener(view -> dialog.dismiss());
 
             positiveTv.setOnClickListener(view -> dialog.dismiss());
-            dialog.setOnDismissListener(dialog1 -> sp.edit().putString(Config.PATCHES, gson.toJson(tinkerIdMap)).apply());
+            dialog.setOnDismissListener(dialog1 -> mSp.edit().putString(Config.PATCHES, gson.toJson(tinkerIdMap)).apply());
 
             dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
             dialog.setContentView(contentView);
             dialog.show();
         }
-
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        DownloadManager.getInstance(this).removeObserver(dataWatcher);
-
-        handler.removeCallbacksAndMessages(null);
     }
 
     private void checkDevice() {
@@ -946,7 +668,7 @@ public class MainActivity extends BaseActivity {
     }
 
     private void oldUserSkip(String deviceId) {
-        sp.edit().putString("syncDeviceID", deviceId).apply();
+        mSp.edit().putString("syncDeviceID", deviceId).apply();
         DialogUtils.showForceDialog(MainActivity.this, "数据同步提醒"
                 , "系统检测到你是光环助手的老用户，为了避免数据丢失，请尽快登录"
                 , "前往登录", "残忍拒绝", new DialogUtils.ConfirmListener() {
@@ -957,26 +679,6 @@ public class MainActivity extends BaseActivity {
                 }, null);
     }
 
-    private void checkPermission() {
-        List<PackageInfo> installedList = getPackageManager().getInstalledPackages(0);
-        if (installedList.isEmpty()) {
-            // 无权限获取应用列表
-            Spanned content = Html.fromHtml("请前往系统权限设置，把“" +
-                    "<font color='#ff0000'>读取应用列表</font>”选择为打开" +
-                    "“<font color='#ff0000'>允许</font>”，否则光环助手将无法帮您安装插件加速版的游戏");
-            DialogUtils.showWarningDialog(this, "提示", content, "忽略", "去开启",
-                    () -> {
-                        // 跳转应用信息界面
-                        Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-                        Uri uri = Uri.fromParts("package", getPackageName(), null);
-                        intent.setData(uri);
-                        startActivityForResult(intent, SKIP_SETTING_REQUEST);
-                    }, null);
-        } else {
-            getInstalledListFromServer();
-        }
-    }
-
     // 获取META-INF中的plugin_update 文件，判断是否从游戏插件中下载的app，是则获取游戏id，启动游戏更新，下载该游戏
     private void getPluginUpdate() {
         HaloApp.getInstance().getMainExecutor().execute(() -> {
@@ -991,13 +693,10 @@ public class MainActivity extends BaseActivity {
                 while (entries.hasMoreElements()) {
                     ZipEntry entry = ((ZipEntry) entries.nextElement());
                     String entryName = entry.getName();
-                    if (entryName.contains("gh_assist")) { // TODO: 20/09/17 统一入口
+                    if (entryName.contains("gh_assist")) {
                         String packageName = entryName.substring(entryName.lastIndexOf("_") + 1);
-                        Intent intent = new Intent(MainActivity.this, DownloadManagerActivity.class);
-                        intent.putExtra("currentItem", 1);
-                        intent.putExtra("packageName", packageName);
-                        intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(游戏插件)");
-                        startActivity(intent);
+                        startActivity(DownloadManagerActivity.getDownloadMangerIntent(MainActivity.this,
+                                packageName, DownloadFragment.INDEX_UPDATE, "(游戏插件)"));
                         break;
                     } else if (entryName.contains("halo_skip.json")) {
                         InputStream in = zipfile.getInputStream(entry);
@@ -1045,6 +744,8 @@ public class MainActivity extends BaseActivity {
             if (Config.getSettings() == null) {
                 getGhzsSettings();
             }
+
+            mPackageViewModel.checkData();
         }
     }
 
@@ -1054,6 +755,7 @@ public class MainActivity extends BaseActivity {
 
         DownloadEntity mDownloadEntity = null;
         for (DownloadEntity downloadEntity : DownloadManager.getInstance(getApplicationContext()).getAll()) {
+            //todo 根据包名获取DownloadEntity? 假如存在相同包名的下载任务,有可能会删除错误
             if (packageName.equals(downloadEntity.getPackageName())) {
                 mDownloadEntity = downloadEntity;
                 break;
@@ -1061,13 +763,12 @@ public class MainActivity extends BaseActivity {
         }
 
         if ("安装".equals(busFour.getType())) {
+            mPackageViewModel.addInstalledGame(packageName);
+
             // 删除下载完成 弹窗
             NotificationManager nManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
             nManager.cancel(packageName.hashCode());
 
-            // 添加进已安装map中
-            PackageManager.INSTANCE.addInstalled(packageName);
-
             if (mDownloadEntity != null) {
                 if (mDownloadEntity.isPluggable()) {
                     Map<String, Object> kv6 = new HashMap<>();
@@ -1081,17 +782,18 @@ public class MainActivity extends BaseActivity {
                             "操作", "安装完成",
                             "网络状态", DeviceUtils.getNetwork(HaloApp.getInstance().getApplication()));
                 }
+
+                // 没有光环 ID 的都记录一下游戏 ID，供'我的游戏'区分同包名不同插件用
+                Object gh_id = PackageUtils.getMetaData(this, mDownloadEntity.getPackageName(), "gh_id");
+                if (gh_id == null) {
+                    ThirdPartyPackageHelper.saveGameId(mDownloadEntity.getPackageName(), mDownloadEntity.getGameId());
+                }
                 DownloadManager.getInstance(getApplicationContext()).cancel(
-                        mDownloadEntity.getUrl(), false); // 默认不删除安装包 sp.getBoolean("autodelete", true)
+                        mDownloadEntity.getUrl(), false); // 默认不删除安装包 mSp.getBoolean("autodelete", true)
             }
 
-            GameManager gameManager = new GameManager(getApplicationContext());
-            GameInfo gameInfo = gameManager.findGame(packageName);
-            if (gameInfo != null) {
-                mInstallManager.updateByEntity(gameInfo);
-            }
 
-            if (sp.getBoolean("concerngame", true)) { //设置页面控制是否安装后自动关注
+            if (mSp.getBoolean("concerngame", true)) { //设置页面控制是否安装后自动关注
                 // 安装后关注游戏
                 DownloadEntity finalDownloadEntity = mDownloadEntity;
                 RetrofitManager.getInstance(this).getApi().getGameDigestByPackageName(UrlFilterUtils.getFilterQuery("package", packageName))
@@ -1101,34 +803,26 @@ public class MainActivity extends BaseActivity {
                             @Override
                             public void onResponse(List<GameDigestEntity> response) {
                                 for (GameDigestEntity gameDigestEntity : response) {
-                                    concernGame(gameDigestEntity.getId(), packageName);
-
                                     if (!TextUtils.isEmpty(gameDigestEntity.getId())) { // 关注游戏
                                         if (finalDownloadEntity != null && gameDigestEntity.getId().equals(finalDownloadEntity.getGameId())) {
-                                            ConcernUtils.INSTANCE.postConcernGameId(MainActivity.this, gameDigestEntity.getId(), null);
+                                            ConcernUtils.INSTANCE.postConcernGameId(MainActivity.this, gameDigestEntity.getId(), null, true);
                                         }
                                     }
                                 }
 
-                                if (PackageUtils.getMetaData(getApplicationContext(),
-                                        packageName, "gh_version") != null) {
-                                    checkGameUpdate(packageName);
-                                }
-
                                 // 更新已安装游戏
                                 RetrofitManager.getInstance(MainActivity.this).getApi()
                                         .postPackage(UserManager.getInstance().getUserId(), packageName)
                                         .subscribeOn(Schedulers.io())
                                         .observeOn(Schedulers.io())
-                                        .subscribe(new Response<ResponseBody>());
+                                        .subscribe(new Response<>());
                             }
                         });
             }
 
         }
         if ("卸载".equals(busFour.getType())) {
-            // 删除map中数据
-            PackageManager.INSTANCE.removeInstalled(packageName);
+            mPackageViewModel.addUninstalledGame(packageName);
 
             if (mDownloadEntity != null && mDownloadEntity.isPluggable()) {
                 Map<String, Object> kv6 = new HashMap<>();
@@ -1145,50 +839,17 @@ public class MainActivity extends BaseActivity {
                 startActivity(PackageUtils.getInstallIntent(this, mDownloadEntity.getPath()));
             }
 
-            FilterManager filterManager = new FilterManager(getApplicationContext());
-            if (filterManager.isFilter(packageName)) {
-                mInstallManager.updateByPackageName(packageName);
-            }
-
             // 更新已安装游戏
             RetrofitManager.getInstance(this).getApi()
                     .deletePackage(UserManager.getInstance().getUserId(), packageName)
                     .subscribeOn(Schedulers.io())
                     .observeOn(Schedulers.io())
-                    .subscribe(new Response<ResponseBody>());
-
+                    .subscribe(new Response<>());
         }
 
-        if ("卸载".equals(busFour.getType()) || "安装".equals(busFour.getType())) {
-            PackageManager.INSTANCE.removeUpdate(packageName);
-        }
         DataCollectionUtils.uploadInorunstall(this, busFour.getType(), busFour.getPackageName());
     }
 
-    private void concernGame(final String id, final String packageName) {
-        RetrofitManager.getInstance(this).getApi().getGameDigest(id)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Response<GameEntity>() {
-                    @Override
-                    public void onResponse(GameEntity response) {
-                        GameManager manager = new GameManager(getApplicationContext());
-                        manager.addOrUpdate(response);
-                        // 检查是否能插件化
-                        if (response.getTag() != null && response.getTag().size() != 0) {
-                            for (ApkEntity apkEntity : response.getApk()) {
-                                if (packageName.equals(apkEntity.getPackageName())
-                                        && !TextUtils.isEmpty(apkEntity.getGhVersion())
-                                        && !PackageUtils.isSignature(getApplicationContext(), apkEntity.getPackageName())) {
-                                    PackageManager.INSTANCE.addUpdate(GameUtils.getGameUpdateEntity(response, apkEntity));
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                });
-    }
-
     // 接收登录和登出更新事件统计的 Meta
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(EBReuse reuse) {

app/src/main/java/com/gh/gamecenter/MessageActivity.java

@@ -14,9 +14,6 @@ import com.gh.gamecenter.message.MessageFragment;
 public class MessageActivity extends NormalActivity {
 
     public static Intent getIntent(Context context, String entrance) {
-//        return new IntentFactory.Builder(context)
-//                .setActivity(MessageActivity.class)
-//                .setFragment(MessageCenterFragment.class).build();
         Bundle bundle = new Bundle();
         bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance);
         return getTargetIntent(context, MessageActivity.class, MessageFragment.class, bundle);

app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt

@@ -201,8 +201,6 @@ class NetworkDiagnosisActivity : BaseActivity() {
                     // 保存成文件
                     val filePath = bitmap2File(bitmap)
 
-                    // TODO upload image or copy image to share
-
                     builder.append("WebView Long Image Path:\n")
                     builder.append(filePath)
                     builder.append("\n")

app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java

@@ -33,6 +33,7 @@ import com.gh.common.util.DataUtils;
 import com.gh.common.util.DetailDownloadUtils;
 import com.gh.common.util.DisplayUtils;
 import com.gh.common.util.EntranceUtils;
+import com.gh.common.util.GdtHelper;
 import com.gh.common.util.ShareUtils;
 import com.gh.common.view.VerticalItemDecoration;
 import com.gh.download.DownloadManager;
@@ -51,6 +52,7 @@ import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.lightgame.download.DataWatcher;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.utils.Utils;
+import com.qq.gdt.action.ActionType;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
@@ -238,7 +240,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener,
         mNewsShare.setVisible(false);
         mNewsCollection.setVisible(false);
 
-        mNoneDataTv.setText("页面不见咯");
+        mNoneDataTv.setText("页面不见了");
 
         // init RecyclerView
         mDetailRv.setHasFixedSize(true);
@@ -270,14 +272,11 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener,
 
         View view = getWindow().findViewById(Window.ID_ANDROID_CONTENT);
         if (view != null) {
-            view.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    System.arraycopy(mHits, 1, mHits, 0, mHits.length - 1);
-                    mHits[mHits.length - 1] = SystemClock.uptimeMillis();
-                    if (mHits[0] >= (SystemClock.uptimeMillis() - 1000)) {
-                        mDetailRv.scrollToPosition(0);
-                    }
+            view.setOnClickListener(v -> {
+                System.arraycopy(mHits, 1, mHits, 0, mHits.length - 1);
+                mHits[mHits.length - 1] = SystemClock.uptimeMillis();
+                if (mHits[0] >= (SystemClock.uptimeMillis() - 1000)) {
+                    mDetailRv.scrollToPosition(0);
                 }
             });
         }
@@ -313,7 +312,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener,
                 }
                 break;
             case R.id.menu_collect:
-                CheckLoginUtils.checkLogin(this, () -> {
+                CheckLoginUtils.checkLogin(this, "资讯文章详情-收藏", () -> {
                     final NewsDetailEntity newsDetailEntity = adapter.getNewsDetailEntity();
                     mNewsCollection.setEnabled(false);
                     if (newsDetailEntity.getMe() != null && newsDetailEntity.getMe().isArticleFavorite()) {
@@ -322,6 +321,10 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener,
                                 new CollectionUtils.OnCollectionListener() {
                                     @Override
                                     public void onSuccess() {
+                                        GdtHelper.INSTANCE.logAction(ActionType.ADD_TO_WISHLIST,
+                                                GdtHelper.CONTENT_TYPE, "ARTICLE",
+                                                GdtHelper.CONTENT_ID, newsDetailEntity.getId());
+
                                         newsDetailEntity.getMe().setArticleFavorite(false);
                                         mNewsCollection.setEnabled(true);
                                         mNewsCollection.setIcon(R.drawable.menu_ic_collect_unselect);
@@ -489,10 +492,11 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener,
 
                     @Override
                     public void onFailure(HttpException e) {
-                        mDetailRv.setVisibility(View.GONE);
-                        mReuseLoading.setVisibility(View.GONE);
-                        mDetailBottomLl.setVisibility(View.GONE);
-                        mNoConn.setVisibility(View.VISIBLE);
+                        if (e != null && e.code() == 404) {
+                            loadEmpty();
+                        } else {
+                            loadError();
+                        }
                     }
                 });
     }
@@ -566,7 +570,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener,
             mNoConn.setVisibility(View.GONE);
             handler.postDelayed(runnable, 1000);
         } else if (v == mDetailCommentLl) {
-            CheckLoginUtils.checkLogin(this, () -> {
+            CheckLoginUtils.checkLogin(this, "资讯文章详情-写评论", () -> {
                 Intent intent = MessageDetailActivity.getIntentById(NewsDetailActivity.this, adapter.getId(), null, true
                         , mEntrance + "(新闻详情[" + adapter.getTitle() + "])");
                 startActivity(intent);
@@ -595,6 +599,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener,
             return;
         }
         RetrofitManager.getInstance(this).getApi().getGameNewsDigest(gameId)
+                .map(ApkActiveUtils.filterMapper)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Response<GameEntity>() {
@@ -608,6 +613,10 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener,
 
                         mDetailBottomLl.setVisibility(View.VISIBLE);
                         DetailDownloadUtils.detailInitDownload(getDetailViewHolder(), true);
+
+                        GdtHelper.INSTANCE.logAction(ActionType.PAGE_VIEW,
+                                GdtHelper.CONTENT_TYPE, "ARTICLE",
+                                GdtHelper.CONTENT_ID, response.getId());
                     }
                 });
     }

app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java

@@ -22,9 +22,6 @@ public class NewsSearchActivity extends NormalActivity {
         args.putString(EntranceUtils.KEY_SEARCHKEY, searchKey);
         args.putString(EntranceUtils.KEY_GAMEID, gameId);
         args.putString(EntranceUtils.KEY_ENTRANCE, entrance);
-//        return new IntentFactory.Builder(context)
-//                .setActivity(NewsSearchActivity.class)
-//                .setFragment(GameNewsSearchResultFragment.class).setArgs(args).build();
         return getTargetIntent(context, NewsSearchActivity.class, GameNewsSearchResultFragment.class, args);
     }
 

app/src/main/java/com/gh/gamecenter/PersonalHomeActivity.kt

@@ -7,6 +7,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.support.v7.widget.RecyclerView
 import android.view.View
+import com.gh.base.BaseActivity
 import com.gh.common.util.DataUtils
 import com.gh.common.util.EntranceUtils
 import com.gh.common.util.StringUtils
@@ -144,7 +145,7 @@ class PersonalHomeActivity : ListActivity<PersonalHistoryEntity, PersonalHomeVie
                 val intent = Intent(context, PersonalHomeActivity::class.java)
                 intent.putExtra(EntranceUtils.KEY_USER_ID, userId)
                 intent.putExtra(EntranceUtils.KEY_PATH, path)
-                intent.putExtra(EntranceUtils.KEY_ENTRANCE, "$entrance+($path)")
+                intent.putExtra(EntranceUtils.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path))
                 context.startActivity(intent)
             }
         }

app/src/main/java/com/gh/gamecenter/PluginActivity.java

@@ -1,204 +0,0 @@
-package com.gh.gamecenter;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-import android.widget.LinearLayout;
-
-import com.gc.materialdesign.views.ProgressBarCircularIndeterminate;
-import com.gh.base.BaseActivity;
-import com.gh.base.OnRequestCallBackListener;
-import com.gh.common.util.DownloadItemUtils;
-import com.gh.common.util.EntranceUtils;
-import com.lightgame.download.DataWatcher;
-import com.lightgame.download.DownloadEntity;
-import com.gh.download.DownloadManager;
-import com.gh.gamecenter.adapter.PluginAdapter;
-import com.gh.gamecenter.entity.GameEntity;
-import com.gh.gamecenter.eventbus.EBDownloadStatus;
-import com.gh.gamecenter.eventbus.EBNetworkState;
-import com.gh.gamecenter.eventbus.EBPackage;
-
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import butterknife.BindView;
-
-/**
- * Created by LGT on 2016/7/6.
- * 可插件化界面
- */
-public class PluginActivity extends BaseActivity implements OnRequestCallBackListener {
-
-    @BindView(R.id.plugin_list)
-    RecyclerView mPluginRv;
-    @BindView(R.id.plugin_pb_loading)
-    ProgressBarCircularIndeterminate mPluginLoading;
-    @BindView(R.id.reuse_no_connection)
-    LinearLayout mNoConn;
-
-    private PluginAdapter adapter;
-
-    private boolean isEverpause = false;
-
-    private DataWatcher dataWatcher = new DataWatcher() {
-        @Override
-        public void onDataChanged(DownloadEntity downloadEntity) {
-            //特殊 插件化update
-            if (downloadEntity.isPluggable()) {
-                ArrayList<Integer> locationList = adapter.getLocationMap().get(downloadEntity.getPackageName());
-                if (locationList != null) {
-                    GameEntity gameEntity;
-                    for (int location : locationList) {
-                        gameEntity = adapter.getPluginList().get(location);
-                        if (gameEntity != null) {
-                            DownloadItemUtils.processDate(PluginActivity.this, gameEntity,
-                                    downloadEntity, adapter, location);
-                        }
-                    }
-                }
-            }
-        }
-    };
-
-    @NonNull
-    public static Intent getIntent(Context context, String entrance) {
-        Intent intent = new Intent(context, PluginActivity.class);
-        intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
-        return intent;
-    }
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.activity_plugin;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setNavigationTitle(getString(R.string.title_plugin));
-
-        mNoConn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mPluginLoading.setVisibility(View.VISIBLE);
-                mPluginRv.setVisibility(View.VISIBLE);
-                mNoConn.setVisibility(View.GONE);
-                adapter = new PluginAdapter(PluginActivity.this, PluginActivity.this, mEntrance);
-                mPluginRv.setAdapter(adapter);
-            }
-        });
-
-        mPluginRv.setHasFixedSize(true);
-        mPluginRv.setLayoutManager(new LinearLayoutManager(this));
-        adapter = new PluginAdapter(this, this, mEntrance);
-        mPluginRv.setAdapter(adapter);
-
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        isEverpause = true;
-        DownloadManager.getInstance(this).removeObserver(dataWatcher);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        if (isEverpause) {
-            for (GameEntity entity : adapter.getPluginList()) {
-                entity.setEntryMap(DownloadManager.getInstance(this).getEntryMap(entity.getName()));
-            }
-            adapter.notifyDataSetChanged();
-        }
-        isEverpause = false;
-        DownloadManager.getInstance(this).addObserver(dataWatcher);
-    }
-
-    @Override
-    public void loadDone() {
-        if (mPluginLoading != null && mPluginLoading.getVisibility() == View.VISIBLE) {
-            mPluginLoading.setVisibility(View.GONE);
-        }
-    }
-
-    @Override
-    public void loadDone(Object obj) {
-
-    }
-
-    @Override
-    public void loadError() {
-
-    }
-
-    @Override
-    public void loadEmpty() {
-
-    }
-
-    // 下载被删除事件
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEventMainThread(EBDownloadStatus status) {
-        if ("delete".equals(status.getStatus())) {
-            DownloadManager.getInstance(this).removePlatform(status.getName(), status.getPlatform());
-
-            ArrayList<Integer> locationList = adapter.getLocationMap().get(status.getPackageName());
-            if (locationList != null) {
-                GameEntity gameEntity;
-                for (int location : locationList) {
-                    gameEntity = adapter.getPluginList().get(location);
-                    if (gameEntity != null && gameEntity.getEntryMap() != null) {
-                        gameEntity.getEntryMap().remove(status.getPlatform());
-                    }
-                    adapter.notifyItemChanged(location);
-                }
-            }
-        }
-    }
-
-    //连接上网络事件
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEventMainThread(EBNetworkState busNetworkState) {
-        if (busNetworkState.isNetworkConnected()) {
-            if (mNoConn.getVisibility() == View.VISIBLE) {
-                mPluginRv.setVisibility(View.VISIBLE);
-                mPluginLoading.setVisibility(View.VISIBLE);
-                mNoConn.setVisibility(View.GONE);
-                adapter = new PluginAdapter(this, this, mEntrance);
-                mPluginRv.setAdapter(adapter);
-            }
-        }
-    }
-
-    //安装、卸载事件
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEventMainThread(EBPackage busFour) {
-        ArrayList<Integer> locationList = adapter.getLocationMap().get(busFour.getPackageName());
-        if (locationList != null) {
-            for (int location : locationList) {
-                if ("安装".equals(busFour.getType()) || "卸载".equals(busFour.getType())) {
-                    List<GameEntity> list = adapter.getPluginList();
-                    for (int i = 0, size = list.size(); i < size; i++) {
-                        if (list.get(i).getApk().get(0).getPackageName().equals(busFour.getPackageName())) {
-                            list.remove(i);
-                            adapter.notifyItemRemoved(location);
-                            break;
-                        }
-                    }
-                }
-            }
-            adapter.initLocationMap();
-        }
-    }
-
-}

app/src/main/java/com/gh/gamecenter/SearchActivity.java

@@ -18,12 +18,16 @@ import android.widget.TextView;
 import com.gh.base.BaseActivity;
 import com.gh.common.util.DataCollectionUtils;
 import com.gh.common.util.EntranceUtils;
+import com.gh.common.util.GdtHelper;
+import com.gh.common.util.TextHelper;
 import com.gh.gamecenter.db.SearchHistoryDao;
 import com.gh.gamecenter.eventbus.EBSearch;
 import com.gh.gamecenter.search.SearchGameDetailFragment;
 import com.gh.gamecenter.search.SearchGameListFragment;
 import com.gh.gamecenter.search.SearchHistoryFragment;
 import com.lightgame.utils.Util_System_Keyboard;
+import com.lightgame.utils.Utils;
+import com.qq.gdt.action.ActionType;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
@@ -33,7 +37,6 @@ import java.util.concurrent.TimeUnit;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.subjects.PublishSubject;
 
-
 public class SearchActivity extends BaseActivity {
 
     private EditText searchInput;
@@ -54,6 +57,12 @@ public class SearchActivity extends BaseActivity {
     private boolean isSearchDetail;
     private PublishSubject<String> mPublishSubject;
 
+    public static final String SEARCH_AUTO = "自动搜索";
+    public static final String SEARCH_DEFAULT = "默认搜索";
+    public static final String SEARCH_HISTORY = "历史搜索";
+    public static final String SEARCH_MANUALLY = "主动搜索";
+    public static final String SEARCH_HOT = "热门搜索";
+
     @NonNull
     public static Intent getIntent(Context context, boolean clicked, String hint, String entrance) {
         Intent intent = new Intent(context, SearchActivity.class);
@@ -170,6 +179,9 @@ public class SearchActivity extends BaseActivity {
                 }
             }
         });
+        TextHelper.limitTheLengthOfEditText(searchInput, 50, () -> {
+            Utils.toast(searchInput.getContext(), "最多输入50个字");
+        });
 
         findViewById(R.id.btnGoBack).setOnClickListener(v -> finish());
     }
@@ -272,10 +284,29 @@ public class SearchActivity extends BaseActivity {
                         search.getGameId(), search.getGameName());
                 break;
             case "search":
+                GdtHelper.INSTANCE.logAction(ActionType.SEARCH,
+                        GdtHelper.KEYWORD, searchKey);
                 DataCollectionUtils.uploadSearch(this, searchKey, searchType, "搜索页面",
                         search.getGameId(), search.getGameName());
                 break;
         }
     }
 
+    public static String convertSearchType(String type) {
+        switch (type) {
+            case "auto":
+                return SEARCH_AUTO;
+            case "default":
+                return SEARCH_DEFAULT;
+            case "remen":
+                return SEARCH_HOT;
+            case "history":
+                return SEARCH_HISTORY;
+            case "initiative":
+                return SEARCH_MANUALLY;
+            default:
+                return "未知搜索类型";
+        }
+    }
+
 }

app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java

@@ -13,9 +13,6 @@ public class SelectUserIconActivity extends NormalActivity {
 
     @NonNull
     public static Intent getIntent(Context context) {
-//        return new IntentFactory.Builder(context)
-//                .setActivity(SelectUserIconActivity.class)
-//                .setFragment(SelectPortraitFragment.class).build();
         return getTargetIntent(context,SelectUserIconActivity.class, SelectPortraitFragment.class);
     }
 

app/src/main/java/com/gh/gamecenter/SettingActivity.java

@@ -19,13 +19,6 @@ public class SettingActivity extends NormalActivity {
 
     @NonNull
     public static Intent getIntent(Context context, boolean isUpdate, String entrance) {
-//        Intent intent = new Intent(context, SettingActivity.class);
-//        intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
-//        return intent;
-//        return new IntentFactory.Builder(context)
-//                .setEntrance(entrance)
-//                .setActivity(SettingActivity.class)
-//                .setFragment(SettingsFragment.class).build();
         Bundle args = new Bundle();
         args.putString(EntranceUtils.KEY_ENTRANCE, entrance);
         args.putBoolean(EntranceUtils.KEY_VERSION_UPDATE, isUpdate);